(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.

diff --git a/Makefile.nix b/Makefile.nix
index 0dd57ea3f16fe0a4f6326536287bbf7570b8c90a..4ca053e539a3d2a991599a33c6cab5085f985fae 100644 (file)
--- a/Makefile.nix
+++ b/Makefile.nix
@@ -21,8 +21,6 @@ INCLS = ./libjp3dvm/t1_3d.h ./libjp3dvm/bio.h ./libjp3dvm/cio.h \
 
 INCLUDE = -I.. -Ilibjp3dvm
 
-AR = ar
-
 INSTALL_LIBDIR = $(prefix)/lib
 headerdir = openjpeg3d-$(JP3D_MAJOR).$(JP3D_MINOR)
 INSTALL_INCLUDE = $(prefix)/include/$(headerdir)

diff --git a/codec/convert.c b/codec/convert.c
index b9aa656fa4a92d8ff99e26e43fd7adccfddecf93..99eb7f2ed81dbba56112528cc1e12473468d3afa 100755 (executable)
--- a/codec/convert.c
+++ b/codec/convert.c
@@ -32,11 +32,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include "../libjp3dvm/openjpeg.h"
-#ifdef WIN32
+#ifdef _WIN32
 #include "windirent.h"
 #else
 #include <dirent.h>
-#endif /* WIN32 */
+#endif /* _WIN32 */
 
 
 

diff --git a/codec/jp3d_to_volume.c b/codec/jp3d_to_volume.c
index ee4425f2a4c28cacba70b32038183da8760bdc99..995faaecccf0769e6be8a84b5124927567713750 100755 (executable)
--- a/codec/jp3d_to_volume.c
+++ b/codec/jp3d_to_volume.c
@@ -37,10 +37,12 @@
 #include "getopt.h"\r
 #include "convert.h"\r
 \r
-#ifndef WIN32\r
+#ifdef _WIN32\r
+#include <windows.h>\r
+#else\r
 #define stricmp strcasecmp\r
 #define strnicmp strncasecmp\r
-#endif\r
+#endif /* _WIN32 */\r
 \r
 /* ----------------------------------------------------------------------- */\r
 static double calc_PSNR(opj_volume_t *original, opj_volume_t *decoded)\r

diff --git a/codec/volume_to_jp3d.c b/codec/volume_to_jp3d.c
index 238c47f5f27ffffcba7c99d3731a479d6bfeb8d7..d448fbe118002ec7c83fa61722b8f736286f06b2 100755 (executable)
--- a/codec/volume_to_jp3d.c
+++ b/codec/volume_to_jp3d.c
@@ -36,10 +36,12 @@
 #include "getopt.h"\r
 #include "convert.h"\r
 \r
-#ifndef WIN32\r
+#ifdef _WIN32\r
+#include <windows.h>\r
+#else\r
 #define stricmp strcasecmp\r
 #define strnicmp strncasecmp\r
-#endif\r
+#endif /* _WIN32 */\r
 \r
 /* ----------------------------------------------------------------------- */\r
 \r

diff --git a/libjp3dvm/event.c b/libjp3dvm/event.c
index 6fe8ae2e3c87864db603305ab91e33cf92160ea2..c558218c60c9b4cce1205668c4d325fd2e74ece3 100755 (executable)
--- a/libjp3dvm/event.c
+++ b/libjp3dvm/event.c
@@ -30,7 +30,7 @@
 //   Utility functions\r
 // ==========================================================\r
 \r
-#ifndef WIN32\r
+#ifndef _WIN32\r
 static char*\r
 i2a(unsigned i, char *a, unsigned r) {\r
        if (i/r > 0) a = i2a(i/r,a,r);\r
@@ -57,7 +57,7 @@ _itoa(int i, char *a, int r) {
        return a;\r
 }\r
 \r
-#endif // !WIN32\r
+#endif // !_WIN32\r
 \r
 /* ----------------------------------------------------------------------- */\r
 \r

diff --git a/libjp3dvm/jp3d_lib.c b/libjp3dvm/jp3d_lib.c
index fe19ab8b3d4cc2500cea3d24fe69bc89206a7b99..b2303991f5a9285dd0461c14dff7401193f0a411 100755 (executable)
--- a/libjp3dvm/jp3d_lib.c
+++ b/libjp3dvm/jp3d_lib.c
@@ -24,17 +24,17 @@
  * POSSIBILITY OF SUCH DAMAGE.\r
  */\r
 \r
-#ifdef WIN32\r
+#ifdef _WIN32\r
 #include <windows.h>\r
 #else\r
 #include <sys/time.h>\r
 #include <sys/resource.h>\r
 #include <sys/times.h>\r
-#endif /* WIN32 */\r
+#endif /* _WIN32 */\r
 #include "opj_includes.h"\r
 \r
 double opj_clock() {\r
-#ifdef WIN32\r
+#ifdef _WIN32\r
        /* WIN32: use QueryPerformance (very accurate) */\r
     LARGE_INTEGER freq , t ;\r
     /* freq is the clock speed of the CPU */\r
@@ -54,7 +54,7 @@ double opj_clock() {
     procTime = t.ru_utime.tv_sec + t.ru_stime.tv_sec;\r
     /* (2b) More precisely! Get the microseconds part ! */\r
     return ( procTime + (t.ru_utime.tv_usec + t.ru_stime.tv_usec) * 1e-6 ) ;\r
-#endif\r
+#endif /* _WIN32 */\r
 }\r
 \r
 void* opj_malloc( size_t size ) {\r

diff --git a/libjp3dvm/openjpeg.c b/libjp3dvm/openjpeg.c
index eb4c39bf327de01fdcec86b93f0e4f51cdab13a7..8e3a0782f79118912ccbc41429bd95fabfc36bca 100755 (executable)
--- a/libjp3dvm/openjpeg.c
+++ b/libjp3dvm/openjpeg.c
@@ -25,14 +25,14 @@
  * POSSIBILITY OF SUCH DAMAGE.\r
  */\r
 \r
-#ifdef WIN32\r
+#ifdef _WIN32\r
 #include <windows.h>\r
-#endif /* WIN32 */\r
+#endif /* _WIN32 */\r
 \r
 #include "opj_includes.h"\r
 #define JP3D_VERSION "1.3.0"\r
 /* ---------------------------------------------------------------------- */\r
-#ifdef WIN32\r
+#ifdef _WIN32\r
 #ifndef OPJ_STATIC\r
 BOOL APIENTRY\r
 DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {\r
@@ -49,7 +49,7 @@ DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
     return TRUE;\r
 }\r
 #endif /* OPJ_STATIC */\r
-#endif /* WIN32 */\r
+#endif /* _WIN32 */\r
 \r
 /* ---------------------------------------------------------------------- */\r
 \r