Fix for listbox problem, when created on invisible

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

diff --git a/src/common/imagiff.cpp b/src/common/imagiff.cpp
index bd6fb87cfe957cf6916eeb309d74bc449e4c53b7..b6db906cdb2863fb5cdb0e6d494086f490bf3895 100644 (file)
--- a/src/common/imagiff.cpp
+++ b/src/common/imagiff.cpp
@@ -1,16 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        imagiff.h
 // Purpose:     wxImage handler for Amiga IFF images
 /////////////////////////////////////////////////////////////////////////////
 // Name:        imagiff.h
 // Purpose:     wxImage handler for Amiga IFF images

-// Author:      Steffen Gutmann
+// Author:      Steffen Gutmann, Thomas Meyer

 // RCS-ID:      $Id$
 // Copyright:   (c) Steffen Gutmann, 2002
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // RCS-ID:      $Id$
 // Copyright:   (c) Steffen Gutmann, 2002
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-//        parts of the source are based on xviff by Thomas Meyer
-//        Permission for use in wxWindows has been gratefully given.
+// 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 wxWidgets has been gratefully given.

 
 

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

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


@@ -32,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>
 


@@ -66,7 +72,7 @@ public:
     unsigned int w;                 /* width */
     unsigned int h;                 /* height */
     int transparent;                /* transparent color (-1 = none) */
     unsigned int w;                 /* width */
     unsigned int h;                 /* height */
     int transparent;                /* transparent color (-1 = none) */

-    int colors;                            /* number of colors */
+    int colors;                     /* number of colors */

     unsigned char *p;               /* bitmap */
     unsigned char *pal;             /* palette */
 
     unsigned char *p;               /* bitmap */
     unsigned char *pal;             /* palette */
 


@@ -77,10 +83,10 @@ public:
 class WXDLLEXPORT wxIFFDecoder
 {
 private:
 class WXDLLEXPORT wxIFFDecoder
 {
 private:

-    IFFImage *m_image;         // image data
-    wxInputStream *m_f;        // input stream
-    unsigned char *databuf; 
-    unsigned char *picptr; 
+    IFFImage *m_image;        // image data
+    wxInputStream *m_f;       // input stream
+    unsigned char *databuf;
+    unsigned char *picptr;

     unsigned char *decomp_mem;
 
     void Destroy();
     unsigned char *decomp_mem;
 
     void Destroy();


@@ -140,7 +146,7 @@ bool wxIFFDecoder::ConvertToImage(wxImage *image) const
     image->Create(GetWidth(), GetHeight());
 
     if (!image->Ok())
     image->Create(GetWidth(), GetHeight());
 
     if (!image->Ok())

-        return FALSE;
+        return false;

 
     unsigned char *pal = GetPalette();
     unsigned char *src = GetData();
 
     unsigned char *pal = GetPalette();
     unsigned char *src = GetData();


@@ -169,7 +175,7 @@ bool wxIFFDecoder::ConvertToImage(wxImage *image) const
         image->SetMaskColour(255, 0, 255);
     }
     else
         image->SetMaskColour(255, 0, 255);
     }
     else

-        image->SetMask(FALSE);
+        image->SetMask(false);

 
 #if wxUSE_PALETTE
     if (pal && colors > 0)
 
 #if wxUSE_PALETTE
     if (pal && colors > 0)


@@ -201,7 +207,7 @@ bool wxIFFDecoder::ConvertToImage(wxImage *image) const
     dst[2] = src[2];
     }
 
     dst[2] = src[2];
     }
 

-    return TRUE;
+    return true;

 }
 
 
 }
 
 


@@ -224,22 +230,24 @@ int wxIFFDecoder::GetTransparentColour() const { return m_image->transparent; }
 
 //
 // CanRead:
 
 //
 // CanRead:

-//  Returns TRUE if the file looks like a valid IFF, FALSE otherwise.
+//  Returns true if the file looks like a valid IFF, false otherwise.

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

 
 

-    return (memcmp(buf, "FORM", 4) == 0 && memcmp(buf+8, "ILBM", 4) == 0);
+    m_f->SeekI(-(wxFileOffset)WXSIZEOF(buf), wxFromCurrent);
+
+    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


@@ -331,7 +339,7 @@ int wxIFFDecoder::ReadIFF()
     }
 
     // compute file length
     }
 
     // compute file length

-    off_t currentPos = m_f->TellI();
+    wxFileOffset currentPos = m_f->TellI();

     m_f->SeekI(0, wxFromEnd);
     long filesize = m_f->TellI();
     m_f->SeekI(currentPos, wxFromStart);
     m_f->SeekI(0, wxFromEnd);
     long filesize = m_f->TellI();
     m_f->SeekI(currentPos, wxFromStart);


@@ -392,7 +400,7 @@ int wxIFFDecoder::ReadIFF()
 #else
        if (chunkLen < 0) {     // format error?
 #endif
 #else
        if (chunkLen < 0) {     // format error?
 #endif

-         break;
+         break;

     }
     bool truncated = (dataptr + 8 + chunkLen > dataend);
 
     }
     bool truncated = (dataptr + 8 + chunkLen > dataend);
 


@@ -727,7 +735,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxIFFHandler, wxImageHandler)
 
 #if wxUSE_STREAMS
 
 
 #if wxUSE_STREAMS
 

-bool wxIFFHandler::LoadFile(wxImage *image, wxInputStream& stream, 
+bool wxIFFHandler::LoadFile(wxImage *image, wxInputStream& stream,

                             bool verbose, int WXUNUSED(index))
 {
     wxIFFDecoder *decod;
                             bool verbose, int WXUNUSED(index))
 {
     wxIFFDecoder *decod;


@@ -755,7 +763,7 @@ bool wxIFFHandler::LoadFile(wxImage *image, wxInputStream& stream,
             }
         }
         delete decod;
             }
         }
         delete decod;

-        return FALSE;
+        return false;

     }
 
     if ((error == wxIFF_TRUNCATED) && verbose)
     }
 
     if ((error == wxIFF_TRUNCATED) && verbose)


@@ -776,19 +784,14 @@ bool wxIFFHandler::SaveFile(wxImage * WXUNUSED(image),
     if (verbose)
         wxLogDebug(wxT("IFF: the handler is read-only!!"));
 
     if (verbose)
         wxLogDebug(wxT("IFF: the handler is read-only!!"));
 

-    return FALSE;
+    return false;

 }
 
 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