diff options
| -rw-r--r-- | Makefile.version | 2 | ||||
| -rwxr-xr-x | buildtools/configure.pl | 6 | ||||
| -rw-r--r-- | converter/ppm/picttoppm.c | 10 | ||||
| -rw-r--r-- | doc/HISTORY | 10 |
4 files changed, 19 insertions, 9 deletions
diff --git a/Makefile.version b/Makefile.version index d90042fb..1c207431 100644 --- a/Makefile.version +++ b/Makefile.version @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 35 -NETPBM_POINT_RELEASE = 25 +NETPBM_POINT_RELEASE = 26 diff --git a/buildtools/configure.pl b/buildtools/configure.pl index 464c89d0..b7f231af 100755 --- a/buildtools/configure.pl +++ b/buildtools/configure.pl @@ -584,9 +584,11 @@ sub libSuffix($) { #----------------------------------------------------------------------------- my $suffix; - if ($platform eq 'windows') { + if ($platform eq 'WINDOWS') { + $suffix = '.dll'; + } elsif ($platform eq 'AIX') { $suffix = '.a'; - } elsif ($platform eq 'darwin') { + } elsif ($platform eq 'DARWIN') { $suffix = '.dylib'; } else { $suffix = '.so'; diff --git a/converter/ppm/picttoppm.c b/converter/ppm/picttoppm.c index cfc5760e..e31d5169 100644 --- a/converter/ppm/picttoppm.c +++ b/converter/ppm/picttoppm.c @@ -1574,6 +1574,8 @@ allocPlanes(struct rgbPlanes * const planesP) { memset(planes.grn, 255, planelen * sizeof(word)); memset(planes.blu, 255, planelen * sizeof(word)); + *planesP = planes; + /* Until we wean this program off of global variables, we have to set these: */ @@ -2170,15 +2172,11 @@ copyPixelGroup(unsigned char * const block, unpackBuf(&block[1], groupLen * pkpixsize, bitsPerPixel, &bytePixels, &bytePixelLen); - if (bytePixelLen > destSize) - pm_error("Invalid PICT image. It contains a row with more pixels " - "than the width of the image"); - - for (i = 0; i < bytePixelLen; ++i) + for (i = 0; i < MIN(bytePixelLen, destSize); ++i) dest[i] = bytePixels[i]; *blockLengthP = blockLength; - *rasterBytesGeneratedP = bytePixelLen; + *rasterBytesGeneratedP = MIN(bytePixelLen, destSize); } } diff --git a/doc/HISTORY b/doc/HISTORY index 97f3fa80..9a5f379b 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,16 @@ Netpbm. CHANGE HISTORY -------------- +07.04.07 BJH Release 10.35.26 + + picttoppm: Fix wild memory reference in all use cases. + + picttoppm: Fix for multi-pixel-per-byte image in which + it says the image has a row that is too long (because of + padding). + + configure: fix choice of default library suffix. + 07.03.23 BJH Release 10.35.25 pnmremap: fix incorrect output with map file deeper than |