[trunk] Start FolderReorgProposal task

Update issue 177
This commit is contained in:
Mathieu Malaterre 2012-09-28 08:11:41 +00:00
parent 8363a6ab1e
commit d518970039
246 changed files with 151 additions and 96 deletions

View File

@ -42,7 +42,7 @@ set(OPENJPEG_LIBRARY_PROPERTIES
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# Path to additional CMake modules # Path to additional CMake modules
set(CMAKE_MODULE_PATH set(CMAKE_MODULE_PATH
${CMAKE_SOURCE_DIR}/CMake ${CMAKE_SOURCE_DIR}/cmake
${CMAKE_MODULE_PATH}) ${CMAKE_MODULE_PATH})
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
@ -121,7 +121,7 @@ TEST_BIG_ENDIAN(OPJ_BIG_ENDIAN)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Setup file for setting custom ctest vars # Setup file for setting custom ctest vars
configure_file( configure_file(
${CMAKE_SOURCE_DIR}/CMake/CTestCustom.cmake.in ${CMAKE_SOURCE_DIR}/cmake/CTestCustom.cmake.in
${CMAKE_BINARY_DIR}/CTestCustom.cmake ${CMAKE_BINARY_DIR}/CTestCustom.cmake
@ONLY @ONLY
) )
@ -185,7 +185,7 @@ OPJ_TEST_LARGE_FILES(OPJ_HAVE_LARGEFILES)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Build Library # Build Library
include_directories(BEFORE ${OPENJPEG_BINARY_DIR}) include_directories(BEFORE ${OPENJPEG_BINARY_DIR})
add_subdirectory(libopenjpeg) add_subdirectory(src)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Build Applications # Build Applications
@ -206,7 +206,7 @@ if(BUILD_CODEC OR BUILD_MJ2)
# ON: 3rd party libs will ALWAYS be build, and used # ON: 3rd party libs will ALWAYS be build, and used
option(BUILD_THIRDPARTY "Build the thirdparty executables if it is needed" OFF) option(BUILD_THIRDPARTY "Build the thirdparty executables if it is needed" OFF)
add_subdirectory(thirdparty) add_subdirectory(thirdparty)
add_subdirectory(applications) add_subdirectory(src/bin)
endif () endif ()
include(CheckTypeSize) include(CheckTypeSize)
@ -225,7 +225,7 @@ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/opj_config.h
# Build DOCUMENTATION (not in ALL target and only if Doxygen is found) # Build DOCUMENTATION (not in ALL target and only if Doxygen is found)
option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF) option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF)
if(BUILD_DOC) if(BUILD_DOC)
add_subdirectory(doc) add_subdirectory(doc)
endif() endif()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
@ -256,7 +256,7 @@ endif()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# install all targets referenced as OPENJPEGTargets # install all targets referenced as OPENJPEGTargets
install(EXPORT OpenJPEGTargets DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}) install(EXPORT OpenJPEGTargets DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR})
configure_file( ${OPENJPEG_SOURCE_DIR}/CMake/OpenJPEGConfig.cmake.in configure_file( ${OPENJPEG_SOURCE_DIR}/cmake/OpenJPEGConfig.cmake.in
${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
@ONLY @ONLY
) )
@ -271,4 +271,4 @@ if(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES)
endif() endif()
install(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR}) install(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
include (CMake/OpenJPEGCPack.cmake) include (cmake/OpenJPEGCPack.cmake)

View File

@ -27,7 +27,7 @@ macro(OPJ_TEST_LARGE_FILES VARIABLE)
# First check without any special flags # First check without any special flags
try_compile(FILE64_OK "${PROJECT_BINARY_DIR}" try_compile(FILE64_OK "${PROJECT_BINARY_DIR}"
"${PROJECT_SOURCE_DIR}/CMake/TestFileOffsetBits.c") "${PROJECT_SOURCE_DIR}/cmake/TestFileOffsetBits.c")
if(FILE64_OK) if(FILE64_OK)
message(STATUS "Checking for 64-bit off_t - present") message(STATUS "Checking for 64-bit off_t - present")
endif() endif()
@ -35,7 +35,7 @@ macro(OPJ_TEST_LARGE_FILES VARIABLE)
if(NOT FILE64_OK) if(NOT FILE64_OK)
# Test with _FILE_OFFSET_BITS=64 # Test with _FILE_OFFSET_BITS=64
try_compile(FILE64_OK "${PROJECT_BINARY_DIR}" try_compile(FILE64_OK "${PROJECT_BINARY_DIR}"
"${PROJECT_SOURCE_DIR}/CMake/TestFileOffsetBits.c" "${PROJECT_SOURCE_DIR}/cmake/TestFileOffsetBits.c"
COMPILE_DEFINITIONS "-D_FILE_OFFSET_BITS=64" ) COMPILE_DEFINITIONS "-D_FILE_OFFSET_BITS=64" )
if(FILE64_OK) if(FILE64_OK)
message(STATUS "Checking for 64-bit off_t - present with _FILE_OFFSET_BITS=64") message(STATUS "Checking for 64-bit off_t - present with _FILE_OFFSET_BITS=64")
@ -46,7 +46,7 @@ macro(OPJ_TEST_LARGE_FILES VARIABLE)
if(NOT FILE64_OK) if(NOT FILE64_OK)
# Test with _LARGE_FILES # Test with _LARGE_FILES
try_compile(FILE64_OK "${PROJECT_BINARY_DIR}" try_compile(FILE64_OK "${PROJECT_BINARY_DIR}"
"${PROJECT_SOURCE_DIR}/CMake/TestFileOffsetBits.c" "${PROJECT_SOURCE_DIR}/cmake/TestFileOffsetBits.c"
COMPILE_DEFINITIONS "-D_LARGE_FILES" ) COMPILE_DEFINITIONS "-D_LARGE_FILES" )
if(FILE64_OK) if(FILE64_OK)
message(STATUS "Checking for 64-bit off_t - present with _LARGE_FILES") message(STATUS "Checking for 64-bit off_t - present with _LARGE_FILES")
@ -57,7 +57,7 @@ macro(OPJ_TEST_LARGE_FILES VARIABLE)
if(NOT FILE64_OK) if(NOT FILE64_OK)
# Test with _LARGEFILE_SOURCE # Test with _LARGEFILE_SOURCE
try_compile(FILE64_OK "${PROJECT_BINARY_DIR}" try_compile(FILE64_OK "${PROJECT_BINARY_DIR}"
"${PROJECT_SOURCE_DIR}/CMake/TestFileOffsetBits.c" "${PROJECT_SOURCE_DIR}/cmake/TestFileOffsetBits.c"
COMPILE_DEFINITIONS "-D_LARGEFILE_SOURCE" ) COMPILE_DEFINITIONS "-D_LARGEFILE_SOURCE" )
if(FILE64_OK) if(FILE64_OK)
message(STATUS "Checking for 64-bit off_t - present with _LARGEFILE_SOURCE") message(STATUS "Checking for 64-bit off_t - present with _LARGEFILE_SOURCE")
@ -69,7 +69,7 @@ macro(OPJ_TEST_LARGE_FILES VARIABLE)
#if(NOT FILE64_OK) #if(NOT FILE64_OK)
# # now check for Windows stuff # # now check for Windows stuff
# try_compile(FILE64_OK "${PROJECT_BINARY_DIR}" # try_compile(FILE64_OK "${PROJECT_BINARY_DIR}"
# "${PROJECT_SOURCE_DIR}/CMake/TestWindowsFSeek.c") # "${PROJECT_SOURCE_DIR}/cmake/TestWindowsFSeek.c")
# if(FILE64_OK) # if(FILE64_OK)
# message(STATUS "Checking for 64-bit off_t - present with _fseeki64") # message(STATUS "Checking for 64-bit off_t - present with _fseeki64")
# set(HAVE__FSEEKI64 1) # set(HAVE__FSEEKI64 1)
@ -85,7 +85,7 @@ macro(OPJ_TEST_LARGE_FILES VARIABLE)
set(_LARGEFILE_SOURCE ${_LARGEFILE_SOURCE} CACHE INTERNAL "Result of test for needed _LARGEFILE_SOURCE") set(_LARGEFILE_SOURCE ${_LARGEFILE_SOURCE} CACHE INTERNAL "Result of test for needed _LARGEFILE_SOURCE")
# Set the flags we might have determined to be required above # Set the flags we might have determined to be required above
configure_file("${PROJECT_SOURCE_DIR}/CMake/TestLargeFiles.c.cmake.in" configure_file("${PROJECT_SOURCE_DIR}/cmake/TestLargeFiles.c.cmake.in"
"${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/TestLargeFiles.c") "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/TestLargeFiles.c")
message(STATUS "Checking for fseeko/ftello") message(STATUS "Checking for fseeko/ftello")

View File

@ -1,35 +0,0 @@
# Makefile for the main JPWL OpenJPEG codecs: JPWL_ j2k_to_image and JPWL_image_to_j2k
add_definitions(-DUSE_JPWL)
set(JPWL_SRCS crc.c jpwl.c jpwl_lib.c rs.c)
if(APPLE)
set_source_files_properties(
rs.c
PROPERTIES
COMPILE_FLAGS -fno-common)
endif()
include_directories(
${OPENJPEG_SOURCE_DIR}/libopenjpeg
)
# Build the library
if(WIN32)
if(BUILD_SHARED_LIBS)
add_definitions(-DOPJ_EXPORTS)
else()
add_definitions(-DOPJ_STATIC)
endif()
endif()
add_library(${OPENJPEG_LIBRARY_NAME}_JPWL ${JPWL_SRCS} ${OPENJPEG_SRCS})
set_target_properties(${OPENJPEG_LIBRARY_NAME}_JPWL
PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
# Install library
install(TARGETS ${OPENJPEG_LIBRARY_NAME}_JPWL
EXPORT OpenJPEGTargets
RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
)

12
src/CMakeLists.txt Normal file
View File

@ -0,0 +1,12 @@
# required dep for server:
if(BUILD_JPIP_SERVER)
find_package(CURL REQUIRED)
find_package(FCGI REQUIRED)
find_package(Threads REQUIRED)
if(NOT CMAKE_USE_PTHREADS_INIT)
message(FATAL_ERROR "Only pthread are supported")
endif()
endif()
add_subdirectory(lib)
#add_subdirectory(bin)

20
src/bin/CMakeLists.txt Normal file
View File

@ -0,0 +1,20 @@
# source code for openjpeg apps:
add_subdirectory(common)
# Part 1 & 2:
add_subdirectory(jp2)
# optionals components:
if(BUILD_JPWL)
# add_subdirectory(jpwl)
endif()
if(BUILD_MJ2)
add_subdirectory(mj2)
endif()
if(BUILD_JPIP)
add_subdirectory(jpip)
endif()
if(BUILD_JP3D)
add_subdirectory(jp3d)
endif()
add_subdirectory(wx)

View File

View File

@ -4,15 +4,15 @@
set(common_SRCS set(common_SRCS
convert.c convert.c
index.c index.c
${OPENJPEG_SOURCE_DIR}/applications/common/color.c ${OPENJPEG_SOURCE_DIR}/src/bin/common/color.c
${OPENJPEG_SOURCE_DIR}/applications/common/opj_getopt.c ${OPENJPEG_SOURCE_DIR}/src/bin/common/opj_getopt.c
) )
# Headers file are located here: # Headers file are located here:
include_directories( include_directories(
${OPENJPEG_SOURCE_DIR}/libopenjpeg ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
${LCMS_INCLUDE_DIRNAME} ${LCMS_INCLUDE_DIRNAME}
${OPENJPEG_SOURCE_DIR}/applications/common ${OPENJPEG_SOURCE_DIR}/src/bin/common
${Z_INCLUDE_DIRNAME} ${Z_INCLUDE_DIRNAME}
${PNG_INCLUDE_DIRNAME} ${PNG_INCLUDE_DIRNAME}
${TIFF_INCLUDE_DIRNAME} ${TIFF_INCLUDE_DIRNAME}

View File

@ -1,7 +1,7 @@
# Headers file are located here: # Headers file are located here:
include_directories( include_directories(
${OPENJPEG_SOURCE_DIR}/libopenjpeg # opj_stdint.h ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2 # opj_stdint.h
${OPENJPEG_SOURCE_DIR}/applications/jpip/libopenjpip ${OPENJPEG_SOURCE_DIR}/src/lib/openjpip
${FCGI_INCLUDE_DIRS} ${FCGI_INCLUDE_DIRS}
) )

View File

@ -1,33 +1,33 @@
# Makefile for the MJ2 codecs of the OpenJPEG library: frames_to_mj2, mj2_to_frames, extract_j2k_from_mj2 and wrap_j2k_in_mj2 # Makefile for the MJ2 codecs of the OpenJPEG library: frames_to_mj2, mj2_to_frames, extract_j2k_from_mj2 and wrap_j2k_in_mj2
set(common_SRCS ${OPENJPEG_SOURCE_DIR}/applications/common/opj_getopt.c) set(common_SRCS ${OPENJPEG_SOURCE_DIR}/src/bin/common/opj_getopt.c)
# While mj2 executables do not use the API correctly, we do not link with the library but rather compile the sources files. # While mj2 executables do not use the API correctly, we do not link with the library but rather compile the sources files.
set(OPJ_SRCS set(OPJ_SRCS
${OPENJPEG_SOURCE_DIR}/libopenjpeg/bio.c ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/bio.c
${OPENJPEG_SOURCE_DIR}/libopenjpeg/cio.c ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/cio.c
${OPENJPEG_SOURCE_DIR}/libopenjpeg/dwt.c ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/dwt.c
${OPENJPEG_SOURCE_DIR}/libopenjpeg/event.c ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/event.c
${OPENJPEG_SOURCE_DIR}/libopenjpeg/image.c ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/image.c
${OPENJPEG_SOURCE_DIR}/libopenjpeg/j2k.c ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/j2k.c
${OPENJPEG_SOURCE_DIR}/libopenjpeg/j2k_lib.c ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/j2k_lib.c
${OPENJPEG_SOURCE_DIR}/libopenjpeg/jp2.c ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/jp2.c
${OPENJPEG_SOURCE_DIR}/libopenjpeg/jpt.c ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/jpt.c
${OPENJPEG_SOURCE_DIR}/libopenjpeg/mct.c ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/mct.c
${OPENJPEG_SOURCE_DIR}/libopenjpeg/mqc.c ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/mqc.c
${OPENJPEG_SOURCE_DIR}/libopenjpeg/openjpeg.c ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/openjpeg.c
${OPENJPEG_SOURCE_DIR}/libopenjpeg/pi.c ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/pi.c
${OPENJPEG_SOURCE_DIR}/libopenjpeg/raw.c ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/raw.c
${OPENJPEG_SOURCE_DIR}/libopenjpeg/t1.c ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/t1.c
${OPENJPEG_SOURCE_DIR}/libopenjpeg/t2.c ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/t2.c
${OPENJPEG_SOURCE_DIR}/libopenjpeg/tcd.c ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/tcd.c
${OPENJPEG_SOURCE_DIR}/libopenjpeg/tgt.c ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/tgt.c
${OPENJPEG_SOURCE_DIR}/libopenjpeg/cidx_manager.c ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/cidx_manager.c
${OPENJPEG_SOURCE_DIR}/libopenjpeg/phix_manager.c ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/phix_manager.c
${OPENJPEG_SOURCE_DIR}/libopenjpeg/ppix_manager.c ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/ppix_manager.c
${OPENJPEG_SOURCE_DIR}/libopenjpeg/thix_manager.c ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/thix_manager.c
${OPENJPEG_SOURCE_DIR}/libopenjpeg/tpix_manager.c ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/tpix_manager.c
${OPENJPEG_SOURCE_DIR}/libopenjpeg/function_list.c ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/function_list.c
) )
set(MJ2_SRCS mj2.c mj2_convert.c) set(MJ2_SRCS mj2.c mj2_convert.c)
@ -38,8 +38,8 @@ endif()
# Headers file are located here: # Headers file are located here:
include_directories( include_directories(
${OPENJPEG_SOURCE_DIR}/libopenjpeg ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
${OPENJPEG_SOURCE_DIR}/applications/common ${OPENJPEG_SOURCE_DIR}/src/bin/common
${LCMS_INCLUDE_DIRNAME} ${LCMS_INCLUDE_DIRNAME}
) )
@ -60,7 +60,7 @@ add_executable(mj2_to_frames
${common_SRCS} ${common_SRCS}
${OPJ_SRCS} ${OPJ_SRCS}
${MJ2_SRCS} ${MJ2_SRCS}
${OPENJPEG_SOURCE_DIR}/applications/common/color.c ${OPENJPEG_SOURCE_DIR}/src/bin/common/color.c
) )
target_link_libraries(mj2_to_frames ${LCMS_LIBNAME}) target_link_libraries(mj2_to_frames ${LCMS_LIBNAME})

View File

View File

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Some files were not shown because too many files have changed in this diff Show More