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

3 files changed, 29 insertions, 27 deletions

diff --git a/jpwl/CMakeLists.txt b/jpwl/CMakeLists.txt
index a4e39905..71e0f7b1 100755
--- a/jpwl/CMakeLists.txt
+++ b/jpwl/CMakeLists.txt
@@ -21,7 +21,6 @@ SET(OPJ_SRCS
 ../libopenjpeg/t2.c
 ../libopenjpeg/tcd.c
 ../libopenjpeg/tgt.c
-../libopenjpeg/opj_convert.c
 )
 SET(JPWL_SRCS crc.c jpwl.c jpwl_lib.c rs.c)
 
@@ -29,14 +28,10 @@ SET(JPWL_SRCS crc.c jpwl.c jpwl_lib.c rs.c)
 IF(DONT_HAVE_GETOPT)
   SET(OPJ_SRCS
     ${OPJ_SRCS}
-    ../codec/compat/getopt.c
+    ../common/getopt.c
   )
 ENDIF(DONT_HAVE_GETOPT)
 
-IF(LCMS_INCLUDE_DIR)
-  INCLUDE_DIRECTORIES( ${LCMS_INCLUDE_DIR} )
-ENDIF(LCMS_INCLUDE_DIR)
-
 # Build the library
 IF(WIN32)
   IF(BUILD_SHARED_LIBS)
@@ -47,18 +42,22 @@ IF(WIN32)
 ENDIF(WIN32)
 ADD_LIBRARY(${OPENJPEG_LIBRARY_NAME}_JPWL ${JPWL_SRCS} ${OPJ_SRCS})
 SET_TARGET_PROPERTIES(${OPENJPEG_LIBRARY_NAME}_JPWL PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
-IF(LCMS_LIB)
-  TARGET_LINK_LIBRARIES(${OPENJPEG_LIBRARY_NAME}_JPWL ${LCMS_LIB})
-ENDIF(LCMS_LIB)
+
 # Install library
 INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME}_JPWL
   DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
 )
 
+# Build executables
+
 INCLUDE_DIRECTORIES(
   ${OPENJPEG_SOURCE_DIR}/libopenjpeg
-  ${LCMS_INCLUDE_DIR}
+  ${OPENJPEG_SOURCE_DIR}/common
   )
+
+IF(LCMS_INCLUDE_DIR)
+  INCLUDE_DIRECTORIES( ${LCMS_INCLUDE_DIR} )
+ENDIF(LCMS_INCLUDE_DIR)
 IF(PNG_FOUND)
   INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR})
 ENDIF(PNG_FOUND)
@@ -68,9 +67,10 @@ ENDIF(TIFF_FOUND)
 
 
 ADD_EXECUTABLE(JPWL_j2k_to_image
+../codec/j2k_to_image.c
 ../codec/convert.c
 ../codec/index.c
-../codec/j2k_to_image.c
+../common/color.c
 )
 TARGET_LINK_LIBRARIES(JPWL_j2k_to_image ${OPENJPEG_LIBRARY_NAME}_JPWL ${LCMS_LIB})
 IF(PNG_FOUND)
diff --git a/jpwl/Makefile.am b/jpwl/Makefile.am
index eeca7abb..f6bc78ab 100644
--- a/jpwl/Makefile.am
+++ b/jpwl/Makefile.am
@@ -17,7 +17,7 @@ SRCS = ../libopenjpeg/bio.c ../libopenjpeg/cio.c ../libopenjpeg/dwt.c \
   ../libopenjpeg/mct.c ../libopenjpeg/mqc.c ../libopenjpeg/openjpeg.c \
   ../libopenjpeg/pi.c ../libopenjpeg/raw.c ../libopenjpeg/t1.c \
   ../libopenjpeg/t2.c ../libopenjpeg/tcd.c ../libopenjpeg/tgt.c \
-  ../libopenjpeg/opj_convert.c $(JPWL_SRCS)
+  $(JPWL_SRCS)
 
 INCLS = ../libopenjpeg/bio.h ../libopenjpeg/cio.h ../libopenjpeg/dwt.h \
   ../libopenjpeg/event.h ../libopenjpeg/fix.h ../libopenjpeg/image.h \
@@ -26,7 +26,7 @@ INCLS = ../libopenjpeg/bio.h ../libopenjpeg/cio.h ../libopenjpeg/dwt.h \
   ../libopenjpeg/mqc.h ../libopenjpeg/openjpeg.h ../libopenjpeg/pi.h \
   ../libopenjpeg/raw.h ../libopenjpeg/t1.h ../libopenjpeg/t2.h \
   ../libopenjpeg/tcd.h ../libopenjpeg/tgt.h ../libopenjpeg/opj_malloc.h \
-  ../libopenjpeg/opj_convert.h ../libopenjpeg/opj_includes.h \
+  ../libopenjpeg/opj_includes.h \
   $(JPWL_INCLS)
 
 libopenjpeg_JPWL_la_SOURCES = $(SRCS) $(INCLS)
@@ -40,8 +40,8 @@ dos2unix:
 
 COMPILERFLAGS = -Wall -ffast-math -std=c99
 
-USERLIBS = -lm
-INCLUDES = -I.. -I. -I../libopenjpeg
+USERLIBS =
+INCLUDES = -I.. -I. -I../libopenjpeg -I../common
 
 if with_libtiff
 INCLUDES += @tiffincludes@
