2007-11-26 Peter Kasting <zerodpx@gmail.com>

[WebKit-https.git] / WebCore / platform / image-decoders / gif / GIFImageReader.cpp

diff --git a/WebCore/platform/image-decoders/gif/GIFImageReader.cpp b/WebCore/platform/image-decoders/gif/GIFImageReader.cpp
index b49915100936dc8154e3e83c5f67a2e3a10b3414..0f9b2e9bb0080a310706a367800e5580b00bf7d2 100644 (file)
--- a/WebCore/platform/image-decoders/gif/GIFImageReader.cpp
+++ b/WebCore/platform/image-decoders/gif/GIFImageReader.cpp
@@ -641,11 +641,13 @@ bool GIFImageReader::read(const unsigned char *buf, unsigned len,
           frame_reader->is_transparent = false;
           // ignoring gfx control extension
         }
-        frame_reader->disposal_method = (gdispose)(((*q) >> 2) & 0x7);
+        // NOTE: This relies on the values in the FrameDisposalMethod enum
+        // matching those in the GIF spec!
+        frame_reader->disposal_method = (WebCore::RGBA32Buffer::FrameDisposalMethod)(((*q) >> 2) & 0x7);
         // Some specs say 3rd bit (value 4), other specs say value 3
         // Let's choose 3 (the more popular)
         if (frame_reader->disposal_method == 4)
-          frame_reader->disposal_method = (gdispose)3;
+          frame_reader->disposal_method = WebCore::RGBA32Buffer::DisposeOverwritePrevious;
         frame_reader->delay_time = GETINT16(q + 1) * 10;
       }
       GETN(1, gif_consume_block);
@@ -882,7 +884,7 @@ bool GIFImageReader::read(const unsigned char *buf, unsigned len,
         // CALLBACK: The frame is now complete.
         if (clientptr && frame_reader)
           clientptr->frameComplete(images_decoded - 1, frame_reader->delay_time, 
-                                   frame_reader->disposal_method == DISPOSE_KEEP);
+                                   frame_reader->disposal_method);
 
         /* Clear state from this image */
         if (frame_reader) {