commit 96be908a9e741643d9befce3e05967baa3505604
author Matt Sarett <msarett@google.com> Tue May 03 13:29:54 2016 -0400
committer Dirk Vogt <dirk@fairphone.com> Mon Jun 20 14:09:47 2016 +0200
tree 2326da0434616fc2e8512dc48fc19f324393f4b2
parent 7d659e4f0574075dfad8d280c8d54b546faaafbb

FPII-2034: DO NOT MERGE Update libpng to 1.6.20

DO NOT MERGE Update libpng to 1.6.20

BUG:23265085
Change-Id: I2fc2106965c789a54f04412e9c63a0901b0c1e71
(cherry picked from commit 0b39f202aaedd3029e4270d2af7d58ba6634f9cd)

contrib/examples/iccfrompng.c

diff --git a/contrib/examples/iccfrompng.c b/contrib/examples/iccfrompng.c
index 386e522..603037e 100644
--- a/contrib/examples/iccfrompng.c
+++ b/contrib/examples/iccfrompng.c
@@ -26,6 +26,10 @@
 
 #include <png.h>
 
+#if defined(PNG_READ_SUPPORTED) && defined(PNG_STDIO_SUPPORTED) && \
+    defined (PNG_iCCP_SUPPORTED)
+
+
 static int verbose = 1;
 static png_byte no_profile[] = "no profile";
 
@@ -178,3 +182,4 @@
    /* Exit code is true if any extract succeeds */
    return extracted == 0;
 }
+#endif /* READ && STDIO && iCCP */