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

* [vincent] fix autotools for various compilation problems 

* [vincent] fix indexer compilation. Patch from Winfried
This commit is contained in:
Vincent Torri 2011-09-30 21:14:25 +00:00
parent 656628e69b
commit f4734d6b4d
11 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -6,6 +6,8 @@ What's New for OpenJPEG
+ : added + : added
September 30, 2011 September 30, 2011
* [vincent] fix autotools for various compilation problems
* [vincent] fix indexer compilation. Patch from Winfried
* [kaori] modified indexer for JPIP, JPP-stream * [kaori] modified indexer for JPIP, JPP-stream
September 27, 2011 September 27, 2011

14
applications/jpip/tools/indexer/CMakeLists.txt
View File

@ -1,14 +1,16 @@
SET(INDEXER_SRCS SET(INDEXER_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/j2k_to_idxjp2.c ${CMAKE_CURRENT_SOURCE_DIR}/j2k_to_idxjp2.c
${CMAKE_CURRENT_SOURCE_DIR}/cidx_manager.c ${CMAKE_CURRENT_SOURCE_DIR}/ext_libopenjpeg/cidx_manager.c
${CMAKE_CURRENT_SOURCE_DIR}/cio_ext.c ${CMAKE_CURRENT_SOURCE_DIR}/ext_libopenjpeg/cio_ext.c
${CMAKE_CURRENT_SOURCE_DIR}/event_mgr_handler.c ${CMAKE_CURRENT_SOURCE_DIR}/event_mgr_handler.c
${CMAKE_CURRENT_SOURCE_DIR}/idxjp2_manager.c ${CMAKE_CURRENT_SOURCE_DIR}/idxjp2_manager.c
${CMAKE_CURRENT_SOURCE_DIR}/j2k_decoder.c ${CMAKE_CURRENT_SOURCE_DIR}/j2k_decoder.c
${CMAKE_CURRENT_SOURCE_DIR}/phix_manager.c ${CMAKE_CURRENT_SOURCE_DIR}/ext_libopenjpeg/phix_manager.c
${CMAKE_CURRENT_SOURCE_DIR}/ppix_manager.c ${CMAKE_CURRENT_SOURCE_DIR}/ext_libopenjpeg/ppix_manager.c
${CMAKE_CURRENT_SOURCE_DIR}/thix_manager.c ${CMAKE_CURRENT_SOURCE_DIR}/ext_libopenjpeg/thix_manager.c
${CMAKE_CURRENT_SOURCE_DIR}/tpix_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: # Headers file are located here:

20
applications/jpip/tools/indexer/Makefile.am
View File

@ -11,10 +11,14 @@ j2k_to_idxjp2_CPPFLAGS = \
j2k_to_idxjp2_CFLAGS = j2k_to_idxjp2_CFLAGS =
j2k_to_idxjp2_LDADD = $(top_builddir)/libopenjpeg/libopenjpeg.la -lm j2k_to_idxjp2_LDADD = $(top_builddir)/libopenjpeg/libopenjpeg.la -lm
j2k_to_idxjp2_SOURCES = \ j2k_to_idxjp2_SOURCES = \
cidx_manager.c \ ext_libopenjpeg/cidx_manager.c \
cidx_manager.h \ ext_libopenjpeg/cidx_manager.h \
cio_ext.c \ ext_libopenjpeg/cio_ext.c \
cio_ext.h \ 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.c \
j2k_to_idxjp2.h \ j2k_to_idxjp2.h \
event_mgr_handler.c \ event_mgr_handler.c \
@ -22,10 +26,10 @@ event_mgr_handler.h \
idxjp2_manager.c \ idxjp2_manager.c \
j2k_decoder.c \ j2k_decoder.c \
indexbox_manager.h \ indexbox_manager.h \
phix_manager.c \ ext_libopenjpeg/phix_manager.c \
ppix_manager.c \ ext_libopenjpeg/ppix_manager.c \
thix_manager.c \ ext_libopenjpeg/thix_manager.c \
tpix_manager.c ext_libopenjpeg/tpix_manager.c
install-data-hook: install-data-hook:
@echo -e " (B)\t$(bindir)/j2k_to_idxjp2$(EXEEXT)" >> $(top_builddir)/report.txt @echo -e " (B)\t$(bindir)/j2k_to_idxjp2$(EXEEXT)" >> $(top_builddir)/report.txt

2
applications/jpip/tools/indexer/ext_libopenjpeg/cio_ext.c
View File

@ -32,6 +32,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <stdio.h>
#include "cio_ext.h" #include "cio_ext.h"
#include "event.h" #include "event.h"

2
applications/jpip/tools/indexer/ext_libopenjpeg/ext_jp2.c
View File

@ -28,6 +28,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <stdio.h>
#include "ext_openjpeg.h" #include "ext_openjpeg.h"
#include "cio.h" #include "cio.h"
#include "cio_ext.h" #include "cio_ext.h"

1
applications/jpip/tools/indexer/ext_libopenjpeg/phix_manager.c
View File

@ -34,6 +34,7 @@
*/ */
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h>
#include <math.h> #include <math.h>
#include "indexbox_manager.h" #include "indexbox_manager.h"
#include "cio_ext.h" #include "cio_ext.h"

1
applications/jpip/tools/indexer/ext_libopenjpeg/tpix_manager.c
View File

@ -33,6 +33,7 @@
* \brief Modification of jpip.c from 2KAN indexer * \brief Modification of jpip.c from 2KAN indexer
*/ */
#include <stdio.h>
#include <math.h> #include <math.h>
#include "indexbox_manager.h" #include "indexbox_manager.h"
#include "cio_ext.h" #include "cio_ext.h"

2
applications/jpip/tools/indexer/idxjp2_manager.c
View File

@ -38,7 +38,7 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include "ext_openjpeg.h" #include "ext_libopenjpeg/ext_openjpeg.h"
#include "j2k_to_idxjp2.h" #include "j2k_to_idxjp2.h"
#include "event_mgr_handler.h" #include "event_mgr_handler.h"

2
applications/jpip/tools/indexer/j2k_decoder.c
View File

@ -29,7 +29,7 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include "ext_openjpeg.h" #include "ext_libopenjpeg/ext_openjpeg.h"
#include "j2k_to_idxjp2.h" #include "j2k_to_idxjp2.h"
#include "event_mgr_handler.h" #include "event_mgr_handler.h"

4
configure.ac
View File

@ -116,10 +116,6 @@ AC_ARG_ENABLE([jpwl],
AC_MSG_CHECKING([whether to build the JPWL library]) AC_MSG_CHECKING([whether to build the JPWL library])
AC_MSG_RESULT([${want_jpwl}]) 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"]) AM_CONDITIONAL([WANT_JPWL], [test "x${want_jpwl}" = "xyes"])
# JPIP # JPIP

3
libopenjpeg/jpwl/Makefile.am
View File

@ -26,7 +26,8 @@ OPJ_SRC = \
../phix_manager.c \ ../phix_manager.c \
../ppix_manager.c \ ../ppix_manager.c \
../thix_manager.c \ ../thix_manager.c \
../tpix_manager.c ../tpix_manager.c \
../function_list.c
libopenjpeg_JPWL_la_CPPFLAGS = \ libopenjpeg_JPWL_la_CPPFLAGS = \
-I. \ -I. \