diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-10-21 09:46:41 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-10-21 09:46:41 +0400 |
commit | f3ece5a108db0bdbefb4663ef4ebd9a7e039e263 (patch) | |
tree | cb6329453be169ef1ec49ef8b8d50a6b14364880 /source/blender/imbuf/intern | |
parent | a1a0c8da13a7b91b0264c7535752864379f3d852 (diff) |
style cleanup: trailing tabs & expand some non prefix tabs into spaces.
Diffstat (limited to 'source/blender/imbuf/intern')
-rw-r--r-- | source/blender/imbuf/intern/anim_movie.c | 2 | ||||
-rw-r--r-- | source/blender/imbuf/intern/bmp.c | 2 | ||||
-rw-r--r-- | source/blender/imbuf/intern/cineon/cineonlib.c | 6 | ||||
-rw-r--r-- | source/blender/imbuf/intern/cineon/dpxlib.c | 2 | ||||
-rw-r--r-- | source/blender/imbuf/intern/dds/BlockDXT.cpp | 4 | ||||
-rw-r--r-- | source/blender/imbuf/intern/dds/ColorBlock.cpp | 2 | ||||
-rw-r--r-- | source/blender/imbuf/intern/divers.c | 2 | ||||
-rw-r--r-- | source/blender/imbuf/intern/imageprocess.c | 2 | ||||
-rw-r--r-- | source/blender/imbuf/intern/iris.c | 4 | ||||
-rw-r--r-- | source/blender/imbuf/intern/jp2.c | 4 | ||||
-rw-r--r-- | source/blender/imbuf/intern/rectop.c | 8 | ||||
-rw-r--r-- | source/blender/imbuf/intern/targa.c | 4 | ||||
-rw-r--r-- | source/blender/imbuf/intern/thumbs.c | 10 | ||||
-rw-r--r-- | source/blender/imbuf/intern/thumbs_blend.c | 2 | ||||
-rw-r--r-- | source/blender/imbuf/intern/util.c | 2 |
15 files changed, 28 insertions, 28 deletions
diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c index 4aeba9af89d..5b64416c309 100644 --- a/source/blender/imbuf/intern/anim_movie.c +++ b/source/blender/imbuf/intern/anim_movie.c @@ -1233,7 +1233,7 @@ static ImBuf *anim_getnew(struct anim *anim) if (anim->curtype != 0) return (NULL); - anim->curtype = imb_get_anim_type(anim->name); + anim->curtype = imb_get_anim_type(anim->name); switch (anim->curtype) { case ANIM_SEQUENCE: diff --git a/source/blender/imbuf/intern/bmp.c b/source/blender/imbuf/intern/bmp.c index df12f0b703e..32733668052 100644 --- a/source/blender/imbuf/intern/bmp.c +++ b/source/blender/imbuf/intern/bmp.c @@ -184,7 +184,7 @@ struct ImBuf *imb_bmp_decode(unsigned char *mem, size_t size, int flags, char co rect += 4; bmp += 3; } /* for 24-bit images, rows are padded to multiples of 4 */ - bmp += x % 4; + bmp += x % 4; } } else if (depth == 32) { diff --git a/source/blender/imbuf/intern/cineon/cineonlib.c b/source/blender/imbuf/intern/cineon/cineonlib.c index a9001303679..894e3a93b4b 100644 --- a/source/blender/imbuf/intern/cineon/cineonlib.c +++ b/source/blender/imbuf/intern/cineon/cineonlib.c @@ -215,7 +215,7 @@ dumpCineonFormatInfo(CineonFormatInformation* formatInfo) { default: d_printf(" (unknown)\n"); break; } d_printf("Packing %d,", formatInfo->packing); - if (formatInfo->packing & 0x80) { + if (formatInfo->packing & 0x80) { d_printf(" multi pixel,"); } else { @@ -232,14 +232,14 @@ dumpCineonFormatInfo(CineonFormatInformation* formatInfo) { default: d_printf(" (unknown)\n"); break; } d_printf("Sign %d,", formatInfo->signage); - if (formatInfo->signage) { + if (formatInfo->signage) { d_printf(" signed\n"); } else { d_printf(" unsigned\n"); } d_printf("Sense %d,", formatInfo->signage); - if (formatInfo->signage) { + if (formatInfo->signage) { d_printf(" negative\n"); } else { diff --git a/source/blender/imbuf/intern/cineon/dpxlib.c b/source/blender/imbuf/intern/cineon/dpxlib.c index c1138225e93..0a067af2cb9 100644 --- a/source/blender/imbuf/intern/cineon/dpxlib.c +++ b/source/blender/imbuf/intern/cineon/dpxlib.c @@ -407,7 +407,7 @@ intern_dpxOpen(int mode, const char* bytestuff, int bufsize) { if (mode == LFREALFILE) { filename = bytestuff; dpx->file = BLI_fopen(filename, "rb"); - if (dpx->file == 0) { + if (dpx->file == 0) { if (verbose) d_printf("Failed to open file \"%s\".\n", filename); dpxClose(dpx); return 0; diff --git a/source/blender/imbuf/intern/dds/BlockDXT.cpp b/source/blender/imbuf/intern/dds/BlockDXT.cpp index f5e9e536e41..db2ca5969ec 100644 --- a/source/blender/imbuf/intern/dds/BlockDXT.cpp +++ b/source/blender/imbuf/intern/dds/BlockDXT.cpp @@ -232,7 +232,7 @@ void BlockDXT1::decodeBlock(ColorBlock * block) const uint idx = (row[j] >> (2 * i)) & 3; block->color(i, j) = color_array[idx]; } - } + } } void BlockDXT1::decodeBlockNV5x(ColorBlock * block) const @@ -592,7 +592,7 @@ void BlockCTX1::decodeBlock(ColorBlock * block) const uint idx = (row[j] >> (2 * i)) & 3; block->color(i, j) = color_array[idx]; } - } + } } void BlockCTX1::setIndices(int * idx) diff --git a/source/blender/imbuf/intern/dds/ColorBlock.cpp b/source/blender/imbuf/intern/dds/ColorBlock.cpp index 0b9f5c163fb..dbd87bf1426 100644 --- a/source/blender/imbuf/intern/dds/ColorBlock.cpp +++ b/source/blender/imbuf/intern/dds/ColorBlock.cpp @@ -393,7 +393,7 @@ void ColorBlock::computeRange(Vector3::Arg axis, Color32 * start, Color32 * end) int mini, maxi; mini = maxi = 0; - float min, max; + float min, max; min = max = dot(Vector3(m_color[0].r, m_color[0].g, m_color[0].b), axis); for (uint i = 1; i < 16; i++) diff --git a/source/blender/imbuf/intern/divers.c b/source/blender/imbuf/intern/divers.c index aa236af3507..966e70c2876 100644 --- a/source/blender/imbuf/intern/divers.c +++ b/source/blender/imbuf/intern/divers.c @@ -62,7 +62,7 @@ void IMB_de_interlace(ImBuf *ibuf) tbuf1 = IMB_allocImBuf(ibuf->x, ibuf->y / 2, 32, IB_rect); tbuf2 = IMB_allocImBuf(ibuf->x, ibuf->y / 2, 32, IB_rect); - ibuf->x *= 2; + ibuf->x *= 2; IMB_rectcpy(tbuf1, ibuf, 0, 0, 0, 0, ibuf->x, ibuf->y); IMB_rectcpy(tbuf2, ibuf, 0, 0, tbuf2->x, 0, ibuf->x, ibuf->y); diff --git a/source/blender/imbuf/intern/imageprocess.c b/source/blender/imbuf/intern/imageprocess.c index 863b8424cc2..57fbce710a1 100644 --- a/source/blender/imbuf/intern/imageprocess.c +++ b/source/blender/imbuf/intern/imageprocess.c @@ -444,7 +444,7 @@ void neareast_interpolation_color(struct ImBuf *in, unsigned char outI[4], float outF[2] = dataF[2]; outF[3] = dataF[3]; } - } + } } void neareast_interpolation(ImBuf *in, ImBuf *out, float x, float y, int xout, int yout) diff --git a/source/blender/imbuf/intern/iris.c b/source/blender/imbuf/intern/iris.c index 549a28a0453..dec5f6fb39e 100644 --- a/source/blender/imbuf/intern/iris.c +++ b/source/blender/imbuf/intern/iris.c @@ -408,7 +408,7 @@ struct ImBuf *imb_loadiris(unsigned char *mem, size_t size, int flags, char colo } MEM_freeN(starttab); - MEM_freeN(lengthtab); + MEM_freeN(lengthtab); } else { @@ -613,7 +613,7 @@ static void expandrow2(float *optr, unsigned char *iptr, int z) optr += 4; } } - } + } } static void expandrow(unsigned char *optr, unsigned char *iptr, int z) diff --git a/source/blender/imbuf/intern/jp2.c b/source/blender/imbuf/intern/jp2.c index 01523463712..692ba3c49ea 100644 --- a/source/blender/imbuf/intern/jp2.c +++ b/source/blender/imbuf/intern/jp2.c @@ -436,7 +436,7 @@ static void cinema_parameters(opj_cparameters_t *parameters) parameters->image_offset_y0 = 0; /*Codeblock size = 32 * 32*/ - parameters->cblockw_init = 32; + parameters->cblockw_init = 32; parameters->cblockh_init = 32; parameters->csty |= 0x01; @@ -602,7 +602,7 @@ static opj_image_t *ibuftoimage(ImBuf *ibuf, opj_cparameters_t *parameters) prec = 12; numcomps = 3; } - else { + else { /* Get settings from the imbuf */ color_space = (ibuf->ftype & JP2_YCC) ? CLRSPC_SYCC : CLRSPC_SRGB; diff --git a/source/blender/imbuf/intern/rectop.c b/source/blender/imbuf/intern/rectop.c index a11f16d5669..8e072361583 100644 --- a/source/blender/imbuf/intern/rectop.c +++ b/source/blender/imbuf/intern/rectop.c @@ -447,7 +447,7 @@ void IMB_rectblend(struct ImBuf *dbuf, struct ImBuf *sbuf, int destx, drectf += destskip * 4; srectf += srcskip * 4; - } + } } } } @@ -482,13 +482,13 @@ void IMB_rectfill(struct ImBuf *drect, const float col[4]) *rrectf++ = col[2]; *rrectf++ = col[3]; } - } + } } void buf_rectfill_area(unsigned char *rect, float *rectf, int width, int height, - const float col[4], struct ColorManagedDisplay *display, - int x1, int y1, int x2, int y2) + const float col[4], struct ColorManagedDisplay *display, + int x1, int y1, int x2, int y2) { int i, j; float a; /* alpha */ diff --git a/source/blender/imbuf/intern/targa.c b/source/blender/imbuf/intern/targa.c index 253680e4bea..eaad77f1ff9 100644 --- a/source/blender/imbuf/intern/targa.c +++ b/source/blender/imbuf/intern/targa.c @@ -55,9 +55,9 @@ /***/ typedef struct TARGA { - unsigned char numid; + unsigned char numid; unsigned char maptyp; - unsigned char imgtyp; + unsigned char imgtyp; short maporig; short mapsize; unsigned char mapbits; diff --git a/source/blender/imbuf/intern/thumbs.c b/source/blender/imbuf/intern/thumbs.c index ff7218d649c..a3ce332b609 100644 --- a/source/blender/imbuf/intern/thumbs.c +++ b/source/blender/imbuf/intern/thumbs.c @@ -175,7 +175,7 @@ static void to_hex_char(char *hexbytes, const unsigned char *bytes, int len) static int uri_from_filename(const char *path, char *uri) { - char orig_uri[URI_MAX]; + char orig_uri[URI_MAX]; const char *dirstart = path; #ifdef WIN32 @@ -265,7 +265,7 @@ ImBuf *IMB_thumb_create(const char *path, ThumbSize size, ThumbSource source, Im char thumb[40]; short tsize = 128; short ex, ey; - float scaledx, scaledy; + float scaledx, scaledy; struct stat info; switch (size) { @@ -334,7 +334,7 @@ ImBuf *IMB_thumb_create(const char *path, ThumbSize size, ThumbSource source, Im } else { IMB_freeImBuf(img); - img = IMB_anim_previewframe(anim); + img = IMB_anim_previewframe(anim); } IMB_free_anim(anim); } @@ -401,7 +401,7 @@ ImBuf *IMB_thumb_read(const char *path, ThumbSize size) if (!uri_from_filename(path, uri)) { return NULL; } - if (thumbpath_from_uri(uri, thumb, sizeof(thumb), size)) { + if (thumbpath_from_uri(uri, thumb, sizeof(thumb), size)) { img = IMB_loadiffname(thumb, IB_rect | IB_metadata, NULL); } @@ -438,7 +438,7 @@ ImBuf *IMB_thumb_manage(const char *path, ThumbSize size, ThumbSource source) if (stat(path, &st)) { return NULL; - } + } if (!uri_from_filename(path, uri)) { return NULL; } diff --git a/source/blender/imbuf/intern/thumbs_blend.c b/source/blender/imbuf/intern/thumbs_blend.c index cfc49d8cef5..73ced4095f9 100644 --- a/source/blender/imbuf/intern/thumbs_blend.c +++ b/source/blender/imbuf/intern/thumbs_blend.c @@ -166,7 +166,7 @@ void IMB_overlayblend_thumb(unsigned int *thumb, int width, int height, float as margin_t = height - margin_b; } - { + { int x, y; int stride_x = (margin_r - margin_l) - 2; diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c index 8dd791c8508..fe138a71a4a 100644 --- a/source/blender/imbuf/intern/util.c +++ b/source/blender/imbuf/intern/util.c @@ -416,7 +416,7 @@ int IMB_isanim(const char *filename) type = imb_get_anim_type(filename); } else { - return(FALSE); + return(FALSE); } } else { /* no quicktime */ |