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

Patch from Callum Lewick. Fixed dwt.c where an alignment in buffer was problematic under x86_64.

This commit is contained in:
Francois-Olivier Devaux 2007-09-27 12:20:12 +00:00
parent 6265dcfb11
commit 4b60f17bba
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -5,6 +5,9 @@ What's New for OpenJPEG
! : changed ! : changed
+ : added + : added
September 27, 2007
* [FOD] Patch from Callum Lewick. Fixed dwt.c where an alignment in buffer was problematic under x86_64.
September 25, 2007 September 25, 2007
* [Mathieu Malaterre] BUG: Fix previous patch from Callum Lerwick. I have no * [Mathieu Malaterre] BUG: Fix previous patch from Callum Lerwick. I have no
clue what CMAKE_INSTALL_LIBDIR refers too. Bump up cmake 2.2 restriction to clue what CMAKE_INSTALL_LIBDIR refers too. Bump up cmake 2.2 restriction to

7
libopenjpeg/dwt.c
View File

@ -604,7 +604,6 @@ static void dwt_decode_tile(opj_tcd_tilecomp_t * tilec, int stop, DWT1DFN dwt_1D
int i, j, k; int i, j, k;
int *a = NULL; int *a = NULL;
int *aj = NULL; int *aj = NULL;
int *m;
int w; //, l; int w; //, l;
int rw; /* width of the resolution level computed */ int rw; /* width of the resolution level computed */
int rh; /* heigth of the resolution level computed */ int rh; /* heigth of the resolution level computed */
@ -619,8 +618,8 @@ static void dwt_decode_tile(opj_tcd_tilecomp_t * tilec, int stop, DWT1DFN dwt_1D
w = tilec->x1-tilec->x0; w = tilec->x1-tilec->x0;
a = tilec->data; a = tilec->data;
m = (int*)opj_malloc(sizeof(int) * (dwt_decode_max_resolution(tr, i)+5)); h.mem = (int*) opj_aligned_malloc(dwt_decode_max_resolution(tr, i) * sizeof(int));
h.mem = v.mem = (int*)( (unsigned)m + 16 - ( (unsigned)m % 16 ) ) ; v.mem = h.mem;
rw = tr->x1 - tr->x0; rw = tr->x1 - tr->x0;
rh = tr->y1 - tr->y0; rh = tr->y1 - tr->y0;
@ -657,5 +656,5 @@ static void dwt_decode_tile(opj_tcd_tilecomp_t * tilec, int stop, DWT1DFN dwt_1D
aj++; aj++;
} }
} }
opj_free(m); opj_aligned_free(h.mem);
} }