Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv20202

Modified Files:
        configure.ac ufraw_writer.c 
Log Message:
Warning fix should be for libpng-1.5.1 and newer. Limit libpng to version 1.2 
and newer. Bump UFRaw version to 0.19.2.

Index: ufraw_writer.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_writer.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- ufraw_writer.c      9 Mar 2013 06:45:08 -0000       1.82
+++ ufraw_writer.c      10 Mar 2013 09:00:08 -0000      1.83
@@ -27,7 +27,7 @@
 #ifdef HAVE_LIBZ
 #include <zlib.h>      /* for libpng 1.5.x */
 #endif
-#if (PNG_LIBPNG_VER_MAJOR == 1) && (PNG_LIBPNG_VER_MINOR < 6)
+#if (PNG_LIBPNG_VER_MAJOR == 1) && ((PNG_LIBPNG_VER_MINOR < 5) || 
((PNG_LIBPNG_VER_MINOR == 5) && (PNG_LIBPNG_VER_RELEASE < 1)))
 #define png_const_bytep png_charp
 #endif
 #endif

Index: configure.ac
===================================================================
RCS file: /cvsroot/ufraw/ufraw/configure.ac,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -d -r1.166 -r1.167
--- configure.ac        6 Mar 2013 05:03:33 -0000       1.166
+++ configure.ac        10 Mar 2013 09:00:08 -0000      1.167
@@ -1,5 +1,5 @@
 dnl $Id$
-AC_INIT(UFRaw, 0.19.1)
+AC_INIT(UFRaw, 0.19.2)
 AC_PREREQ(2.57)
 
 # Create host_os, host_cpu variables
@@ -247,7 +247,7 @@
   AC_CHECK_LIB(tiff, TIFFSetErrorHandler))
 have_tiff=${ac_cv_lib_tiff_TIFFSetErrorHandler:-no}
 
-PKG_CHECK_MODULES(LIBPNG, libpng,
+PKG_CHECK_MODULES(LIBPNG, libpng >= 1.2,
   [ have_png=yes
     AC_DEFINE(HAVE_LIBPNG, 1, have the png library) ],
   [ have_png=no


------------------------------------------------------------------------------
Symantec Endpoint Protection 12 positioned as A LEADER in The Forrester  
Wave(TM): Endpoint Security, Q1 2013 and "remains a good choice" in the  
endpoint security space. For insight on selecting the right partner to 
tackle endpoint security challenges, access the full report. 
http://p.sf.net/sfu/symantec-dev2dev
_______________________________________________
ufraw-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs

Reply via email to