X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4a10ea8b13fd0851e71e6fa5ebbe5b93933be11e..97c7099a70fd3af6ac7bef7f420581c8801ba22d:/src/common/imagtiff.cpp

diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp
index 8c7d45a6fb..b7871ba994 100644
--- a/src/common/imagtiff.cpp
+++ b/src/common/imagtiff.cpp
@@ -11,18 +11,21 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
-#include "wx/defs.h"
-
 #if wxUSE_IMAGE && wxUSE_LIBTIFF
 
 #include "wx/imagtiff.h"
-#include "wx/bitmap.h"
-#include "wx/debug.h"
-#include "wx/log.h"
-#include "wx/app.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/intl.h"
+    #include "wx/bitmap.h"
+    #include "wx/module.h"
+#endif
+
 extern "C"
 {
     #include "tiff.h"
@@ -30,11 +33,13 @@ extern "C"
 }
 #include "wx/filefn.h"
 #include "wx/wfstream.h"
-#include "wx/intl.h"
-#include "wx/module.h"
 
 #ifndef TIFFLINKAGEMODE
-  #define TIFFLINKAGEMODE LINKAGEMODE
+    #if defined(__WATCOMC__) && defined(__WXMGL__)
+        #define TIFFLINKAGEMODE cdecl
+    #else
+        #define TIFFLINKAGEMODE LINKAGEMODE
+    #endif
 #endif
 
 //-----------------------------------------------------------------------------
@@ -82,7 +87,7 @@ extern "C"
 {
 
 tsize_t TIFFLINKAGEMODE
-_tiffNullProc(thandle_t WXUNUSED(handle),
+wxTIFFNullProc(thandle_t WXUNUSED(handle),
           tdata_t WXUNUSED(buf),
           tsize_t WXUNUSED(size))
 {
@@ -90,7 +95,7 @@ _tiffNullProc(thandle_t WXUNUSED(handle),
 }
 
 tsize_t TIFFLINKAGEMODE
-_tiffReadProc(thandle_t handle, tdata_t buf, tsize_t size)
+wxTIFFReadProc(thandle_t handle, tdata_t buf, tsize_t size)
 {
     wxInputStream *stream = (wxInputStream*) handle;
     stream->Read( (void*) buf, (size_t) size );
@@ -98,7 +103,7 @@ _tiffReadProc(thandle_t handle, tdata_t buf, tsize_t size)
 }
 
 tsize_t TIFFLINKAGEMODE
-_tiffWriteProc(thandle_t handle, tdata_t buf, tsize_t size)
+wxTIFFWriteProc(thandle_t handle, tdata_t buf, tsize_t size)
 {
     wxOutputStream *stream = (wxOutputStream*) handle;
     stream->Write( (void*) buf, (size_t) size );
@@ -106,7 +111,7 @@ _tiffWriteProc(thandle_t handle, tdata_t buf, tsize_t size)
 }
 
 toff_t TIFFLINKAGEMODE
-_tiffSeekIProc(thandle_t handle, toff_t off, int whence)
+wxTIFFSeekIProc(thandle_t handle, toff_t off, int whence)
 {
     wxInputStream *stream = (wxInputStream*) handle;
 
@@ -115,7 +120,7 @@ _tiffSeekIProc(thandle_t handle, toff_t off, int whence)
 }
 
 toff_t TIFFLINKAGEMODE
-_tiffSeekOProc(thandle_t handle, toff_t off, int whence)
+wxTIFFSeekOProc(thandle_t handle, toff_t off, int whence)
 {
     wxOutputStream *stream = (wxOutputStream*) handle;
 
@@ -124,20 +129,29 @@ _tiffSeekOProc(thandle_t handle, toff_t off, int whence)
 }
 
 int TIFFLINKAGEMODE
-_tiffCloseProc(thandle_t WXUNUSED(handle))
+wxTIFFCloseIProc(thandle_t WXUNUSED(handle))
 {
-    return 0;  // ?
+    // there is no need to close the input stream
+    return 0;
+}
+
+int TIFFLINKAGEMODE
+wxTIFFCloseOProc(thandle_t handle)
+{
+    wxOutputStream *stream = (wxOutputStream*) handle;
+
+    return stream->Close() ? 0 : -1;
 }
 
 toff_t TIFFLINKAGEMODE
-_tiffSizeProc(thandle_t handle)
+wxTIFFSizeProc(thandle_t handle)
 {
     wxStreamBase *stream = (wxStreamBase*) handle;
     return (toff_t) stream->GetSize();
 }
 
 int TIFFLINKAGEMODE
-_tiffMapProc(thandle_t WXUNUSED(handle),
+wxTIFFMapProc(thandle_t WXUNUSED(handle),
              tdata_t* WXUNUSED(pbase),
              toff_t* WXUNUSED(psize))
 {
@@ -145,7 +159,7 @@ _tiffMapProc(thandle_t WXUNUSED(handle),
 }
 
 void TIFFLINKAGEMODE
-_tiffUnmapProc(thandle_t WXUNUSED(handle),
+wxTIFFUnmapProc(thandle_t WXUNUSED(handle),
                tdata_t WXUNUSED(base),
                toff_t WXUNUSED(size))
 {
@@ -190,9 +204,9 @@ TIFFwxOpen(wxInputStream &stream, const char* name, const char* mode)
 {
     TIFF* tif = TIFFClientOpen(name, mode,
         (thandle_t) &stream,
-        _tiffReadProc, _tiffNullProc,
-        _tiffSeekIProc, _tiffCloseProc, _tiffSizeProc,
-        _tiffMapProc, _tiffUnmapProc);
+        wxTIFFReadProc, wxTIFFNullProc,
+        wxTIFFSeekIProc, wxTIFFCloseIProc, wxTIFFSizeProc,
+        wxTIFFMapProc, wxTIFFUnmapProc);
 
     return tif;
 }
@@ -202,9 +216,9 @@ TIFFwxOpen(wxOutputStream &stream, const char* name, const char* mode)
 {
     TIFF* tif = TIFFClientOpen(name, mode,
         (thandle_t) &stream,
-        _tiffNullProc, _tiffWriteProc,
-        _tiffSeekOProc, _tiffCloseProc, _tiffSizeProc,
-        _tiffMapProc, _tiffUnmapProc);
+        wxTIFFNullProc, wxTIFFWriteProc,
+        wxTIFFSeekOProc, wxTIFFCloseOProc, wxTIFFSizeProc,
+        wxTIFFMapProc, wxTIFFUnmapProc);
 
     return tif;
 }
@@ -389,7 +403,13 @@ bool wxTIFFHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo
 
     int compression = image->GetOptionInt(wxIMAGE_OPTION_COMPRESSION);
     if ( !compression )
-        compression=COMPRESSION_LZW;
+    {
+        // we can't use COMPRESSION_LZW because current version of libtiff
+        // doesn't implement it ("no longer implemented due to Unisys patent
+        // enforcement") and other compression methods are lossy so we
+        // shouldn't use them by default -- and the only remaining one is none
+        compression = COMPRESSION_NONE;
+    }
 
     TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, spp);
     TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, bpp);