Moved print dialog data conversion code

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

diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp
index 741bc364723fdc2940dc672f5b1543413b730f7c..ef9589c911dbe43e8ab19e3fdb4bda7349d62987 100644 (file)
--- a/src/common/imagtiff.cpp
+++ b/src/common/imagtiff.cpp
@@ -7,7 +7,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "imagtiff.h"
 #endif
 
 #pragma implementation "imagtiff.h"
 #endif
 


@@ -136,6 +136,22 @@ _tiffUnmapProc(thandle_t WXUNUSED(handle),
 {
 }
 
 {
 }
 

+static void
+TIFFwxWarningHandler(const char* module, const char* fmt, va_list ap)
+{
+    if (module != NULL)
+            wxLogWarning(_("tiff module: %s"), module);
+    wxLogWarning((wxChar *) fmt, ap);
+}
+
+static void
+TIFFwxErrorHandler(const char* module, const char* fmt, va_list ap)
+{
+    if (module != NULL)
+            wxLogError(_("tiff module: %s"), module);
+    wxVLogError((wxChar *) fmt, ap);
+}
+

 } // extern "C"
 
 TIFF*
 } // extern "C"
 
 TIFF*


@@ -162,6 +178,16 @@ TIFFwxOpen(wxOutputStream &stream, const char* name, const char* mode)
     return tif;
 }
 
     return tif;
 }
 

+wxTIFFHandler::wxTIFFHandler()
+{
+    m_name = wxT("TIFF file");
+    m_extension = wxT("tif");
+    m_type = wxBITMAP_TYPE_TIF;
+    m_mime = wxT("image/tiff");
+    TIFFSetWarningHandler((TIFFErrorHandler) TIFFwxWarningHandler);
+    TIFFSetErrorHandler((TIFFErrorHandler) TIFFwxErrorHandler);
+}
+

 bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int index )
 {
     if (index == -1)
 bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int index )
 {
     if (index == -1)


@@ -176,7 +202,7 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos
         if (verbose)
             wxLogError( _("TIFF: Error loading image.") );
 
         if (verbose)
             wxLogError( _("TIFF: Error loading image.") );
 

-        return FALSE;
+        return false;

     }
 
     if (!TIFFSetDirectory( tif, (tdir_t)index ))
     }
 
     if (!TIFFSetDirectory( tif, (tdir_t)index ))


@@ -186,7 +212,7 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos
 
         TIFFClose( tif );
 
 
         TIFFClose( tif );
 

-        return FALSE;
+        return false;

     }
 
     uint32 w, h;
     }
 
     uint32 w, h;


@@ -207,7 +233,7 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos
 
         TIFFClose( tif );
 
 
         TIFFClose( tif );
 

-        return FALSE;
+        return false;

     }
 
     image->Create( (int)w, (int)h );
     }
 
     image->Create( (int)w, (int)h );


@@ -219,7 +245,7 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos
         _TIFFfree( raster );
         TIFFClose( tif );
 
         _TIFFfree( raster );
         TIFFClose( tif );
 

-        return FALSE;
+        return false;

     }
 
     if (!TIFFReadRGBAImage( tif, w, h, raster, 0 ))
     }
 
     if (!TIFFReadRGBAImage( tif, w, h, raster, 0 ))


@@ -231,10 +257,10 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos
         image->Destroy();
         TIFFClose( tif );
 
         image->Destroy();
         TIFFClose( tif );
 

-        return FALSE;
+        return false;

     }
 
     }
 

-    bool hasmask = FALSE;
+    bool hasmask = false;

 
     unsigned char *ptr = image->GetData();
     ptr += w*3*(h-1);
 
     unsigned char *ptr = image->GetData();
     ptr += w*3*(h-1);


@@ -247,7 +273,7 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos
             unsigned char alpha = (unsigned char)TIFFGetA(raster[pos]);
             if (alpha < 127)
             {
             unsigned char alpha = (unsigned char)TIFFGetA(raster[pos]);
             if (alpha < 127)
             {

-                hasmask = TRUE;
+                hasmask = true;

                 ptr[0] = image->GetMaskRed();
                 ptr++;
                 ptr[0] = image->GetMaskGreen();
                 ptr[0] = image->GetMaskRed();
                 ptr++;
                 ptr[0] = image->GetMaskGreen();


@@ -275,7 +301,7 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos
 
     image->SetMask( hasmask );
 
 
     image->SetMask( hasmask );
 

-    return TRUE;
+    return true;

 }
 
 int wxTIFFHandler::GetImageCount( wxInputStream& stream )
 }
 
 int wxTIFFHandler::GetImageCount( wxInputStream& stream )


@@ -304,7 +330,7 @@ bool wxTIFFHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo
         if (verbose)
             wxLogError( _("TIFF: Error saving image.") );
 
         if (verbose)
             wxLogError( _("TIFF: Error saving image.") );
 

-        return FALSE;
+        return false;

     }
 
     TIFFSetField(tif, TIFFTAG_IMAGEWIDTH,  (uint32)image->GetWidth());
     }
 
     TIFFSetField(tif, TIFFTAG_IMAGEWIDTH,  (uint32)image->GetWidth());


@@ -329,7 +355,7 @@ bool wxTIFFHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo
 
             TIFFClose( tif );
 
 
             TIFFClose( tif );
 

-            return FALSE;
+            return false;

         }
     }
     else
         }
     }
     else


@@ -355,7 +381,7 @@ bool wxTIFFHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo
             if (buf)
                 _TIFFfree(buf);
 
             if (buf)
                 _TIFFfree(buf);
 

-            return FALSE;
+            return false;

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


@@ -365,15 +391,15 @@ bool wxTIFFHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo
     if (buf)
     _TIFFfree(buf);
 
     if (buf)
     _TIFFfree(buf);
 

-    return TRUE;
+    return true;

 }
 
 bool wxTIFFHandler::DoCanRead( wxInputStream& stream )
 {
     unsigned char hdr[2];
 
 }
 
 bool wxTIFFHandler::DoCanRead( wxInputStream& stream )
 {
     unsigned char hdr[2];
 

-    if ( !stream.Read(&hdr, WXSIZEOF(hdr)) )
-        return FALSE;
+    if ( !stream.Read(&hdr[0], WXSIZEOF(hdr)) )
+        return false;

 
     return (hdr[0] == 'I' && hdr[1] == 'I') ||
            (hdr[0] == 'M' && hdr[1] == 'M');
 
     return (hdr[0] == 'I' && hdr[1] == 'I') ||
            (hdr[0] == 'M' && hdr[1] == 'M');