make wxConvUTF8 available in wchar_t-less mode, too

[wxWidgets.git] / src / common / imagtiff.cpp

diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp
index e125218742c557930a20b9ab1e396a0b673c16b9..741bc364723fdc2940dc672f5b1543413b730f7c 100644 (file)
--- a/src/common/imagtiff.cpp
+++ b/src/common/imagtiff.cpp
@@ -37,19 +37,22 @@ extern "C"
 #include "wx/intl.h"
 #include "wx/module.h"
 
 #include "wx/intl.h"
 #include "wx/module.h"
 

-#if defined(__WATCOMC__) && !defined(__DOS__)
-#ifdef LINKAGEMODE
-#undef LINKAGEMODE
-#define LINKAGEMODE __cdecl
-#endif
+#ifndef TIFFLINKAGEMODE
+  #define TIFFLINKAGEMODE LINKAGEMODE

 #endif
 #endif

+

 //-----------------------------------------------------------------------------
 // wxTIFFHandler
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxTIFFHandler,wxImageHandler)
 
 //-----------------------------------------------------------------------------
 // wxTIFFHandler
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxTIFFHandler,wxImageHandler)
 

-static tsize_t LINKAGEMODE
+#if wxUSE_STREAMS
+
+extern "C"
+{
+
+tsize_t TIFFLINKAGEMODE

 _tiffNullProc(thandle_t WXUNUSED(handle),
           tdata_t WXUNUSED(buf),
           tsize_t WXUNUSED(size))
 _tiffNullProc(thandle_t WXUNUSED(handle),
           tdata_t WXUNUSED(buf),
           tsize_t WXUNUSED(size))


@@ -57,7 +60,7 @@ _tiffNullProc(thandle_t WXUNUSED(handle),
     return (tsize_t) -1;
 }
 
     return (tsize_t) -1;
 }
 

-static tsize_t LINKAGEMODE
+tsize_t TIFFLINKAGEMODE

 _tiffReadProc(thandle_t handle, tdata_t buf, tsize_t size)
 {
     wxInputStream *stream = (wxInputStream*) handle;
 _tiffReadProc(thandle_t handle, tdata_t buf, tsize_t size)
 {
     wxInputStream *stream = (wxInputStream*) handle;


@@ -65,7 +68,7 @@ _tiffReadProc(thandle_t handle, tdata_t buf, tsize_t size)
     return stream->LastRead();
 }
 
     return stream->LastRead();
 }
 

-static tsize_t LINKAGEMODE
+tsize_t TIFFLINKAGEMODE

 _tiffWriteProc(thandle_t handle, tdata_t buf, tsize_t size)
 {
     wxOutputStream *stream = (wxOutputStream*) handle;
 _tiffWriteProc(thandle_t handle, tdata_t buf, tsize_t size)
 {
     wxOutputStream *stream = (wxOutputStream*) handle;


@@ -73,7 +76,7 @@ _tiffWriteProc(thandle_t handle, tdata_t buf, tsize_t size)
     return stream->LastWrite();
 }
 
     return stream->LastWrite();
 }
 

-static toff_t LINKAGEMODE
+toff_t TIFFLINKAGEMODE

 _tiffSeekIProc(thandle_t handle, toff_t off, int whence)
 {
     wxInputStream *stream = (wxInputStream*) handle;
 _tiffSeekIProc(thandle_t handle, toff_t off, int whence)
 {
     wxInputStream *stream = (wxInputStream*) handle;


@@ -89,7 +92,7 @@ _tiffSeekIProc(thandle_t handle, toff_t off, int whence)
     return (toff_t)stream->SeekI( (off_t)off, mode );
 }
 
     return (toff_t)stream->SeekI( (off_t)off, mode );
 }
 

-static toff_t LINKAGEMODE
+toff_t TIFFLINKAGEMODE

 _tiffSeekOProc(thandle_t handle, toff_t off, int whence)
 {
     wxOutputStream *stream = (wxOutputStream*) handle;
 _tiffSeekOProc(thandle_t handle, toff_t off, int whence)
 {
     wxOutputStream *stream = (wxOutputStream*) handle;


@@ -105,20 +108,20 @@ _tiffSeekOProc(thandle_t handle, toff_t off, int whence)
     return (toff_t)stream->SeekO( (off_t)off, mode );
 }
 
     return (toff_t)stream->SeekO( (off_t)off, mode );
 }
 

-static int LINKAGEMODE
+int TIFFLINKAGEMODE

 _tiffCloseProc(thandle_t WXUNUSED(handle))
 {
     return 0;  // ?
 }
 
 _tiffCloseProc(thandle_t WXUNUSED(handle))
 {
     return 0;  // ?
 }
 

-static toff_t LINKAGEMODE
+toff_t TIFFLINKAGEMODE

 _tiffSizeProc(thandle_t handle)
 {
     wxStreamBase *stream = (wxStreamBase*) handle;
     return (toff_t) stream->GetSize();
 }
 
 _tiffSizeProc(thandle_t handle)
 {
     wxStreamBase *stream = (wxStreamBase*) handle;
     return (toff_t) stream->GetSize();
 }
 

-static int LINKAGEMODE
+int TIFFLINKAGEMODE

 _tiffMapProc(thandle_t WXUNUSED(handle),
              tdata_t* WXUNUSED(pbase),
              toff_t* WXUNUSED(psize))
 _tiffMapProc(thandle_t WXUNUSED(handle),
              tdata_t* WXUNUSED(pbase),
              toff_t* WXUNUSED(psize))


@@ -126,13 +129,15 @@ _tiffMapProc(thandle_t WXUNUSED(handle),
     return 0;
 }
 
     return 0;
 }
 

-static void LINKAGEMODE
+void TIFFLINKAGEMODE

 _tiffUnmapProc(thandle_t WXUNUSED(handle),
                tdata_t WXUNUSED(base),
                toff_t WXUNUSED(size))
 {
 }
 
 _tiffUnmapProc(thandle_t WXUNUSED(handle),
                tdata_t WXUNUSED(base),
                toff_t WXUNUSED(size))
 {
 }
 

+} // extern "C"
+

 TIFF*
 TIFFwxOpen(wxInputStream &stream, const char* name, const char* mode)
 {
 TIFF*
 TIFFwxOpen(wxInputStream &stream, const char* name, const char* mode)
 {


@@ -159,6 +164,9 @@ TIFFwxOpen(wxOutputStream &stream, const char* name, const char* mode)
 
 bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int index )
 {
 
 bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int index )
 {

+    if (index == -1)
+        index = 0;
+

     image->Destroy();
 
     TIFF *tif = TIFFwxOpen( stream, "image", "r" );
     image->Destroy();
 
     TIFF *tif = TIFFwxOpen( stream, "image", "r" );


@@ -364,15 +372,14 @@ bool wxTIFFHandler::DoCanRead( wxInputStream& stream )
 {
     unsigned char hdr[2];
 
 {
     unsigned char hdr[2];
 

-    stream.Read(&hdr, 2);
-    stream.SeekI(-2, wxFromCurrent);
+    if ( !stream.Read(&hdr, WXSIZEOF(hdr)) )
+        return FALSE;

 
 

-    return ((hdr[0] == 0x49 && hdr[1] == 0x49) ||
-            (hdr[0] == 0x4D && hdr[1] == 0x4D));
+    return (hdr[0] == 'I' && hdr[1] == 'I') ||
+           (hdr[0] == 'M' && hdr[1] == 'M');

 }
 
 }
 

+#endif  // wxUSE_STREAMS

 
 

-#endif
-   // wxUSE_LIBTIFF
-
+#endif  // wxUSE_LIBTIFF