diff options
-rw-r--r-- | Makefile.version | 2 | ||||
-rw-r--r-- | buildtools/libopt.c | 2 | ||||
-rw-r--r-- | converter/other/pngtopnm.c | 6 | ||||
-rw-r--r-- | converter/other/pnmtopng.c | 7 | ||||
-rw-r--r-- | converter/ppm/ppmtompeg/jpeg.c | 2 | ||||
-rw-r--r-- | doc/HISTORY | 11 |
6 files changed, 28 insertions, 2 deletions
diff --git a/Makefile.version b/Makefile.version index 01adb604..5512f749 100644 --- a/Makefile.version +++ b/Makefile.version @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 35 -NETPBM_POINT_RELEASE = 66 +NETPBM_POINT_RELEASE = 67 diff --git a/buildtools/libopt.c b/buildtools/libopt.c index 3dcb1f73..8e21e1be 100644 --- a/buildtools/libopt.c +++ b/buildtools/libopt.c @@ -310,7 +310,7 @@ parse_filename(const char * const filename, unsigned int prefix_length; bool prefix_good; - if (strcmp(lastdot, "a") == 0) + if (strcmp(lastdot + 1, "a") == 0) *static_p = TRUE; else *static_p = FALSE; diff --git a/converter/other/pngtopnm.c b/converter/other/pngtopnm.c index c21420a7..0ee08ede 100644 --- a/converter/other/pngtopnm.c +++ b/converter/other/pngtopnm.c @@ -44,6 +44,12 @@ #include "nstring.h" #include "shhopt.h" +#if PNG_LIBPNG_VER >= 10400 +#error Your PNG library (<png.h>) is incompatible with this Netpbm source code. +#error You need either an older PNG library (older than 1.4) +#error newer Netpbm source code (at least 10.48) +#endif + typedef struct _jmpbuf_wrapper { jmp_buf jmpbuf; } jmpbuf_wrapper; diff --git a/converter/other/pnmtopng.c b/converter/other/pnmtopng.c index 5fc0326b..ed074777 100644 --- a/converter/other/pnmtopng.c +++ b/converter/other/pnmtopng.c @@ -69,6 +69,13 @@ #include "nstring.h" #include "version.h" +#if PNG_LIBPNG_VER >= 10400 +#error Your PNG library (<png.h>) is incompatible with this Netpbm source code. +#error You need either an older PNG library (older than 1.4) +#error newer Netpbm source code (at least 10.48) +#endif + + struct zlibCompression { /* These are parameters that describe a form of zlib compression. Values have the same meaning as the similarly named arguments to diff --git a/converter/ppm/ppmtompeg/jpeg.c b/converter/ppm/ppmtompeg/jpeg.c index 3aad6364..b51cf083 100644 --- a/converter/ppm/ppmtompeg/jpeg.c +++ b/converter/ppm/ppmtompeg/jpeg.c @@ -468,6 +468,8 @@ ReadJPEG(MpegFrame * const mf, */ #ifdef JPEG4 buffer_height = 8; /* could be 2, 4,8 rows high */ +#elif JPEG_LIB_VERSION >= 70 + buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_v_scaled_size; #else buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_scaled_size; #endif diff --git a/doc/HISTORY b/doc/HISTORY index 56ba54d9..9c823ad1 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,17 @@ Netpbm. CHANGE HISTORY -------------- +09.09.03 BJH Release 10.35.67 + + Build: fix failure to recognize static library in omitting + -R from link. + + Build: Make compile of pnmtopng and pngtopnm fail with helpful + error message when PNG library is incompatibly new (version 1.4 + or later). + + Build: work with JPEG library Version 7. + 09.07.23 BJH Release 10.35.66 Build: fix failure of a merge build on a system that doesn't |