2011-04-28 ojab <ojab@ojab.ru>
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 28 Apr 2011 14:23:06 +0000 (14:23 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 28 Apr 2011 14:23:06 +0000 (14:23 +0000)
        Reviewed by David Levin.

        Fix build with libpng-1.5.1
        https://bugs.webkit.org/show_bug.cgi?id=59607

        * platform/image-decoders/png/PNGImageDecoder.cpp:
        (WebCore::readColorProfile):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@85181 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp

index b95d7da..c06f865 100644 (file)
@@ -1,3 +1,13 @@
+2011-04-28  ojab  <ojab@ojab.ru>
+
+        Reviewed by David Levin.
+
+        Fix build with libpng-1.5.1
+        https://bugs.webkit.org/show_bug.cgi?id=59607
+
+        * platform/image-decoders/png/PNGImageDecoder.cpp:
+        (WebCore::readColorProfile):
+
 2011-04-28  Zoltan Herczeg  <zherczeg@inf.u-szeged.hu>
 
         Reviewed by Nikolas Zimmermann.
index 9d14a25..ea9373b 100644 (file)
@@ -228,7 +228,11 @@ static ColorProfile readColorProfile(png_structp png, png_infop info)
 #ifdef PNG_iCCP_SUPPORTED
     char* profileName;
     int compressionType;
-    char* profile;
+#if (PNG_LIBPNG_VER < 10500)
+    png_charp profile;
+#else
+    png_bytep profile;
+#endif
     png_uint_32 profileLength;
     if (png_get_iCCP(png, info, &profileName, &compressionType, &profile, &profileLength)) {
         ColorProfile colorProfile;