[zbar-commits] push rev [342]: fix C example libpng usage

[<sp...@us...>]

changeset: 342:9a6dc24f222c
user:      sp...@us...
date:      Sun Sep 18 16:59:52 2011 -0700
details:   http://zbar.hg.sourceforge.net:8000/hgroot/zbar/zbarzbar/rev/9a6dc24f222c
description:
fix C example libpng usage
    - thanks to nickmeinhold for finding and reporting the fix!

diffstat:

 examples/scan_image.c |  16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diffs (33 lines):

diff -r c85723b21066 -r 9a6dc24f222c examples/scan_image.c
--- a/examples/scan_image.c	Sun Sep 18 11:52:51 2011 -0700
+++ b/examples/scan_image.c	Sun Sep 18 16:59:52 2011 -0700
@@ -3,6 +3,20 @@
 #include <png.h>
 #include <zbar.h>
 
+#if !defined(PNG_LIBPNG_VER) || \
+    PNG_LIBPNG_VER < 10018 ||   \
+    (PNG_LIBPNG_VER > 10200 &&  \
+     PNG_LIBPNG_VER < 10209)
+  /* Changes to Libpng from version 1.2.42 to 1.4.0 (January 4, 2010)
+   * ...
+   * 2. m. The function png_set_gray_1_2_4_to_8() was removed. It has been
+   *       deprecated since libpng-1.0.18 and 1.2.9, when it was replaced with
+   *       png_set_expand_gray_1_2_4_to_8() because the former function also
+   *       expanded palette images.
+   */
+# define png_set_expand_gray_1_2_4_to_8 png_set_gray_1_2_4_to_8
+#endif
+
 zbar_image_scanner_t *scanner = NULL;
 
 /* to complete a runnable example, this abbreviated implementation of
@@ -30,7 +44,7 @@
     if(color & PNG_COLOR_TYPE_PALETTE)
         png_set_palette_to_rgb(png);
     if(color == PNG_COLOR_TYPE_GRAY && bits < 8)
-        png_set_gray_1_2_4_to_8(png);
+        png_set_expand_gray_1_2_4_to_8(png);
     if(bits == 16)
         png_set_strip_16(png);
     if(color & PNG_COLOR_MASK_ALPHA)