(thanks to Winfried for his help)

* [antonin] changed remaining "WIN32" to "_WIN32"
! [antonin] libopenjpeg has no more dependency on LCMS lib. Everything concerning color (icc profile, conversion to rgb, etc) has been put outside libopenjpeg and is used in j2k_to_image.c and mj2_to_frames.c.
- [antonin] removed "opj_convert{.c,.h}"
+ [antonin] added a directory "common/" that contains "getopt{.c,.h}" (previously in "codec/compat").
+ [antonin] added files "color{.c,.h}" in "common/" that define the code for icc profile management and sycc_to_rgb conversion
+ [antonin] added "common/format_defs.h" that contains common definitions used in image_to_j2k, j2k_to_image, j2k_dump.

1 files changed, 5 insertions, 5 deletions

diff --git a/OPJ_Validate/OPJ_Validate.c b/OPJ_Validate/OPJ_Validate.c
index 7153725a..9bd1da5b 100644
--- a/OPJ_Validate/OPJ_Validate.c
+++ b/OPJ_Validate/OPJ_Validate.c
@@ -26,9 +26,9 @@
 * POSSIBILITY OF SUCH DAMAGE.

 */

 

-#ifdef WIN32

+#ifdef _WIN32

 #include <windows.h>

-#endif

+#endif /* _WIN32 */

 #include <stdio.h>

 #include <string.h>

 #include "md5.h"

@@ -37,7 +37,7 @@
 

 int doprocess(char programme[4096],char command_line[4096]) {

 

-#ifdef WIN32

+#ifdef _WIN32

 	

 	int exit=STILL_ACTIVE;

 	STARTUPINFO siStartupInfo;

@@ -67,12 +67,12 @@ int doprocess(char programme[4096],char command_line[4096]) {
 	

 	return 0;

 

-#else // #ifndef WIN32

+#else /* !_WIN32 */

 	printf("\n%s\n", command_line);

 	system(command_line);

 	return 0;

 

-#endif

+#endif /* _WIN32 */

 	

 }