diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2020-05-06 01:44:55 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2020-05-06 01:44:55 +0000 |
| commit | 6d7dbf7b94a0fd7b38b33c98bae33bfcfc260ba9 (patch) | |
| tree | 3c422ec7afd7716d79ad029bef4fa8dff30ab4e1 | |
| parent | e9a1f733afee7133879affb4b11e4ac602f10718 (diff) | |
| download | netpbm-mirror-6d7dbf7b94a0fd7b38b33c98bae33bfcfc260ba9.tar.gz netpbm-mirror-6d7dbf7b94a0fd7b38b33c98bae33bfcfc260ba9.tar.xz netpbm-mirror-6d7dbf7b94a0fd7b38b33c98bae33bfcfc260ba9.zip | |
Release 10.90.02
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@3804 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | converter/pbm/pbmtonokia.c | 3 | ||||
| -rw-r--r-- | doc/HISTORY | 7 | ||||
| -rw-r--r-- | version.mk | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/converter/pbm/pbmtonokia.c b/converter/pbm/pbmtonokia.c index 73b62b96..80b0bd59 100644 --- a/converter/pbm/pbmtonokia.c +++ b/converter/pbm/pbmtonokia.c @@ -412,7 +412,8 @@ convertToNpm(bit ** const image, header[ 3] = 0; header[ 4] = len; header[ 5] = 0; - memcpy(&header[5], text, len); + if (text) + memcpy(&header[6], text, len); header[ 6 + len] = cols; header[ 7 + len] = rows; header[ 8 + len] = 1; diff --git a/doc/HISTORY b/doc/HISTORY index d607042b..03226aa1 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -3,6 +3,13 @@ Netpbm. CHANGE HISTORY -------------- + +20.05.06 BJH Release 10.90.02 + + pbmtonokia: Fix incorrect output with -txt option. + + pbmtonokia: Fix incorrect output with newer compiler. + 20.04.20 BJH Release 10.90.01 pnmtorle: Fix incorrect command and filename in header. diff --git a/version.mk b/version.mk index bfd7de0a..a1942f96 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 90 -NETPBM_POINT_RELEASE = 1 +NETPBM_POINT_RELEASE = 2 |