Index: core/src/fxcodec/codec/fx_codec_tiff.cpp |
diff --git a/core/src/fxcodec/codec/fx_codec_tiff.cpp b/core/src/fxcodec/codec/fx_codec_tiff.cpp |
index cf7af8fe779a6283b30edea8ef4b3a39ab301f84..3d157726df8d65aee41ec7cbf71141ba1dcd0456 100644 |
--- a/core/src/fxcodec/codec/fx_codec_tiff.cpp |
+++ b/core/src/fxcodec/codec/fx_codec_tiff.cpp |
@@ -9,7 +9,7 @@ |
#include "codec_int.h" |
extern "C" { |
-#include "third_party/tiff_v403/tiffiop.h" |
+#include "third_party/tiff_v406/tiffiop.h" |
} |
void* IccLib_CreateTransform_sRGB(const unsigned char* pProfileData, |
@@ -181,22 +181,10 @@ void _TIFFmemcpy(void* des, const void* src, tmsize_t size) { |
int _TIFFmemcmp(const void* ptr1, const void* ptr2, tmsize_t size) { |
return FXSYS_memcmp(ptr1, ptr2, (size_t)size); |
} |
-static void _tiff_warning_ext(thandle_t context, |
jun_fang
2016/01/07 03:55:17
I think that we should keep these two call-back fu
Lei Zhang
2016/01/07 04:05:04
If a developer needs to debug, they can easily add
jun_fang
2016/01/07 04:11:20
The original idea was that libtiff found errors an
Lei Zhang
2016/01/07 23:52:15
If there is a real need to do this, we can always
|
- const char* module, |
- const char* fmt, |
- va_list ap) { |
- if (module != NULL) { |
- } |
-} |
-TIFFErrorHandlerExt _TIFFwarningHandlerExt = _tiff_warning_ext; |
-static void _tiff_error_ext(thandle_t context, |
- const char* module, |
- const char* fmt, |
- va_list ap) { |
- if (module != NULL) { |
- } |
-} |
-TIFFErrorHandlerExt _TIFFerrorHandlerExt = _tiff_error_ext; |
+ |
+TIFFErrorHandler _TIFFwarningHandler = nullptr; |
+TIFFErrorHandler _TIFFerrorHandler = nullptr; |
+ |
int TIFFCmyk2Rgb(thandle_t context, |
uint8 c, |
uint8 m, |