diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2018-10-02 14:29:55 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2018-10-02 14:29:55 +0000 |
commit | 7fc46bb79f04fd0ba77284382c0ce4a74f34f2a3 (patch) | |
tree | 2105c0c18fca6cf800c68091874cf4ff1be08fc7 /converter | |
parent | e227331a6b5626e100705fcff3269fd8479ea988 (diff) | |
download | netpbm-mirror-7fc46bb79f04fd0ba77284382c0ce4a74f34f2a3.tar.gz netpbm-mirror-7fc46bb79f04fd0ba77284382c0ce4a74f34f2a3.tar.xz netpbm-mirror-7fc46bb79f04fd0ba77284382c0ce4a74f34f2a3.zip |
Release 10.84.01
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@3369 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter')
-rw-r--r-- | converter/other/jbig/libjbig/jbig.c | 2 | ||||
-rw-r--r-- | converter/other/jpeg2000/libjasper/jpc/jpc_util.c | 4 |
2 files changed, 3 insertions, 3 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; } |