From 014aa7261e29810b35b3d65c759f9d255bf8a277 Mon Sep 17 00:00:00 2001
From: Ton Roosendaal <ton@blender.org>
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/imbuf/IMB_imbuf_types.h | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'source/blender/imbuf/IMB_imbuf_types.h')

diff --git a/source/blender/imbuf/IMB_imbuf_types.h b/source/blender/imbuf/IMB_imbuf_types.h
index 56a28850e71..4f648031fc6 100644
--- a/source/blender/imbuf/IMB_imbuf_types.h
+++ b/source/blender/imbuf/IMB_imbuf_types.h
@@ -93,6 +93,7 @@ typedef struct ImBuf{
 	unsigned char *encodedbuffer;     /**< Compressed image only used with png currently */
 	unsigned int   encodedsize;       /**< Size of data written to encodedbuffer */
 	unsigned int   encodedbuffersize; /**< Size of encodedbuffer */
+	float *rect_float;		/**< floating point Rect equivilant */
 } ImBuf;
 
 /* Moved from BKE_bmfont_types.h because it is a userflag bit mask. */
@@ -131,6 +132,8 @@ typedef enum {
 #define IB_zbuf			(1 << 13)
 
 #define IB_mem			(1 << 14)
+#define IB_rectfloat	(1 << 15)
+
 /**@}*/
 
 /** \name imbuf_formats Image file formats
@@ -141,17 +144,20 @@ typedef enum {
  *
  * The bit flag is stored in the ImBuf.ftype variable.
  */
-#define AMI	        (1 << 31)
-#define PNG	        (1 << 30)
+#define AMI				(1 << 31)
+#define PNG				(1 << 30)
 #define Anim	        (1 << 29)
-#define TGA	        (1 << 28)
-#define JPG		(1 << 27)
-#define BMP		(1 << 26)
+#define TGA				(1 << 28)
+#define JPG				(1 << 27)
+#define BMP				(1 << 26)
+
 #ifdef WITH_QUICKTIME
-#define QUICKTIME	(1 << 25)
+#define QUICKTIME		(1 << 25)
 #endif
-#define RADHDR		(1<<24)
-#define TIF		(1<<23)
+
+#define RADHDR			(1 << 24)
+#define TIF				(1 << 23)
+#define OPENEXR			(1 << 22)
 
 #define RAWTGA	        (TGA | 1)
 
@@ -188,6 +194,7 @@ typedef enum {
 #define IS_hamx(x)		(x->ftype == AN_hamx)
 #define IS_tga(x)		(x->ftype & TGA)
 #define IS_png(x)		(x->ftype & PNG)
+#define IS_openexr(x)	(x->ftype & OPENEXR)
 #define IS_bmp(x)		(x->ftype & BMP)
 #define IS_tiff(x)		(x->ftype & TIF)
 #define IS_radhdr(x)	(x->ftype & RADHDR)
-- 
cgit v1.2.3