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.

22 files changed, 33 insertions, 170 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  {
diff --git a/source/blender/include/BIF_space.h b/source/blender/include/BIF_space.h
index c86a95f91a5..c34cafd4b81 100644
--- a/source/blender/include/BIF_space.h
+++ b/source/blender/include/BIF_space.h
@@ -111,7 +111,8 @@ extern 		void BIF_undo(void);
 extern 		void BIF_redo(void);
 extern 		void BIF_undo_menu(void);
 
-#ifdef _WIN32	// FULLSCREEN
+#if 0
+//#ifdef _WIN32	// FULLSCREEN
 extern		 void mainwindow_toggle_fullscreen(int fullscreen);
 #endif
 
diff --git a/source/blender/src/buttons_scene.c b/source/blender/src/buttons_scene.c
index 46e66c93a2b..3b0a4db93cb 100644
--- a/source/blender/src/buttons_scene.c
+++ b/source/blender/src/buttons_scene.c
@@ -562,7 +562,6 @@ void do_render_panels(unsigned short event)
 		allqueue(REDRAWVIEWCAM, 0);
 		break;
 
-#ifdef WITH_QUICKTIME
 	case B_FILETYPEMENU:
 		allqueue(REDRAWBUTSSCENE, 0);
 #if defined (_WIN32) || defined (__APPLE__)
@@ -575,61 +574,21 @@ void do_render_panels(unsigned short event)
 		} else {
 		  break;
 		}
-#else /* libquicktime */
-		if(G.scene->r.imtype == R_QUICKTIME) {
-			/* i'm not sure if this should be here... */
-			/* set default quicktime codec */
-			if (!G.scene->r.qtcodecdata) {
-				G.scene->r.qtcodecdata = MEM_callocN(sizeof(QtCodecData),   "QtCodecData");
-				qtcodec_idx = 1;
-			}
-			
-			qt_init_codecs();
-			if (qtcodec_idx < 1) qtcodec_idx = 1;	
-			
-			G.scene->r.qtcodecdata->fourcc =  qtcodecidx_to_fcc(qtcodec_idx-1);
-			qt_init_codecdata(G.scene->r.qtcodecdata);
-/* I'm not sure if this is really needed, so don't remove it yet */
-#if 0
-			/* get index of codec that can handle a given fourcc */
-			if (qtcodec_idx < 1)
-				qtcodec_idx = get_qtcodec_idx(G.scene->r.qtcodecdata->fourcc)+1;
-
-			/* no suitable codec found, alert user */
-			if (qtcodec_idx < -1) {
-				error("no suitable codec found!");
-				qtcodec_idx = 1;
-			}
-#endif /* 0 */
-		}
 #endif /*_WIN32 || __APPLE__ */
 
 	case B_SELECTCODEC:
 #if defined (_WIN32) || defined (__APPLE__)
 		if ((G.scene->r.imtype == R_QUICKTIME)) { /* || (G.scene->r.qtcodecdata)) */
+#ifdef WITH_QUICKTIME
 			get_qtcodec_settings();
+#endif /* WITH_QUICKTIME */
 		}
 #ifdef _WIN32
 		else
 			get_avicodec_settings();
 #endif /* _WIN32 */
-#else /* libquicktime */
-		if (!G.scene->r.qtcodecdata) {
-			G.scene->r.qtcodecdata = MEM_callocN(sizeof(QtCodecData),  "QtCodecData");
-			qtcodec_idx = 1;
-		}
-		if (qtcodec_idx < 1) {
-			qtcodec_idx = 1;
-			qt_init_codecs();
-		}
-
-		G.scene->r.qtcodecdata->fourcc = qtcodecidx_to_fcc(qtcodec_idx-1);
-		/* if the selected codec differs from the previous one, reinit it */
-		qt_init_codecdata(G.scene->r.qtcodecdata);	
-		allqueue(REDRAWBUTSSCENE, 0);
 #endif /* _WIN32 || __APPLE__ */
 		break;
-#endif /* WITH_QUICKTIME */
 
 	case B_PR_FULL:
 		G.scene->r.xsch= 1280;
@@ -1248,21 +1207,7 @@ static void render_panel_format(void)
 			else
 				uiDefBut(block, LABEL, 0, G.scene->r.qtcodecdata->qtcodecname,  892,yofs+44,225,20, 0, 0, 0, 0, 0, "");
 			uiDefBut(block, BUT,B_SELECTCODEC, "Set codec",  892,yofs,112,20, 0, 0, 0, 0, 0, "Set codec settings for Quicktime");
