diff options
| -rw-r--r-- | doc/HISTORY | 4 | ||||
| -rw-r--r-- | editor/pamsistoaglyph.c | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/doc/HISTORY b/doc/HISTORY index 0cd7f1c7..ddf752da 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -9,6 +9,10 @@ not yet BJH Release 10.98.00 pnmtosir: Set some possibly meaningless bits in output to zero so output is repeatable. + pamsistoaglyph: Fix invalid memory reference and incorrect + output on depth 1 input. Always broken. (pamsistoaglyph was + new in Netpbm 10.47 (June 2009). Thanks Scott Pakin. + pambayer: Fix bogus colors at edges. Always Broken (pambayer was new in Release 10.30 (October 2005)). diff --git a/editor/pamsistoaglyph.c b/editor/pamsistoaglyph.c index 6b093520..f9e25518 100644 --- a/editor/pamsistoaglyph.c +++ b/editor/pamsistoaglyph.c @@ -6,7 +6,7 @@ * * ---------------------------------------------------------------------- * - * Copyright (C) 2009 Scott Pakin <scott+pbm@pakin.org> + * Copyright (C) 2009-2022 Scott Pakin <scott+pbm@pakin.org> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -127,7 +127,10 @@ readAsGray( const char * const fileName, for (col = 0; col < pamP->width; ++col) { double YP, CbP, CrP; - pnm_YCbCrtuple( tuplerow[col], &YP, &CbP, &CrP ); + if (pamP->depth >= 3) + pnm_YCbCrtuple(tuplerow[col], &YP, &CbP, &CrP); + else + YP = (double) tuplerow[col][0]; grayArray[row][col] = (gray) (YP * maxGrayVal / (double)pamP->maxval); } |