summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-05-18 16:11:39 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2016-05-18 14:14:19 +0000
commitdd01c17a73d995865ea6069667f70b013994e43b (patch)
tree4e3772038b56c24c37b89824e255681a6d1e92ef
parentf6963f0d6d05d84664726f84a172a99687ca6a71 (diff)
downloadqtwebengine-chromium-dd01c17a73d995865ea6069667f70b013994e43b.tar.gz
Fix build with PNG_LIBPNG_VER >= 10500
Upstream broke building against newer libpng versions. Change-Id: Ice1979e28b1bcd68751fba23c2321cf3c4a34120 Reviewed-by: Michael BrĂ¼ning <michael.bruning@theqtcompany.com>
-rw-r--r--chromium/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp b/chromium/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp
index bff97c205e1..e5e18952b19 100644
--- a/chromium/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp
+++ b/chromium/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp
@@ -234,7 +234,7 @@ void PNGImageDecoder::headerAvailable()
#endif
png_uint_32 profileLength = 0;
if (png_get_iCCP(png, info, &profileName, &compressionType, &profile, &profileLength)) {
- setColorProfileAndTransform(profile, profileLength, imageHasAlpha, false /* useSRGB */);
+ setColorProfileAndTransform(reinterpret_cast<const char*>(profile), profileLength, imageHasAlpha, false /* useSRGB */);
}
}
#endif // PNG_iCCP_SUPPORTED