diff options
| author | Damien Plisson <damien.plisson@yahoo.fr> | 2009-11-02 14:20:31 +0300 |
|---|---|---|
| committer | Damien Plisson <damien.plisson@yahoo.fr> | 2009-11-02 14:20:31 +0300 |
| commit | 3b43a5228e37e8cb79063474295a951c423497b3 (patch) | |
| tree | 42c4ef998bf36a442d3848a4e0c45909376da45e /source/blender/imbuf/intern/readimage.c | |
| parent | da1765765baf3bc84059548a43beec0c3a1c2d41 (diff) | |
Mac / COCOA :
- revert tiff load/save to use standard libtiff (to ensure 100% colorimetry & alpha interpretation across platforms)
- include patch #18720 to fix load of libtiff dynlib (if present on system)
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; |