3 files changed, 31 insertions, 23 deletions

diff --git a/source/blender/blenkernel/intern/Makefile b/source/blender/blenkernel/intern/Makefile
index 9207023f9a5..1bdeda1841f 100644
--- a/source/blender/blenkernel/intern/Makefile
+++ b/source/blender/blenkernel/intern/Makefile
@@ -83,3 +83,7 @@ ifeq ($(WITH_FREETYPE2), true)
     CPPFLAGS += -I$(NAN_FREETYPE)/include/freetype2
 endif
 
+ifeq ($(WITH_OPENEXR), true)
+    CPPFLAGS += -DWITH_OPENEXR
+endif
+
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index fa4136d63fa..26711495252 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -341,8 +341,15 @@ void addImageExtension(char *string)
 			extension= ".bmp";
 	}
 	else if(G.have_libtiff && (G.scene->r.imtype==R_TIFF)) {
-		extension= ".tif";
+		if(!BLI_testextensie(string, ".tif"))
+			extension= ".tif";
 	}
+#ifdef WITH_OPENEXR
+	else if(G.scene->r.imtype==R_OPENEXR) {
+		if(!BLI_testextensie(string, ".exr"))
+			extension= ".exr";
+	}
+#endif
 	
 	strcat(string, extension);
 }
@@ -449,13 +456,13 @@ static void de_interlace_ng(struct ImBuf *ibuf)	/* neogeo fields */
 		tbuf2 = IMB_allocImBuf(ibuf->x, (short)(ibuf->y >> 1), (unsigned char)32, (int)IB_rect, (unsigned char)0);
 		
 		ibuf->x *= 2;
-		/* These rectop calls are broken!!! I added a trailing 0 arg... */
-		IMB_rectop(tbuf1, ibuf, 0, 0, 0, 0, 32767, 32767, IMB_rectcpy, 0);
-		IMB_rectop(tbuf2, ibuf, 0, 0, tbuf2->x, 0, 32767, 32767, IMB_rectcpy, 0);
+		
+		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);
 		
 		ibuf->x /= 2;
-		IMB_rectop(ibuf, tbuf1, 0, 0, 0, 0, 32767, 32767, IMB_rectcpy, 0);
-		IMB_rectop(ibuf, tbuf2, 0, tbuf2->y, 0, 0, 32767, 32767, IMB_rectcpy, 0);
+		IMB_rectcpy(ibuf, tbuf1, 0, 0, 0, 0, tbuf1->x, tbuf1->y);
+		IMB_rectcpy(ibuf, tbuf2, 0, tbuf2->y, 0, 0, tbuf2->x, tbuf2->y);
 		
 		IMB_freeImBuf(tbuf1);
 		IMB_freeImBuf(tbuf2);
@@ -477,13 +484,13 @@ static void de_interlace_st(struct ImBuf *ibuf)	/* standard fields */
 		tbuf2 = IMB_allocImBuf(ibuf->x, (short)(ibuf->y >> 1), (unsigned char)32, IB_rect, 0);
 		
 		ibuf->x *= 2;
-		/* These are brolenm as well... */
-		IMB_rectop(tbuf1, ibuf, 0, 0, 0, 0, 32767, 32767, IMB_rectcpy, 0);
-		IMB_rectop(tbuf2, ibuf, 0, 0, tbuf2->x, 0, 32767, 32767, IMB_rectcpy, 0);
+		
+		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);
 		
 		ibuf->x /= 2;
-		IMB_rectop(ibuf, tbuf2, 0, 0, 0, 0, 32767, 32767, IMB_rectcpy, 0);
-		IMB_rectop(ibuf, tbuf1, 0, tbuf2->y, 0, 0, 32767, 32767, IMB_rectcpy, 0);
+		IMB_rectcpy(ibuf, tbuf2, 0, 0, 0, 0, tbuf2->x, tbuf2->y);
+		IMB_rectcpy(ibuf, tbuf1, 0, tbuf2->y, 0, 0, tbuf1->x, tbuf1->y);
 		
 		IMB_freeImBuf(tbuf1);
 		IMB_freeImBuf(tbuf2);
@@ -559,7 +566,7 @@ void ima_ibuf_is_nul(Tex *tex, Image *ima)
 				}
 				
 				IMB_applycmap(ima->ibuf);
-				IMB_convert_rgba_to_abgr(ima->ibuf->x*ima->ibuf->y, ima->ibuf->rect);
+				IMB_convert_rgba_to_abgr(ima->ibuf);
 				
 			}
 			
diff --git a/source/blender/blenkernel/intern/writeavi.c b/source/blender/blenkernel/intern/writeavi.c
index 77c35cc46ab..35f5c7b0d17 100644
--- a/source/blender/blenkernel/intern/writeavi.c
+++ b/source/blender/blenkernel/intern/writeavi.c
@@ -35,10 +35,6 @@
 
 #include <string.h>
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "MEM_guardedalloc.h"
 #include "BLI_blenlib.h"
 
@@ -122,7 +118,8 @@ void start_avi(void)
 
 void append_avi(int frame)
 {
-	unsigned int *rt1, *rt2, *temp;
+	unsigned int *rt1, *rt2;
+	struct ImBuf *temp;
 	int y;
 
 	if (avi == NULL) {
@@ -130,20 +127,20 @@ void append_avi(int frame)
 		return;
 	}
 
-		/* note that libavi free's the buffer... stupid interface - zr */
-	temp = MEM_mallocN(R.rectx*R.recty*4, "append_avi buf");
+	/* note that libavi free's the buffer... stupid interface - zr */
+	temp = IMB_allocImBuf(R.rectx,R.recty*4,32, IB_rect, 0);
 
-	rt1= temp;
+	rt1= temp->rect;
 	rt2= R.rectot + (R.recty-1)*R.rectx;
 	for (y=0; y < R.recty; y++, rt1+= R.rectx, rt2-= R.rectx) {
 		memcpy (rt1, rt2, R.rectx*4);
 	}
 
-	IMB_convert_rgba_to_abgr(R.rectx*R.recty, temp);
+	IMB_convert_rgba_to_abgr(temp);
 	
-	AVI_write_frame (avi, (frame-sframe), AVI_FORMAT_RGB32, 
-										temp, R.rectx*R.recty*4);
+	AVI_write_frame (avi, (frame-sframe), AVI_FORMAT_RGB32, temp->rect, R.rectx*R.recty*4);
 	printf ("added frame %3d (frame %3d in avi): ", frame, frame-sframe);
+	IMB_freeImBuf(temp);
 }
 
 void end_avi(void)