diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2014-03-07 11:27:34 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2014-03-07 11:27:34 +0000 |
| commit | e238148d4241884157f5b6a0ac72d8f2739f6f3f (patch) | |
| tree | a6eb5c368eab02ec49b145c911ad452ce96213b6 /src/lib | |
| parent | 9d216954762b0177bc7eaef9af651988f7c79aec (diff) | |
[trunk] Another round of fixes for sign conversion warnings.
Update issue 256
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/openjp2/image.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/openjp2/image.c b/src/lib/openjp2/image.c index 1b14f685..24f868d4 100644 --- a/src/lib/openjp2/image.c +++ b/src/lib/openjp2/image.c @@ -106,23 +106,23 @@ void opj_image_comp_header_update(opj_image_t * p_image_header, const struct opj OPJ_INT32 l_comp_x0, l_comp_y0, l_comp_x1, l_comp_y1; opj_image_comp_t* l_img_comp = NULL; - l_x0 = opj_int_max(p_cp->tx0 , p_image_header->x0); - l_y0 = opj_int_max(p_cp->ty0 , p_image_header->y0); - l_x1 = opj_int_min(p_cp->tx0 + p_cp->tw * p_cp->tdx, p_image_header->x1); - l_y1 = opj_int_min(p_cp->ty0 + p_cp->th * p_cp->tdy, p_image_header->y1); + l_x0 = opj_int_max((OPJ_INT32)p_cp->tx0 , (OPJ_INT32)p_image_header->x0); + l_y0 = opj_int_max((OPJ_INT32)p_cp->ty0 , (OPJ_INT32)p_image_header->y0); + l_x1 = opj_int_min((OPJ_INT32)(p_cp->tx0 + p_cp->tw * p_cp->tdx), (OPJ_INT32)p_image_header->x1); + l_y1 = opj_int_min((OPJ_INT32)(p_cp->ty0 + p_cp->th * p_cp->tdy), (OPJ_INT32)p_image_header->y1); l_img_comp = p_image_header->comps; for (i = 0; i < p_image_header->numcomps; ++i) { - l_comp_x0 = opj_int_ceildiv(l_x0, l_img_comp->dx); - l_comp_y0 = opj_int_ceildiv(l_y0, l_img_comp->dy); - l_comp_x1 = opj_int_ceildiv(l_x1, l_img_comp->dx); - l_comp_y1 = opj_int_ceildiv(l_y1, l_img_comp->dy); - l_width = opj_int_ceildivpow2(l_comp_x1 - l_comp_x0, l_img_comp->factor); - l_height = opj_int_ceildivpow2(l_comp_y1 - l_comp_y0, l_img_comp->factor); + l_comp_x0 = opj_int_ceildiv(l_x0, (OPJ_INT32)l_img_comp->dx); + l_comp_y0 = opj_int_ceildiv(l_y0, (OPJ_INT32)l_img_comp->dy); + l_comp_x1 = opj_int_ceildiv(l_x1, (OPJ_INT32)l_img_comp->dx); + l_comp_y1 = opj_int_ceildiv(l_y1, (OPJ_INT32)l_img_comp->dy); + l_width = (OPJ_UINT32)opj_int_ceildivpow2(l_comp_x1 - l_comp_x0, (OPJ_INT32)l_img_comp->factor); + l_height = (OPJ_UINT32)opj_int_ceildivpow2(l_comp_y1 - l_comp_y0, (OPJ_INT32)l_img_comp->factor); l_img_comp->w = l_width; l_img_comp->h = l_height; - l_img_comp->x0 = l_comp_x0/*l_x0*/; - l_img_comp->y0 = l_comp_y0/*l_y0*/; + l_img_comp->x0 = (OPJ_UINT32)l_comp_x0/*l_x0*/; + l_img_comp->y0 = (OPJ_UINT32)l_comp_y0/*l_y0*/; ++l_img_comp; } } |