Release 10.47.19

git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@1279 9d0c8265-081b-0410-96cb-a4ca84ce46f8

6 files changed, 19 insertions, 10 deletions

diff --git a/GNUmakefile b/GNUmakefile
index 4b01cec2..ae5893d7 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -265,10 +265,10 @@ ifneq ($(X11LIB),NONE)
   MERGELIBS += $(X11LIB)
 endif
 
-ifeq ($(shell libpng-config --version),)
+ifeq ($(shell libpng$(PNGVER)-config --version),)
   PNGLD = $(shell $(LIBOPT) $(LIBOPTR) $(PNGLIB) $(ZLIB))
 else
-  PNGLD = $(shell libpng-config --ldflags)
+  PNGLD = $(shell libpng$(PNGVER)-config --ldflags)
 endif
 
 ifeq ($(shell xml2-config --version),)
diff --git a/converter/other/Makefile b/converter/other/Makefile
index 5231bffa..8277b127 100644
--- a/converter/other/Makefile
+++ b/converter/other/Makefile
@@ -26,7 +26,7 @@ ifneq ($(TIFFLIB),NONE)
   endif
 endif
 
-ifeq ($(shell libpng-config --version),)
+ifeq ($(shell libpng$(PNGVER)-config --version),)
   ifneq ($(PNGLIB),NONE)
     HAVE_PNGLIB = Y
     ifneq ($(PNGHDR_DIR)x,x)
@@ -38,7 +38,7 @@ ifeq ($(shell libpng-config --version),)
   endif
 else
   HAVE_PNGLIB = Y
-  EXTERN_INCLUDES += $(shell libpng-config --cflags)
+  EXTERN_INCLUDES += $(shell libpng$(PNGVER)-config --cflags)
 endif
 
 ifneq ($(JPEGLIB),NONE)
@@ -152,10 +152,10 @@ tifftopnm pamtotiff pnmtotiffcmyk: %: %.o tiff.o $(NETPBMLIB) $(LIBOPT)
 	$(LD) -o $@ $@.o tiff.o \
 	  $(LIBOPTS_TIFF) $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD)
 
-ifeq ($(shell libpng-config --version),)
+ifeq ($(shell libpng$(PNGVER)-config --version),)
   PNGLIB_LIBOPTS = $(shell $(LIBOPT) $(LIBOPTR) $(PNGLIB) $(ZLIB))
 else
-  PNGLIB_LIBOPTS = $(shell libpng-config --ldflags)
+  PNGLIB_LIBOPTS = $(shell libpng$(PNGVER)-config --ldflags)
 endif
 
 pngtopnm pngtopam: %: %.o $(NETPBMLIB) $(LIBOPT)
diff --git a/doc/HISTORY b/doc/HISTORY
index eaf9203d..4cfbe41e 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,15 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+10.08.28 BJH  Release 10.47.19
+
+              Build: don't expect snprintf() to exist.
+
+              Build: don't use <strings.h> or bzero().
+
+              Build: fix PNGVER.  Thanks Matthew Fischer
+              <futhark@users.sourceforge.net>.
+
 10.07.27 BJH  Release 10.47.18
 
               Pnmtopng:  -libversion doesn't report level of linked libz.
diff --git a/other/pamx/image.h b/other/pamx/image.h
index 32a48c5a..5b352a28 100644
--- a/other/pamx/image.h
+++ b/other/pamx/image.h
@@ -1,6 +1,5 @@
 #ifndef IMAGE_H_INCLUDED
 #define IMAGE_H_INCLUDED
-#include <strings.h>
 
 #include "pm_c_util.h"
 
diff --git a/other/pamx/send.c b/other/pamx/send.c
index 4b1268a5..5413308b 100644
--- a/other/pamx/send.c
+++ b/other/pamx/send.c
@@ -9,6 +9,7 @@
   See COPYRIGHT file for copyright information.
 */
 
+#include <string.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
@@ -131,7 +132,7 @@ itrueToRGB(Image *      const imageP,
 
     colors = 1 << ddepth;
   
-    bzero(pixel_counts, 32768 * sizeof(unsigned long));
+    memset(pixel_counts, 0, 32768 * sizeof(unsigned long));
   
     pixel= imageP->data;
     for (y= 0; y < imageP->height; y++) {
@@ -693,7 +694,7 @@ makeXImage(XImageInfo * const ximageinfoP,
                     pm_error("Unable to allocate space for %u x %x x %u "
                              "image", imageP->width, imageP->height, dpixlen);
                 ximageinfoP->ximageP->data = (char*)data;
-                bzero(data, size);
+                memset(data, 0, size);
                 ximageinfoP->ximageP->bitmap_bit_order = MSBFirst;
                 ximageinfoP->ximageP->byte_order = MSBFirst;
                 for (a= 0; a < dbits; ++a) {
diff --git a/version.mk b/version.mk
index e3848187..11f549d3 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 47
-NETPBM_POINT_RELEASE = 18
+NETPBM_POINT_RELEASE = 19