Merge image related changes from the render branch. This includes the image

tile cache code in imbuf, but it is not hooked up to the render engine.


Imbuf module: some small refactoring and removing a lot of unused or old code
(about 6.5k lines).

* Added a ImFileType struct with callbacks to make adding an file format type,
  or making changes to the API easier.
* Move imbuf init/exit code into IMB_init()/IMB_exit() functions.
* Increased mipmap levels from 10 to 20, you run into this limit already with
  a 2k image.
* Removed hamx, amiga, anim5 format support.
* Removed colormap saving, only simple colormap code now for reading tga.
* Removed gen_dynlibtiff.py, editing this is almost as much work as just
  editing the code directly.
* Functions removed that were only used for sequencer plugin API:
  IMB_anim_nextpic, IMB_clever_double, IMB_antialias, IMB_gamwarp,
  IMB_scalefieldImBuf, IMB_scalefastfieldImBuf, IMB_onethird, IMB_halflace,
  IMB_dit0, IMB_dit2, IMB_cspace
* Write metadata info into OpenEXR images. Can be viewed with the command
  line utility 'exrheader'

For the image tile cache code, see this page:
http://wiki.blender.org/index.php/Dev:2.5/Source/Imaging/ImageTileCache

1 files changed, 3 insertions, 16 deletions

diff --git a/source/blender/imbuf/intern/IMB_anim.h b/source/blender/imbuf/intern/IMB_anim.h
index 39b8e48fb7f..c9eac2c1399 100644
--- a/source/blender/imbuf/intern/IMB_anim.h
+++ b/source/blender/imbuf/intern/IMB_anim.h
@@ -65,7 +65,6 @@
 							BLI_countlist BLI_stringdec */
 
 #include "imbuf.h"
-#include "imbuf_patch.h"
 
 #include "AVI_avi.h"
 
@@ -93,7 +92,6 @@
 #include "IMB_imbuf.h"
 
 #include "IMB_allocimbuf.h"
-#include "IMB_bitplanes.h"
 
 
 
@@ -117,7 +115,7 @@
 #define ANIM_NONE		(0)
 #define ANIM_SEQUENCE		(1 << 0)
 #define ANIM_DIR		(1 << 1)
-#define ANIM_ANIM5		(1 << 2)
+#define ANIM_DEPRECATED	(1 << 2)
 #define ANIM_TGA		(1 << 3)
 #define ANIM_MOVIE		(1 << 4)
 #define ANIM_MDEC		(1 << 5)
@@ -126,13 +124,10 @@
 #define ANIM_FFMPEG             (1 << 8)
 #define ANIM_REDCODE            (1 << 9)
 
-#define ANIM5_MMAP		0
-#define ANIM5_MALLOC		1
-#define ANIM5_SNGBUF		2
-#define ANIM5_XOR		4
-
 #define MAXNUMSTREAMS		50
 
+struct _AviMovie;
+
 struct anim {
 	int ib_flags;
 	int curtype;
@@ -145,14 +140,6 @@ struct anim {
 		/* voor sequence */
 	char first[256];
 	
-		/* anim5 */
-	struct ListBase	anim5base;
-	void		* anim5mmap;
-	int		anim5len;
-	struct Anim5Delta *anim5curdlta;
-	void		(*anim5decode)(struct ImBuf *, unsigned char *);
-	int		anim5flags;
-	
 		/* movie */
 	void *movie;
 	void *track;