diff options
-rw-r--r-- | converter/other/jbig/libjbig/jbig.c | 2 | ||||
-rw-r--r-- | converter/other/jpeg2000/libjasper/jpc/jpc_util.c | 4 | ||||
-rw-r--r-- | doc/HISTORY | 11 | ||||
-rw-r--r-- | lib/libpbmfont2.c | 2 | ||||
-rw-r--r-- | version.mk | 2 |
5 files changed, 16 insertions, 5 deletions
diff --git a/converter/other/jbig/libjbig/jbig.c b/converter/other/jbig/libjbig/jbig.c index 0d29f770..ba9c6452 100644 --- a/converter/other/jbig/libjbig/jbig.c +++ b/converter/other/jbig/libjbig/jbig.c @@ -887,7 +887,7 @@ void jbg_enc_options(struct jbg_enc_state *s, int order, int options, if (order >= 0 && order <= 0x0f) s->order = order; if (options >= 0) s->options = options; if (l0 > 0) s->l0 = l0; - if (mx >= 0 && my < 128) s->mx = mx; + if (mx >= 0 && mx < 128) s->mx = mx; if (my >= 0 && my < 256) s->my = my; return; diff --git a/converter/other/jpeg2000/libjasper/jpc/jpc_util.c b/converter/other/jpeg2000/libjasper/jpc/jpc_util.c index 82f4b285..ecc4b914 100644 --- a/converter/other/jpeg2000/libjasper/jpc/jpc_util.c +++ b/converter/other/jpeg2000/libjasper/jpc/jpc_util.c @@ -151,7 +151,7 @@ int jpc_atoaf(const char *s, int *numvalues, double **values) if ((cp = strtok(buf, delim))) { ++n; while ((cp = strtok(0, delim))) { - if (cp != '\0') { + if (cp[0] != '\0') { ++n; } } @@ -169,7 +169,7 @@ int jpc_atoaf(const char *s, int *numvalues, double **values) vs[n] = atof(cp); ++n; while ((cp = strtok(0, delim))) { - if (cp != '\0') { + if (cp[0] != '\0') { vs[n] = atof(cp); ++n; } diff --git a/doc/HISTORY b/doc/HISTORY index 7076a357..a9939dad 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,17 @@ Netpbm. CHANGE HISTORY -------------- +18.10.02 BJH Release 10.84.01 + + pamtojpeg2k: fix incorrect interpretation of -ilyrrates option + when it contains multiple delimiter characters in a row. Always + broken (pamtojpeg2k was new in Netpbm 10.12 (November 2002)). + + pnmtojbig: fix incorrect handling of -x option. Always broken + (pnmtojbig was new in Netpbm 9.2 (May 2000)). + + Build: fix reference to nonexistent strndup on Mac OS X 10.6. + 18.09.29 BJH Release 10.84.00 Add pamaltsat. Thanks Anton Shepelev <anton.txt@gmail.com>. diff --git a/lib/libpbmfont2.c b/lib/libpbmfont2.c index 0ee7169c..e7189921 100644 --- a/lib/libpbmfont2.c +++ b/lib/libpbmfont2.c @@ -728,7 +728,7 @@ doCharsetRegistry(Readline * const readlineP, pm_message("CHARSET_REGISTRY in BDF font file is too long. " "Truncating"); - *registryP = strndup(readlineP->arg[1], maxTokenLen); + *registryP = pm_strdup(readlineP->arg[1]); *gotRegistryP = true; } diff --git a/version.mk b/version.mk index c8aa2495..de529f9a 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 84 -NETPBM_POINT_RELEASE = 0 +NETPBM_POINT_RELEASE = 1 |