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

[trunk] WIP: solve problems with reading of elements outside the tilec->data buffer in dwt

This commit is contained in:
Mickael Savinaud 2011-10-25 12:27:51 +00:00
parent 2808de6084
commit 08bc3b0386
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -5,6 +5,9 @@ What's New for OpenJPEG
! : changed ! : changed
+ : added + : added
October 25, 2011
* [mickael] WIP: solve problems with reading of elements outside the tilec->data buffer in dwt
October 21, 2011 October 21, 2011
+ [mickael] WIP: manage output image with area correponding to the set decoded area + [mickael] WIP: manage output image with area correponding to the set decoded area
+ [mickael] WIP: enhance codestream index generation + [mickael] WIP: enhance codestream index generation

28
libopenjpeg/dwt.c
View File

@ -766,8 +766,7 @@ static void v4dwt_interleave_h(v4dwt_t* restrict w, float* restrict a, int x, in
int i, k; int i, k;
for(k = 0; k < 2; ++k){ for(k = 0; k < 2; ++k){
if (count + 3 * x < size && ((size_t) a & 0x0f) == 0 && if ( count + 3 * x < size && ((size_t) a & 0x0f) == 0 && ((size_t) bi & 0x0f) == 0 && (x & 0x0f) == 0 ) {
((size_t) bi & 0x0f) == 0 && (x & 0x0f) == 0) {
/* Fast code path */ /* Fast code path */
for(i = 0; i < count; ++i){ for(i = 0; i < count; ++i){
int j = i; int j = i;
@ -786,14 +785,14 @@ static void v4dwt_interleave_h(v4dwt_t* restrict w, float* restrict a, int x, in
int j = i; int j = i;
bi[i*8 ] = a[j]; bi[i*8 ] = a[j];
j += x; j += x;
if(j > size) continue; if(j >= size) continue;
bi[i*8 + 1] = a[j]; bi[i*8 + 1] = a[j];
j += x; j += x;
if(j > size) continue; if(j >= size) continue;
bi[i*8 + 2] = a[j]; bi[i*8 + 2] = a[j];
j += x; j += x;
if(j > size) continue; if(j >= size) continue;
bi[i*8 + 3] = a[j]; bi[i*8 + 3] = a[j]; /* This one*/
} }
} }
@ -804,16 +803,19 @@ static void v4dwt_interleave_h(v4dwt_t* restrict w, float* restrict a, int x, in
} }
} }
static void v4dwt_interleave_v(v4dwt_t* restrict v , float* restrict a , int x){ static void v4dwt_interleave_v(v4dwt_t* restrict v , float* restrict a , int x, int nb_elts_read){
v4* restrict bi = v->wavelet + v->cas; v4* restrict bi = v->wavelet + v->cas;
int i; int i;
for(i = 0; i < v->sn; ++i){ for(i = 0; i < v->sn; ++i){
memcpy(&bi[i*2], &a[i*x], 4 * sizeof(float)); memcpy(&bi[i*2], &a[i*x], nb_elts_read * sizeof(float));
} }
a += v->sn * x; a += v->sn * x;
bi = v->wavelet + 1 - v->cas; bi = v->wavelet + 1 - v->cas;
for(i = 0; i < v->dn; ++i){ for(i = 0; i < v->dn; ++i){
memcpy(&bi[i*2], &a[i*x], 4 * sizeof(float)); memcpy(&bi[i*2], &a[i*x], nb_elts_read * sizeof(float));
} }
} }
@ -1037,7 +1039,7 @@ opj_bool dwt_decode_real(opj_tcd_tilecomp_t* restrict tilec, int numres){
aj = (float*) tilec->data; aj = (float*) tilec->data;
for(j = rw; j > 3; j -= 4){ for(j = rw; j > 3; j -= 4){
int k; int k;
v4dwt_interleave_v(&v, aj, w); v4dwt_interleave_v(&v, aj, w, 4);
v4dwt_decode(&v); v4dwt_decode(&v);
for(k = 0; k < rh; ++k){ for(k = 0; k < rh; ++k){
memcpy(&aj[k*w], &v.wavelet[k], 4 * sizeof(float)); memcpy(&aj[k*w], &v.wavelet[k], 4 * sizeof(float));
@ -1047,7 +1049,7 @@ opj_bool dwt_decode_real(opj_tcd_tilecomp_t* restrict tilec, int numres){
if (rw & 0x03){ if (rw & 0x03){
int k; int k;
j = rw & 0x03; j = rw & 0x03;
v4dwt_interleave_v(&v, aj, w); v4dwt_interleave_v(&v, aj, w, j);
v4dwt_decode(&v); v4dwt_decode(&v);
for(k = 0; k < rh; ++k){ for(k = 0; k < rh; ++k){
memcpy(&aj[k*w], &v.wavelet[k], j * sizeof(float)); memcpy(&aj[k*w], &v.wavelet[k], j * sizeof(float));
@ -1130,7 +1132,7 @@ opj_bool dwt_decode_real_v2(opj_tcd_tilecomp_v2_t* restrict tilec, OPJ_UINT32 nu
for(j = rw; j > 3; j -= 4){ for(j = rw; j > 3; j -= 4){
OPJ_INT32 k; OPJ_INT32 k;
v4dwt_interleave_v(&v, aj, w); v4dwt_interleave_v(&v, aj, w, 4);
v4dwt_decode(&v); v4dwt_decode(&v);
for(k = 0; k < rh; ++k){ for(k = 0; k < rh; ++k){
@ -1144,7 +1146,7 @@ opj_bool dwt_decode_real_v2(opj_tcd_tilecomp_v2_t* restrict tilec, OPJ_UINT32 nu
j = rw & 0x03; j = rw & 0x03;
v4dwt_interleave_v(&v, aj, w); v4dwt_interleave_v(&v, aj, w, j);
v4dwt_decode(&v); v4dwt_decode(&v);
for(k = 0; k < rh; ++k){ for(k = 0; k < rh; ++k){