-#else /* libquicktime */
-			if (!G.scene->r.qtcodecdata) G.scene->r.qtcodecdata = MEM_callocN(sizeof(QtCodecData), "QtCodecData");
-			uiDefButI(block, MENU, B_SELECTCODEC, qtcodecs_pup(), 892,yofs, 112, 20, &qtcodec_idx, 0, 0, 0, 0, "Codec");
-			/* make sure the codec stored in G.scene->r.qtcodecdata matches the selected
-			 * one, especially if it's not set.. */
-			if (!G.scene->r.qtcodecdata->fourcc) {
-				G.scene->r.qtcodecdata->fourcc = qtcodecidx_to_fcc(qtcodec_idx-1);
-				qt_init_codecdata(G.scene->r.qtcodecdata);	
-			}
-
-			yofs -= 22;
-			uiDefBlockBut(block, qtcodec_menu, NULL, "Codec Settings", 892,yofs, 227, 20, "Edit Codec settings for QuickTime");
-			yofs +=22;
-
-#endif /* libquicktime */
+#endif
 #endif /* WITH_QUICKTIME */
 		} else {
 #ifdef _WIN32
diff --git a/source/blender/src/drawimasel.c b/source/blender/src/drawimasel.c
index 0058019c491..e0116459eff 100644
--- a/source/blender/src/drawimasel.c
+++ b/source/blender/src/drawimasel.c
@@ -424,9 +424,6 @@ static void str_image_type(int ftype, char *name)
 #ifdef WITH_QUICKTIME
 	if( ftype & QUICKTIME ) { strcat(name, "quicktime "); }
 #endif
-#ifdef WITH_FREEIMAGE
-	if( ftype & FREEIMAGE ) { strcat(name, "freeimage "); }
-#endif
 }
 
 void draw_sima_area(SpaceImaSel *simasel)
diff --git a/source/blender/src/editscreen.c b/source/blender/src/editscreen.c
index 1624ae77b00..eaabd686487 100644
--- a/source/blender/src/editscreen.c
+++ b/source/blender/src/editscreen.c
@@ -1253,7 +1253,8 @@ void screenmain(void)
 	}
 }
 
