build options to disable image formats WITH_CINEON, WITH_HDR.

- updated cmake, make & scons.
- renamed CMake build options WITH_TIFF -> WITH_IMAGE_TIFF, same for DDS, OPENJPEG etc.

4 files changed, 57 insertions, 12 deletions

diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index bcd60154379..fbd75a79fd7 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -46,21 +46,29 @@ IF(WITH_BULLET)
 	ADD_DEFINITIONS(-DUSE_BULLET)
 ENDIF(WITH_BULLET)
 
-IF(WITH_OPENEXR)
+IF(WITH_IMAGE_OPENEXR)
 	ADD_DEFINITIONS(-DWITH_OPENEXR)
-ENDIF(WITH_OPENEXR)
+ENDIF(WITH_IMAGE_OPENEXR)
 
-IF(WITH_TIFF)
+IF(WITH_IMAGE_TIFF)
 	ADD_DEFINITIONS(-DWITH_TIFF)
-ENDIF(WITH_TIFF)
+ENDIF(WITH_IMAGE_TIFF)
 
-IF(WITH_OPENJPEG)
+IF(WITH_IMAGE_OPENJPEG)
 	ADD_DEFINITIONS(-DWITH_OPENJPEG)
-ENDIF(WITH_OPENJPEG)
+ENDIF(WITH_IMAGE_OPENJPEG)
 
-IF(WITH_DDS)
+IF(WITH_IMAGE_DDS)
 	ADD_DEFINITIONS(-DWITH_DDS)
-ENDIF(WITH_DDS)
+ENDIF(WITH_IMAGE_DDS)
+
+IF(WITH_IMAGE_CINEON)
+	ADD_DEFINITIONS(-DWITH_CINEON)
+ENDIF(WITH_IMAGE_CINEON)
+
+IF(WITH_IMAGE_HDR)
+	ADD_DEFINITIONS(-DWITH_HDR)
+ENDIF(WITH_IMAGE_HDR)
 
 IF(WITH_QUICKTIME)
 	SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
@@ -87,9 +95,9 @@ IF(WITH_OPENMP)
 		ADD_DEFINITIONS(-DPARALLEL=1)
 ENDIF(WITH_OPENMP)
 
-IF(NOT WITH_ELBEEM)
+IF(NOT WITH_FLUID)
 	ADD_DEFINITIONS(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_ELBEEM)
+ENDIF(NOT WITH_FLUID)
 
 IF(WITH_LZO)
 	SET(INC ${INC} ../../../extern/lzo/minilzo)
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript
index a6705653769..9f5027f801d 100644
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -47,6 +47,12 @@ if env['WITH_BF_OPENJPEG']:
 if env['WITH_BF_DDS']:
 	defs.append('WITH_DDS')
 
+if env['WITH_BF_CINEON']:
+	defs.append('WITH_CINEON')
+
+if env['WITH_BF_HDR']:
+	defs.append('WITH_HDR')
+
 if env['WITH_BF_FFMPEG']:
 	defs.append('WITH_FFMPEG')
 	incs += ' ' + env['BF_FFMPEG_INC']
diff --git a/source/blender/blenkernel/intern/Makefile b/source/blender/blenkernel/intern/Makefile
index 15c022592f9..7a4eb52326a 100644
--- a/source/blender/blenkernel/intern/Makefile
+++ b/source/blender/blenkernel/intern/Makefile
@@ -136,6 +136,14 @@ ifeq ($(WITH_TIFF), true)
     CPPFLAGS += -DWITH_TIFF
 endif
 
+ifeq ($(WITH_CINEON), true)
+    CPPFLAGS += -DWITH_CINEON
+endif
+
+ifeq ($(WITH_HDR), true)
+    CPPFLAGS += -DWITH_HDR
+endif
+
 ifeq ($(OS), darwin)
     ifeq ($(WITH_BF_OPENMP), true)
       CPPFLAGS += -DPARALLEL=1
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 77607ae25b6..d2612e90945 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -660,8 +660,10 @@ int BKE_imtype_to_ftype(int imtype)
 		return TGA;
 	else if(imtype== R_IRIS) 
 		return IMAGIC;
+#ifdef WITH_HDR
 	else if (imtype==R_RADHDR)
 		return RADHDR;
