From 287be4e6832bca03d00e4e83bd6439129b54dff3 Mon Sep 17 00:00:00 2001
From: Antonin Descampe <antonin@gmail.com>
Date: Tue, 5 Oct 2010 20:58:04 +0000
Subject: [PATCH] minor bugs fixed (see issue 31 on googlecode - Thanks to
 winfried)

---
 libopenjpeg/j2k.c                    | 2 +-
 test_V2_tile_handling/test_decoder.c | 2 ++
 test_V2_tile_handling/test_encoder.c | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c
index 8e1aadab..d971a889 100644
--- 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 5f88876d..f7cfccb1 100644
--- 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 abdcaf20..b75196f6 100644
--- 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