diff options
| author | Francois-Olivier Devaux <fodevaux@users.noreply.github.com> | 2010-04-08 18:43:29 +0000 |
|---|---|---|
| committer | Francois-Olivier Devaux <fodevaux@users.noreply.github.com> | 2010-04-08 18:43:29 +0000 |
| commit | f9e6b811769d92a307bc7f0fd52d552ddd57551c (patch) | |
| tree | a288d08525e3d1ae9916db8a7ce9fb73d741f865 /libopenjpeg | |
| parent | a346da059980dbced6ce005c61c27c4d9ae2d026 (diff) | |
[v2.0] Fixed pi.c bug (issue 15 on google code). Thanks to Anton Lionel for catching this.
Diffstat (limited to 'libopenjpeg')
| -rw-r--r-- | libopenjpeg/pi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libopenjpeg/pi.c b/libopenjpeg/pi.c index 5dc75dc2..7a433596 100644 --- a/libopenjpeg/pi.c +++ b/libopenjpeg/pi.c @@ -345,7 +345,7 @@ if (!pi->tp_on){ try1 = int_ceildiv(pi->ty1, comp->dy << levelno); rpx = res->pdx + levelno; rpy = res->pdy + levelno; - if (!((pi->y % (comp->dy << rpy) == 0) || ((pi->y == pi->ty0) && ((try0 << levelno) % (1 << rpx))))){ + if (!((pi->y % (comp->dy << rpy) == 0) || ((pi->y == pi->ty0) && ((try0 << levelno) % (1 << rpy))))){ continue; } if (!((pi->x % (comp->dx << rpx) == 0) || ((pi->x == pi->tx0) && ((trx0 << levelno) % (1 << rpx))))){ @@ -427,7 +427,7 @@ static bool pi_next_pcrl(opj_pi_iterator_t * pi) { try1 = int_ceildiv(pi->ty1, comp->dy << levelno); rpx = res->pdx + levelno; rpy = res->pdy + levelno; - if (!((pi->y % (comp->dy << rpy) == 0) || ((pi->y == pi->ty0) && ((try0 << levelno) % (1 << rpx))))){ + if (!((pi->y % (comp->dy << rpy) == 0) || ((pi->y == pi->ty0) && ((try0 << levelno) % (1 << rpy))))){ continue; } if (!((pi->x % (comp->dx << rpx) == 0) || ((pi->x == pi->tx0) && ((trx0 << levelno) % (1 << rpx))))){ @@ -507,14 +507,14 @@ static bool pi_next_cprl(opj_pi_iterator_t * pi) { try1 = int_ceildiv(pi->ty1, comp->dy << levelno); rpx = res->pdx + levelno; rpy = res->pdy + levelno; - if (!((pi->y % (comp->dy << rpy) == 0) || ((pi->y == pi->ty0) && ((try0 << levelno) % (1 << rpx))))){ + if (!((pi->y % (comp->dy << rpy) == 0) || ((pi->y == pi->ty0) && ((try0 << levelno) % (1 << rpy))))){ continue; } if (!((pi->x % (comp->dx << rpx) == 0) || ((pi->x == pi->tx0) && ((trx0 << levelno) % (1 << rpx))))){ continue; } - if ((res->pw==0)||(res->pw==0)) continue; + if ((res->pw==0)||(res->ph==0)) continue; if ((trx0==trx1)||(try0==try1)) continue; |