Title: [148701] trunk/Source/WebCore
Revision
148701
Author
commit-qu...@webkit.org
Date
2013-04-18 14:01:24 -0700 (Thu, 18 Apr 2013)

Log Message

Remove obsolete macros from libpng
https://bugs.webkit.org/show_bug.cgi?id=114817

Patch by Alberto Garcia <agar...@igalia.com> on 2013-04-18
Reviewed by Benjamin Poulain.

libpng 1.4 removes the png_voidp_NULL and png_error_ptr_NULL
macros. Null pointers must be used directly instead.

* platform/image-encoders/PNGImageEncoder.cpp:
(WebCore::compressRGBABigEndianToPNG):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (148700 => 148701)


--- trunk/Source/WebCore/ChangeLog	2013-04-18 20:39:32 UTC (rev 148700)
+++ trunk/Source/WebCore/ChangeLog	2013-04-18 21:01:24 UTC (rev 148701)
@@ -1,3 +1,16 @@
+2013-04-18  Alberto Garcia  <agar...@igalia.com>
+
+        Remove obsolete macros from libpng
+        https://bugs.webkit.org/show_bug.cgi?id=114817
+
+        Reviewed by Benjamin Poulain.
+
+        libpng 1.4 removes the png_voidp_NULL and png_error_ptr_NULL
+        macros. Null pointers must be used directly instead.
+
+        * platform/image-encoders/PNGImageEncoder.cpp:
+        (WebCore::compressRGBABigEndianToPNG):
+
 2013-04-18  Jer Noble  <jer.no...@apple.com>
 
         CodeGeneratorJS.pm should generate "isFiringEventListeners()" check in isReachableFromOpaqueRoots()

Modified: trunk/Source/WebCore/platform/image-encoders/PNGImageEncoder.cpp (148700 => 148701)


--- trunk/Source/WebCore/platform/image-encoders/PNGImageEncoder.cpp	2013-04-18 20:39:32 UTC (rev 148700)
+++ trunk/Source/WebCore/platform/image-encoders/PNGImageEncoder.cpp	2013-04-18 21:01:24 UTC (rev 148701)
@@ -85,7 +85,7 @@
 
 bool compressRGBABigEndianToPNG(unsigned char* rgbaBigEndianData, const IntSize& size, Vector<char>& pngData)
 {
-    png_struct* pngPtr = png_create_write_struct(PNG_LIBPNG_VER_STRING, png_voidp_NULL, png_error_ptr_NULL, png_error_ptr_NULL);
+    png_struct* pngPtr = png_create_write_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0);
     if (!pngPtr)
         return false;
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to