diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bd49c25987b795551eceeee54eef4ef9d5cfe4e4..125e1f0f32be6ef317c962c8d8a638a6bea716ee 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2009-06-13  Peter Kasting  <pkasting@google.com>
+
+        Bustage: Fix broken GIFs on Cairo due to subtle typo.  Fix a warning.
+
+        * platform/image-decoders/ImageDecoder.h:
+        (WebCore::RGBA32Buffer::copyRowNTimes):
+        * platform/image-decoders/bmp/BMPImageReader.cpp:
+        (WebCore::BMPImageReader::processBitmasks):
+
 2009-06-13  Peter Kasting  <pkasting@google.com>
 
         GTK bustage fix.  "inline" is handled differently by different compilers.
diff --git a/WebCore/platform/image-decoders/ImageDecoder.h b/WebCore/platform/image-decoders/ImageDecoder.h
index 64dbf643a56ddb0766482b1d88ed541862baeb32..e692405375f0c7646058c6e7d5e618c2c1304429 100644
--- a/WebCore/platform/image-decoders/ImageDecoder.h
+++ b/WebCore/platform/image-decoders/ImageDecoder.h
@@ -86,7 +86,7 @@ namespace WebCore {
             const int rowBytes = (endX - startX) * sizeof(PixelData);
             const PixelData* const startAddr = getAddr(startX, startY);
             for (int destY = startY + 1; destY < endY; ++destY)
-                memcpy(getAddr(startX, endY), startAddr, rowBytes);
+                memcpy(getAddr(startX, destY), startAddr, rowBytes);
         }
 
         // Allocates space for the pixel data.  Must be called before any pixels
diff --git a/WebCore/platform/image-decoders/bmp/BMPImageReader.cpp b/WebCore/platform/image-decoders/bmp/BMPImageReader.cpp
index 57192772a816e9b38a82ffd494a3daf2c61a05ce..693d67dd5ed51a2fd5e9aeeed33583e217d5f6be 100644
--- a/WebCore/platform/image-decoders/bmp/BMPImageReader.cpp
+++ b/WebCore/platform/image-decoders/bmp/BMPImageReader.cpp
@@ -470,7 +470,7 @@ bool BMPImageReader::processBitmasks(SharedBuffer* data)
         // we read the info header.
 
         // Fail if we don't have enough file space for the bitmasks.
-        static const int SIZEOF_BITMASKS = 12;
+        static const size_t SIZEOF_BITMASKS = 12;
         if (((m_headerOffset + m_infoHeader.biSize + SIZEOF_BITMASKS) < (m_headerOffset + m_infoHeader.biSize))
             || (m_imgDataOffset && (m_imgDataOffset < (m_headerOffset + m_infoHeader.biSize + SIZEOF_BITMASKS)))) {
             m_failed = true;