modified configure to allow configuration of wxMotif under Darwin/Mac OS X

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

diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp
index ec1a1bc5341d00ec5f813b96f5e1870386b1f4c3..c030a83c848aff8fcb90219b68aaa49b0b75de23 100644 (file)
--- a/src/common/imagtiff.cpp
+++ b/src/common/imagtiff.cpp
@@ -20,7 +20,7 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

-#if wxUSE_LIBTIFF
+#if wxUSE_IMAGE && wxUSE_LIBTIFF

 
 #include "wx/imagtiff.h"
 #include "wx/bitmap.h"
 
 #include "wx/imagtiff.h"
 #include "wx/bitmap.h"


@@ -43,7 +43,7 @@ extern "C"
 
 IMPLEMENT_DYNAMIC_CLASS(wxTIFFHandler,wxImageHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxTIFFHandler,wxImageHandler)
 

-static tsize_t
+static tsize_t LINKAGEMODE

 _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))


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

-static tsize_t
+static tsize_t LINKAGEMODE

 _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;


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

-static tsize_t
+static tsize_t LINKAGEMODE

 _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;


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

-static toff_t
+static toff_t LINKAGEMODE

 _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;


@@ -83,7 +83,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
+static toff_t LINKAGEMODE

 _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;


@@ -99,20 +99,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
+static int LINKAGEMODE

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

-static toff_t
+static toff_t LINKAGEMODE

 _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
+static int LINKAGEMODE

 _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))


@@ -120,7 +120,7 @@ _tiffMapProc(thandle_t WXUNUSED(handle),
     return 0;
 }
 
     return 0;
 }
 

-static void
+static void LINKAGEMODE

 _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))


@@ -190,7 +190,7 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos
     {
         if (verbose)
             wxLogError( _("TIFF: Couldn't allocate memory.") );
     {
         if (verbose)
             wxLogError( _("TIFF: Couldn't allocate memory.") );

-            
+

         TIFFClose( tif );
 
         return FALSE;
         TIFFClose( tif );
 
         return FALSE;


@@ -301,11 +301,11 @@ bool wxTIFFHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo
     TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
     TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB);
     TIFFSetField(tif, TIFFTAG_COMPRESSION, COMPRESSION_LZW);
     TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
     TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB);
     TIFFSetField(tif, TIFFTAG_COMPRESSION, COMPRESSION_LZW);

-    
+

     tsize_t linebytes = (tsize_t)image->GetWidth() * 3;
     unsigned char *buf;
     tsize_t linebytes = (tsize_t)image->GetWidth() * 3;
     unsigned char *buf;

-    
-    if (TIFFScanlineSize(tif) > linebytes) 
+
+    if (TIFFScanlineSize(tif) > linebytes)

     {
         buf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(tif));
         if (!buf)
     {
         buf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(tif));
         if (!buf)


@@ -317,30 +317,30 @@ bool wxTIFFHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo
 
             return FALSE;
         }
 
             return FALSE;
         }

-    } 
-    else 
+    }
+    else

     {
         buf = NULL;
     }
 
     TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP,
         TIFFDefaultStripSize(tif, (uint32) -1));
     {
         buf = NULL;
     }
 
     TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP,
         TIFFDefaultStripSize(tif, (uint32) -1));

-        
+

     unsigned char *ptr = image->GetData();
     unsigned char *ptr = image->GetData();

-    for (int row = 0; row < image->GetHeight(); row++) 
+    for (int row = 0; row < image->GetHeight(); row++)

     {
            if (buf)
                memcpy(buf, ptr, image->GetWidth());
     {
            if (buf)
                memcpy(buf, ptr, image->GetWidth());

-        
+

            if (TIFFWriteScanline(tif, buf ? buf : ptr, (uint32)row, 0) < 0)
         {
                if (verbose)
                    wxLogError( _("TIFF: Error writing image.") );
            if (TIFFWriteScanline(tif, buf ? buf : ptr, (uint32)row, 0) < 0)
         {
                if (verbose)
                    wxLogError( _("TIFF: Error writing image.") );

-        
+

             TIFFClose( tif );
             if (buf)
                 _TIFFfree(buf);
             TIFFClose( tif );
             if (buf)
                 _TIFFfree(buf);

-                
+

             return FALSE;
         }
         ptr += image->GetWidth()*3;
             return FALSE;
         }
         ptr += image->GetWidth()*3;