Removed a couple of redundant "FTF_api.h" includes,

removed leftovers from Freeimage/Imagemagick experiments
and removed stuff from a Quicktime for linux implementation.

Also removed the (win32) Fullscreen button from the UI and
disabled the corresponding commandline option. The code is
still present to reenable the option whenever the ATI issues
get solved.

5 files changed, 1 insertions, 75 deletions

diff --git a/source/blender/imbuf/IMB_imbuf_types.h b/source/blender/imbuf/IMB_imbuf_types.h
index a257e475e4e..7afcc42f361 100644
--- a/source/blender/imbuf/IMB_imbuf_types.h
+++ b/source/blender/imbuf/IMB_imbuf_types.h
@@ -146,12 +146,6 @@ typedef enum {
 #ifdef WITH_QUICKTIME
 #define QUICKTIME	(1 << 25)
 #endif
-#ifdef WITH_FREEIMAGE
-#define FREEIMAGE	(1 << 24)
-#endif
-#ifdef WITH_IMAGEMAGICK
-#define IMAGEMAGICK	(1 << 23)
-#endif
 
 #define RAWTGA	        (TGA | 1)
 
diff --git a/source/blender/imbuf/intern/IMB_anim.h b/source/blender/imbuf/intern/IMB_anim.h
index 8b81ca70608..77958f82e42 100644
--- a/source/blender/imbuf/intern/IMB_anim.h
+++ b/source/blender/imbuf/intern/IMB_anim.h
@@ -76,9 +76,6 @@
 #if defined(_WIN32) || defined(__APPLE__)
 #include "quicktime_import.h"
 #endif /* _WIN32 || __APPLE__ */
-#ifdef linux
-#include "quicktime_import_linux.h"
-#endif /* linux */
 #endif /* WITH_QUICKTIME */
 
 #include "IMB_imbuf_types.h"
diff --git a/source/blender/imbuf/intern/anim.c b/source/blender/imbuf/intern/anim.c
index c11a56d2abf..284339ece48 100644
--- a/source/blender/imbuf/intern/anim.c
+++ b/source/blender/imbuf/intern/anim.c
@@ -75,9 +75,6 @@
 #if defined(_WIN32) || defined(__APPLE__)
 #include "quicktime_import.h"
 #endif /* _WIN32 || __APPLE__ */
-#ifdef linux
-#include "quicktime_import_linux.h"
-#endif /* linux */
 #endif /* WITH_QUICKTIME */
 
 #include "IMB_imbuf_types.h"
diff --git a/source/blender/imbuf/intern/readimage.c b/source/blender/imbuf/intern/readimage.c
index e9ae51a8422..bbb423fa2d2 100644
--- a/source/blender/imbuf/intern/readimage.c
+++ b/source/blender/imbuf/intern/readimage.c
@@ -55,13 +55,8 @@
 #ifdef WITH_QUICKTIME
 #if defined(_WIN32) || defined (__APPLE__)
 #include "quicktime_import.h"
-#elif defined (__linux__)
-#include "quicktime_import_linux.h"
 #endif
 #endif
-#ifdef WITH_FREEIMAGE
-#include "IMB_freeimage.h"
-#endif
 
 /* actually hard coded endianness */
 #define GET_BIG_LONG(x) (((uchar *) (x))[0] << 24 | ((uchar *) (x))[1] << 16 | ((uchar *) (x))[2] << 8 | ((uchar *) (x))[3])
@@ -150,14 +145,6 @@ ImBuf *IMB_ibImageFromMemory(int *mem, int size, int flags) {
 		}
 #endif
 #endif	
-#ifdef WITH_FREEIMAGE
-		ibuf = imb_freeimage_decode((uchar *)mem, size, flags);
-		if (ibuf) return(ibuf);
-#endif	
-#ifdef WITH_IMAGEMAGICK
-		ibuf = imb_imagick_decode((uchar *)mem, size, flags);
-		if (ibuf) return(ibuf);
-#endif	
 
 		if (IB_verbose) fprintf(stderr, "Unknown fileformat\n");
 	}
diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c
index ddd81d55b68..8863097a8ba 100644
--- a/source/blender/imbuf/intern/util.c
+++ b/source/blender/imbuf/intern/util.c
@@ -51,13 +51,6 @@
 #ifdef WITH_QUICKTIME
 #include "quicktime_import.h"
 #endif
-#ifdef WITH_FREEIMAGE
-#include "IMB_freeimage.h"
-#endif
-#ifdef WITH_IMAGEMAGICK
-#include "IMB_imagemagick.h"
-#endif
-
 
 #define UTIL_DEBUG 0
 
@@ -114,14 +107,6 @@ static int IMB_ispic_name(char *name)
 #endif
 #endif
 
-#ifdef WITH_FREEIMAGE
-				if (imb_is_a_freeimage(name)) return(FREEIMAGE);
-#endif
-
-#ifdef WITH_IMAGEMAGICK
-				if (imb_is_imagick(name)) return(IMAGEMAGICK);
-#endif
-
 				return(FALSE);
 			}
 			close(fp);
@@ -152,21 +137,6 @@ int IMB_ispic(char *filename)
 				||	BLI_testextensie(filename, ".pict")
 				||	BLI_testextensie(filename, ".pntg") //macpaint
 				||	BLI_testextensie(filename, ".qtif")
-#if defined(WITH_FREEIMAGE) || defined (WITH_IMAGEMAGICK) //nasty for now
-				||	BLI_testextensie(filename, ".jng")
-				||	BLI_testextensie(filename, ".mng")
-				||	BLI_testextensie(filename, ".pbm")
-				||	BLI_testextensie(filename, ".pgm")
-				||	BLI_testextensie(filename, ".ppm")
-				||	BLI_testextensie(filename, ".wbmp")
-				||	BLI_testextensie(filename, ".cut")
-				||	BLI_testextensie(filename, ".ico")
-				||	BLI_testextensie(filename, ".koa")
-				||	BLI_testextensie(filename, ".koala")
-				||	BLI_testextensie(filename, ".pcd")
-				||	BLI_testextensie(filename, ".pcx")
-				||	BLI_testextensie(filename, ".ras")
-#endif
 				||	BLI_testextensie(filename, ".sgi")) {
 				return IMB_ispic_name(filename);
 			} else {
@@ -181,26 +151,7 @@ int IMB_ispic(char *filename)
 				||	BLI_testextensie(filename, ".png")
 				||	BLI_testextensie(filename, ".iff")
 				||	BLI_testextensie(filename, ".lbm")
-#if defined(WITH_FREEIMAGE) || defined (WITH_IMAGEMAGICK) //nasty for now
-				||	BLI_testextensie(filename, ".jng")
-				||	BLI_testextensie(filename, ".mng")
-				||	BLI_testextensie(filename, ".pbm")
-				||	BLI_testextensie(filename, ".pgm")
-				||	BLI_testextensie(filename, ".ppm")
-				||	BLI_testextensie(filename, ".wbmp")
-				||	BLI_testextensie(filename, ".cut")
-				||	BLI_testextensie(filename, ".ico")
-				||	BLI_testextensie(filename, ".koa")
-				||	BLI_testextensie(filename, ".koala")
-				||	BLI_testextensie(filename, ".pcd")
-				||	BLI_testextensie(filename, ".pcx")
-				||	BLI_testextensie(filename, ".ras")
-				||	BLI_testextensie(filename, ".gif")
-				||	BLI_testextensie(filename, ".psd")
-				||	BLI_testextensie(filename, ".tif")
-				||	BLI_testextensie(filename, ".tiff")
-#endif
-			||	BLI_testextensie(filename, ".sgi")) {
+				||	BLI_testextensie(filename, ".sgi")) {
 				return IMB_ispic_name(filename);
 			}
 			else  {