Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/imbuf/intern/readimage.c')
-rw-r--r--source/blender/imbuf/intern/readimage.c13
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");
}