Use <xmmintrin.h> for WIN32, else use <mm_malloc.h>

This commit is contained in:
Francois-Olivier Devaux 2007-08-21 12:57:39 +00:00
parent 07be749bf2
commit 1d02a8b595
2 changed files with 5 additions and 1 deletions

View File

@ -61,7 +61,11 @@ Allocate memory aligned to a 16 byte boundry
@param size Bytes to allocate @param size Bytes to allocate
@return Returns a void pointer to the allocated space, or NULL if there is insufficient memory available @return Returns a void pointer to the allocated space, or NULL if there is insufficient memory available
*/ */
#ifdef WIN32
#include <xmmintrin.h> #include <xmmintrin.h>
#else
#include <mm_malloc.h>
#endif
#define opj_aligned_malloc(size) _mm_malloc(size, 16) #define opj_aligned_malloc(size) _mm_malloc(size, 16)
#define opj_aligned_free(m) _mm_free(m) #define opj_aligned_free(m) _mm_free(m)

View File

@ -1124,7 +1124,7 @@ void t1_decode_cblks(
opj_tcd_precinct_t *prc = &band->precincts[precno]; opj_tcd_precinct_t *prc = &band->precincts[precno];
for (cblkno = 0; cblkno < prc->cw * prc->ch; ++cblkno) { 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]; opj_tcd_cblk_t *cblk = &prc->cblks[cblkno];
t1_decode_cblk( t1_decode_cblk(