remove redundant trailing slashes
authorCampbell Barton <ideasman42@gmail.com>
Thu, 12 Jan 2012 06:11:08 +0000 (06:11 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 12 Jan 2012 06:11:08 +0000 (06:11 +0000)
source/blender/blenkernel/intern/displist.c
source/blender/blenlib/intern/boxpack2d.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/space_image/image_draw.c
source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
source/blender/imbuf/intern/tiff.c
source/blender/makesrna/intern/rna_wm.c
source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
source/blender/python/intern/bpy_props.c

index a5be056..17936a4 100644 (file)
@@ -269,9 +269,9 @@ int surfindex_displist(DispList *dl, int a, int *b, int *p1, int *p2, int *p3, i
                (*b)= 1;
        }
        
-       if( (dl->flag & DL_CYCL_V) && a==dl->parts-1) {                     \
-               (*p3)-= dl->nr*dl->parts;                                   \
-               (*p4)-= dl->nr*dl->parts;                                   \
+       if( (dl->flag & DL_CYCL_V) && a==dl->parts-1) {
+               (*p3)-= dl->nr*dl->parts;
+               (*p4)-= dl->nr*dl->parts;
        }
        
        return 1;
index 30bf69b..073b4b5 100644 (file)
@@ -174,33 +174,33 @@ void boxPack2D(boxPack *boxarray, const int len, float *tot_width, float *tot_he
        
        for (box=boxarray, box_index=0, i=0; box_index < len; box_index++, box++) {
 
-               vert->blb = vert->brb = vert->tlb =\
-                       vert->isect_cache[0] = vert->isect_cache[1] =\
-                       vert->isect_cache[2] = vert->isect_cache[3] = NULL;
+               vert->blb = vert->brb = vert->tlb =
+                       vert->isect_cache[0] = vert->isect_cache[1] =
+                       vert->isect_cache[2] = vert->isect_cache[3] = NULL;
                vert->free = CORNERFLAGS &~ TRF;
                vert->trb = box;
                vert->index = i; i++;
                box->v[BL] = vert; vert++;
                
-               vert->trb= vert->brb = vert->tlb =\
-                       vert->isect_cache[0] = vert->isect_cache[1] =\
-                       vert->isect_cache[2] = vert->isect_cache[3] = NULL;
+               vert->trb= vert->brb = vert->tlb =
+                       vert->isect_cache[0] = vert->isect_cache[1] =
+                       vert->isect_cache[2] = vert->isect_cache[3] = NULL;
                vert->free = CORNERFLAGS &~ BLF;
                vert->blb = box;
                vert->index = i; i++;
                box->v[TR] = vert; vert++;
                
-               vert->trb = vert->blb = vert->tlb =\
-                       vert->isect_cache[0] = vert->isect_cache[1] =\
-                       vert->isect_cache[2] = vert->isect_cache[3] = NULL;
+               vert->trb = vert->blb = vert->tlb =
+                       vert->isect_cache[0] = vert->isect_cache[1] =
+                       vert->isect_cache[2] = vert->isect_cache[3] = NULL;
                vert->free = CORNERFLAGS &~ BRF;
                vert->brb = box;
                vert->index = i; i++;
                box->v[TL] = vert; vert++;
                
-               vert->trb = vert->blb = vert->brb =\
-                       vert->isect_cache[0] = vert->isect_cache[1] =\
-                       vert->isect_cache[2] = vert->isect_cache[3] = NULL;
+               vert->trb = vert->blb = vert->brb =
+                       vert->isect_cache[0] = vert->isect_cache[1] =
+                       vert->isect_cache[2] = vert->isect_cache[3] = NULL;
                vert->free = CORNERFLAGS &~ TLF;
                vert->tlb = box; 
                vert->index = i; i++;
index 5618d37..bf2f66e 100644 (file)
@@ -165,14 +165,14 @@ static unsigned int check_tria_face[4][3]= {
 
 GLubyte checker_stipple_sml[32*32/8] =
 {
-       255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0, \
-       255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0, \
-       0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255, \
-       0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255, \
-       255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0, \
-       255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0, \
-       0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255, \
-       0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255, \
+       255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,
+       255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,
+       0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,
+       0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,
+       255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,
+       255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,
+       0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,
+       0,255,0,255,0,255,0,255,0,255,0,255,0,255,0,255,
 };
 
 /* ************************************************* */
index 923bf50..41fc861 100644 (file)
@@ -379,14 +379,14 @@ static void sima_draw_alpha_backdrop(float x1, float y1, float xsize, float ysiz
 {
        GLubyte checker_stipple[32*32/8] =
        {
-               255,255,0,0,255,255,0,0,255,255,0,0,255,255,0,0, \
-               255,255,0,0,255,255,0,0,255,255,0,0,255,255,0,0, \
-               255,255,0,0,255,255,0,0,255,255,0,0,255,255,0,0, \
-               255,255,0,0,255,255,0,0,255,255,0,0,255,255,0,0, \
-               0,0,255,255,0,0,255,255,0,0,255,255,0,0,255,255, \
-               0,0,255,255,0,0,255,255,0,0,255,255,0,0,255,255, \
-               0,0,255,255,0,0,255,255,0,0,255,255,0,0,255,255, \
-               0,0,255,255,0,0,255,255,0,0,255,255,0,0,255,255, \
+               255,255,0,0,255,255,0,0,255,255,0,0,255,255,0,0,
+               255,255,0,0,255,255,0,0,255,255,0,0,255,255,0,0,
+               255,255,0,0,255,255,0,0,255,255,0,0,255,255,0,0,
+               255,255,0,0,255,255,0,0,255,255,0,0,255,255,0,0,
+               0,0,255,255,0,0,255,255,0,0,255,255,0,0,255,255,
+               0,0,255,255,0,0,255,255,0,0,255,255,0,0,255,255,
+               0,0,255,255,0,0,255,255,0,0,255,255,0,0,255,255,
+               0,0,255,255,0,0,255,255,0,0,255,255,0,0,255,255,
        };
        
        glColor3ubv(col1);
index 3e017d5..f98f37e 100644 (file)
@@ -703,11 +703,11 @@ void DDSHeader::setSwizzleCode(uint8 c0, uint8 c1, uint8 c2, uint8 c3)
 void DDSHeader::setPixelFormat(uint bitcount, uint rmask, uint gmask, uint bmask, uint amask)
 {
        // Make sure the masks are correct.
-       if ((rmask & gmask) || \
-               (rmask & bmask) || \
-               (rmask & amask) || \
-               (gmask & bmask) || \
-               (gmask & amask) || \
+       if ((rmask & gmask) ||
+               (rmask & bmask) ||
+               (rmask & amask) ||
+               (gmask & bmask) ||
+               (gmask & amask) ||
                (bmask & amask)) {
                printf("DDS: bad RGBA masks, pixel format not set\n");
                return;
index 2051b8d..6fe2a3b 100644 (file)
@@ -541,7 +541,7 @@ ImBuf *imb_loadtiff(unsigned char *mem, size_t size, int flags)
        }
        else {
                fprintf(stderr, 
-                       "imb_loadtiff: could not allocate memory for TIFF " \
+                       "imb_loadtiff: could not allocate memory for TIFF "
                        "image.\n");
                TIFFClose(image);
                return NULL;
index 8e05e43..52a4a1d 100644 (file)
@@ -371,7 +371,7 @@ EnumPropertyItem wm_report_items[] = {
        {RPT_OPERATOR, "OPERATOR", 0, "Operator", ""},
        {RPT_WARNING, "WARNING", 0, "Warning", ""},
        {RPT_ERROR, "ERROR", 0, "Error", ""},
-       {RPT_ERROR_INVALID_INPUT, "ERROR_INVALID_INPUT", 0, "Invalid Input", ""},\
+       {RPT_ERROR_INVALID_INPUT, "ERROR_INVALID_INPUT", 0, "Invalid Input", ""},
        {RPT_ERROR_INVALID_CONTEXT, "ERROR_INVALID_CONTEXT", 0, "Invalid Context", ""},
        {RPT_ERROR_OUT_OF_MEMORY, "ERROR_OUT_OF_MEMORY", 0, "Out of Memory", ""},
        {0, NULL, 0, NULL, NULL}};
index a7ec098..b7ebb7d 100644 (file)
@@ -716,10 +716,11 @@ static void do_allEdgeDetection(unsigned int t, unsigned int rw, unsigned int *l
                       is also empty. If both conditions are true for any one of the 4 adjacent pixels
                       then the current pixel is counted as being a true outer edge pixel.
                      */
-                    if((!lomask[pix_nextCol] && !limask[pix_nextCol]) || \
-                       (!lomask[pix_prevCol] && !limask[pix_prevCol]) || \
-                       (!lomask[pix_nextRow] && !limask[pix_nextRow]) || \
-                       (!lomask[pix_prevRow] && !limask[pix_prevRow])) {
+                    if((!lomask[pix_nextCol] && !limask[pix_nextCol]) ||
+                       (!lomask[pix_prevCol] && !limask[pix_prevCol]) ||
+                       (!lomask[pix_nextRow] && !limask[pix_nextRow]) ||
+                       (!lomask[pix_prevRow] && !limask[pix_prevRow]))
+                                       {
                         in_osz++;           // increment the outer boundary pixel count
                         lres[a]=3;       // flag pixel as part of outer edge
                     } else {             // it's not a boundary pixel, but it is a gradient pixel
@@ -773,10 +774,11 @@ static void do_adjacentEdgeDetection(unsigned int t, unsigned int rw, unsigned i
                       is also empty. If both conditions are true for any one of the 4 adjacent pixels
                       then the current pixel is counted as being a true outer edge pixel.
                      */
-                    if((!lomask[pix_nextCol] && !limask[pix_nextCol]) || \
-                       (!lomask[pix_prevCol] && !limask[pix_prevCol]) || \
-                       (!lomask[pix_nextRow] && !limask[pix_nextRow]) || \
-                       (!lomask[pix_prevRow] && !limask[pix_prevRow])) {
+                    if((!lomask[pix_nextCol] && !limask[pix_nextCol]) ||
+                       (!lomask[pix_prevCol] && !limask[pix_prevCol]) ||
+                       (!lomask[pix_nextRow] && !limask[pix_nextRow]) ||
+                       (!lomask[pix_prevRow] && !limask[pix_prevRow]))
+                                       {
                         in_osz++;           // increment the outer boundary pixel count
                         lres[a]=3;       // flag pixel as part of outer edge
                     } else {             // it's not a boundary pixel, but it is a gradient pixel
@@ -786,10 +788,11 @@ static void do_adjacentEdgeDetection(unsigned int t, unsigned int rw, unsigned i
                 }
 
             } else {
-                if((!limask[pix_nextCol] && lomask[pix_nextCol]) || \
-                   (!limask[pix_prevCol] && lomask[pix_prevCol]) || \
-                   (!limask[pix_nextRow] && lomask[pix_nextRow]) || \
-                   (!limask[pix_prevRow] && lomask[pix_prevRow])) {
+                if((!limask[pix_nextCol] && lomask[pix_nextCol]) ||
+                   (!limask[pix_prevCol] && lomask[pix_prevCol]) ||
+                   (!limask[pix_nextRow] && lomask[pix_nextRow]) ||
+                   (!limask[pix_prevRow] && lomask[pix_prevRow]))
+                               {
                     in_isz++;               // increment the inner boundary pixel count
                     lres[a]=4;           // flag pixel as part of inner edge
                 } else {
index 81eb81e..d94ba8b 100644 (file)
@@ -1423,7 +1423,7 @@ static PyObject *BPy_RemoveProperty(PyObject *self, PyObject *args, PyObject *kw
                return ret;     
        }
        else if (PyTuple_GET_SIZE(args) > 1) {
-               PyErr_SetString(PyExc_ValueError, "all args must be keywords"); \
+               PyErr_SetString(PyExc_ValueError, "all args must be keywords");
                return NULL;
        }