commit 9b1a8860611e17fd25c0d322ef4d28cfa601e82e
author Leon Scroggins III <scroggo@google.com> Thu Mar 01 15:57:32 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Mar 01 21:23:04 2018 +0000
tree 57cbe4f527c5d9e12500b0484cae137fa6c1f0f1
parent c57c41e8aa1f4b3d14412142210ba282e734bded

Fix fuschia roll

Only call png_set_option ifdef PNG_SET_OPTION_SUPPORTED.

Change-Id: Ib3d03e15b12b6229f98544b195a6bc32b5aa2f0f
Reviewed-on: https://skia-review.googlesource.com/111601
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>

src/codec/SkPngCodec.cpp

diff --git a/src/codec/SkPngCodec.cpp b/src/codec/SkPngCodec.cpp
index df22121..31a407c 100644
--- a/src/codec/SkPngCodec.cpp
+++ b/src/codec/SkPngCodec.cpp
@@ -22,7 +22,6 @@
 #include "SkTemplates.h"
 #include "SkUtils.h"
 
-#define PNG_SET_OPTION_SUPPORTED
 #include "png.h"
 #include <algorithm>
 
@@ -788,9 +787,11 @@
         return SkCodec::kInternalError;
     }
 
+#ifdef PNG_SET_OPTION_SUPPORTED
     // This setting ensures that we display images with incorrect CMF bytes.
     // See crbug.com/807324.
     png_set_option(png_ptr, PNG_MAXIMUM_INFLATE_WINDOW, PNG_OPTION_ON);
+#endif
 
     AutoCleanPng autoClean(png_ptr, stream, chunkReader, outCodec);