diff options
| -rw-r--r-- | converter/other/cameratopam/identify.c | 11 | ||||
| -rw-r--r-- | doc/HISTORY | 5 | ||||
| -rw-r--r-- | version.mk | 2 |
3 files changed, 8 insertions, 10 deletions
diff --git a/converter/other/cameratopam/identify.c b/converter/other/cameratopam/identify.c index b99496b7..f0b21ce5 100644 --- a/converter/other/cameratopam/identify.c +++ b/converter/other/cameratopam/identify.c @@ -238,15 +238,8 @@ adobe_coeff() for (i=0; i < sizeof table / sizeof *table; i++) if (!strncmp (name, table[i].prefix, strlen(table[i].prefix))) { unsigned int j; - /* I have no idea what this code is supposed to do, but the way I - found it, it was setting the first 12 elements, instead of 4, - of cm[0]. But cm[0] has only 3 elements! So I just changed it - to use the first 3 "trans" values and ignore the rest. I - don't know if that produces useful results, but at least it - cures the array bounds violation. -Bryan 2010.04.09. - */ - for (j=0; j < 3; j++) - cm[0][j] = table[i].trans[j]; + for (j=0; j < 12; j++) + cm[j/4][j%4] = table[i].trans[j]; dng_coeff (cc, cm, xyz); break; } diff --git a/doc/HISTORY b/doc/HISTORY index f7002c6d..e88ba84f 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,11 @@ Netpbm. CHANGE HISTORY -------------- +not yet BJH Release 10.67.06 + + cameratopam: fix incorrect output introduced in Netpbm 10.51 + (June 2010). + 14.09.08 BJH Release 10.67.05 cameratopam: fix buffer overflow. Always present. (cameratopam diff --git a/version.mk b/version.mk index 5b6e8567..3db36b97 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 67 -NETPBM_POINT_RELEASE = 5 +NETPBM_POINT_RELEASE = 6 |