From ab4a2aaf4a4b2b4e416aa1f113b30362cbe0dec3 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 24 Mar 2012 06:38:07 +0000
Subject: style cleanup: follow style guide for formatting of if/for/while
 loops, and else if's

---
 source/blender/imbuf/intern/cineon/cineonlib.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'source/blender/imbuf/intern/cineon/cineonlib.c')

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;
 	}
 
-- 
cgit v1.2.3