Changeset 148701 in webkit

Timestamp:

Apr 18, 2013 2:01:24 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

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

Patch by Alberto Garcia <​agarcia@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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/image-encoders/PNGImageEncoder.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-18  Alberto Garcia  <agarcia@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.noble@apple.com>
 

trunk/Source/WebCore/platform/image-encoders/PNGImageEncoder.cpp

@@ -86 +86 @@
 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;