From f4734d6b4dd45e744b6f088414486353721d4b4c Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Fri, 30 Sep 2011 21:14:25 +0000 Subject: [PATCH] * [vincent] fix autotools for various compilation problems * [vincent] fix indexer compilation. Patch from Winfried --- CHANGES | 2 ++ .../jpip/tools/indexer/CMakeLists.txt | 14 +++++++------ applications/jpip/tools/indexer/Makefile.am | 20 +++++++++++-------- .../tools/indexer/ext_libopenjpeg/cio_ext.c | 4 +++- .../tools/indexer/ext_libopenjpeg/ext_jp2.c | 2 ++ .../indexer/ext_libopenjpeg/phix_manager.c | 1 + .../indexer/ext_libopenjpeg/tpix_manager.c | 1 + .../jpip/tools/indexer/idxjp2_manager.c | 2 +- applications/jpip/tools/indexer/j2k_decoder.c | 2 +- configure.ac | 4 ---- libopenjpeg/jpwl/Makefile.am | 3 ++- 11 files changed, 33 insertions(+), 22 deletions(-) diff --git a/CHANGES b/CHANGES index 831e5877..10571028 100644 --- a/CHANGES +++ b/CHANGES @@ -6,6 +6,8 @@ What's New for OpenJPEG + : added September 30, 2011 +* [vincent] fix autotools for various compilation problems +* [vincent] fix indexer compilation. Patch from Winfried * [kaori] modified indexer for JPIP, JPP-stream September 27, 2011 diff --git a/applications/jpip/tools/indexer/CMakeLists.txt b/applications/jpip/tools/indexer/CMakeLists.txt index b1b34b70..bb5efe48 100644 --- a/applications/jpip/tools/indexer/CMakeLists.txt +++ b/applications/jpip/tools/indexer/CMakeLists.txt @@ -1,14 +1,16 @@ SET(INDEXER_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/j2k_to_idxjp2.c -${CMAKE_CURRENT_SOURCE_DIR}/cidx_manager.c -${CMAKE_CURRENT_SOURCE_DIR}/cio_ext.c +${CMAKE_CURRENT_SOURCE_DIR}/ext_libopenjpeg/cidx_manager.c +${CMAKE_CURRENT_SOURCE_DIR}/ext_libopenjpeg/cio_ext.c ${CMAKE_CURRENT_SOURCE_DIR}/event_mgr_handler.c ${CMAKE_CURRENT_SOURCE_DIR}/idxjp2_manager.c ${CMAKE_CURRENT_SOURCE_DIR}/j2k_decoder.c -${CMAKE_CURRENT_SOURCE_DIR}/phix_manager.c -${CMAKE_CURRENT_SOURCE_DIR}/ppix_manager.c -${CMAKE_CURRENT_SOURCE_DIR}/thix_manager.c -${CMAKE_CURRENT_SOURCE_DIR}/tpix_manager.c +${CMAKE_CURRENT_SOURCE_DIR}/ext_libopenjpeg/phix_manager.c +${CMAKE_CURRENT_SOURCE_DIR}/ext_libopenjpeg/ppix_manager.c +${CMAKE_CURRENT_SOURCE_DIR}/ext_libopenjpeg/thix_manager.c +${CMAKE_CURRENT_SOURCE_DIR}/ext_libopenjpeg/tpix_manager.c +${CMAKE_CURRENT_SOURCE_DIR}/ext_libopenjpeg/ext_j2k.c +${CMAKE_CURRENT_SOURCE_DIR}/ext_libopenjpeg/ext_jp2.c ) # Headers file are located here: diff --git a/applications/jpip/tools/indexer/Makefile.am b/applications/jpip/tools/indexer/Makefile.am index 8207020d..786e779d 100644 --- a/applications/jpip/tools/indexer/Makefile.am +++ b/applications/jpip/tools/indexer/Makefile.am @@ -11,10 +11,14 @@ j2k_to_idxjp2_CPPFLAGS = \ j2k_to_idxjp2_CFLAGS = j2k_to_idxjp2_LDADD = $(top_builddir)/libopenjpeg/libopenjpeg.la -lm j2k_to_idxjp2_SOURCES = \ -cidx_manager.c \ -cidx_manager.h \ -cio_ext.c \ -cio_ext.h \ +ext_libopenjpeg/cidx_manager.c \ +ext_libopenjpeg/cidx_manager.h \ +ext_libopenjpeg/cio_ext.c \ +ext_libopenjpeg/cio_ext.h \ +ext_libopenjpeg/ext_j2k.c \ +ext_libopenjpeg/ext_jp2.c \ +ext_libopenjpeg/ext_openjpeg.h \ +ext_libopenjpeg/indexbox_manager.h \ j2k_to_idxjp2.c \ j2k_to_idxjp2.h \ event_mgr_handler.c \ @@ -22,10 +26,10 @@ event_mgr_handler.h \ idxjp2_manager.c \ j2k_decoder.c \ indexbox_manager.h \ -phix_manager.c \ -ppix_manager.c \ -thix_manager.c \ -tpix_manager.c +ext_libopenjpeg/phix_manager.c \ +ext_libopenjpeg/ppix_manager.c \ +ext_libopenjpeg/thix_manager.c \ +ext_libopenjpeg/tpix_manager.c install-data-hook: @echo -e " (B)\t$(bindir)/j2k_to_idxjp2$(EXEEXT)" >> $(top_builddir)/report.txt diff --git a/applications/jpip/tools/indexer/ext_libopenjpeg/cio_ext.c b/applications/jpip/tools/indexer/ext_libopenjpeg/cio_ext.c index 29d543e4..4af95440 100644 --- a/applications/jpip/tools/indexer/ext_libopenjpeg/cio_ext.c +++ b/applications/jpip/tools/indexer/ext_libopenjpeg/cio_ext.c @@ -32,6 +32,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include + #include "cio_ext.h" #include "event.h" @@ -43,7 +45,7 @@ opj_bool cio_ext_byteout(opj_cio_t *cio, unsigned char v); unsigned int cio_ext_write( opj_cio_t *cio, unsigned long long int v, int n) -{ +{ int i; for (i = n - 1; i >= 0; i--) { if( !cio_ext_byteout(cio, (unsigned char) ((v >> (i << 3)) & 0xff)) ) diff --git a/applications/jpip/tools/indexer/ext_libopenjpeg/ext_jp2.c b/applications/jpip/tools/indexer/ext_libopenjpeg/ext_jp2.c index 7f355113..6b5a28f9 100644 --- a/applications/jpip/tools/indexer/ext_libopenjpeg/ext_jp2.c +++ b/applications/jpip/tools/indexer/ext_libopenjpeg/ext_jp2.c @@ -28,6 +28,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include + #include "ext_openjpeg.h" #include "cio.h" #include "cio_ext.h" diff --git a/applications/jpip/tools/indexer/ext_libopenjpeg/phix_manager.c b/applications/jpip/tools/indexer/ext_libopenjpeg/phix_manager.c index e79fc7b6..482fa41b 100644 --- a/applications/jpip/tools/indexer/ext_libopenjpeg/phix_manager.c +++ b/applications/jpip/tools/indexer/ext_libopenjpeg/phix_manager.c @@ -34,6 +34,7 @@ */ #include +#include #include #include "indexbox_manager.h" #include "cio_ext.h" diff --git a/applications/jpip/tools/indexer/ext_libopenjpeg/tpix_manager.c b/applications/jpip/tools/indexer/ext_libopenjpeg/tpix_manager.c index 1f71ce6d..37a507ff 100644 --- a/applications/jpip/tools/indexer/ext_libopenjpeg/tpix_manager.c +++ b/applications/jpip/tools/indexer/ext_libopenjpeg/tpix_manager.c @@ -33,6 +33,7 @@ * \brief Modification of jpip.c from 2KAN indexer */ +#include #include #include "indexbox_manager.h" #include "cio_ext.h" diff --git a/applications/jpip/tools/indexer/idxjp2_manager.c b/applications/jpip/tools/indexer/idxjp2_manager.c index 6146d800..73f6d22d 100644 --- a/applications/jpip/tools/indexer/idxjp2_manager.c +++ b/applications/jpip/tools/indexer/idxjp2_manager.c @@ -38,7 +38,7 @@ */ #include -#include "ext_openjpeg.h" +#include "ext_libopenjpeg/ext_openjpeg.h" #include "j2k_to_idxjp2.h" #include "event_mgr_handler.h" diff --git a/applications/jpip/tools/indexer/j2k_decoder.c b/applications/jpip/tools/indexer/j2k_decoder.c index 111e0001..5959bed0 100644 --- a/applications/jpip/tools/indexer/j2k_decoder.c +++ b/applications/jpip/tools/indexer/j2k_decoder.c @@ -29,7 +29,7 @@ */ #include -#include "ext_openjpeg.h" +#include "ext_libopenjpeg/ext_openjpeg.h" #include "j2k_to_idxjp2.h" #include "event_mgr_handler.h" diff --git a/configure.ac b/configure.ac index 01c5a725..0ff6a32d 100644 --- a/configure.ac +++ b/configure.ac @@ -116,10 +116,6 @@ AC_ARG_ENABLE([jpwl], AC_MSG_CHECKING([whether to build the JPWL library]) AC_MSG_RESULT([${want_jpwl}]) -if test "x${want_jpwl}" = "xyes" ; then - AC_DEFINE(USE_JPWL, [1], [define to 1 if you use jpwl]) -fi - AM_CONDITIONAL([WANT_JPWL], [test "x${want_jpwl}" = "xyes"]) # JPIP diff --git a/libopenjpeg/jpwl/Makefile.am b/libopenjpeg/jpwl/Makefile.am index 8677a399..701348b6 100644 --- a/libopenjpeg/jpwl/Makefile.am +++ b/libopenjpeg/jpwl/Makefile.am @@ -26,7 +26,8 @@ OPJ_SRC = \ ../phix_manager.c \ ../ppix_manager.c \ ../thix_manager.c \ -../tpix_manager.c +../tpix_manager.c \ +../function_list.c libopenjpeg_JPWL_la_CPPFLAGS = \ -I. \