diff options
| author | Francois-Olivier Devaux <fodevaux@users.noreply.github.com> | 2007-08-21 12:57:39 +0000 |
|---|---|---|
| committer | Francois-Olivier Devaux <fodevaux@users.noreply.github.com> | 2007-08-21 12:57:39 +0000 |
| commit | 1d02a8b59505e2faace66ad5cbb607e994cc46eb (patch) | |
| tree | 208454018bf1bfb34e5239798fbf1d009a210aa0 /libopenjpeg | |
| parent | 07be749bf2a8a1ae27f31b24b2eb132f5537b665 (diff) | |
Use <xmmintrin.h> for WIN32, else use <mm_malloc.h>
Diffstat (limited to 'libopenjpeg')
| -rw-r--r-- | libopenjpeg/j2k_lib.h | 4 | ||||
| -rw-r--r-- | libopenjpeg/t1.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libopenjpeg/j2k_lib.h b/libopenjpeg/j2k_lib.h index 84a68c06..d13ac5fe 100644 --- a/libopenjpeg/j2k_lib.h +++ b/libopenjpeg/j2k_lib.h @@ -61,7 +61,11 @@ Allocate memory aligned to a 16 byte boundry @param size Bytes to allocate @return Returns a void pointer to the allocated space, or NULL if there is insufficient memory available */ +#ifdef WIN32 #include <xmmintrin.h> +#else +#include <mm_malloc.h> +#endif #define opj_aligned_malloc(size) _mm_malloc(size, 16) #define opj_aligned_free(m) _mm_free(m) diff --git a/libopenjpeg/t1.c b/libopenjpeg/t1.c index 716f6b45..d6d7e07d 100644 --- a/libopenjpeg/t1.c +++ b/libopenjpeg/t1.c @@ -1124,7 +1124,7 @@ void t1_decode_cblks( opj_tcd_precinct_t *prc = &band->precincts[precno]; for (cblkno = 0; cblkno < prc->cw * prc->ch; ++cblkno) { - int x, y, w, i, j, orient, cblk_w, cblk_h; + int x, y, w, i, j, cblk_w, cblk_h; opj_tcd_cblk_t *cblk = &prc->cblks[cblkno]; t1_decode_cblk( |