diff options
author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-11-02 20:35:23 +0300 |
---|---|---|
committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-11-02 20:35:23 +0300 |
commit | 985e784ae899c564eaeb9f30a9f653db4cf81b61 (patch) | |
tree | c047c1c4aae1f583080c6476486e9f1e55d726ca /source/blender/imbuf/intern/readimage.c | |
parent | 91fcccc3ad5fd907ebba816797e35199757f2d18 (diff) | |
parent | 31258507d047d6594a97fc99496855d6d1a83d5b (diff) |
Merge from trunk -r 24182:24247. Skipped change 24182 (merge of this branch into trunk).
Diffstat (limited to 'source/blender/imbuf/intern/readimage.c')
-rw-r--r-- | source/blender/imbuf/intern/readimage.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/imbuf/intern/readimage.c b/source/blender/imbuf/intern/readimage.c index 5003127dfb6..f248e6bb6c4 100644 --- a/source/blender/imbuf/intern/readimage.c +++ b/source/blender/imbuf/intern/readimage.c @@ -57,7 +57,7 @@ #include "IMB_dpxcineon.h" #include "BKE_global.h" -#if defined(__APPLE__) && defined(GHOST_COCOA) +#if defined(__APPLE__) && defined(IMBUF_COCOA) #include "IMB_cocoa.h" #else #include "IMB_tiff.h" @@ -157,7 +157,7 @@ ImBuf *IMB_ibImageFromMemory(int *mem, int size, int flags) { ibuf = imb_loadcineon((uchar *)mem, size, flags); if (ibuf) return(ibuf); -#if defined(__APPLE__) && defined(GHOST_COCOA) +#if defined(__APPLE__) && defined(IMBUF_COCOA) ibuf = imb_cocoaLoadImage((uchar *)mem, size, flags); if(ibuf) { ibuf->ftype = TIF; |