walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

+ Antonin verified that the MacOS build of JPWL module suffered from a missing definition of the "min" macro; I've added this into both jpwl.h and rs.h

This commit is contained in:
Giuseppe Baruffa 2006-12-07 18:46:28 +00:00
parent 3adfd18602
commit 76ee6b8441
4 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -5,6 +5,9 @@ What's New for OpenJPEG
! : changed ! : changed
+ : added + : 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 December 05, 2006
* [Giuseppe Baruffa] Better fix of the TPH EPBs bug in JPWL module * [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 * [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

2
jpwl/JPWL_image_to_j2k.dsp
View File

@ -66,7 +66,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# 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 # 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
# ADD BASE RSC /l 0x80c /d "_DEBUG" # ADD BASE RSC /l 0x80c /d "_DEBUG"
# ADD RSC /l 0x80c /d "_DEBUG" # ADD RSC /l 0x80c /d "_DEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe

10
jpwl/jpwl.h
View File

@ -365,6 +365,16 @@ and get the CRC at the end
*/ */
#define jpwl_updateCRC32(CRC, DATA) updateCRC32(CRC, DATA) #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 */ #endif /* USE_JPWL */

9
jpwl/rs.h
View File

@ -94,6 +94,15 @@ int encode_rs(dtype data[], dtype bb[]);
*/ */
int eras_dec_rs(dtype data[], int eras_pos[], int no_eras); 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__ */ #endif /* __CRC32_HEADER__ */