From fa104a997d026591756f10f547de66dc587ac1e5 Mon Sep 17 00:00:00 2001 From: "pkasting@chromium.org" Date: Sat, 13 Jun 2009 19:36:30 +0000 Subject: [PATCH] 2009-06-13 Peter Kasting 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 --- WebCore/ChangeLog | 9 +++++++++ WebCore/platform/image-decoders/ImageDecoder.h | 2 +- WebCore/platform/image-decoders/bmp/BMPImageReader.cpp | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index bd49c25987b..125e1f0f32b 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,3 +1,12 @@ +2009-06-13 Peter Kasting + + 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 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 64dbf643a56..e692405375f 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 57192772a81..693d67dd5ed 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; -- GitLab