74 lines
4.2 KiB
Diff
74 lines
4.2 KiB
Diff
diff --git a/third_party/libopenjpeg/j2k.c b/third_party/libopenjpeg/j2k.c
|
|
index 889c2cfc8..711dd73e8 100644
|
|
--- a/third_party/libopenjpeg/j2k.c
|
|
+++ b/third_party/libopenjpeg/j2k.c
|
|
@@ -2299,10 +2299,8 @@ static OPJ_BOOL opj_j2k_read_siz(opj_j2k_t *p_j2k,
|
|
}
|
|
|
|
/* Compute the number of tiles */
|
|
- l_cp->tw = (OPJ_UINT32)opj_int_ceildiv((OPJ_INT32)(l_image->x1 - l_cp->tx0),
|
|
- (OPJ_INT32)l_cp->tdx);
|
|
- l_cp->th = (OPJ_UINT32)opj_int_ceildiv((OPJ_INT32)(l_image->y1 - l_cp->ty0),
|
|
- (OPJ_INT32)l_cp->tdy);
|
|
+ l_cp->tw = opj_uint_ceildiv(l_image->x1 - l_cp->tx0, l_cp->tdx);
|
|
+ l_cp->th = opj_uint_ceildiv(l_image->y1 - l_cp->ty0, l_cp->tdy);
|
|
|
|
/* Check that the number of tiles is valid */
|
|
if (l_cp->tw == 0 || l_cp->th == 0 || l_cp->tw > 65535 / l_cp->th) {
|
|
@@ -2319,12 +2317,10 @@ static OPJ_BOOL opj_j2k_read_siz(opj_j2k_t *p_j2k,
|
|
(p_j2k->m_specific_param.m_decoder.m_start_tile_x - l_cp->tx0) / l_cp->tdx;
|
|
p_j2k->m_specific_param.m_decoder.m_start_tile_y =
|
|
(p_j2k->m_specific_param.m_decoder.m_start_tile_y - l_cp->ty0) / l_cp->tdy;
|
|
- p_j2k->m_specific_param.m_decoder.m_end_tile_x = (OPJ_UINT32)opj_int_ceildiv((
|
|
- OPJ_INT32)(p_j2k->m_specific_param.m_decoder.m_end_tile_x - l_cp->tx0),
|
|
- (OPJ_INT32)l_cp->tdx);
|
|
- p_j2k->m_specific_param.m_decoder.m_end_tile_y = (OPJ_UINT32)opj_int_ceildiv((
|
|
- OPJ_INT32)(p_j2k->m_specific_param.m_decoder.m_end_tile_y - l_cp->ty0),
|
|
- (OPJ_INT32)l_cp->tdy);
|
|
+ p_j2k->m_specific_param.m_decoder.m_end_tile_x = opj_uint_ceildiv(
|
|
+ p_j2k->m_specific_param.m_decoder.m_end_tile_x - l_cp->tx0, l_cp->tdx);
|
|
+ p_j2k->m_specific_param.m_decoder.m_end_tile_y = opj_uint_ceildiv(
|
|
+ p_j2k->m_specific_param.m_decoder.m_end_tile_y - l_cp->ty0, l_cp->tdy);
|
|
} else {
|
|
p_j2k->m_specific_param.m_decoder.m_start_tile_x = 0;
|
|
p_j2k->m_specific_param.m_decoder.m_start_tile_y = 0;
|
|
@@ -10035,10 +10029,8 @@ static OPJ_BOOL opj_j2k_update_image_dimensions(opj_image_t* p_image,
|
|
return OPJ_FALSE;
|
|
}
|
|
|
|
- l_img_comp->x0 = (OPJ_UINT32)opj_int_ceildiv((OPJ_INT32)p_image->x0,
|
|
- (OPJ_INT32)l_img_comp->dx);
|
|
- l_img_comp->y0 = (OPJ_UINT32)opj_int_ceildiv((OPJ_INT32)p_image->y0,
|
|
- (OPJ_INT32)l_img_comp->dy);
|
|
+ l_img_comp->x0 = opj_uint_ceildiv(p_image->x0, l_img_comp->dx);
|
|
+ l_img_comp->y0 = opj_uint_ceildiv(p_image->y0, l_img_comp->dy);
|
|
l_comp_x1 = opj_int_ceildiv((OPJ_INT32)p_image->x1, (OPJ_INT32)l_img_comp->dx);
|
|
l_comp_y1 = opj_int_ceildiv((OPJ_INT32)p_image->y1, (OPJ_INT32)l_img_comp->dy);
|
|
|
|
@@ -11950,10 +11942,8 @@ OPJ_BOOL opj_j2k_get_tile(opj_j2k_t *p_j2k,
|
|
|
|
l_img_comp->factor = p_j2k->m_private_image->comps[compno].factor;
|
|
|
|
- l_img_comp->x0 = (OPJ_UINT32)opj_int_ceildiv((OPJ_INT32)p_image->x0,
|
|
- (OPJ_INT32)l_img_comp->dx);
|
|
- l_img_comp->y0 = (OPJ_UINT32)opj_int_ceildiv((OPJ_INT32)p_image->y0,
|
|
- (OPJ_INT32)l_img_comp->dy);
|
|
+ l_img_comp->x0 = opj_uint_ceildiv(p_image->x0, l_img_comp->dx);
|
|
+ l_img_comp->y0 = opj_uint_ceildiv(p_image->y0, l_img_comp->dy);
|
|
l_comp_x1 = opj_int_ceildiv((OPJ_INT32)p_image->x1, (OPJ_INT32)l_img_comp->dx);
|
|
l_comp_y1 = opj_int_ceildiv((OPJ_INT32)p_image->y1, (OPJ_INT32)l_img_comp->dy);
|
|
|
|
@@ -12304,10 +12294,8 @@ static void opj_get_tile_dimensions(opj_image_t * l_image,
|
|
|
|
*l_width = (OPJ_UINT32)(l_tilec->x1 - l_tilec->x0);
|
|
*l_height = (OPJ_UINT32)(l_tilec->y1 - l_tilec->y0);
|
|
- *l_offset_x = (OPJ_UINT32)opj_int_ceildiv((OPJ_INT32)l_image->x0,
|
|
- (OPJ_INT32)l_img_comp->dx);
|
|
- *l_offset_y = (OPJ_UINT32)opj_int_ceildiv((OPJ_INT32)l_image->y0,
|
|
- (OPJ_INT32)l_img_comp->dy);
|
|
+ *l_offset_x = opj_uint_ceildiv(l_image->x0, l_img_comp->dx);
|
|
+ *l_offset_y = opj_uint_ceildiv(l_image->y0, l_img_comp->dy);
|
|
*l_image_width = (OPJ_UINT32)opj_int_ceildiv((OPJ_INT32)l_image->x1 -
|
|
(OPJ_INT32)l_image->x0, (OPJ_INT32)l_img_comp->dx);
|
|
*l_stride = *l_image_width - *l_width;
|