More TIFF things,

  Disabled leaking debug code.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4766 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index 0fc51e19b14f625789f567c938caebff7082fe53..df33af7c8f60dbfe6ceabce873f654e4824e9883 100644 (file)
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -224,8 +224,8 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
   dc.DrawText( "PNM handler", 30, 1285 );
   if (my_horse_pnm && my_horse_pnm->Ok()) dc.DrawBitmap( *my_horse_pnm, 30, 1300 );
   
   dc.DrawText( "PNM handler", 30, 1285 );
   if (my_horse_pnm && my_horse_pnm->Ok()) dc.DrawBitmap( *my_horse_pnm, 30, 1300 );
   

-  dc.DrawText( "TIFF handler", 30, 1415 );
-  if (my_horse_tiff && my_horse_tiff->Ok()) dc.DrawBitmap( *my_horse_pnm, 30, 1430 );
+  dc.DrawText( "TIFF handler", 30, 1515 );
+  if (my_horse_tiff && my_horse_tiff->Ok()) dc.DrawBitmap( *my_horse_pnm, 30, 1530 );

 }
 
 void MyCanvas::CreateAntiAliasedBitmap()
 }
 
 void MyCanvas::CreateAntiAliasedBitmap()

diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp
index 474e12e3e05b5888bf59ffdacae639e92deb0a94..1ca0a0d0f788e5d95d650ab92c87a5f78c6c64ca 100644 (file)
--- a/src/common/imagtiff.cpp
+++ b/src/common/imagtiff.cpp
@@ -52,8 +52,7 @@ _tiffReadProc(thandle_t handle, tdata_t buf, tsize_t size)
 {
     wxInputStream *stream = (wxInputStream*) handle;
     stream->Read( (void*) buf, (size_t) size );
 {
     wxInputStream *stream = (wxInputStream*) handle;
     stream->Read( (void*) buf, (size_t) size );

-    if (!*stream) return 0;
-    return size;
+    return stream->LastRead();

 }
 
 static tsize_t
 }
 
 static tsize_t


@@ -61,8 +60,7 @@ _tiffWriteProc(thandle_t handle, tdata_t buf, tsize_t size)
 {
     wxOutputStream *stream = (wxOutputStream*) handle;
     stream->Write( (void*) buf, (size_t) size );
 {
     wxOutputStream *stream = (wxOutputStream*) handle;
     stream->Write( (void*) buf, (size_t) size );

-    if (!*stream) return 0;
-    return size;
+    return stream->LastWrite();

 }
 
 static toff_t
 }
 
 static toff_t


@@ -91,8 +89,7 @@ static toff_t
 _tiffSizeProc(thandle_t handle)
 {
     wxInputStream *stream = (wxInputStream*) handle;
 _tiffSizeProc(thandle_t handle)
 {
     wxInputStream *stream = (wxInputStream*) handle;

-    long fsize;
-    return ((fsize = stream->SeekI(0, wxFromEnd)) < 0 ? 0 : fsize);
+    return (toff_t) stream->GetSize();

 }
 
 static int
 }
 
 static int


@@ -126,7 +123,7 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos
 {
     image->Destroy();
     
 {
     image->Destroy();
     

-    TIFF *tif = TIFFwxOpen( stream, "horse.tif", "r" );
+    TIFF *tif = TIFFwxOpen( stream, "image", "r" );

     
     if (!tif)
     {
     
     if (!tif)
     {


@@ -228,15 +225,13 @@ bool wxTIFFHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo
 
 bool wxTIFFHandler::DoCanRead( wxInputStream& stream )
 {
 
 bool wxTIFFHandler::DoCanRead( wxInputStream& stream )
 {

-    return TRUE;
-
-/*
-    unsigned char hdr[4];
+    unsigned char hdr[2];

 
 

-    stream.Read(&hdr, 4);
-    stream.SeekI(-4, wxFromCurrent);
-    return (hdr[0] == 'T' && hdr[1] == 'I' && hdr[2] == 'F' && hdr[3] == 'F');
-*/
+    stream.Read(&hdr, 2);
+    stream.SeekI(-2, wxFromCurrent);
+    
+    return ((hdr[0] == 0x49 && hdr[1] == 0x49) ||
+            (hdr[0] == 0x4D && hdr[1] == 0x4D));

 }
 
 
 }
 
 

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index d09ee10763e8c81ca8352bcc7272c6abfad44265..2f617eaacd2cea3186db3ef45c7b30772b40f164 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -223,6 +223,7 @@ static gint gtk_debug_focus_in_callback( GtkWidget *WXUNUSED(widget),
 
 void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar *window )
 {
 
 void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar *window )
 {

+/*

     wxString tmp = name;
     tmp += wxT(" FROM ");
     tmp += window;
     wxString tmp = name;
     tmp += wxT(" FROM ");
     tmp += window;


@@ -233,6 +234,7 @@ void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar *window
 
     gtk_signal_connect( GTK_OBJECT(widget), "focus_in_event",
       GTK_SIGNAL_FUNC(gtk_debug_focus_in_callback), (gpointer)s );
 
     gtk_signal_connect( GTK_OBJECT(widget), "focus_in_event",
       GTK_SIGNAL_FUNC(gtk_debug_focus_in_callback), (gpointer)s );

+*/

 }
 
 #endif // Debug
 }
 
 #endif // Debug

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index d09ee10763e8c81ca8352bcc7272c6abfad44265..2f617eaacd2cea3186db3ef45c7b30772b40f164 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -223,6 +223,7 @@ static gint gtk_debug_focus_in_callback( GtkWidget *WXUNUSED(widget),
 
 void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar *window )
 {
 
 void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar *window )
 {

+/*

     wxString tmp = name;
     tmp += wxT(" FROM ");
     tmp += window;
     wxString tmp = name;
     tmp += wxT(" FROM ");
     tmp += window;


@@ -233,6 +234,7 @@ void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar *window
 
     gtk_signal_connect( GTK_OBJECT(widget), "focus_in_event",
       GTK_SIGNAL_FUNC(gtk_debug_focus_in_callback), (gpointer)s );
 
     gtk_signal_connect( GTK_OBJECT(widget), "focus_in_event",
       GTK_SIGNAL_FUNC(gtk_debug_focus_in_callback), (gpointer)s );

+*/

 }
 
 #endif // Debug
 }
 
 #endif // Debug