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/readimage.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/readimage.c')
| -rw-r--r-- | source/blender/imbuf/intern/readimage.c | 13 |
1 files changed, 0 insertions, 13 deletions
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"); } |