diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-24 10:38:07 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-24 10:38:07 +0400 |
commit | ab4a2aaf4a4b2b4e416aa1f113b30362cbe0dec3 (patch) | |
tree | 81af4c18519181490074508dbe9a8d515eab634f /source/blender/imbuf/intern/cineon | |
parent | 5a90ea77bc1333efe4e1e54984a080550ed3f707 (diff) |
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
Diffstat (limited to 'source/blender/imbuf/intern/cineon')
-rw-r--r-- | source/blender/imbuf/intern/cineon/cineon_dpx.c | 8 | ||||
-rw-r--r-- | source/blender/imbuf/intern/cineon/cineonlib.c | 22 | ||||
-rw-r--r-- | source/blender/imbuf/intern/cineon/dpxlib.c | 19 | ||||
-rw-r--r-- | source/blender/imbuf/intern/cineon/logImageLib.c | 12 | ||||
-rw-r--r-- | source/blender/imbuf/intern/cineon/logmemfile.c | 6 |
5 files changed, 42 insertions, 25 deletions
diff --git a/source/blender/imbuf/intern/cineon/cineon_dpx.c b/source/blender/imbuf/intern/cineon/cineon_dpx.c index af964bb2bb3..c1222d3cea3 100644 --- a/source/blender/imbuf/intern/cineon/cineon_dpx.c +++ b/source/blender/imbuf/intern/cineon/cineon_dpx.c @@ -154,7 +154,7 @@ static int imb_save_dpx_cineon(ImBuf *ibuf, const char *filename, int use_cineon if (!logImage) return 0; - if(logImageSetByteConversion(logImage, &conversion)==0) { + if (logImageSetByteConversion(logImage, &conversion)==0) { printf("error setting args\n"); } @@ -184,7 +184,7 @@ static int imb_save_dpx_cineon(ImBuf *ibuf, const char *filename, int use_cineon MEM_freeN(line); - if(is_alloc) { + if (is_alloc) { MEM_freeN(fbuf); } @@ -204,7 +204,7 @@ int imb_is_cineon(unsigned char *buf) ImBuf *imb_loadcineon(unsigned char *mem, size_t size, int flags) { - if(imb_is_cineon(mem)) + if (imb_is_cineon(mem)) return imb_load_dpx_cineon(mem, 1, size, flags); return NULL; } @@ -221,7 +221,7 @@ int imb_is_dpx(unsigned char *buf) ImBuf *imb_loaddpx(unsigned char *mem, size_t size, int flags) { - if(imb_is_dpx(mem)) + if (imb_is_dpx(mem)) return imb_load_dpx_cineon(mem, 0, size, flags); return NULL; } diff --git a/source/blender/imbuf/intern/cineon/cineonlib.c b/source/blender/imbuf/intern/cineon/cineonlib.c index a10d8c67051..ae9f8e0fe97 100644 --- a/source/blender/imbuf/intern/cineon/cineonlib.c +++ b/source/blender/imbuf/intern/cineon/cineonlib.c @@ -136,7 +136,8 @@ fillCineonImageInfo(CineonFile* cineon, CineonImageInformation* imageInfo) { if (cineon->depth == 1) { fillCineonChannelInfo(cineon, &imageInfo->channel[0], 0); - } else if (cineon->depth == 3) { + } + else if (cineon->depth == 3) { fillCineonChannelInfo(cineon, &imageInfo->channel[0], 1); fillCineonChannelInfo(cineon, &imageInfo->channel[1], 2); fillCineonChannelInfo(cineon, &imageInfo->channel[2], 3); @@ -215,7 +216,8 @@ dumpCineonFormatInfo(CineonFormatInformation* formatInfo) { d_printf("Packing %d,", formatInfo->packing); if (formatInfo->packing & 0x80) { d_printf(" multi pixel,"); - } else { + } + else { d_printf(" single pixel,"); } switch (formatInfo->packing & 0x7F) { @@ -231,13 +233,15 @@ dumpCineonFormatInfo(CineonFormatInformation* formatInfo) { d_printf("Sign %d,", formatInfo->signage); if (formatInfo->signage) { d_printf(" signed\n"); - } else { + } + else { d_printf(" unsigned\n"); } d_printf("Sense %d,", formatInfo->signage); if (formatInfo->signage) { d_printf(" negative\n"); - } else { + } + else { d_printf(" positive\n"); } d_printf("End of line padding %ld\n", (intptr_t)ntohl(formatInfo->line_padding)); @@ -362,7 +366,7 @@ cineonGetRowBytes(CineonFile* cineon, unsigned short* row, int y) { /* extract required pixels */ for (pixelIndex = 0; pixelIndex < numPixels; ++pixelIndex) { - if(cineon->params.doLogarithm) + if (cineon->params.doLogarithm) row[pixelIndex] = cineon->lut10_16[cineon->pixelBuffer[pixelIndex]]; else row[pixelIndex] = cineon->pixelBuffer[pixelIndex] << 6; @@ -381,7 +385,7 @@ cineonSetRowBytes(CineonFile* cineon, const unsigned short* row, int y) { /* put new pixels into pixelBuffer */ for (pixelIndex = 0; pixelIndex < numPixels; ++pixelIndex) { - if(cineon->params.doLogarithm) + if (cineon->params.doLogarithm) cineon->pixelBuffer[pixelIndex] = cineon->lut16_16[row[pixelIndex]]; else cineon->pixelBuffer[pixelIndex] = row[pixelIndex] >> 6; @@ -604,7 +608,8 @@ int cineonIsMemFileCineon(unsigned char *mem) if (num != ntohl(CINEON_FILE_MAGIC)) { return 0; - } else return 1; + } + else return 1; } CineonFile* @@ -763,7 +768,8 @@ cineonCreate(const char* filename, int width, int height, int depth) { shortFilename = strrchr(filename, '/'); if (shortFilename == 0) { shortFilename = filename; - } else { + } + else { ++shortFilename; } diff --git a/source/blender/imbuf/intern/cineon/dpxlib.c b/source/blender/imbuf/intern/cineon/dpxlib.c index 01177b01178..c9b9901a495 100644 --- a/source/blender/imbuf/intern/cineon/dpxlib.c +++ b/source/blender/imbuf/intern/cineon/dpxlib.c @@ -142,7 +142,8 @@ fillDpxImageInfo( if (dpx->depth == 1) { fillDpxChannelInfo(dpx, &imageInfo->channel[0], 0); - } else if (dpx->depth == 3) { + } + else if (dpx->depth == 3) { fillDpxChannelInfo(dpx, &imageInfo->channel[0], 50); } } @@ -270,7 +271,8 @@ dpxGetRowBytes(DpxFile* dpx, unsigned short* row, int y) { dpx->pixelBuffer[pixelIndex+2] = t & 0x3ff; pixelIndex += 3; } - } else /* if (dpx->depth == 3) */ { + } + else /* if (dpx->depth == 3) */ { for (longIndex = 0; longIndex < readLongs; ++longIndex) { unsigned int t = ntohl(dpx->lineBuffer[longIndex]); t = t >> 2; @@ -286,7 +288,7 @@ dpxGetRowBytes(DpxFile* dpx, unsigned short* row, int y) { /* extract required pixels */ for (pixelIndex = 0; pixelIndex < numPixels; ++pixelIndex) { - if(dpx->params.doLogarithm) + if (dpx->params.doLogarithm) row[pixelIndex] = dpx->lut10_16[dpx->pixelBuffer[pixelIndex]]; else row[pixelIndex] = dpx->pixelBuffer[pixelIndex] << 6; @@ -329,7 +331,7 @@ dpxSetRowBytes(DpxFile* dpx, const unsigned short* row, int y) { /* put new pixels into pixelBuffer */ for (pixelIndex = 0; pixelIndex < numPixels; ++pixelIndex) { - if(dpx->params.doLogarithm) + if (dpx->params.doLogarithm) dpx->pixelBuffer[dpx->pixelBufferUsed + pixelIndex] = dpx->lut16_16[row[pixelIndex]]; else dpx->pixelBuffer[dpx->pixelBufferUsed + pixelIndex] = row[pixelIndex] >> 6; @@ -351,7 +353,8 @@ dpxSetRowBytes(DpxFile* dpx, const unsigned short* row, int y) { dpx->lineBuffer[longIndex] = htonl(t); pixelIndex += 3; } - } else { + } + else { for (longIndex = 0; longIndex < writeLongs; ++longIndex) { unsigned int t = dpx->pixelBuffer[pixelIndex+2] << 2 | (dpx->pixelBuffer[pixelIndex+1] << 12) | @@ -411,7 +414,8 @@ intern_dpxOpen(int mode, const char* bytestuff, int bufsize) { dpx->membuffer = 0; dpx->memcursor = 0; dpx->membuffersize = 0; - } else if (mode == LFMEMFILE) { + } + else if (mode == LFMEMFILE) { dpx->membuffer = (unsigned char *)bytestuff; dpx->memcursor = (unsigned char *)bytestuff; dpx->membuffersize = bufsize; @@ -625,7 +629,8 @@ dpxCreate(const char* filename, int width, int height, int depth) { shortFilename = strrchr(filename, '/'); if (shortFilename == 0) { shortFilename = filename; - } else { + } + else { ++shortFilename; } initDpxMainHeader(dpx, &header, shortFilename); diff --git a/source/blender/imbuf/intern/cineon/logImageLib.c b/source/blender/imbuf/intern/cineon/logImageLib.c index dc50d93bf18..f97df005fc8 100644 --- a/source/blender/imbuf/intern/cineon/logImageLib.c +++ b/source/blender/imbuf/intern/cineon/logImageLib.c @@ -56,7 +56,8 @@ logImageOpen(const char* filename, int cineon) { if (cineon) { return cineonOpen(filename); - } else { + } + else { return dpxOpen(filename); } return 0; @@ -67,7 +68,8 @@ logImageOpenFromMem(unsigned char *buffer, unsigned int size, int cineon) { if (cineon) { return cineonOpenFromMem(buffer, size); - } else { + } + else { return dpxOpenFromMem(buffer, size); } return 0; @@ -78,7 +80,8 @@ logImageCreate(const char* filename, int cineon, int width, int height, int dept { if (cineon) { return cineonCreate(filename, width, height, depth); - } else { + } + else { return dpxCreate(filename, width, height, depth); } return 0; @@ -171,7 +174,8 @@ logImageDump(const char* filename) #if 0 cineonDump(filename); #endif - } else if (magic == ntohl(DPX_FILE_MAGIC)) { + } + else if (magic == ntohl(DPX_FILE_MAGIC)) { dpxDump(filename); } } diff --git a/source/blender/imbuf/intern/cineon/logmemfile.c b/source/blender/imbuf/intern/cineon/logmemfile.c index 289dd0357a4..3db4241cc14 100644 --- a/source/blender/imbuf/intern/cineon/logmemfile.c +++ b/source/blender/imbuf/intern/cineon/logmemfile.c @@ -39,10 +39,12 @@ int logimage_fseek(void* logfile, intptr_t offsett, int origin) if (origin==SEEK_SET) { if (offset > file->membuffersize) return 1; file->memcursor = file->membuffer + offset; - } else if (origin==SEEK_END) { + } + else if (origin==SEEK_END) { if (offset > file->membuffersize) return 1; file->memcursor = (file->membuffer + file->membuffersize) - offset; - } else if (origin==SEEK_CUR) { + } + else if (origin==SEEK_CUR) { uintptr_t pos = (uintptr_t)file->membuffer - (uintptr_t)file->memcursor; if (pos + offset > file->membuffersize) return 1; if (pos < 0) return 1; |