diff options
| -rw-r--r-- | converter/other/cameratopam/foveon.c | 2 | ||||
| -rw-r--r-- | doc/HISTORY | 7 | ||||
| -rw-r--r-- | pm_config.in.h | 6 | ||||
| -rw-r--r-- | version.mk | 2 |
4 files changed, 9 insertions, 8 deletions
diff --git a/converter/other/cameratopam/foveon.c b/converter/other/cameratopam/foveon.c index aa42da36..f6d074fb 100644 --- a/converter/other/cameratopam/foveon.c +++ b/converter/other/cameratopam/foveon.c @@ -486,7 +486,7 @@ foveon_interpolate(float coeff[3][4]) { foveon_avg (image[row*width]+c, dscr[1], cfilt) * 3 - ddft[0][c][0] ) / 4 - ddft[0][c][1]; } - memcpy (black, black+8, sizeof *black*8); + memcpy (black, black+8, sizeof (*black)*8); memcpy (black+height-11, black+height-22, 11*sizeof *black); memcpy (last, black, sizeof last); diff --git a/doc/HISTORY b/doc/HISTORY index e41e5a4f..f7002c6d 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,13 @@ Netpbm. CHANGE HISTORY -------------- +14.09.08 BJH Release 10.67.05 + + cameratopam: fix buffer overflow. Always present. (cameratopam + was new in Netpbm 10.28 (June 2005)). + + Build: fix universal build failure introduced in 10.67.04. + 14.09.04 BJH Release 10.67.04 pcdovtoppm: Fix crash due to invalid operator == on some diff --git a/pm_config.in.h b/pm_config.in.h index d282cab7..ed1ebb89 100644 --- a/pm_config.in.h +++ b/pm_config.in.h @@ -74,12 +74,6 @@ ** for the format of the color database file. */ -#define RGB_DB_PATH \ -"/usr/share/netpbm/rgb.txt:" \ -"/usr/lib/X11/rgb.txt:" \ -"/usr/share/X11/rgb.txt:" \ -"/usr/X11R6/lib/X11/rgb.txt" - #if (defined(SYSV) || defined(__amigaos__)) #include <string.h> diff --git a/version.mk b/version.mk index e7245c05..5b6e8567 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 67 -NETPBM_POINT_RELEASE = 4 +NETPBM_POINT_RELEASE = 5 |