1 files changed, 34 insertions, 27 deletions

diff --git a/source/blender/imbuf/intern/rotate.c b/source/blender/imbuf/intern/rotate.c
index ca7ea01eaa6..c04987b3e71 100644
--- a/source/blender/imbuf/intern/rotate.c
+++ b/source/blender/imbuf/intern/rotate.c
@@ -40,48 +40,55 @@
 
 void IMB_flipy(struct ImBuf * ibuf)
 {
-	short x, y;
-	unsigned int *top, *bottom, do_float=0, *line;
-	float *topf=NULL, *bottomf=NULL, *linef=NULL;
+	int x, y;
 
 	if (ibuf == NULL) return;
-	if (ibuf->rect == NULL) return;
-	
-	if (ibuf->rect_float) do_float =1;
 
-	x = ibuf->x;
-	y = ibuf->y;
+	if (ibuf->rect) {
+		unsigned int *top, *bottom, *line;
+
+		x = ibuf->x;
+		y = ibuf->y;
 
-	top = ibuf->rect;
-	bottom = top + ((y-1) * x);
-	line= MEM_mallocN(x*sizeof(int), "linebuf");
+		top = ibuf->rect;
+		bottom = top + ((y-1) * x);
+		line= MEM_mallocN(x*sizeof(int), "linebuf");
 	
-	if (do_float) {
+		y >>= 1;
+
+		for(;y>0;y--) {
+			memcpy(line, top, x*sizeof(int));
+			memcpy(top, bottom, x*sizeof(int));
+			memcpy(bottom, line, x*sizeof(int));
+			bottom -= x;
+			top+= x;
+		}
+
+		MEM_freeN(line);
+	}
+
+	if (ibuf->rect_float) {
+		float *topf=NULL, *bottomf=NULL, *linef=NULL;
+
+		x = ibuf->x;
+		y = ibuf->y;
+
 		topf= ibuf->rect_float;
 		bottomf = topf + 4*((y-1) * x);
 		linef= MEM_mallocN(4*x*sizeof(float), "linebuff");
-	}
-	y >>= 1;
-
-	for(;y>0;y--) {
-		
-		memcpy(line, top, x*sizeof(int));
-		memcpy(top, bottom, x*sizeof(int));
-		memcpy(bottom, line, x*sizeof(int));
-		bottom -= x;
-		top+= x;
-		
-		if(do_float) {
+
+		y >>= 1;
+
+		for(;y>0;y--) {
 			memcpy(linef, topf, 4*x*sizeof(float));
 			memcpy(topf, bottomf, 4*x*sizeof(float));
 			memcpy(bottomf, linef, 4*x*sizeof(float));
 			bottomf -= 4*x;
 			topf+= 4*x;
 		}
+
+		MEM_freeN(linef);
 	}
-	
-	MEM_freeN(line);
-	if(linef) MEM_freeN(linef);
 }
 
 void IMB_flipx(struct ImBuf * ibuf)