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

diff --git a/libopenjpeg/j2k_lib.h b/libopenjpeg/j2k_lib.h
index 84a68c06667cf9fa3c0e4e1dbe8b6af21aa42079..d13ac5fef39f09e426a9a7e4832bc67da9fb16ee 100644 (file)
--- 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 716f6b45bc79560795d6b39512ad50b4822ccc5c..d6d7e07d9365c1c6933cec8865f52f49b8a2f2c9 100644 (file)
--- 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(