correct compilation after last change (added ifdef in the wrong function...)

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

diff --git a/src/common/gifdecod.cpp b/src/common/gifdecod.cpp
index ab507b8d7f860fc7211306bba7185f8f52b54af1..0b53e9c627d29b16323fd77c1123d6549d5df699 100644 (file)
--- a/src/common/gifdecod.cpp
+++ b/src/common/gifdecod.cpp
@@ -125,7 +125,7 @@ bool wxGIFDecoder::ConvertToImage(size_t frame, wxImage *image) const
     pal = GetPalette(frame);
     src = GetData(frame);
     dst = image->GetData();
     pal = GetPalette(frame);
     src = GetData(frame);
     dst = image->GetData();

-    transparent = GetTransparentColour(frame);
+    transparent = GetTransparentColourIndex(frame);

 
     /* set transparent colour mask */
     if (transparent != -1)
 
     /* set transparent colour mask */
     if (transparent != -1)


@@ -206,10 +206,22 @@ long wxGIFDecoder::GetDelay(size_t frame) const
     return GetFrame(frame)->delay;
 }
 
     return GetFrame(frame)->delay;
 }
 

+wxColour wxGIFDecoder::GetTransparentColour(size_t frame) const
+{
+    unsigned char *pal = GetFrame(frame)->pal;
+    int n = GetFrame(frame)->transparent;
+    if (n == -1)
+        return wxNullColour;
+
+    return wxColour(pal[n*3 + 0],
+                    pal[n*3 + 1],
+                    pal[n*3 + 2]);
+}
+

 unsigned char* wxGIFDecoder::GetData(size_t frame) const    { return (GetFrame(frame)->p); }
 unsigned char* wxGIFDecoder::GetPalette(size_t frame) const { return (GetFrame(frame)->pal); }
 unsigned int wxGIFDecoder::GetNcolours(size_t frame) const  { return (GetFrame(frame)->ncolours); }
 unsigned char* wxGIFDecoder::GetData(size_t frame) const    { return (GetFrame(frame)->p); }
 unsigned char* wxGIFDecoder::GetPalette(size_t frame) const { return (GetFrame(frame)->pal); }
 unsigned int wxGIFDecoder::GetNcolours(size_t frame) const  { return (GetFrame(frame)->ncolours); }

-int wxGIFDecoder::GetTransparentColour(size_t frame) const  { return (GetFrame(frame)->transparent); }
+int wxGIFDecoder::GetTransparentColourIndex(size_t frame) const  { return (GetFrame(frame)->transparent); }

 
 
 
 
 
 


@@ -703,12 +715,12 @@ wxGIFErrorCode wxGIFDecoder::LoadGIF(wxInputStream& stream)
             {
                 while ((i = (unsigned char)stream.GetC()) != 0)
                 {
             {
                 while ((i = (unsigned char)stream.GetC()) != 0)
                 {

-                    stream.SeekI(i, wxFromCurrent);
-                    if (stream.Eof())
+                    if (stream.Eof() || (stream.LastRead() == 0))

                     {
                         done = true;
                         break;
                     }
                     {
                         done = true;
                         break;
                     }

+                    stream.SeekI(i, wxFromCurrent);

                 }
             }
         }
                 }
             }
         }


@@ -834,6 +846,11 @@ wxGIFErrorCode wxGIFDecoder::LoadGIF(wxInputStream& stream)
             /* skip all data */
             while ((i = (unsigned char)stream.GetC()) != 0)
             {
             /* skip all data */
             while ((i = (unsigned char)stream.GetC()) != 0)
             {

+                if (stream.Eof() || (stream.LastRead() == 0))
+                {
+                    Destroy();
+                    return wxGIF_INVFORMAT;
+                }

                 stream.SeekI(i, wxFromCurrent);
             }
         }
                 stream.SeekI(i, wxFromCurrent);
             }
         }


@@ -852,22 +869,26 @@ wxGIFErrorCode wxGIFDecoder::LoadGIF(wxInputStream& stream)
             if ((buf[8] & 0x80) == 0x80)
             {
                 unsigned int local_ncolors = 2 << (buf[8] & 0x07);
             if ((buf[8] & 0x80) == 0x80)
             {
                 unsigned int local_ncolors = 2 << (buf[8] & 0x07);

-                wxFileOffset pos = stream.TellI();

                 wxFileOffset numBytes = 3 * local_ncolors;
                 stream.SeekI(numBytes, wxFromCurrent);
                 wxFileOffset numBytes = 3 * local_ncolors;
                 stream.SeekI(numBytes, wxFromCurrent);

-                if (stream.TellI() != (pos + numBytes))
-                {
-                    Destroy();
-                    return wxGIF_INVFORMAT;
-                }

             }
 
             /* initial code size */
             (void) stream.GetC();
             }
 
             /* initial code size */
             (void) stream.GetC();

+            if (stream.Eof() || (stream.LastRead() == 0))
+            {
+                Destroy();
+                return wxGIF_INVFORMAT;
+            }

 
             /* skip all data */
             while ((i = (unsigned char)stream.GetC()) != 0)
             {
 
             /* skip all data */
             while ((i = (unsigned char)stream.GetC()) != 0)
             {

+                if (stream.Eof() || (stream.LastRead() == 0))
+                {
+                    Destroy();
+                    return wxGIF_INVFORMAT;
+                }

                 stream.SeekI(i, wxFromCurrent);
             }
         }
                 stream.SeekI(i, wxFromCurrent);
             }
         }