kumarashishg | 826308d | 2023-06-23 13:21:22 +0000 | [diff] [blame] | 1 | diff --git a/third_party/libopenjpeg/jp2.c b/third_party/libopenjpeg/jp2.c |
| 2 | index 7c065ba74..a5790b267 100644 |
| 3 | --- a/third_party/libopenjpeg/jp2.c |
| 4 | +++ b/third_party/libopenjpeg/jp2.c |
| 5 | @@ -1079,8 +1079,8 @@ static OPJ_BOOL opj_jp2_apply_pclr(opj_image_t *image, |
| 6 | assert(pcol == 0); |
| 7 | new_comps[i] = old_comps[cmp]; |
| 8 | } else { |
| 9 | - assert(i == pcol); |
| 10 | - new_comps[pcol] = old_comps[cmp]; |
| 11 | + assert( i == pcol ); // probably wrong? |
| 12 | + new_comps[i] = old_comps[cmp]; |
| 13 | } |
| 14 | |
| 15 | /* Palette mapping: */ |
| 16 | @@ -1108,7 +1108,7 @@ static OPJ_BOOL opj_jp2_apply_pclr(opj_image_t *image, |
| 17 | pcol = cmap[i].pcol; |
| 18 | src = old_comps[cmp].data; |
| 19 | assert(src); /* verified above */ |
| 20 | - max = new_comps[pcol].w * new_comps[pcol].h; |
| 21 | + max = new_comps[i].w * new_comps[i].h; |
| 22 | |
| 23 | /* Direct use: */ |
| 24 | if (cmap[i].mtyp == 0) { |
| 25 | @@ -1118,8 +1118,8 @@ static OPJ_BOOL opj_jp2_apply_pclr(opj_image_t *image, |
| 26 | dst[j] = src[j]; |
| 27 | } |
| 28 | } else { |
| 29 | - assert(i == pcol); |
| 30 | - dst = new_comps[pcol].data; |
| 31 | + assert( i == pcol ); // probably wrong? |
| 32 | + dst = new_comps[i].data; |
| 33 | assert(dst); |
| 34 | for (j = 0; j < max; ++j) { |
| 35 | /* The index */ |