diff options
| author | Francois-Olivier Devaux <fodevaux@users.noreply.github.com> | 2005-06-02 15:14:33 +0000 |
|---|---|---|
| committer | Francois-Olivier Devaux <fodevaux@users.noreply.github.com> | 2005-06-02 15:14:33 +0000 |
| commit | cf4f8be5f030575af56240f810d17bbf6d216f9e (patch) | |
| tree | ef287b34c4c0df69048446ec2925ddc89b0225ae | |
| parent | ec1b970a32f95c094423b7d74d8191fde0ca37a4 (diff) | |
Conversions from int to unsigned int to ensure correct execution of int_min at line 626 to 628
| -rw-r--r-- | libopenjpeg/j2k.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c index f45d6f42..fff1c2f8 100644 --- a/libopenjpeg/j2k.c +++ b/libopenjpeg/j2k.c @@ -623,9 +623,9 @@ void j2k_read_poc() poc = &tcp->pocs[i]; poc->resno0 = cio_read(1); /* RSpoc_i */ poc->compno0 = cio_read(j2k_img->numcomps <= 256 ? 1 : 2); /* CSpoc_i */ - poc->layno1 = int_min(cio_read(2), tcp->numlayers); /* LYEpoc_i */ - poc->resno1 = int_min(cio_read(1), tccp->numresolutions); /* REpoc_i */ - poc->compno1 = int_min(cio_read(j2k_img->numcomps <= 256 ? 1 : 2), j2k_img->numcomps); /* CEpoc_i */ + poc->layno1 = int_min(cio_read(2), (unsigned int) tcp->numlayers); /* LYEpoc_i */ + poc->resno1 = int_min(cio_read(1), (unsigned int) tccp->numresolutions); /* REpoc_i */ + poc->compno1 = int_min(cio_read(j2k_img->numcomps <= 256 ? 1 : 2), (unsigned int) j2k_img->numcomps); /* CEpoc_i */ poc->prg = cio_read(1); /* Ppoc_i */ } |