diff options
| -rw-r--r-- | converter/other/Makefile | 2 | ||||
| -rw-r--r-- | converter/other/jpeg2000/libjasper/Makefile | 2 | ||||
| -rw-r--r-- | converter/other/pngtopam.c | 9 | ||||
| -rw-r--r-- | converter/other/pnmtopng.c | 5 | ||||
| -rw-r--r-- | converter/other/svgtopam.c | 14 | ||||
| -rw-r--r-- | doc/HISTORY | 14 | ||||
| -rw-r--r-- | lib/Makefile | 2 | ||||
| -rw-r--r-- | other/pambayer.c | 2 | ||||
| -rw-r--r-- | urt/Makefile | 2 | ||||
| -rw-r--r-- | version.mk | 2 |
10 files changed, 38 insertions, 16 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 */ diff --git a/doc/HISTORY b/doc/HISTORY index 6ef7d892..41d36953 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,20 @@ Netpbm. CHANGE HISTORY -------------- +09.09.18 BJH Release 10.47.04 + + pambayer: fix unconditional crash/failure when you aren't using + Standard Input. + + Build: use AR from config.mk instead of "ar" to build static + libraries: libnetpbm, librle, libjasper. + + Build: compiles with libpng 1.4 beta. + + Build: don't use "uint". + + Package: fix installation of pnmplain on Windows (.exe suffix). + 09.09.03 BJH Release 10.47.03 Build: fix failure to recognize static library in omitting diff --git a/lib/Makefile b/lib/Makefile index c49367b5..67fac5b2 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -179,7 +179,7 @@ endif ifeq ($(BUILD_STATICLIB),y) libnetpbm.$(STATICLIBSUFFIX): $(LIBOBJECTS) $(LIBOBJECTS_X) -rm -f $@ - ar rc $@ $(LIBOBJECTS) $(LIBOBJECTS_X) + $(AR) rc $@ $(LIBOBJECTS) $(LIBOBJECTS_X) -$(RANLIB) $@ endif diff --git a/other/pambayer.c b/other/pambayer.c index b4eaae75..f8ce0db8 100644 --- a/other/pambayer.c +++ b/other/pambayer.c @@ -80,6 +80,8 @@ parseCommandLine(int argc, char ** argv, else if (argc-1 > 1) pm_error("There is at most one argument -- the input file. " "You specified %u", argc-1); + else + cmdlineP->inputFilespec = argv[1]; if (!typeSpec) pm_error("You must specify the -type option"); diff --git a/urt/Makefile b/urt/Makefile index b9eacaf9..57543b0c 100644 --- a/urt/Makefile +++ b/urt/Makefile @@ -19,7 +19,7 @@ all: librle.a librle.a: $(LIBOBJECTS) rm -f $@ - ar rc $@ $^ + $(AR) rc $@ $^ $(RANLIB) $@ # Rule for objects. diff --git a/version.mk b/version.mk index f885cfdd..f1196705 100644 --- a/version.mk +++ b/version.mk @@ -1,4 +1,4 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 47 -NETPBM_POINT_RELEASE = 3 +NETPBM_POINT_RELEASE = 4 |