diff options
| author | Lei Zhang <thestig@chromium.org> | 2016-01-07 15:52:44 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2016-01-07 15:52:44 -0800 |
| commit | 9c2c87d1c7443b4eeb3e439af7dc34f695bbd2c8 (patch) | |
| tree | d40131c4030f331b224abcd0efe707767f58fd75 /core/src/fxcodec/codec | |
| parent | 0aec19b09e48097df6096802f70daeb53d348c79 (diff) | |
| download | pdfium-9c2c87d1c7443b4eeb3e439af7dc34f695bbd2c8.tar.xz | |
XFA: Upgrade to libtiff 4.0.6.
R=jun_fang@foxitsoftware.com, tsepez@chromium.org
Review URL: https://codereview.chromium.org/1563103002 .
Diffstat (limited to 'core/src/fxcodec/codec')
| -rw-r--r-- | core/src/fxcodec/codec/fx_codec_tiff.cpp | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/core/src/fxcodec/codec/fx_codec_tiff.cpp b/core/src/fxcodec/codec/fx_codec_tiff.cpp index cf7af8fe77..51a443bc3d 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/libtiff/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,
- 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,
|