diff options
-rw-r--r-- | converter/other/cameratopam/camera.c | 8 | ||||
-rw-r--r-- | converter/other/giftopnm.c | 2 | ||||
-rw-r--r-- | converter/other/pamtosvg/pxl-outline.c | 2 | ||||
-rw-r--r-- | converter/ppm/ppmtompeg/bsearch.c | 1 | ||||
-rw-r--r-- | doc/HISTORY | 13 | ||||
-rw-r--r-- | version.mk | 2 |
6 files changed, 21 insertions, 7 deletions
diff --git a/converter/other/cameratopam/camera.c b/converter/other/cameratopam/camera.c index 14d208e3..d318e379 100644 --- a/converter/other/cameratopam/camera.c +++ b/converter/other/cameratopam/camera.c @@ -15,6 +15,7 @@ #include "pm_config.h" #include "pm.h" #include "mallocvar.h" +#include "pm_c_util.h" #include "global_variables.h" #include "cameratopam.h" @@ -699,11 +700,12 @@ kodak_radc_load_raw(Image const image) { init_decoder(); getbits(ifp, -1); - for (i = 0; i < 3; ++i) { + for (i = 0; i < ARRAY_SIZE(buf); ++i) { unsigned int j; - for (j = 0; j < 3; ++j) { + for (j = 0; j < ARRAY_SIZE(buf[0]); ++j) { unsigned int k; - buf[i][j][k] = 2048; + for (k = 0; k < ARRAY_SIZE(buf[0][0]); ++k) + buf[i][j][k] = 2048; } } for (row=0; row < height; row+=4) { diff --git a/converter/other/giftopnm.c b/converter/other/giftopnm.c index 9f4bc8a1..96a6fc4c 100644 --- a/converter/other/giftopnm.c +++ b/converter/other/giftopnm.c @@ -365,7 +365,7 @@ getDataBlock(FILE * const ifP, pm_message("EOF or error in reading DataBlock size from file. %s", error); pm_strfree(error); - *errorP = FALSE; + *errorP = NULL; *eofP = TRUE; *lengthP = 0; } else { diff --git a/converter/other/pamtosvg/pxl-outline.c b/converter/other/pamtosvg/pxl-outline.c index 0dda3cc3..a1fa5299 100644 --- a/converter/other/pamtosvg/pxl-outline.c +++ b/converter/other/pamtosvg/pxl-outline.c @@ -269,7 +269,7 @@ findOneCenterline(bitmap_type const bitmap, */ { pm_pixelcoord pos; - pos.col = col; pos.row = bitmap.height - row - 1; + pos.col = originalCol; pos.row = bitmap.height - originalRow - 1; LOG2(" (%d,%d)", pos.col, pos.row); append_outline_pixel(&outline, pos); } diff --git a/converter/ppm/ppmtompeg/bsearch.c b/converter/ppm/ppmtompeg/bsearch.c index db34d95b..c618bbd4 100644 --- a/converter/ppm/ppmtompeg/bsearch.c +++ b/converter/ppm/ppmtompeg/bsearch.c @@ -834,7 +834,6 @@ BMotionSearchCross2(const LumBlock * const currentBlockP, interpErrF = FindBestMatch(&forwardBlock, currentBlockP, next, by, bx, &newMotion.bwd, bestErr, searchRangeB); - bestErr = min(bestErr, interpErr); interpErrB = FindBestMatch(&backBlock, currentBlockP, prev, by, bx, &newMotion.fwd, bestErr, searchRangeB); diff --git a/doc/HISTORY b/doc/HISTORY index d7526492..bcd928c6 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,19 @@ Netpbm. CHANGE HISTORY -------------- +15.03.03 BJH Release 10.69.06 + + pamtosvg: fix use of unset variable; probably results in a + crash. Always present (pamtosvg was new in Netpbm 10.33 (March + 2006). + + cameratopam: fix bug: variable used before set; unknown impact. + Introduced in Netpbm 10.66 (March 2014). + + build: fix incompatible type compilation error in giftopnm. + Broken in Netpbm 10.38 (March 2007) (but obviously manifests + only in recent build environments). + 15.01.25 BJH Release 10.69.05 pamtilt: fix bug: unconditional crash. Broken in Netpbm 10.63 diff --git a/version.mk b/version.mk index 03ce9e59..c05dacd0 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 69 -NETPBM_POINT_RELEASE = 5 +NETPBM_POINT_RELEASE = 6 |