@@ -63,6 +63,8 @@ INCLUDES += @lcms1includes@
 USERLIBS += @lcms1libs@
 endif
 
+USERLIBS += -lm
+
 bin_PROGRAMS = JPWL_j2k_to_image JPWL_image_to_j2k
 
 JPWL_j2k_to_image_CFLAGS = $(COMPILERFLAGS) $(INCLUDES) -DUSE_JPWL -static
@@ -71,10 +73,10 @@ JPWL_image_to_j2k_CFLAGS = $(COMPILERFLAGS) $(INCLUDES) -DUSE_JPWL -static
 CFLAGS = $(COMPILERFLAGS) $(INCLUDES) -DUSE_JPWL
 LDADD = ./libopenjpeg_JPWL.la $(USERLIBS)
 
-JPWL_j2k_to_image_SOURCES = ../codec/compat/getopt.c ../codec/index.c \
-	../codec/convert.c ../codec/j2k_to_image.c
+JPWL_j2k_to_image_SOURCES = ../common/getopt.c ../codec/index.c \
+	../codec/convert.c ../common/color.c ../codec/j2k_to_image.c
 
-JPWL_image_to_j2k_SOURCES = ../codec/compat/getopt.c ../codec/index.c \
+JPWL_image_to_j2k_SOURCES = ../common/getopt.c ../codec/index.c \
 	../codec/convert.c ../codec/image_to_j2k.c 
 
 REPBIN=$(bin_PROGRAMS)
diff --git a/jpwl/Makefile.nix b/jpwl/Makefile.nix
index 8b43a775..20b1cebd 100644
--- a/jpwl/Makefile.nix
+++ b/jpwl/Makefile.nix
@@ -3,7 +3,7 @@ include ../config.nix
 
 TARGET  = openjpeg_JPWL
 COMPILERFLAGS = -Wall -ffast-math -std=c99 -fPIC
-USERLIBS = -lm
+USERLIBS =
 
 JPWL_SRCS = ./crc.c ./jpwl.c ./jpwl_lib.c ./rs.c
 
@@ -13,7 +13,7 @@ SRCS = ../libopenjpeg/bio.c ../libopenjpeg/cio.c ../libopenjpeg/dwt.c \
   ../libopenjpeg/mct.c ../libopenjpeg/mqc.c ../libopenjpeg/openjpeg.c \
   ../libopenjpeg/pi.c ../libopenjpeg/raw.c ../libopenjpeg/t1.c \
   ../libopenjpeg/t2.c ../libopenjpeg/tcd.c ../libopenjpeg/tgt.c \
-  ../libopenjpeg/opj_convert.c $(JPWL_SRCS)
+  $(JPWL_SRCS)
 
 INCLS = ../libopenjpeg/bio.h ../libopenjpeg/cio.h ../libopenjpeg/dwt.h \
   ../libopenjpeg/event.h ../libopenjpeg/fix.h ../libopenjpeg/image.h \
@@ -22,11 +22,9 @@ INCLS = ../libopenjpeg/bio.h ../libopenjpeg/cio.h ../libopenjpeg/dwt.h \
   ../libopenjpeg/mqc.h ../libopenjpeg/openjpeg.h ../libopenjpeg/pi.h \
   ../libopenjpeg/raw.h ../libopenjpeg/t1.h ../libopenjpeg/t2.h \
   ../libopenjpeg/tcd.h ../libopenjpeg/tgt.h ../libopenjpeg/opj_malloc.h \
-  ../libopenjpeg/opj_convert.h ../libopenjpeg/opj_includes.h
+  ../libopenjpeg/opj_includes.h
 
-INCLUDE = -I.. -I. -I../libopenjpeg
-
-AR = ar
+INCLUDE = -I.. -I. -I../libopenjpeg -I../common
 
 INSTALL_LIBDIR = $(prefix)/lib
 INSTALL_BIN = $(prefix)/bin
@@ -57,6 +55,8 @@ INCLUDE += $(LCMS1_INCLUDE)
 USERLIBS += $(LCMS1_LIB)
 endif
 
+USERLIBS += -lm
+
 LIBRARIES += $(USERLIBS)
 
 MODULES = $(SRCS:.c=.o)
@@ -101,12 +101,12 @@ $(SHAREDLIB): $(MODULES)
 endif
 
 JPWL_j2k_to_image: ../codec/j2k_to_image.c
-	$(CC) $(CFLAGS) ../codec/compat/getopt.c ../codec/index.c \
-	../codec/convert.c ../codec/j2k_to_image.c \
+	$(CC) $(CFLAGS) ../common/getopt.c ../codec/index.c \
+	../codec/convert.c ../common/color.c ../codec/j2k_to_image.c \
 	-o JPWL_j2k_to_image ./libopenjpeg_JPWL.a $(USERLIBS)
 
 JPWL_image_to_j2k: ../codec/image_to_j2k.c
-	$(CC) $(CFLAGS) ../codec/compat/getopt.c ../codec/index.c \
+	$(CC) $(CFLAGS) ../common/getopt.c ../codec/index.c \
 	../codec/convert.c ../codec/image_to_j2k.c \
 	-o JPWL_image_to_j2k ./libopenjpeg_JPWL.a $(USERLIBS)