diff options
Diffstat (limited to 'net-libs/webkit-gtk/files/webkit-gtk-1.2.7-libpng15.patch')
| -rw-r--r-- | net-libs/webkit-gtk/files/webkit-gtk-1.2.7-libpng15.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.2.7-libpng15.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.2.7-libpng15.patch new file mode 100644 index 0000000..5674861 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-1.2.7-libpng15.patch @@ -0,0 +1,36 @@ +--- WebCore/platform/image-decoders/png/PNGImageDecoder.cpp ++++ WebCore/platform/image-decoders/png/PNGImageDecoder.cpp +@@ -242,9 +242,9 @@ + png_structp png = m_reader->pngPtr(); + png_infop info = m_reader->infoPtr(); +- png_uint_32 width = png->width; +- png_uint_32 height = png->height; ++ png_uint_32 width = png_get_image_width(png, info); ++ png_uint_32 height = png_get_image_height(png, info); + + // Protect against large images. +- if (png->width > cMaxPNGSize || png->height > cMaxPNGSize) { ++ if (width > cMaxPNGSize || height > cMaxPNGSize) { + longjmp(JMPBUF(png), 1); + return; +@@ -319,7 +319,12 @@ + + if (m_reader->decodingSizeOnly()) { +- // If we only needed the size, halt the reader. ++ // If we only needed the size, halt the reader. ++#if defined(PNG_LIBPNG_VER_MAJOR) && defined(PNG_LIBPNG_VER_MINOR) && (PNG_LIBPNG_VER_MAJOR > 1 || (PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 5)) ++ // '0' argument to png_process_data_pause means: Do not cache unprocessed data. ++ m_reader->setReadOffset(m_reader->currentBufferSize() - png_process_data_pause(png, 0)); ++#else + m_reader->setReadOffset(m_reader->currentBufferSize() - png->buffer_size); + png->buffer_size = 0; ++#endif + } + } +@@ -344,5 +349,5 @@ + buffer.setOriginalFrameRect(IntRect(IntPoint(), size())); + +- if (m_reader->pngPtr()->interlaced) ++ if (png_get_interlace_type(m_reader->pngPtr(), m_reader->infoPtr()) != PNG_INTERLACE_NONE) + m_reader->createInterlaceBuffer((m_reader->hasAlpha() ? 4 : 3) * size().width() * size().height()); + } |