Release 10.47.04

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

5 files changed, 19 insertions, 13 deletions

diff --git a/converter/other/Makefile b/converter/other/Makefile
index db171517..5231bffa 100644
--- a/converter/other/Makefile
+++ b/converter/other/Makefile
@@ -219,7 +219,7 @@ install.bin.local: $(PKGDIR)/bin
 # Remember that $(SYMLINK) might just be a copy command.
 # backward compatibility: program used to be named pnmnoraw
 	cd $(PKGDIR)/bin ; \
-	$(SYMLINK) pnmtoplainpnm$(EXE) pnmnoraw
+	$(SYMLINK) pnmtoplainpnm pnmnoraw
 # backward compatibility: program used to be gemtopbm
 	cd $(PKGDIR)/bin ; \
 	$(SYMLINK) gemtopnm$(EXE) gemtopbm
diff --git a/converter/other/jpeg2000/libjasper/Makefile b/converter/other/jpeg2000/libjasper/Makefile
index 34d1860a..ddbd148a 100644
--- a/converter/other/jpeg2000/libjasper/Makefile
+++ b/converter/other/jpeg2000/libjasper/Makefile
@@ -25,6 +25,6 @@ include $(SRCDIR)/$(SUBDIR)/common.mk
 # looks like dependencies were rebuilt and libjasper.a gets rebuilt every
 # time.
 libjasper.a: $(SUBDIRS:%=%/all) partlist 
-	ar rc $@ $(shell cat partlist)
+	$(AR) rc $@ $(shell cat partlist)
 	$(RANLIB) $@
 
diff --git a/converter/other/pngtopam.c b/converter/other/pngtopam.c
index a7e18140..534439d2 100644
--- a/converter/other/pngtopam.c
+++ b/converter/other/pngtopam.c
@@ -33,6 +33,9 @@
 /* A hack until we can remove direct access to png_info from the program */
 #if PNG_LIBPNG_VER >= 10400
 #define trans_values trans_color
+#define TRANS_ALPHA trans_alpha
+#else
+#define TRANS_ALPHA trans
 #endif
 
 typedef struct _jmpbuf_wrapper {
@@ -637,8 +640,8 @@ paletteHasPartialTransparency(png_info * const info_ptr) {
             for (i = 0, foundGray = FALSE;
                  i < info_ptr->num_trans && !foundGray;
                  ++i) {
-                if (info_ptr->trans[i] != 0 &&
-                    info_ptr->trans[i] != maxval) {
+                if (info_ptr->TRANS_ALPHA[i] != 0 &&
+                    info_ptr->TRANS_ALPHA[i] != maxval) {
                     foundGray = TRUE;
                 }
             }
@@ -1041,7 +1044,7 @@ makeTupleRow(const struct pam *  const pamP,
             setTuple(pamP, tuplerow[col], fgColor, bgColor, alphaHandling,
                      (pngInfoP->valid & PNG_INFO_tRNS) &&
                      index < pngInfoP->num_trans ?
-                     pngInfoP->trans[index] : maxval);
+                     pngInfoP->TRANS_ALPHA[index] : maxval);
         }
         break;
                 
diff --git a/converter/other/pnmtopng.c b/converter/other/pnmtopng.c
index ef42db00..5107c33a 100644
--- a/converter/other/pnmtopng.c
+++ b/converter/other/pnmtopng.c
@@ -72,6 +72,9 @@
 /* A hack until we can remove direct access to png_info from the program */
 #if PNG_LIBPNG_VER >= 10400
 #define trans_values trans_color
+#define TRANS_ALPHA trans_alpha
+#else
+#define TRANS_ALPHA trans
 #endif
 
 
@@ -2626,7 +2629,7 @@ convertpnm(struct cmdlineInfo const cmdline,
     info_ptr->num_palette = palette_size;
     if (trans_size > 0) {
         info_ptr->valid |= PNG_INFO_tRNS;
-        info_ptr->trans = trans;
+        info_ptr->TRANS_ALPHA = trans;
         info_ptr->num_trans = trans_size;   /* omit opaque values */
     }
     /* creating hIST chunk */
diff --git a/converter/other/svgtopam.c b/converter/other/svgtopam.c
index a97599cd..c7eac8e6 100644
--- a/converter/other/svgtopam.c
+++ b/converter/other/svgtopam.c
@@ -200,13 +200,13 @@ destroyPath(path * const pathP) {
 
 
 typedef struct {
-    uint x;
-    uint y;
+    unsigned int x;
+    unsigned int y;
 } point;
 
 static point
-makePoint(uint const x,
-          uint const y) {
+makePoint(unsigned int const x,
+          unsigned int const y) {
 
     point p;
     
@@ -316,8 +316,8 @@ skipWhiteSpace(pathReader * const pathReaderP) {
 
 
 static void
-getNumber(pathReader * const pathReaderP,
-          uint *       const numberP) {
+getNumber(pathReader *   const pathReaderP,
+          unsigned int * const numberP) {
 
     const path * const pathP          = pathReaderP->pathP;
     const char * const pathText       = pathP->pathText;
@@ -328,7 +328,7 @@ getNumber(pathReader * const pathReaderP,
     if (pathReaderP->cursor >= pathTextLength)
         pm_error("Path description ends where a number was expected.");
     else {
-        uint number;
+        unsigned int number;
 
         number = 0;  /* initial value */