+ Antonin verified that the MacOS build of JPWL module suffered from a missing defini...

diff --git a/ChangeLog b/ChangeLog
index 20f816a832c65e686c7cd60a6d3dd7ac03178b3d..dcccc9ec6c98b6202faf1c78c46eff837fae42e5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+December 07, 2006
++ [Giuseppe Baruffa] Antonin verified that the MacOS build suffered from a missing definition of the "min" macro; I've added this definition (properly #ifndef'ed) into both jpwl.h and rs.h
+
 December 05, 2006
 * [Giuseppe Baruffa] Better fix of the TPH EPBs bug in JPWL module
 * [GB] Fixed the UEP bug in JPWL module; now, during a UEP specification, RS protection or CRC check can be switched off for selected range of packets, and consequently reswitched on without confusing the decoder

diff --git a/jpwl/JPWL_image_to_j2k.dsp b/jpwl/JPWL_image_to_j2k.dsp
index f1fb5385a4165eb9718d7845b7516bf17cee99d5..f924ee187a680f63102c1a09f9937b950db7f2b8 100644 (file)
--- a/jpwl/JPWL_image_to_j2k.dsp
+++ b/jpwl/JPWL_image_to_j2k.dsp
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../libopenjpeg" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "OPJ_STATIC" /D "USE_JPWL" /FD /GZ /c\r
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../libopenjpeg" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "OPJ_STATIC" /D "USE_JPWL" /FR /FD /GZ /c\r
 # ADD BASE RSC /l 0x80c /d "_DEBUG"\r
 # ADD RSC /l 0x80c /d "_DEBUG"\r
 BSC32=bscmake.exe\r

diff --git a/jpwl/jpwl.h b/jpwl/jpwl.h
index a533e3a371439a90eae2763780dae6e9811f23fe..8af80fdb1695a207c094ad1ad063405d5198b922 100644 (file)
--- a/jpwl/jpwl.h
+++ b/jpwl/jpwl.h
@@ -365,6 +365,16 @@ and get the CRC at the end
 */
 #define jpwl_updateCRC32(CRC, DATA) updateCRC32(CRC, DATA)
 
+/**
+Computes the minimum between two integers
+@param a first integer to compare
+@param b second integer to compare
+@return returns the minimum integer between a and b
+*/
+#ifndef min
+#define min(a,b)    (((a) < (b)) ? (a) : (b))
+#endif /* min */
+
 /*@}*/
 
 #endif /* USE_JPWL */

diff --git a/jpwl/rs.h b/jpwl/rs.h
index b303af79daf01ea2d44161edb339e6edc3d22cb6..047d9c2f55887816c081f3f7af57a8b6ccb16f43 100644 (file)
--- a/jpwl/rs.h
+++ b/jpwl/rs.h
@@ -94,6 +94,15 @@ int encode_rs(dtype data[], dtype bb[]);
  */
 int eras_dec_rs(dtype data[], int eras_pos[], int no_eras);
 
+/**
+Computes the minimum between two integers
+@param a first integer to compare
+@param b second integer to compare
+@return returns the minimum integer between a and b
+*/
+#ifndef min
+#define min(a,b)    (((a) < (b)) ? (a) : (b))
+#endif /* min */
 
 #endif /* __CRC32_HEADER__ */