Commit fa104a99 authored by pkasting@chromium.org's avatar pkasting@chromium.org

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):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@44654 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent ea7ce88e
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.
......@@ -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
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment