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

[trunk] First step in moving JPIP code out of openjp2

This commit is contained in:
Mathieu Malaterre 2012-10-05 16:57:30 +00:00
parent c66e6be4a4
commit 16106b2978
11 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib/openjp2/CMakeLists.txt
View File

@ -28,11 +28,6 @@ set(OPENJPEG_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/t2.c ${CMAKE_CURRENT_SOURCE_DIR}/t2.c
${CMAKE_CURRENT_SOURCE_DIR}/tcd.c ${CMAKE_CURRENT_SOURCE_DIR}/tcd.c
${CMAKE_CURRENT_SOURCE_DIR}/tgt.c ${CMAKE_CURRENT_SOURCE_DIR}/tgt.c
${CMAKE_CURRENT_SOURCE_DIR}/cidx_manager.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}/function_list.c ${CMAKE_CURRENT_SOURCE_DIR}/function_list.c
) )

2
src/lib/openjp2/opj_includes.h
View File

@ -169,8 +169,10 @@ static INLINE long lrintf(float f){
#include "mct.h" #include "mct.h"
#include "opj_intmath.h" #include "opj_intmath.h"
#ifdef USE_JPIP
#include "cidx_manager.h" #include "cidx_manager.h"
#include "indexbox_manager.h" #include "indexbox_manager.h"
#endif
/* JPWL>> */ /* JPWL>> */
#ifdef USE_JPWL #ifdef USE_JPWL

8
src/lib/openjpip/CMakeLists.txt
View File

@ -1,6 +1,9 @@
include_regular_expression("^.*$") include_regular_expression("^.*$")
add_definitions(-DUSE_JPIP)
include_directories( include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h ${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
${OPENJPEG_SOURCE_DIR}/src/lib/openjp2 ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
${FCGI_INCLUDE_DIRS} ${FCGI_INCLUDE_DIRS}
@ -33,6 +36,11 @@ set(OPENJPIP_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/session_manager.c ${CMAKE_CURRENT_SOURCE_DIR}/session_manager.c
${CMAKE_CURRENT_SOURCE_DIR}/jpip_parser.c ${CMAKE_CURRENT_SOURCE_DIR}/jpip_parser.c
${CMAKE_CURRENT_SOURCE_DIR}/sock_manager.c ${CMAKE_CURRENT_SOURCE_DIR}/sock_manager.c
${CMAKE_CURRENT_SOURCE_DIR}/cidx_manager.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
) )
set(SERVER_SRCS set(SERVER_SRCS

0
src/lib/openjp2/cidx_manager.c → src/lib/openjpip/cidx_manager.c
View File

0
src/lib/openjp2/cidx_manager.h → src/lib/openjpip/cidx_manager.h
View File

0
src/lib/openjp2/indexbox_manager.h → src/lib/openjpip/indexbox_manager.h
View File

0
src/lib/openjp2/phix_manager.c → src/lib/openjpip/phix_manager.c
View File

0
src/lib/openjp2/ppix_manager.c → src/lib/openjpip/ppix_manager.c
View File

0
src/lib/openjp2/thix_manager.c → src/lib/openjpip/thix_manager.c
View File

0
src/lib/openjp2/tpix_manager.c → src/lib/openjpip/tpix_manager.c
View File

5
src/lib/openjpwl/CMakeLists.txt
View File

@ -21,11 +21,6 @@ set(OPENJPEG_SRCS
${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/t2.c ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/t2.c
${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/tcd.c ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/tcd.c
${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/tgt.c ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/tgt.c
${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/cidx_manager.c
${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/phix_manager.c
${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/ppix_manager.c
${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/thix_manager.c
${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/tpix_manager.c
${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/function_list.c ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/function_list.c
) )