+#endif
 	else if (imtype==R_PNG)
 		return PNG;
 #ifdef WITH_DDS
@@ -670,14 +672,18 @@ int BKE_imtype_to_ftype(int imtype)
 #endif
 	else if (imtype==R_BMP)
 		return BMP;
+#ifdef WITH_TIFF
 	else if (imtype==R_TIFF)
 		return TIF;
+#endif
 	else if (imtype==R_OPENEXR || imtype==R_MULTILAYER)
 		return OPENEXR;
+#ifdef WITH_CINEON
 	else if (imtype==R_CINEON)
 		return CINEON;
 	else if (imtype==R_DPX)
 		return DPX;
+#endif
 	else if (imtype==R_TARGA)
 		return TGA;
 	else if(imtype==R_RAWTGA)
@@ -696,8 +702,10 @@ int BKE_ftype_to_imtype(int ftype)
 		return TGA;
 	else if(ftype == IMAGIC) 
 		return R_IRIS;
+#ifdef WITH_HDR
 	else if (ftype & RADHDR)
 		return R_RADHDR;
+#endif
 	else if (ftype & PNG)
 		return R_PNG;
 #ifdef WITH_DDS
@@ -706,14 +714,18 @@ int BKE_ftype_to_imtype(int ftype)
 #endif
 	else if (ftype & BMP)
 		return R_BMP;
+#ifdef WITH_TIFF
 	else if (ftype & TIF)
 		return R_TIFF;
+#endif
 	else if (ftype & OPENEXR)
 		return R_OPENEXR;
+#ifdef WITH_CINEON
 	else if (ftype & CINEON)
 		return R_CINEON;
 	else if (ftype & DPX)
 		return R_DPX;
+#endif
 	else if (ftype & TGA)
 		return R_TARGA;
 	else if(ftype & RAWTGA)
@@ -756,10 +768,12 @@ void BKE_add_image_extension(char *string, int imtype)
 		if(!BLI_testextensie(string, ".rgb"))
 			extension= ".rgb";
 	}
+#ifdef WITH_HDR
 	else if(imtype==R_RADHDR) {
 		if(!BLI_testextensie(string, ".hdr"))
 			extension= ".hdr";
 	}
+#endif
 	else if (ELEM5(imtype, R_PNG, R_FFMPEG, R_H264, R_THEORA, R_XVID)) {
 		if(!BLI_testextensie(string, ".png"))
 			extension= ".png";
@@ -790,6 +804,7 @@ void BKE_add_image_extension(char *string, int imtype)
 			extension= ".exr";
 	}
 #endif
+#ifdef WITH_CINEON
 	else if(imtype==R_CINEON){
 		if (!BLI_testextensie(string, ".cin"))
 			extension= ".cin";
@@ -798,6 +813,7 @@ void BKE_add_image_extension(char *string, int imtype)
 		if (!BLI_testextensie(string, ".dpx"))
 			extension= ".dpx";
 	}
+#endif
 	else if(imtype==R_TARGA) {
 		if(!BLI_testextensie(string, ".tga"))
 			extension= ".tga";
@@ -1180,12 +1196,17 @@ int BKE_write_ibuf(Scene *scene, ImBuf *ibuf, char *name, int imtype, int subimt
 {
 	int ok;
 	
-	if(imtype==0);
-	else if(imtype== R_IRIS) 
+	if(imtype==0) {
+		/* pass */
+	}
+	else if(imtype== R_IRIS) {
 		ibuf->ftype= IMAGIC;
+	}
+#ifdef WITH_HDR
 	else if ((imtype==R_RADHDR)) {
 		ibuf->ftype= RADHDR;
 	}
+#endif
 	else if (ELEM5(imtype, R_PNG, R_FFMPEG, R_H264, R_THEORA, R_XVID)) {
 		ibuf->ftype= PNG;
 
@@ -1221,12 +1242,14 @@ int BKE_write_ibuf(Scene *scene, ImBuf *ibuf, char *name, int imtype, int subimt
 		
 	}
 #endif
+#ifdef WITH_CINEON
 	else if (imtype==R_CINEON) {
 		ibuf->ftype = CINEON;
 	}
 	else if (imtype==R_DPX) {
 		ibuf->ftype = DPX;
 	}
+#endif
 	else if (imtype==R_TARGA) {
 		ibuf->ftype= TGA;
 	}