Potential error in tcd_init around L543 with p and q

This commit is contained in:
Yannick Verschueren 2004-04-19 13:02:49 +00:00
parent e5106dd836
commit 4bbd79b370
1 changed files with 3 additions and 3 deletions

View File

@ -517,7 +517,7 @@ void tcd_init_encode(j2k_image_t * img, j2k_cp_t * cp, int curtileno)
void tcd_init(j2k_image_t * img, j2k_cp_t * cp) void tcd_init(j2k_image_t * img, j2k_cp_t * cp)
{ {
int tileno, compno, resno, bandno, precno, cblkno, i; int tileno, compno, resno, bandno, precno, cblkno, i;
unsigned int x0=0 , y0=0, x1 = 0, y1 = 0, w, h, j; unsigned int x0=0 , y0=0, x1 = 0, y1 = 0, w, h, j, p, q;
tcd_img = img; tcd_img = img;
tcd_cp = cp; tcd_cp = cp;
tcd_image.tw = cp->tw; tcd_image.tw = cp->tw;
@ -536,8 +536,8 @@ void tcd_init(j2k_image_t * img, j2k_cp_t * cp)
// int previous_x0, previous_x1, previous_y0, previous_y1; // int previous_x0, previous_x1, previous_y0, previous_y1;
/* cfr p59 ISO/IEC FDIS15444-1 : 2000 (18 august 2000) */ /* cfr p59 ISO/IEC FDIS15444-1 : 2000 (18 august 2000) */
int p = tileno % cp->tw; /* si numerotation matricielle .. */ p = tileno % cp->tw; /* si numerotation matricielle .. */
int q = tileno / cp->tw; /* .. coordonnees de la tile (q,p) q pour ligne et p pour colonne */ q = tileno / cp->tw; /* .. coordonnees de la tile (q,p) q pour ligne et p pour colonne */
/* 4 borders of the tile rescale on the image if necessary */ /* 4 borders of the tile rescale on the image if necessary */
tile->x0 = int_max(cp->tx0 + p * cp->tdx, img->x0); tile->x0 = int_max(cp->tx0 + p * cp->tdx, img->x0);