diff options
| author | Rob Haarsma <phaseIV@zonnet.nl> | 2005-03-24 00:10:03 +0300 |
|---|---|---|
| committer | Rob Haarsma <phaseIV@zonnet.nl> | 2005-03-24 00:10:03 +0300 |
| commit | b86dc81cf346a6c54ab60d312169fb4882f44972 (patch) | |
| tree | e5bcf80f13367c16d365d50db862203cbcb20cbe /source/blender/imbuf/intern/util.c | |
| parent | 6be51da81af0212dc6ed7099dd9f514e5f3e7e3f (diff) | |
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.
Diffstat (limited to 'source/blender/imbuf/intern/util.c')
| -rw-r--r-- | source/blender/imbuf/intern/util.c | 51 |
1 files changed, 1 insertions, 50 deletions
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 { |