From 014aa7261e29810b35b3d65c759f9d255bf8a277 Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Mon, 9 Jan 2006 00:40:35 +0000 Subject: 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... :/ --- source/blender/blenkernel/intern/Makefile | 4 ++++ source/blender/blenkernel/intern/image.c | 31 ++++++++++++++++++----------- source/blender/blenkernel/intern/writeavi.c | 19 ++++++++---------- 3 files changed, 31 insertions(+), 23 deletions(-) (limited to 'source/blender/blenkernel/intern') 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 -#ifdef HAVE_CONFIG_H -#include -#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) -- cgit v1.2.3