minor bugs fixed (see issue 31 on googlecode - Thanks to winfried)

diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c
index 8e1aadabaab7d91b36bab30e9284ea01e0584f42..d971a8898ead1032a0e69e9fe16d69b8476a1a4f 100644 (file)
--- a/libopenjpeg/j2k.c
+++ b/libopenjpeg/j2k.c
@@ -1335,7 +1335,7 @@ const opj_dec_memory_marker_handler_t j2k_memory_marker_handler_tab [] =
   {J2K_MS_MCT, J2K_DEC_STATE_MH | J2K_DEC_STATE_TPH, j2k_read_mct},
   {J2K_MS_CBD, J2K_DEC_STATE_MH , j2k_read_cbd},
   {J2K_MS_MCC, J2K_DEC_STATE_MH | J2K_DEC_STATE_TPH, j2k_read_mcc},
-  {J2K_MS_MCO, J2K_DEC_STATE_MH | J2K_DEC_STATE_TPH, j2k_read_mco}
+  {J2K_MS_MCO, J2K_DEC_STATE_MH | J2K_DEC_STATE_TPH, j2k_read_mco},
 #ifdef USE_JPWL
   {J2K_MS_EPC, J2K_DEC_STATE_MH | J2K_DEC_STATE_TPH, j2k_read_epc},
   {J2K_MS_EPB, J2K_DEC_STATE_MH | J2K_DEC_STATE_TPH, j2k_read_epb},

diff --git a/test_V2_tile_handling/test_decoder.c b/test_V2_tile_handling/test_decoder.c
index 5f88876d8168e69859b5ca7df9fcbd2916fdd3c5..f7cfccb1721d56e20efbad1e54eecd91fb0b4b4b 100644 (file)
--- a/test_V2_tile_handling/test_decoder.c
+++ b/test_V2_tile_handling/test_decoder.c
@@ -32,6 +32,8 @@
 #include "stdlib.h"
 #ifdef WIN32
 #include <malloc.h>
+#else
+#include <stdlib.h>
 #endif
 #define DA_X0 0
 #define DA_Y0 0

diff --git a/test_V2_tile_handling/test_encoder.c b/test_V2_tile_handling/test_encoder.c
index abdcaf200ff7efc8862455b77c7241f294ea5ea5..b75196f61eb03bd9212124e406026a2302199621 100644 (file)
--- a/test_V2_tile_handling/test_encoder.c
+++ b/test_V2_tile_handling/test_encoder.c
@@ -34,6 +34,8 @@
 
 #ifdef WIN32
 #include "windows.h" // needed for rand() function
+#else
+#include <stdlib.h>
 #endif