From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q79c6-0001E1-Hr for garchives@archives.gentoo.org; Tue, 05 Apr 2011 17:00:22 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DFBF81C06A; Tue, 5 Apr 2011 17:00:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A03421C06A for ; Tue, 5 Apr 2011 17:00:13 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BD6BA1B40D3 for ; Tue, 5 Apr 2011 17:00:12 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2183) id 5D44F20057; Tue, 5 Apr 2011 17:00:11 +0000 (UTC) From: "Christoph Mende (angelos)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, angelos@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in net-libs/webkit-gtk/files: webkit-gtk-1.2.7-libpng15.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: webkit-gtk-1.2.7-libpng15.patch X-VCS-Directories: net-libs/webkit-gtk/files X-VCS-Committer: angelos X-VCS-Committer-Name: Christoph Mende Content-Type: text/plain; charset=utf8 Message-Id: <20110405170011.5D44F20057@flycatcher.gentoo.org> Date: Tue, 5 Apr 2011 17:00:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: f2b69cde3c20c6aba366fdd139e42076 angelos 11/04/05 17:00:11 Modified: webkit-gtk-1.2.7-libpng15.patch Log: Converted libpng15 patch from DOS to Unix =20 (Portage version: 2.2.0_alpha29/cvs/Linux x86_64) Revision Changes Path 1.2 net-libs/webkit-gtk/files/webkit-gtk-1.2.7-libpng15.= patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gt= k/files/webkit-gtk-1.2.7-libpng15.patch?rev=3D1.2&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gt= k/files/webkit-gtk-1.2.7-libpng15.patch?rev=3D1.2&content-type=3Dtext/pla= in diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gt= k/files/webkit-gtk-1.2.7-libpng15.patch?r1=3D1.1&r2=3D1.2 Index: webkit-gtk-1.2.7-libpng15.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-1.= 2.7-libpng15.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- webkit-gtk-1.2.7-libpng15.patch 4 Apr 2011 20:48:14 -0000 1.1 +++ webkit-gtk-1.2.7-libpng15.patch 5 Apr 2011 17:00:11 -0000 1.2 @@ -1,36 +1,36 @@ ---- WebCore/platform/image-decoders/png/PNGImageDecoder.cpp -+++ WebCore/platform/image-decoders/png/PNGImageDecoder.cpp -@@ -242,9 +242,9 @@ - png_structp png =3D m_reader->pngPtr(); - png_infop info =3D m_reader->infoPtr(); -- png_uint_32 width =3D png->width; -- png_uint_32 height =3D png->height; -+ png_uint_32 width =3D png_get_image_width(png, info); -+ png_uint_32 height =3D png_get_image_height(png, info); - =20 - // 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 @@ -=20 - if (m_reader->decodingSizeOnly()) { -- // If we only needed the size, halt the reader. =20 -+ // 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 =3D=3D 1 && PNG_LIBPNG_= VER_MINOR >=3D 5)) -+ // '0' argument to png_process_data_pause means: Do not cache u= nprocessed data. -+ m_reader->setReadOffset(m_reader->currentBufferSize() - png_pro= cess_data_pause(png, 0)); -+#else - m_reader->setReadOffset(m_reader->currentBufferSize() - png->bu= ffer_size); - png->buffer_size =3D 0; -+#endif - } - } -@@ -344,5 +349,5 @@ - buffer.setOriginalFrameRect(IntRect(IntPoint(), size())); -=20 -- if (m_reader->pngPtr()->interlaced) -+ if (png_get_interlace_type(m_reader->pngPtr(), m_reader->infoPt= r()) !=3D PNG_INTERLACE_NONE) - m_reader->createInterlaceBuffer((m_reader->hasAlpha() ? 4 := 3) * size().width() * size().height()); - } +--- WebCore/platform/image-decoders/png/PNGImageDecoder.cpp ++++ WebCore/platform/image-decoders/png/PNGImageDecoder.cpp +@@ -242,9 +242,9 @@ + png_structp png =3D m_reader->pngPtr(); + png_infop info =3D m_reader->infoPtr(); +- png_uint_32 width =3D png->width; +- png_uint_32 height =3D png->height; ++ png_uint_32 width =3D png_get_image_width(png, info); ++ png_uint_32 height =3D png_get_image_height(png, info); + =20 + // 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 @@ +=20 + if (m_reader->decodingSizeOnly()) { +- // If we only needed the size, halt the reader. =20 ++ // 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 =3D=3D 1 && PNG_LIBPNG_= VER_MINOR >=3D 5)) ++ // '0' argument to png_process_data_pause means: Do not cache u= nprocessed data. ++ m_reader->setReadOffset(m_reader->currentBufferSize() - png_pro= cess_data_pause(png, 0)); ++#else + m_reader->setReadOffset(m_reader->currentBufferSize() - png->bu= ffer_size); + png->buffer_size =3D 0; ++#endif + } + } +@@ -344,5 +349,5 @@ + buffer.setOriginalFrameRect(IntRect(IntPoint(), size())); +=20 +- if (m_reader->pngPtr()->interlaced) ++ if (png_get_interlace_type(m_reader->pngPtr(), m_reader->infoPt= r()) !=3D PNG_INTERLACE_NONE) + m_reader->createInterlaceBuffer((m_reader->hasAlpha() ? 4 := 3) * size().width() * size().height()); + }