diff options
| author | davilla <davilla@4pi.com> | 2013-02-07 00:50:36 -0500 |
|---|---|---|
| committer | davilla <davilla@4pi.com> | 2013-02-07 01:20:21 -0500 |
| commit | 58333327bf1eafefeed0857210cc346696407d67 (patch) | |
| tree | 5c36e30e1a5238bf7b52f2510f3bee1932e4ce54 /lib/cximage-6.0 | |
| parent | e28aed30bbfc0da6972a50a8a8d42c41c9468253 (diff) | |
fixes #14030, osx x86_64 would crash on a throw, trying to open tiffs, basically cximage was referencing internal tiff headers instead of system headers, opps
Diffstat (limited to 'lib/cximage-6.0')
| -rw-r--r-- | lib/cximage-6.0/CxImage/tif_xfile.cpp | 6 | ||||
| -rw-r--r-- | lib/cximage-6.0/CxImage/ximatif.cpp | 2 | ||||
| -rw-r--r-- | lib/cximage-6.0/CxImage/ximatif.h | 4 |
3 files changed, 10 insertions, 2 deletions
diff --git a/lib/cximage-6.0/CxImage/tif_xfile.cpp b/lib/cximage-6.0/CxImage/tif_xfile.cpp index ac92c954b0..133a6563d0 100644 --- a/lib/cximage-6.0/CxImage/tif_xfile.cpp +++ b/lib/cximage-6.0/CxImage/tif_xfile.cpp @@ -11,7 +11,11 @@ #if CXIMAGE_SUPPORT_TIF +#ifdef _LINUX +#include <tiffio.h> +#else #include "../tiff/tiffiop.h" +#endif #include "xfile.h" @@ -92,8 +96,10 @@ _TIFFFdOpen(void* fd, const char* name, const char* mode) (thandle_t) fd, _tiffReadProcEx, _tiffWriteProcEx, _tiffSeekProcEx, _tiffCloseProcEx, _tiffSizeProcEx, _tiffMapProcEx, _tiffUnmapProcEx); +#ifndef _LINUX if (tif) tif->tif_fd = fd; +#endif return (tif); } diff --git a/lib/cximage-6.0/CxImage/ximatif.cpp b/lib/cximage-6.0/CxImage/ximatif.cpp index f2b14d02aa..0018fa98f2 100644 --- a/lib/cximage-6.0/CxImage/ximatif.cpp +++ b/lib/cximage-6.0/CxImage/ximatif.cpp @@ -11,8 +11,6 @@ #define FIX_16BPP_DARKIMG // + VK: if uncomment, dark 16bpp images are fixed -#include "../tiff/tiffio.h" - #define CVT(x) (((x) * 255L) / ((1L<<16)-1)) #define SCALE(x) (((x)*((1L<<16)-1))/255) #define CalculateLine(width,bitdepth) (((width * bitdepth) + 7) / 8) diff --git a/lib/cximage-6.0/CxImage/ximatif.h b/lib/cximage-6.0/CxImage/ximatif.h index 8886316cd7..d1c8e8e3c0 100644 --- a/lib/cximage-6.0/CxImage/ximatif.h +++ b/lib/cximage-6.0/CxImage/ximatif.h @@ -23,7 +23,11 @@ #if CXIMAGE_SUPPORT_TIF +#ifdef _LINUX +#include <tiffio.h> +#else #include "../tiff/tiffio.h" +#endif class DLL_EXP CxImageTIF: public CxImage { |