-#ifdef _WIN32	// FULLSCREEN
+#if 0
+//#ifdef _WIN32	// FULLSCREEN
 void mainwindow_toggle_fullscreen(int fullscreen){
 	if (fullscreen) U.uiflag |= USER_FLIPFULLSCREEN;
 	else U.uiflag &= ~USER_FLIPFULLSCREEN;
@@ -1882,7 +1883,8 @@ static bScreen *addscreen(char *name)		/* use setprefsize() if you want somethin
 	sc->scene= G.scene;
 	
   	if (!mainwin) {
-#ifdef _WIN32	// FULLSCREEN
+#if 0
+//#ifdef _WIN32	// FULLSCREEN
 		if (G.windowstate == G_WINDOWSTATE_FULLSCREEN)
 			mainwin= window_open("Blender", sc->startx, sc->starty, sc->sizex, sc->sizey, G_WINDOWSTATE_FULLSCREEN);
 		else
diff --git a/source/blender/src/ghostwinlay.c b/source/blender/src/ghostwinlay.c
index 154be0bb4dd..4699b587853 100644
--- a/source/blender/src/ghostwinlay.c
+++ b/source/blender/src/ghostwinlay.c
@@ -330,9 +330,9 @@ Window *window_open(char *title, int posx, int posy, int sizex, int sizey, int s
 		GHOST_kWindowStateFullScreen:GHOST_kWindowStateNormal;
 #else
 #ifdef _WIN32	// FULLSCREEN
-	if (start_maximized == G_WINDOWSTATE_FULLSCREEN)
-		inital_state= GHOST_kWindowStateFullScreen;
-	else
+//	if (start_maximized == G_WINDOWSTATE_FULLSCREEN)
+//		inital_state= GHOST_kWindowStateFullScreen;
+//	else
 		inital_state= start_maximized?GHOST_kWindowStateMaximized:GHOST_kWindowStateNormal;
 #else			// APPLE
 	inital_state= start_maximized?GHOST_kWindowStateMaximized:GHOST_kWindowStateNormal;
@@ -726,7 +726,8 @@ void window_raise(Window *win) {
 #endif
 }
 
-#ifdef _WIN32	//FULLSCREEN
+#if 0
+//#ifdef _WIN32	//FULLSCREEN
 void window_toggle_fullscreen(Window *win, int fullscreen) {
 	/* these two lines make sure front and backbuffer are equal. for swapbuffers */
 	markdirty_all();
diff --git a/source/blender/src/header_imasel.c b/source/blender/src/header_imasel.c
index de845fdfaf7..68e47a97420 100644
--- a/source/blender/src/header_imasel.c
+++ b/source/blender/src/header_imasel.c
@@ -45,9 +45,6 @@
 
 #include "BMF_Api.h"
 #include "BIF_language.h"
-#ifdef INTERNATIONAL
-#include "FTF_Api.h"
-#endif
 
 #include "DNA_ID.h"
 #include "DNA_screen_types.h"
diff --git a/source/blender/src/header_info.c b/source/blender/src/header_info.c
index 3afbf59e750..ccd4defd45c 100644
--- a/source/blender/src/header_info.c
+++ b/source/blender/src/header_info.c
@@ -1913,7 +1913,8 @@ BIF_SetScale(block->aspect);
 	/* always do as last */
 	curarea->headbutlen= xco+2*XIC;
 
-#ifdef _WIN32	// FULLSCREEN
+#if 0
+// #ifdef _WIN32	// FULLSCREEN
 	if(U.uiflag & USER_FLIPFULLSCREEN) {
 		uiDefIconBut(block, BUT, B_FLIPFULLSCREEN, ICON_WINDOW_WINDOW,
 				(short)(curarea->winx-XIC-5), 0,XIC,YIC,
diff --git a/source/blender/src/header_oops.c b/source/blender/src/header_oops.c
index 3460ac7a05e..6ca3aed0134 100644
--- a/source/blender/src/header_oops.c
+++ b/source/blender/src/header_oops.c
@@ -45,9 +45,6 @@
 
 #include "BMF_Api.h"
 #include "BIF_language.h"
-#ifdef INTERNATIONAL
-#include "FTF_Api.h"
-#endif
 
 #include "DNA_ID.h"
 #include "DNA_oops_types.h"
diff --git a/source/blender/src/header_seq.c b/source/blender/src/header_seq.c
index 2f506eb2683..59c7b9ceacf 100644
--- a/source/blender/src/header_seq.c
+++ b/source/blender/src/header_seq.c
@@ -45,9 +45,6 @@
 
 #include "BMF_Api.h"
 #include "BIF_language.h"
-#ifdef INTERNATIONAL
-#include "FTF_Api.h"
-#endif
 
 #include "DNA_ID.h"
 #include "DNA_scene_types.h"
diff --git a/source/blender/src/header_sound.c b/source/blender/src/header_sound.c
index 53cf5589f74..77a1853e63c 100644
--- a/source/blender/src/header_sound.c
+++ b/source/blender/src/header_sound.c
@@ -45,9 +45,6 @@
 
 #include "BMF_Api.h"
 #include "BIF_language.h"
-#ifdef INTERNATIONAL
-#include "FTF_Api.h"
-#endif
 
 #include "DNA_ID.h"
 #include "DNA_screen_types.h"
diff --git a/source/blender/src/header_text.c b/source/blender/src/header_text.c
index 3dec21b90ab..9478d28f4be 100644
--- a/source/blender/src/header_text.c
+++ b/source/blender/src/header_text.c
@@ -45,9 +45,6 @@
 
 #include "BMF_Api.h"
 #include "BIF_language.h"
-#ifdef INTERNATIONAL
-#include "FTF_Api.h"
-#endif
 
 #include "BSE_headerbuttons.h"
 
diff --git a/source/blender/src/header_view3d.c b/source/blender/src/header_view3d.c
index 664ee10bbc2..2a94483ca58 100644
--- a/source/blender/src/header_view3d.c
+++ b/source/blender/src/header_view3d.c
@@ -44,9 +44,6 @@
 
 #include "BMF_Api.h"
 #include "BIF_language.h"
-#ifdef INTERNATIONAL
-#include "FTF_Api.h"
-#endif
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/src/headerbuttons.c b/source/blender/src/headerbuttons.c
index 445fa6db8e1..0c0483ecb52 100644
--- a/source/blender/src/headerbuttons.c
+++ b/source/blender/src/headerbuttons.c
@@ -1466,7 +1466,8 @@ void do_global_buttons(unsigned short event)
 		scrarea_queue_headredraw(curarea);
 		break;
 
-#ifdef _WIN32 // FULLSCREEN
+#if 0
+//#ifdef _WIN32 // FULLSCREEN
 	case B_FLIPFULLSCREEN:
 		if(U.uiflag & USER_FLIPFULLSCREEN)
 			U.uiflag &= ~USER_FLIPFULLSCREEN;
diff --git a/source/blender/src/toets.c b/source/blender/src/toets.c
index 0aac38c58cf..f5d0d7a98f9 100644
--- a/source/blender/src/toets.c
+++ b/source/blender/src/toets.c
@@ -682,7 +682,8 @@ int blenderqread(unsigned short event, short val)
 	case DOWNARROWKEY:
 		if(textediting==0 && textspace==0) {
 
-#ifdef _WIN32	// FULLSCREEN
+#if 0
+//#ifdef _WIN32	// FULLSCREEN
 			if(event==DOWNARROWKEY){
 				if (G.qual==LR_ALTKEY)
 					mainwindow_toggle_fullscreen(0);
@@ -709,7 +710,8 @@ int blenderqread(unsigned short event, short val)
 	case UPARROWKEY:
 		if(textediting==0 && textspace==0) {
 
-#ifdef _WIN32	// FULLSCREEN
+#if 0
+//#ifdef _WIN32	// FULLSCREEN
 			if(event==UPARROWKEY){ 
 				if(G.qual==LR_ALTKEY)
 					mainwindow_toggle_fullscreen(1);
diff --git a/source/blender/src/usiblender.c b/source/blender/src/usiblender.c
index e132c13756f..6a97cad660d 100644
--- a/source/blender/src/usiblender.c
+++ b/source/blender/src/usiblender.c
@@ -263,7 +263,8 @@ int BIF_read_homefile(void)
 	char tstr[FILE_MAXDIR+FILE_MAXFILE], scestr[FILE_MAXDIR];
 	char *home= BLI_gethome();
 	int success;
-#ifdef _WIN32	// FULLSCREEN
+#if 0
+//#ifdef _WIN32	// FULLSCREEN
 	static int screenmode = -1;
 	
 	screenmode = U.uiflag & USER_FLIPFULLSCREEN;
@@ -282,7 +283,8 @@ int BIF_read_homefile(void)
 	}
 	strcpy(G.sce, scestr);
 	
-#ifdef _WIN32	// FULLSCREEN
+#if 0
+//#ifdef _WIN32	// FULLSCREEN
 	/* choose window startmode */
 	switch (G.windowstate){
 		case G_WINDOWSTATE_USERDEF: /* use the usersetting */
diff --git a/source/blender/src/winlay.h b/source/blender/src/winlay.h
index 7427f06e9ff..cd599fb3914 100644
--- a/source/blender/src/winlay.h
+++ b/source/blender/src/winlay.h
@@ -46,7 +46,8 @@ void	window_set_timer	(Window *win, int delay_ms, int event);
 void	window_make_active	(Window *win);
 void	window_swap_buffers	(Window *win);
 
-#ifdef _WIN32	// FULLSCREEN
+#if 0
+//#ifdef _WIN32	// FULLSCREEN
 void 	window_toggle_fullscreen(Window *win, int fullscreen);
 #endif
 
diff --git a/source/creator/creator.c b/source/creator/creator.c
index 377e91400ad..6875a4ace89 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -402,13 +402,15 @@ int main(int argc, char **argv)
 					 */ 
 					winlay_get_screensize(&sizx, &sizy);
 					setprefsize(0, 0, sizx, sizy);
-#ifdef _WIN32	// FULLSCREEN
+#if 0
+//#ifdef _WIN32	// FULLSCREEN
 					G.windowstate = G_WINDOWSTATE_BORDER;
 #endif
 					break;
 				case 'W':
 						/* XXX, fixme zr, borderless on win32 */
-#ifdef _WIN32	// FULLSCREEN
+#if 0
+//#ifdef _WIN32	// FULLSCREEN
 					G.windowstate = G_WINDOWSTATE_FULLSCREEN;
 #endif
 					break;