Orange branch: OpenEXR finally in Blender!

Credits go to Gernot Ziegler, who originally coded EXR support, and to
Austin  Benesh for bringing it further. Kent Mein provided a lot of code
for integrating float buffers in Blender imbuf and ImBuf API cleanup,
and provided Make and Scons and static linking.

At this moment; the EXR libraries are a *dependency*, so you cannot get
the Orange branch compiled without having OpenEXR installed. Get the
(precompiled or sources) stuff from www.openexr.com. Current default is
that the headers and lib resides in /user/local/

Several changes/additions/fixes were added:

- EXR code only supported 'half' format (16 bits per channel). I've added
  float writing, but for reading it I need tomorrow. :)
- Quite some clumsy copying of data happened in EXR code.
- cleaned up the api calls already a bit, preparing for more advanced
  support
- Zbuffers were saved 16 bits, now 32 bits
- automatic adding of .exr extensions went wrong

Imbuf:

- added proper imbuf->flags and imbuf->mall support for float buffers, it
  was created for *each* imbuf. :)
- found bugs for float buffers in scaling and flipping. Code there will
  need more checks still
- imbuf also needs to be verified to behave properly when no 32 bits
  rect exists (for saving for example)

TODO:

- support internal float images for textures, backbuf, AO probes, and
  display in Image window

Hope this commit won't screwup syncing with bf-blender... :/

1 files changed, 7 insertions, 10 deletions

diff --git a/source/blender/src/writemovie.c b/source/blender/src/writemovie.c
index f27f7ffd7e3..2c80200f904 100644
--- a/source/blender/src/writemovie.c
+++ b/source/blender/src/writemovie.c
@@ -30,10 +30,6 @@
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifdef __sgi
 
 #include <unistd.h>
@@ -364,6 +360,7 @@ void append_movie(int cfra)
 	char		name[FILE_MAXDIR+FILE_MAXFILE];
 	const char	*string;
 	int			fd;
+	float col[4] = {0.0,0.0,0.0,0.0};
 	
 	set_sfra_efra();
 	make_movie_name(name);
@@ -377,28 +374,28 @@ void append_movie(int cfra)
 	
 	if (ibuf->x != mv_outx || ibuf->y != mv_outy) {
 		tbuf = IMB_allocImBuf(mv_outx, mv_outy, 32, IB_rect, 0);
-		IMB_rectoptot(tbuf, 0, IMB_rectfill, 0x00);
+		IMB_rectfill(tbuf,col);
 		
 		ofsx = (tbuf->x - ibuf->x) / 2;
 		ofsy = (tbuf->y - ibuf->y) / 2;
 		if (numfields == 2) ofsy &= ~1;
 		
-		IMB_rectop(tbuf, ibuf, ofsx, ofsy, 0, 0, 32767, 32767, IMB_rectcpy, 0);
+		IMB_rectcpy(tbuf, ibuf, ofsx, ofsy, 0, 0, ibuf->x, ibuf->y);
 		IMB_freeImBuf(ibuf);
 		strcpy(tbuf->name, ibuf->name);
 		ibuf = tbuf;
 	}
-	IMB_convert_rgba_to_abgr(ibuf->x*ibuf->y, ibuf->rect);
+	IMB_convert_rgba_to_abgr(ibuf);
 	
 	if (numfields == 2) {
 		if (ntsc) {
-			IMB_rectop(ibuf, ibuf, 0, 0, 0, 1, 32767, 32767, IMB_rectcpy, 0);
+			IMB_rectcpy(ibuf, ibuf, 0, 0, 0, 1, ibuf->x, ibuf->y);
 			IMB_flipy(ibuf);
 			IMB_de_interlace(ibuf);
-			if (ntsc) IMB_rectop(ibuf, ibuf, 0, 0, 0, 1, 32767, 32767, IMB_rectcpy, 0);
+			if (ntsc) IMB_rectcpy(ibuf, ibuf, 0, 0, 0, 1, ibuf->x, ibuf->y);
 		} else {
 			IMB_flipy(ibuf);
-			IMB_rectop(ibuf, ibuf, 0, 0, 0, 1, 32767, 32767, IMB_rectcpy, 0);
+			IMB_rectcpy(ibuf, ibuf, 0, 0, 0, 1, ibuf->x, ibuf->y);
 			IMB_de_interlace(ibuf);
 		}
 	}