2020-11-28 22:49:27 +00:00
|
|
|
diff -rupN --no-dereference openjpeg-2.3.1/src/lib/openjp2/tcd.c openjpeg-2.3.1-new/src/lib/openjp2/tcd.c
|
|
|
|
|
--- openjpeg-2.3.1/src/lib/openjp2/tcd.c 2019-04-02 14:45:15.000000000 +0200
|
2020-12-17 15:52:52 +00:00
|
|
|
+++ openjpeg-2.3.1-new/src/lib/openjp2/tcd.c 2020-12-17 16:25:44.754030498 +0100
|
2020-11-28 22:49:27 +00:00
|
|
|
@@ -905,8 +905,24 @@ static INLINE OPJ_BOOL opj_tcd_init_tile
|
2020-10-15 20:20:13 +00:00
|
|
|
/* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000) */
|
|
|
|
|
l_tl_prc_x_start = opj_int_floordivpow2(l_res->x0, (OPJ_INT32)l_pdx) << l_pdx;
|
|
|
|
|
l_tl_prc_y_start = opj_int_floordivpow2(l_res->y0, (OPJ_INT32)l_pdy) << l_pdy;
|
|
|
|
|
- l_br_prc_x_end = opj_int_ceildivpow2(l_res->x1, (OPJ_INT32)l_pdx) << l_pdx;
|
|
|
|
|
- l_br_prc_y_end = opj_int_ceildivpow2(l_res->y1, (OPJ_INT32)l_pdy) << l_pdy;
|
|
|
|
|
+ {
|
|
|
|
|
+ OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->x1,
|
|
|
|
|
+ (OPJ_INT32)l_pdx)) << l_pdx;
|
|
|
|
|
+ if (tmp > (OPJ_UINT32)INT_MAX) {
|
|
|
|
|
+ opj_event_msg(manager, EVT_ERROR, "Integer overflow\n");
|
|
|
|
|
+ return OPJ_FALSE;
|
|
|
|
|
+ }
|
|
|
|
|
+ l_br_prc_x_end = (OPJ_INT32)tmp;
|
|
|
|
|
+ }
|
|
|
|
|
+ {
|
|
|
|
|
+ OPJ_UINT32 tmp = ((OPJ_UINT32)opj_int_ceildivpow2(l_res->y1,
|
|
|
|
|
+ (OPJ_INT32)l_pdy)) << l_pdy;
|
|
|
|
|
+ if (tmp > (OPJ_UINT32)INT_MAX) {
|
|
|
|
|
+ opj_event_msg(manager, EVT_ERROR, "Integer overflow\n");
|
|
|
|
|
+ return OPJ_FALSE;
|
|
|
|
|
+ }
|
|
|
|
|
+ l_br_prc_y_end = (OPJ_INT32)tmp;
|
|
|
|
|
+ }
|
|
|
|
|
/*fprintf(stderr, "\t\t\tprc_x_start=%d, prc_y_start=%d, br_prc_x_end=%d, br_prc_y_end=%d \n", l_tl_prc_x_start, l_tl_prc_y_start, l_br_prc_x_end ,l_br_prc_y_end );*/
|
|
|
|
|
|
|
|
|
|
l_res->pw = (l_res->x0 == l_res->x1) ? 0U : (OPJ_UINT32)((
|
