diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2020-05-29 01:11:33 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2020-05-29 01:11:33 +0000 |
| commit | f71958bde7fda4f9b2c7a8f1ace344a1919be180 (patch) | |
| tree | 6f0ae49fa5afbad06ed9a399fe25a9437c354720 | |
| parent | 6d7dbf7b94a0fd7b38b33c98bae33bfcfc260ba9 (diff) | |
| download | netpbm-mirror-f71958bde7fda4f9b2c7a8f1ace344a1919be180.tar.gz netpbm-mirror-f71958bde7fda4f9b2c7a8f1ace344a1919be180.tar.xz netpbm-mirror-f71958bde7fda4f9b2c7a8f1ace344a1919be180.zip | |
Release 10.90.03
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@3819 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | converter/ppm/picttoppm.c | 3 | ||||
| -rw-r--r-- | doc/HISTORY | 11 | ||||
| -rw-r--r-- | version.mk | 2 |
3 files changed, 14 insertions, 2 deletions
diff --git a/converter/ppm/picttoppm.c b/converter/ppm/picttoppm.c index 9cf570e6..656e4e5f 100644 --- a/converter/ppm/picttoppm.c +++ b/converter/ppm/picttoppm.c @@ -1204,7 +1204,7 @@ doDiffSize(struct Rect const clipsrc, struct rgbPlanes const dst, unsigned int const dstwid) { - unsigned int const dstadd = dstwid - xsize; + unsigned int const dstadd = dstwid - rectwidth(&clipdst); FILE * pamscalePipeP; const char * command; @@ -1960,6 +1960,7 @@ ClipRgn(struct canvas * const canvasP, */ readRect(&clip_rect); + rectinter(clip_rect, picFrame, &clip_rect); /* XXX should clip this by picFrame */ if (verbose) dumpRect("clipping to", clip_rect); diff --git a/doc/HISTORY b/doc/HISTORY index 03226aa1..1c580e6d 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,17 @@ Netpbm. CHANGE HISTORY -------------- +20.05.29 BJH Release 10.90.03 + + picttoppm: Fix bug with an input file that specifies a clip + region (ClipRgn opcode) that is not contained within the + picture frame. Result is invalid memory access. Broken + some time 1994-2002. + + picttoppm: Fix incorrect output (sheared) when a blit must be + scaled. Broken in Netpbm 10.34 (June 2006) or 10.35 (August + 2006). + 20.05.06 BJH Release 10.90.02 pbmtonokia: Fix incorrect output with -txt option. diff --git a/version.mk b/version.mk index a1942f96..762da0b4 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 90 -NETPBM_POINT_RELEASE = 2 +NETPBM_POINT_RELEASE = 3 |