Added headers that didn't get installed.

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

diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp
index 48ca43ab9856c737e2980d08925d94970610ff79..657ff82ac5daa487bcf067690a3c3167443c3bca 100644 (file)
--- a/src/common/imagtiff.cpp
+++ b/src/common/imagtiff.cpp
@@ -47,6 +47,8 @@ extern "C"
 
 IMPLEMENT_DYNAMIC_CLASS(wxTIFFHandler,wxImageHandler)
 
+#if wxUSE_STREAMS
+
 extern "C"
 {
 
@@ -134,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*
@@ -160,6 +178,16 @@ TIFFwxOpen(wxOutputStream &stream, const char* name, const char* mode)
     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)
@@ -373,14 +401,11 @@ bool wxTIFFHandler::DoCanRead( wxInputStream& stream )
     if ( !stream.Read(&hdr, WXSIZEOF(hdr)) )
         return FALSE;
 
-    stream.SeekI(-WXSIZEOF(hdr), wxFromCurrent);
-
     return (hdr[0] == 'I' && hdr[1] == 'I') ||
            (hdr[0] == 'M' && hdr[1] == 'M');
 }
 
+#endif  // wxUSE_STREAMS
 
-#endif
-   // wxUSE_LIBTIFF
-
+#endif  // wxUSE_LIBTIFF