diff options
| author | Kent Mein <mein@cs.umn.edu> | 2006-01-10 19:52:21 +0300 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2006-01-10 19:52:21 +0300 |
| commit | daca2eb7875fa5e301d6cdd7d432aefeec6274ae (patch) | |
| tree | 6b8106ace5759290b5682aabb46912d0539cdd12 /source/blender/imbuf/intern | |
| parent | 35a103c403cea995982d95eec6e6229be33bef7b (diff) | |
ifdef check for WITH_OPENEXR was removed from readimage for some reason
causing building without OPENEXR to fail. (Hopefully this doesn't mess up
current scons stuff, shouldn't but I haven't tested it after latest
changes in scons)
(I also cleaned up the Makefile a tad so it didn't check twice for WITH_OPENEXR)
Kent
Diffstat (limited to 'source/blender/imbuf/intern')
| -rw-r--r-- | source/blender/imbuf/intern/Makefile | 5 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/readimage.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/imbuf/intern/Makefile b/source/blender/imbuf/intern/Makefile index 839bb4df4c3..6f8fc7d31bb 100644 --- a/source/blender/imbuf/intern/Makefile +++ b/source/blender/imbuf/intern/Makefile @@ -41,6 +41,7 @@ include nan_definitions.mk ifeq ($(WITH_OPENEXR), true) DIRS = openexr + CFLAGS += -DWITH_OPENEXR endif @@ -48,10 +49,6 @@ ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd linux openbsd solaris windo CFLAGS += -funsigned-char endif -ifeq ($(WITH_OPENEXR), true) - CFLAGS += -DWITH_OPENEXR -endif - CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(NAN_JPEG)/include diff --git a/source/blender/imbuf/intern/readimage.c b/source/blender/imbuf/intern/readimage.c index 117dd54cfdd..42b23dfb6e9 100644 --- a/source/blender/imbuf/intern/readimage.c +++ b/source/blender/imbuf/intern/readimage.c @@ -142,8 +142,10 @@ ImBuf *IMB_ibImageFromMemory(int *mem, int size, int flags) { ibuf = imb_loadhdr((uchar*)mem, size, flags); if (ibuf) return (ibuf); +#ifdef WITH_OPENEXR ibuf = imb_load_openexr((uchar *)mem, size, flags); if (ibuf) return (ibuf); +#endif #ifdef WITH_QUICKTIME #if defined(_WIN32) || defined (__APPLE__) |