font inheritance fixes (patch 983251)

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

diff --git a/src/common/imagiff.cpp b/src/common/imagiff.cpp
index affbd43967ac48604f8c5baeacef30be75e06ebd..6ceafceab0ab2b23eeb59c74d85535d6ad93f99d 100644 (file)
--- a/src/common/imagiff.cpp
+++ b/src/common/imagiff.cpp
@@ -10,9 +10,9 @@
 // Parts of this source are based on the iff loading algorithm found
 // in xviff.c.  Permission by the original author, Thomas Meyer, and
 // by the author of xv, John Bradley for using the iff loading part
 // Parts of this source are based on the iff loading algorithm found
 // in xviff.c.  Permission by the original author, Thomas Meyer, and
 // by the author of xv, John Bradley for using the iff loading part

-// in wxWindows has been gratefully given.
+// in wxWidgets has been gratefully given.

 
 

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

 #pragma implementation "imagiff.h"
 #endif
 
 #pragma implementation "imagiff.h"
 #endif
 


@@ -34,6 +34,10 @@
 #include "wx/log.h"
 #include "wx/intl.h"
 
 #include "wx/log.h"
 #include "wx/intl.h"
 

+#if wxUSE_PALETTE
+    #include "wx/palette.h"
+#endif // wxUSE_PALETTE
+

 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>
 


@@ -230,18 +234,20 @@ int wxIFFDecoder::GetTransparentColour() const { return m_image->transparent; }
 //
 bool wxIFFDecoder::CanRead()
 {
 //
 bool wxIFFDecoder::CanRead()
 {

-    unsigned char buf[12] = "";
+    unsigned char buf[12];

 
 

-    m_f->Read(buf, 12);
-    m_f->SeekI(-12, wxFromCurrent);
+    if ( !m_f->Read(buf, WXSIZEOF(buf)) )
+        return FALSE;
+
+    m_f->SeekI(-(off_t)WXSIZEOF(buf), wxFromCurrent);

 
 

-    return (memcmp(buf, "FORM", 4) == 0 && memcmp(buf+8, "ILBM", 4) == 0);
+    return (memcmp(buf, "FORM", 4) == 0) && (memcmp(buf+8, "ILBM", 4) == 0);

 }
 
 
 // ReadIFF:
 // Based on xv source code by Thomas Meyer
 }
 
 
 // ReadIFF:
 // Based on xv source code by Thomas Meyer

-// Permission for use in wxWindows has been gratefully given.
+// Permission for use in wxWidgets has been gratefully given.

 
 typedef unsigned char byte;
 #define IFFDEBUG 0
 
 typedef unsigned char byte;
 #define IFFDEBUG 0


@@ -783,14 +789,9 @@ bool wxIFFHandler::SaveFile(wxImage * WXUNUSED(image),
 
 bool wxIFFHandler::DoCanRead(wxInputStream& stream)
 {
 
 bool wxIFFHandler::DoCanRead(wxInputStream& stream)
 {

-    wxIFFDecoder *decod;
-    bool ok;
+    wxIFFDecoder decod(&stream);

 
 

-    decod = new wxIFFDecoder(&stream);
-    ok = decod->CanRead();
-    delete decod;
-
-    return ok;
+    return decod.CanRead();

 }
 
 #endif // wxUSE_STREAMS
 }
 
 #endif // wxUSE_STREAMS