walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

[trunk] JP3D: Fix issue with Z handling in packet iterator

This commit is contained in:
Mathieu Malaterre 2013-01-03 14:26:38 +00:00
parent 44fb38949b
commit ccd448d626
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib/openjp3d/pi.c
View File

@ -358,13 +358,16 @@ static bool pi_next_cprl(opj_pi_iterator_t * pi) {
comp = &pi->comps[pi->compno]; comp = &pi->comps[pi->compno];
pi->dx = 0; pi->dx = 0;
pi->dy = 0; pi->dy = 0;
pi->dz = 0;
for (resno = 0; resno < comp->numresolution[0]; resno++) { for (resno = 0; resno < comp->numresolution[0]; resno++) {
int dx, dy; int dx, dy, dz;
res = &comp->resolutions[resno]; res = &comp->resolutions[resno];
dx = comp->dx * (1 << (res->pdx + comp->numresolution[0] - 1 - resno)); dx = comp->dx * (1 << (res->pdx + comp->numresolution[0] - 1 - resno));
dy = comp->dy * (1 << (res->pdy + comp->numresolution[0] - 1 - resno)); dy = comp->dy * (1 << (res->pdy + comp->numresolution[1] - 1 - resno));
dz = comp->dz * (1 << (res->pdz + comp->numresolution[2] - 1 - resno));
pi->dx = !pi->dx ? dx : int_min(pi->dx, dx); pi->dx = !pi->dx ? dx : int_min(pi->dx, dx);
pi->dy = !pi->dy ? dy : int_min(pi->dy, dy); pi->dy = !pi->dy ? dy : int_min(pi->dy, dy);
pi->dz = !pi->dz ? dz : int_min(pi->dz, dz);
} }
for (pi->z = pi->tz0; pi->z < pi->tz1; pi->z += pi->dz - (pi->z % pi->dz)) { for (pi->z = pi->tz0; pi->z < pi->tz1; pi->z += pi->dz - (pi->z % pi->dz)) {
for (pi->y = pi->ty0; pi->y < pi->ty1; pi->y += pi->dy - (pi->y % pi->dy)) { for (pi->y = pi->ty0; pi->y < pi->ty1; pi->y += pi->dy - (pi->y % pi->dy)) {
@ -522,7 +525,7 @@ opj_pi_iterator_t *pi_create(opj_volume_t *volume, opj_cp_t *cp, int tileno) {
} }
levelnox = comp->numresolution[0] - 1 - resno; levelnox = comp->numresolution[0] - 1 - resno;
levelnoy = comp->numresolution[1] - 1 - resno; levelnoy = comp->numresolution[1] - 1 - resno;
levelnoz = comp->numresolution[2] - 1 - resno; levelnoz = comp->numresolution[2] - 1 - resno;
if (levelnoz < 0) levelnoz = 0; if (levelnoz < 0) levelnoz = 0;
diff = comp->numresolution[0] - comp->numresolution[2]; diff = comp->numresolution[0] - comp->numresolution[2];