From 6106e48397d8a48bb544a8cfbc30d1516db6cc77 Mon Sep 17 00:00:00 2001 From: Antonin Descampe Date: Sun, 10 Jul 2011 17:32:22 +0000 Subject: [PATCH 01/33] improved encoding speed in t1_encode_cblks (credit to Giuseppe Baruffa) --- CHANGES | 3 +++ libopenjpeg/t1.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 72b43733..f1e8c4f8 100644 --- a/CHANGES +++ b/CHANGES @@ -5,6 +5,9 @@ What's New for OpenJPEG ! : changed + : added +July 10, 2011 +! [antonin] improved encoding speed in t1_encode_cblks (credit to Giuseppe Baruffa) + July 3, 2011 * [antonin] fixed bmptoimage (see http://groups.google.com/group/openjpeg/browse_thread/thread/33a24c5896bf6391) * [antonin] fixed handling of "jp2->meth" value (Restricted ICC profile handling currently not implemented) diff --git a/libopenjpeg/t1.c b/libopenjpeg/t1.c index 1794ac22..002a82d4 100644 --- a/libopenjpeg/t1.c +++ b/libopenjpeg/t1.c @@ -1413,6 +1413,7 @@ void t1_encode_cblks( for (bandno = 0; bandno < res->numbands; ++bandno) { opj_tcd_band_t* restrict band = &res->bands[bandno]; + int bandconst = 8192 * 8192 / ((int) floor(band->stepsize * 8192)); for (precno = 0; precno < res->pw * res->ph; ++precno) { opj_tcd_precinct_t *prc = &band->precincts[precno]; @@ -1463,7 +1464,7 @@ void t1_encode_cblks( datap[(j * cblk_w) + i] = fix_mul( tmp, - 8192 * 8192 / ((int) floor(band->stepsize * 8192))) >> (11 - T1_NMSEDEC_FRACBITS); + bandconst) >> (11 - T1_NMSEDEC_FRACBITS); } } } From acccedbbb7e372b968a9a163e36acce4a15e3503 Mon Sep 17 00:00:00 2001 From: Antonin Descampe Date: Sun, 10 Jul 2011 18:36:17 +0000 Subject: [PATCH 02/33] opj-v1-branch created --- CHANGES | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES b/CHANGES index f1e8c4f8..d6ec5f74 100644 --- a/CHANGES +++ b/CHANGES @@ -5,6 +5,8 @@ What's New for OpenJPEG ! : changed + : added +_______ R812 : OPJ-V1-BRANCH created ______________________________ + July 10, 2011 ! [antonin] improved encoding speed in t1_encode_cblks (credit to Giuseppe Baruffa) From 025bc9fbe17851185586080c2c435b2984aff83f Mon Sep 17 00:00:00 2001 From: Kaori Hagihara Date: Mon, 11 Jul 2011 14:23:11 +0000 Subject: [PATCH 03/33] updates of jar files --- ...r-20110510.jar => opj_viewer-20110711.jar} | Bin 14851 -> 14848 bytes .../opj_client/opj_viewer/dist/opj_viewer.jar | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename applications/jpip/opj_client/opj_viewer/dist/{opj_viewer-20110510.jar => opj_viewer-20110711.jar} (54%) diff --git a/applications/jpip/opj_client/opj_viewer/dist/opj_viewer-20110510.jar b/applications/jpip/opj_client/opj_viewer/dist/opj_viewer-20110711.jar similarity index 54% rename from applications/jpip/opj_client/opj_viewer/dist/opj_viewer-20110510.jar rename to applications/jpip/opj_client/opj_viewer/dist/opj_viewer-20110711.jar index a4ac470a79117fea69ba6892d342a8ae8a8e964a..1024d50a3a82a3a7eb30ca7d743a70bbb02a8756 100644 GIT binary patch delta 5863 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 delta 5904 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 Date: Mon, 11 Jul 2011 14:35:22 +0000 Subject: [PATCH 04/33] updates of jar files 2 --- ...510.jar => opj_viewer_xerces-20110711.jar} | Bin 19361 -> 19358 bytes .../dist/opj_viewer_xerces.jar | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename applications/jpip/opj_client/opj_viewer_xerces/dist/{opj_viewer_xerces-20110510.jar => opj_viewer_xerces-20110711.jar} (62%) diff --git a/applications/jpip/opj_client/opj_viewer_xerces/dist/opj_viewer_xerces-20110510.jar b/applications/jpip/opj_client/opj_viewer_xerces/dist/opj_viewer_xerces-20110711.jar similarity index 62% rename from applications/jpip/opj_client/opj_viewer_xerces/dist/opj_viewer_xerces-20110510.jar rename to applications/jpip/opj_client/opj_viewer_xerces/dist/opj_viewer_xerces-20110711.jar index 07304bb8e1592d8dbd9f56eb34954a7fdad8b340..30b824b767fb50cc9ff94f96b0592d01f054489c 100644 GIT binary patch delta 6079 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 G!Tk$mWnc;b delta 6182 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 I>`(E30evZOIRF3v diff --git a/applications/jpip/opj_client/opj_viewer_xerces/dist/opj_viewer_xerces.jar b/applications/jpip/opj_client/opj_viewer_xerces/dist/opj_viewer_xerces.jar index 01cd91a8..5288da8f 120000 --- a/applications/jpip/opj_client/opj_viewer_xerces/dist/opj_viewer_xerces.jar +++ b/applications/jpip/opj_client/opj_viewer_xerces/dist/opj_viewer_xerces.jar @@ -1 +1 @@ -opj_viewer_xerces-20110510.jar \ No newline at end of file +opj_viewer_xerces-20110711.jar \ No newline at end of file From 36c8d85f4335b3d6dd518e45efe3b6ccedda4c06 Mon Sep 17 00:00:00 2001 From: Antonin Descampe Date: Mon, 11 Jul 2011 17:43:08 +0000 Subject: [PATCH 05/33] updated CHNAGES files after branch renaming --- CHANGES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index d6ec5f74..94175175 100644 --- a/CHANGES +++ b/CHANGES @@ -5,7 +5,7 @@ What's New for OpenJPEG ! : changed + : added -_______ R812 : OPJ-V1-BRANCH created ______________________________ +_______ R812 : 'openjpeg-1.5' branch created ______________________________ July 10, 2011 ! [antonin] improved encoding speed in t1_encode_cblks (credit to Giuseppe Baruffa) From 65f7f8dc506e3c889e137bef1c730644fc7798eb Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Wed, 13 Jul 2011 16:49:53 +0000 Subject: [PATCH 06/33] improved some CMakeLists files linked to the build of applications which used thirdparty --- CHANGES | 3 + {thirdparty => CMake}/FindLCMS.cmake | 27 +++-- {thirdparty => CMake}/FindLCMS2.cmake | 26 ++-- CMakeLists.txt | 26 +++- applications/CMakeLists.txt | 127 +------------------- applications/codec/CMakeLists.txt | 8 +- opj_configh.cmake.in | 6 +- thirdparty/CMakeLists.txt | 167 +++++++++++++++++++++++--- 8 files changed, 213 insertions(+), 177 deletions(-) rename {thirdparty => CMake}/FindLCMS.cmake (63%) rename {thirdparty => CMake}/FindLCMS2.cmake (59%) diff --git a/CHANGES b/CHANGES index 94175175..486ed83f 100644 --- a/CHANGES +++ b/CHANGES @@ -5,6 +5,9 @@ What's New for OpenJPEG ! : changed + : added +July 10, 2011 +! [mickael] improved some CMakeLists files linked to the build of applications which used thirdparty + _______ R812 : 'openjpeg-1.5' branch created ______________________________ July 10, 2011 diff --git a/thirdparty/FindLCMS.cmake b/CMake/FindLCMS.cmake similarity index 63% rename from thirdparty/FindLCMS.cmake rename to CMake/FindLCMS.cmake index 8125e620..1a476a4a 100644 --- a/thirdparty/FindLCMS.cmake +++ b/CMake/FindLCMS.cmake @@ -1,24 +1,31 @@ # - Find LCMS library # Find the native LCMS includes and library -# This module defines -# LCMS_INCLUDE_DIR, where to find tiff.h, etc. -# LCMS_LIBRARIES, libraries to link against to use LCMS. -# LCMS_FOUND, If false, do not try to use LCMS. +# Once done this will define +# +# LCMS_INCLUDE_DIR - Where to find lcms.h, etc. +# LCMS_LIBRARIES - Libraries to link against to use LCMS. +# LCMS_FOUND - If false, do not try to use LCMS. +# # also defined, but not for general use are # LCMS_LIBRARY, where to find the LCMS library. -# + +#============================================================================= +#============================================================================= + FIND_PATH(LCMS_INCLUDE_DIR lcms.h PATHS /usr/include /usr/local/include /opt/include /opt/local/include) -# + SET(LCMS_NAMES ${LCMS_NAMES} lcms liblcms liblcms_static) + FIND_LIBRARY(LCMS_LIBRARY NAMES ${LCMS_NAMES} ) -# + +MARK_AS_ADVANCED(LCMS_INCLUDE_DIR LCMS_LIBRARY) + # handle the QUIETLY and REQUIRED arguments and set LCMS_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(LCMS DEFAULT_MSG LCMS_LIBRARY LCMS_INCLUDE_DIR) -# + IF(LCMS_FOUND) + SET( LCMS_INCLUDE_DIRS ${LCMS_INCLUDE_DIR}) SET( LCMS_LIBRARIES ${LCMS_LIBRARY} ) ENDIF(LCMS_FOUND) - -MARK_AS_ADVANCED(LCMS_INCLUDE_DIR LCMS_LIBRARY) diff --git a/thirdparty/FindLCMS2.cmake b/CMake/FindLCMS2.cmake similarity index 59% rename from thirdparty/FindLCMS2.cmake rename to CMake/FindLCMS2.cmake index 219800e8..b781d84c 100644 --- a/thirdparty/FindLCMS2.cmake +++ b/CMake/FindLCMS2.cmake @@ -1,23 +1,31 @@ # - Find LCMS2 library # Find the native LCMS2 includes and library -# This module defines -# LCMS2_INCLUDE_DIR, where to find tiff.h, etc. -# LCMS2_LIBRARIES, libraries to link against to use LCMS2. -# LCMS2_FOUND, If false, do not try to use LCMS2. -# also defined, but not for general use are -# LCMS2_LIBRARY, where to find the LCMS2 library. +# Once done this will define # +# LCMS2_INCLUDE_DIR - Where to find lcms2.h, etc. +# LCMS2_LIBRARIES - Libraries to link against to use LCMS2. +# LCMS2_FOUND - If false, do not try to use LCMS2. +# +# also defined, but not for general use are +# LCMS2_LIBRARY - Where to find the LCMS2 library. + +#============================================================================= +#============================================================================= + FIND_PATH(LCMS2_INCLUDE_DIR lcms2.h PATHS /usr/include /usr/local/include /opt/include /opt/local/include) + SET(LCMS2_NAMES ${LCMS2_NAMES} lcms2 liblcms2 liblcms2_static) + FIND_LIBRARY(LCMS2_LIBRARY NAMES ${LCMS2_NAMES} ) +MARK_AS_ADVANCED(LCMS2_INCLUDE_DIR LCMS2_LIBRARY) + # handle the QUIETLY and REQUIRED arguments and set LCMS2_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(LCMS2 DEFAULT_MSG LCMS2_LIBRARY LCMS2_INCLUDE_DIR) -# + IF(LCMS2_FOUND) + SET( LCMS2_INCLUDE_DIRS ${LCMS2_INCLUDE_DIR}) SET( LCMS2_LIBRARIES ${LCMS2_LIBRARY} ) ENDIF(LCMS2_FOUND) -# -MARK_AS_ADVANCED(LCMS2_INCLUDE_DIR LCMS2_LIBRARY) diff --git a/CMakeLists.txt b/CMakeLists.txt index d8859414..032b8ab4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,6 +39,12 @@ SET(OPENJPEG_LIBRARY_PROPERTIES SOVERSION "${OPENJPEG_VERSION_MAJOR}" ) + +# Path to additional CMake modules +SET(CMAKE_MODULE_PATH + ${CMAKE_SOURCE_DIR}/CMake + ${CMAKE_MODULE_PATH}) + # On Visual Studio 8 MS deprecated C. This removes all 1.276E1265 security # warnings IF(WIN32) @@ -150,7 +156,7 @@ IF(CMAKE_COMPILER_IS_GNUCC) ENDIF(CMAKE_COMPILER_IS_GNUCC) #----------------------------------------------------------------------------- -# opj_config.h generation +# opj_config.h generation (1/2) FIND_FILE(HAVE_STRINGS_H_FOUND strings.h) IF(NOT HAVE_STRINGS_H_FOUND STREQUAL "HAVE_STRINGS_H_FOUND-NOTFOUND") FIND_FILE(HAVE_STRINGS_H strings.h) @@ -196,10 +202,6 @@ IF(NOT HAVE_UNISTD_H_FOUND STREQUAL "HAVE_UNISTD_H_FOUND-NOTFOUND") FIND_FILE(HAVE_UNISTD_H unistd.h) SET(HAS_UNISTD_H 1) ENDIF() -CONFIGURE_FILE("${OPENJPEG_SOURCE_DIR}/opj_configh.cmake.in" - "${OPENJPEG_BINARY_DIR}/opj_config.h" - @ONLY - ) #----------------------------------------------------------------------------- # CDash+CMake : to be updated @@ -218,7 +220,19 @@ ADD_SUBDIRECTORY(libopenjpeg) # Build Applications OPTION(BUILD_CODEC "Build the CODEC executables" ON) OPTION(BUILD_MJ2 "Build the MJ2 executables." OFF) -ADD_SUBDIRECTORY(applications) + +IF(BUILD_CODEC OR BUILD_MJ2) + OPTION(BUILD_THIRDPARTY "Build the thirdparty executables if it is needed" OFF) + ADD_SUBDIRECTORY(thirdparty) + ADD_SUBDIRECTORY(applications) +ENDIF (BUILD_CODEC OR BUILD_MJ2) + +#----------------------------------------------------------------------------- +# opj_config.h generation (2/2) +CONFIGURE_FILE("${OPENJPEG_SOURCE_DIR}/opj_configh.cmake.in" + "${OPENJPEG_BINARY_DIR}/opj_config.h" + @ONLY + ) #----------------------------------------------------------------------------- # Build JPWL-flavoured library and executables diff --git a/applications/CMakeLists.txt b/applications/CMakeLists.txt index 5f413169..3b65ade1 100644 --- a/applications/CMakeLists.txt +++ b/applications/CMakeLists.txt @@ -1,130 +1,9 @@ -IF(BUILD_CODEC OR BUILD_MJ2) -# -# -IF(UNIX OR CYGWIN) - SET(CMAKE_INCLUDE_PATH /usr/include /usr/local/include /opt/include - /opt/local/include /usr/include/libpng /usr/include/libpng14 - /usr/include/libpng12 /usr/local/include/libpng - /usr/local/include/libpng14 /usr/local/include/libpng12 - /opt/include/libpng /opt/include/libpng14 /opt/include/libpng12 - /opt/local/include/libpng /opt/local/include/libpng14) - SET(CMAKE_LIBRARY_PATH /usr/lib /usr/local/lib /opt/lib /opt/local/lib) -ENDIF() -# - FIND_PACKAGE(ZLIB) -# - IF(ZLIB_LIBRARY STREQUAL "ZLIB_LIBRARY-NOTFOUND") - SET(ZLIB_FOUND 0) - ENDIF(ZLIB_LIBRARY STREQUAL "ZLIB_LIBRARY-NOTFOUND") -# - IF(ZLIB_FOUND) - SET(HAVE_ZLIB_H 1) - SET(HABE_LIBZ 1) - SET(Z_LIBNAME ${ZLIB_LIBRARIES}) - SET(Z_INCLUDE_DIRNAME ${ZLIB_INCLUDE_DIR}) - ENDIF(ZLIB_FOUND) -# - FIND_PACKAGE(PNG) -# - IF(PNG_LIBRARY STREQUAL "PNG_LIBRARY-NOTFOUND") - SET(PNG_FOUND 0) - ENDIF(PNG_LIBRARY STREQUAL "PNG_LIBRARY-NOTFOUND") -# - IF(PNG_FOUND) - SET(HAVE_PNG_H 1) - SET(HAVE_LIBPNG 1) - SET(PNG_LIBNAME ${PNG_LIBRARIES}) - SET(PNG_INCLUDE_DIRNAME ${PNG_INCLUDE_DIR}) - ENDIF(PNG_FOUND) -# - FIND_PACKAGE(TIFF) -# - IF(TIFF_LIBRARY STREQUAL "TIFF_LIBRARY-NOTFOUND") - SET(TIFF_FOUND 0) - ENDIF(TIFF_LIBRARY STREQUAL "TIFF_LIBRARY-NOTFOUND") -# - IF(TIFF_FOUND) - SET(HAVE_TIFF_H 1) - SET(HAVE_LIBTIFF 1) - SET(TIFF_LIBNAME ${TIFF_LIBRARIES}) - SET(TIFF_INCLUDE_DIRNAME ${TIFF_INCLUDE_DIR}) - ENDIF(TIFF_FOUND) -# - SET(LCMS12_MISSING 1) - INCLUDE(${OPENJPEG_SOURCE_DIR}/thirdparty/FindLCMS2.cmake OPTIONAL) -# - IF(LCMS2_FOUND) - SET(LCMS12_MISSING 0) - SET(HAVE_LCMS2_H 1) - SET(HAVE_LIBLCMS2 1) - SET(LCMS_LIBNAME ${LCMS2_LIBRARY}) - SET(LCMS_INCLUDE_DIRNAME ${LCMS2_INCLUDE_DIR}) - ENDIF(LCMS2_FOUND) -# - IF(NOT LCMS2_FOUND) - INCLUDE(${OPENJPEG_SOURCE_DIR}/thirdparty/FindLCMS.cmake OPTIONAL) -# - IF(LCMS_FOUND) - SET(LCMS12_MISSING 0) - SET(HAVE_LCMS1_H 1) - SET(HAVE_LIBLCMS1 1) - SET(LCMS_LIBNAME ${LCMS_LIBRARY} ) - SET(LCMS_INCLUDE_DIRNAME ${LCMS_INCLUDE_DIR}) - ENDIF(LCMS_FOUND) - ENDIF(NOT LCMS2_FOUND) -#------------------------------------------------------------- - OPTION(BUILD_THIRDPARTY "Build the thirdparty executables" ON) -# - IF(NOT ZLIB_FOUND OR NOT PNG_FOUND OR NOT TIFF_FOUND OR LCMS12_MISSING) - IF(BUILD_THIRDPARTY) - SET(HAVE_ZLIB_H 1) - SET(HAVE_LIBZ 1) - SET(HAVE_PNG_H 1) - SET(HAVE_LIBPNG 1) - SET(HAVE_TIFF_H 1) - SET(HAVE_LIBTIFF 1) - SET(HAVE_LCMS2_H 1) - SET(HAVE_LIBLCMS2 1) -# -#ADD_SUBDIRECTORY(${OPENJPEG_SOURCE_DIR}/thirdparty) -# - LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/thirdparty/lib) -# - IF(NOT ZLIB_FOUND) - INCLUDE_DIRECTORIES(${OPENJPEG_SOURCE_DIR}/thirdparty/include) - SET(ZLIB_INCLUDE_DIRNAME ${OPENJPEG_SOURCE_DIR}/thirdparty/include) - SET(Z_LIBNAME z) - SET(ZLIB_FOUND 1) - ENDIF(NOT ZLIB_FOUND) -# - IF(NOT PNG_FOUND) - SET(PNG_INCLUDE_DIRNAME ${OPENJPEG_SOURCE_DIR}/thirdparty/libpng) - SET(PNG_LIBNAME png) - SET(PNG_FOUND 1) - ENDIF(NOT PNG_FOUND) -# - IF(NOT LCMS_FOUND AND NOT LCMS2_FOUND) - SET(LCMS_INCLUDE_DIRNAME ${OPENJPEG_SOURCE_DIR}/thirdparty/liblcms2/include) - SET(LCMS_LIBNAME lcms2) - SET(LCMS2_FOUND 1) - ENDIF(NOT LCMS_FOUND AND NOT LCMS2_FOUND) -# - IF(NOT TIFF_FOUND) - SET(TIFF_INCLUDE_DIRNAME ${OPENJPEG_SOURCE_DIR}/thirdparty/libtiff) - SET(TIFF_LIBNAME tiff) - SET(TIFF_FOUND 1) - ENDIF(NOT TIFF_FOUND) -# - ENDIF(BUILD_THIRDPARTY) - ENDIF(NOT ZLIB_FOUND OR NOT PNG_FOUND OR NOT TIFF_FOUND OR LCMS12_MISSING) -# -ENDIF(BUILD_CODEC OR BUILD_MJ2) -# +# Build the each application if it needed + IF(BUILD_CODEC) ADD_SUBDIRECTORY(codec) ENDIF(BUILD_CODEC) -# + IF(BUILD_MJ2) ADD_SUBDIRECTORY(mj2) ENDIF(BUILD_MJ2) -# diff --git a/applications/codec/CMakeLists.txt b/applications/codec/CMakeLists.txt index 1a25d310..e39f41f3 100644 --- a/applications/codec/CMakeLists.txt +++ b/applications/codec/CMakeLists.txt @@ -1,4 +1,4 @@ - # Build the demo app, small examples +# Build the demo app, small examples # First thing define the common source: SET(common_SRCS @@ -37,11 +37,7 @@ ENDIF(WIN32) FOREACH(exe j2k_to_image image_to_j2k j2k_dump) ADD_EXECUTABLE(${exe} ${exe}.c ${common_SRCS}) TARGET_LINK_LIBRARIES(${exe} ${OPENJPEG_LIBRARY_NAME} -${Z_LIBNAME} ${PNG_LIBNAME} ${TIFF_LIBNAME}) - - IF(LCMS_FOUND OR LCMS2_FOUND) - TARGET_LINK_LIBRARIES(${exe} ${LCMS_LIBNAME}) - ENDIF(LCMS_FOUND OR LCMS2_FOUND) +${Z_LIBNAME} ${PNG_LIBNAME} ${TIFF_LIBNAME} ${LCMS_LIBNAME} ) ADD_TEST(${exe} ${EXECUTABLE_OUTPUT_PATH}/${exe}) # calling those exe without option will make them fail always: diff --git a/opj_configh.cmake.in b/opj_configh.cmake.in index f510a710..c05d8d55 100644 --- a/opj_configh.cmake.in +++ b/opj_configh.cmake.in @@ -1,6 +1,6 @@ /* create config.h for CMake */ #define PACKAGE_VERSION "@PACKAGE_VERSION@" -# + #cmakedefine HAVE_INTTYPES_H @HAS_INTTYPES_H@ #cmakedefine HAVE_MEMORY_H @HAS_MEMORY_H@ #cmakedefine HAVE_STDINT_H @HAS_STDINT_H@ @@ -14,9 +14,9 @@ #cmakedefine HAVE_PNG_H @HAVE_PNG_H@ #cmakedefine HAVE_LIBTIFF @HAVE_LIBTIFF@ #cmakedefine HAVE_TIFF_H @HAVE_TIFF_H@ -# + #cmakedefine HAVE_LIBLCMS1 @HAVE_LIBLCMS1@ #cmakedefine HAVE_LIBLCMS2 @HAVE_LIBLCMS2@ #cmakedefine HAVE_LCMS1_H @HAVE_LCMS1_H@ #cmakedefine HAVE_LCMS2_H @HAVE_LCMS2_H@ -# + diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt index 08710380..c779ff95 100644 --- a/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt @@ -1,20 +1,149 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -IF(BUILD_THIRDPARTY) -# -IF(NOT ZLIB_FOUND) - ADD_SUBDIRECTORY(libz) -ENDIF(NOT ZLIB_FOUND) -# -IF(NOT PNG_FOUND) - ADD_SUBDIRECTORY(libpng) -ENDIF(NOT PNG_FOUND) -# -IF(NOT LCMS2_FOUND) - ADD_SUBDIRECTORY(liblcms2) -ENDIF(NOT LCMS2_FOUND) -# -IF(NOT TIFF_FOUND) - ADD_SUBDIRECTORY(libtiff) -ENDIF(NOT TIFF_FOUND) -# -ENDIF(BUILD_THIRDPARTY) + +IF(UNIX OR CYGWIN) + SET(CMAKE_INCLUDE_PATH /usr/include /usr/local/include /opt/include + /opt/local/include /usr/include/libpng /usr/include/libpng14 + /usr/include/libpng12 /usr/local/include/libpng + /usr/local/include/libpng14 /usr/local/include/libpng12 + /opt/include/libpng /opt/include/libpng14 /opt/include/libpng12 + /opt/local/include/libpng /opt/local/include/libpng14) + SET(CMAKE_LIBRARY_PATH /usr/lib /usr/local/lib /opt/lib /opt/local/lib) +ENDIF(UNIX OR CYGWIN) + +#------------ +# Try to find lib Z +FIND_PACKAGE(ZLIB) + +IF(ZLIB_FOUND) + + SET(Z_LIBNAME ${ZLIB_LIBRARIES} PARENT_SCOPE) + SET(Z_INCLUDE_DIRNAME ${ZLIB_INCLUDE_DIRS} PARENT_SCOPE) + message("Your system seems to have a Z lib available, we will used it to generate PNG lib") + +ELSE (ZLIB_FOUND) # not found + + IF(BUILD_THIRDPARTY) + # Try to build it + message("We will build Z lib from thirdparty") + ADD_SUBDIRECTORY(libz) + SET(Z_LIBNAME ${ZLIB_LIBRARIES} PARENT_SCOPE) + SET(Z_INCLUDE_DIRNAME ${ZLIB_INCLUDE_DIRS} PARENT_SCOPE) + SET(ZLIB_FOUND 1) + ELSE (BUILD_THIRDPARTY) + message("Z lib not found, activate BUILD_THIRDPARTY if you want build it (necessary to build libPNG)") + ENDIF(BUILD_THIRDPARTY) + +ENDIF(ZLIB_FOUND) + +#------------ +# Try to find lib PNG (which depends to zlib) +IF (ZLIB_FOUND) + FIND_PACKAGE(PNG) + + IF(PNG_FOUND) + + message("Your system seems to have a PNG lib available, we will used it") + SET(HAVE_PNG_H 1 PARENT_SCOPE) + SET(HAVE_LIBPNG 1 PARENT_SCOPE) + SET(PNG_LIBNAME ${PNG_LIBRARIES} PARENT_SCOPE) + SET(PNG_INCLUDE_DIRNAME ${PNG_INCLUDE_DIR} PARENT_SCOPE) + + ELSE(PNG_FOUND) # not found + + IF(BUILD_THIRDPARTY) + # Try to build it + message("We will build PNG lib from thirdparty") + ADD_SUBDIRECTORY(libpng) + SET(HAVE_PNG_H 1 PARENT_SCOPE) + SET(HAVE_LIBPNG 1 PARENT_SCOPE) + SET(PNG_LIBNAME ${PNG_LIBRARIES} PARENT_SCOPE) + SET(PNG_INCLUDE_DIRNAME ${PNG_INCLUDE_DIR} PARENT_SCOPE) + ELSE (BUILD_THIRDPARTY) + SET(HAVE_PNG_H 0 PARENT_SCOPE) + SET(HAVE_LIBPNG 0 PARENT_SCOPE) + message("PNG lib not found, activate BUILD_THIRDPARTY if you want build it") + ENDIF(BUILD_THIRDPARTY) + + ENDIF(PNG_FOUND) + +ELSE (ZLIB_FOUND) + message(WARNING "To add lib PNG we need that ZLIB was previously found") +ENDIF (ZLIB_FOUND) + +#------------ +# Try to find lib TIFF +FIND_PACKAGE(TIFF) + +IF(TIFF_FOUND) + + message("Your system seems to have a TIFF lib available, we will used it") + SET(HAVE_TIFF_H 1 PARENT_SCOPE) + SET(HAVE_LIBTIFF 1 PARENT_SCOPE) + SET(TIFF_LIBNAME ${TIFF_LIBRARIES} PARENT_SCOPE) + SET(TIFF_INCLUDE_DIRNAME ${TIFF_INCLUDE_DIR} PARENT_SCOPE) + +ELSE (TIFF_FOUND) # not found + + IF(BUILD_THIRDPARTY) + # Try to build it + message("We will build TIFF lib from thirdparty") + ADD_SUBDIRECTORY(libtiff) + SET(TIFF_LIBNAME ${TIFF_LIBRARIES} PARENT_SCOPE) + SET(TIFF_INCLUDE_DIRNAME ${TIFF_INCLUDE_DIR} PARENT_SCOPE) + SET(HAVE_TIFF_H 1 PARENT_SCOPE) + SET(HAVE_LIBTIFF 1 PARENT_SCOPE) + ELSE (BUILD_THIRDPARTY) + SET(HAVE_TIFF_H 0 PARENT_SCOPE) + SET(HAVE_LIBTIFF 0 PARENT_SCOPE) + message("TIFF lib not found, activate BUILD_THIRDPARTY if you want build it") + ENDIF(BUILD_THIRDPARTY) + +ENDIF(TIFF_FOUND) + +#------------ +# Try to find lib LCMS2 (or by default LCMS) +FIND_PACKAGE(LCMS2) + +IF(LCMS2_FOUND) + + message("Your system seems to have a LCMS2 lib available, we will used it") + SET(HAVE_LCMS2_H 1 PARENT_SCOPE) + SET(HAVE_LIBLCMS2 1 PARENT_SCOPE) + SET(LCMS_LIBNAME ${LCMS2_LIBRARIES} PARENT_SCOPE) + SET(LCMS_INCLUDE_DIRNAME ${LCMS2_INCLUDE_DIRS} PARENT_SCOPE) + +ELSE (LCMS2_FOUND) # not found lcms2 + # try to find LCMS + FIND_PACKAGE(LCMS) + + IF(LCMS_FOUND) + + message("Your system seems to have a LCMS lib available, we will used it") + SET(HAVE_LCMS_H 1 PARENT_SCOPE) + SET(HAVE_LIBLCMS 1 PARENT_SCOPE) + SET(LCMS_LIBNAME ${LCMS_LIBRARIES} PARENT_SCOPE) + SET(LCMS_INCLUDE_DIRNAME ${LCMS_INCLUDE_DIRS} PARENT_SCOPE) + + ELSE (LCMS_FOUND) # not found lcms + SET(HAVE_LCMS_H 0 PARENT_SCOPE) + SET(HAVE_LIBLCMS 0 PARENT_SCOPE) + + IF( BUILD_THIRDPARTY) + + # Try to build lcms2 + message("We will build LCMS2 lib from thirdparty") + ADD_SUBDIRECTORY(liblcms2) + SET(LCMS_LIBNAME "lcms2" PARENT_SCOPE) + SET(LCMS_INCLUDE_DIRNAME ${OPENJPEG_SOURCE_DIR}/thirdparty/liblcms2/include PARENT_SCOPE) # + SET(HAVE_LCMS2_H 1 PARENT_SCOPE) + SET(HAVE_LIBLCMS2 1 PARENT_SCOPE) + ELSE (BUILD_THIRDPARTY) + SET(HAVE_LCMS2_H 0 PARENT_SCOPE) + SET(HAVE_LIBLCMS2 0 PARENT_SCOPE) + message("LCMS2 or LCMS lib not found, activate BUILD_THIRDPARTY if you want build it") + ENDIF(BUILD_THIRDPARTY) + + ENDIF (LCMS_FOUND) +ENDIF(LCMS2_FOUND) + + From 9cd5752e387b908485cb79dc26c84671cdc42679 Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Mon, 18 Jul 2011 08:58:18 +0000 Subject: [PATCH 07/33] correct build error (mislocated declaration) with convert to tiff function when HAVE_LIBTIFF is defined --- CHANGES | 5 ++++- applications/codec/convert.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 486ed83f..b383bb87 100644 --- a/CHANGES +++ b/CHANGES @@ -5,7 +5,10 @@ What's New for OpenJPEG ! : changed + : added -July 10, 2011 +July 18, 2011 +! [mickael] correct build error (mislocated declaration) with convert to tiff function when HAVE_LIBTIFF is defined + +July 13, 2011 ! [mickael] improved some CMakeLists files linked to the build of applications which used thirdparty _______ R812 : 'openjpeg-1.5' branch created ______________________________ diff --git a/applications/codec/convert.c b/applications/codec/convert.c index 9310938a..f3170a72 100644 --- a/applications/codec/convert.c +++ b/applications/codec/convert.c @@ -1925,9 +1925,9 @@ int imagetotif(opj_image_t * image, const char *outfile) { unsigned char *dat8; tsize_t i, ssize; + int step, restx; ssize = TIFFStripSize(tif); dat8 = (unsigned char*)buf; - int step, restx; if(bps == 8) { From 0380840348d378217c417e5f310ba5885079fe8d Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Thu, 21 Jul 2011 14:34:16 +0000 Subject: [PATCH 08/33] removed unused warning configuration message --- CHANGES | 3 +++ thirdparty/CMakeLists.txt | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index b383bb87..a74ad81e 100644 --- a/CHANGES +++ b/CHANGES @@ -5,6 +5,9 @@ What's New for OpenJPEG ! : changed + : added +July 21, 2011 +! [mickael] removed unused warning configuration message + July 18, 2011 ! [mickael] correct build error (mislocated declaration) with convert to tiff function when HAVE_LIBTIFF is defined diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt index c779ff95..b129d0e5 100644 --- a/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt @@ -65,9 +65,6 @@ IF (ZLIB_FOUND) ENDIF(BUILD_THIRDPARTY) ENDIF(PNG_FOUND) - -ELSE (ZLIB_FOUND) - message(WARNING "To add lib PNG we need that ZLIB was previously found") ENDIF (ZLIB_FOUND) #------------ From f8de2fc8eb78d52480bcf7755acdcd961ef3aa39 Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Thu, 21 Jul 2011 14:56:29 +0000 Subject: [PATCH 09/33] to follow last version of conformance data about component separator for pgx file, we changed - to _ separator even if nb component = 1 --- CHANGES | 3 +++ applications/codec/convert.c | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index a74ad81e..f6b0ae06 100644 --- a/CHANGES +++ b/CHANGES @@ -5,6 +5,9 @@ What's New for OpenJPEG ! : changed + : added +July 21, 2011 +! [mickael] to follow last version of conformance data about component separator for pgx file, we changed - to _ separator even if nb component = 1 + July 21, 2011 ! [mickael] removed unused warning configuration message diff --git a/applications/codec/convert.c b/applications/codec/convert.c index f3170a72..8ca54a4f 100644 --- a/applications/codec/convert.c +++ b/applications/codec/convert.c @@ -1200,11 +1200,11 @@ int imagetopgx(opj_image_t * image, const char *outfile) { name = (char*)malloc(total+1); } strncpy(name, outfile, dotpos); - if (image->numcomps > 1) { - sprintf(name+dotpos, "-%d.pgx", compno); - } else { + //if (image->numcomps > 1) { + sprintf(name+dotpos, "_%d.pgx", compno); + /*} else { strcpy(name+dotpos, ".pgx"); - } + }*/ fdest = fopen(name, "wb"); if (!fdest) { fprintf(stderr, "ERROR -> failed to open %s for writing\n", name); From a19c8a4ea38866c1654f26f8389e4a4e7d9b092e Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Thu, 21 Jul 2011 15:23:31 +0000 Subject: [PATCH 10/33] add new decode tests based on conformance data and tolerance. Non regression is also added on the decoder output. Deactivate old tests. --- CHANGES | 3 +- CMakeLists.txt | 29 +- applications/codec/CMakeLists.txt | 68 +-- tests/CMakeLists.txt | 31 ++ tests/comparePGXimages.c | 774 ++++++++++++++++++++++++++++++ tests/conformance/CMakeLists.txt | 420 ++++++++++++++++ thirdparty/CMakeLists.txt | 2 +- 7 files changed, 1282 insertions(+), 45 deletions(-) create mode 100644 tests/CMakeLists.txt create mode 100644 tests/comparePGXimages.c create mode 100644 tests/conformance/CMakeLists.txt diff --git a/CHANGES b/CHANGES index f6b0ae06..5ef91e23 100644 --- a/CHANGES +++ b/CHANGES @@ -6,9 +6,8 @@ What's New for OpenJPEG + : added July 21, 2011 +!+ [mickael] add new decode tests based on conformance data and tolerance. Non regression is also added on the decoder output. Deactivate old tests. ! [mickael] to follow last version of conformance data about component separator for pgx file, we changed - to _ separator even if nb component = 1 - -July 21, 2011 ! [mickael] removed unused warning configuration message July 18, 2011 diff --git a/CMakeLists.txt b/CMakeLists.txt index 032b8ab4..4fcbca9c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -203,14 +203,6 @@ IF(NOT HAVE_UNISTD_H_FOUND STREQUAL "HAVE_UNISTD_H_FOUND-NOTFOUND") SET(HAS_UNISTD_H 1) ENDIF() -#----------------------------------------------------------------------------- -# CDash+CMake : to be updated -OPTION(BUILD_TESTING "Build the tests." OFF) -IF(BUILD_TESTING) - ENABLE_TESTING() - INCLUDE(CTest) -ENDIF(BUILD_TESTING) - #----------------------------------------------------------------------------- # Build Library INCLUDE_DIRECTORIES(BEFORE ${OPENJPEG_BINARY_DIR}) @@ -242,6 +234,27 @@ OPTION(BUILD_JPWL "Build the JPWL library and executables" OFF) # Build DOCUMENTATION (not in ALL target and only if Doxygen is found) ADD_SUBDIRECTORY(doc) +#----------------------------------------------------------------------------- +# Buld Testing +OPTION(BUILD_TESTING "Build the tests." OFF) +IF(BUILD_TESTING) + IF(BUILD_CODEC) + ENABLE_TESTING() + INCLUDE(CTest) + + # Add repository where to find tests + ADD_SUBDIRECTORY(tests) + + # Search openjpeg data needed for the tests + # They could be found via svn on the OpenJPEG google code project + # svn checkout http://openjpeg.googlecode.com/svn/data (about 70 Mo) + FIND_PATH(OPJ_DATA_ROOT README-OPJ-Data + PATHS $ENV{OPJ_DATA_ROOT} ${CMAKE_SOURCE_DIR}/../opj-data) + ELSE(BUILD_CODEC) + message(FATAL_ERROR "You need build codec to run the tests") + ENDIF(BUILD_CODEC) +ENDIF(BUILD_TESTING) + #----------------------------------------------------------------------------- # Tests data IF(BUILD_TESTING) diff --git a/applications/codec/CMakeLists.txt b/applications/codec/CMakeLists.txt index e39f41f3..f56ee0b5 100644 --- a/applications/codec/CMakeLists.txt +++ b/applications/codec/CMakeLists.txt @@ -101,38 +101,38 @@ IF(BUILD_JPWL) ) ENDIF(BUILD_JPWL) -if(BUILD_TESTING) -# Do testing here, once we know the examples are being built: -FILE(GLOB_RECURSE OPENJPEG_DATA_IMAGES_GLOB - "${JPEG2000_CONFORMANCE_DATA_ROOT}/*.j2k" - "${JPEG2000_CONFORMANCE_DATA_ROOT}/*.j2c" - "${JPEG2000_CONFORMANCE_DATA_ROOT}/*.jp2" - ) +#if(BUILD_TESTING) +## Do testing here, once we know the examples are being built: +#FILE(GLOB_RECURSE OPENJPEG_DATA_IMAGES_GLOB +# "${JPEG2000_CONFORMANCE_DATA_ROOT}/*.j2k" +# "${JPEG2000_CONFORMANCE_DATA_ROOT}/*.j2c" +# "${JPEG2000_CONFORMANCE_DATA_ROOT}/*.jp2" +# ) -foreach(filename ${OPENJPEG_DATA_IMAGES_GLOB}) - get_filename_component(filename_temp ${filename} NAME) - get_filename_component(filename_ext ${filename} EXT) - execute_process(COMMAND ${EXECUTABLE_OUTPUT_PATH}/j2k_dump -i ${filename} - OUTPUT_VARIABLE dump_success - OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/${filename_temp}.dump - ERROR_QUIET - ) - if(dump_success) - file(READ ${CMAKE_CURRENT_BINARY_DIR}/${filename_temp}.dump numcomp_file) - string(REGEX REPLACE ".*numcomps=([0-9]+).*" "\\1" - numcomps "${numcomp_file}") - #message( "found:${output_variable} for ${filename_temp}" ) - endif() - ADD_TEST(dump-${filename_temp} ${EXECUTABLE_OUTPUT_PATH}/j2k_dump -i ${filename}) - foreach(codec_type ppm pgx bmp tif raw tga png) - ADD_TEST(j2i-${filename_temp}-${codec_type} ${EXECUTABLE_OUTPUT_PATH}/j2k_to_image -i ${filename} -o ${filename_temp}.${codec_type}) - endforeach(codec_type) - foreach(codec_type ppm bmp tif tga png) - ADD_TEST(i2j-${filename_temp}-${codec_type} ${EXECUTABLE_OUTPUT_PATH}/image_to_j2k -i ${filename_temp}.${codec_type} -o ${filename_temp}.${codec_type}${filename_ext}) - SET_TESTS_PROPERTIES(i2j-${filename_temp}-${codec_type} PROPERTIES DEPENDS j2i-${filename_temp}-${codec_type}) - #if(UNIX) - # ADD_TEST(cmp-${filename_temp}-${codec_type} cmp ${filename} ${filename_temp}.${codec_type}${filename_ext}) - #endif(UNIX) - endforeach(codec_type) -endforeach(filename) -endif(BUILD_TESTING) +#foreach(filename ${OPENJPEG_DATA_IMAGES_GLOB}) +# get_filename_component(filename_temp ${filename} NAME) +# get_filename_component(filename_ext ${filename} EXT) +# execute_process(COMMAND ${EXECUTABLE_OUTPUT_PATH}/j2k_dump -i ${filename} +# OUTPUT_VARIABLE dump_success +# OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/${filename_temp}.dump +# ERROR_QUIET +# ) +# if(dump_success) +# file(READ ${CMAKE_CURRENT_BINARY_DIR}/${filename_temp}.dump numcomp_file) +# string(REGEX REPLACE ".*numcomps=([0-9]+).*" "\\1" +# numcomps "${numcomp_file}") +# #message( "found:${output_variable} for ${filename_temp}" ) +# endif() +# ADD_TEST(dump-${filename_temp} ${EXECUTABLE_OUTPUT_PATH}/j2k_dump -i ${filename}) +# foreach(codec_type ppm pgx bmp tif raw tga png) +# ADD_TEST(j2i-${filename_temp}-${codec_type} ${EXECUTABLE_OUTPUT_PATH}/j2k_to_image -i ${filename} -o ${filename_temp}.${codec_type}) +# endforeach(codec_type) +# foreach(codec_type ppm bmp tif tga png) +# ADD_TEST(i2j-${filename_temp}-${codec_type} ${EXECUTABLE_OUTPUT_PATH}/image_to_j2k -i ${filename_temp}.${codec_type} -o ${filename_temp}.${codec_type}${filename_ext}) +# SET_TESTS_PROPERTIES(i2j-${filename_temp}-${codec_type} PROPERTIES DEPENDS j2i-${filename_temp}-${codec_type}) +# #if(UNIX) +# # ADD_TEST(cmp-${filename_temp}-${codec_type} cmp ${filename} ${filename_temp}.${codec_type}${filename_ext}) +# #endif(UNIX) +# endforeach(codec_type) +#endforeach(filename) +#endif(BUILD_TESTING) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt new file mode 100644 index 00000000..29879b82 --- /dev/null +++ b/tests/CMakeLists.txt @@ -0,0 +1,31 @@ +CMAKE_MINIMUM_REQUIRED(VERSION 2.6) + +INCLUDE_DIRECTORIES(${OPENJPEG_SOURCE_DIR}/libopenjpeg + ${OPENJPEG_SOURCE_DIR}/applications/codec + ${OPENJPEG_SOURCE_DIR}/applications/common + ) + +# First thing define the common source: +SET(comparePGXimages_SRCS comparePGXimages.c ${OPENJPEG_SOURCE_DIR}/applications/codec/convert.c) + +# If not getopt was found then add it to the exe: +IF(DONT_HAVE_GETOPT) + message("dont have getopt, we will add it") + SET(common_SRCS + ${common_SRCS} + ${OPENJPEG_SOURCE_DIR}/applications/common/getopt.c + ) +ENDIF(DONT_HAVE_GETOPT) + +ADD_EXECUTABLE(comparePGXimages ${comparePGXimages_SRCS}) +TARGET_LINK_LIBRARIES(comparePGXimages ${OPENJPEG_LIBRARY_NAME} + ${PNG_LIBNAME} + ${TIFF_LIBNAME} + ) + +# No image send to the dashboard if lib PNG is not available. +IF(NOT HAVE_LIBPNG) + MESSAGE(WARNING "Lib PNG seems to be not available: if you want run the non-regression tests with images reported to the dashboard, you need it (try BUILD_THIRDPARTY)") +ENDIF(NOT HAVE_LIBPNG) + +ADD_SUBDIRECTORY(conformance) \ No newline at end of file diff --git a/tests/comparePGXimages.c b/tests/comparePGXimages.c new file mode 100644 index 00000000..ad3b58fb --- /dev/null +++ b/tests/comparePGXimages.c @@ -0,0 +1,774 @@ +/* + * compareImagesPGX2.c + * + * Created on: 8 juil. 2011 + * Author: mickael + */ + +#include +#include +#include +#include + +//#include + +#include "opj_config.h" +#include "getopt.h" + +#include "openjpeg.h" +#include "format_defs.h" +#include "convert.h" + +//#include "commonTesting.h" + +double* parseToleranceValues( char* inArg, const int nbcomp); +void comparePGXimages_help_display(); +opj_image_t* readImageFromFilePGX(char* filename, int nbFilenamePGX, char *separator); +#ifdef HAVE_LIBPNG +int imageToPNG(const opj_image_t* image, const char* filename, int num_comp_select); +#endif + +typedef struct test_cmp_parameters +{ + /** */ + char* base_filename; + /** */ + char* test_filename; + /** Number of components */ + int nbcomp; + /** */ + double* tabMSEvalues; + /** */ + double* tabPEAKvalues; + /** */ + int nr_flag; + /** */ + char separator_base[2]; + /** */ + char separator_test[2]; + +} test_cmp_parameters; + +void comparePGXimages_help_display() { + fprintf(stdout,"\nList of parameters for the comparePGX function \n"); + fprintf(stdout,"\n"); + fprintf(stdout," -b \t REQUIRED \t filename to the reference/baseline PGX image \n"); + fprintf(stdout," -t \t REQUIRED \t filename to the test PGX image\n"); + fprintf(stdout," -n \t REQUIRED \t number of component of the image (used to generate correct filename)\n"); + fprintf(stdout," -m \t OPTIONAL \t list of MSE tolerances, separated by : (size must correspond to the number of component) of \n"); + fprintf(stdout," -p \t OPTIONAL \t list of PEAK tolerances, separated by : (size must correspond to the number of component) \n"); + fprintf(stdout," -s \t OPTIONAL \t 1 or 2 filename separator to take into account PGX image with different components, " + "please indicate b or t before separator to indicate respectively the separator " + "for ref/base file and for test file. \n"); + fprintf(stdout," -r \t OPTIONAL \t indicate if you want to run this function as conformance test or as non regression test\n"); + fprintf(stdout,"\n"); +} + +/******************************************************************************* + * Parse command line + *******************************************************************************/ +int parse_cmdline_cmp(int argc, char **argv, test_cmp_parameters* param) +{ + char *MSElistvalues = NULL; char *PEAKlistvalues= NULL; + char *separatorList = NULL; + int sizemembasefile, sizememtestfile; + int index, flagM=0, flagP=0; + const char optlist[] = "b:t:n:m:p:s:d"; + int c; + + // Init parameters + param->base_filename = NULL; + param->test_filename = NULL; + param->nbcomp = 0; + param->tabMSEvalues = NULL; + param->tabPEAKvalues = NULL; + param->nr_flag = 0; + + opterr = 0; + + while ((c = getopt(argc, argv, optlist)) != -1) + switch (c) + { + case 'b': + sizemembasefile = (int)strlen(optarg)+1; + param->base_filename = (char*) malloc(sizemembasefile); + param->base_filename[0] = '\0'; + strncpy(param->base_filename, optarg, strlen(optarg)); + param->base_filename[strlen(optarg)] = '\0'; + //printf("param->base_filename = %s [%d / %d]\n", param->base_filename, strlen(param->base_filename), sizemembasefile ); + break; + case 't': + sizememtestfile = (int) strlen(optarg) + 1; + param->test_filename = (char*) malloc(sizememtestfile); + param->test_filename[0] = '\0'; + strncpy(param->test_filename, optarg, strlen(optarg)); + param->test_filename[strlen(optarg)] = '\0'; + //printf("param->test_filename = %s [%d / %d]\n", param->test_filename, strlen(param->test_filename), sizememtestfile); + break; + case 'n': + param->nbcomp = atoi(optarg); + break; + case 'm': + MSElistvalues = optarg; + flagM = 1; + break; + case 'p': + PEAKlistvalues = optarg; + flagP = 1; + break; + case 'd': + param->nr_flag = 1; + break; + case 's': + separatorList = optarg; + break; + case '?': + if ((optopt == 'b') || (optopt == 't') || (optopt == 'n') || (optopt == 'p') || (optopt == 'm') || (optopt + == 's')) + fprintf(stderr, "Option -%c requires an argument.\n", optopt); + else + if (isprint(optopt)) fprintf(stderr, "Unknown option `-%c'.\n", optopt); + else fprintf(stderr, "Unknown option character `\\x%x'.\n", optopt); + return 1; + default: + fprintf(stderr, "WARNING -> this option is not valid \"-%c %s\"\n", c, optarg); + break; + } + + if (optind != argc) + { + for (index = optind; index < argc; index++) + fprintf(stderr,"Non-option argument %s\n", argv[index]); + return EXIT_FAILURE; + } + + if (param->nbcomp == 0) + { + fprintf(stderr,"Need to indicate the number of components !\n"); + return EXIT_FAILURE; + } + else + { + if ( flagM && flagP ) + { + param->tabMSEvalues = parseToleranceValues( MSElistvalues, param->nbcomp); + param->tabPEAKvalues = parseToleranceValues( PEAKlistvalues, param->nbcomp); + if ( (param->tabMSEvalues == NULL) || (param->tabPEAKvalues == NULL)) + { + fprintf(stderr,"MSE and PEAK values are not correct (respectively need %d values)\n",param->nbcomp); + return EXIT_FAILURE; + } + } + /*else + { + + }*/ + } + + // Get separators after corresponding letter (b or t) + if (separatorList != NULL) + { + if( (strlen(separatorList) ==2) || (strlen(separatorList) ==4) ) + { + // keep original string + int sizeseplist = (int)strlen(separatorList)+1; + char* separatorList2 = (char*)malloc( sizeseplist ); + separatorList2[0] = '\0'; + strncpy(separatorList2, separatorList, strlen(separatorList)); + separatorList2[strlen(separatorList)] = '\0'; + //printf("separatorList2 = %s [%d / %d]\n", separatorList2, strlen(separatorList2), sizeseplist); + + if (strlen(separatorList) == 2) // one separator behind b or t + { + char *resultT = NULL; + resultT = strtok(separatorList2, "t"); + if (strlen(resultT) == strlen(separatorList)) // didn't find t character, try to find b + { + char *resultB = NULL; + resultB = strtok(resultT, "b"); + if (strlen(resultB) == 1) + { + param->separator_base[0] = separatorList[1];param->separator_base[1] = '\0'; + param->separator_test[0] ='\0'; + } + else // not found b + { + free(separatorList2); + return EXIT_FAILURE; + } + } + else // found t + { + param->separator_base[0] ='\0'; + param->separator_test[0] = separatorList[1];param->separator_test[1] = '\0'; + } + //printf("sep b = %s [%d] and sep t = %s [%d]\n",param->separator_base, strlen(param->separator_base), param->separator_test, strlen(param->separator_test) ); + } + else // == 4 characters we must found t and b + { + char *resultT = NULL; + resultT = strtok(separatorList2, "t"); + if (strlen(resultT) == 3) // found t in first place + { + char *resultB = NULL; + resultB = strtok(resultT, "b"); + if (strlen(resultB) == 1) // found b after t + { + param->separator_test[0] = separatorList[1];param->separator_test[1] = '\0'; + param->separator_base[0] = separatorList[3];param->separator_base[1] = '\0'; + } + else // didn't find b after t + { + free(separatorList2); + return EXIT_FAILURE; + } + } + else // == 2, didn't find t in first place + { + char *resultB = NULL; + resultB = strtok(resultT, "b"); + if (strlen(resultB) == 1) // found b in first place + { + param->separator_base[0] = separatorList[1]; param->separator_base[1] = '\0'; + param->separator_test[0] = separatorList[3]; param->separator_test[1] = '\0'; + } + else // didn't found b in first place => problem + { + free(separatorList2); + return EXIT_FAILURE; + } + } + } + free(separatorList2); + } + else // wrong number of argument after -s + { + return EXIT_FAILURE; + } + } + else + { + if (param->nbcomp == 1) + { + param->separator_base[0] = '\0'; + param->separator_test[0] = '\0'; + } + else + { + fprintf(stderr,"If number of component is > 1, we need separator\n"); + return EXIT_FAILURE; + } + } + + + if ( (param->nr_flag) && (flagP || flagM) ) + { + fprintf(stderr,"Wrong input parameters list: it is non-regression test or tolerance comparison\n"); + return EXIT_FAILURE; + } + if ( (!param->nr_flag) && (!flagP || !flagM) ) + { + fprintf(stderr,"Wrong input parameters list: it is non-regression test or tolerance comparison\n"); + return EXIT_FAILURE; + } + + return EXIT_SUCCESS; +} + +/******************************************************************************* + * Parse MSE and PEAK input values ( + * separator = ":" + *******************************************************************************/ +double* parseToleranceValues( char* inArg, const int nbcomp) +{ + double* outArgs= malloc(nbcomp * sizeof(double)); + int it_comp = 0; + char delims[] = ":"; + char *result = NULL; + result = strtok( inArg, delims ); + + while( (result != NULL) && (it_comp < nbcomp )) + { + outArgs[it_comp] = atof(result); + result = strtok( NULL, delims ); + it_comp++; + } + + if (it_comp != nbcomp) + return NULL; + else + return outArgs; +} +/******************************************************************************* + * Create filenames from a filename by used separator and nb components + * (begin to 0) + *******************************************************************************/ +char* createMultiComponentsFilename(const char* inFilename, const int indexF, const char* separator) +{ + char s[255]; + char *outFilename, *ptr; + char token = '.'; + int posToken = 0; + + //printf("inFilename = %s\n", inFilename); + if ((ptr = strrchr(inFilename, token)) != NULL) + { + posToken = (int) (strlen(inFilename) - strlen(ptr)); + //printf("Position of %c character inside inFilename = %d\n", token, posToken); + } + else + { + //printf("Token %c not found\n", token); + return outFilename; + } + + outFilename = (char*)malloc((posToken + 7) * sizeof(char)); //6 + + strncpy(outFilename, inFilename, posToken); + + outFilename[posToken] = '\0'; + + strcat(outFilename, separator); + + sprintf(s, "%i", indexF); + strcat(outFilename, s); + + strcat(outFilename, ".pgx"); + + //printf("outfilename: %s\n", outFilename); + return outFilename; +} +/******************************************************************************* + * + *******************************************************************************/ +opj_image_t* readImageFromFilePGX(char* filename, int nbFilenamePGX, char *separator) +{ + int it_file; + opj_image_t* image_read = NULL; + opj_image_t* image = NULL; + opj_cparameters_t parameters; + opj_image_cmptparm_t* param_image_read; + int** data; + + // If separator is empty => nb file to read is equal to one + if ( strlen(separator) == 0 ) + nbFilenamePGX = 1; + + /* set encoding parameters to default values */ + opj_set_default_encoder_parameters(¶meters); + parameters.decod_format = PGX_DFMT; + strncpy(parameters.infile, filename, sizeof(parameters.infile)-1); + + // Allocate memory + param_image_read = malloc(nbFilenamePGX * sizeof(opj_image_cmptparm_t)); + data = malloc(nbFilenamePGX * sizeof(*data)); + + it_file = 0; + for (it_file = 0; it_file < nbFilenamePGX; it_file++) + { + // Create the right filename + char *filenameComponentPGX; + if (strlen(separator) == 0) + { + filenameComponentPGX = malloc((strlen(filename) + 1) * sizeof(*filenameComponentPGX)); + strcpy(filenameComponentPGX, filename); + } + else + filenameComponentPGX = createMultiComponentsFilename(filename, it_file, separator); + + // Read the pgx file corresponding to the component + image_read = pgxtoimage(filenameComponentPGX, ¶meters); + if (!image_read) + { + fprintf(stderr, "Unable to load pgx file\n"); + return NULL; + } + + // Set the image_read parameters + param_image_read[it_file].x0 = 0; + param_image_read[it_file].y0 = 0; + param_image_read[it_file].dx = 0; + param_image_read[it_file].dy = 0; + param_image_read[it_file].h = image_read->comps->h; + param_image_read[it_file].w = image_read->comps->w; + param_image_read[it_file].bpp = image_read->comps->bpp; + param_image_read[it_file].prec = image_read->comps->prec; + param_image_read[it_file].sgnd = image_read->comps->sgnd; + + // Copy data + data[it_file] = malloc(param_image_read[it_file].h * param_image_read[it_file].w * sizeof(int)); + memcpy(data[it_file], image_read->comps->data, image_read->comps->h * image_read->comps->w * sizeof(int)); + + // Free memory + opj_image_destroy(image_read); + free(filenameComponentPGX); + } + + image = opj_image_create(nbFilenamePGX, param_image_read, CLRSPC_UNSPECIFIED); + for (it_file = 0; it_file < nbFilenamePGX; it_file++) + { + // Copy data into output image and free memory + memcpy(image->comps[it_file].data, data[it_file], image->comps[it_file].h * image->comps[it_file].w * sizeof(int)); + free(data[it_file]); + } + + // Free memory + free(param_image_read); + free(data); + + return image; +} + +/******************************************************************************* + * + *******************************************************************************/ +#ifdef HAVE_LIBPNG +int imageToPNG(const opj_image_t* image, const char* filename, int num_comp_select) +{ + opj_image_cmptparm_t param_image_write; + opj_image_t* image_write = NULL; + + param_image_write.x0 = 0; + param_image_write.y0 = 0; + param_image_write.dx = 0; + param_image_write.dy = 0; + param_image_write.h = image->comps[num_comp_select].h; + param_image_write.w = image->comps[num_comp_select].w; + param_image_write.bpp = image->comps[num_comp_select].bpp; + param_image_write.prec = image->comps[num_comp_select].prec; + param_image_write.sgnd = image->comps[num_comp_select].sgnd; + + image_write = opj_image_create(1, ¶m_image_write, CLRSPC_GRAY); + memcpy(image_write->comps->data, image->comps[num_comp_select].data, param_image_write.h * param_image_write.w * sizeof(int)); + + imagetopng(image_write, filename); + + opj_image_destroy(image_write); + + return EXIT_SUCCESS; +} +#endif + +/******************************************************************************* + * MAIN + *******************************************************************************/ +int main(int argc, char **argv) +{ + test_cmp_parameters inParam; + int it_comp, itpxl; + int failed = 0; + int nbFilenamePGXbase, nbFilenamePGXtest; + char *filenamePNGtest= NULL, *filenamePNGbase = NULL, *filenamePNGdiff = NULL; + int memsizebasefilename, memsizetestfilename, memsizedifffilename; + int valueDiff = 0, nbPixelDiff = 0; + double sumDiff = 0.0; + // Structures to store image parameters and data + opj_image_t *imageBase = NULL, *imageTest = NULL, *imageDiff = NULL; + opj_image_cmptparm_t* param_image_diff; + + // Get parameters from command line + if( parse_cmdline_cmp(argc, argv, &inParam) == EXIT_FAILURE ) + { + comparePGXimages_help_display(); + if (!inParam.tabMSEvalues) free(inParam.tabMSEvalues); + if (!inParam.tabPEAKvalues) free(inParam.tabPEAKvalues); + if (!inParam.base_filename) free(inParam.base_filename); + if (!inParam.test_filename) free(inParam.test_filename); + return EXIT_FAILURE; + } + + // Display Parameters + printf("******Parameters********* \n"); + printf(" base_filename = %s\n" + " test_filename = %s\n" + " nb of Components = %d\n" + " Non regression test = %d\n" + " separator Base = %s\n" + " separator Test = %s\n", + inParam.base_filename, inParam.test_filename, inParam.nbcomp, + inParam.nr_flag, inParam.separator_base, inParam.separator_test); + + if ( (inParam.tabMSEvalues != NULL) && (inParam.tabPEAKvalues != NULL)) + { + printf(" MSE values = ["); + for (it_comp = 0; it_comp < inParam.nbcomp; it_comp++) + printf(" %f ", inParam.tabMSEvalues[it_comp]); + printf("]\n"); + printf(" PEAK values = ["); + for (it_comp = 0; it_comp < inParam.nbcomp; it_comp++) + printf(" %f ", inParam.tabPEAKvalues[it_comp]); + printf("]\n"); + printf(" Non-regression test = %d\n", inParam.nr_flag); + } + + if (strlen(inParam.separator_base) == 0) + nbFilenamePGXbase = 0; + else + nbFilenamePGXbase = inParam.nbcomp; + + if (strlen(inParam.separator_test) == 0) + nbFilenamePGXtest = 0; + else + nbFilenamePGXtest = inParam.nbcomp; + + printf(" NbFilename to generate from base filename = %d\n", nbFilenamePGXbase); + printf(" NbFilename to generate from test filename = %d\n", nbFilenamePGXtest); + printf("************************* \n"); + + //----------BASELINE IMAGE-------- + // + memsizebasefilename = (int)strlen(inParam.test_filename) + 1 + 5 + 2 + 4; + memsizetestfilename = (int)strlen(inParam.test_filename) + 1 + 5 + 2 + 4; + + imageBase = readImageFromFilePGX( inParam.base_filename, nbFilenamePGXbase, inParam.separator_base); + if ( imageBase != NULL) + { + filenamePNGbase = (char*) malloc(memsizebasefilename); + filenamePNGbase[0] = '\0'; + strncpy(filenamePNGbase, inParam.test_filename, strlen(inParam.test_filename)); + filenamePNGbase[strlen(inParam.test_filename)] = '\0'; + strcat(filenamePNGbase, ".base"); + //printf("filenamePNGbase = %s [%d / %d octets]\n",filenamePNGbase, strlen(filenamePNGbase),memsizebasefilename ); + } + else + { + if (!inParam.tabMSEvalues) free(inParam.tabMSEvalues); + if (!inParam.tabPEAKvalues) free(inParam.tabPEAKvalues); + if (!inParam.base_filename) free(inParam.base_filename); + if (!inParam.test_filename) free(inParam.test_filename); + return EXIT_FAILURE; + } + + //----------TEST IMAGE-------- + // + + imageTest = readImageFromFilePGX(inParam.test_filename, nbFilenamePGXtest, inParam.separator_test); + if ( imageTest != NULL) + { + filenamePNGtest = (char*) malloc(memsizetestfilename); + filenamePNGtest[0] = '\0'; + strncpy(filenamePNGtest, inParam.test_filename, strlen(inParam.test_filename)); + filenamePNGtest[strlen(inParam.test_filename)] = '\0'; + strcat(filenamePNGtest, ".test"); + //printf("filenamePNGtest = %s [%d / %d octets]\n",filenamePNGtest, strlen(filenamePNGtest),memsizetestfilename ); + } + else + { + if (!inParam.tabMSEvalues) free(inParam.tabMSEvalues); + if (!inParam.tabPEAKvalues) free(inParam.tabPEAKvalues); + if (!inParam.base_filename) free(inParam.base_filename); + if (!inParam.test_filename) free(inParam.test_filename); + free(filenamePNGbase); + return EXIT_FAILURE; + } + + //----------DIFF IMAGE-------- + // + + // Allocate memory + param_image_diff = malloc( imageBase->numcomps * sizeof(opj_image_cmptparm_t)); + + // Comparison of header parameters + printf("Step 1 -> Header comparison\n"); + + for (it_comp = 0; it_comp < imageBase->numcomps; it_comp++) + { + param_image_diff[it_comp].x0 = 0; + param_image_diff[it_comp].y0 = 0; + param_image_diff[it_comp].dx = 0; + param_image_diff[it_comp].dy = 0; + + if (imageBase->comps[it_comp].sgnd != imageTest->comps[it_comp].sgnd) + { + printf("ERROR: sign mismatch [comp %d] (%d><%d)\n", it_comp, ((imageBase->comps)[it_comp]).sgnd, ((imageTest->comps)[it_comp]).sgnd); + failed = 1; + } + else + param_image_diff[it_comp].sgnd = 0 ; + + if (((imageBase->comps)[it_comp]).prec != ((imageTest->comps)[it_comp]).prec) + { + printf("ERROR: prec mismatch [comp %d] (%d><%d)\n", it_comp, ((imageBase->comps)[it_comp]).prec, ((imageTest->comps)[it_comp]).prec); + failed = 1; + } + else + param_image_diff[it_comp].prec = 8 ; + + if (((imageBase->comps)[it_comp]).bpp != ((imageTest->comps)[it_comp]).bpp) + { + printf("ERROR: byte per pixel mismatch [comp %d] (%d><%d)\n", it_comp, ((imageBase->comps)[it_comp]).bpp, ((imageTest->comps)[it_comp]).bpp); + failed = 1; + } + else + param_image_diff[it_comp].bpp = 1 ; + + if (((imageBase->comps)[it_comp]).h != ((imageTest->comps)[it_comp]).h) + { + printf("ERROR: height mismatch [comp %d] (%d><%d)\n", it_comp, ((imageBase->comps)[it_comp]).h, ((imageTest->comps)[it_comp]).h); + failed = 1; + } + else + param_image_diff[it_comp].h = imageBase->comps[it_comp].h ; + + if (((imageBase->comps)[it_comp]).w != ((imageTest->comps)[it_comp]).w) + { + printf("ERROR: width mismatch [comp %d] (%d><%d)\n", it_comp, ((imageBase->comps)[it_comp]).w, ((imageTest->comps)[it_comp]).w); + failed = 1; + } + else + param_image_diff[it_comp].w = imageBase->comps[it_comp].w ; + } + + // If only one parameter is different, we stop the test + if (failed) + { + free(inParam.tabMSEvalues); + free(inParam.tabPEAKvalues); + free(inParam.base_filename); + free(inParam.test_filename); + + free(filenamePNGbase); + free(filenamePNGtest); + + opj_image_destroy(imageBase); + opj_image_destroy(imageTest); + + free(param_image_diff); + + return EXIT_FAILURE; + } + + imageDiff = opj_image_create(imageBase->numcomps, param_image_diff, CLRSPC_UNSPECIFIED); + // Free memory + free(param_image_diff); + + // Measurement computation + printf("Step 2 -> measurement comparison\n"); + + memsizedifffilename = strlen(inParam.test_filename) + 1 + 5 + 2 + 4; + filenamePNGdiff = (char*) malloc(memsizedifffilename); + filenamePNGdiff[0] = '\0'; + strncpy(filenamePNGdiff, inParam.test_filename, strlen(inParam.test_filename)); + filenamePNGdiff[strlen(inParam.test_filename)] = '\0'; + strcat(filenamePNGdiff, ".diff"); + //printf("filenamePNGdiff = %s [%d / %d octets]\n",filenamePNGdiff, strlen(filenamePNGdiff),memsizedifffilename ); + + // Compute pixel diff + for (it_comp = 0; it_comp < imageDiff->numcomps; it_comp++) + { + double SE=0,PEAK=0; + double MSE=0,PSNR=0; + char *filenamePNGbase_it_comp, *filenamePNGtest_it_comp, *filenamePNGdiff_it_comp; + + filenamePNGbase_it_comp = (char*) malloc(memsizebasefilename); + filenamePNGbase_it_comp[0] = '\0'; + strncpy(filenamePNGbase_it_comp,filenamePNGbase,strlen(filenamePNGbase)); + filenamePNGbase_it_comp[strlen(filenamePNGbase)] = '\0'; + + filenamePNGtest_it_comp = (char*) malloc(memsizetestfilename); + filenamePNGtest_it_comp[0] = '\0'; + strncpy(filenamePNGtest_it_comp,filenamePNGtest,strlen(filenamePNGtest)); + filenamePNGtest_it_comp[strlen(filenamePNGtest)] = '\0'; + + filenamePNGdiff_it_comp = (char*) malloc(memsizedifffilename); + filenamePNGdiff_it_comp[0] = '\0'; + strncpy(filenamePNGdiff_it_comp,filenamePNGdiff,strlen(filenamePNGdiff)); + filenamePNGdiff_it_comp[strlen(filenamePNGdiff)] = '\0'; + + for (itpxl = 0; itpxl < ((imageDiff->comps)[it_comp]).w * ((imageDiff->comps)[it_comp]).h; itpxl++) + { + if (abs( ((imageBase->comps)[it_comp]).data[itpxl] - ((imageTest->comps)[it_comp]).data[itpxl] ) > 0) + { + valueDiff = ((imageBase->comps)[it_comp]).data[itpxl] - ((imageTest->comps)[it_comp]).data[itpxl]; + ((imageDiff->comps)[it_comp]).data[itpxl] = abs(valueDiff); + sumDiff += (double)valueDiff; + nbPixelDiff++; + + SE += (double)(valueDiff * valueDiff); + PEAK = (PEAK > abs(valueDiff)) ? PEAK : abs(valueDiff); + } + else + ((imageDiff->comps)[it_comp]).data[itpxl] = 0; + }// h*w loop + + MSE = SE / ( ((imageDiff->comps)[it_comp]).w * ((imageDiff->comps)[it_comp]).h ); + + if (!inParam.nr_flag && (inParam.tabMSEvalues != NULL) && (inParam.tabPEAKvalues != NULL)) + { // Conformance test + printf(" %f \n", it_comp, PEAK); + printf(" %f \n", it_comp, MSE); + + if ( (MSE > inParam.tabMSEvalues[it_comp]) || (PEAK > inParam.tabPEAKvalues[it_comp]) ) + { + printf("ERROR: MSE (%f) or PEAK (%f) values produced by the decoded file are greater " + "than the allowable error (respectively %f and %f) \n", + MSE, PEAK, inParam.tabMSEvalues[it_comp], inParam.tabPEAKvalues[it_comp]); + failed = 1; + } + } + else // Non regression-test + { + if ( nbPixelDiff > 0) + { + char it_compc[255]; + + printf(" %d \n", it_comp, nbPixelDiff); + printf(" %f \n", it_comp, sumDiff); + +#ifdef HAVE_LIBPNG + it_compc[0] = '\0'; + sprintf(it_compc, "_%i", it_comp); + strcat(it_compc,".png"); + strcat(filenamePNGbase_it_comp, it_compc); + //printf("filenamePNGbase_it = %s [%d / %d octets]\n",filenamePNGbase_it_comp, strlen(filenamePNGbase_it_comp),memsizebasefilename ); + strcat(filenamePNGtest_it_comp, it_compc); + //printf("filenamePNGtest_it = %s [%d / %d octets]\n",filenamePNGtest_it_comp, strlen(filenamePNGtest_it_comp),memsizetestfilename ); + strcat(filenamePNGdiff_it_comp, it_compc); + //printf("filenamePNGdiff_it = %s [%d / %d octets]\n",filenamePNGdiff_it_comp, strlen(filenamePNGdiff_it_comp),memsizedifffilename ); + + if ( imageToPNG(imageBase, filenamePNGbase_it_comp, it_comp) == EXIT_SUCCESS ) + { + printf(" %s \n", it_comp, filenamePNGbase_it_comp); + } + + if ( imageToPNG(imageTest, filenamePNGtest_it_comp, it_comp) == EXIT_SUCCESS ) + { + printf(" %s \n", it_comp, filenamePNGtest_it_comp); + } + + if ( imageToPNG(imageDiff, filenamePNGdiff_it_comp, it_comp) == EXIT_SUCCESS ) + { + printf(" %s \n", it_comp, filenamePNGdiff_it_comp); + } +#endif + failed = 1; + } + } + free(filenamePNGbase_it_comp); + free(filenamePNGtest_it_comp); + free(filenamePNGdiff_it_comp); + } // it_comp loop + + //----------------------------- + // Free memory + opj_image_destroy(imageBase); + opj_image_destroy(imageTest); + opj_image_destroy(imageDiff); + + free(filenamePNGbase); + free(filenamePNGtest); + free(filenamePNGdiff); + + free(inParam.tabMSEvalues); + free(inParam.tabPEAKvalues); + free(inParam.base_filename); + free(inParam.test_filename); + + if (failed) + return EXIT_FAILURE; + else + { + printf("---- TEST SUCCEED ----\n"); + return EXIT_SUCCESS; + } +} diff --git a/tests/conformance/CMakeLists.txt b/tests/conformance/CMakeLists.txt new file mode 100644 index 00000000..600b9bb0 --- /dev/null +++ b/tests/conformance/CMakeLists.txt @@ -0,0 +1,420 @@ +# CONFORMANCE TESTS AND NON-REGRESSION ON THIS DATASET + +FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Temporary) + +SET(TEMP ${CMAKE_CURRENT_BINARY_DIR}/Temporary) +SET(BASELINE_CONF ${OPJ_DATA_ROOT}/baseline/conformance) +SET(BASELINE_NR ${OPJ_DATA_ROOT}/baseline/nonregression) +SET(INPUT_CONF ${OPJ_DATA_ROOT}/input/conformance) + + +# List of components by file (normaly p0_13.j2k have 257 components but for this +#set of test we consider only 4) +SET( CP0_nbC_list "not_used;1;1;1;3;4;4;3;3;1;3;1;1;4;3;1;1") +SET( CP1_nbC_list "not_used;1;3;4;1;3;3;2") + +SET(COMMENTCODEVAR FALSE) + + +#-------------------------------------------------------------------------- +# Tests about class 0 profile 0 +# try to decode +# compare to ref file provided by the Executable Test Suite +# non regression comparison + +# Parameters and tolerances given by Table C.1 +SET( C0P0_ResFactor_list "not_used;0;0;0;3;3;3;0;5;2;0;0;0;0;2;0;0") +SET( C0P0_PEAK_list "not_used;0;0;0;33;54;109;10;7;4;10;0;0;0;0;0;0") +SET( C0P0_MSE_list "not_used;0;0;0;55.8;68;743;0.34;6.72;1.47;2.84;0;0;0;0;0;0") + +FOREACH(numFileC0P0 RANGE 1 16) + + # Build filenames + IF(${numFileC0P0} LESS 10) + SET( filenameInput p0_0${numFileC0P0}.j2k ) + SET( filenameRef c0p0_0${numFileC0P0}.pgx ) + ELSE(${numFileC0P0} LESS 10) + SET( filenameInput p0_${numFileC0P0}.j2k ) + SET( filenameRef c0p0_${numFileC0P0}.pgx ) + ENDIF(${numFileC0P0} LESS 10) + + # Get corresponding tests parameters + list(GET C0P0_ResFactor_list ${numFileC0P0} ResFactor) + list(GET CP0_nbC_list ${numFileC0P0} nbComponents) + list(GET C0P0_PEAK_list ${numFileC0P0} PEAK_limit) + list(GET C0P0_MSE_list ${numFileC0P0} MSE_limit) + + # Manage cases which need to try different resolution reduction + IF (numFileC0P0 EQUAL 3 OR numFileC0P0 EQUAL 15) + + get_filename_component(filenameRefSub ${filenameRef} NAME_WE) + + #r = 0 + ADD_TEST(ETS-C0P0-${filenameInput}-r0-decode + ${EXECUTABLE_OUTPUT_PATH}/j2k_to_image + -i ${INPUT_CONF}/${filenameInput} + -o ${TEMP}/c0${filenameInput}-r0.pgx + -r 0 + ) + + ADD_TEST(ETS-C0P0-${filenameInput}-r0-compare2ref + ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages + -b ${BASELINE_CONF}/${filenameRefSub}r0.pgx + -t ${TEMP}/c0${filenameInput}-r0.pgx + -n ${nbComponents} + -p ${PEAK_limit} + -m ${MSE_limit} + -s t_ + ) + + SET_TESTS_PROPERTIES(ETS-C0P0-${filenameInput}-r0-compare2ref + PROPERTIES DEPENDS + ETS-C0P0-${filenameInput}-r0-decode) + + ADD_TEST(NR-C0P0-${filenameInput}-r0-compare2base + ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages + -b ${BASELINE_NR}/opj_${filenameRefSub}-r0.pgx + -t ${TEMP}/c0${filenameInput}-r0.pgx + -n ${nbComponents} + -d + -s b_t_ + ) + + SET_TESTS_PROPERTIES(NR-C0P0-${filenameInput}-r0-compare2base + PROPERTIES DEPENDS + ETS-C0P0-${filenameInput}-r0-decode) + + #r = 1 + ADD_TEST(ETS-C0P0-${filenameInput}-r1-decode + ${EXECUTABLE_OUTPUT_PATH}/j2k_to_image + -i ${INPUT_CONF}/${filenameInput} + -o ${TEMP}/c0${filenameInput}-r1.pgx + -r 1 + ) + + ADD_TEST(ETS-C0P0-${filenameInput}-r1-compare2ref + ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages + -b ${BASELINE_CONF}/${filenameRefSub}r1.pgx + -t ${TEMP}/c0${filenameInput}-r1.pgx + -n ${nbComponents} + -p ${PEAK_limit} + -m ${MSE_limit} + -s t_ + ) + + SET_TESTS_PROPERTIES(ETS-C0P0-${filenameInput}-r1-compare2ref + PROPERTIES DEPENDS + ETS-C0P0-${filenameInput}-r1-decode) + + ADD_TEST(NR-C0P0-${filenameInput}-r1-compare2base + ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages + -b ${BASELINE_NR}/opj_${filenameRefSub}-r1.pgx + -t ${TEMP}/c0${filenameInput}-r1.pgx + -n ${nbComponents} + -d + -s b_t_ + ) + + SET_TESTS_PROPERTIES(NR-C0P0-${filenameInput}-r1-compare2base + PROPERTIES DEPENDS + ETS-C0P0-${filenameInput}-r1-decode) + + ELSE(numFileC0P0 EQUAL 3 OR numFileC0P0 EQUAL 15) + + ADD_TEST(ETS-C0P0-${filenameInput}-decode + ${EXECUTABLE_OUTPUT_PATH}/j2k_to_image + -i ${INPUT_CONF}/${filenameInput} + -o ${TEMP}/c0${filenameInput}.pgx + -r ${ResFactor} + ) + + ADD_TEST(ETS-C0P0-${filenameInput}-compare2ref + ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages + -b ${BASELINE_CONF}/${filenameRef} + -t ${TEMP}/c0${filenameInput}.pgx + -n ${nbComponents} + -p ${PEAK_limit} + -m ${MSE_limit} + -s t_ + ) + + SET_TESTS_PROPERTIES(ETS-C0P0-${filenameInput}-compare2ref + PROPERTIES DEPENDS + ETS-C0P0-${filenameInput}-decode) + + ADD_TEST(NR-C0P0-${filenameInput}-compare2base + ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages + -b ${BASELINE_NR}/opj_${filenameRef} + -t ${TEMP}/c0${filenameInput}.pgx + -n ${nbComponents} + -d + -s b_t_ + ) + + SET_TESTS_PROPERTIES(NR-C0P0-${filenameInput}-compare2base + PROPERTIES DEPENDS + ETS-C0P0-${filenameInput}-decode) + + ENDIF(numFileC0P0 EQUAL 3 OR numFileC0P0 EQUAL 15) + +ENDFOREACH(numFileC0P0) + +#-------------------------------------------------------------------------- +# Tests about class 0 profile 1 +# try to decode +# compare to ref file +# non regression comparison + +# Parameters and tolerances given by Table C.4 +SET( C0P1_ResFactor_list "not_used;0;3;3;0;4;1;0") +SET( C0P1_PEAK_list "not_used;0;35;28;2;128;128;0") +SET( C0P1_MSE_list "not_used;0;74;18.8;0.550;16384;16384;0") + +FOREACH(numFileC0P1 RANGE 1 7) + + # Build filenames + SET( filenameInput p1_0${numFileC0P1}.j2k ) + SET( filenameRef c0p1_0${numFileC0P1}.pgx ) + + # Get corresponding tests parameters + list(GET C0P1_ResFactor_list ${numFileC0P1} ResFactor) + list(GET CP1_nbC_list ${numFileC0P1} nbComponents) + list(GET C0P1_PEAK_list ${numFileC0P1} PEAK_limit) + list(GET C0P1_MSE_list ${numFileC0P1} MSE_limit) + + + # Manage cases which need to try different resolution reduction + IF (numFileC0P1 EQUAL 4 ) + + get_filename_component(filenameRefSub ${filenameRef} NAME_WE) + + #r = 0 + ADD_TEST(ETS-C0P1-${filenameInput}-r0-decode + ${EXECUTABLE_OUTPUT_PATH}/j2k_to_image + -i ${INPUT_CONF}/${filenameInput} + -o ${TEMP}/c0${filenameInput}-r0.pgx + -r 0 + ) + + ADD_TEST(ETS-C0P1-${filenameInput}-r0-compare2ref + ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages + -b ${BASELINE_CONF}/${filenameRefSub}r0.pgx + -t ${TEMP}/c0${filenameInput}-r0.pgx + -n ${nbComponents} + -p ${PEAK_limit} + -m ${MSE_limit} + -s t_ + ) + + SET_TESTS_PROPERTIES(ETS-C0P1-${filenameInput}-r0-compare2ref + PROPERTIES DEPENDS + ETS-C0P1-${filenameInput}-r0-decode) + + ADD_TEST(NR-C0P1-${filenameInput}-r0-compare2base + ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages + -b ${BASELINE_NR}/opj_${filenameRefSub}-r0.pgx + -t ${TEMP}/c0${filenameInput}-r0.pgx + -n ${nbComponents} + -d + -s b_t_ + ) + + SET_TESTS_PROPERTIES(NR-C0P1-${filenameInput}-r0-compare2base + PROPERTIES DEPENDS + ETS-C0P1-${filenameInput}-r0-decode) + + #r = 3 + ADD_TEST(ETS-C0P1-${filenameInput}-r3-decode + ${EXECUTABLE_OUTPUT_PATH}/j2k_to_image + -i ${INPUT_CONF}/${filenameInput} + -o ${TEMP}/c0${filenameInput}-r3.pgx + -r 3 + ) + + ADD_TEST(ETS-C0P1-${filenameInput}-r3-compare2ref + ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages + -b ${BASELINE_CONF}/${filenameRefSub}r3.pgx + -t ${TEMP}/c0${filenameInput}-r3.pgx + -n ${nbComponents} + -p ${PEAK_limit} + -m ${MSE_limit} + -s t_ + ) + + SET_TESTS_PROPERTIES(ETS-C0P1-${filenameInput}-r3-compare2ref + PROPERTIES DEPENDS + ETS-C0P1-${filenameInput}-r3-decode) + + ADD_TEST(NR-C0P1-${filenameInput}-r3-compare2base + ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages + -b ${BASELINE_NR}/opj_${filenameRefSub}-r3.pgx + -t ${TEMP}/c0${filenameInput}-r3.pgx + -n ${nbComponents} + -d + -s b_t_ + ) + + SET_TESTS_PROPERTIES(NR-C0P1-${filenameInput}-r3-compare2base + PROPERTIES DEPENDS + ETS-C0P1-${filenameInput}-r3-decode) + + ELSE(numFileC0P1 EQUAL 4) + + ADD_TEST(ETS-C0P1-${filenameInput}-decode + ${EXECUTABLE_OUTPUT_PATH}/j2k_to_image + -i ${INPUT_CONF}/${filenameInput} + -o ${TEMP}/c0${filenameInput}.pgx + -r ${ResFactor} + ) + + ADD_TEST(ETS-C0P1-${filenameInput}-compare2ref + ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages + -b ${BASELINE_CONF}/${filenameRef} + -t ${TEMP}/c0${filenameInput}.pgx + -n ${nbComponents} + -p ${PEAK_limit} + -m ${MSE_limit} + -s t_ + ) + + SET_TESTS_PROPERTIES(ETS-C0P1-${filenameInput}-compare2ref + PROPERTIES DEPENDS + ETS-C0P1-${filenameInput}-decode) + + ADD_TEST(NR-C0P1-${filenameInput}-compare2base + ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages + -b ${BASELINE_NR}/opj_${filenameRef} + -t ${TEMP}/c0${filenameInput}.pgx + -n ${nbComponents} + -d + -s b_t_ + ) + + SET_TESTS_PROPERTIES(NR-C0P1-${filenameInput}-compare2base + PROPERTIES DEPENDS + ETS-C0P1-${filenameInput}-decode) + + ENDIF(numFileC0P1 EQUAL 4) + +ENDFOREACH(numFileC0P1) + +#-------------------------------------------------------------------------- +# Tests about class 1 profile 0 +# try to decode +# compare to ref file +# non regression comparison + +# Parameters and tolerances given by Table C.6 +SET( C1P0_ResFactor_list "not_used;0;0;0;0;0;0;0;1;0;0;0;0;0;0;0;0") +SET( C1P0_PEAK_list "not_used;0;0;0;5:4:6;2:2:2:0;635:403:378:0;0:0:0;0:0:0;0;0:0:0;0;0;0:0:0:0;0:0:0;0;0") +SET( C1P0_MSE_list "not_used;0;0;0;0.776:0.626:1.070;0.302:0.307:0.269:0;11287:6124:3968:0;0:0:0;0:0:0;0;0:0:0;0;0;0:0:0:0;0:0:0;0;0") + +FOREACH(numFileC1P0 RANGE 1 16) + + # Build filenames + IF(${numFileC1P0} LESS 10) + SET( filenameInput p0_0${numFileC1P0}.j2k ) + SET( filenameRef c1p0_0${numFileC1P0}.pgx ) + ELSE(${numFileC1P0} LESS 10) + SET( filenameInput p0_${numFileC1P0}.j2k ) + SET( filenameRef c1p0_${numFileC1P0}.pgx ) + ENDIF(${numFileC1P0} LESS 10) + + # Get corresponding tests parameters + list(GET CP0_nbC_list ${numFileC1P0} nbComponents) + list(GET C1P0_ResFactor_list ${numFileC1P0} ResFactor) + list(GET C1P0_PEAK_list ${numFileC1P0} PEAK_limit) + list(GET C1P0_MSE_list ${numFileC1P0} MSE_limit) + + ADD_TEST(ETS-C1P0-${filenameInput}-decode + ${EXECUTABLE_OUTPUT_PATH}/j2k_to_image + -i ${INPUT_CONF}/${filenameInput} + -o ${TEMP}/c1${filenameInput}.pgx + -r ${ResFactor} + ) + + ADD_TEST(ETS-C1P0-${filenameInput}-compare2ref + ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages + -b ${BASELINE_CONF}/${filenameRef} + -t ${TEMP}/c1${filenameInput}.pgx + -n ${nbComponents} + -p ${PEAK_limit} + -m ${MSE_limit} + -s b_t_ + ) + + SET_TESTS_PROPERTIES(ETS-C1P0-${filenameInput}-compare2ref + PROPERTIES DEPENDS + ETS-C1P0-${filenameInput}-decode) + + ADD_TEST(NR-C1P0-${filenameInput}-compare2base + ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages + -b ${BASELINE_NR}/opj_${filenameRef} + -t ${TEMP}/c1${filenameInput}.pgx + -n ${nbComponents} + -d + -s b_t_ + ) + + SET_TESTS_PROPERTIES(NR-C1P0-${filenameInput}-compare2base + PROPERTIES DEPENDS + ETS-C1P0-${filenameInput}-decode) + +ENDFOREACH(numFileC1P0) + +#-------------------------------------------------------------------------- +# Tests about class 1 profile 1 +# try to decode +# compare to ref file +# non regression comparison + +# Parameters and tolerances given by Table C.7 +SET( C1P1_PEAK_list "not_used;0;5:4:6;2:2:1:0;624;40:40:40;2:2:2;0:0") +SET( C1P1_MSE_list "not_used;0;0.765:0.616:1.051;0.3:0.210:0.200:0;3080;8.458:9.816:10.154;0.6:0.6:0.6;0:0") + +FOREACH(numFileC1P1 RANGE 1 7) + + # Build filenames + SET( filenameInput p1_0${numFileC1P1}.j2k ) + SET( filenameRef c1p1_0${numFileC1P1}.pgx ) + + # Get corresponding tests parameters + list(GET CP1_nbC_list ${numFileC1P1} nbComponents) + list(GET C1P1_PEAK_list ${numFileC1P1} PEAK_limit) + list(GET C1P1_MSE_list ${numFileC1P1} MSE_limit) + + ADD_TEST(ETS-C1P1-${filenameInput}-decode + ${EXECUTABLE_OUTPUT_PATH}/j2k_to_image + -i ${INPUT_CONF}/${filenameInput} + -o ${TEMP}/c1${filenameInput}.pgx + -r 0 + ) + + ADD_TEST(ETS-C1P1-${filenameInput}-compare2ref + ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages + -b ${BASELINE_CONF}/${filenameRef} + -t ${TEMP}/c1${filenameInput}.pgx + -n ${nbComponents} + -p ${PEAK_limit} + -m ${MSE_limit} + -s b_t_ + ) + + SET_TESTS_PROPERTIES(ETS-C1P1-${filenameInput}-compare2ref + PROPERTIES DEPENDS + ETS-C1P1-${filenameInput}-decode) + + ADD_TEST(NR-C1P1-${filenameInput}-compare2base + ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages + -b ${BASELINE_NR}/opj_${filenameRef} + -t ${TEMP}/c1${filenameInput}.pgx + -n ${nbComponents} + -d + -s b_t_ + ) + + SET_TESTS_PROPERTIES(NR-C1P1-${filenameInput}-compare2base + PROPERTIES DEPENDS + ETS-C1P1-${filenameInput}-decode) + +ENDFOREACH(numFileC1P1) \ No newline at end of file diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt index b129d0e5..b8c6b387 100644 --- a/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt @@ -46,7 +46,7 @@ IF (ZLIB_FOUND) SET(HAVE_PNG_H 1 PARENT_SCOPE) SET(HAVE_LIBPNG 1 PARENT_SCOPE) SET(PNG_LIBNAME ${PNG_LIBRARIES} PARENT_SCOPE) - SET(PNG_INCLUDE_DIRNAME ${PNG_INCLUDE_DIR} PARENT_SCOPE) + SET(PNG_INCLUDE_DIRNAME ${PNG_PNG_INCLUDE_DIR} PARENT_SCOPE) ELSE(PNG_FOUND) # not found From ec398229b12ec32774c7b7d19f93431c7f1de7cb Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Thu, 21 Jul 2011 16:26:23 +0000 Subject: [PATCH 11/33] correct a compil error linked to getopt with win platform --- CHANGES | 1 + tests/CMakeLists.txt | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 5ef91e23..0566072c 100644 --- a/CHANGES +++ b/CHANGES @@ -6,6 +6,7 @@ What's New for OpenJPEG + : added July 21, 2011 +! [mickael] correct a compil error linked to getopt with win platform !+ [mickael] add new decode tests based on conformance data and tolerance. Non regression is also added on the decoder output. Deactivate old tests. ! [mickael] to follow last version of conformance data about component separator for pgx file, we changed - to _ separator even if nb component = 1 ! [mickael] removed unused warning configuration message diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 29879b82..858befb4 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -11,8 +11,8 @@ SET(comparePGXimages_SRCS comparePGXimages.c ${OPENJPEG_SOURCE_DIR}/applications # If not getopt was found then add it to the exe: IF(DONT_HAVE_GETOPT) message("dont have getopt, we will add it") - SET(common_SRCS - ${common_SRCS} + SET(comparePGXimages_SRCS + ${comparePGXimages_SRCS} ${OPENJPEG_SOURCE_DIR}/applications/common/getopt.c ) ENDIF(DONT_HAVE_GETOPT) @@ -28,4 +28,4 @@ IF(NOT HAVE_LIBPNG) MESSAGE(WARNING "Lib PNG seems to be not available: if you want run the non-regression tests with images reported to the dashboard, you need it (try BUILD_THIRDPARTY)") ENDIF(NOT HAVE_LIBPNG) -ADD_SUBDIRECTORY(conformance) \ No newline at end of file +ADD_SUBDIRECTORY(conformance) From 06363c01e4beb4e5a046554ebbcf774dfa45bfb5 Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Fri, 22 Jul 2011 14:26:57 +0000 Subject: [PATCH 12/33] correct some troubles about thirdparty when they are used --- CHANGES | 3 +++ tests/CMakeLists.txt | 10 +++++++--- thirdparty/CMakeLists.txt | 14 +++++++------- thirdparty/libtiff/CMakeLists.txt | 1 - 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index 0566072c..8b8b4524 100644 --- a/CHANGES +++ b/CHANGES @@ -5,6 +5,9 @@ What's New for OpenJPEG ! : changed + : added +July 22, 2011 +! [mickael] correct some troubles about thirdparty when they are used + July 21, 2011 ! [mickael] correct a compil error linked to getopt with win platform !+ [mickael] add new decode tests based on conformance data and tolerance. Non regression is also added on the decoder output. Deactivate old tests. diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 858befb4..003f2f17 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -3,6 +3,9 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) INCLUDE_DIRECTORIES(${OPENJPEG_SOURCE_DIR}/libopenjpeg ${OPENJPEG_SOURCE_DIR}/applications/codec ${OPENJPEG_SOURCE_DIR}/applications/common + ${Z_INCLUDE_DIRNAME} + ${PNG_INCLUDE_DIRNAME} + ${TIFF_INCLUDE_DIRNAME} ) # First thing define the common source: @@ -19,9 +22,10 @@ ENDIF(DONT_HAVE_GETOPT) ADD_EXECUTABLE(comparePGXimages ${comparePGXimages_SRCS}) TARGET_LINK_LIBRARIES(comparePGXimages ${OPENJPEG_LIBRARY_NAME} - ${PNG_LIBNAME} - ${TIFF_LIBNAME} - ) + ${Z_LIBNAME} + ${PNG_LIBNAME} + ${TIFF_LIBNAME} + ) # No image send to the dashboard if lib PNG is not available. IF(NOT HAVE_LIBPNG) diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt index b8c6b387..5bcd6113 100644 --- a/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt @@ -26,8 +26,8 @@ ELSE (ZLIB_FOUND) # not found # Try to build it message("We will build Z lib from thirdparty") ADD_SUBDIRECTORY(libz) - SET(Z_LIBNAME ${ZLIB_LIBRARIES} PARENT_SCOPE) - SET(Z_INCLUDE_DIRNAME ${ZLIB_INCLUDE_DIRS} PARENT_SCOPE) + SET(Z_LIBNAME z PARENT_SCOPE) + SET(Z_INCLUDE_DIRNAME ${OPENJPEG_SOURCE_DIR}/thirdparty/include PARENT_SCOPE) SET(ZLIB_FOUND 1) ELSE (BUILD_THIRDPARTY) message("Z lib not found, activate BUILD_THIRDPARTY if you want build it (necessary to build libPNG)") @@ -56,8 +56,8 @@ IF (ZLIB_FOUND) ADD_SUBDIRECTORY(libpng) SET(HAVE_PNG_H 1 PARENT_SCOPE) SET(HAVE_LIBPNG 1 PARENT_SCOPE) - SET(PNG_LIBNAME ${PNG_LIBRARIES} PARENT_SCOPE) - SET(PNG_INCLUDE_DIRNAME ${PNG_INCLUDE_DIR} PARENT_SCOPE) + SET(PNG_LIBNAME png PARENT_SCOPE) + SET(PNG_INCLUDE_DIRNAME ${OPENJPEG_SOURCE_DIR}/thirdparty/libpng PARENT_SCOPE) ELSE (BUILD_THIRDPARTY) SET(HAVE_PNG_H 0 PARENT_SCOPE) SET(HAVE_LIBPNG 0 PARENT_SCOPE) @@ -85,8 +85,8 @@ ELSE (TIFF_FOUND) # not found # Try to build it message("We will build TIFF lib from thirdparty") ADD_SUBDIRECTORY(libtiff) - SET(TIFF_LIBNAME ${TIFF_LIBRARIES} PARENT_SCOPE) - SET(TIFF_INCLUDE_DIRNAME ${TIFF_INCLUDE_DIR} PARENT_SCOPE) + SET(TIFF_LIBNAME tiff PARENT_SCOPE) + SET(TIFF_INCLUDE_DIRNAME ${OPENJPEG_SOURCE_DIR}/thirdparty/libtiff PARENT_SCOPE) SET(HAVE_TIFF_H 1 PARENT_SCOPE) SET(HAVE_LIBTIFF 1 PARENT_SCOPE) ELSE (BUILD_THIRDPARTY) @@ -130,7 +130,7 @@ ELSE (LCMS2_FOUND) # not found lcms2 # Try to build lcms2 message("We will build LCMS2 lib from thirdparty") ADD_SUBDIRECTORY(liblcms2) - SET(LCMS_LIBNAME "lcms2" PARENT_SCOPE) + SET(LCMS_LIBNAME lcms2 PARENT_SCOPE) SET(LCMS_INCLUDE_DIRNAME ${OPENJPEG_SOURCE_DIR}/thirdparty/liblcms2/include PARENT_SCOPE) # SET(HAVE_LCMS2_H 1 PARENT_SCOPE) SET(HAVE_LIBLCMS2 1 PARENT_SCOPE) diff --git a/thirdparty/libtiff/CMakeLists.txt b/thirdparty/libtiff/CMakeLists.txt index 851c9573..14601f0b 100644 --- a/thirdparty/libtiff/CMakeLists.txt +++ b/thirdparty/libtiff/CMakeLists.txt @@ -39,7 +39,6 @@ SET(TARGET_FILES tif_predict.h tif_print.c tif_read.c - tif_stream.cxx tif_strip.c tif_swab.c tif_thunder.c From a7f08e9b36fbdc87c7a51a3c83879531f30405eb Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Mon, 25 Jul 2011 07:31:52 +0000 Subject: [PATCH 13/33] fixed issue 74 for trunk --- CHANGES | 3 +++ applications/codec/convert.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 8b8b4524..867e3532 100644 --- a/CHANGES +++ b/CHANGES @@ -8,6 +8,9 @@ What's New for OpenJPEG July 22, 2011 ! [mickael] correct some troubles about thirdparty when they are used +July 25, 2011 +* fixed issue 74 for trunk + July 21, 2011 ! [mickael] correct a compil error linked to getopt with win platform !+ [mickael] add new decode tests based on conformance data and tolerance. Non regression is also added on the decoder output. Deactivate old tests. diff --git a/applications/codec/convert.c b/applications/codec/convert.c index 8ca54a4f..537f9c60 100644 --- a/applications/codec/convert.c +++ b/applications/codec/convert.c @@ -458,7 +458,7 @@ opj_image_t* bmptoimage(const char *filename, opj_cparameters_t *parameters) if(Info_h.biSize != 40) { - fprintf(stderr,"Error, unknown BMP header size %d\n", Info_h.biSize); + fprintf(stderr,"Error, unknown BMP header size %ld\n", Info_h.biSize); fclose(IN); return NULL; } From ff6d246efdc410d89116ffd1b4015aa81fd46d33 Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Mon, 25 Jul 2011 16:27:07 +0000 Subject: [PATCH 14/33] modify j2k_dump to support output file, needed for non-regression tests --- CHANGES | 7 +++--- applications/codec/j2k_dump.c | 40 +++++++++++++++++++++++++++++------ 2 files changed, 38 insertions(+), 9 deletions(-) diff --git a/CHANGES b/CHANGES index 867e3532..e3a62dc2 100644 --- a/CHANGES +++ b/CHANGES @@ -5,12 +5,13 @@ What's New for OpenJPEG ! : changed + : added +July 25, 2011 +* [mickael] fixed issue 74 for trunk +! [mickael] modify j2k_dump to support output file, needed for non-regression tests + July 22, 2011 ! [mickael] correct some troubles about thirdparty when they are used -July 25, 2011 -* fixed issue 74 for trunk - July 21, 2011 ! [mickael] correct a compil error linked to getopt with win platform !+ [mickael] add new decode tests based on conformance data and tolerance. Non regression is also added on the decoder output. Deactivate old tests. diff --git a/applications/codec/j2k_dump.c b/applications/codec/j2k_dump.c index 543a7d79..a7292968 100644 --- a/applications/codec/j2k_dump.c +++ b/applications/codec/j2k_dump.c @@ -92,6 +92,10 @@ void decode_help_display() { fprintf(stdout," REQUIRED only if an Input image directory not specified\n"); fprintf(stdout," Currently accepts J2K-files, JP2-files and JPT-files. The file type\n"); fprintf(stdout," is identified based on its suffix.\n"); + fprintf(stdout," -o \n"); + fprintf(stdout," OPTIONAL\n"); + fprintf(stdout," Output file where file info will be dump.\n"); + fprintf(stdout," By default it will be in the stdout.\n"); fprintf(stdout,"\n"); } @@ -197,7 +201,7 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,i {"ImgDir",REQ_ARG, NULL ,'y'}, }; - const char optlist[] = "i:h"; + const char optlist[] = "i:o:h"; totlen=sizeof(long_option); img_fol->set_out_format = 0; while (1) { @@ -222,6 +226,15 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,i } strncpy(parameters->infile, infile, sizeof(parameters->infile)-1); } + break; + + /* ------------------------------------------------------ */ + + case 'o': /* output file */ + { + char *outfile = optarg; + strncpy(parameters->outfile, outfile, sizeof(parameters->outfile)-1); + } break; /* ----------------------------------------------------- */ @@ -306,7 +319,7 @@ int main(int argc, char *argv[]) img_fol_t img_fol; opj_event_mgr_t event_mgr; /* event manager */ opj_image_t *image = NULL; - FILE *fsrc = NULL; + FILE *fsrc = NULL, *fout = NULL;; unsigned char *src = NULL; int file_length; int num_images; @@ -362,6 +375,19 @@ int main(int argc, char *argv[]) num_images=1; } + // + if (parameters.outfile[0] != 0) + { + fout = fopen(parameters.outfile,"w"); + if (!fout) + { + fprintf(stderr, "ERROR -> failed to open %s for reading\n", parameters.outfile); + return 1; + } + } + else + fout = stdout; + /*Encoding image one by one*/ for(imageno = 0; imageno < num_images ; imageno++) { @@ -421,10 +447,10 @@ int main(int argc, char *argv[]) return 1; } /* dump image */ - j2k_dump_image(stdout, image); + j2k_dump_image(fout, image); /* dump cp */ - j2k_dump_cp(stdout, image, ((opj_j2k_t*)dinfo->j2k_handle)->cp); + j2k_dump_cp(fout, image, ((opj_j2k_t*)dinfo->j2k_handle)->cp); /* close the byte stream */ opj_cio_close(cio); @@ -472,10 +498,10 @@ int main(int argc, char *argv[]) { free(image->icc_profile_buf); image->icc_profile_buf = NULL; } - j2k_dump_image(stdout, image); + j2k_dump_image(fout, image); /* dump cp */ - j2k_dump_cp(stdout, image, ((opj_jp2_t*)dinfo->jp2_handle)->j2k->cp); + j2k_dump_cp(fout, image, ((opj_jp2_t*)dinfo->jp2_handle)->j2k->cp); /* close the byte stream */ opj_cio_close(cio); @@ -554,6 +580,8 @@ int main(int argc, char *argv[]) } + fclose(fout); + return EXIT_SUCCESS; } From eea61ee5e4112c32ee5ebd3c49a2405c48a94a73 Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Mon, 25 Jul 2011 16:33:52 +0000 Subject: [PATCH 15/33] added non-regression tests for j2k_dump function and conformance data --- CHANGES | 1 + tests/CMakeLists.txt | 9 ++ tests/comparePGXimages.c | 13 +- tests/compare_dump_files.c | 202 +++++++++++++++++++++++++++++++ tests/conformance/CMakeLists.txt | 102 +++++++++++++--- 5 files changed, 302 insertions(+), 25 deletions(-) create mode 100644 tests/compare_dump_files.c diff --git a/CHANGES b/CHANGES index e3a62dc2..24d80ccc 100644 --- a/CHANGES +++ b/CHANGES @@ -8,6 +8,7 @@ What's New for OpenJPEG July 25, 2011 * [mickael] fixed issue 74 for trunk ! [mickael] modify j2k_dump to support output file, needed for non-regression tests ++! [mickael] added non-regression tests for j2k_dump function and conformance data July 22, 2011 ! [mickael] correct some troubles about thirdparty when they are used diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 003f2f17..5021dca1 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -11,6 +11,8 @@ INCLUDE_DIRECTORIES(${OPENJPEG_SOURCE_DIR}/libopenjpeg # First thing define the common source: SET(comparePGXimages_SRCS comparePGXimages.c ${OPENJPEG_SOURCE_DIR}/applications/codec/convert.c) +SET(compare_dump_files_SRCS compare_dump_files.c) + # If not getopt was found then add it to the exe: IF(DONT_HAVE_GETOPT) message("dont have getopt, we will add it") @@ -18,6 +20,11 @@ IF(DONT_HAVE_GETOPT) ${comparePGXimages_SRCS} ${OPENJPEG_SOURCE_DIR}/applications/common/getopt.c ) + + SET(compare_dump_files_SRCS + ${compare_dump_files_SRCS} + ${OPENJPEG_SOURCE_DIR}/applications/common/getopt.c + ) ENDIF(DONT_HAVE_GETOPT) ADD_EXECUTABLE(comparePGXimages ${comparePGXimages_SRCS}) @@ -26,6 +33,8 @@ TARGET_LINK_LIBRARIES(comparePGXimages ${OPENJPEG_LIBRARY_NAME} ${PNG_LIBNAME} ${TIFF_LIBNAME} ) + +ADD_EXECUTABLE(compare_dump_files ${compare_dump_files_SRCS}) # No image send to the dashboard if lib PNG is not available. IF(NOT HAVE_LIBPNG) diff --git a/tests/comparePGXimages.c b/tests/comparePGXimages.c index ad3b58fb..a31a25f1 100644 --- a/tests/comparePGXimages.c +++ b/tests/comparePGXimages.c @@ -1,5 +1,5 @@ /* - * compareImagesPGX2.c + * comparePGXimages.c * * Created on: 8 juil. 2011 * Author: mickael @@ -10,8 +10,6 @@ #include #include -//#include - #include "opj_config.h" #include "getopt.h" @@ -19,8 +17,6 @@ #include "format_defs.h" #include "convert.h" -//#include "commonTesting.h" - double* parseToleranceValues( char* inArg, const int nbcomp); void comparePGXimages_help_display(); opj_image_t* readImageFromFilePGX(char* filename, int nbFilenamePGX, char *separator); @@ -49,6 +45,9 @@ typedef struct test_cmp_parameters } test_cmp_parameters; +/******************************************************************************* + * Command line help function + *******************************************************************************/ void comparePGXimages_help_display() { fprintf(stdout,"\nList of parameters for the comparePGX function \n"); fprintf(stdout,"\n"); @@ -319,6 +318,8 @@ char* createMultiComponentsFilename(const char* inFilename, const int indexF, co else { //printf("Token %c not found\n", token); + outFilename = (char*)malloc(1); + outFilename[0] = '\0'; return outFilename; } @@ -657,7 +658,7 @@ int main(int argc, char **argv) for (it_comp = 0; it_comp < imageDiff->numcomps; it_comp++) { double SE=0,PEAK=0; - double MSE=0,PSNR=0; + double MSE=0; char *filenamePNGbase_it_comp, *filenamePNGtest_it_comp, *filenamePNGdiff_it_comp; filenamePNGbase_it_comp = (char*) malloc(memsizebasefilename); diff --git a/tests/compare_dump_files.c b/tests/compare_dump_files.c new file mode 100644 index 00000000..a2b8db30 --- /dev/null +++ b/tests/compare_dump_files.c @@ -0,0 +1,202 @@ +/* + * compare_dump_files.c + * + * Created on: 25 juil. 2011 + * Author: mickael + */ + +#include +#include +#include + +#include "getopt.h" + +typedef struct test_cmp_parameters +{ + /** */ + char* base_filename; + /** */ + char* test_filename; +} test_cmp_parameters; + +/******************************************************************************* + * Command line help function + *******************************************************************************/ +void compare_dump_files_help_display() { + fprintf(stdout,"\nList of parameters for the compare_dump_files function \n"); + fprintf(stdout,"\n"); + fprintf(stdout," -b \t REQUIRED \t filename to the reference/baseline dump file \n"); + fprintf(stdout," -t \t REQUIRED \t filename to the test dump file image\n"); + fprintf(stdout,"\n"); +} +/******************************************************************************* + * Parse command line + *******************************************************************************/ +int parse_cmdline_cmp(int argc, char **argv, test_cmp_parameters* param) +{ + int sizemembasefile, sizememtestfile; + int index; + const char optlist[] = "b:t:"; + int c; + + // Init parameters + param->base_filename = NULL; + param->test_filename = NULL; + + opterr = 0; + + while ((c = getopt(argc, argv, optlist)) != -1) + switch (c) + { + case 'b': + sizemembasefile = (int)strlen(optarg)+1; + param->base_filename = (char*) malloc(sizemembasefile); + param->base_filename[0] = '\0'; + strncpy(param->base_filename, optarg, strlen(optarg)); + param->base_filename[strlen(optarg)] = '\0'; + //printf("param->base_filename = %s [%d / %d]\n", param->base_filename, strlen(param->base_filename), sizemembasefile ); + break; + case 't': + sizememtestfile = (int) strlen(optarg) + 1; + param->test_filename = (char*) malloc(sizememtestfile); + param->test_filename[0] = '\0'; + strncpy(param->test_filename, optarg, strlen(optarg)); + param->test_filename[strlen(optarg)] = '\0'; + //printf("param->test_filename = %s [%d / %d]\n", param->test_filename, strlen(param->test_filename), sizememtestfile); + break; + case '?': + if ( (optopt == 'b') || (optopt == 't') ) + fprintf(stderr, "Option -%c requires an argument.\n", optopt); + else + if (isprint(optopt)) fprintf(stderr, "Unknown option `-%c'.\n", optopt); + else fprintf(stderr, "Unknown option character `\\x%x'.\n", optopt); + return 1; + default: + fprintf(stderr, "WARNING -> this option is not valid \"-%c %s\"\n", c, optarg); + break; + } + + if (optind != argc) + { + for (index = optind; index < argc; index++) + fprintf(stderr,"Non-option argument %s\n", argv[index]); + return EXIT_FAILURE; + } + + return EXIT_SUCCESS; +} +/******************************************************************************* + * MAIN + *******************************************************************************/ +int main(int argc, char **argv) +{ + test_cmp_parameters inParam; + FILE *fbase=NULL, *ftest=NULL; + char chbase, chtest; + int same = 1; + unsigned long l=1, pos; + + if( parse_cmdline_cmp(argc, argv, &inParam) == EXIT_FAILURE ) + { + compare_dump_files_help_display(); + if (!inParam.base_filename) free(inParam.base_filename); + if (!inParam.test_filename) free(inParam.test_filename); + return EXIT_FAILURE; + } + + // Display Parameters + printf("******Parameters********* \n"); + printf(" base_filename = %s\n" + " test_filename = %s\n", + inParam.base_filename, inParam.test_filename); + printf("************************* \n"); + + /* open base file */ + printf("Try to open: %s for reading ... ", inParam.base_filename); + if((fbase = fopen(inParam.base_filename, "rb"))==NULL) + { + printf("Failed.\n"); + free(inParam.base_filename); + free(inParam.test_filename); + return EXIT_FAILURE; + } + printf("Ok.\n"); + + /* open test file */ + printf("Try to open: %s for reading ... ", inParam.test_filename); + if((ftest = fopen(inParam.test_filename, "rb"))==NULL) + { + printf("Failed.\n"); + fclose(fbase); + free(inParam.base_filename); + free(inParam.test_filename); + return EXIT_FAILURE; + } + printf("Ok.\n"); + + pos=ftell(fbase); + + while(!feof(fbase)) + { + chbase = fgetc(fbase); + if(ferror(fbase)) + { + printf("Error reading base file.\n"); + return EXIT_FAILURE; + } + + chtest = fgetc(ftest); + if(ferror(ftest)) + { + printf("Error reading test file.\n"); + return EXIT_FAILURE; + } + + if(chbase != chtest) + { + size_t nbytes = 2048; + char* strbase, *strtest; + int nbytes_read_base, nbytes_read_test; + + printf("Files differ at line %lu:\n", l); + fseek(fbase,pos,SEEK_SET); + fseek(ftest,pos,SEEK_SET); + + strbase = (char *) malloc(nbytes + 1); + strtest = (char *) malloc(nbytes + 1); + nbytes_read_base = getline(&strbase, &nbytes, fbase); + nbytes_read_test = getline(&strtest, &nbytes, ftest); + strbase[nbytes_read_base-1] = '\0'; + strtest[nbytes_read_test-1] = '\0'; + printf("<%s> vs. <%s>\n", strbase, strtest); + + free(strbase); + free(strtest); + same = 0; + break; + } + else + { + if (chbase == '\n') + { + l++; + pos = ftell(fbase); + } + } + } + + //Close File + fclose(fbase); + fclose(ftest); + + // Free memory + free(inParam.base_filename); + free(inParam.test_filename); + + if(same) + { + printf("\n***** TEST SUCCEED: Files are the same. *****\n"); + return EXIT_SUCCESS; + } + else return EXIT_FAILURE; +} diff --git a/tests/conformance/CMakeLists.txt b/tests/conformance/CMakeLists.txt index 600b9bb0..63f6c456 100644 --- a/tests/conformance/CMakeLists.txt +++ b/tests/conformance/CMakeLists.txt @@ -46,10 +46,9 @@ FOREACH(numFileC0P0 RANGE 1 16) # Manage cases which need to try different resolution reduction IF (numFileC0P0 EQUAL 3 OR numFileC0P0 EQUAL 15) - get_filename_component(filenameRefSub ${filenameRef} NAME_WE) - #r = 0 + ADD_TEST(ETS-C0P0-${filenameInput}-r0-decode ${EXECUTABLE_OUTPUT_PATH}/j2k_to_image -i ${INPUT_CONF}/${filenameInput} @@ -83,7 +82,7 @@ FOREACH(numFileC0P0 RANGE 1 16) SET_TESTS_PROPERTIES(NR-C0P0-${filenameInput}-r0-compare2base PROPERTIES DEPENDS ETS-C0P0-${filenameInput}-r0-decode) - + #r = 1 ADD_TEST(ETS-C0P0-${filenameInput}-r1-decode ${EXECUTABLE_OUTPUT_PATH}/j2k_to_image @@ -117,7 +116,7 @@ FOREACH(numFileC0P0 RANGE 1 16) SET_TESTS_PROPERTIES(NR-C0P0-${filenameInput}-r1-compare2base PROPERTIES DEPENDS - ETS-C0P0-${filenameInput}-r1-decode) + ETS-C0P0-${filenameInput}-r1-decode) ELSE(numFileC0P0 EQUAL 3 OR numFileC0P0 EQUAL 15) @@ -154,7 +153,7 @@ FOREACH(numFileC0P0 RANGE 1 16) SET_TESTS_PROPERTIES(NR-C0P0-${filenameInput}-compare2base PROPERTIES DEPENDS ETS-C0P0-${filenameInput}-decode) - + ENDIF(numFileC0P0 EQUAL 3 OR numFileC0P0 EQUAL 15) ENDFOREACH(numFileC0P0) @@ -181,13 +180,11 @@ FOREACH(numFileC0P1 RANGE 1 7) list(GET CP1_nbC_list ${numFileC0P1} nbComponents) list(GET C0P1_PEAK_list ${numFileC0P1} PEAK_limit) list(GET C0P1_MSE_list ${numFileC0P1} MSE_limit) - # Manage cases which need to try different resolution reduction IF (numFileC0P1 EQUAL 4 ) - get_filename_component(filenameRefSub ${filenameRef} NAME_WE) - + #r = 0 ADD_TEST(ETS-C0P1-${filenameInput}-r0-decode ${EXECUTABLE_OUTPUT_PATH}/j2k_to_image @@ -221,8 +218,8 @@ FOREACH(numFileC0P1 RANGE 1 7) SET_TESTS_PROPERTIES(NR-C0P1-${filenameInput}-r0-compare2base PROPERTIES DEPENDS - ETS-C0P1-${filenameInput}-r0-decode) - + ETS-C0P1-${filenameInput}-r0-decode) + #r = 3 ADD_TEST(ETS-C0P1-${filenameInput}-r3-decode ${EXECUTABLE_OUTPUT_PATH}/j2k_to_image @@ -256,8 +253,8 @@ FOREACH(numFileC0P1 RANGE 1 7) SET_TESTS_PROPERTIES(NR-C0P1-${filenameInput}-r3-compare2base PROPERTIES DEPENDS - ETS-C0P1-${filenameInput}-r3-decode) - + ETS-C0P1-${filenameInput}-r3-decode) + ELSE(numFileC0P1 EQUAL 4) ADD_TEST(ETS-C0P1-${filenameInput}-decode @@ -292,8 +289,8 @@ FOREACH(numFileC0P1 RANGE 1 7) SET_TESTS_PROPERTIES(NR-C0P1-${filenameInput}-compare2base PROPERTIES DEPENDS - ETS-C0P1-${filenameInput}-decode) - + ETS-C0P1-${filenameInput}-decode) + ENDIF(numFileC0P1 EQUAL 4) ENDFOREACH(numFileC0P1) @@ -358,8 +355,8 @@ FOREACH(numFileC1P0 RANGE 1 16) SET_TESTS_PROPERTIES(NR-C1P0-${filenameInput}-compare2base PROPERTIES DEPENDS - ETS-C1P0-${filenameInput}-decode) - + ETS-C1P0-${filenameInput}-decode) + ENDFOREACH(numFileC1P0) #-------------------------------------------------------------------------- @@ -402,7 +399,7 @@ FOREACH(numFileC1P1 RANGE 1 7) SET_TESTS_PROPERTIES(ETS-C1P1-${filenameInput}-compare2ref PROPERTIES DEPENDS - ETS-C1P1-${filenameInput}-decode) + ETS-C1P1-${filenameInput}-decode) ADD_TEST(NR-C1P1-${filenameInput}-compare2base ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages @@ -415,6 +412,73 @@ FOREACH(numFileC1P1 RANGE 1 7) SET_TESTS_PROPERTIES(NR-C1P1-${filenameInput}-compare2base PROPERTIES DEPENDS - ETS-C1P1-${filenameInput}-decode) + ETS-C1P1-${filenameInput}-decode) -ENDFOREACH(numFileC1P1) \ No newline at end of file +ENDFOREACH(numFileC1P1) + +#--------------------------------------------------------------------------# +#--------------------------------------------------------------------------# +#--------------------------------------------------------------------------# + +#-------------------------------------------------------------------------- +# Tests about dump of profile 0 file +# try to dump image and codestream informations into a file +# non regression comparison this file to the baseline + +FOREACH(numFileP0 RANGE 1 16) + + # Build filenames + IF(${numFileP0} LESS 10) + SET( filenameInput p0_0${numFileP0}.j2k ) + ELSE(${numFileP0} LESS 10) + SET( filenameInput p0_${numFileP0}.j2k ) + ENDIF(${numFileP0} LESS 10) + get_filename_component(filenameRefSub ${filenameInput} NAME_WE) + + + ADD_TEST(NR-${filenameInput}-dump + ${EXECUTABLE_OUTPUT_PATH}/j2k_dump + -i ${INPUT_CONF}/${filenameInput} + -o ${TEMP}/${filenameInput}.txt + ) + + ADD_TEST(NR-${filenameInput}-compare_dump2base + ${EXECUTABLE_OUTPUT_PATH}/compare_dump_files + -b ${BASELINE_NR}/opj_${filenameRefSub}.txt + -t ${TEMP}/${filenameInput}.txt + ) + + SET_TESTS_PROPERTIES(NR-${filenameInput}-compare_dump2base + PROPERTIES DEPENDS + NR-${filenameInput}-dump) + +ENDFOREACH(numFileP0 RANGE 1 16) + +#-------------------------------------------------------------------------- +# Tests about dump of profile 1 file +# try to dump image and codestream informations into a file +# non regression comparison this file to the baseline + +FOREACH(numFileP1 RANGE 1 7) + + # Build filenames + SET( filenameInput p1_0${numFileP1}.j2k ) + get_filename_component(filenameInputSub ${filenameInput} NAME_WE) + + ADD_TEST(NR-${filenameInput}-dump + ${EXECUTABLE_OUTPUT_PATH}/j2k_dump + -i ${INPUT_CONF}/${filenameInput} + -o ${TEMP}/${filenameInput}.txt + ) + + ADD_TEST(NR-${filenameInput}-compare_dump2base + ${EXECUTABLE_OUTPUT_PATH}/compare_dump_files + -b ${BASELINE_NR}/opj_${filenameInputSub}.txt + -t ${TEMP}/${filenameInput}.txt + ) + + SET_TESTS_PROPERTIES(NR-${filenameInput}-compare_dump2base + PROPERTIES DEPENDS + NR-${filenameInput}-dump) + +ENDFOREACH(numFileP1 RANGE 1 7) \ No newline at end of file From 14799e25c6c648c6eb45eacace0173a4f96bd372 Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Tue, 26 Jul 2011 07:57:53 +0000 Subject: [PATCH 16/33] delete double semi-colon at end of line which generate crash on win platform --- CHANGES | 3 +++ applications/codec/j2k_dump.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 24d80ccc..3b1b6bc5 100644 --- a/CHANGES +++ b/CHANGES @@ -5,6 +5,9 @@ What's New for OpenJPEG ! : changed + : added +July 26, 2011 +! [mickael] delete double semi-colon at end of line which generate crash on win platform + July 25, 2011 * [mickael] fixed issue 74 for trunk ! [mickael] modify j2k_dump to support output file, needed for non-regression tests diff --git a/applications/codec/j2k_dump.c b/applications/codec/j2k_dump.c index a7292968..eaf1b34b 100644 --- a/applications/codec/j2k_dump.c +++ b/applications/codec/j2k_dump.c @@ -319,7 +319,7 @@ int main(int argc, char *argv[]) img_fol_t img_fol; opj_event_mgr_t event_mgr; /* event manager */ opj_image_t *image = NULL; - FILE *fsrc = NULL, *fout = NULL;; + FILE *fsrc = NULL, *fout = NULL; unsigned char *src = NULL; int file_length; int num_images; From f4601aff8bc00cdd379814bbae9cbc8a3bbab3c1 Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Tue, 26 Jul 2011 09:30:54 +0000 Subject: [PATCH 17/33] use ansi c function fgets instead of GNU function getline to avoid build error with win platform --- CHANGES | 1 + tests/comparePGXimages.c | 1 + tests/compare_dump_files.c | 22 +++++++++++++--------- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/CHANGES b/CHANGES index 3b1b6bc5..c3a24e90 100644 --- a/CHANGES +++ b/CHANGES @@ -7,6 +7,7 @@ What's New for OpenJPEG July 26, 2011 ! [mickael] delete double semi-colon at end of line which generate crash on win platform +! [mickael] use ansi c function fgets instead of GNU function getline to avoid build error with win platform July 25, 2011 * [mickael] fixed issue 74 for trunk diff --git a/tests/comparePGXimages.c b/tests/comparePGXimages.c index a31a25f1..dc3d9380 100644 --- a/tests/comparePGXimages.c +++ b/tests/comparePGXimages.c @@ -9,6 +9,7 @@ #include #include #include +#include #include "opj_config.h" #include "getopt.h" diff --git a/tests/compare_dump_files.c b/tests/compare_dump_files.c index a2b8db30..a8f573ae 100644 --- a/tests/compare_dump_files.c +++ b/tests/compare_dump_files.c @@ -8,6 +8,7 @@ #include #include #include +#include #include "getopt.h" @@ -155,8 +156,7 @@ int main(int argc, char **argv) if(chbase != chtest) { size_t nbytes = 2048; - char* strbase, *strtest; - int nbytes_read_base, nbytes_read_test; + char *strbase, *strtest, *strbase_d, *strtest_d; printf("Files differ at line %lu:\n", l); fseek(fbase,pos,SEEK_SET); @@ -164,14 +164,18 @@ int main(int argc, char **argv) strbase = (char *) malloc(nbytes + 1); strtest = (char *) malloc(nbytes + 1); - nbytes_read_base = getline(&strbase, &nbytes, fbase); - nbytes_read_test = getline(&strtest, &nbytes, ftest); - strbase[nbytes_read_base-1] = '\0'; - strtest[nbytes_read_test-1] = '\0'; - printf("<%s> vs. <%s>\n", strbase, strtest); + fgets(strbase, nbytes, fbase); + fgets(strtest, nbytes, ftest); + strbase_d = (char *) malloc(strlen(strbase)); + strtest_d = (char *) malloc(strlen(strtest)); + strncpy(strbase_d, strbase, strlen(strbase)-1); + strncpy(strtest_d, strtest, strlen(strtest)-1); + strbase_d[strlen(strbase)] = '\0'; + strtest_d[strlen(strtest)] = '\0'; + printf("<%s> vs. <%s>\n", strbase_d, strtest_d); - free(strbase); - free(strtest); + free(strbase);free(strtest); + free(strbase_d);free(strtest_d); same = 0; break; } From 1776120dba3610c83a27602dbcf6fcf9a9fa5d7d Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Tue, 26 Jul 2011 13:49:27 +0000 Subject: [PATCH 18/33] correct CRLF problem between unix baseline and win platform test file generated by j2k_dump --- CHANGES | 1 + tests/compare_dump_files.c | 27 +++++++++++++++++++++------ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index c3a24e90..05ee2532 100644 --- a/CHANGES +++ b/CHANGES @@ -8,6 +8,7 @@ What's New for OpenJPEG July 26, 2011 ! [mickael] delete double semi-colon at end of line which generate crash on win platform ! [mickael] use ansi c function fgets instead of GNU function getline to avoid build error with win platform +! [mickael] correct CRLF problem between unix baseline and win platform test file generated by j2k_dump July 25, 2011 * [mickael] fixed issue 74 for trunk diff --git a/tests/compare_dump_files.c b/tests/compare_dump_files.c index a8f573ae..2340dfb7 100644 --- a/tests/compare_dump_files.c +++ b/tests/compare_dump_files.c @@ -3,6 +3,7 @@ * * Created on: 25 juil. 2011 * Author: mickael + * BASELINE MUST BE GENERATED BY UNIX PLATFORM REGARDING TO THE CRLF PROBLEM */ #include @@ -93,7 +94,7 @@ int main(int argc, char **argv) { test_cmp_parameters inParam; FILE *fbase=NULL, *ftest=NULL; - char chbase, chtest; + int chbase, chtest; int same = 1; unsigned long l=1, pos; @@ -153,25 +154,39 @@ int main(int argc, char **argv) return EXIT_FAILURE; } + // CRLF problem (Baseline must be always generated by unix platform) + if (chbase == '\n' && chtest == '\r') + if (fgetc(ftest) == '\n') + chtest = '\n'; + if(chbase != chtest) { size_t nbytes = 2048; + int CRLF_shift=1; char *strbase, *strtest, *strbase_d, *strtest_d; printf("Files differ at line %lu:\n", l); fseek(fbase,pos,SEEK_SET); + + // Take into account CRLF characters when we write \n into + // dump file when we used WIN platform +#ifdef _WIN32 + CRLF_shift = 2; + fseek(ftest,pos + l - 1,SEEK_SET); +#else fseek(ftest,pos,SEEK_SET); +#endif strbase = (char *) malloc(nbytes + 1); strtest = (char *) malloc(nbytes + 1); fgets(strbase, nbytes, fbase); fgets(strtest, nbytes, ftest); - strbase_d = (char *) malloc(strlen(strbase)); - strtest_d = (char *) malloc(strlen(strtest)); + strbase_d = (char *) malloc(strlen(strbase)+1); + strtest_d = (char *) malloc(strlen(strtest)+1); strncpy(strbase_d, strbase, strlen(strbase)-1); - strncpy(strtest_d, strtest, strlen(strtest)-1); - strbase_d[strlen(strbase)] = '\0'; - strtest_d[strlen(strtest)] = '\0'; + strncpy(strtest_d, strtest, strlen(strtest)-CRLF_shift); + strbase_d[strlen(strbase)-1] = '\0'; + strtest_d[strlen(strtest)-CRLF_shift] = '\0'; printf("<%s> vs. <%s>\n", strbase_d, strtest_d); free(strbase);free(strtest); From f88a57e5d79e36117dd96309dbfe55f654584653 Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Wed, 27 Jul 2011 12:45:04 +0000 Subject: [PATCH 19/33] added new decoding/dump tests based on data found in input/nonregresion repository (remove JPEG2000_CONFORMANCE_DATA_ROOT variable, add REF_DECODER_BIN_PATH variable for the encoder test suite). Remove definitively old tests --- CHANGES | 3 ++ CMakeLists.txt | 18 +++------- applications/codec/CMakeLists.txt | 41 +--------------------- tests/CMakeLists.txt | 1 + tests/nonregression/CMakeLists.txt | 55 ++++++++++++++++++++++++++++++ 5 files changed, 64 insertions(+), 54 deletions(-) create mode 100644 tests/nonregression/CMakeLists.txt diff --git a/CHANGES b/CHANGES index 05ee2532..a57b0fba 100644 --- a/CHANGES +++ b/CHANGES @@ -5,6 +5,9 @@ What's New for OpenJPEG ! : changed + : added +July 27, 2011 +! [mickael] added new decoding/dump tests based on data found in input/nonregresion repository (remove JPEG2000_CONFORMANCE_DATA_ROOT variable, add REF_DECODER_BIN_PATH variable for the encoder test suite). Remove definitively old tests. + July 26, 2011 ! [mickael] delete double semi-colon at end of line which generate crash on win platform ! [mickael] use ansi c function fgets instead of GNU function getline to avoid build error with win platform diff --git a/CMakeLists.txt b/CMakeLists.txt index 4fcbca9c..de047b78 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -250,25 +250,15 @@ IF(BUILD_TESTING) # svn checkout http://openjpeg.googlecode.com/svn/data (about 70 Mo) FIND_PATH(OPJ_DATA_ROOT README-OPJ-Data PATHS $ENV{OPJ_DATA_ROOT} ${CMAKE_SOURCE_DIR}/../opj-data) + + SET (REF_DECODER_BIN_PATH "NOT-FOUND" CACHE PATH "Single directory where find the reference encoder binaries to enable encoding test suite.") + MARK_AS_ADVANCED(REF_DECODER_BIN_PATH) + ELSE(BUILD_CODEC) message(FATAL_ERROR "You need build codec to run the tests") ENDIF(BUILD_CODEC) ENDIF(BUILD_TESTING) -#----------------------------------------------------------------------------- -# Tests data -IF(BUILD_TESTING) -# Adding test with dataset from: -# http://www.openjpeg.org/conformance/j2kp4files_v1_5.zip -# -> wget http://www.openjpeg.org/conformance/j2kp4files_v1_5.zip -# http://www.jpeg.org/jpeg2000guide/testimages/testimages.html -# Adding JPEG2000_CONFORMANCE_DATA_ROOT -FIND_PATH(JPEG2000_CONFORMANCE_DATA_ROOT testimages.html - ${OPENJPEG_SOURCE_DIR}/../jpeg2000testimages - $ENV{JPEG2000_CONFORMANCE_DATA_ROOT} -) -ENDIF(BUILD_TESTING) - #----------------------------------------------------------------------------- # install all targets referenced as OPENJPEGTargets INSTALL(EXPORT OpenJPEGTargets DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}) diff --git a/applications/codec/CMakeLists.txt b/applications/codec/CMakeLists.txt index f56ee0b5..8c1d3c25 100644 --- a/applications/codec/CMakeLists.txt +++ b/applications/codec/CMakeLists.txt @@ -39,9 +39,6 @@ FOREACH(exe j2k_to_image image_to_j2k j2k_dump) TARGET_LINK_LIBRARIES(${exe} ${OPENJPEG_LIBRARY_NAME} ${Z_LIBNAME} ${PNG_LIBNAME} ${TIFF_LIBNAME} ${LCMS_LIBNAME} ) - ADD_TEST(${exe} ${EXECUTABLE_OUTPUT_PATH}/${exe}) - # calling those exe without option will make them fail always: - SET_TESTS_PROPERTIES(${exe} PROPERTIES WILL_FAIL TRUE) # On unix you need to link to the math library: IF(UNIX) TARGET_LINK_LIBRARIES(${exe} m) @@ -99,40 +96,4 @@ IF(BUILD_JPWL) INSTALL(TARGETS JPWL_image_to_j2k JPWL_j2k_to_image DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications ) -ENDIF(BUILD_JPWL) - -#if(BUILD_TESTING) -## Do testing here, once we know the examples are being built: -#FILE(GLOB_RECURSE OPENJPEG_DATA_IMAGES_GLOB -# "${JPEG2000_CONFORMANCE_DATA_ROOT}/*.j2k" -# "${JPEG2000_CONFORMANCE_DATA_ROOT}/*.j2c" -# "${JPEG2000_CONFORMANCE_DATA_ROOT}/*.jp2" -# ) - -#foreach(filename ${OPENJPEG_DATA_IMAGES_GLOB}) -# get_filename_component(filename_temp ${filename} NAME) -# get_filename_component(filename_ext ${filename} EXT) -# execute_process(COMMAND ${EXECUTABLE_OUTPUT_PATH}/j2k_dump -i ${filename} -# OUTPUT_VARIABLE dump_success -# OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/${filename_temp}.dump -# ERROR_QUIET -# ) -# if(dump_success) -# file(READ ${CMAKE_CURRENT_BINARY_DIR}/${filename_temp}.dump numcomp_file) -# string(REGEX REPLACE ".*numcomps=([0-9]+).*" "\\1" -# numcomps "${numcomp_file}") -# #message( "found:${output_variable} for ${filename_temp}" ) -# endif() -# ADD_TEST(dump-${filename_temp} ${EXECUTABLE_OUTPUT_PATH}/j2k_dump -i ${filename}) -# foreach(codec_type ppm pgx bmp tif raw tga png) -# ADD_TEST(j2i-${filename_temp}-${codec_type} ${EXECUTABLE_OUTPUT_PATH}/j2k_to_image -i ${filename} -o ${filename_temp}.${codec_type}) -# endforeach(codec_type) -# foreach(codec_type ppm bmp tif tga png) -# ADD_TEST(i2j-${filename_temp}-${codec_type} ${EXECUTABLE_OUTPUT_PATH}/image_to_j2k -i ${filename_temp}.${codec_type} -o ${filename_temp}.${codec_type}${filename_ext}) -# SET_TESTS_PROPERTIES(i2j-${filename_temp}-${codec_type} PROPERTIES DEPENDS j2i-${filename_temp}-${codec_type}) -# #if(UNIX) -# # ADD_TEST(cmp-${filename_temp}-${codec_type} cmp ${filename} ${filename_temp}.${codec_type}${filename_ext}) -# #endif(UNIX) -# endforeach(codec_type) -#endforeach(filename) -#endif(BUILD_TESTING) +ENDIF(BUILD_JPWL) \ No newline at end of file diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 5021dca1..ec937023 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -42,3 +42,4 @@ IF(NOT HAVE_LIBPNG) ENDIF(NOT HAVE_LIBPNG) ADD_SUBDIRECTORY(conformance) +ADD_SUBDIRECTORY(nonregression) \ No newline at end of file diff --git a/tests/nonregression/CMakeLists.txt b/tests/nonregression/CMakeLists.txt new file mode 100644 index 00000000..18e57244 --- /dev/null +++ b/tests/nonregression/CMakeLists.txt @@ -0,0 +1,55 @@ +# NON-REGRESSION TESTS ON THIS DATASET LOCATED ${OPJ_DATA_ROOT}/input/nonregression + +FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Temporary) + +SET(TEMP ${CMAKE_CURRENT_BINARY_DIR}/Temporary) +SET(BASELINE_NR ${OPJ_DATA_ROOT}/baseline/nonregression) +SET(INPUT_NR ${OPJ_DATA_ROOT}/input/nonregression) + +FILE(GLOB_RECURSE OPJ_DATA_NR_LIST + "${INPUT_NR}/*.j2k" + "${INPUT_NR}/*.j2c" + "${INPUT_NR}/*.jp2" + ) + +FOREACH(filepath ${OPJ_DATA_NR_LIST}) + GET_FILENAME_COMPONENT(filename ${filepath} NAME) + GET_FILENAME_COMPONENT(filenameSub ${filename} NAME_WE) + message("${filenameSub}") + + ADD_TEST(NR-${filename}-dump + ${EXECUTABLE_OUTPUT_PATH}/j2k_dump + -i ${filepath} + -o ${TEMP}/${filename}.txt + ) + + ADD_TEST(NR-${filename}-compare_dump2base + ${EXECUTABLE_OUTPUT_PATH}/compare_dump_files + -b ${BASELINE_NR}/opj_${filenameSub}.txt + -t ${TEMP}/${filename}.txt + ) + + SET_TESTS_PROPERTIES(NR-${filename}-compare_dump2base + PROPERTIES DEPENDS + NR-${filename}-dump) + + ADD_TEST(NR-${filename}-decode + ${EXECUTABLE_OUTPUT_PATH}/j2k_to_image + -i ${filepath} + -o ${TEMP}/${filename}.pgx + ) + +# ADD_TEST(NR-${filename}-compare2base +# ${EXECUTABLE_OUTPUT_PATH}/comparePGXimages +# -b ${BASELINE_NR}/opj_${filenameRef} +# -t ${TEMP}/${filename}.pgx +# -n ${nbComponents} +# -d +# -s b_t_ +# ) +# +# SET_TESTS_PROPERTIES(NR-${filename}-compare2base +# PROPERTIES DEPENDS +# NR-${filename}-decode) + +ENDFOREACH(filepath) \ No newline at end of file From c2b0a8101b21babd3e3572c18497df2c9a1f85ac Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Wed, 27 Jul 2011 16:37:57 +0000 Subject: [PATCH 20/33] correct some warnings detected under unix platform --- CHANGES | 1 + applications/codec/convert.c | 429 ++++++++++++++++++----------- applications/codec/image_to_j2k.c | 2 +- applications/codec/j2k_dump.c | 8 +- applications/codec/j2k_to_image.c | 10 +- tests/compare_dump_files.c | 14 +- tests/nonregression/CMakeLists.txt | 1 - 7 files changed, 296 insertions(+), 169 deletions(-) diff --git a/CHANGES b/CHANGES index a57b0fba..26d8f3ff 100644 --- a/CHANGES +++ b/CHANGES @@ -7,6 +7,7 @@ What's New for OpenJPEG July 27, 2011 ! [mickael] added new decoding/dump tests based on data found in input/nonregresion repository (remove JPEG2000_CONFORMANCE_DATA_ROOT variable, add REF_DECODER_BIN_PATH variable for the encoder test suite). Remove definitively old tests. +! [mickael] correct some warnings detected under unix platform July 26, 2011 ! [mickael] delete double semi-colon at end of line which generate crash on win platform diff --git a/applications/codec/convert.c b/applications/codec/convert.c index 537f9c60..502539f7 100644 --- a/applications/codec/convert.c +++ b/applications/codec/convert.c @@ -102,7 +102,11 @@ int tga_readheader(FILE *fp, unsigned int *bits_per_pixel, return 0; // Read TGA header - fread((unsigned char*)&tga, sizeof(tga_header), 1, fp); + if ( fread((unsigned char*)&tga, sizeof(tga_header), 1, fp) != 1 ) + { + fprintf(stderr, "\nError: fread return a number of element different from the expected.\n"); + return 0 ; + } *bits_per_pixel = tga.pixel_depth; @@ -113,7 +117,12 @@ int tga_readheader(FILE *fp, unsigned int *bits_per_pixel, if (tga.id_length) { unsigned char *id = (unsigned char *) malloc(tga.id_length); - fread(id, tga.id_length, 1, fp); + if ( !fread(id, tga.id_length, 1, fp) ) + { + fprintf(stderr, "\nError: fread return a number of element different from the expected.\n"); + free(id); + return 0 ; + } free(id); } @@ -246,9 +255,25 @@ opj_image_t* tgatoimage(const char *filename, opj_cparameters_t *parameters) { for (x=0;xcomps[0].data[index]=r; image->comps[1].data[index]=g; @@ -261,10 +286,30 @@ opj_image_t* tgatoimage(const char *filename, opj_cparameters_t *parameters) { for (x=0;xcomps[0].data[index]=r; image->comps[1].data[index]=g; @@ -408,10 +453,8 @@ opj_image_t* bmptoimage(const char *filename, opj_cparameters_t *parameters) unsigned int j, PAD = 0; int x, y, index; - int gray_scale = 1, not_end_file = 1; + int gray_scale = 1; int has_color; - unsigned int line = 0, col = 0; - unsigned char v, v2; DWORD W, H; IN = fopen(filename, "rb"); @@ -558,7 +601,13 @@ opj_image_t* bmptoimage(const char *filename, opj_cparameters_t *parameters) RGB = (unsigned char *) malloc((3 * W + PAD) * H * sizeof(unsigned char)); - fread(RGB, sizeof(unsigned char), (3 * W + PAD) * H, IN); + if ( fread(RGB, sizeof(unsigned char), (3 * W + PAD) * H, IN) != (3 * W + PAD) * H ) + { + free(RGB); + opj_image_destroy(image); + fprintf(stderr, "\nError: fread return a number of element different from the expected.\n"); + return NULL; + } index = 0; @@ -641,7 +690,16 @@ opj_image_t* bmptoimage(const char *filename, opj_cparameters_t *parameters) RGB = (unsigned char *) malloc(W * H * sizeof(unsigned char)); - fread(RGB, sizeof(unsigned char), W * H, IN); + if ( fread(RGB, sizeof(unsigned char), W * H, IN) != W * H ) + { + free(table_R); + free(table_G); + free(table_B); + free(RGB); + opj_image_destroy(image); + fprintf(stderr, "\nError: fread return a number of element different from the expected.\n"); + return NULL; + } if (gray_scale) { index = 0; @@ -680,156 +738,163 @@ opj_image_t* bmptoimage(const char *filename, opj_cparameters_t *parameters) }/* RGB8 */ else if (Info_h.biBitCount == 8 && Info_h.biCompression == 1)//RLE8 - { - unsigned char *pix, *beyond; - unsigned int *gray, *red, *green, *blue; - unsigned int x, y, max; - int i, c, c1; - unsigned char uc; + { + unsigned char *pix, *beyond; + int *gray, *red, *green, *blue; + unsigned int x, y, max; + int i, c, c1; + unsigned char uc; - if(Info_h.biClrUsed == 0) Info_h.biClrUsed = 256; - else - if(Info_h.biClrUsed > 256) Info_h.biClrUsed = 256; + if (Info_h.biClrUsed == 0) + Info_h.biClrUsed = 256; + else if (Info_h.biClrUsed > 256) + Info_h.biClrUsed = 256; - table_R = (unsigned char *) malloc(256 * sizeof(unsigned char)); - table_G = (unsigned char *) malloc(256 * sizeof(unsigned char)); - table_B = (unsigned char *) malloc(256 * sizeof(unsigned char)); + table_R = (unsigned char *) malloc(256 * sizeof(unsigned char)); + table_G = (unsigned char *) malloc(256 * sizeof(unsigned char)); + table_B = (unsigned char *) malloc(256 * sizeof(unsigned char)); - has_color = 0; - for (j = 0; j < Info_h.biClrUsed; j++) - { - table_B[j] = getc(IN); - table_G[j] = getc(IN); - table_R[j] = getc(IN); - getc(IN); - has_color += - !(table_R[j] == table_G[j] && table_R[j] == table_B[j]); + has_color = 0; + for (j = 0; j < Info_h.biClrUsed; j++) + { + table_B[j] = getc(IN); + table_G[j] = getc(IN); + table_R[j] = getc(IN); + getc(IN); + has_color += !(table_R[j] == table_G[j] && table_R[j] == table_B[j]); + } - } - if(has_color) gray_scale = 0; + if (has_color) + gray_scale = 0; - numcomps = gray_scale ? 1 : 3; - color_space = gray_scale ? CLRSPC_GRAY : CLRSPC_SRGB; - /* initialize image components */ - memset(&cmptparm[0], 0, 3 * sizeof(opj_image_cmptparm_t)); - for(i = 0; i < numcomps; i++) - { - cmptparm[i].prec = 8; - cmptparm[i].bpp = 8; - cmptparm[i].sgnd = 0; - cmptparm[i].dx = subsampling_dx; - cmptparm[i].dy = subsampling_dy; - cmptparm[i].w = w; - cmptparm[i].h = h; - } - /* create the image */ - image = opj_image_create(numcomps, &cmptparm[0], color_space); - if(!image) - { - fclose(IN); - free(table_R); free(table_G); free(table_B); - return NULL; - } + numcomps = gray_scale ? 1 : 3; + color_space = gray_scale ? CLRSPC_GRAY : CLRSPC_SRGB; + /* initialize image components */ + memset(&cmptparm[0], 0, 3 * sizeof(opj_image_cmptparm_t)); + for (i = 0; i < numcomps; i++) + { + cmptparm[i].prec = 8; + cmptparm[i].bpp = 8; + cmptparm[i].sgnd = 0; + cmptparm[i].dx = subsampling_dx; + cmptparm[i].dy = subsampling_dy; + cmptparm[i].w = w; + cmptparm[i].h = h; + } + /* create the image */ + image = opj_image_create(numcomps, &cmptparm[0], color_space); + if (!image) + { + fclose(IN); + free(table_R); + free(table_G); + free(table_B); + return NULL; + } - /* set image offset and reference grid */ - image->x0 = parameters->image_offset_x0; - image->y0 = parameters->image_offset_y0; - image->x1 = !image->x0 ? (w - 1) * subsampling_dx + 1 : image->x0 + (w - 1) * subsampling_dx + 1; - image->y1 = !image->y0 ? (h - 1) * subsampling_dy + 1 : image->y0 + (h - 1) * subsampling_dy + 1; + /* set image offset and reference grid */ + image->x0 = parameters->image_offset_x0; + image->y0 = parameters->image_offset_y0; + image->x1 = !image->x0 ? (w - 1) * subsampling_dx + 1 : image->x0 + (w + - 1) * subsampling_dx + 1; + image->y1 = !image->y0 ? (h - 1) * subsampling_dy + 1 : image->y0 + (h + - 1) * subsampling_dy + 1; - /* set image data */ - - /* Place the cursor at the beginning of the image information */ - fseek(IN, 0, SEEK_SET); - fseek(IN, File_h.bfOffBits, SEEK_SET); + /* set image data */ - W = Info_h.biWidth; - H = Info_h.biHeight; - RGB = (unsigned char *)calloc(1, W * H * sizeof(unsigned char)); - beyond = RGB + W * H; - pix = beyond - W; - x = y = 0; + /* Place the cursor at the beginning of the image information */ + fseek(IN, 0, SEEK_SET); + fseek(IN, File_h.bfOffBits, SEEK_SET); - while(y < H) - { - c = getc(IN); + W = Info_h.biWidth; + H = Info_h.biHeight; + RGB = (unsigned char *) calloc(1, W * H * sizeof(unsigned char)); + beyond = RGB + W * H; + pix = beyond - W; + x = y = 0; - if (c) - { - c1 = getc(IN); + while (y < H) + { + c = getc(IN); - for (i = 0; i < c && x < W && pix < beyond; i++, x++, pix++) - *pix = c1; - } - else - { - c = getc(IN); + if (c) + { + c1 = getc(IN); - if(c == 0x00) /* EOL */ - { - x = 0; ++y; pix = RGB + x + (H - y - 1) * W; - } + for (i = 0; i < c && x < W && pix < beyond; i++, x++, pix++) + *pix = c1; + } + else + { + c = getc(IN); + + if (c == 0x00) /* EOL */ + { + x = 0; + ++y; + pix = RGB + x + (H - y - 1) * W; + } + else if (c == 0x01) /* EOP */ + break; + else if (c == 0x02) /* MOVE by dxdy */ + { + c = getc(IN); + x += c; + c = getc(IN); + y += c; + pix = RGB + (H - y - 1) * W + x; + } + else /* 03 .. 255 */ + { + i = 0; + for (; i < c && x < W && pix < beyond; i++, x++, pix++) + { + c1 = getc(IN); + *pix = c1; + } + if (c & 1) /* skip padding byte */ + getc(IN); + } + } + }/* while() */ + + if (gray_scale) + { + gray = image->comps[0].data; + pix = RGB; + max = W * H; + + while (max--) + { + uc = *pix++; + + *gray++ = table_R[uc]; + } + } else - if(c == 0x01) /* EOP */ - break; - else - if(c == 0x02) /* MOVE by dxdy */ - { - c = getc(IN); x += c; - c = getc(IN); y += c; - pix = RGB + (H - y - 1) * W + x; - } - else /* 03 .. 255 */ - { - i = 0; - for(; i < c && x < W && pix < beyond; i++, x++, pix++) - { - c1 = getc(IN); - *pix = c1; - } - if(c & 1) /* skip padding byte */ - getc(IN); - } - } - }/* while() */ + { + //int *red, *green, *blue; - if (gray_scale) - { - int *gray; + red = image->comps[0].data; + green = image->comps[1].data; + blue = image->comps[2].data; + pix = RGB; + max = W * H; - gray = image->comps[0].data; - pix = RGB; - max = W * H; + while (max--) + { + uc = *pix++; - while(max--) - { - uc = *pix++; - - *gray++ = table_R[uc]; - } - } - else - { - int *red, *green, *blue; - - red = image->comps[0].data; - green = image->comps[1].data; - blue = image->comps[2].data; - pix = RGB; - max = W * H; - - while(max--) - { - uc = *pix++; - - *red++ = table_R[uc]; - *green++ = table_G[uc]; - *blue++ = table_B[uc]; - } - } - free(RGB); - free(table_R); free(table_G); free(table_B); - }/* RLE8 */ + *red++ = table_R[uc]; + *green++ = table_G[uc]; + *blue++ = table_B[uc]; + } + } + free(RGB); + free(table_R); + free(table_G); + free(table_B); + }/* RLE8 */ else { fprintf(stderr, @@ -1007,7 +1072,6 @@ int imagetobmp(opj_image_t * image, const char *outfile) { } for (i = 0; i < w * h; i++) { - unsigned char rc; int r; r = image->comps[0].data[w * h - ((i) / (w) + 1) * w + (i) % (w)]; @@ -1038,15 +1102,27 @@ PGX IMAGE FORMAT unsigned char readuchar(FILE * f) { unsigned char c1; - fread(&c1, 1, 1, f); + if ( !fread(&c1, 1, 1, f) ) + { + fprintf(stderr, "\nError: fread return a number of element different from the expected.\n"); + return 0; + } return c1; } unsigned short readushort(FILE * f, int bigendian) { unsigned char c1, c2; - fread(&c1, 1, 1, f); - fread(&c2, 1, 1, f); + if ( !fread(&c1, 1, 1, f) ) + { + fprintf(stderr, "\nError: fread return a number of element different from the expected.\n"); + return 0; + } + if ( !fread(&c2, 1, 1, f) ) + { + fprintf(stderr, "\nError: fread return a number of element different from the expected.\n"); + return 0; + } if (bigendian) return (c1 << 8) + c2; else @@ -1056,10 +1132,26 @@ unsigned short readushort(FILE * f, int bigendian) unsigned int readuint(FILE * f, int bigendian) { unsigned char c1, c2, c3, c4; - fread(&c1, 1, 1, f); - fread(&c2, 1, 1, f); - fread(&c3, 1, 1, f); - fread(&c4, 1, 1, f); + if ( !fread(&c1, 1, 1, f) ) + { + fprintf(stderr, "\nError: fread return a number of element different from the expected.\n"); + return 0; + } + if ( !fread(&c2, 1, 1, f) ) + { + fprintf(stderr, "\nError: fread return a number of element different from the expected.\n"); + return 0; + } + if ( !fread(&c3, 1, 1, f) ) + { + fprintf(stderr, "\nError: fread return a number of element different from the expected.\n"); + return 0; + } + if ( !fread(&c4, 1, 1, f) ) + { + fprintf(stderr, "\nError: fread return a number of element different from the expected.\n"); + return 0; + } if (bigendian) return (c1 << 24) + (c2 << 16) + (c3 << 8) + c4; else @@ -1097,6 +1189,7 @@ opj_image_t* pgxtoimage(const char *filename, opj_cparameters_t *parameters) { fseek(f, 0, SEEK_SET); fscanf(f, "PG%[ \t]%c%c%[ \t+-]%d%[ \t]%d%[ \t]%d",temp,&endian1,&endian2,signtmp,&prec,temp,&w,temp,&h); + i=0; sign='+'; while (signtmp[i]!='\0') { @@ -1308,7 +1401,14 @@ static void read_pnm_header(FILE *reader, struct pnm_header *ph) char idf[256], type[256]; char line[256]; - fgets(line, 250, reader); + char* return_value_fgets = fgets(line, 250, reader); + if (!strcmp(return_value_fgets,line)) + { + fprintf(stderr,"\nWARNING: fgets return a value different that the first argument"); + free(return_value_fgets); + return; + } + free(return_value_fgets); if(line[0] != 'P') { @@ -1563,7 +1663,8 @@ opj_image_t* pnmtoimage(const char *filename, opj_cparameters_t *parameters) { for(compno = 0; compno < numcomps; compno++) { index = 0; - fscanf(fp, "%u", &index); + if (fscanf(fp, "%u", &index) != 1) + fprintf(stderr, "\nWARNING: fscanf return a number of element different from the expected.\n"); image->comps[compno].data[i] = (index * 255)/header_info.maxval; } @@ -1584,14 +1685,16 @@ opj_image_t* pnmtoimage(const char *filename, opj_cparameters_t *parameters) { { for(compno = 0; compno < numcomps; compno++) { - fread(&c0, 1, 1, fp); + if ( !fread(&c0, 1, 1, fp) ) + fprintf(stderr, "\nError: fread return a number of element different from the expected.\n"); if(one) { image->comps[compno].data[i] = c0; } else { - fread(&c1, 1, 1, fp); + if ( !fread(&c1, 1, 1, fp) ) + fprintf(stderr, "\nError: fread return a number of element different from the expected.\n"); /* netpbm: */ image->comps[compno].data[i] = ((c0<<8) | c1); } @@ -1605,7 +1708,8 @@ opj_image_t* pnmtoimage(const char *filename, opj_cparameters_t *parameters) { { unsigned int index; - fscanf(fp, "%u", &index); + if ( fscanf(fp, "%u", &index) != 1) + fprintf(stderr, "\nWARNING: fscanf return a number of element different from the expected.\n"); image->comps[0].data[i] = (index?0:255); } @@ -1640,7 +1744,8 @@ opj_image_t* pnmtoimage(const char *filename, opj_cparameters_t *parameters) { for(i = 0; i < w * h; ++i) { - fread(&uc, 1, 1, fp); + if ( !fread(&uc, 1, 1, fp) ) + fprintf(stderr, "\nError: fread return a number of element different from the expected.\n"); image->comps[0].data[i] = (uc & 1)?0:255; } } diff --git a/applications/codec/image_to_j2k.c b/applications/codec/image_to_j2k.c index 1e1cfbf4..e19ecdb7 100644 --- a/applications/codec/image_to_j2k.c +++ b/applications/codec/image_to_j2k.c @@ -1482,7 +1482,7 @@ int main(int argc, char **argv) { opj_image_t *image = NULL; int i,num_images; int imageno; - dircnt_t *dirptr; + dircnt_t *dirptr = NULL; raw_cparameters_t raw_cp; opj_codestream_info_t cstr_info; /* Codestream information structure */ char indexfilename[OPJ_PATH_LEN]; /* index file name */ diff --git a/applications/codec/j2k_dump.c b/applications/codec/j2k_dump.c index eaf1b34b..170c4324 100644 --- a/applications/codec/j2k_dump.c +++ b/applications/codec/j2k_dump.c @@ -412,7 +412,13 @@ int main(int argc, char *argv[]) file_length = ftell(fsrc); fseek(fsrc, 0, SEEK_SET); src = (unsigned char *) malloc(file_length); - fread(src, 1, file_length, fsrc); + if (fread(src, 1, file_length, fsrc) != file_length) + { + free(src); + fclose(fsrc); + fprintf(stderr, "\nERROR: fread return a number of element different from the expected.\n"); + return 1; + } fclose(fsrc); /* decode the code-stream */ diff --git a/applications/codec/j2k_to_image.c b/applications/codec/j2k_to_image.c index bc9ef7dd..b8f237bd 100644 --- a/applications/codec/j2k_to_image.c +++ b/applications/codec/j2k_to_image.c @@ -521,7 +521,7 @@ int main(int argc, char **argv) { int file_length; int num_images; int i,imageno; - dircnt_t *dirptr; + dircnt_t *dirptr = NULL; opj_dinfo_t* dinfo = NULL; /* handle to a decompressor */ opj_cio_t *cio = NULL; opj_codestream_info_t cstr_info; /* Codestream information structure */ @@ -595,7 +595,13 @@ int main(int argc, char **argv) { file_length = ftell(fsrc); fseek(fsrc, 0, SEEK_SET); src = (unsigned char *) malloc(file_length); - fread(src, 1, file_length, fsrc); + if (fread(src, 1, file_length, fsrc) != file_length) + { + free(src); + fclose(fsrc); + fprintf(stderr, "\nERROR: fread return a number of element different from the expected.\n"); + return 1; + } fclose(fsrc); /* decode the code-stream */ diff --git a/tests/compare_dump_files.c b/tests/compare_dump_files.c index 2340dfb7..42ef2fbb 100644 --- a/tests/compare_dump_files.c +++ b/tests/compare_dump_files.c @@ -164,6 +164,7 @@ int main(int argc, char **argv) size_t nbytes = 2048; int CRLF_shift=1; char *strbase, *strtest, *strbase_d, *strtest_d; + char *return_value_fgets; printf("Files differ at line %lu:\n", l); fseek(fbase,pos,SEEK_SET); @@ -179,8 +180,17 @@ int main(int argc, char **argv) strbase = (char *) malloc(nbytes + 1); strtest = (char *) malloc(nbytes + 1); - fgets(strbase, nbytes, fbase); - fgets(strtest, nbytes, ftest); + + return_value_fgets = fgets(strbase, nbytes, fbase); + if (!strcmp(return_value_fgets,strbase)) + fprintf(stderr,"\nWARNING: fgets return a value different that the first argument"); + free(return_value_fgets); + + return_value_fgets = fgets(strtest, nbytes, ftest); + if (!strcmp(return_value_fgets,strtest)) + fprintf(stderr,"\nWARNING: fgets return a value different that the first argument"); + free(return_value_fgets); + strbase_d = (char *) malloc(strlen(strbase)+1); strtest_d = (char *) malloc(strlen(strtest)+1); strncpy(strbase_d, strbase, strlen(strbase)-1); diff --git a/tests/nonregression/CMakeLists.txt b/tests/nonregression/CMakeLists.txt index 18e57244..f8a67ceb 100644 --- a/tests/nonregression/CMakeLists.txt +++ b/tests/nonregression/CMakeLists.txt @@ -15,7 +15,6 @@ FILE(GLOB_RECURSE OPJ_DATA_NR_LIST FOREACH(filepath ${OPJ_DATA_NR_LIST}) GET_FILENAME_COMPONENT(filename ${filepath} NAME) GET_FILENAME_COMPONENT(filenameSub ${filename} NAME_WE) - message("${filenameSub}") ADD_TEST(NR-${filename}-dump ${EXECUTABLE_OUTPUT_PATH}/j2k_dump From e716a316f60f66cd5a6fb07b88b2cb8b9c815cec Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Thu, 28 Jul 2011 10:45:22 +0000 Subject: [PATCH 21/33] manage case 0 frames inside yuv_num_frames function and correct some warnings with gcc4.5 (credit to Winfried) --- applications/codec/convert.c | 3 +-- applications/codec/j2k_to_image.c | 2 +- applications/common/getopt.c | 2 +- .../opj_dec_server/opj_dec_server.c | 2 +- applications/mj2/frames_to_mj2.c | 20 +++++++++---------- applications/mj2/mj2.c | 14 +++++-------- applications/mj2/mj2.h | 8 ++++---- applications/mj2/mj2_convert.c | 18 ++++++++--------- applications/mj2/mj2_convert.h | 2 +- libopenjpeg/dwt.c | 2 +- libopenjpeg/j2k.c | 2 +- libopenjpeg/jpwl/jpwl.c | 11 +++++----- libopenjpeg/jpwl/jpwl_lib.c | 9 +++++---- 13 files changed, 45 insertions(+), 50 deletions(-) diff --git a/applications/codec/convert.c b/applications/codec/convert.c index 502539f7..c7adabe9 100644 --- a/applications/codec/convert.c +++ b/applications/codec/convert.c @@ -1968,7 +1968,6 @@ int imagetotif(opj_image_t * image, const char *outfile) int width, height, imgsize; int bps,index,adjust, sgnd; int ushift, dshift, has_alpha, force16; - unsigned int last_i=0; TIFF *tif; tdata_t buf; tstrip_t strip; @@ -2029,7 +2028,7 @@ int imagetotif(opj_image_t * image, const char *outfile) for(strip = 0; strip < TIFFNumberOfStrips(tif); strip++) { unsigned char *dat8; - tsize_t i, ssize; + tsize_t i, ssize, last_i = 0; int step, restx; ssize = TIFFStripSize(tif); dat8 = (unsigned char*)buf; diff --git a/applications/codec/j2k_to_image.c b/applications/codec/j2k_to_image.c index b8f237bd..3da83119 100644 --- a/applications/codec/j2k_to_image.c +++ b/applications/codec/j2k_to_image.c @@ -595,7 +595,7 @@ int main(int argc, char **argv) { file_length = ftell(fsrc); fseek(fsrc, 0, SEEK_SET); src = (unsigned char *) malloc(file_length); - if (fread(src, 1, file_length, fsrc) != file_length) + if (fread(src, 1, file_length, fsrc) != (size_t)file_length) { free(src); fclose(fsrc); diff --git a/applications/common/getopt.c b/applications/common/getopt.c index 5e444d39..a02dde96 100644 --- a/applications/common/getopt.c +++ b/applications/common/getopt.c @@ -129,7 +129,7 @@ int getopt(int nargc, char *const *nargv, const char *ostr) { int getopt_long(int argc, char * const argv[], const char *optstring, -struct option *longopts, int totlen) { +const struct option *longopts, int totlen) { static int lastidx,lastofs; char *tmp; int i,len; diff --git a/applications/jpip/opj_client/opj_dec_server/opj_dec_server.c b/applications/jpip/opj_client/opj_dec_server/opj_dec_server.c index e2709797..895ade5c 100644 --- a/applications/jpip/opj_client/opj_dec_server/opj_dec_server.c +++ b/applications/jpip/opj_client/opj_dec_server/opj_dec_server.c @@ -144,7 +144,7 @@ int main(int argc, char *argv[]){ int listening_socket = open_listeningsocket(); - int addrlen = sizeof(peer_sin); + unsigned int addrlen = sizeof(peer_sin); cachelist_param_t *cachelist = gene_cachelist(); diff --git a/applications/mj2/frames_to_mj2.c b/applications/mj2/frames_to_mj2.c index 4e89956f..1e0d29a9 100644 --- a/applications/mj2/frames_to_mj2.c +++ b/applications/mj2/frames_to_mj2.c @@ -199,29 +199,29 @@ void help_display() fprintf(stdout,"TotalDisto\n\n"); } -int give_progression(char progression[4]) +OPJ_PROG_ORDER give_progression(char progression[5]) { if (progression[0] == 'L' && progression[1] == 'R' && progression[2] == 'C' && progression[3] == 'P') { - return 0; + return LRCP; } else { if (progression[0] == 'R' && progression[1] == 'L' && progression[2] == 'C' && progression[3] == 'P') { - return 1; + return RLCP; } else { if (progression[0] == 'R' && progression[1] == 'P' && progression[2] == 'C' && progression[3] == 'L') { - return 2; + return RPCL; } else { if (progression[0] == 'P' && progression[1] == 'C' && progression[2] == 'R' && progression[3] == 'L') { - return 3; + return PCRL; } else { if (progression[0] == 'C' && progression[1] == 'P' && progression[2] == 'R' && progression[3] == 'L') { - return 4; + return CPRL; } else { - return -1; + return PROG_UNKNOWN; } } } @@ -475,9 +475,9 @@ int main(int argc, char **argv) /* ----------------------------------------------------- */ case 'p': /* progression order */ { - char progression[4]; + char progression[5]; - strncpy(progression, optarg, 4); + strncpy(progression, optarg, 5); j2k_parameters->prog_order = give_progression(progression); if (j2k_parameters->prog_order == -1) { fprintf(stderr, "Unrecognized progression order " @@ -696,7 +696,7 @@ int main(int argc, char **argv) movie->tk[0].num_samples = yuv_num_frames(&movie->tk[0],mj2_parameters.infile); - if (movie->tk[0].num_samples == -1) { + if (movie->tk[0].num_samples == 0) { return 1; } diff --git a/applications/mj2/mj2.c b/applications/mj2/mj2.c index dfab1917..fe48415b 100644 --- a/applications/mj2/mj2.c +++ b/applications/mj2/mj2.c @@ -240,9 +240,7 @@ void mj2_tts_decompact(mj2_tk_t * tk) */ void mj2_stsc_decompact(mj2_tk_t * tk) { - int j, i; - unsigned int k; - int sampleno=0; + unsigned int i, j, k, sampleno = 0; if (tk->num_samplestochunk == 1) { tk->num_chunks = @@ -283,10 +281,8 @@ void mj2_stsc_decompact(mj2_tk_t * tk) */ void mj2_stco_decompact(mj2_tk_t * tk) { - int j; - unsigned int i; - int k = 0; - int intra_chunk_offset; + unsigned int i, j, k = 0; + unsigned int intra_chunk_offset; for (i = 0; i < tk->num_chunks; i++) { intra_chunk_offset = 0; @@ -585,7 +581,7 @@ int mj2_read_stsz(mj2_tk_t * tk, opj_cio_t *cio) */ void mj2_write_stsc(mj2_tk_t * tk, opj_cio_t *cio) { - int i; + unsigned int i; mj2_box_t box; box.init_pos = cio_tell(cio); @@ -617,7 +613,7 @@ void mj2_write_stsc(mj2_tk_t * tk, opj_cio_t *cio) */ int mj2_read_stsc(mj2_tk_t * tk, opj_cio_t *cio) { - int i; + unsigned int i; mj2_box_t box; mj2_read_boxhdr(&box, cio); /* Box Size */ diff --git a/applications/mj2/mj2.h b/applications/mj2/mj2.h index d4f27451..2e3d0b15 100644 --- a/applications/mj2/mj2.h +++ b/applications/mj2/mj2.h @@ -103,7 +103,7 @@ typedef struct mj2_tts { Chunk */ typedef struct mj2_chunk { - int num_samples; + unsigned int num_samples; int sample_descr_idx; int offset; } mj2_chunk_t; @@ -112,8 +112,8 @@ typedef struct mj2_chunk { Sample to chunk */ typedef struct mj2_sampletochunk { - int first_chunk; - int samples_per_chunk; + unsigned int first_chunk; + unsigned int samples_per_chunk; int sample_descr_idx; } mj2_sampletochunk_t; @@ -205,7 +205,7 @@ typedef struct mj2_tk { mj2_tts_t *tts; unsigned int num_chunks; mj2_chunk_t *chunk; - int num_samplestochunk; + unsigned int num_samplestochunk; mj2_sampletochunk_t *sampletochunk; char *name; opj_jp2_t jp2_struct; diff --git a/applications/mj2/mj2_convert.c b/applications/mj2/mj2_convert.c index 0f2d975d..3d842883 100644 --- a/applications/mj2/mj2_convert.c +++ b/applications/mj2/mj2_convert.c @@ -37,20 +37,20 @@ /* */ /* ----------------------- */ -int yuv_num_frames(mj2_tk_t * tk, char *infile) +unsigned int yuv_num_frames(mj2_tk_t * tk, char *infile) { - int numimages, frame_size, prec_size; - long end_of_f; + unsigned int prec_size; + long end_of_f, frame_size; FILE *f; f = fopen(infile,"rb"); if (!f) { fprintf(stderr, "failed to open %s for reading\n",infile); - return -1; + return 0; } prec_size = (tk->depth + 7)/8;/* bytes of precision */ - frame_size = (int) (tk->w * tk->h * (1.0 + (double) 2 / (double) (tk->CbCr_subsampling_dx * tk->CbCr_subsampling_dy))); /* Calculate frame size */ + frame_size = (long) (tk->w * tk->h * (1.0 + (double) 2 / (double) (tk->CbCr_subsampling_dx * tk->CbCr_subsampling_dy))); /* Calculate frame size */ frame_size *= prec_size; fseek(f, 0, SEEK_END); @@ -60,13 +60,11 @@ int yuv_num_frames(mj2_tk_t * tk, char *infile) fprintf(stderr, "YUV does not contains any frame of %d x %d size\n", tk->w, tk->h); - return -1; + return 0; } + fclose(f); - numimages = end_of_f / frame_size; /* Calculate number of images */ - fclose(f); - - return numimages; + return (unsigned int)(end_of_f / frame_size); } // ----------------------- diff --git a/applications/mj2/mj2_convert.h b/applications/mj2/mj2_convert.h index 78e6c470..19ba99f7 100644 --- a/applications/mj2/mj2_convert.h +++ b/applications/mj2/mj2_convert.h @@ -39,7 +39,7 @@ opj_image_t *mj2_image_create(mj2_tk_t * tk, opj_cparameters_t *parameters); char yuvtoimage(mj2_tk_t * tk, opj_image_t * img, int frame_num, opj_cparameters_t *parameters, char* infile); -int yuv_num_frames(mj2_tk_t * tk, char *infile); +unsigned int yuv_num_frames(mj2_tk_t * tk, char *infile); #endif diff --git a/libopenjpeg/dwt.c b/libopenjpeg/dwt.c index 3436b103..e7d74e2f 100644 --- a/libopenjpeg/dwt.c +++ b/libopenjpeg/dwt.c @@ -527,7 +527,7 @@ static void dwt_decode_tile(opj_tcd_tilecomp_t* tilec, int numres, DWT1DFN dwt_1 int w = tilec->x1 - tilec->x0; - h.mem = opj_aligned_malloc(dwt_decode_max_resolution(tr, numres) * sizeof(int)); + h.mem = (int*)opj_aligned_malloc(dwt_decode_max_resolution(tr, numres) * sizeof(int)); v.mem = h.mem; while( --numres) { diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c index cbdee114..0b09899a 100644 --- a/libopenjpeg/j2k.c +++ b/libopenjpeg/j2k.c @@ -236,7 +236,7 @@ static void j2k_read_unk(opj_j2k_t *j2k); /* ----------------------------------------------------------------------- */ typedef struct j2k_prog_order{ OPJ_PROG_ORDER enum_prog; - char str_prog[4]; + char str_prog[5]; }j2k_prog_order_t; j2k_prog_order_t j2k_prog_order_list[] = { diff --git a/libopenjpeg/jpwl/jpwl.c b/libopenjpeg/jpwl/jpwl.c index 707e46fd..a910ea78 100644 --- a/libopenjpeg/jpwl/jpwl.c +++ b/libopenjpeg/jpwl/jpwl.c @@ -75,9 +75,10 @@ jpwl_epc_ms_t *jpwl_epc_create(opj_j2k_t *j2k, opj_bool esd_on, opj_bool red_on, @param sensval pointer to an array of sensitivity values (if NULL, they will be automatically filled) @return returns the freshly created ESD */ -jpwl_esd_ms_t *jpwl_esd_create(opj_j2k_t *j2k, int comps, unsigned char addrm, unsigned char ad_size, - unsigned char senst, int se_size, int tileno, - unsigned long int svalnum, void *sensval); +jpwl_esd_ms_t *jpwl_esd_create(opj_j2k_t *j2k, int comps, + unsigned char addrm, unsigned char ad_size, + unsigned char senst, int se_size, int tileno, + unsigned long int svalnum, void *sensval); /** this function is used to compare two JPWL markers based on their relevant wishlist position @@ -168,7 +169,7 @@ void j2k_add_marker(opj_codestream_info_t *cstr_info, unsigned short int type, i /* expand the list? */ if ((cstr_info->marknum + 1) > cstr_info->maxmarknum) { cstr_info->maxmarknum = 100 + (int) ((float) cstr_info->maxmarknum * 1.0F); - cstr_info->marker = opj_realloc(cstr_info->marker, cstr_info->maxmarknum); + cstr_info->marker = (opj_marker_info_t*)opj_realloc(cstr_info->marker, cstr_info->maxmarknum); } /* add the marker */ @@ -906,7 +907,7 @@ void j2k_read_epc(opj_j2k_t *j2k) { unsigned short int Lepc, Pcrc = 0x0000; unsigned char Pepc; opj_cio_t *cio = j2k->cio; - char *ans1; + const char *ans1; /* Simply read the EPC parameters */ Lepcp = cio_tell(cio); diff --git a/libopenjpeg/jpwl/jpwl_lib.c b/libopenjpeg/jpwl/jpwl_lib.c index f60d33b1..90a71cec 100644 --- a/libopenjpeg/jpwl/jpwl_lib.c +++ b/libopenjpeg/jpwl/jpwl_lib.c @@ -1200,9 +1200,10 @@ int jpwl_esds_add(opj_j2k_t *j2k, jpwl_marker_t *jwmarker, int *jwmarker_num, return 0; } -jpwl_esd_ms_t *jpwl_esd_create(opj_j2k_t *j2k, int comp, unsigned char addrm, unsigned char ad_size, - unsigned char senst, unsigned char se_size, int tileno, - unsigned long int svalnum, void *sensval) { +jpwl_esd_ms_t *jpwl_esd_create(opj_j2k_t *j2k, int comp, + unsigned char addrm, unsigned char ad_size, + unsigned char senst, int se_size, int tileno, + unsigned long int svalnum, void *sensval) { jpwl_esd_ms_t *esd = NULL; @@ -1232,7 +1233,7 @@ jpwl_esd_ms_t *jpwl_esd_create(opj_j2k_t *j2k, int comp, unsigned char addrm, un /* packet mode */ case (0): ad_size = 0; /* as per the standard */ - esd->sensval_size = se_size; + esd->sensval_size = (unsigned int)se_size; break; /* byte range */ From 5743cca5f851a6c33462f66c2006ca5fc78f3c12 Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Fri, 29 Jul 2011 08:50:55 +0000 Subject: [PATCH 22/33] solve some obvious warnings for WIN platform, increase number of warning reported on the dashboard, correct last warnings with gcc 4.4 (-Wall) --- CHANGES | 3 +++ applications/codec/convert.c | 33 +++++++++++++++++++------------ applications/codec/image_to_j2k.c | 10 +++++----- applications/codec/j2k_dump.c | 18 ++++++++--------- applications/codec/j2k_to_image.c | 16 +++++++-------- applications/common/getopt.c | 2 +- applications/common/getopt.h | 2 +- libopenjpeg/event.c | 3 ++- libopenjpeg/jp2.c | 14 ++++++------- libopenjpeg/t2.c | 4 ++-- tests/comparePGXimages.c | 6 +++--- tests/compare_dump_files.c | 2 +- 12 files changed, 62 insertions(+), 51 deletions(-) diff --git a/CHANGES b/CHANGES index 26d8f3ff..319d9308 100644 --- a/CHANGES +++ b/CHANGES @@ -5,6 +5,9 @@ What's New for OpenJPEG ! : changed + : added +July 29, 2011 +! [mickael] solve some obvious warnings for WIN platform, increase number of warning reported on the dashboard, correct last warnings with gcc 4.4 (-Wall) + July 27, 2011 ! [mickael] added new decoding/dump tests based on data found in input/nonregresion repository (remove JPEG2000_CONFORMANCE_DATA_ROOT variable, add REF_DECODER_BIN_PATH variable for the encoder test suite). Remove definitively old tests. ! [mickael] correct some warnings detected under unix platform diff --git a/applications/codec/convert.c b/applications/codec/convert.c index c7adabe9..7b255092 100644 --- a/applications/codec/convert.c +++ b/applications/codec/convert.c @@ -158,9 +158,14 @@ int tga_writeheader(FILE *fp, int bits_per_pixel, int width, int height, memset(&tga, 0, sizeof(tga_header)); - tga.pixel_depth = bits_per_pixel; - tga.image_width = width; - tga.image_height = height; + if ( bits_per_pixel < 256 ) + tga.pixel_depth = (unsigned char)bits_per_pixel; + else{ + fprintf(stderr,"ERROR: Wrong bits per pixel inside tga_header"); + return 0; + } + tga.image_width = (unsigned short)width; + tga.image_height = (unsigned short)height; tga.image_type = 2; // Uncompressed. tga.image_desc = 8; // 8 bits per component. @@ -639,9 +644,9 @@ opj_image_t* bmptoimage(const char *filename, opj_cparameters_t *parameters) has_color = 0; for (j = 0; j < Info_h.biClrUsed; j++) { - table_B[j] = getc(IN); - table_G[j] = getc(IN); - table_R[j] = getc(IN); + table_B[j] = (unsigned char)getc(IN); + table_G[j] = (unsigned char)getc(IN); + table_R[j] = (unsigned char)getc(IN); getc(IN); has_color += !(table_R[j] == table_G[j] && table_R[j] == table_B[j]); @@ -757,9 +762,9 @@ opj_image_t* bmptoimage(const char *filename, opj_cparameters_t *parameters) has_color = 0; for (j = 0; j < Info_h.biClrUsed; j++) { - table_B[j] = getc(IN); - table_G[j] = getc(IN); - table_R[j] = getc(IN); + table_B[j] = (unsigned char)getc(IN); + table_G[j] = (unsigned char)getc(IN); + table_R[j] = (unsigned char)getc(IN); getc(IN); has_color += !(table_R[j] == table_G[j] && table_R[j] == table_B[j]); } @@ -822,7 +827,7 @@ opj_image_t* bmptoimage(const char *filename, opj_cparameters_t *parameters) c1 = getc(IN); for (i = 0; i < c && x < W && pix < beyond; i++, x++, pix++) - *pix = c1; + *pix = (unsigned char)c1; } else { @@ -850,7 +855,7 @@ opj_image_t* bmptoimage(const char *filename, opj_cparameters_t *parameters) for (; i < c && x < W && pix < beyond; i++, x++, pix++) { c1 = getc(IN); - *pix = c1; + *pix = (unsigned char)c1; } if (c & 1) /* skip padding byte */ getc(IN); @@ -1187,8 +1192,10 @@ opj_image_t* pgxtoimage(const char *filename, opj_cparameters_t *parameters) { } fseek(f, 0, SEEK_SET); - fscanf(f, "PG%[ \t]%c%c%[ \t+-]%d%[ \t]%d%[ \t]%d",temp,&endian1,&endian2,signtmp,&prec,temp,&w,temp,&h); - + if( fscanf(f, "PG%[ \t]%c%c%[ \t+-]%d%[ \t]%d%[ \t]%d",temp,&endian1,&endian2,signtmp,&prec,temp,&w,temp,&h) != 9){ + fprintf(stderr, "ERROR: Failed to read the right number of element from the fscanf() function!\n"); + return NULL; + } i=0; sign='+'; diff --git a/applications/codec/image_to_j2k.c b/applications/codec/image_to_j2k.c index e19ecdb7..92353970 100644 --- a/applications/codec/image_to_j2k.c +++ b/applications/codec/image_to_j2k.c @@ -82,7 +82,7 @@ typedef struct img_folder{ float *rates; }img_fol_t; -void encode_help_display() { +void encode_help_display(void) { fprintf(stdout,"HELP for image_to_j2k\n----\n\n"); fprintf(stdout,"- the -h option displays this help information on screen\n\n"); @@ -573,7 +573,7 @@ void cinema_setup_encoder(opj_cparameters_t *parameters,opj_image_t *image, img_ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters, img_fol_t *img_fol, raw_cparameters_t *raw_cp, char *indexfilename) { - int i, j,totlen; + int i, j, totlen, c; option_t long_option[]={ {"cinema2K",REQ_ARG, NULL ,'w'}, {"cinema4K",NO_ARG, NULL ,'y'}, @@ -597,8 +597,8 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters, img_fol->set_out_format=0; raw_cp->rawWidth = 0; - while (1) { - int c = getopt_long(argc, argv, optlist,long_option,totlen); + do{ + c = getopt_long(argc, argv, optlist,long_option,totlen); if (c == -1) break; switch (c) { @@ -1376,7 +1376,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters, fprintf(stderr, "ERROR -> Command line not valid\n"); return 1; } - } + }while(c != -1); /* check for possible errors */ if (parameters->cp_cinema){ diff --git a/applications/codec/j2k_dump.c b/applications/codec/j2k_dump.c index 170c4324..b0f44043 100644 --- a/applications/codec/j2k_dump.c +++ b/applications/codec/j2k_dump.c @@ -73,7 +73,7 @@ typedef struct img_folder{ }img_fol_t; -void decode_help_display() { +void decode_help_display(void) { fprintf(stdout,"HELP for j2k_dump\n----\n\n"); fprintf(stdout,"- the -h option displays this help information on screen\n\n"); @@ -196,7 +196,7 @@ char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_dparamet /* -------------------------------------------------------------------------- */ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,img_fol_t *img_fol, char *indexfilename) { /* parse the command line */ - int totlen; + int totlen, c; option_t long_option[]={ {"ImgDir",REQ_ARG, NULL ,'y'}, }; @@ -204,8 +204,8 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,i const char optlist[] = "i:o:h"; totlen=sizeof(long_option); img_fol->set_out_format = 0; - while (1) { - int c = getopt_long(argc, argv,optlist,long_option,totlen); + do { + c = getopt_long(argc, argv,optlist,long_option,totlen); if (c == -1) break; switch (c) { @@ -259,7 +259,7 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,i fprintf(stderr,"WARNING -> this option is not valid \"-%c %s\"\n",c, optarg); break; } - } + }while(c != -1); /* check for possible errors */ if(img_fol->set_imgdir==1){ @@ -412,7 +412,7 @@ int main(int argc, char *argv[]) file_length = ftell(fsrc); fseek(fsrc, 0, SEEK_SET); src = (unsigned char *) malloc(file_length); - if (fread(src, 1, file_length, fsrc) != file_length) + if (fread(src, 1, file_length, fsrc) != (size_t)file_length) { free(src); fclose(fsrc); @@ -463,7 +463,7 @@ int main(int argc, char *argv[]) /* Write the index to disk */ if (*indexfilename) { - char bSuccess; + opj_bool bSuccess; bSuccess = write_index_file(&cstr_info, indexfilename); if (bSuccess) { fprintf(stderr, "Failed to output index file\n"); @@ -514,7 +514,7 @@ int main(int argc, char *argv[]) /* Write the index to disk */ if (*indexfilename) { - char bSuccess; + opj_bool bSuccess; bSuccess = write_index_file(&cstr_info, indexfilename); if (bSuccess) { fprintf(stderr, "Failed to output index file\n"); @@ -556,7 +556,7 @@ int main(int argc, char *argv[]) /* Write the index to disk */ if (*indexfilename) { - char bSuccess; + opj_bool bSuccess; bSuccess = write_index_file(&cstr_info, indexfilename); if (bSuccess) { fprintf(stderr, "Failed to output index file\n"); diff --git a/applications/codec/j2k_to_image.c b/applications/codec/j2k_to_image.c index 3da83119..2b421369 100644 --- a/applications/codec/j2k_to_image.c +++ b/applications/codec/j2k_to_image.c @@ -85,7 +85,7 @@ typedef struct img_folder{ }img_fol_t; -void decode_help_display() { +void decode_help_display(void) { fprintf(stdout,"HELP for j2k_to_image\n----\n\n"); fprintf(stdout,"- the -h option displays this help information on screen\n\n"); @@ -237,7 +237,7 @@ char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_dparamet /* -------------------------------------------------------------------------- */ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,img_fol_t *img_fol, char *indexfilename) { /* parse the command line */ - int totlen; + int totlen, c; option_t long_option[]={ {"ImgDir",REQ_ARG, NULL ,'y'}, {"OutFor",REQ_ARG, NULL ,'O'}, @@ -253,8 +253,8 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,i "h" ; totlen=sizeof(long_option); img_fol->set_out_format = 0; - while (1) { - int c = getopt_long(argc, argv,optlist,long_option,totlen); + do { + c = getopt_long(argc, argv,optlist,long_option,totlen); if (c == -1) break; switch (c) { @@ -457,7 +457,7 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,i fprintf(stderr,"WARNING -> this option is not valid \"-%c %s\"\n",c, optarg); break; } - } + }while(c != -1); /* check for possible errors */ if(img_fol->set_imgdir==1){ @@ -641,7 +641,7 @@ int main(int argc, char **argv) { /* Write the index to disk */ if (*indexfilename) { - char bSuccess; + opj_bool bSuccess; bSuccess = write_index_file(&cstr_info, indexfilename); if (bSuccess) { fprintf(stderr, "Failed to output index file\n"); @@ -683,7 +683,7 @@ int main(int argc, char **argv) { /* Write the index to disk */ if (*indexfilename) { - char bSuccess; + opj_bool bSuccess; bSuccess = write_index_file(&cstr_info, indexfilename); if (bSuccess) { fprintf(stderr, "Failed to output index file\n"); @@ -725,7 +725,7 @@ int main(int argc, char **argv) { /* Write the index to disk */ if (*indexfilename) { - char bSuccess; + opj_bool bSuccess; bSuccess = write_index_file(&cstr_info, indexfilename); if (bSuccess) { fprintf(stderr, "Failed to output index file\n"); diff --git a/applications/common/getopt.c b/applications/common/getopt.c index a02dde96..3edd969d 100644 --- a/applications/common/getopt.c +++ b/applications/common/getopt.c @@ -60,7 +60,7 @@ typedef struct option #define EMSG "" /* As this class remembers its values from one Java call to the other, reset the values before each use */ -void reset_options_reading() { +void reset_options_reading(void) { opterr = 1; optind = 1; } diff --git a/applications/common/getopt.h b/applications/common/getopt.h index 779fe470..1b32d2b6 100644 --- a/applications/common/getopt.h +++ b/applications/common/getopt.h @@ -24,6 +24,6 @@ extern char *optarg; extern int getopt(int nargc, char *const *nargv, const char *ostr); extern int getopt_long(int argc, char * const argv[], const char *optstring, const struct option *longopts, int totlen); -extern void reset_options_reading(); +extern void reset_options_reading(void); #endif /* _GETOPT_H_ */ diff --git a/libopenjpeg/event.c b/libopenjpeg/event.c index df684ba2..0dc22f12 100644 --- a/libopenjpeg/event.c +++ b/libopenjpeg/event.c @@ -30,6 +30,7 @@ Utility functions ==========================================================*/ +#ifdef OPJ_CODE_NOT_USED #ifndef _WIN32 static char* i2a(unsigned i, char *a, unsigned r) { @@ -58,7 +59,7 @@ _itoa(int i, char *a, int r) { } #endif /* !_WIN32 */ - +#endif /* ----------------------------------------------------------------------- */ opj_event_mgr_t* OPJ_CALLCONV opj_set_event_mgr(opj_common_ptr cinfo, opj_event_mgr_t *event_mgr, void *context) { diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c index ffbf270f..39d48a5f 100644 --- a/libopenjpeg/jp2.c +++ b/libopenjpeg/jp2.c @@ -403,8 +403,8 @@ static opj_bool jp2_read_pclr(opj_jp2_t *jp2, opj_cio_t *cio, */ if(color->jp2_pclr) return OPJ_FALSE; - nr_entries = cio_read(cio, 2); /* NE */ - nr_channels = cio_read(cio, 1);/* NPC */ + nr_entries = (unsigned short)cio_read(cio, 2); /* NE */ + nr_channels = (unsigned short)cio_read(cio, 1);/* NPC */ entries = (unsigned int*) opj_malloc(nr_channels * nr_entries * sizeof(unsigned int)); @@ -460,7 +460,7 @@ static opj_bool jp2_read_cmap(opj_jp2_t *jp2, opj_cio_t *cio, for(i = 0; i < nr_channels; ++i) { - cmap[i].cmp = cio_read(cio, 2); + cmap[i].cmp = (unsigned short)cio_read(cio, 2); cmap[i].mtyp = cio_read(cio, 1); cmap[i].pcol = cio_read(cio, 1); @@ -516,7 +516,7 @@ static opj_bool jp2_read_cdef(opj_jp2_t *jp2, opj_cio_t *cio, */ if(color->jp2_cdef) return OPJ_FALSE; - if((n = cio_read(cio, 2)) == 0) return OPJ_FALSE; /* szukw000: FIXME */ + if((n = (unsigned short)cio_read(cio, 2)) == 0) return OPJ_FALSE; /* szukw000: FIXME */ info = (opj_jp2_cdef_info_t*) opj_malloc(n * sizeof(opj_jp2_cdef_info_t)); @@ -527,9 +527,9 @@ static opj_bool jp2_read_cdef(opj_jp2_t *jp2, opj_cio_t *cio, for(i = 0; i < n; ++i) { - info[i].cn = cio_read(cio, 2); - info[i].typ = cio_read(cio, 2); - info[i].asoc = cio_read(cio, 2); + info[i].cn = (unsigned short)cio_read(cio, 2); + info[i].typ = (unsigned short)cio_read(cio, 2); + info[i].asoc = (unsigned short)cio_read(cio, 2); } return OPJ_TRUE; diff --git a/libopenjpeg/t2.c b/libopenjpeg/t2.c index 4af8eb84..76821afc 100644 --- a/libopenjpeg/t2.c +++ b/libopenjpeg/t2.c @@ -149,8 +149,8 @@ static int t2_encode_packet(opj_tcd_tile_t * tile, opj_tcp_t * tcp, opj_pi_itera c[1] = 145; c[2] = 0; c[3] = 4; - c[4] = (tile->packno % 65536) / 256; - c[5] = (tile->packno % 65536) % 256; + c[4] = (unsigned char)((tile->packno % 65536) / 256); + c[5] = (unsigned char)((tile->packno % 65536) % 256); c += 6; } /* */ diff --git a/tests/comparePGXimages.c b/tests/comparePGXimages.c index dc3d9380..7a1e8f1c 100644 --- a/tests/comparePGXimages.c +++ b/tests/comparePGXimages.c @@ -19,7 +19,7 @@ #include "convert.h" double* parseToleranceValues( char* inArg, const int nbcomp); -void comparePGXimages_help_display(); +void comparePGXimages_help_display(void); opj_image_t* readImageFromFilePGX(char* filename, int nbFilenamePGX, char *separator); #ifdef HAVE_LIBPNG int imageToPNG(const opj_image_t* image, const char* filename, int num_comp_select); @@ -49,7 +49,7 @@ typedef struct test_cmp_parameters /******************************************************************************* * Command line help function *******************************************************************************/ -void comparePGXimages_help_display() { +void comparePGXimages_help_display(void) { fprintf(stdout,"\nList of parameters for the comparePGX function \n"); fprintf(stdout,"\n"); fprintf(stdout," -b \t REQUIRED \t filename to the reference/baseline PGX image \n"); @@ -713,12 +713,12 @@ int main(int argc, char **argv) if ( nbPixelDiff > 0) { char it_compc[255]; + it_compc[0] = '\0'; printf(" %d \n", it_comp, nbPixelDiff); printf(" %f \n", it_comp, sumDiff); #ifdef HAVE_LIBPNG - it_compc[0] = '\0'; sprintf(it_compc, "_%i", it_comp); strcat(it_compc,".png"); strcat(filenamePNGbase_it_comp, it_compc); diff --git a/tests/compare_dump_files.c b/tests/compare_dump_files.c index 42ef2fbb..48b9d40f 100644 --- a/tests/compare_dump_files.c +++ b/tests/compare_dump_files.c @@ -24,7 +24,7 @@ typedef struct test_cmp_parameters /******************************************************************************* * Command line help function *******************************************************************************/ -void compare_dump_files_help_display() { +void compare_dump_files_help_display(void) { fprintf(stdout,"\nList of parameters for the compare_dump_files function \n"); fprintf(stdout,"\n"); fprintf(stdout," -b \t REQUIRED \t filename to the reference/baseline dump file \n"); From f57c4fd0c2383f50ad04e80a757db4100a69c27d Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Fri, 29 Jul 2011 09:12:26 +0000 Subject: [PATCH 23/33] increase number of warning reported on the dashboard (forgot the file in the last commit) --- CHANGES | 1 + CMake/CTestCustom.cmake.in | 21 ++++++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 319d9308..ea190c9b 100644 --- a/CHANGES +++ b/CHANGES @@ -7,6 +7,7 @@ What's New for OpenJPEG July 29, 2011 ! [mickael] solve some obvious warnings for WIN platform, increase number of warning reported on the dashboard, correct last warnings with gcc 4.4 (-Wall) +! [mickael] increase number of warning reported on the dashboard (forgot the file in the last commit) July 27, 2011 ! [mickael] added new decoding/dump tests based on data found in input/nonregresion repository (remove JPEG2000_CONFORMANCE_DATA_ROOT variable, add REF_DECODER_BIN_PATH variable for the encoder test suite). Remove definitively old tests. diff --git a/CMake/CTestCustom.cmake.in b/CMake/CTestCustom.cmake.in index 00ad6670..cc5c273f 100644 --- a/CMake/CTestCustom.cmake.in +++ b/CMake/CTestCustom.cmake.in @@ -1,15 +1,30 @@ # -# For further details regarding this file, -# see http://www.vtk.org/Wiki/CMake_Testing_With_CTest#Customizing_CTest +# Note that the ITK/CMakeLists.txt file configures this file # +# CMake/CTestCustom.cmake.in +# +# to this file +# +# ${ITK_BINARY_DIR}/CTestCustom.cmake +# +#---------------------------------------------------------------------- +# +# For further details regarding this file, +# see http://www.cmake.org/Wiki/CMake_Testing_With_CTest#Customizing_CTest +# +# and +# http://www.kitware.com/blog/home/post/27 +# +#---------------------------------------------------------------------- SET (CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS 50) -SET (CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 50) +SET (CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 2000) SET(CTEST_CUSTOM_COVERAGE_EXCLUDE ${CTEST_CUSTOM_COVERAGE_EXCLUDE} # Exclude files from the Testing directories + ".*/tests/.*" ".*/Testing/.*" ) From 16998b4b6da8c51b0f4b69bf3c8636547c1727ca Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Fri, 29 Jul 2011 10:47:42 +0000 Subject: [PATCH 24/33] update MJ2 CMakeLists regards to the new thirdparty strategy --- CHANGES | 1 + applications/mj2/CMakeLists.txt | 20 ++++++++------------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/CHANGES b/CHANGES index ea190c9b..68462ded 100644 --- a/CHANGES +++ b/CHANGES @@ -8,6 +8,7 @@ What's New for OpenJPEG July 29, 2011 ! [mickael] solve some obvious warnings for WIN platform, increase number of warning reported on the dashboard, correct last warnings with gcc 4.4 (-Wall) ! [mickael] increase number of warning reported on the dashboard (forgot the file in the last commit) +! [mickael] update MJ2 CMakeLists regards to the new thirdparty strategy July 27, 2011 ! [mickael] added new decoding/dump tests based on data found in input/nonregresion repository (remove JPEG2000_CONFORMANCE_DATA_ROOT variable, add REF_DECODER_BIN_PATH variable for the encoder test suite). Remove definitively old tests. diff --git a/applications/mj2/CMakeLists.txt b/applications/mj2/CMakeLists.txt index 7b365678..4a43886f 100644 --- a/applications/mj2/CMakeLists.txt +++ b/applications/mj2/CMakeLists.txt @@ -46,9 +46,8 @@ ADD_EXECUTABLE(frames_to_mj2 ${OPJ_SRCS} ${MJ2_SRCS} ) -IF(LCMS_FOUND OR LCMS2_FOUND) - TARGET_LINK_LIBRARIES(frames_to_mj2 ${LCMS_LIBNAME}) -ENDIF(LCMS_FOUND OR LCMS2_FOUND) +TARGET_LINK_LIBRARIES(frames_to_mj2 ${LCMS_LIBNAME}) + IF(UNIX) TARGET_LINK_LIBRARIES(frames_to_mj2 m) ENDIF(UNIX) @@ -60,9 +59,8 @@ ADD_EXECUTABLE(mj2_to_frames ${MJ2_SRCS} ${OPENJPEG_SOURCE_DIR}/applications/common/color.c ) -IF(LCMS_FOUND OR LCMS2_FOUND) - TARGET_LINK_LIBRARIES(mj2_to_frames ${LCMS_LIBNAME}) -ENDIF(LCMS_FOUND OR LCMS2_FOUND) +TARGET_LINK_LIBRARIES(mj2_to_frames ${LCMS_LIBNAME}) + IF(UNIX) TARGET_LINK_LIBRARIES(mj2_to_frames m) ENDIF(UNIX) @@ -72,9 +70,8 @@ ADD_EXECUTABLE(extract_j2k_from_mj2 ${OPJ_SRCS} ${MJ2_SRCS} ) -IF(LCMS_FOUND OR LCMS2_FOUND) - TARGET_LINK_LIBRARIES(extract_j2k_from_mj2 ${LCMS_LIBNAME}) -ENDIF(LCMS_FOUND OR LCMS2_FOUND) +TARGET_LINK_LIBRARIES(extract_j2k_from_mj2 ${LCMS_LIBNAME}) + IF(UNIX) TARGET_LINK_LIBRARIES(extract_j2k_from_mj2 m) ENDIF(UNIX) @@ -84,9 +81,8 @@ ADD_EXECUTABLE(wrap_j2k_in_mj2 ${OPJ_SRCS} ${MJ2_SRCS} ) -IF(LCMS_FOUND OR LCMS2_FOUND) - TARGET_LINK_LIBRARIES(wrap_j2k_in_mj2 ${LCMS_LIBNAME}) -ENDIF(LCMS_FOUND OR LCMS2_FOUND) +TARGET_LINK_LIBRARIES(wrap_j2k_in_mj2 ${LCMS_LIBNAME}) + IF(UNIX) TARGET_LINK_LIBRARIES(wrap_j2k_in_mj2 m) ENDIF(UNIX) From df44837b0731ab7c231b8b3159c5f0600ee2f5e8 Mon Sep 17 00:00:00 2001 From: Antonin Descampe Date: Tue, 9 Aug 2011 15:42:42 +0000 Subject: [PATCH 25/33] removed xcode project files (cmake and autotools are now the only supported build methods) --- CHANGES | 3 + openjpeg.xcodeproj/project.pbxproj | 3792 ---------------------------- 2 files changed, 3 insertions(+), 3792 deletions(-) delete mode 100644 openjpeg.xcodeproj/project.pbxproj diff --git a/CHANGES b/CHANGES index 68462ded..82c68804 100644 --- a/CHANGES +++ b/CHANGES @@ -5,6 +5,9 @@ What's New for OpenJPEG ! : changed + : added +August 9, 2011 +- [antonin] removed xcode project files (cmake and autotools are now the only supported build methods) + July 29, 2011 ! [mickael] solve some obvious warnings for WIN platform, increase number of warning reported on the dashboard, correct last warnings with gcc 4.4 (-Wall) ! [mickael] increase number of warning reported on the dashboard (forgot the file in the last commit) diff --git a/openjpeg.xcodeproj/project.pbxproj b/openjpeg.xcodeproj/project.pbxproj deleted file mode 100644 index df0034c2..00000000 --- a/openjpeg.xcodeproj/project.pbxproj +++ /dev/null @@ -1,3792 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXAggregateTarget section */ - 692CF258122BB2640010088E /* build OPJ_JPWL */ = { - isa = PBXAggregateTarget; - buildConfigurationList = 692CF261122BB2640010088E /* Build configuration list for PBXAggregateTarget "build OPJ_JPWL" */; - buildPhases = ( - ); - dependencies = ( - 692CF265122BB2760010088E /* PBXTargetDependency */, - 692CF267122BB2760010088E /* PBXTargetDependency */, - 692CF269122BB2760010088E /* PBXTargetDependency */, - 694E0DD012913537008AFCC7 /* PBXTargetDependency */, - ); - name = "build OPJ_JPWL"; - productName = "build all"; - }; - 692CF26A122BB2850010088E /* build all */ = { - isa = PBXAggregateTarget; - buildConfigurationList = 692CF271122BB2850010088E /* Build configuration list for PBXAggregateTarget "build all" */; - buildPhases = ( - ); - dependencies = ( - 692CF275122BB29A0010088E /* PBXTargetDependency */, - 692CF277122BB29A0010088E /* PBXTargetDependency */, - 6938D7E912D0F4C10017B83E /* PBXTargetDependency */, - 69B13704137BEE5A00C06507 /* PBXTargetDependency */, - ); - name = "build all"; - productName = "build all"; - }; - 694039A6117B7E090079DE22 /* build OPJ */ = { - isa = PBXAggregateTarget; - buildConfigurationList = 694039A9117B7E2E0079DE22 /* Build configuration list for PBXAggregateTarget "build OPJ" */; - buildPhases = ( - ); - dependencies = ( - 694039AB117B7E390079DE22 /* PBXTargetDependency */, - 694039AD117B7E3D0079DE22 /* PBXTargetDependency */, - 694039AF117B7E420079DE22 /* PBXTargetDependency */, - 694E0DA412913354008AFCC7 /* PBXTargetDependency */, - 694E0DCE1291350B008AFCC7 /* PBXTargetDependency */, - ); - name = "build OPJ"; - productName = "build all"; - }; - 694E0D4412912A70008AFCC7 /* opj_config */ = { - isa = PBXAggregateTarget; - buildConfigurationList = 694E0D4712912A8F008AFCC7 /* Build configuration list for PBXAggregateTarget "opj_config" */; - buildPhases = ( - 694E0D4312912A70008AFCC7 /* ShellScript */, - ); - dependencies = ( - ); - name = opj_config; - productName = opj_config; - }; - 694E0EFA12953FD2008AFCC7 /* build OPJ_MJ2 */ = { - isa = PBXAggregateTarget; - buildConfigurationList = 694E0F0612953FF2008AFCC7 /* Build configuration list for PBXAggregateTarget "build OPJ_MJ2" */; - buildPhases = ( - ); - dependencies = ( - 694E0F0412953FDB008AFCC7 /* PBXTargetDependency */, - 694E0F0212953FDB008AFCC7 /* PBXTargetDependency */, - 694E0F0012953FDB008AFCC7 /* PBXTargetDependency */, - 694E0EFE12953FDB008AFCC7 /* PBXTargetDependency */, - ); - name = "build OPJ_MJ2"; - productName = "build OPJ_MJ2"; - }; - 69B136F8137BEE2C00C06507 /* build OPJ_JPIP */ = { - isa = PBXAggregateTarget; - buildConfigurationList = 69B1370E137BEE7B00C06507 /* Build configuration list for PBXAggregateTarget "build OPJ_JPIP" */; - buildPhases = ( - ); - dependencies = ( - 69B136FC137BEE3700C06507 /* PBXTargetDependency */, - 69B137B4137BF40B00C06507 /* PBXTargetDependency */, - 69B136FE137BEE3C00C06507 /* PBXTargetDependency */, - 69B13700137BEE4000C06507 /* PBXTargetDependency */, - 69B13793137BF2F700C06507 /* PBXTargetDependency */, - ); - name = "build OPJ_JPIP"; - productName = "build openjpip"; - }; - 69B13785137BF2DE00C06507 /* opj_tools */ = { - isa = PBXAggregateTarget; - buildConfigurationList = 69B13797137BF30B00C06507 /* Build configuration list for PBXAggregateTarget "opj_tools" */; - buildPhases = ( - ); - dependencies = ( - 69B13791137BF2E500C06507 /* PBXTargetDependency */, - 69B1378F137BF2E500C06507 /* PBXTargetDependency */, - 69B1378D137BF2E500C06507 /* PBXTargetDependency */, - 69B1378B137BF2E500C06507 /* PBXTargetDependency */, - 69B13789137BF2E500C06507 /* PBXTargetDependency */, - ); - name = opj_tools; - productName = opj_tools; - }; -/* End PBXAggregateTarget section */ - -/* Begin PBXBuildFile section */ - 692CF211122BAFA10010088E /* bio.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F984FF0D40A41700C2791C /* bio.c */; }; - 692CF212122BAFA10010088E /* cio.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985020D40A41700C2791C /* cio.c */; }; - 692CF213122BAFA10010088E /* dwt.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985060D40A41700C2791C /* dwt.c */; }; - 692CF214122BAFA10010088E /* event.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985090D40A41700C2791C /* event.c */; }; - 692CF215122BAFA10010088E /* image.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9850D0D40A41700C2791C /* image.c */; }; - 692CF216122BAFA10010088E /* j2k.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985110D40A41700C2791C /* j2k.c */; }; - 692CF217122BAFA10010088E /* j2k_lib.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985140D40A41700C2791C /* j2k_lib.c */; }; - 692CF218122BAFA10010088E /* jp2.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985170D40A41700C2791C /* jp2.c */; }; - 692CF219122BAFA10010088E /* jpt.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9851A0D40A41700C2791C /* jpt.c */; }; - 692CF21A122BAFA10010088E /* mct.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9851D0D40A41700C2791C /* mct.c */; }; - 692CF21B122BAFA10010088E /* mqc.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985200D40A41700C2791C /* mqc.c */; }; - 692CF21C122BAFA10010088E /* openjpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985230D40A41700C2791C /* openjpeg.c */; }; - 692CF21D122BAFA10010088E /* pi.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985280D40A41700C2791C /* pi.c */; }; - 692CF21E122BAFA10010088E /* raw.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9852B0D40A41700C2791C /* raw.c */; }; - 692CF21F122BAFA10010088E /* t1.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9852E0D40A41700C2791C /* t1.c */; }; - 692CF221122BAFA10010088E /* t2.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985330D40A41700C2791C /* t2.c */; }; - 692CF222122BAFA10010088E /* tcd.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985360D40A41700C2791C /* tcd.c */; }; - 692CF223122BAFA10010088E /* tgt.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985390D40A41700C2791C /* tgt.c */; }; - 694E0DAF1291347F008AFCC7 /* bio.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F984FF0D40A41700C2791C /* bio.c */; }; - 694E0DB01291347F008AFCC7 /* cio.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985020D40A41700C2791C /* cio.c */; }; - 694E0DB21291347F008AFCC7 /* dwt.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985060D40A41700C2791C /* dwt.c */; }; - 694E0DB31291347F008AFCC7 /* event.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985090D40A41700C2791C /* event.c */; }; - 694E0DB41291347F008AFCC7 /* image.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9850D0D40A41700C2791C /* image.c */; }; - 694E0DB51291347F008AFCC7 /* j2k.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985110D40A41700C2791C /* j2k.c */; }; - 694E0DB61291347F008AFCC7 /* j2k_lib.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985140D40A41700C2791C /* j2k_lib.c */; }; - 694E0DB71291347F008AFCC7 /* jp2.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985170D40A41700C2791C /* jp2.c */; }; - 694E0DB81291347F008AFCC7 /* jpt.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9851A0D40A41700C2791C /* jpt.c */; }; - 694E0DBB1291347F008AFCC7 /* mct.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9851D0D40A41700C2791C /* mct.c */; }; - 694E0DBC1291347F008AFCC7 /* mqc.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985200D40A41700C2791C /* mqc.c */; }; - 694E0DBD1291347F008AFCC7 /* openjpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985230D40A41700C2791C /* openjpeg.c */; }; - 694E0DBF1291347F008AFCC7 /* pi.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985280D40A41700C2791C /* pi.c */; }; - 694E0DC01291347F008AFCC7 /* raw.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9852B0D40A41700C2791C /* raw.c */; }; - 694E0DC21291347F008AFCC7 /* t1.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9852E0D40A41700C2791C /* t1.c */; }; - 694E0DC41291347F008AFCC7 /* t2.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985330D40A41700C2791C /* t2.c */; }; - 694E0DC51291347F008AFCC7 /* tcd.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985360D40A41700C2791C /* tcd.c */; }; - 694E0DC61291347F008AFCC7 /* tgt.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985390D40A41700C2791C /* tgt.c */; }; - 69B13609137BE4B600C06507 /* convert.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13524137BE46700C06507 /* convert.c */; }; - 69B1360A137BE4B600C06507 /* image_to_j2k.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13526137BE46700C06507 /* image_to_j2k.c */; }; - 69B1360B137BE4B600C06507 /* index.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13527137BE46700C06507 /* index.c */; }; - 69B1360C137BE4C000C06507 /* getopt.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13533137BE46700C06507 /* getopt.c */; }; - 69B1360D137BE4DB00C06507 /* convert.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13524137BE46700C06507 /* convert.c */; }; - 69B1360E137BE4DB00C06507 /* index.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13527137BE46700C06507 /* index.c */; }; - 69B1360F137BE4DB00C06507 /* j2k_to_image.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B1352A137BE46700C06507 /* j2k_to_image.c */; }; - 69B13610137BE4DB00C06507 /* color.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13530137BE46700C06507 /* color.c */; }; - 69B13611137BE4DB00C06507 /* getopt.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13533137BE46700C06507 /* getopt.c */; }; - 69B13612137BE50600C06507 /* convert.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13524137BE46700C06507 /* convert.c */; }; - 69B13613137BE50600C06507 /* j2k_dump.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13529137BE46700C06507 /* j2k_dump.c */; }; - 69B13614137BE50600C06507 /* getopt.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13533137BE46700C06507 /* getopt.c */; }; - 69B1362A137BE5FD00C06507 /* crc.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13620137BE5FD00C06507 /* crc.c */; }; - 69B1362B137BE5FD00C06507 /* jpwl.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13622137BE5FD00C06507 /* jpwl.c */; }; - 69B1362C137BE5FD00C06507 /* jpwl_lib.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13624137BE5FD00C06507 /* jpwl_lib.c */; }; - 69B1362D137BE5FD00C06507 /* rs.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13628137BE5FD00C06507 /* rs.c */; }; - 69B1362E137BE5FD00C06507 /* crc.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13620137BE5FD00C06507 /* crc.c */; }; - 69B1362F137BE5FD00C06507 /* jpwl.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13622137BE5FD00C06507 /* jpwl.c */; }; - 69B13630137BE5FD00C06507 /* jpwl_lib.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13624137BE5FD00C06507 /* jpwl_lib.c */; }; - 69B13631137BE5FD00C06507 /* rs.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13628137BE5FD00C06507 /* rs.c */; }; - 69B13638137BE66200C06507 /* convert.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13524137BE46700C06507 /* convert.c */; }; - 69B13639137BE66200C06507 /* image_to_j2k.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13526137BE46700C06507 /* image_to_j2k.c */; }; - 69B1363A137BE66200C06507 /* index.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13527137BE46700C06507 /* index.c */; }; - 69B1363B137BE66200C06507 /* getopt.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13533137BE46700C06507 /* getopt.c */; }; - 69B1363C137BE66C00C06507 /* convert.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13524137BE46700C06507 /* convert.c */; }; - 69B1363D137BE66C00C06507 /* index.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13527137BE46700C06507 /* index.c */; }; - 69B1363E137BE66C00C06507 /* j2k_to_image.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B1352A137BE46700C06507 /* j2k_to_image.c */; }; - 69B1363F137BE66C00C06507 /* color.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13530137BE46700C06507 /* color.c */; }; - 69B13640137BE66C00C06507 /* getopt.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13533137BE46700C06507 /* getopt.c */; }; - 69B13641137BE6D300C06507 /* bio.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F984FF0D40A41700C2791C /* bio.c */; }; - 69B13642137BE6D300C06507 /* cio.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985020D40A41700C2791C /* cio.c */; }; - 69B13643137BE6D300C06507 /* dwt.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985060D40A41700C2791C /* dwt.c */; }; - 69B13644137BE6D300C06507 /* event.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985090D40A41700C2791C /* event.c */; }; - 69B13645137BE6D300C06507 /* image.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9850D0D40A41700C2791C /* image.c */; }; - 69B13646137BE6D300C06507 /* j2k.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985110D40A41700C2791C /* j2k.c */; }; - 69B13647137BE6D300C06507 /* j2k_lib.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985140D40A41700C2791C /* j2k_lib.c */; }; - 69B13648137BE6D300C06507 /* jp2.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985170D40A41700C2791C /* jp2.c */; }; - 69B13649137BE6D300C06507 /* jpt.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9851A0D40A41700C2791C /* jpt.c */; }; - 69B1364A137BE6D300C06507 /* mct.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9851D0D40A41700C2791C /* mct.c */; }; - 69B1364B137BE6D300C06507 /* mqc.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985200D40A41700C2791C /* mqc.c */; }; - 69B1364C137BE6D300C06507 /* openjpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985230D40A41700C2791C /* openjpeg.c */; }; - 69B1364D137BE6D300C06507 /* pi.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985280D40A41700C2791C /* pi.c */; }; - 69B1364E137BE6D300C06507 /* raw.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9852B0D40A41700C2791C /* raw.c */; }; - 69B1364F137BE6D300C06507 /* t1.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9852E0D40A41700C2791C /* t1.c */; }; - 69B13651137BE6D300C06507 /* t2.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985330D40A41700C2791C /* t2.c */; }; - 69B13652137BE6D300C06507 /* tcd.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985360D40A41700C2791C /* tcd.c */; }; - 69B13653137BE6D300C06507 /* tgt.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985390D40A41700C2791C /* tgt.c */; }; - 69B13654137BE6D700C06507 /* bio.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F984FF0D40A41700C2791C /* bio.c */; }; - 69B13655137BE6D700C06507 /* cio.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985020D40A41700C2791C /* cio.c */; }; - 69B13656137BE6D700C06507 /* dwt.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985060D40A41700C2791C /* dwt.c */; }; - 69B13657137BE6D700C06507 /* event.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985090D40A41700C2791C /* event.c */; }; - 69B13658137BE6D700C06507 /* image.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9850D0D40A41700C2791C /* image.c */; }; - 69B13659137BE6D700C06507 /* j2k.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985110D40A41700C2791C /* j2k.c */; }; - 69B1365A137BE6D700C06507 /* j2k_lib.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985140D40A41700C2791C /* j2k_lib.c */; }; - 69B1365B137BE6D700C06507 /* jp2.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985170D40A41700C2791C /* jp2.c */; }; - 69B1365C137BE6D700C06507 /* jpt.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9851A0D40A41700C2791C /* jpt.c */; }; - 69B1365D137BE6D700C06507 /* mct.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9851D0D40A41700C2791C /* mct.c */; }; - 69B1365E137BE6D700C06507 /* mqc.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985200D40A41700C2791C /* mqc.c */; }; - 69B1365F137BE6D700C06507 /* openjpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985230D40A41700C2791C /* openjpeg.c */; }; - 69B13660137BE6D700C06507 /* pi.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985280D40A41700C2791C /* pi.c */; }; - 69B13661137BE6D700C06507 /* raw.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9852B0D40A41700C2791C /* raw.c */; }; - 69B13662137BE6D700C06507 /* t1.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9852E0D40A41700C2791C /* t1.c */; }; - 69B13664137BE6D700C06507 /* t2.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985330D40A41700C2791C /* t2.c */; }; - 69B13665137BE6D700C06507 /* tcd.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985360D40A41700C2791C /* tcd.c */; }; - 69B13666137BE6D700C06507 /* tgt.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985390D40A41700C2791C /* tgt.c */; }; - 69B13667137BE6DA00C06507 /* bio.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F984FF0D40A41700C2791C /* bio.c */; }; - 69B13668137BE6DA00C06507 /* cio.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985020D40A41700C2791C /* cio.c */; }; - 69B13669137BE6DA00C06507 /* dwt.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985060D40A41700C2791C /* dwt.c */; }; - 69B1366A137BE6DA00C06507 /* event.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985090D40A41700C2791C /* event.c */; }; - 69B1366B137BE6DA00C06507 /* image.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9850D0D40A41700C2791C /* image.c */; }; - 69B1366C137BE6DA00C06507 /* j2k.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985110D40A41700C2791C /* j2k.c */; }; - 69B1366D137BE6DA00C06507 /* j2k_lib.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985140D40A41700C2791C /* j2k_lib.c */; }; - 69B1366E137BE6DA00C06507 /* jp2.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985170D40A41700C2791C /* jp2.c */; }; - 69B1366F137BE6DA00C06507 /* jpt.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9851A0D40A41700C2791C /* jpt.c */; }; - 69B13670137BE6DA00C06507 /* mct.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9851D0D40A41700C2791C /* mct.c */; }; - 69B13671137BE6DA00C06507 /* mqc.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985200D40A41700C2791C /* mqc.c */; }; - 69B13672137BE6DA00C06507 /* openjpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985230D40A41700C2791C /* openjpeg.c */; }; - 69B13673137BE6DA00C06507 /* pi.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985280D40A41700C2791C /* pi.c */; }; - 69B13674137BE6DA00C06507 /* raw.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9852B0D40A41700C2791C /* raw.c */; }; - 69B13675137BE6DA00C06507 /* t1.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9852E0D40A41700C2791C /* t1.c */; }; - 69B13677137BE6DA00C06507 /* t2.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985330D40A41700C2791C /* t2.c */; }; - 69B13678137BE6DA00C06507 /* tcd.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985360D40A41700C2791C /* tcd.c */; }; - 69B13679137BE6DA00C06507 /* tgt.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985390D40A41700C2791C /* tgt.c */; }; - 69B1367A137BE6DD00C06507 /* bio.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F984FF0D40A41700C2791C /* bio.c */; }; - 69B1367B137BE6DD00C06507 /* cio.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985020D40A41700C2791C /* cio.c */; }; - 69B1367C137BE6DD00C06507 /* dwt.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985060D40A41700C2791C /* dwt.c */; }; - 69B1367D137BE6DD00C06507 /* event.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985090D40A41700C2791C /* event.c */; }; - 69B1367E137BE6DD00C06507 /* image.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9850D0D40A41700C2791C /* image.c */; }; - 69B1367F137BE6DD00C06507 /* j2k.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985110D40A41700C2791C /* j2k.c */; }; - 69B13680137BE6DD00C06507 /* j2k_lib.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985140D40A41700C2791C /* j2k_lib.c */; }; - 69B13681137BE6DD00C06507 /* jp2.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985170D40A41700C2791C /* jp2.c */; }; - 69B13682137BE6DD00C06507 /* jpt.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9851A0D40A41700C2791C /* jpt.c */; }; - 69B13683137BE6DD00C06507 /* mct.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9851D0D40A41700C2791C /* mct.c */; }; - 69B13684137BE6DD00C06507 /* mqc.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985200D40A41700C2791C /* mqc.c */; }; - 69B13685137BE6DD00C06507 /* openjpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985230D40A41700C2791C /* openjpeg.c */; }; - 69B13686137BE6DD00C06507 /* pi.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985280D40A41700C2791C /* pi.c */; }; - 69B13687137BE6DD00C06507 /* raw.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9852B0D40A41700C2791C /* raw.c */; }; - 69B13688137BE6DD00C06507 /* t1.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9852E0D40A41700C2791C /* t1.c */; }; - 69B1368A137BE6DD00C06507 /* t2.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985330D40A41700C2791C /* t2.c */; }; - 69B1368B137BE6DD00C06507 /* tcd.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985360D40A41700C2791C /* tcd.c */; }; - 69B1368C137BE6DD00C06507 /* tgt.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985390D40A41700C2791C /* tgt.c */; }; - 69B1368D137BE70C00C06507 /* extract_j2k_from_mj2.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B135D0137BE46700C06507 /* extract_j2k_from_mj2.c */; }; - 69B1368E137BE70C00C06507 /* mj2.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B135D6137BE46700C06507 /* mj2.c */; }; - 69B1368F137BE70C00C06507 /* mj2_convert.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B135D8137BE46700C06507 /* mj2_convert.c */; }; - 69B13690137BE71700C06507 /* frames_to_mj2.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B135D1137BE46700C06507 /* frames_to_mj2.c */; }; - 69B13691137BE71700C06507 /* mj2.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B135D6137BE46700C06507 /* mj2.c */; }; - 69B13692137BE71700C06507 /* mj2_convert.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B135D8137BE46700C06507 /* mj2_convert.c */; }; - 69B13693137BE72900C06507 /* mj2.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B135D6137BE46700C06507 /* mj2.c */; }; - 69B13694137BE72900C06507 /* mj2_convert.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B135D8137BE46700C06507 /* mj2_convert.c */; }; - 69B13695137BE72900C06507 /* mj2_to_frames.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B135DA137BE46700C06507 /* mj2_to_frames.c */; }; - 69B13696137BE73B00C06507 /* mj2.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B135D6137BE46700C06507 /* mj2.c */; }; - 69B13697137BE73B00C06507 /* mj2_convert.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B135D8137BE46700C06507 /* mj2_convert.c */; }; - 69B13698137BE73B00C06507 /* wrap_j2k_in_mj2.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B135E2137BE46700C06507 /* wrap_j2k_in_mj2.c */; }; - 69B1369F137BE79C00C06507 /* index.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13527137BE46700C06507 /* index.c */; }; - 69B1371F137BEF3A00C06507 /* box_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13555137BE46700C06507 /* box_manager.c */; }; - 69B13720137BEF3A00C06507 /* boxheader_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13557137BE46700C06507 /* boxheader_manager.c */; }; - 69B13721137BEF3A00C06507 /* byte_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13559137BE46700C06507 /* byte_manager.c */; }; - 69B13722137BEF3A00C06507 /* codestream_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B1355B137BE46700C06507 /* codestream_manager.c */; }; - 69B13723137BEF3A00C06507 /* faixbox_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B1355E137BE46700C06507 /* faixbox_manager.c */; }; - 69B13724137BEF3A00C06507 /* ihdrbox_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13560137BE46700C06507 /* ihdrbox_manager.c */; }; - 69B13725137BEF3A00C06507 /* imgreg_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13562137BE46700C06507 /* imgreg_manager.c */; }; - 69B13726137BEF3A00C06507 /* index_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13564137BE46700C06507 /* index_manager.c */; }; - 69B13727137BEF3A00C06507 /* manfbox_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13567137BE46700C06507 /* manfbox_manager.c */; }; - 69B13728137BEF3A00C06507 /* marker_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13569137BE46700C06507 /* marker_manager.c */; }; - 69B13729137BEF3A00C06507 /* metadata_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B1356B137BE46700C06507 /* metadata_manager.c */; }; - 69B1372A137BEF3A00C06507 /* mhixbox_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B1356D137BE46700C06507 /* mhixbox_manager.c */; }; - 69B1372B137BEF3A00C06507 /* msgqueue_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B1356F137BE46700C06507 /* msgqueue_manager.c */; }; - 69B1372C137BEF3A00C06507 /* placeholder_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13571137BE46700C06507 /* placeholder_manager.c */; }; - 69B1372D137BEF3A00C06507 /* target_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13573137BE46700C06507 /* target_manager.c */; }; - 69B1372E137BEF3E00C06507 /* box_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13555137BE46700C06507 /* box_manager.c */; }; - 69B1372F137BEF3E00C06507 /* boxheader_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13557137BE46700C06507 /* boxheader_manager.c */; }; - 69B13730137BEF3E00C06507 /* byte_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13559137BE46700C06507 /* byte_manager.c */; }; - 69B13731137BEF3E00C06507 /* codestream_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B1355B137BE46700C06507 /* codestream_manager.c */; }; - 69B13732137BEF3E00C06507 /* faixbox_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B1355E137BE46700C06507 /* faixbox_manager.c */; }; - 69B13733137BEF3E00C06507 /* ihdrbox_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13560137BE46700C06507 /* ihdrbox_manager.c */; }; - 69B13734137BEF3E00C06507 /* imgreg_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13562137BE46700C06507 /* imgreg_manager.c */; }; - 69B13735137BEF3E00C06507 /* index_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13564137BE46700C06507 /* index_manager.c */; }; - 69B13736137BEF3E00C06507 /* manfbox_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13567137BE46700C06507 /* manfbox_manager.c */; }; - 69B13737137BEF3E00C06507 /* marker_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13569137BE46700C06507 /* marker_manager.c */; }; - 69B13738137BEF3E00C06507 /* metadata_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B1356B137BE46700C06507 /* metadata_manager.c */; }; - 69B13739137BEF3E00C06507 /* mhixbox_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B1356D137BE46700C06507 /* mhixbox_manager.c */; }; - 69B1373A137BEF3E00C06507 /* msgqueue_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B1356F137BE46700C06507 /* msgqueue_manager.c */; }; - 69B1373B137BEF3E00C06507 /* placeholder_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13571137BE46700C06507 /* placeholder_manager.c */; }; - 69B1373C137BEF3E00C06507 /* target_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13573137BE46700C06507 /* target_manager.c */; }; - 69B13744137BEFE000C06507 /* channel_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B135A6137BE46700C06507 /* channel_manager.c */; }; - 69B13745137BEFE000C06507 /* opj_server.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B135A9137BE46700C06507 /* opj_server.c */; }; - 69B13746137BEFE000C06507 /* query_parser.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B135AA137BE46700C06507 /* query_parser.c */; }; - 69B13747137BEFE000C06507 /* session_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B135AC137BE46700C06507 /* session_manager.c */; }; - 69B1374B137BF01A00C06507 /* libopenjpip_server.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 69B136DD137BECDC00C06507 /* libopenjpip_server.a */; }; - 69B1374C137BF02500C06507 /* libopenjpip_local.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 69B13713137BEEDD00C06507 /* libopenjpip_local.a */; }; - 69B1374D137BF04B00C06507 /* cache_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13579137BE46700C06507 /* cache_manager.c */; }; - 69B1374E137BF04B00C06507 /* imgsock_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B1357B137BE46700C06507 /* imgsock_manager.c */; }; - 69B1374F137BF04B00C06507 /* jp2k_decoder.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B1357D137BE46700C06507 /* jp2k_decoder.c */; }; - 69B13750137BF04B00C06507 /* jptstream_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B1357F137BE46700C06507 /* jptstream_manager.c */; }; - 69B13751137BF04B00C06507 /* opj_dec_server.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B13582137BE46700C06507 /* opj_dec_server.c */; }; - 69B13798137BF33600C06507 /* libopenjpip_local.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 69B13713137BEEDD00C06507 /* libopenjpip_local.a */; }; - 69B13799137BF33B00C06507 /* libopenjpip_local.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 69B13713137BEEDD00C06507 /* libopenjpip_local.a */; }; - 69B1379A137BF34000C06507 /* libopenjpip_local.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 69B13713137BEEDD00C06507 /* libopenjpip_local.a */; }; - 69B1379B137BF34500C06507 /* libopenjpip_local.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 69B13713137BEEDD00C06507 /* libopenjpip_local.a */; }; - 69B1379C137BF35100C06507 /* jpt_to_j2k.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B135CA137BE46700C06507 /* jpt_to_j2k.c */; }; - 69B1379D137BF35500C06507 /* jpt_to_jp2.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B135CB137BE46700C06507 /* jpt_to_jp2.c */; }; - 69B1379E137BF35C00C06507 /* test_index.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B135CD137BE46700C06507 /* test_index.c */; }; - 69B1379F137BF36200C06507 /* addXMLinJP2.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B135B0137BE46700C06507 /* addXMLinJP2.c */; }; - 69B137A2137BF39900C06507 /* bio.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B135B2137BE46700C06507 /* bio.c */; }; - 69B137A3137BF39900C06507 /* cio.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B135B4137BE46700C06507 /* cio.c */; }; - 69B137A4137BF39900C06507 /* fix.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B135B6137BE46700C06507 /* fix.c */; }; - 69B137A5137BF39900C06507 /* index_create.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B135B8137BE46700C06507 /* index_create.c */; }; - 69B137A6137BF39900C06507 /* int.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B135B9137BE46700C06507 /* int.c */; }; - 69B137A7137BF39900C06507 /* jp2.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B135BC137BE46700C06507 /* jp2.c */; }; - 69B137A8137BF39900C06507 /* jpip.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B135BE137BE46700C06507 /* jpip.c */; }; - 69B137AA137BF39900C06507 /* pi.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B135C2137BE46700C06507 /* pi.c */; }; - 69B137AB137BF39900C06507 /* t2.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B135C4137BE46700C06507 /* t2.c */; }; - 69B137AC137BF39900C06507 /* tcd.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B135C6137BE46700C06507 /* tcd.c */; }; - 69B137AD137BF39900C06507 /* tgt.c in Sources */ = {isa = PBXBuildFile; fileRef = 69B135C8137BE46700C06507 /* tgt.c */; }; - 69F9860E0D40A7B000C2791C /* bio.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F984FF0D40A41700C2791C /* bio.c */; }; - 69F9860F0D40A7B000C2791C /* cio.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985020D40A41700C2791C /* cio.c */; }; - 69F986100D40A7B000C2791C /* dwt.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985060D40A41700C2791C /* dwt.c */; }; - 69F986110D40A7B000C2791C /* event.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985090D40A41700C2791C /* event.c */; }; - 69F986120D40A7B000C2791C /* image.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9850D0D40A41700C2791C /* image.c */; }; - 69F986130D40A7B000C2791C /* j2k.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985110D40A41700C2791C /* j2k.c */; }; - 69F986140D40A7B000C2791C /* j2k_lib.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985140D40A41700C2791C /* j2k_lib.c */; }; - 69F986150D40A7B000C2791C /* jp2.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985170D40A41700C2791C /* jp2.c */; }; - 69F986160D40A7B000C2791C /* jpt.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9851A0D40A41700C2791C /* jpt.c */; }; - 69F986170D40A7B000C2791C /* mct.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9851D0D40A41700C2791C /* mct.c */; }; - 69F986180D40A7B000C2791C /* mqc.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985200D40A41700C2791C /* mqc.c */; }; - 69F986190D40A7B000C2791C /* openjpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985230D40A41700C2791C /* openjpeg.c */; }; - 69F9861A0D40A7B000C2791C /* pi.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985280D40A41700C2791C /* pi.c */; }; - 69F9861B0D40A7B000C2791C /* raw.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9852B0D40A41700C2791C /* raw.c */; }; - 69F9861C0D40A7B000C2791C /* t1.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9852E0D40A41700C2791C /* t1.c */; }; - 69F9861E0D40A7B000C2791C /* t2.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985330D40A41700C2791C /* t2.c */; }; - 69F9861F0D40A7B000C2791C /* tcd.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985360D40A41700C2791C /* tcd.c */; }; - 69F986200D40A7B000C2791C /* tgt.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985390D40A41700C2791C /* tgt.c */; }; - 69F986210D40A7B100C2791C /* bio.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F984FF0D40A41700C2791C /* bio.c */; }; - 69F986220D40A7B100C2791C /* cio.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985020D40A41700C2791C /* cio.c */; }; - 69F986230D40A7B100C2791C /* dwt.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985060D40A41700C2791C /* dwt.c */; }; - 69F986240D40A7B100C2791C /* event.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985090D40A41700C2791C /* event.c */; }; - 69F986250D40A7B100C2791C /* image.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9850D0D40A41700C2791C /* image.c */; }; - 69F986260D40A7B100C2791C /* j2k.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985110D40A41700C2791C /* j2k.c */; }; - 69F986270D40A7B100C2791C /* j2k_lib.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985140D40A41700C2791C /* j2k_lib.c */; }; - 69F986280D40A7B100C2791C /* jp2.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985170D40A41700C2791C /* jp2.c */; }; - 69F986290D40A7B100C2791C /* jpt.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9851A0D40A41700C2791C /* jpt.c */; }; - 69F9862A0D40A7B100C2791C /* mct.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9851D0D40A41700C2791C /* mct.c */; }; - 69F9862B0D40A7B100C2791C /* mqc.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985200D40A41700C2791C /* mqc.c */; }; - 69F9862C0D40A7B100C2791C /* openjpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985230D40A41700C2791C /* openjpeg.c */; }; - 69F9862D0D40A7B100C2791C /* pi.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985280D40A41700C2791C /* pi.c */; }; - 69F9862E0D40A7B100C2791C /* raw.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9852B0D40A41700C2791C /* raw.c */; }; - 69F9862F0D40A7B100C2791C /* t1.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F9852E0D40A41700C2791C /* t1.c */; }; - 69F986310D40A7B100C2791C /* t2.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985330D40A41700C2791C /* t2.c */; }; - 69F986320D40A7B100C2791C /* tcd.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985360D40A41700C2791C /* tcd.c */; }; - 69F986330D40A7B100C2791C /* tgt.c in Sources */ = {isa = PBXBuildFile; fileRef = 69F985390D40A41700C2791C /* tgt.c */; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - 692CF264122BB2760010088E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 692CF20D122BAF7A0010088E; - remoteInfo = openjpeg_JPWL; - }; - 692CF266122BB2760010088E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 692CF23C122BB1D60010088E; - remoteInfo = JPWL_image_to_j2k; - }; - 692CF268122BB2760010088E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 692CF24A122BB2110010088E; - remoteInfo = JPWL_j2k_to_image; - }; - 692CF274122BB29A0010088E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 694039A6117B7E090079DE22; - remoteInfo = "build OPJ"; - }; - 692CF276122BB29A0010088E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 692CF258122BB2640010088E; - remoteInfo = "build OPJ_JPWL"; - }; - 6938D7E812D0F4C10017B83E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 694E0EFA12953FD2008AFCC7; - remoteInfo = "build OPJ_MJ2"; - }; - 694039AA117B7E390079DE22 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 69F985A00D40A48E00C2791C; - remoteInfo = openjpeg; - }; - 694039AC117B7E3D0079DE22 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 69F986380D40A7DA00C2791C; - remoteInfo = image_to_j2k; - }; - 694039AE117B7E420079DE22 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 69F9865B0D40A8E200C2791C; - remoteInfo = j2k_to_image; - }; - 694E0D4E12912DED008AFCC7 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 694E0D4412912A70008AFCC7; - remoteInfo = opj_config; - }; - 694E0D5012912DFE008AFCC7 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 694E0D4412912A70008AFCC7; - remoteInfo = opj_config; - }; - 694E0D5212912E09008AFCC7 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 694E0D4412912A70008AFCC7; - remoteInfo = opj_config; - }; - 694E0D5412912E0E008AFCC7 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 694E0D4412912A70008AFCC7; - remoteInfo = opj_config; - }; - 694E0D5612912E19008AFCC7 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 694E0D4412912A70008AFCC7; - remoteInfo = opj_config; - }; - 694E0D5812912E1F008AFCC7 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 694E0D4412912A70008AFCC7; - remoteInfo = opj_config; - }; - 694E0D5A12912E27008AFCC7 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 694E0D4412912A70008AFCC7; - remoteInfo = opj_config; - }; - 694E0DA312913354008AFCC7 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 694E0D99129132D7008AFCC7; - remoteInfo = j2k_dump; - }; - 694E0DAD12913478008AFCC7 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 694E0D4412912A70008AFCC7; - remoteInfo = opj_config; - }; - 694E0DCB129134F3008AFCC7 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 694E0D4412912A70008AFCC7; - remoteInfo = opj_config; - }; - 694E0DCD1291350B008AFCC7 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 69F985B50D40A63D00C2791C; - remoteInfo = opj_dynamic; - }; - 694E0DCF12913537008AFCC7 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 694E0DA81291340E008AFCC7; - remoteInfo = opj_JPWL_dynamic; - }; - 694E0EBB12953E05008AFCC7 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 694E0D4412912A70008AFCC7; - remoteInfo = opj_config; - }; - 694E0EC512953EC7008AFCC7 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 694E0D4412912A70008AFCC7; - remoteInfo = opj_config; - }; - 694E0ED412953F2B008AFCC7 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 694E0D4412912A70008AFCC7; - remoteInfo = opj_config; - }; - 694E0EEB12953F82008AFCC7 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 694E0D4412912A70008AFCC7; - remoteInfo = opj_config; - }; - 694E0EFD12953FDB008AFCC7 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 694E0EE912953F82008AFCC7; - remoteInfo = wrap_j2k_in_mj2; - }; - 694E0EFF12953FDB008AFCC7 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 694E0ED212953F2B008AFCC7; - remoteInfo = mj2_to_frames; - }; - 694E0F0112953FDB008AFCC7 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 694E0EC312953EC7008AFCC7; - remoteInfo = frames_to_mj2; - }; - 694E0F0312953FDB008AFCC7 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 694E0EB612953DF3008AFCC7; - remoteInfo = extract_j2k_from_mj2; - }; - 69B136FB137BEE3700C06507 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 69B136DC137BECDC00C06507 /* openjpip_static */; - remoteInfo = openjpip_static; - }; - 69B136FD137BEE3C00C06507 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 69B136E3137BED3400C06507 /* opj_server */; - remoteInfo = opj_server; - }; - 69B136FF137BEE4000C06507 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 69B136EA137BED4A00C06507 /* opj_dec_server */; - remoteInfo = opj_dec_server; - }; - 69B13703137BEE5A00C06507 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 69B136F8137BEE2C00C06507 /* build openjpip */; - remoteInfo = "build openjpip"; - }; - 69B13788137BF2E500C06507 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 69B13780137BF2CE00C06507 /* index_create */; - remoteInfo = index_create; - }; - 69B1378A137BF2E500C06507 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 69B13772137BF2A900C06507 /* test_index */; - remoteInfo = test_index; - }; - 69B1378C137BF2E500C06507 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 69B1376B137BF29500C06507 /* addXMLinJP2 */; - remoteInfo = addXMLinJP2; - }; - 69B1378E137BF2E500C06507 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 69B13764137BF27B00C06507 /* jpt_to_jp2 */; - remoteInfo = jpt_to_jp2; - }; - 69B13790137BF2E500C06507 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 69B1375D137BF26900C06507 /* jpt_to_j2k */; - remoteInfo = jpt_to_j2k; - }; - 69B13792137BF2F700C06507 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 69B13785137BF2DE00C06507 /* opj_tools */; - remoteInfo = opj_tools; - }; - 69B137B3137BF40B00C06507 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 69F984A80D40A3AE00C2791C /* Project object */; - proxyType = 1; - remoteGlobalIDString = 69B13712137BEEDD00C06507 /* openjpip_local */; - remoteInfo = openjpip_local; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXFileReference section */ - 692CF20E122BAF7A0010088E /* libopenjpeg_JPWL.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libopenjpeg_JPWL.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 692CF247122BB1D60010088E /* JPWL_image_to_j2k */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = JPWL_image_to_j2k; sourceTree = BUILT_PRODUCTS_DIR; }; - 692CF255122BB2110010088E /* JPWL_j2k_to_image */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = JPWL_j2k_to_image; sourceTree = BUILT_PRODUCTS_DIR; }; - 694E0D40129129D3008AFCC7 /* opj_config.h.in.user */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = opj_config.h.in.user; sourceTree = ""; }; - 694E0D8512913100008AFCC7 /* opj_config.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = opj_config.h; sourceTree = ""; }; - 694E0D9A129132D7008AFCC7 /* j2k_dump */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = j2k_dump; sourceTree = BUILT_PRODUCTS_DIR; }; - 694E0DA91291340E008AFCC7 /* libopenjpeg_JPWL.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libopenjpeg_JPWL.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; - 694E0EB712953DF3008AFCC7 /* extract_j2k_from_mj2 */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = extract_j2k_from_mj2; sourceTree = BUILT_PRODUCTS_DIR; }; - 694E0ECD12953EC7008AFCC7 /* frames_to_mj2 */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = frames_to_mj2; sourceTree = BUILT_PRODUCTS_DIR; }; - 694E0EDC12953F2B008AFCC7 /* mj2_to_frames */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = mj2_to_frames; sourceTree = BUILT_PRODUCTS_DIR; }; - 694E0EF312953F82008AFCC7 /* wrap_j2k_in_mj2 */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = wrap_j2k_in_mj2; sourceTree = BUILT_PRODUCTS_DIR; }; - 6975151C127D722900CAD463 /* INSTALL */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = INSTALL; sourceTree = ""; }; - 697D95B3125B3C7500FFCE8E /* image_to_j2k.1 */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.man; path = image_to_j2k.1; sourceTree = ""; }; - 697D95B4125B3C7500FFCE8E /* j2k_dump.1 */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.man; path = j2k_dump.1; sourceTree = ""; }; - 697D95B5125B3C7500FFCE8E /* j2k_to_image.1 */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.man; path = j2k_to_image.1; sourceTree = ""; }; - 697D95B7125B3C7500FFCE8E /* libopenjpeg.3 */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = libopenjpeg.3; sourceTree = ""; }; - 697D965A1262643900FFCE8E /* CHANGES */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = CHANGES; sourceTree = ""; }; - 69B13523137BE46700C06507 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = ""; }; - 69B13524137BE46700C06507 /* convert.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = convert.c; sourceTree = ""; }; - 69B13525137BE46700C06507 /* convert.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = convert.h; sourceTree = ""; }; - 69B13526137BE46700C06507 /* image_to_j2k.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = image_to_j2k.c; sourceTree = ""; }; - 69B13527137BE46700C06507 /* index.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = index.c; sourceTree = ""; }; - 69B13528137BE46700C06507 /* index.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = index.h; sourceTree = ""; }; - 69B13529137BE46700C06507 /* j2k_dump.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = j2k_dump.c; sourceTree = ""; }; - 69B1352A137BE46700C06507 /* j2k_to_image.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = j2k_to_image.c; sourceTree = ""; }; - 69B1352B137BE46700C06507 /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = Makefile.am; sourceTree = ""; }; - 69B1352C137BE46700C06507 /* Makefile.nix */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = Makefile.nix; sourceTree = ""; }; - 69B1352D137BE46700C06507 /* README */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = README; sourceTree = ""; }; - 69B1352E137BE46700C06507 /* windirent.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = windirent.h; sourceTree = ""; }; - 69B13530137BE46700C06507 /* color.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = color.c; sourceTree = ""; }; - 69B13531137BE46700C06507 /* color.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = color.h; sourceTree = ""; }; - 69B13532137BE46700C06507 /* format_defs.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = format_defs.h; sourceTree = ""; }; - 69B13533137BE46700C06507 /* getopt.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = getopt.c; sourceTree = ""; }; - 69B13534137BE46700C06507 /* getopt.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = getopt.h; sourceTree = ""; }; - 69B13536137BE46700C06507 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = ""; }; - 69B13539137BE46700C06507 /* jawt.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = jawt.h; sourceTree = ""; }; - 69B1353A137BE46700C06507 /* jdwpTransport.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = jdwpTransport.h; sourceTree = ""; }; - 69B1353B137BE46700C06507 /* jni.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = jni.h; sourceTree = ""; }; - 69B1353C137BE46700C06507 /* jvmdi.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = jvmdi.h; sourceTree = ""; }; - 69B1353D137BE46700C06507 /* jvmpi.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = jvmpi.h; sourceTree = ""; }; - 69B1353E137BE46700C06507 /* jvmti.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = jvmti.h; sourceTree = ""; }; - 69B13540137BE46700C06507 /* jawt_md.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = jawt_md.h; sourceTree = ""; }; - 69B13541137BE46700C06507 /* jni_md.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = jni_md.h; sourceTree = ""; }; - 69B13543137BE46700C06507 /* jvm.lib */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = jvm.lib; sourceTree = ""; }; - 69B13547137BE46700C06507 /* OpenJPEGJavaDecoder.java */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.java; path = OpenJPEGJavaDecoder.java; sourceTree = ""; }; - 69B13548137BE46700C06507 /* OpenJPEGJavaEncoder.java */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.java; path = OpenJPEGJavaEncoder.java; sourceTree = ""; }; - 69B13549137BE46700C06507 /* JavaOpenJPEG.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = JavaOpenJPEG.c; sourceTree = ""; }; - 69B1354A137BE46700C06507 /* JavaOpenJPEGDecoder.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = JavaOpenJPEGDecoder.c; sourceTree = ""; }; - 69B1354B137BE46700C06507 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; - 69B1354C137BE46700C06507 /* org_openJpeg_OpenJPEGJavaDecoder.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = org_openJpeg_OpenJPEGJavaDecoder.h; sourceTree = ""; }; - 69B1354D137BE46700C06507 /* org_openJpeg_OpenJPEGJavaEncoder.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = org_openJpeg_OpenJPEGJavaEncoder.h; sourceTree = ""; }; - 69B1354F137BE46700C06507 /* CHANGES */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = CHANGES; sourceTree = ""; }; - 69B13551137BE46700C06507 /* Doxyfile */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = Doxyfile; sourceTree = ""; }; - 69B13552137BE46700C06507 /* jpip_protocol.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = jpip_protocol.png; sourceTree = ""; }; - 69B13554137BE46700C06507 /* bool.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = bool.h; sourceTree = ""; }; - 69B13555137BE46700C06507 /* box_manager.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = box_manager.c; sourceTree = ""; }; - 69B13556137BE46700C06507 /* box_manager.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = box_manager.h; sourceTree = ""; }; - 69B13557137BE46700C06507 /* boxheader_manager.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = boxheader_manager.c; sourceTree = ""; }; - 69B13558137BE46700C06507 /* boxheader_manager.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = boxheader_manager.h; sourceTree = ""; }; - 69B13559137BE46700C06507 /* byte_manager.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = byte_manager.c; sourceTree = ""; }; - 69B1355A137BE46700C06507 /* byte_manager.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = byte_manager.h; sourceTree = ""; }; - 69B1355B137BE46700C06507 /* codestream_manager.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = codestream_manager.c; sourceTree = ""; }; - 69B1355C137BE46700C06507 /* codestream_manager.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = codestream_manager.h; sourceTree = ""; }; - 69B1355D137BE46700C06507 /* comMakefile.mk */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = comMakefile.mk; sourceTree = ""; }; - 69B1355E137BE46700C06507 /* faixbox_manager.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = faixbox_manager.c; sourceTree = ""; }; - 69B1355F137BE46700C06507 /* faixbox_manager.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = faixbox_manager.h; sourceTree = ""; }; - 69B13560137BE46700C06507 /* ihdrbox_manager.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = ihdrbox_manager.c; sourceTree = ""; }; - 69B13561137BE46700C06507 /* ihdrbox_manager.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = ihdrbox_manager.h; sourceTree = ""; }; - 69B13562137BE46700C06507 /* imgreg_manager.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = imgreg_manager.c; sourceTree = ""; }; - 69B13563137BE46700C06507 /* imgreg_manager.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = imgreg_manager.h; sourceTree = ""; }; - 69B13564137BE46700C06507 /* index_manager.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = index_manager.c; sourceTree = ""; }; - 69B13565137BE46700C06507 /* index_manager.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = index_manager.h; sourceTree = ""; }; - 69B13566137BE46700C06507 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; - 69B13567137BE46700C06507 /* manfbox_manager.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = manfbox_manager.c; sourceTree = ""; }; - 69B13568137BE46700C06507 /* manfbox_manager.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = manfbox_manager.h; sourceTree = ""; }; - 69B13569137BE46700C06507 /* marker_manager.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = marker_manager.c; sourceTree = ""; }; - 69B1356A137BE46700C06507 /* marker_manager.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = marker_manager.h; sourceTree = ""; }; - 69B1356B137BE46700C06507 /* metadata_manager.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = metadata_manager.c; sourceTree = ""; }; - 69B1356C137BE46700C06507 /* metadata_manager.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = metadata_manager.h; sourceTree = ""; }; - 69B1356D137BE46700C06507 /* mhixbox_manager.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = mhixbox_manager.c; sourceTree = ""; }; - 69B1356E137BE46700C06507 /* mhixbox_manager.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = mhixbox_manager.h; sourceTree = ""; }; - 69B1356F137BE46700C06507 /* msgqueue_manager.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = msgqueue_manager.c; sourceTree = ""; }; - 69B13570137BE46700C06507 /* msgqueue_manager.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = msgqueue_manager.h; sourceTree = ""; }; - 69B13571137BE46700C06507 /* placeholder_manager.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = placeholder_manager.c; sourceTree = ""; }; - 69B13572137BE46700C06507 /* placeholder_manager.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = placeholder_manager.h; sourceTree = ""; }; - 69B13573137BE46700C06507 /* target_manager.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = target_manager.c; sourceTree = ""; }; - 69B13574137BE46700C06507 /* target_manager.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = target_manager.h; sourceTree = ""; }; - 69B13575137BE46700C06507 /* mainpage.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = mainpage.h; sourceTree = ""; }; - 69B13576137BE46700C06507 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; - 69B13579137BE46700C06507 /* cache_manager.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = cache_manager.c; sourceTree = ""; }; - 69B1357A137BE46700C06507 /* cache_manager.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = cache_manager.h; sourceTree = ""; }; - 69B1357B137BE46700C06507 /* imgsock_manager.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = imgsock_manager.c; sourceTree = ""; }; - 69B1357C137BE46700C06507 /* imgsock_manager.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = imgsock_manager.h; sourceTree = ""; }; - 69B1357D137BE46700C06507 /* jp2k_decoder.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = jp2k_decoder.c; sourceTree = ""; }; - 69B1357E137BE46700C06507 /* jp2k_decoder.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = jp2k_decoder.h; sourceTree = ""; }; - 69B1357F137BE46700C06507 /* jptstream_manager.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = jptstream_manager.c; sourceTree = ""; }; - 69B13580137BE46700C06507 /* jptstream_manager.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = jptstream_manager.h; sourceTree = ""; }; - 69B13581137BE46700C06507 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; - 69B13582137BE46700C06507 /* opj_dec_server.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = opj_dec_server.c; sourceTree = ""; }; - 69B13584137BE46700C06507 /* build.xml */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xml; path = build.xml; sourceTree = ""; }; - 69B13586137BE46700C06507 /* manifest.txt */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = manifest.txt; sourceTree = ""; }; - 69B13587137BE46700C06507 /* opj_viewer-20110510.jar */ = {isa = PBXFileReference; lastKnownFileType = archive.jar; path = "opj_viewer-20110510.jar"; sourceTree = ""; }; - 69B13588137BE46700C06507 /* opj_viewer.jar */ = {isa = PBXFileReference; lastKnownFileType = archive.jar; path = opj_viewer.jar; sourceTree = ""; }; - 69B1358A137BE46700C06507 /* ImageManager.java */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.java; path = ImageManager.java; sourceTree = ""; }; - 69B1358B137BE46700C06507 /* ImageViewer.java */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.java; path = ImageViewer.java; sourceTree = ""; }; - 69B1358C137BE46700C06507 /* ImageWindow.java */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.java; path = ImageWindow.java; sourceTree = ""; }; - 69B1358D137BE46700C06507 /* ImgdecClient.java */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.java; path = ImgdecClient.java; sourceTree = ""; }; - 69B1358E137BE46700C06507 /* JPIPHttpClient.java */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.java; path = JPIPHttpClient.java; sourceTree = ""; }; - 69B1358F137BE46700C06507 /* MML.java */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.java; path = MML.java; sourceTree = ""; }; - 69B13590137BE46700C06507 /* PnmImage.java */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.java; path = PnmImage.java; sourceTree = ""; }; - 69B13591137BE46700C06507 /* RegimViewer.java */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.java; path = RegimViewer.java; sourceTree = ""; }; - 69B13592137BE46700C06507 /* ResizeListener.java */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.java; path = ResizeListener.java; sourceTree = ""; }; - 69B13594137BE46700C06507 /* build.xml */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.xml; path = build.xml; sourceTree = ""; }; - 69B13596137BE46700C06507 /* manifest.txt */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = manifest.txt; sourceTree = ""; }; - 69B13597137BE46700C06507 /* opj_viewer_xerces-20110510.jar */ = {isa = PBXFileReference; lastKnownFileType = archive.jar; path = "opj_viewer_xerces-20110510.jar"; sourceTree = ""; }; - 69B13598137BE46700C06507 /* opj_viewer_xerces.jar */ = {isa = PBXFileReference; lastKnownFileType = archive.jar; path = opj_viewer_xerces.jar; sourceTree = ""; }; - 69B1359A137BE46700C06507 /* ImageManager.java */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.java; path = ImageManager.java; sourceTree = ""; }; - 69B1359B137BE46700C06507 /* ImageViewer.java */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.java; path = ImageViewer.java; sourceTree = ""; }; - 69B1359C137BE46700C06507 /* ImageWindow.java */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.java; path = ImageWindow.java; sourceTree = ""; }; - 69B1359D137BE46700C06507 /* ImgdecClient.java */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.java; path = ImgdecClient.java; sourceTree = ""; }; - 69B1359E137BE46700C06507 /* JP2XMLparser.java */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.java; path = JP2XMLparser.java; sourceTree = ""; }; - 69B1359F137BE46700C06507 /* JPIPHttpClient.java */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.java; path = JPIPHttpClient.java; sourceTree = ""; }; - 69B135A0137BE46700C06507 /* MML.java */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.java; path = MML.java; sourceTree = ""; }; - 69B135A1137BE46700C06507 /* OptionPanel.java */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.java; path = OptionPanel.java; sourceTree = ""; }; - 69B135A2137BE46700C06507 /* PnmImage.java */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.java; path = PnmImage.java; sourceTree = ""; }; - 69B135A3137BE46700C06507 /* RegimViewer.java */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.java; path = RegimViewer.java; sourceTree = ""; }; - 69B135A4137BE46700C06507 /* ResizeListener.java */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.java; path = ResizeListener.java; sourceTree = ""; }; - 69B135A6137BE46700C06507 /* channel_manager.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = channel_manager.c; sourceTree = ""; }; - 69B135A7137BE46700C06507 /* channel_manager.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = channel_manager.h; sourceTree = ""; }; - 69B135A8137BE46700C06507 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; - 69B135A9137BE46700C06507 /* opj_server.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = opj_server.c; sourceTree = ""; }; - 69B135AA137BE46700C06507 /* query_parser.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = query_parser.c; sourceTree = ""; }; - 69B135AB137BE46700C06507 /* query_parser.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = query_parser.h; sourceTree = ""; }; - 69B135AC137BE46700C06507 /* session_manager.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = session_manager.c; sourceTree = ""; }; - 69B135AD137BE46700C06507 /* session_manager.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = session_manager.h; sourceTree = ""; }; - 69B135AE137BE46700C06507 /* README */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = README; sourceTree = ""; }; - 69B135B0137BE46700C06507 /* addXMLinJP2.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = addXMLinJP2.c; sourceTree = ""; }; - 69B135B2137BE46700C06507 /* bio.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = bio.c; sourceTree = ""; }; - 69B135B3137BE46700C06507 /* bio.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = bio.h; sourceTree = ""; }; - 69B135B4137BE46700C06507 /* cio.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = cio.c; sourceTree = ""; }; - 69B135B5137BE46700C06507 /* cio.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = cio.h; sourceTree = ""; }; - 69B135B6137BE46700C06507 /* fix.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = fix.c; sourceTree = ""; }; - 69B135B7137BE46700C06507 /* fix.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = fix.h; sourceTree = ""; }; - 69B135B8137BE46700C06507 /* index_create.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = index_create.c; sourceTree = ""; }; - 69B135B9137BE46700C06507 /* int.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = int.c; sourceTree = ""; }; - 69B135BA137BE46700C06507 /* int.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = int.h; sourceTree = ""; }; - 69B135BB137BE46700C06507 /* j2k.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = j2k.h; sourceTree = ""; }; - 69B135BC137BE46700C06507 /* jp2.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = jp2.c; sourceTree = ""; }; - 69B135BD137BE46700C06507 /* jp2.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = jp2.h; sourceTree = ""; }; - 69B135BE137BE46700C06507 /* jpip.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = jpip.c; sourceTree = ""; }; - 69B135BF137BE46700C06507 /* jpip.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = jpip.h; sourceTree = ""; }; - 69B135C0137BE46700C06507 /* jpt.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = jpt.c; sourceTree = ""; }; - 69B135C1137BE46700C06507 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; - 69B135C2137BE46700C06507 /* pi.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = pi.c; sourceTree = ""; }; - 69B135C3137BE46700C06507 /* pi.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = pi.h; sourceTree = ""; }; - 69B135C4137BE46700C06507 /* t2.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = t2.c; sourceTree = ""; }; - 69B135C5137BE46700C06507 /* t2.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = t2.h; sourceTree = ""; }; - 69B135C6137BE46700C06507 /* tcd.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = tcd.c; sourceTree = ""; }; - 69B135C7137BE46700C06507 /* tcd.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = tcd.h; sourceTree = ""; }; - 69B135C8137BE46700C06507 /* tgt.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = tgt.c; sourceTree = ""; }; - 69B135C9137BE46700C06507 /* tgt.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = tgt.h; sourceTree = ""; }; - 69B135CA137BE46700C06507 /* jpt_to_j2k.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = jpt_to_j2k.c; sourceTree = ""; }; - 69B135CB137BE46700C06507 /* jpt_to_jp2.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = jpt_to_jp2.c; sourceTree = ""; }; - 69B135CC137BE46700C06507 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; - 69B135CD137BE46700C06507 /* test_index.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = test_index.c; sourceTree = ""; }; - 69B135D0137BE46700C06507 /* extract_j2k_from_mj2.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = extract_j2k_from_mj2.c; sourceTree = ""; }; - 69B135D1137BE46700C06507 /* frames_to_mj2.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = frames_to_mj2.c; sourceTree = ""; }; - 69B135D4137BE46700C06507 /* meta_out.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = meta_out.c; sourceTree = ""; }; - 69B135D5137BE46700C06507 /* meta_out.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = meta_out.h; sourceTree = ""; }; - 69B135D6137BE46700C06507 /* mj2.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = mj2.c; sourceTree = ""; }; - 69B135D7137BE46700C06507 /* mj2.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = mj2.h; sourceTree = ""; }; - 69B135D8137BE46700C06507 /* mj2_convert.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = mj2_convert.c; sourceTree = ""; }; - 69B135D9137BE46700C06507 /* mj2_convert.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = mj2_convert.h; sourceTree = ""; }; - 69B135DA137BE46700C06507 /* mj2_to_frames.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = mj2_to_frames.c; sourceTree = ""; }; - 69B135DB137BE46700C06507 /* mj2_to_metadata.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = mj2_to_metadata.c; sourceTree = ""; }; - 69B135DD137BE46700C06507 /* mj2_to_metadata.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = mj2_to_metadata.h; sourceTree = ""; }; - 69B135E2137BE46700C06507 /* wrap_j2k_in_mj2.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = wrap_j2k_in_mj2.c; sourceTree = ""; }; - 69B135E5137BE46700C06507 /* about.htm */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.html; path = about.htm; sourceTree = ""; }; - 69B135E6137BE46700C06507 /* opj_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = opj_logo.png; sourceTree = ""; }; - 69B135E7137BE46700C06507 /* buildupdate.bat */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = buildupdate.bat; sourceTree = ""; }; - 69B135E8137BE46700C06507 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; - 69B135E9137BE46700C06507 /* OPJViewer.dsp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = OPJViewer.dsp; sourceTree = ""; }; - 69B135EA137BE46700C06507 /* OPJViewer.dsw */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = OPJViewer.dsw; sourceTree = ""; }; - 69B135EB137BE46700C06507 /* OPJViewer.iss */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = OPJViewer.iss; sourceTree = ""; }; - 69B135EC137BE46700C06507 /* Readme.txt */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = Readme.txt; sourceTree = ""; }; - 69B135EE137BE46700C06507 /* about_htm.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = about_htm.h; sourceTree = ""; }; - 69B135EF137BE46700C06507 /* build.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = build.h; sourceTree = ""; }; - 69B135F0137BE46700C06507 /* icon1.xpm */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = icon1.xpm; sourceTree = ""; }; - 69B135F1137BE46700C06507 /* icon2.xpm */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = icon2.xpm; sourceTree = ""; }; - 69B135F2137BE46700C06507 /* icon3.xpm */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = icon3.xpm; sourceTree = ""; }; - 69B135F3137BE46700C06507 /* icon4.xpm */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = icon4.xpm; sourceTree = ""; }; - 69B135F4137BE46700C06507 /* icon5.xpm */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = icon5.xpm; sourceTree = ""; }; - 69B135F5137BE46700C06507 /* imagjpeg2000.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; path = imagjpeg2000.cpp; sourceTree = ""; }; - 69B135F6137BE46700C06507 /* imagjpeg2000.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = imagjpeg2000.h; sourceTree = ""; }; - 69B135F7137BE46700C06507 /* imagmxf.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; path = imagmxf.cpp; sourceTree = ""; }; - 69B135F8137BE46700C06507 /* imagmxf.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = imagmxf.h; sourceTree = ""; }; - 69B135F9137BE46700C06507 /* license.txt */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = license.txt; sourceTree = ""; }; - 69B135FA137BE46700C06507 /* opj_logo.xpm */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = opj_logo.xpm; sourceTree = ""; }; - 69B135FB137BE46700C06507 /* OPJAbout.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; path = OPJAbout.cpp; sourceTree = ""; }; - 69B135FC137BE46700C06507 /* OPJChild.ico */ = {isa = PBXFileReference; lastKnownFileType = image.ico; path = OPJChild.ico; sourceTree = ""; }; - 69B135FD137BE46700C06507 /* OPJChild16.xpm */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = OPJChild16.xpm; sourceTree = ""; }; - 69B135FE137BE46700C06507 /* OPJDialogs.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; path = OPJDialogs.cpp; sourceTree = ""; }; - 69B135FF137BE46700C06507 /* OPJThreads.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; path = OPJThreads.cpp; sourceTree = ""; }; - 69B13600137BE46700C06507 /* OPJViewer.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; path = OPJViewer.cpp; sourceTree = ""; }; - 69B13601137BE46700C06507 /* OPJViewer.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = OPJViewer.h; sourceTree = ""; }; - 69B13602137BE46700C06507 /* OPJViewer.ico */ = {isa = PBXFileReference; lastKnownFileType = image.ico; path = OPJViewer.ico; sourceTree = ""; }; - 69B13603137BE46700C06507 /* OPJViewer.rc */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = OPJViewer.rc; sourceTree = ""; }; - 69B13604137BE46700C06507 /* OPJViewer16.xpm */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = OPJViewer16.xpm; sourceTree = ""; }; - 69B13605137BE46700C06507 /* readmeafter.txt */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = readmeafter.txt; sourceTree = ""; }; - 69B13606137BE46700C06507 /* readmebefore.txt */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = readmebefore.txt; sourceTree = ""; }; - 69B13607137BE46700C06507 /* wxj2kparser.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; path = wxj2kparser.cpp; sourceTree = ""; }; - 69B13608137BE46700C06507 /* wxjp2parser.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; path = wxjp2parser.cpp; sourceTree = ""; }; - 69B13620137BE5FD00C06507 /* crc.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = crc.c; sourceTree = ""; }; - 69B13621137BE5FD00C06507 /* crc.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = crc.h; sourceTree = ""; }; - 69B13622137BE5FD00C06507 /* jpwl.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = jpwl.c; sourceTree = ""; }; - 69B13623137BE5FD00C06507 /* jpwl.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = jpwl.h; sourceTree = ""; }; - 69B13624137BE5FD00C06507 /* jpwl_lib.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = jpwl_lib.c; sourceTree = ""; }; - 69B13628137BE5FD00C06507 /* rs.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = rs.c; sourceTree = ""; }; - 69B13629137BE5FD00C06507 /* rs.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = rs.h; sourceTree = ""; }; - 69B136DD137BECDC00C06507 /* libopenjpip_server.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libopenjpip_server.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 69B136E4137BED3400C06507 /* opj_server */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = opj_server; sourceTree = BUILT_PRODUCTS_DIR; }; - 69B136EB137BED4A00C06507 /* opj_dec_server */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = opj_dec_server; sourceTree = BUILT_PRODUCTS_DIR; }; - 69B13713137BEEDD00C06507 /* libopenjpip_local.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libopenjpip_local.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 69B1375E137BF26900C06507 /* jpt_to_j2k */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jpt_to_j2k; sourceTree = BUILT_PRODUCTS_DIR; }; - 69B13765137BF27B00C06507 /* jpt_to_jp2 */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jpt_to_jp2; sourceTree = BUILT_PRODUCTS_DIR; }; - 69B1376C137BF29500C06507 /* addXMLinJP2 */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = addXMLinJP2; sourceTree = BUILT_PRODUCTS_DIR; }; - 69B13773137BF2A900C06507 /* test_index */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = test_index; sourceTree = BUILT_PRODUCTS_DIR; }; - 69B13781137BF2CE00C06507 /* index_create */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = index_create; sourceTree = BUILT_PRODUCTS_DIR; }; - 69F984D10D40A41700C2791C /* Doxyfile.dox */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = Doxyfile.dox; sourceTree = ""; }; - 69F984FF0D40A41700C2791C /* bio.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = bio.c; sourceTree = ""; }; - 69F985000D40A41700C2791C /* bio.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = bio.h; sourceTree = ""; }; - 69F985020D40A41700C2791C /* cio.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = cio.c; sourceTree = ""; }; - 69F985030D40A41700C2791C /* cio.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = cio.h; sourceTree = ""; }; - 69F985060D40A41700C2791C /* dwt.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = dwt.c; sourceTree = ""; }; - 69F985070D40A41700C2791C /* dwt.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = dwt.h; sourceTree = ""; }; - 69F985090D40A41700C2791C /* event.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = event.c; sourceTree = ""; }; - 69F9850A0D40A41700C2791C /* event.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = event.h; sourceTree = ""; }; - 69F9850C0D40A41700C2791C /* fix.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = fix.h; sourceTree = ""; }; - 69F9850D0D40A41700C2791C /* image.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = image.c; sourceTree = ""; }; - 69F9850E0D40A41700C2791C /* image.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = image.h; sourceTree = ""; }; - 69F985100D40A41700C2791C /* int.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = int.h; sourceTree = ""; }; - 69F985110D40A41700C2791C /* j2k.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = j2k.c; sourceTree = ""; }; - 69F985120D40A41700C2791C /* j2k.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = j2k.h; sourceTree = ""; }; - 69F985140D40A41700C2791C /* j2k_lib.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = j2k_lib.c; sourceTree = ""; }; - 69F985150D40A41700C2791C /* j2k_lib.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = j2k_lib.h; sourceTree = ""; }; - 69F985170D40A41700C2791C /* jp2.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = jp2.c; sourceTree = ""; }; - 69F985180D40A41700C2791C /* jp2.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = jp2.h; sourceTree = ""; }; - 69F9851A0D40A41700C2791C /* jpt.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = jpt.c; sourceTree = ""; }; - 69F9851B0D40A41700C2791C /* jpt.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = jpt.h; sourceTree = ""; }; - 69F9851D0D40A41700C2791C /* mct.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = mct.c; sourceTree = ""; }; - 69F9851E0D40A41700C2791C /* mct.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = mct.h; sourceTree = ""; }; - 69F985200D40A41700C2791C /* mqc.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = mqc.c; sourceTree = ""; }; - 69F985210D40A41700C2791C /* mqc.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = mqc.h; sourceTree = ""; }; - 69F985230D40A41700C2791C /* openjpeg.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = openjpeg.c; sourceTree = ""; }; - 69F985240D40A41700C2791C /* openjpeg.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = openjpeg.h; sourceTree = ""; }; - 69F985260D40A41700C2791C /* opj_includes.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = opj_includes.h; sourceTree = ""; }; - 69F985270D40A41700C2791C /* opj_malloc.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = opj_malloc.h; sourceTree = ""; }; - 69F985280D40A41700C2791C /* pi.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = pi.c; sourceTree = ""; }; - 69F985290D40A41700C2791C /* pi.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = pi.h; sourceTree = ""; }; - 69F9852B0D40A41700C2791C /* raw.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = raw.c; sourceTree = ""; }; - 69F9852C0D40A41700C2791C /* raw.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = raw.h; sourceTree = ""; }; - 69F9852E0D40A41700C2791C /* t1.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = t1.c; sourceTree = ""; }; - 69F9852F0D40A41700C2791C /* t1.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = t1.h; sourceTree = ""; }; - 69F985320D40A41700C2791C /* t1_luts.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = t1_luts.h; sourceTree = ""; }; - 69F985330D40A41700C2791C /* t2.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = t2.c; sourceTree = ""; }; - 69F985340D40A41700C2791C /* t2.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = t2.h; sourceTree = ""; }; - 69F985360D40A41700C2791C /* tcd.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = tcd.c; sourceTree = ""; }; - 69F985370D40A41700C2791C /* tcd.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = tcd.h; sourceTree = ""; }; - 69F985390D40A41700C2791C /* tgt.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = tgt.c; sourceTree = ""; }; - 69F9853A0D40A41700C2791C /* tgt.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = tgt.h; sourceTree = ""; }; - 69F985A10D40A48E00C2791C /* libopenjpeg.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libopenjpeg.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 69F985B60D40A63D00C2791C /* libopenjpeg.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libopenjpeg.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; - 69F986390D40A7DA00C2791C /* image_to_j2k */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = image_to_j2k; sourceTree = BUILT_PRODUCTS_DIR; }; - 69F9865C0D40A8E200C2791C /* j2k_to_image */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = j2k_to_image; sourceTree = BUILT_PRODUCTS_DIR; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 69B136E2137BED3400C06507 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 69B1374B137BF01A00C06507 /* libopenjpip_server.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 69B136E9137BED4A00C06507 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 69B1374C137BF02500C06507 /* libopenjpip_local.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 69B1375C137BF26900C06507 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 69B13798137BF33600C06507 /* libopenjpip_local.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 69B13763137BF27B00C06507 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 69B13799137BF33B00C06507 /* libopenjpip_local.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 69B1376A137BF29500C06507 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 69B1379A137BF34000C06507 /* libopenjpip_local.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 69B13771137BF2A900C06507 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 69B1379B137BF34500C06507 /* libopenjpip_local.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 697D95B1125B3C7500FFCE8E /* man */ = { - isa = PBXGroup; - children = ( - 697D95B2125B3C7500FFCE8E /* man1 */, - 697D95B6125B3C7500FFCE8E /* man3 */, - ); - path = man; - sourceTree = ""; - }; - 697D95B2125B3C7500FFCE8E /* man1 */ = { - isa = PBXGroup; - children = ( - 697D95B3125B3C7500FFCE8E /* image_to_j2k.1 */, - 697D95B4125B3C7500FFCE8E /* j2k_dump.1 */, - 697D95B5125B3C7500FFCE8E /* j2k_to_image.1 */, - ); - path = man1; - sourceTree = ""; - }; - 697D95B6125B3C7500FFCE8E /* man3 */ = { - isa = PBXGroup; - children = ( - 697D95B7125B3C7500FFCE8E /* libopenjpeg.3 */, - ); - path = man3; - sourceTree = ""; - }; - 69B13520137BE46700C06507 /* applications */ = { - isa = PBXGroup; - children = ( - 69B13522137BE46700C06507 /* codec */, - 69B1352F137BE46700C06507 /* common */, - 69B13535137BE46700C06507 /* JavaOpenJPEG */, - 69B1354E137BE46700C06507 /* jpip */, - 69B135CE137BE46700C06507 /* mj2 */, - 69B135E3137BE46700C06507 /* OPJViewer */, - ); - path = applications; - sourceTree = ""; - }; - 69B13522137BE46700C06507 /* codec */ = { - isa = PBXGroup; - children = ( - 69B13523137BE46700C06507 /* CMakeLists.txt */, - 69B13524137BE46700C06507 /* convert.c */, - 69B13525137BE46700C06507 /* convert.h */, - 69B13526137BE46700C06507 /* image_to_j2k.c */, - 69B13527137BE46700C06507 /* index.c */, - 69B13528137BE46700C06507 /* index.h */, - 69B13529137BE46700C06507 /* j2k_dump.c */, - 69B1352A137BE46700C06507 /* j2k_to_image.c */, - 69B1352B137BE46700C06507 /* Makefile.am */, - 69B1352C137BE46700C06507 /* Makefile.nix */, - 69B1352D137BE46700C06507 /* README */, - 69B1352E137BE46700C06507 /* windirent.h */, - ); - path = codec; - sourceTree = ""; - }; - 69B1352F137BE46700C06507 /* common */ = { - isa = PBXGroup; - children = ( - 69B13530137BE46700C06507 /* color.c */, - 69B13531137BE46700C06507 /* color.h */, - 69B13532137BE46700C06507 /* format_defs.h */, - 69B13533137BE46700C06507 /* getopt.c */, - 69B13534137BE46700C06507 /* getopt.h */, - ); - path = common; - sourceTree = ""; - }; - 69B13535137BE46700C06507 /* JavaOpenJPEG */ = { - isa = PBXGroup; - children = ( - 69B13536137BE46700C06507 /* CMakeLists.txt */, - 69B13537137BE46700C06507 /* java-jni */, - 69B13544137BE46700C06507 /* java-sources */, - 69B13549137BE46700C06507 /* JavaOpenJPEG.c */, - 69B1354A137BE46700C06507 /* JavaOpenJPEGDecoder.c */, - 69B1354B137BE46700C06507 /* Makefile */, - 69B1354C137BE46700C06507 /* org_openJpeg_OpenJPEGJavaDecoder.h */, - 69B1354D137BE46700C06507 /* org_openJpeg_OpenJPEGJavaEncoder.h */, - ); - path = JavaOpenJPEG; - sourceTree = ""; - }; - 69B13537137BE46700C06507 /* java-jni */ = { - isa = PBXGroup; - children = ( - 69B13538137BE46700C06507 /* include */, - 69B13542137BE46700C06507 /* lib */, - ); - path = "java-jni"; - sourceTree = ""; - }; - 69B13538137BE46700C06507 /* include */ = { - isa = PBXGroup; - children = ( - 69B13539137BE46700C06507 /* jawt.h */, - 69B1353A137BE46700C06507 /* jdwpTransport.h */, - 69B1353B137BE46700C06507 /* jni.h */, - 69B1353C137BE46700C06507 /* jvmdi.h */, - 69B1353D137BE46700C06507 /* jvmpi.h */, - 69B1353E137BE46700C06507 /* jvmti.h */, - 69B1353F137BE46700C06507 /* win32 */, - ); - path = include; - sourceTree = ""; - }; - 69B1353F137BE46700C06507 /* win32 */ = { - isa = PBXGroup; - children = ( - 69B13540137BE46700C06507 /* jawt_md.h */, - 69B13541137BE46700C06507 /* jni_md.h */, - ); - path = win32; - sourceTree = ""; - }; - 69B13542137BE46700C06507 /* lib */ = { - isa = PBXGroup; - children = ( - 69B13543137BE46700C06507 /* jvm.lib */, - ); - path = lib; - sourceTree = ""; - }; - 69B13544137BE46700C06507 /* java-sources */ = { - isa = PBXGroup; - children = ( - 69B13545137BE46700C06507 /* org */, - ); - path = "java-sources"; - sourceTree = ""; - }; - 69B13545137BE46700C06507 /* org */ = { - isa = PBXGroup; - children = ( - 69B13546137BE46700C06507 /* openJpeg */, - ); - path = org; - sourceTree = ""; - }; - 69B13546137BE46700C06507 /* openJpeg */ = { - isa = PBXGroup; - children = ( - 69B13547137BE46700C06507 /* OpenJPEGJavaDecoder.java */, - 69B13548137BE46700C06507 /* OpenJPEGJavaEncoder.java */, - ); - path = openJpeg; - sourceTree = ""; - }; - 69B1354E137BE46700C06507 /* jpip */ = { - isa = PBXGroup; - children = ( - 69B1354F137BE46700C06507 /* CHANGES */, - 69B13550137BE46700C06507 /* doc */, - 69B13553137BE46700C06507 /* libopenjpip */, - 69B13575137BE46700C06507 /* mainpage.h */, - 69B13576137BE46700C06507 /* Makefile */, - 69B13577137BE46700C06507 /* opj_client */, - 69B135A5137BE46700C06507 /* opj_server */, - 69B135AE137BE46700C06507 /* README */, - 69B135AF137BE46700C06507 /* tools */, - ); - path = jpip; - sourceTree = ""; - }; - 69B13550137BE46700C06507 /* doc */ = { - isa = PBXGroup; - children = ( - 69B13551137BE46700C06507 /* Doxyfile */, - 69B13552137BE46700C06507 /* jpip_protocol.png */, - ); - path = doc; - sourceTree = ""; - }; - 69B13553137BE46700C06507 /* libopenjpip */ = { - isa = PBXGroup; - children = ( - 69B13554137BE46700C06507 /* bool.h */, - 69B13555137BE46700C06507 /* box_manager.c */, - 69B13556137BE46700C06507 /* box_manager.h */, - 69B13557137BE46700C06507 /* boxheader_manager.c */, - 69B13558137BE46700C06507 /* boxheader_manager.h */, - 69B13559137BE46700C06507 /* byte_manager.c */, - 69B1355A137BE46700C06507 /* byte_manager.h */, - 69B1355B137BE46700C06507 /* codestream_manager.c */, - 69B1355C137BE46700C06507 /* codestream_manager.h */, - 69B1355D137BE46700C06507 /* comMakefile.mk */, - 69B1355E137BE46700C06507 /* faixbox_manager.c */, - 69B1355F137BE46700C06507 /* faixbox_manager.h */, - 69B13560137BE46700C06507 /* ihdrbox_manager.c */, - 69B13561137BE46700C06507 /* ihdrbox_manager.h */, - 69B13562137BE46700C06507 /* imgreg_manager.c */, - 69B13563137BE46700C06507 /* imgreg_manager.h */, - 69B13564137BE46700C06507 /* index_manager.c */, - 69B13565137BE46700C06507 /* index_manager.h */, - 69B13566137BE46700C06507 /* Makefile */, - 69B13567137BE46700C06507 /* manfbox_manager.c */, - 69B13568137BE46700C06507 /* manfbox_manager.h */, - 69B13569137BE46700C06507 /* marker_manager.c */, - 69B1356A137BE46700C06507 /* marker_manager.h */, - 69B1356B137BE46700C06507 /* metadata_manager.c */, - 69B1356C137BE46700C06507 /* metadata_manager.h */, - 69B1356D137BE46700C06507 /* mhixbox_manager.c */, - 69B1356E137BE46700C06507 /* mhixbox_manager.h */, - 69B1356F137BE46700C06507 /* msgqueue_manager.c */, - 69B13570137BE46700C06507 /* msgqueue_manager.h */, - 69B13571137BE46700C06507 /* placeholder_manager.c */, - 69B13572137BE46700C06507 /* placeholder_manager.h */, - 69B13573137BE46700C06507 /* target_manager.c */, - 69B13574137BE46700C06507 /* target_manager.h */, - ); - path = libopenjpip; - sourceTree = ""; - }; - 69B13577137BE46700C06507 /* opj_client */ = { - isa = PBXGroup; - children = ( - 69B13578137BE46700C06507 /* opj_dec_server */, - 69B13583137BE46700C06507 /* opj_viewer */, - 69B13593137BE46700C06507 /* opj_viewer_xerces */, - ); - path = opj_client; - sourceTree = ""; - }; - 69B13578137BE46700C06507 /* opj_dec_server */ = { - isa = PBXGroup; - children = ( - 69B13579137BE46700C06507 /* cache_manager.c */, - 69B1357A137BE46700C06507 /* cache_manager.h */, - 69B1357B137BE46700C06507 /* imgsock_manager.c */, - 69B1357C137BE46700C06507 /* imgsock_manager.h */, - 69B1357D137BE46700C06507 /* jp2k_decoder.c */, - 69B1357E137BE46700C06507 /* jp2k_decoder.h */, - 69B1357F137BE46700C06507 /* jptstream_manager.c */, - 69B13580137BE46700C06507 /* jptstream_manager.h */, - 69B13581137BE46700C06507 /* Makefile */, - 69B13582137BE46700C06507 /* opj_dec_server.c */, - ); - path = opj_dec_server; - sourceTree = ""; - }; - 69B13583137BE46700C06507 /* opj_viewer */ = { - isa = PBXGroup; - children = ( - 69B13584137BE46700C06507 /* build.xml */, - 69B13585137BE46700C06507 /* dist */, - 69B13589137BE46700C06507 /* src */, - ); - path = opj_viewer; - sourceTree = ""; - }; - 69B13585137BE46700C06507 /* dist */ = { - isa = PBXGroup; - children = ( - 69B13586137BE46700C06507 /* manifest.txt */, - 69B13587137BE46700C06507 /* opj_viewer-20110510.jar */, - 69B13588137BE46700C06507 /* opj_viewer.jar */, - ); - path = dist; - sourceTree = ""; - }; - 69B13589137BE46700C06507 /* src */ = { - isa = PBXGroup; - children = ( - 69B1358A137BE46700C06507 /* ImageManager.java */, - 69B1358B137BE46700C06507 /* ImageViewer.java */, - 69B1358C137BE46700C06507 /* ImageWindow.java */, - 69B1358D137BE46700C06507 /* ImgdecClient.java */, - 69B1358E137BE46700C06507 /* JPIPHttpClient.java */, - 69B1358F137BE46700C06507 /* MML.java */, - 69B13590137BE46700C06507 /* PnmImage.java */, - 69B13591137BE46700C06507 /* RegimViewer.java */, - 69B13592137BE46700C06507 /* ResizeListener.java */, - ); - path = src; - sourceTree = ""; - }; - 69B13593137BE46700C06507 /* opj_viewer_xerces */ = { - isa = PBXGroup; - children = ( - 69B13594137BE46700C06507 /* build.xml */, - 69B13595137BE46700C06507 /* dist */, - 69B13599137BE46700C06507 /* src */, - ); - path = opj_viewer_xerces; - sourceTree = ""; - }; - 69B13595137BE46700C06507 /* dist */ = { - isa = PBXGroup; - children = ( - 69B13596137BE46700C06507 /* manifest.txt */, - 69B13597137BE46700C06507 /* opj_viewer_xerces-20110510.jar */, - 69B13598137BE46700C06507 /* opj_viewer_xerces.jar */, - ); - path = dist; - sourceTree = ""; - }; - 69B13599137BE46700C06507 /* src */ = { - isa = PBXGroup; - children = ( - 69B1359A137BE46700C06507 /* ImageManager.java */, - 69B1359B137BE46700C06507 /* ImageViewer.java */, - 69B1359C137BE46700C06507 /* ImageWindow.java */, - 69B1359D137BE46700C06507 /* ImgdecClient.java */, - 69B1359E137BE46700C06507 /* JP2XMLparser.java */, - 69B1359F137BE46700C06507 /* JPIPHttpClient.java */, - 69B135A0137BE46700C06507 /* MML.java */, - 69B135A1137BE46700C06507 /* OptionPanel.java */, - 69B135A2137BE46700C06507 /* PnmImage.java */, - 69B135A3137BE46700C06507 /* RegimViewer.java */, - 69B135A4137BE46700C06507 /* ResizeListener.java */, - ); - path = src; - sourceTree = ""; - }; - 69B135A5137BE46700C06507 /* opj_server */ = { - isa = PBXGroup; - children = ( - 69B135A6137BE46700C06507 /* channel_manager.c */, - 69B135A7137BE46700C06507 /* channel_manager.h */, - 69B135A8137BE46700C06507 /* Makefile */, - 69B135A9137BE46700C06507 /* opj_server.c */, - 69B135AA137BE46700C06507 /* query_parser.c */, - 69B135AB137BE46700C06507 /* query_parser.h */, - 69B135AC137BE46700C06507 /* session_manager.c */, - 69B135AD137BE46700C06507 /* session_manager.h */, - ); - path = opj_server; - sourceTree = ""; - }; - 69B135AF137BE46700C06507 /* tools */ = { - isa = PBXGroup; - children = ( - 69B135B0137BE46700C06507 /* addXMLinJP2.c */, - 69B135B1137BE46700C06507 /* indexer */, - 69B135CA137BE46700C06507 /* jpt_to_j2k.c */, - 69B135CB137BE46700C06507 /* jpt_to_jp2.c */, - 69B135CC137BE46700C06507 /* Makefile */, - 69B135CD137BE46700C06507 /* test_index.c */, - ); - path = tools; - sourceTree = ""; - }; - 69B135B1137BE46700C06507 /* indexer */ = { - isa = PBXGroup; - children = ( - 69B135B2137BE46700C06507 /* bio.c */, - 69B135B3137BE46700C06507 /* bio.h */, - 69B135B4137BE46700C06507 /* cio.c */, - 69B135B5137BE46700C06507 /* cio.h */, - 69B135B6137BE46700C06507 /* fix.c */, - 69B135B7137BE46700C06507 /* fix.h */, - 69B135B8137BE46700C06507 /* index_create.c */, - 69B135B9137BE46700C06507 /* int.c */, - 69B135BA137BE46700C06507 /* int.h */, - 69B135BB137BE46700C06507 /* j2k.h */, - 69B135BC137BE46700C06507 /* jp2.c */, - 69B135BD137BE46700C06507 /* jp2.h */, - 69B135BE137BE46700C06507 /* jpip.c */, - 69B135BF137BE46700C06507 /* jpip.h */, - 69B135C0137BE46700C06507 /* jpt.c */, - 69B135C1137BE46700C06507 /* Makefile */, - 69B135C2137BE46700C06507 /* pi.c */, - 69B135C3137BE46700C06507 /* pi.h */, - 69B135C4137BE46700C06507 /* t2.c */, - 69B135C5137BE46700C06507 /* t2.h */, - 69B135C6137BE46700C06507 /* tcd.c */, - 69B135C7137BE46700C06507 /* tcd.h */, - 69B135C8137BE46700C06507 /* tgt.c */, - 69B135C9137BE46700C06507 /* tgt.h */, - ); - path = indexer; - sourceTree = ""; - }; - 69B135CE137BE46700C06507 /* mj2 */ = { - isa = PBXGroup; - children = ( - 69B135D0137BE46700C06507 /* extract_j2k_from_mj2.c */, - 69B135D1137BE46700C06507 /* frames_to_mj2.c */, - 69B135D4137BE46700C06507 /* meta_out.c */, - 69B135D5137BE46700C06507 /* meta_out.h */, - 69B135D6137BE46700C06507 /* mj2.c */, - 69B135D7137BE46700C06507 /* mj2.h */, - 69B135D8137BE46700C06507 /* mj2_convert.c */, - 69B135D9137BE46700C06507 /* mj2_convert.h */, - 69B135DA137BE46700C06507 /* mj2_to_frames.c */, - 69B135DB137BE46700C06507 /* mj2_to_metadata.c */, - 69B135DD137BE46700C06507 /* mj2_to_metadata.h */, - 69B135E2137BE46700C06507 /* wrap_j2k_in_mj2.c */, - ); - path = mj2; - sourceTree = ""; - }; - 69B135E3137BE46700C06507 /* OPJViewer */ = { - isa = PBXGroup; - children = ( - 69B135E4137BE46700C06507 /* about */, - 69B135E7137BE46700C06507 /* buildupdate.bat */, - 69B135E8137BE46700C06507 /* Makefile */, - 69B135E9137BE46700C06507 /* OPJViewer.dsp */, - 69B135EA137BE46700C06507 /* OPJViewer.dsw */, - 69B135EB137BE46700C06507 /* OPJViewer.iss */, - 69B135EC137BE46700C06507 /* Readme.txt */, - 69B135ED137BE46700C06507 /* source */, - ); - path = OPJViewer; - sourceTree = ""; - }; - 69B135E4137BE46700C06507 /* about */ = { - isa = PBXGroup; - children = ( - 69B135E5137BE46700C06507 /* about.htm */, - 69B135E6137BE46700C06507 /* opj_logo.png */, - ); - path = about; - sourceTree = ""; - }; - 69B135ED137BE46700C06507 /* source */ = { - isa = PBXGroup; - children = ( - 69B135EE137BE46700C06507 /* about_htm.h */, - 69B135EF137BE46700C06507 /* build.h */, - 69B135F0137BE46700C06507 /* icon1.xpm */, - 69B135F1137BE46700C06507 /* icon2.xpm */, - 69B135F2137BE46700C06507 /* icon3.xpm */, - 69B135F3137BE46700C06507 /* icon4.xpm */, - 69B135F4137BE46700C06507 /* icon5.xpm */, - 69B135F5137BE46700C06507 /* imagjpeg2000.cpp */, - 69B135F6137BE46700C06507 /* imagjpeg2000.h */, - 69B135F7137BE46700C06507 /* imagmxf.cpp */, - 69B135F8137BE46700C06507 /* imagmxf.h */, - 69B135F9137BE46700C06507 /* license.txt */, - 69B135FA137BE46700C06507 /* opj_logo.xpm */, - 69B135FB137BE46700C06507 /* OPJAbout.cpp */, - 69B135FC137BE46700C06507 /* OPJChild.ico */, - 69B135FD137BE46700C06507 /* OPJChild16.xpm */, - 69B135FE137BE46700C06507 /* OPJDialogs.cpp */, - 69B135FF137BE46700C06507 /* OPJThreads.cpp */, - 69B13600137BE46700C06507 /* OPJViewer.cpp */, - 69B13601137BE46700C06507 /* OPJViewer.h */, - 69B13602137BE46700C06507 /* OPJViewer.ico */, - 69B13603137BE46700C06507 /* OPJViewer.rc */, - 69B13604137BE46700C06507 /* OPJViewer16.xpm */, - 69B13605137BE46700C06507 /* readmeafter.txt */, - 69B13606137BE46700C06507 /* readmebefore.txt */, - 69B13607137BE46700C06507 /* wxj2kparser.cpp */, - 69B13608137BE46700C06507 /* wxjp2parser.cpp */, - ); - path = source; - sourceTree = ""; - }; - 69B1361E137BE5FD00C06507 /* jpwl */ = { - isa = PBXGroup; - children = ( - 69B13620137BE5FD00C06507 /* crc.c */, - 69B13621137BE5FD00C06507 /* crc.h */, - 69B13622137BE5FD00C06507 /* jpwl.c */, - 69B13623137BE5FD00C06507 /* jpwl.h */, - 69B13624137BE5FD00C06507 /* jpwl_lib.c */, - 69B13628137BE5FD00C06507 /* rs.c */, - 69B13629137BE5FD00C06507 /* rs.h */, - ); - path = jpwl; - sourceTree = ""; - }; - 69F984A60D40A3AE00C2791C = { - isa = PBXGroup; - children = ( - 694E0D8512913100008AFCC7 /* opj_config.h */, - 694E0D40129129D3008AFCC7 /* opj_config.h.in.user */, - 6975151C127D722900CAD463 /* INSTALL */, - 697D965A1262643900FFCE8E /* CHANGES */, - 69F984FE0D40A41700C2791C /* libopenjpeg */, - 69B13520137BE46700C06507 /* applications */, - 69F984CF0D40A41700C2791C /* doc */, - 69F985A20D40A48E00C2791C /* Products */, - ); - sourceTree = ""; - }; - 69F984CF0D40A41700C2791C /* doc */ = { - isa = PBXGroup; - children = ( - 697D95B1125B3C7500FFCE8E /* man */, - 69F984D10D40A41700C2791C /* Doxyfile.dox */, - ); - path = doc; - sourceTree = ""; - }; - 69F984FE0D40A41700C2791C /* libopenjpeg */ = { - isa = PBXGroup; - children = ( - 69B1361E137BE5FD00C06507 /* jpwl */, - 69F984FF0D40A41700C2791C /* bio.c */, - 69F985000D40A41700C2791C /* bio.h */, - 69F985020D40A41700C2791C /* cio.c */, - 69F985030D40A41700C2791C /* cio.h */, - 69F985060D40A41700C2791C /* dwt.c */, - 69F985070D40A41700C2791C /* dwt.h */, - 69F985090D40A41700C2791C /* event.c */, - 69F9850A0D40A41700C2791C /* event.h */, - 69F9850C0D40A41700C2791C /* fix.h */, - 69F9850D0D40A41700C2791C /* image.c */, - 69F9850E0D40A41700C2791C /* image.h */, - 69F985100D40A41700C2791C /* int.h */, - 69F985110D40A41700C2791C /* j2k.c */, - 69F985120D40A41700C2791C /* j2k.h */, - 69F985140D40A41700C2791C /* j2k_lib.c */, - 69F985150D40A41700C2791C /* j2k_lib.h */, - 69F985170D40A41700C2791C /* jp2.c */, - 69F985180D40A41700C2791C /* jp2.h */, - 69F9851A0D40A41700C2791C /* jpt.c */, - 69F9851B0D40A41700C2791C /* jpt.h */, - 69F9851D0D40A41700C2791C /* mct.c */, - 69F9851E0D40A41700C2791C /* mct.h */, - 69F985200D40A41700C2791C /* mqc.c */, - 69F985210D40A41700C2791C /* mqc.h */, - 69F985230D40A41700C2791C /* openjpeg.c */, - 69F985240D40A41700C2791C /* openjpeg.h */, - 69F985260D40A41700C2791C /* opj_includes.h */, - 69F985270D40A41700C2791C /* opj_malloc.h */, - 69F985280D40A41700C2791C /* pi.c */, - 69F985290D40A41700C2791C /* pi.h */, - 69F9852B0D40A41700C2791C /* raw.c */, - 69F9852C0D40A41700C2791C /* raw.h */, - 69F9852E0D40A41700C2791C /* t1.c */, - 69F9852F0D40A41700C2791C /* t1.h */, - 69F985320D40A41700C2791C /* t1_luts.h */, - 69F985330D40A41700C2791C /* t2.c */, - 69F985340D40A41700C2791C /* t2.h */, - 69F985360D40A41700C2791C /* tcd.c */, - 69F985370D40A41700C2791C /* tcd.h */, - 69F985390D40A41700C2791C /* tgt.c */, - 69F9853A0D40A41700C2791C /* tgt.h */, - ); - path = libopenjpeg; - sourceTree = ""; - }; - 69F985A20D40A48E00C2791C /* Products */ = { - isa = PBXGroup; - children = ( - 69F985A10D40A48E00C2791C /* libopenjpeg.a */, - 69F986390D40A7DA00C2791C /* image_to_j2k */, - 69F9865C0D40A8E200C2791C /* j2k_to_image */, - 69F985B60D40A63D00C2791C /* libopenjpeg.dylib */, - 692CF20E122BAF7A0010088E /* libopenjpeg_JPWL.a */, - 692CF247122BB1D60010088E /* JPWL_image_to_j2k */, - 692CF255122BB2110010088E /* JPWL_j2k_to_image */, - 694E0D9A129132D7008AFCC7 /* j2k_dump */, - 694E0DA91291340E008AFCC7 /* libopenjpeg_JPWL.dylib */, - 694E0EB712953DF3008AFCC7 /* extract_j2k_from_mj2 */, - 694E0ECD12953EC7008AFCC7 /* frames_to_mj2 */, - 694E0EDC12953F2B008AFCC7 /* mj2_to_frames */, - 694E0EF312953F82008AFCC7 /* wrap_j2k_in_mj2 */, - 69B136DD137BECDC00C06507 /* libopenjpip_server.a */, - 69B136E4137BED3400C06507 /* opj_server */, - 69B136EB137BED4A00C06507 /* opj_dec_server */, - 69B13713137BEEDD00C06507 /* libopenjpip_local.a */, - 69B1375E137BF26900C06507 /* jpt_to_j2k */, - 69B13765137BF27B00C06507 /* jpt_to_jp2 */, - 69B1376C137BF29500C06507 /* addXMLinJP2 */, - 69B13773137BF2A900C06507 /* test_index */, - 69B13781137BF2CE00C06507 /* index_create */, - ); - name = Products; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 692CF20D122BAF7A0010088E /* opj_JPWL_static */ = { - isa = PBXNativeTarget; - buildConfigurationList = 692CF224122BAFBF0010088E /* Build configuration list for PBXNativeTarget "opj_JPWL_static" */; - buildPhases = ( - 692CF20B122BAF7A0010088E /* Sources */, - ); - buildRules = ( - ); - dependencies = ( - 694E0D5712912E19008AFCC7 /* PBXTargetDependency */, - ); - name = opj_JPWL_static; - productName = openjpegWL; - productReference = 692CF20E122BAF7A0010088E /* libopenjpeg_JPWL.a */; - productType = "com.apple.product-type.library.static"; - }; - 692CF23C122BB1D60010088E /* JPWL_image_to_j2k */ = { - isa = PBXNativeTarget; - buildConfigurationList = 692CF244122BB1D60010088E /* Build configuration list for PBXNativeTarget "JPWL_image_to_j2k" */; - buildPhases = ( - 692CF23D122BB1D60010088E /* Sources */, - ); - buildRules = ( - ); - dependencies = ( - 694E0D5912912E1F008AFCC7 /* PBXTargetDependency */, - ); - name = JPWL_image_to_j2k; - productName = image_to_j2k; - productReference = 692CF247122BB1D60010088E /* JPWL_image_to_j2k */; - productType = "com.apple.product-type.tool"; - }; - 692CF24A122BB2110010088E /* JPWL_j2k_to_image */ = { - isa = PBXNativeTarget; - buildConfigurationList = 692CF252122BB2110010088E /* Build configuration list for PBXNativeTarget "JPWL_j2k_to_image" */; - buildPhases = ( - 692CF24B122BB2110010088E /* Sources */, - ); - buildRules = ( - ); - dependencies = ( - 694E0D5B12912E27008AFCC7 /* PBXTargetDependency */, - ); - name = JPWL_j2k_to_image; - productName = j2k_to_image; - productReference = 692CF255122BB2110010088E /* JPWL_j2k_to_image */; - productType = "com.apple.product-type.tool"; - }; - 694E0D99129132D7008AFCC7 /* j2k_dump */ = { - isa = PBXNativeTarget; - buildConfigurationList = 694E0D9F1291330E008AFCC7 /* Build configuration list for PBXNativeTarget "j2k_dump" */; - buildPhases = ( - 694E0D97129132D7008AFCC7 /* Sources */, - ); - buildRules = ( - ); - dependencies = ( - 694E0DCC129134F3008AFCC7 /* PBXTargetDependency */, - ); - name = j2k_dump; - productName = j2k_dump; - productReference = 694E0D9A129132D7008AFCC7 /* j2k_dump */; - productType = "com.apple.product-type.tool"; - }; - 694E0DA81291340E008AFCC7 /* opj_JPWL_dynamic */ = { - isa = PBXNativeTarget; - buildConfigurationList = 694E0DAC1291342C008AFCC7 /* Build configuration list for PBXNativeTarget "opj_JPWL_dynamic" */; - buildPhases = ( - 694E0DA61291340E008AFCC7 /* Sources */, - ); - buildRules = ( - ); - dependencies = ( - 694E0DAE12913478008AFCC7 /* PBXTargetDependency */, - ); - name = opj_JPWL_dynamic; - productName = opj_JPWL_dynamic; - productReference = 694E0DA91291340E008AFCC7 /* libopenjpeg_JPWL.dylib */; - productType = "com.apple.product-type.library.dynamic"; - }; - 694E0EB612953DF3008AFCC7 /* extract_j2k_from_mj2 */ = { - isa = PBXNativeTarget; - buildConfigurationList = 694E0EBD12953E23008AFCC7 /* Build configuration list for PBXNativeTarget "extract_j2k_from_mj2" */; - buildPhases = ( - 694E0EB412953DF3008AFCC7 /* Sources */, - ); - buildRules = ( - ); - dependencies = ( - 694E0EBC12953E05008AFCC7 /* PBXTargetDependency */, - ); - name = extract_j2k_from_mj2; - productName = extract_j2k_from_mj2; - productReference = 694E0EB712953DF3008AFCC7 /* extract_j2k_from_mj2 */; - productType = "com.apple.product-type.tool"; - }; - 694E0EC312953EC7008AFCC7 /* frames_to_mj2 */ = { - isa = PBXNativeTarget; - buildConfigurationList = 694E0ECA12953EC7008AFCC7 /* Build configuration list for PBXNativeTarget "frames_to_mj2" */; - buildPhases = ( - 694E0EC612953EC7008AFCC7 /* Sources */, - ); - buildRules = ( - ); - dependencies = ( - 694E0EC412953EC7008AFCC7 /* PBXTargetDependency */, - ); - name = frames_to_mj2; - productName = extract_j2k_from_mj2; - productReference = 694E0ECD12953EC7008AFCC7 /* frames_to_mj2 */; - productType = "com.apple.product-type.tool"; - }; - 694E0ED212953F2B008AFCC7 /* mj2_to_frames */ = { - isa = PBXNativeTarget; - buildConfigurationList = 694E0ED912953F2B008AFCC7 /* Build configuration list for PBXNativeTarget "mj2_to_frames" */; - buildPhases = ( - 694E0ED512953F2B008AFCC7 /* Sources */, - ); - buildRules = ( - ); - dependencies = ( - 694E0ED312953F2B008AFCC7 /* PBXTargetDependency */, - ); - name = mj2_to_frames; - productName = extract_j2k_from_mj2; - productReference = 694E0EDC12953F2B008AFCC7 /* mj2_to_frames */; - productType = "com.apple.product-type.tool"; - }; - 694E0EE912953F82008AFCC7 /* wrap_j2k_in_mj2 */ = { - isa = PBXNativeTarget; - buildConfigurationList = 694E0EF012953F82008AFCC7 /* Build configuration list for PBXNativeTarget "wrap_j2k_in_mj2" */; - buildPhases = ( - 694E0EEC12953F82008AFCC7 /* Sources */, - ); - buildRules = ( - ); - dependencies = ( - 694E0EEA12953F82008AFCC7 /* PBXTargetDependency */, - ); - name = wrap_j2k_in_mj2; - productName = extract_j2k_from_mj2; - productReference = 694E0EF312953F82008AFCC7 /* wrap_j2k_in_mj2 */; - productType = "com.apple.product-type.tool"; - }; - 69B136DC137BECDC00C06507 /* openjpip_server */ = { - isa = PBXNativeTarget; - buildConfigurationList = 69B136E0137BECFA00C06507 /* Build configuration list for PBXNativeTarget "openjpip_server" */; - buildPhases = ( - 69B136DA137BECDC00C06507 /* Sources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = openjpip_server; - productName = openjpip_static; - productReference = 69B136DD137BECDC00C06507 /* libopenjpip_server.a */; - productType = "com.apple.product-type.library.static"; - }; - 69B136E3137BED3400C06507 /* opj_server */ = { - isa = PBXNativeTarget; - buildConfigurationList = 69B136EF137BED6900C06507 /* Build configuration list for PBXNativeTarget "opj_server" */; - buildPhases = ( - 69B136E1137BED3400C06507 /* Sources */, - 69B136E2137BED3400C06507 /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = opj_server; - productName = opj_server; - productReference = 69B136E4137BED3400C06507 /* opj_server */; - productType = "com.apple.product-type.tool"; - }; - 69B136EA137BED4A00C06507 /* opj_dec_server */ = { - isa = PBXNativeTarget; - buildConfigurationList = 69B136F0137BED6900C06507 /* Build configuration list for PBXNativeTarget "opj_dec_server" */; - buildPhases = ( - 69B136E8137BED4A00C06507 /* Sources */, - 69B136E9137BED4A00C06507 /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = opj_dec_server; - productName = opj_dec_server; - productReference = 69B136EB137BED4A00C06507 /* opj_dec_server */; - productType = "com.apple.product-type.tool"; - }; - 69B13712137BEEDD00C06507 /* openjpip_local */ = { - isa = PBXNativeTarget; - buildConfigurationList = 69B1371E137BEF0400C06507 /* Build configuration list for PBXNativeTarget "openjpip_local" */; - buildPhases = ( - 69B13710137BEEDD00C06507 /* Sources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = openjpip_local; - productName = openjpip_local; - productReference = 69B13713137BEEDD00C06507 /* libopenjpip_local.a */; - productType = "com.apple.product-type.library.static"; - }; - 69B1375D137BF26900C06507 /* jpt_to_j2k */ = { - isa = PBXNativeTarget; - buildConfigurationList = 69B1377A137BF2AE00C06507 /* Build configuration list for PBXNativeTarget "jpt_to_j2k" */; - buildPhases = ( - 69B1375B137BF26900C06507 /* Sources */, - 69B1375C137BF26900C06507 /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = jpt_to_j2k; - productName = jpt_to_j2k; - productReference = 69B1375E137BF26900C06507 /* jpt_to_j2k */; - productType = "com.apple.product-type.tool"; - }; - 69B13764137BF27B00C06507 /* jpt_to_jp2 */ = { - isa = PBXNativeTarget; - buildConfigurationList = 69B1377B137BF2AE00C06507 /* Build configuration list for PBXNativeTarget "jpt_to_jp2" */; - buildPhases = ( - 69B13762137BF27B00C06507 /* Sources */, - 69B13763137BF27B00C06507 /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = jpt_to_jp2; - productName = jpt_to_jp2; - productReference = 69B13765137BF27B00C06507 /* jpt_to_jp2 */; - productType = "com.apple.product-type.tool"; - }; - 69B1376B137BF29500C06507 /* addXMLinJP2 */ = { - isa = PBXNativeTarget; - buildConfigurationList = 69B1377C137BF2AE00C06507 /* Build configuration list for PBXNativeTarget "addXMLinJP2" */; - buildPhases = ( - 69B13769137BF29500C06507 /* Sources */, - 69B1376A137BF29500C06507 /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = addXMLinJP2; - productName = addXMLinJP2; - productReference = 69B1376C137BF29500C06507 /* addXMLinJP2 */; - productType = "com.apple.product-type.tool"; - }; - 69B13772137BF2A900C06507 /* test_index */ = { - isa = PBXNativeTarget; - buildConfigurationList = 69B1377D137BF2AE00C06507 /* Build configuration list for PBXNativeTarget "test_index" */; - buildPhases = ( - 69B13770137BF2A900C06507 /* Sources */, - 69B13771137BF2A900C06507 /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = test_index; - productName = test_index; - productReference = 69B13773137BF2A900C06507 /* test_index */; - productType = "com.apple.product-type.tool"; - }; - 69B13780137BF2CE00C06507 /* index_create */ = { - isa = PBXNativeTarget; - buildConfigurationList = 69B13796137BF30B00C06507 /* Build configuration list for PBXNativeTarget "index_create" */; - buildPhases = ( - 69B1377E137BF2CE00C06507 /* Sources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = index_create; - productName = index_create; - productReference = 69B13781137BF2CE00C06507 /* index_create */; - productType = "com.apple.product-type.tool"; - }; - 69F985A00D40A48E00C2791C /* opj_static */ = { - isa = PBXNativeTarget; - buildConfigurationList = 69F985A30D40A48F00C2791C /* Build configuration list for PBXNativeTarget "opj_static" */; - buildPhases = ( - 69F9859E0D40A48E00C2791C /* Sources */, - ); - buildRules = ( - ); - dependencies = ( - 694E0D4F12912DED008AFCC7 /* PBXTargetDependency */, - ); - name = opj_static; - productName = openjpeg; - productReference = 69F985A10D40A48E00C2791C /* libopenjpeg.a */; - productType = "com.apple.product-type.library.static"; - }; - 69F985B50D40A63D00C2791C /* opj_dynamic */ = { - isa = PBXNativeTarget; - buildConfigurationList = 69F985B90D40A69400C2791C /* Build configuration list for PBXNativeTarget "opj_dynamic" */; - buildPhases = ( - 69F985B30D40A63D00C2791C /* Sources */, - ); - buildRules = ( - ); - dependencies = ( - 694E0D5112912DFE008AFCC7 /* PBXTargetDependency */, - ); - name = opj_dynamic; - productName = opjdyn; - productReference = 69F985B60D40A63D00C2791C /* libopenjpeg.dylib */; - productType = "com.apple.product-type.library.dynamic"; - }; - 69F986380D40A7DA00C2791C /* image_to_j2k */ = { - isa = PBXNativeTarget; - buildConfigurationList = 69F9864B0D40A7F200C2791C /* Build configuration list for PBXNativeTarget "image_to_j2k" */; - buildPhases = ( - 69F986360D40A7DA00C2791C /* Sources */, - ); - buildRules = ( - ); - dependencies = ( - 694E0D5312912E09008AFCC7 /* PBXTargetDependency */, - ); - name = image_to_j2k; - productName = image_to_j2k; - productReference = 69F986390D40A7DA00C2791C /* image_to_j2k */; - productType = "com.apple.product-type.tool"; - }; - 69F9865B0D40A8E200C2791C /* j2k_to_image */ = { - isa = PBXNativeTarget; - buildConfigurationList = 69F986650D40A93B00C2791C /* Build configuration list for PBXNativeTarget "j2k_to_image" */; - buildPhases = ( - 69F986590D40A8E200C2791C /* Sources */, - ); - buildRules = ( - ); - dependencies = ( - 694E0D5512912E0E008AFCC7 /* PBXTargetDependency */, - ); - name = j2k_to_image; - productName = j2k_to_image; - productReference = 69F9865C0D40A8E200C2791C /* j2k_to_image */; - productType = "com.apple.product-type.tool"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 69F984A80D40A3AE00C2791C /* Project object */ = { - isa = PBXProject; - buildConfigurationList = 69F984A90D40A3AE00C2791C /* Build configuration list for PBXProject "openjpeg" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; - hasScannedForEncodings = 0; - knownRegions = ( - English, - Japanese, - French, - German, - ); - mainGroup = 69F984A60D40A3AE00C2791C; - productRefGroup = 69F985A20D40A48E00C2791C /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 694E0D4412912A70008AFCC7 /* opj_config */, - 69F985A00D40A48E00C2791C /* opj_static */, - 69F986380D40A7DA00C2791C /* image_to_j2k */, - 69F9865B0D40A8E200C2791C /* j2k_to_image */, - 694E0D99129132D7008AFCC7 /* j2k_dump */, - 69F985B50D40A63D00C2791C /* opj_dynamic */, - 694039A6117B7E090079DE22 /* build OPJ */, - 692CF20D122BAF7A0010088E /* opj_JPWL_static */, - 692CF23C122BB1D60010088E /* JPWL_image_to_j2k */, - 692CF24A122BB2110010088E /* JPWL_j2k_to_image */, - 694E0DA81291340E008AFCC7 /* opj_JPWL_dynamic */, - 692CF258122BB2640010088E /* build OPJ_JPWL */, - 694E0EB612953DF3008AFCC7 /* extract_j2k_from_mj2 */, - 694E0EC312953EC7008AFCC7 /* frames_to_mj2 */, - 694E0ED212953F2B008AFCC7 /* mj2_to_frames */, - 694E0EE912953F82008AFCC7 /* wrap_j2k_in_mj2 */, - 694E0EFA12953FD2008AFCC7 /* build OPJ_MJ2 */, - 69B136DC137BECDC00C06507 /* openjpip_server */, - 69B13712137BEEDD00C06507 /* openjpip_local */, - 69B136E3137BED3400C06507 /* opj_server */, - 69B136EA137BED4A00C06507 /* opj_dec_server */, - 69B1375D137BF26900C06507 /* jpt_to_j2k */, - 69B13764137BF27B00C06507 /* jpt_to_jp2 */, - 69B1376B137BF29500C06507 /* addXMLinJP2 */, - 69B13772137BF2A900C06507 /* test_index */, - 69B13780137BF2CE00C06507 /* index_create */, - 69B13785137BF2DE00C06507 /* opj_tools */, - 69B136F8137BEE2C00C06507 /* build OPJ_JPIP */, - 692CF26A122BB2850010088E /* build all */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXShellScriptBuildPhase section */ - 694E0D4312912A70008AFCC7 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(SRCROOT)/opj_config.h.in.user", - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/opj_config.h", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "# shell script goes here\n\n# TODO : script to automatically check for libpng, libtiff and liblcms.\n\n# Copy opj_config.h.in.user to opj_config.h\n\ncp -a opj_config.h.in.user opj_config.h\n\nexit 0"; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 692CF20B122BAF7A0010088E /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 692CF211122BAFA10010088E /* bio.c in Sources */, - 692CF212122BAFA10010088E /* cio.c in Sources */, - 692CF213122BAFA10010088E /* dwt.c in Sources */, - 692CF214122BAFA10010088E /* event.c in Sources */, - 692CF215122BAFA10010088E /* image.c in Sources */, - 692CF216122BAFA10010088E /* j2k.c in Sources */, - 692CF217122BAFA10010088E /* j2k_lib.c in Sources */, - 692CF218122BAFA10010088E /* jp2.c in Sources */, - 692CF219122BAFA10010088E /* jpt.c in Sources */, - 692CF21A122BAFA10010088E /* mct.c in Sources */, - 692CF21B122BAFA10010088E /* mqc.c in Sources */, - 692CF21C122BAFA10010088E /* openjpeg.c in Sources */, - 692CF21D122BAFA10010088E /* pi.c in Sources */, - 692CF21E122BAFA10010088E /* raw.c in Sources */, - 692CF21F122BAFA10010088E /* t1.c in Sources */, - 692CF221122BAFA10010088E /* t2.c in Sources */, - 692CF222122BAFA10010088E /* tcd.c in Sources */, - 692CF223122BAFA10010088E /* tgt.c in Sources */, - 69B1362A137BE5FD00C06507 /* crc.c in Sources */, - 69B1362B137BE5FD00C06507 /* jpwl.c in Sources */, - 69B1362C137BE5FD00C06507 /* jpwl_lib.c in Sources */, - 69B1362D137BE5FD00C06507 /* rs.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 692CF23D122BB1D60010088E /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 69B13638137BE66200C06507 /* convert.c in Sources */, - 69B13639137BE66200C06507 /* image_to_j2k.c in Sources */, - 69B1363A137BE66200C06507 /* index.c in Sources */, - 69B1363B137BE66200C06507 /* getopt.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 692CF24B122BB2110010088E /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 69B1363C137BE66C00C06507 /* convert.c in Sources */, - 69B1363D137BE66C00C06507 /* index.c in Sources */, - 69B1363E137BE66C00C06507 /* j2k_to_image.c in Sources */, - 69B1363F137BE66C00C06507 /* color.c in Sources */, - 69B13640137BE66C00C06507 /* getopt.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 694E0D97129132D7008AFCC7 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 69B1369F137BE79C00C06507 /* index.c in Sources */, - 69B13612137BE50600C06507 /* convert.c in Sources */, - 69B13613137BE50600C06507 /* j2k_dump.c in Sources */, - 69B13614137BE50600C06507 /* getopt.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 694E0DA61291340E008AFCC7 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 694E0DAF1291347F008AFCC7 /* bio.c in Sources */, - 694E0DB01291347F008AFCC7 /* cio.c in Sources */, - 694E0DB21291347F008AFCC7 /* dwt.c in Sources */, - 694E0DB31291347F008AFCC7 /* event.c in Sources */, - 694E0DB41291347F008AFCC7 /* image.c in Sources */, - 694E0DB51291347F008AFCC7 /* j2k.c in Sources */, - 694E0DB61291347F008AFCC7 /* j2k_lib.c in Sources */, - 694E0DB71291347F008AFCC7 /* jp2.c in Sources */, - 694E0DB81291347F008AFCC7 /* jpt.c in Sources */, - 694E0DBB1291347F008AFCC7 /* mct.c in Sources */, - 694E0DBC1291347F008AFCC7 /* mqc.c in Sources */, - 694E0DBD1291347F008AFCC7 /* openjpeg.c in Sources */, - 694E0DBF1291347F008AFCC7 /* pi.c in Sources */, - 694E0DC01291347F008AFCC7 /* raw.c in Sources */, - 694E0DC21291347F008AFCC7 /* t1.c in Sources */, - 694E0DC41291347F008AFCC7 /* t2.c in Sources */, - 694E0DC51291347F008AFCC7 /* tcd.c in Sources */, - 694E0DC61291347F008AFCC7 /* tgt.c in Sources */, - 69B1362E137BE5FD00C06507 /* crc.c in Sources */, - 69B1362F137BE5FD00C06507 /* jpwl.c in Sources */, - 69B13630137BE5FD00C06507 /* jpwl_lib.c in Sources */, - 69B13631137BE5FD00C06507 /* rs.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 694E0EB412953DF3008AFCC7 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 69B1368D137BE70C00C06507 /* extract_j2k_from_mj2.c in Sources */, - 69B1368E137BE70C00C06507 /* mj2.c in Sources */, - 69B1368F137BE70C00C06507 /* mj2_convert.c in Sources */, - 69B13641137BE6D300C06507 /* bio.c in Sources */, - 69B13642137BE6D300C06507 /* cio.c in Sources */, - 69B13643137BE6D300C06507 /* dwt.c in Sources */, - 69B13644137BE6D300C06507 /* event.c in Sources */, - 69B13645137BE6D300C06507 /* image.c in Sources */, - 69B13646137BE6D300C06507 /* j2k.c in Sources */, - 69B13647137BE6D300C06507 /* j2k_lib.c in Sources */, - 69B13648137BE6D300C06507 /* jp2.c in Sources */, - 69B13649137BE6D300C06507 /* jpt.c in Sources */, - 69B1364A137BE6D300C06507 /* mct.c in Sources */, - 69B1364B137BE6D300C06507 /* mqc.c in Sources */, - 69B1364C137BE6D300C06507 /* openjpeg.c in Sources */, - 69B1364D137BE6D300C06507 /* pi.c in Sources */, - 69B1364E137BE6D300C06507 /* raw.c in Sources */, - 69B1364F137BE6D300C06507 /* t1.c in Sources */, - 69B13651137BE6D300C06507 /* t2.c in Sources */, - 69B13652137BE6D300C06507 /* tcd.c in Sources */, - 69B13653137BE6D300C06507 /* tgt.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 694E0EC612953EC7008AFCC7 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 69B13690137BE71700C06507 /* frames_to_mj2.c in Sources */, - 69B13691137BE71700C06507 /* mj2.c in Sources */, - 69B13692137BE71700C06507 /* mj2_convert.c in Sources */, - 69B13654137BE6D700C06507 /* bio.c in Sources */, - 69B13655137BE6D700C06507 /* cio.c in Sources */, - 69B13656137BE6D700C06507 /* dwt.c in Sources */, - 69B13657137BE6D700C06507 /* event.c in Sources */, - 69B13658137BE6D700C06507 /* image.c in Sources */, - 69B13659137BE6D700C06507 /* j2k.c in Sources */, - 69B1365A137BE6D700C06507 /* j2k_lib.c in Sources */, - 69B1365B137BE6D700C06507 /* jp2.c in Sources */, - 69B1365C137BE6D700C06507 /* jpt.c in Sources */, - 69B1365D137BE6D700C06507 /* mct.c in Sources */, - 69B1365E137BE6D700C06507 /* mqc.c in Sources */, - 69B1365F137BE6D700C06507 /* openjpeg.c in Sources */, - 69B13660137BE6D700C06507 /* pi.c in Sources */, - 69B13661137BE6D700C06507 /* raw.c in Sources */, - 69B13662137BE6D700C06507 /* t1.c in Sources */, - 69B13664137BE6D700C06507 /* t2.c in Sources */, - 69B13665137BE6D700C06507 /* tcd.c in Sources */, - 69B13666137BE6D700C06507 /* tgt.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 694E0ED512953F2B008AFCC7 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 69B13693137BE72900C06507 /* mj2.c in Sources */, - 69B13694137BE72900C06507 /* mj2_convert.c in Sources */, - 69B13695137BE72900C06507 /* mj2_to_frames.c in Sources */, - 69B13667137BE6DA00C06507 /* bio.c in Sources */, - 69B13668137BE6DA00C06507 /* cio.c in Sources */, - 69B13669137BE6DA00C06507 /* dwt.c in Sources */, - 69B1366A137BE6DA00C06507 /* event.c in Sources */, - 69B1366B137BE6DA00C06507 /* image.c in Sources */, - 69B1366C137BE6DA00C06507 /* j2k.c in Sources */, - 69B1366D137BE6DA00C06507 /* j2k_lib.c in Sources */, - 69B1366E137BE6DA00C06507 /* jp2.c in Sources */, - 69B1366F137BE6DA00C06507 /* jpt.c in Sources */, - 69B13670137BE6DA00C06507 /* mct.c in Sources */, - 69B13671137BE6DA00C06507 /* mqc.c in Sources */, - 69B13672137BE6DA00C06507 /* openjpeg.c in Sources */, - 69B13673137BE6DA00C06507 /* pi.c in Sources */, - 69B13674137BE6DA00C06507 /* raw.c in Sources */, - 69B13675137BE6DA00C06507 /* t1.c in Sources */, - 69B13677137BE6DA00C06507 /* t2.c in Sources */, - 69B13678137BE6DA00C06507 /* tcd.c in Sources */, - 69B13679137BE6DA00C06507 /* tgt.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 694E0EEC12953F82008AFCC7 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 69B13696137BE73B00C06507 /* mj2.c in Sources */, - 69B13697137BE73B00C06507 /* mj2_convert.c in Sources */, - 69B13698137BE73B00C06507 /* wrap_j2k_in_mj2.c in Sources */, - 69B1367A137BE6DD00C06507 /* bio.c in Sources */, - 69B1367B137BE6DD00C06507 /* cio.c in Sources */, - 69B1367C137BE6DD00C06507 /* dwt.c in Sources */, - 69B1367D137BE6DD00C06507 /* event.c in Sources */, - 69B1367E137BE6DD00C06507 /* image.c in Sources */, - 69B1367F137BE6DD00C06507 /* j2k.c in Sources */, - 69B13680137BE6DD00C06507 /* j2k_lib.c in Sources */, - 69B13681137BE6DD00C06507 /* jp2.c in Sources */, - 69B13682137BE6DD00C06507 /* jpt.c in Sources */, - 69B13683137BE6DD00C06507 /* mct.c in Sources */, - 69B13684137BE6DD00C06507 /* mqc.c in Sources */, - 69B13685137BE6DD00C06507 /* openjpeg.c in Sources */, - 69B13686137BE6DD00C06507 /* pi.c in Sources */, - 69B13687137BE6DD00C06507 /* raw.c in Sources */, - 69B13688137BE6DD00C06507 /* t1.c in Sources */, - 69B1368A137BE6DD00C06507 /* t2.c in Sources */, - 69B1368B137BE6DD00C06507 /* tcd.c in Sources */, - 69B1368C137BE6DD00C06507 /* tgt.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 69B136DA137BECDC00C06507 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 69B1371F137BEF3A00C06507 /* box_manager.c in Sources */, - 69B13720137BEF3A00C06507 /* boxheader_manager.c in Sources */, - 69B13721137BEF3A00C06507 /* byte_manager.c in Sources */, - 69B13722137BEF3A00C06507 /* codestream_manager.c in Sources */, - 69B13723137BEF3A00C06507 /* faixbox_manager.c in Sources */, - 69B13724137BEF3A00C06507 /* ihdrbox_manager.c in Sources */, - 69B13725137BEF3A00C06507 /* imgreg_manager.c in Sources */, - 69B13726137BEF3A00C06507 /* index_manager.c in Sources */, - 69B13727137BEF3A00C06507 /* manfbox_manager.c in Sources */, - 69B13728137BEF3A00C06507 /* marker_manager.c in Sources */, - 69B13729137BEF3A00C06507 /* metadata_manager.c in Sources */, - 69B1372A137BEF3A00C06507 /* mhixbox_manager.c in Sources */, - 69B1372B137BEF3A00C06507 /* msgqueue_manager.c in Sources */, - 69B1372C137BEF3A00C06507 /* placeholder_manager.c in Sources */, - 69B1372D137BEF3A00C06507 /* target_manager.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 69B136E1137BED3400C06507 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 69B13744137BEFE000C06507 /* channel_manager.c in Sources */, - 69B13745137BEFE000C06507 /* opj_server.c in Sources */, - 69B13746137BEFE000C06507 /* query_parser.c in Sources */, - 69B13747137BEFE000C06507 /* session_manager.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 69B136E8137BED4A00C06507 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 69B1374D137BF04B00C06507 /* cache_manager.c in Sources */, - 69B1374E137BF04B00C06507 /* imgsock_manager.c in Sources */, - 69B1374F137BF04B00C06507 /* jp2k_decoder.c in Sources */, - 69B13750137BF04B00C06507 /* jptstream_manager.c in Sources */, - 69B13751137BF04B00C06507 /* opj_dec_server.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 69B13710137BEEDD00C06507 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 69B1372E137BEF3E00C06507 /* box_manager.c in Sources */, - 69B1372F137BEF3E00C06507 /* boxheader_manager.c in Sources */, - 69B13730137BEF3E00C06507 /* byte_manager.c in Sources */, - 69B13731137BEF3E00C06507 /* codestream_manager.c in Sources */, - 69B13732137BEF3E00C06507 /* faixbox_manager.c in Sources */, - 69B13733137BEF3E00C06507 /* ihdrbox_manager.c in Sources */, - 69B13734137BEF3E00C06507 /* imgreg_manager.c in Sources */, - 69B13735137BEF3E00C06507 /* index_manager.c in Sources */, - 69B13736137BEF3E00C06507 /* manfbox_manager.c in Sources */, - 69B13737137BEF3E00C06507 /* marker_manager.c in Sources */, - 69B13738137BEF3E00C06507 /* metadata_manager.c in Sources */, - 69B13739137BEF3E00C06507 /* mhixbox_manager.c in Sources */, - 69B1373A137BEF3E00C06507 /* msgqueue_manager.c in Sources */, - 69B1373B137BEF3E00C06507 /* placeholder_manager.c in Sources */, - 69B1373C137BEF3E00C06507 /* target_manager.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 69B1375B137BF26900C06507 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 69B1379C137BF35100C06507 /* jpt_to_j2k.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 69B13762137BF27B00C06507 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 69B1379D137BF35500C06507 /* jpt_to_jp2.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 69B13769137BF29500C06507 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 69B1379F137BF36200C06507 /* addXMLinJP2.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 69B13770137BF2A900C06507 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 69B1379E137BF35C00C06507 /* test_index.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 69B1377E137BF2CE00C06507 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 69B137A2137BF39900C06507 /* bio.c in Sources */, - 69B137A3137BF39900C06507 /* cio.c in Sources */, - 69B137A4137BF39900C06507 /* fix.c in Sources */, - 69B137A5137BF39900C06507 /* index_create.c in Sources */, - 69B137A6137BF39900C06507 /* int.c in Sources */, - 69B137A7137BF39900C06507 /* jp2.c in Sources */, - 69B137A8137BF39900C06507 /* jpip.c in Sources */, - 69B137AA137BF39900C06507 /* pi.c in Sources */, - 69B137AB137BF39900C06507 /* t2.c in Sources */, - 69B137AC137BF39900C06507 /* tcd.c in Sources */, - 69B137AD137BF39900C06507 /* tgt.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 69F9859E0D40A48E00C2791C /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 69F9860E0D40A7B000C2791C /* bio.c in Sources */, - 69F9860F0D40A7B000C2791C /* cio.c in Sources */, - 69F986100D40A7B000C2791C /* dwt.c in Sources */, - 69F986110D40A7B000C2791C /* event.c in Sources */, - 69F986120D40A7B000C2791C /* image.c in Sources */, - 69F986130D40A7B000C2791C /* j2k.c in Sources */, - 69F986140D40A7B000C2791C /* j2k_lib.c in Sources */, - 69F986150D40A7B000C2791C /* jp2.c in Sources */, - 69F986160D40A7B000C2791C /* jpt.c in Sources */, - 69F986170D40A7B000C2791C /* mct.c in Sources */, - 69F986180D40A7B000C2791C /* mqc.c in Sources */, - 69F986190D40A7B000C2791C /* openjpeg.c in Sources */, - 69F9861A0D40A7B000C2791C /* pi.c in Sources */, - 69F9861B0D40A7B000C2791C /* raw.c in Sources */, - 69F9861C0D40A7B000C2791C /* t1.c in Sources */, - 69F9861E0D40A7B000C2791C /* t2.c in Sources */, - 69F9861F0D40A7B000C2791C /* tcd.c in Sources */, - 69F986200D40A7B000C2791C /* tgt.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 69F985B30D40A63D00C2791C /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 69F986210D40A7B100C2791C /* bio.c in Sources */, - 69F986220D40A7B100C2791C /* cio.c in Sources */, - 69F986230D40A7B100C2791C /* dwt.c in Sources */, - 69F986240D40A7B100C2791C /* event.c in Sources */, - 69F986250D40A7B100C2791C /* image.c in Sources */, - 69F986260D40A7B100C2791C /* j2k.c in Sources */, - 69F986270D40A7B100C2791C /* j2k_lib.c in Sources */, - 69F986280D40A7B100C2791C /* jp2.c in Sources */, - 69F986290D40A7B100C2791C /* jpt.c in Sources */, - 69F9862A0D40A7B100C2791C /* mct.c in Sources */, - 69F9862B0D40A7B100C2791C /* mqc.c in Sources */, - 69F9862C0D40A7B100C2791C /* openjpeg.c in Sources */, - 69F9862D0D40A7B100C2791C /* pi.c in Sources */, - 69F9862E0D40A7B100C2791C /* raw.c in Sources */, - 69F9862F0D40A7B100C2791C /* t1.c in Sources */, - 69F986310D40A7B100C2791C /* t2.c in Sources */, - 69F986320D40A7B100C2791C /* tcd.c in Sources */, - 69F986330D40A7B100C2791C /* tgt.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 69F986360D40A7DA00C2791C /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 69B13609137BE4B600C06507 /* convert.c in Sources */, - 69B1360A137BE4B600C06507 /* image_to_j2k.c in Sources */, - 69B1360B137BE4B600C06507 /* index.c in Sources */, - 69B1360C137BE4C000C06507 /* getopt.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 69F986590D40A8E200C2791C /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 69B1360D137BE4DB00C06507 /* convert.c in Sources */, - 69B1360E137BE4DB00C06507 /* index.c in Sources */, - 69B1360F137BE4DB00C06507 /* j2k_to_image.c in Sources */, - 69B13610137BE4DB00C06507 /* color.c in Sources */, - 69B13611137BE4DB00C06507 /* getopt.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - 692CF265122BB2760010088E /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 692CF20D122BAF7A0010088E /* opj_JPWL_static */; - targetProxy = 692CF264122BB2760010088E /* PBXContainerItemProxy */; - }; - 692CF267122BB2760010088E /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 692CF23C122BB1D60010088E /* JPWL_image_to_j2k */; - targetProxy = 692CF266122BB2760010088E /* PBXContainerItemProxy */; - }; - 692CF269122BB2760010088E /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 692CF24A122BB2110010088E /* JPWL_j2k_to_image */; - targetProxy = 692CF268122BB2760010088E /* PBXContainerItemProxy */; - }; - 692CF275122BB29A0010088E /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 694039A6117B7E090079DE22 /* build OPJ */; - targetProxy = 692CF274122BB29A0010088E /* PBXContainerItemProxy */; - }; - 692CF277122BB29A0010088E /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 692CF258122BB2640010088E /* build OPJ_JPWL */; - targetProxy = 692CF276122BB29A0010088E /* PBXContainerItemProxy */; - }; - 6938D7E912D0F4C10017B83E /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 694E0EFA12953FD2008AFCC7 /* build OPJ_MJ2 */; - targetProxy = 6938D7E812D0F4C10017B83E /* PBXContainerItemProxy */; - }; - 694039AB117B7E390079DE22 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 69F985A00D40A48E00C2791C /* opj_static */; - targetProxy = 694039AA117B7E390079DE22 /* PBXContainerItemProxy */; - }; - 694039AD117B7E3D0079DE22 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 69F986380D40A7DA00C2791C /* image_to_j2k */; - targetProxy = 694039AC117B7E3D0079DE22 /* PBXContainerItemProxy */; - }; - 694039AF117B7E420079DE22 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 69F9865B0D40A8E200C2791C /* j2k_to_image */; - targetProxy = 694039AE117B7E420079DE22 /* PBXContainerItemProxy */; - }; - 694E0D4F12912DED008AFCC7 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 694E0D4412912A70008AFCC7 /* opj_config */; - targetProxy = 694E0D4E12912DED008AFCC7 /* PBXContainerItemProxy */; - }; - 694E0D5112912DFE008AFCC7 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 694E0D4412912A70008AFCC7 /* opj_config */; - targetProxy = 694E0D5012912DFE008AFCC7 /* PBXContainerItemProxy */; - }; - 694E0D5312912E09008AFCC7 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 694E0D4412912A70008AFCC7 /* opj_config */; - targetProxy = 694E0D5212912E09008AFCC7 /* PBXContainerItemProxy */; - }; - 694E0D5512912E0E008AFCC7 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 694E0D4412912A70008AFCC7 /* opj_config */; - targetProxy = 694E0D5412912E0E008AFCC7 /* PBXContainerItemProxy */; - }; - 694E0D5712912E19008AFCC7 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 694E0D4412912A70008AFCC7 /* opj_config */; - targetProxy = 694E0D5612912E19008AFCC7 /* PBXContainerItemProxy */; - }; - 694E0D5912912E1F008AFCC7 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 694E0D4412912A70008AFCC7 /* opj_config */; - targetProxy = 694E0D5812912E1F008AFCC7 /* PBXContainerItemProxy */; - }; - 694E0D5B12912E27008AFCC7 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 694E0D4412912A70008AFCC7 /* opj_config */; - targetProxy = 694E0D5A12912E27008AFCC7 /* PBXContainerItemProxy */; - }; - 694E0DA412913354008AFCC7 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 694E0D99129132D7008AFCC7 /* j2k_dump */; - targetProxy = 694E0DA312913354008AFCC7 /* PBXContainerItemProxy */; - }; - 694E0DAE12913478008AFCC7 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 694E0D4412912A70008AFCC7 /* opj_config */; - targetProxy = 694E0DAD12913478008AFCC7 /* PBXContainerItemProxy */; - }; - 694E0DCC129134F3008AFCC7 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 694E0D4412912A70008AFCC7 /* opj_config */; - targetProxy = 694E0DCB129134F3008AFCC7 /* PBXContainerItemProxy */; - }; - 694E0DCE1291350B008AFCC7 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 69F985B50D40A63D00C2791C /* opj_dynamic */; - targetProxy = 694E0DCD1291350B008AFCC7 /* PBXContainerItemProxy */; - }; - 694E0DD012913537008AFCC7 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 694E0DA81291340E008AFCC7 /* opj_JPWL_dynamic */; - targetProxy = 694E0DCF12913537008AFCC7 /* PBXContainerItemProxy */; - }; - 694E0EBC12953E05008AFCC7 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 694E0D4412912A70008AFCC7 /* opj_config */; - targetProxy = 694E0EBB12953E05008AFCC7 /* PBXContainerItemProxy */; - }; - 694E0EC412953EC7008AFCC7 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 694E0D4412912A70008AFCC7 /* opj_config */; - targetProxy = 694E0EC512953EC7008AFCC7 /* PBXContainerItemProxy */; - }; - 694E0ED312953F2B008AFCC7 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 694E0D4412912A70008AFCC7 /* opj_config */; - targetProxy = 694E0ED412953F2B008AFCC7 /* PBXContainerItemProxy */; - }; - 694E0EEA12953F82008AFCC7 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 694E0D4412912A70008AFCC7 /* opj_config */; - targetProxy = 694E0EEB12953F82008AFCC7 /* PBXContainerItemProxy */; - }; - 694E0EFE12953FDB008AFCC7 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 694E0EE912953F82008AFCC7 /* wrap_j2k_in_mj2 */; - targetProxy = 694E0EFD12953FDB008AFCC7 /* PBXContainerItemProxy */; - }; - 694E0F0012953FDB008AFCC7 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 694E0ED212953F2B008AFCC7 /* mj2_to_frames */; - targetProxy = 694E0EFF12953FDB008AFCC7 /* PBXContainerItemProxy */; - }; - 694E0F0212953FDB008AFCC7 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 694E0EC312953EC7008AFCC7 /* frames_to_mj2 */; - targetProxy = 694E0F0112953FDB008AFCC7 /* PBXContainerItemProxy */; - }; - 694E0F0412953FDB008AFCC7 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 694E0EB612953DF3008AFCC7 /* extract_j2k_from_mj2 */; - targetProxy = 694E0F0312953FDB008AFCC7 /* PBXContainerItemProxy */; - }; - 69B136FC137BEE3700C06507 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 69B136DC137BECDC00C06507 /* openjpip_server */; - targetProxy = 69B136FB137BEE3700C06507 /* PBXContainerItemProxy */; - }; - 69B136FE137BEE3C00C06507 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 69B136E3137BED3400C06507 /* opj_server */; - targetProxy = 69B136FD137BEE3C00C06507 /* PBXContainerItemProxy */; - }; - 69B13700137BEE4000C06507 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 69B136EA137BED4A00C06507 /* opj_dec_server */; - targetProxy = 69B136FF137BEE4000C06507 /* PBXContainerItemProxy */; - }; - 69B13704137BEE5A00C06507 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 69B136F8137BEE2C00C06507 /* build OPJ_JPIP */; - targetProxy = 69B13703137BEE5A00C06507 /* PBXContainerItemProxy */; - }; - 69B13789137BF2E500C06507 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 69B13780137BF2CE00C06507 /* index_create */; - targetProxy = 69B13788137BF2E500C06507 /* PBXContainerItemProxy */; - }; - 69B1378B137BF2E500C06507 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 69B13772137BF2A900C06507 /* test_index */; - targetProxy = 69B1378A137BF2E500C06507 /* PBXContainerItemProxy */; - }; - 69B1378D137BF2E500C06507 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 69B1376B137BF29500C06507 /* addXMLinJP2 */; - targetProxy = 69B1378C137BF2E500C06507 /* PBXContainerItemProxy */; - }; - 69B1378F137BF2E500C06507 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 69B13764137BF27B00C06507 /* jpt_to_jp2 */; - targetProxy = 69B1378E137BF2E500C06507 /* PBXContainerItemProxy */; - }; - 69B13791137BF2E500C06507 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 69B1375D137BF26900C06507 /* jpt_to_j2k */; - targetProxy = 69B13790137BF2E500C06507 /* PBXContainerItemProxy */; - }; - 69B13793137BF2F700C06507 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 69B13785137BF2DE00C06507 /* opj_tools */; - targetProxy = 69B13792137BF2F700C06507 /* PBXContainerItemProxy */; - }; - 69B137B4137BF40B00C06507 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 69B13712137BEEDD00C06507 /* openjpip_local */; - targetProxy = 69B137B3137BF40B00C06507 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin XCBuildConfiguration section */ - 692CF20F122BAF7A0010088E /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = /usr/local/lib; - OTHER_CFLAGS = "-DUSE_JPWL"; - PREBINDING = NO; - PRODUCT_NAME = openjpeg_JPWL; - }; - name = Debug; - }; - 692CF210122BAF7A0010088E /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/lib; - OTHER_CFLAGS = "-DUSE_JPWL"; - PREBINDING = NO; - PRODUCT_NAME = openjpeg_JPWL; - ZERO_LINK = NO; - }; - name = Release; - }; - 692CF245122BB1D60010088E /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_LINK_WITH_DYNAMIC_LIBRARIES = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = "$(HOME)/bin"; - OTHER_CFLAGS = "-DUSE_JPWL"; - OTHER_LDFLAGS = ( - "$(BUILD_DIR)/$(CONFIGURATION)/libopenjpeg_JPWL.a", - "-lpng", - "-ltiff", - ); - PREBINDING = NO; - PRODUCT_NAME = JPWL_image_to_j2k; - USER_HEADER_SEARCH_PATHS = ./libopenjpeg; - ZERO_LINK = YES; - }; - name = Debug; - }; - 692CF246122BB1D60010088E /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_LINK_WITH_DYNAMIC_LIBRARIES = YES; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = "$(HOME)/bin"; - OTHER_CFLAGS = "-DUSE_JPWL"; - OTHER_LDFLAGS = ( - "$(BUILD_DIR)/$(CONFIGURATION)/libopenjpeg_JPWL.a", - "-lpng", - "-ltiff", - ); - PREBINDING = NO; - PRODUCT_NAME = JPWL_image_to_j2k; - USER_HEADER_SEARCH_PATHS = ./libopenjpeg; - ZERO_LINK = NO; - }; - name = Release; - }; - 692CF253122BB2110010088E /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_LINK_WITH_DYNAMIC_LIBRARIES = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = "$(HOME)/bin"; - OTHER_CFLAGS = "-DUSE_JPWL"; - OTHER_LDFLAGS = ( - "$(BUILD_DIR)/$(CONFIGURATION)/libopenjpeg_JPWL.a", - "-lpng", - "-ltiff", - ); - PREBINDING = NO; - PRODUCT_NAME = JPWL_j2k_to_image; - USER_HEADER_SEARCH_PATHS = ./libopenjpeg; - ZERO_LINK = YES; - }; - name = Debug; - }; - 692CF254122BB2110010088E /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_LINK_WITH_DYNAMIC_LIBRARIES = YES; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = "$(HOME)/bin"; - OTHER_CFLAGS = "-DUSE_JPWL"; - OTHER_LDFLAGS = ( - "$(BUILD_DIR)/$(CONFIGURATION)/libopenjpeg_JPWL.a", - "-lpng", - "-ltiff", - ); - PREBINDING = NO; - PRODUCT_NAME = JPWL_j2k_to_image; - USER_HEADER_SEARCH_PATHS = ./libopenjpeg; - ZERO_LINK = NO; - }; - name = Release; - }; - 692CF262122BB2640010088E /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; - PRODUCT_NAME = "build all"; - }; - name = Debug; - }; - 692CF263122BB2640010088E /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - PRODUCT_NAME = "build all"; - ZERO_LINK = NO; - }; - name = Release; - }; - 692CF272122BB2850010088E /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; - PRODUCT_NAME = "build all"; - }; - name = Debug; - }; - 692CF273122BB2850010088E /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - PRODUCT_NAME = "build all"; - ZERO_LINK = NO; - }; - name = Release; - }; - 694039A7117B7E0A0079DE22 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; - PRODUCT_NAME = "build all"; - }; - name = Debug; - }; - 694039A8117B7E0A0079DE22 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - PRODUCT_NAME = "build all"; - ZERO_LINK = NO; - }; - name = Release; - }; - 694E0D4512912A71008AFCC7 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; - PRODUCT_NAME = opj_config; - }; - name = Debug; - }; - 694E0D4612912A71008AFCC7 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - PRODUCT_NAME = opj_config; - ZERO_LINK = NO; - }; - name = Release; - }; - 694E0D9C129132D8008AFCC7 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = "$(BUILD_DIR)/$(CONFIGURATION)/libopenjpeg.a"; - PREBINDING = NO; - PRODUCT_NAME = j2k_dump; - USER_HEADER_SEARCH_PATHS = ./libopenjpeg; - }; - name = Debug; - }; - 694E0D9D129132D8008AFCC7 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = dwarf; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = "$(BUILD_DIR)/$(CONFIGURATION)/libopenjpeg.a"; - PREBINDING = NO; - PRODUCT_NAME = j2k_dump; - USER_HEADER_SEARCH_PATHS = ./libopenjpeg; - ZERO_LINK = NO; - }; - name = Release; - }; - 694E0DAA1291340E008AFCC7 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - EXECUTABLE_PREFIX = lib; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = /usr/local/lib; - PREBINDING = NO; - PRODUCT_NAME = openjpeg_JPWL; - }; - name = Debug; - }; - 694E0DAB1291340E008AFCC7 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = dwarf; - EXECUTABLE_PREFIX = lib; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/lib; - PREBINDING = NO; - PRODUCT_NAME = openjpeg_JPWL; - ZERO_LINK = NO; - }; - name = Release; - }; - 694E0EB912953DF4008AFCC7 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = "$(BUILD_DIR)/$(CONFIGURATION)/libopenjpeg.a"; - PREBINDING = NO; - PRODUCT_NAME = extract_j2k_from_mj2; - }; - name = Debug; - }; - 694E0EBA12953DF4008AFCC7 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = dwarf; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = "$(BUILD_DIR)/$(CONFIGURATION)/libopenjpeg.a"; - PREBINDING = NO; - PRODUCT_NAME = extract_j2k_from_mj2; - ZERO_LINK = NO; - }; - name = Release; - }; - 694E0ECB12953EC7008AFCC7 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = "$(BUILD_DIR)/$(CONFIGURATION)/libopenjpeg.a"; - PREBINDING = NO; - PRODUCT_NAME = frames_to_mj2; - }; - name = Debug; - }; - 694E0ECC12953EC7008AFCC7 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = dwarf; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = "$(BUILD_DIR)/$(CONFIGURATION)/libopenjpeg.a"; - PREBINDING = NO; - PRODUCT_NAME = frames_to_mj2; - ZERO_LINK = NO; - }; - name = Release; - }; - 694E0EDA12953F2B008AFCC7 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = "$(BUILD_DIR)/$(CONFIGURATION)/libopenjpeg.a"; - PREBINDING = NO; - PRODUCT_NAME = mj2_to_frames; - }; - name = Debug; - }; - 694E0EDB12953F2B008AFCC7 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = dwarf; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = "$(BUILD_DIR)/$(CONFIGURATION)/libopenjpeg.a"; - PREBINDING = NO; - PRODUCT_NAME = mj2_to_frames; - ZERO_LINK = NO; - }; - name = Release; - }; - 694E0EF112953F82008AFCC7 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = "$(BUILD_DIR)/$(CONFIGURATION)/libopenjpeg.a"; - PREBINDING = NO; - PRODUCT_NAME = wrap_j2k_in_mj2; - }; - name = Debug; - }; - 694E0EF212953F82008AFCC7 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = dwarf; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = "$(BUILD_DIR)/$(CONFIGURATION)/libopenjpeg.a"; - PREBINDING = NO; - PRODUCT_NAME = wrap_j2k_in_mj2; - ZERO_LINK = NO; - }; - name = Release; - }; - 694E0EFB12953FD2008AFCC7 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; - PRODUCT_NAME = "build OPJ_MJ2"; - }; - name = Debug; - }; - 694E0EFC12953FD2008AFCC7 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - PRODUCT_NAME = "build OPJ_MJ2"; - ZERO_LINK = NO; - }; - name = Release; - }; - 69B136DE137BECDC00C06507 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = /usr/local/lib; - OTHER_CFLAGS = "-DSERVER"; - PREBINDING = NO; - PRODUCT_NAME = openjpip_server; - }; - name = Debug; - }; - 69B136DF137BECDC00C06507 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/lib; - OTHER_CFLAGS = "-DSERVER"; - PREBINDING = NO; - PRODUCT_NAME = openjpip_server; - ZERO_LINK = NO; - }; - name = Release; - }; - 69B136E6137BED3400C06507 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = ( - "-lm", - "-lfcgi", - ); - PREBINDING = NO; - PRODUCT_NAME = opj_server; - }; - name = Debug; - }; - 69B136E7137BED3400C06507 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = ( - "-lm", - "-lfcgi", - ); - PREBINDING = NO; - PRODUCT_NAME = opj_server; - ZERO_LINK = NO; - }; - name = Release; - }; - 69B136ED137BED4B00C06507 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = /usr/local/bin; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/build/Release\"", - ); - OTHER_LDFLAGS = ( - "$(BUILD_DIR)/$(CONFIGURATION)/libopenjpeg.a", - "-lm", - ); - PREBINDING = NO; - PRODUCT_NAME = opj_dec_server; - }; - name = Debug; - }; - 69B136EE137BED4B00C06507 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/bin; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/build/Release\"", - ); - OTHER_LDFLAGS = ( - "$(BUILD_DIR)/$(CONFIGURATION)/libopenjpeg.a", - "-lm", - ); - PREBINDING = NO; - PRODUCT_NAME = opj_dec_server; - ZERO_LINK = NO; - }; - name = Release; - }; - 69B136F9137BEE2C00C06507 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; - PRODUCT_NAME = "build openjpip"; - }; - name = Debug; - }; - 69B136FA137BEE2C00C06507 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - PRODUCT_NAME = "build openjpip"; - ZERO_LINK = NO; - }; - name = Release; - }; - 69B13714137BEEDD00C06507 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = /usr/local/lib; - PREBINDING = NO; - PRODUCT_NAME = openjpip_local; - }; - name = Debug; - }; - 69B13715137BEEDD00C06507 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/lib; - PREBINDING = NO; - PRODUCT_NAME = openjpip_local; - ZERO_LINK = NO; - }; - name = Release; - }; - 69B13760137BF26A00C06507 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = /usr/local/bin; - PREBINDING = NO; - PRODUCT_NAME = jpt_to_j2k; - }; - name = Debug; - }; - 69B13761137BF26A00C06507 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/bin; - PREBINDING = NO; - PRODUCT_NAME = jpt_to_j2k; - ZERO_LINK = NO; - }; - name = Release; - }; - 69B13767137BF27B00C06507 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = /usr/local/bin; - PREBINDING = NO; - PRODUCT_NAME = jpt_to_jp2; - }; - name = Debug; - }; - 69B13768137BF27B00C06507 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/bin; - PREBINDING = NO; - PRODUCT_NAME = jpt_to_jp2; - ZERO_LINK = NO; - }; - name = Release; - }; - 69B1376E137BF29600C06507 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = /usr/local/bin; - PREBINDING = NO; - PRODUCT_NAME = addXMLinJP2; - }; - name = Debug; - }; - 69B1376F137BF29600C06507 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/bin; - PREBINDING = NO; - PRODUCT_NAME = addXMLinJP2; - ZERO_LINK = NO; - }; - name = Release; - }; - 69B13775137BF2A900C06507 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = /usr/local/bin; - PREBINDING = NO; - PRODUCT_NAME = test_index; - }; - name = Debug; - }; - 69B13776137BF2A900C06507 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/bin; - PREBINDING = NO; - PRODUCT_NAME = test_index; - ZERO_LINK = NO; - }; - name = Release; - }; - 69B13783137BF2CF00C06507 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = /usr/local/bin; - PREBINDING = NO; - PRODUCT_NAME = index_create; - }; - name = Debug; - }; - 69B13784137BF2CF00C06507 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/bin; - PREBINDING = NO; - PRODUCT_NAME = index_create; - ZERO_LINK = NO; - }; - name = Release; - }; - 69B13786137BF2DE00C06507 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; - PRODUCT_NAME = opj_tools; - }; - name = Debug; - }; - 69B13787137BF2DE00C06507 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - PRODUCT_NAME = opj_tools; - ZERO_LINK = NO; - }; - name = Release; - }; - 69F984AA0D40A3AE00C2791C /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(NATIVE_ARCH_ACTUAL)"; - COPY_PHASE_STRIP = NO; - GCC_LINK_WITH_DYNAMIC_LIBRARIES = YES; - }; - name = Debug; - }; - 69F984AB0D40A3AE00C2791C /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(NATIVE_ARCH_ACTUAL)"; - COPY_PHASE_STRIP = YES; - GCC_LINK_WITH_DYNAMIC_LIBRARIES = YES; - }; - name = Release; - }; - 69F985A40D40A48F00C2791C /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = /usr/local/lib; - PREBINDING = NO; - PRODUCT_NAME = openjpeg; - USER_HEADER_SEARCH_PATHS = ./libopenjpeg; - ZERO_LINK = YES; - }; - name = Debug; - }; - 69F985A50D40A48F00C2791C /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/lib; - PREBINDING = NO; - PRODUCT_NAME = openjpeg; - USER_HEADER_SEARCH_PATHS = ./libopenjpeg; - ZERO_LINK = NO; - }; - name = Release; - }; - 69F985BA0D40A69400C2791C /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - EXECUTABLE_PREFIX = lib; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = /usr/local/lib; - PREBINDING = NO; - PRODUCT_NAME = openjpeg; - USER_HEADER_SEARCH_PATHS = ./libopenjpeg; - ZERO_LINK = YES; - }; - name = Debug; - }; - 69F985BB0D40A69400C2791C /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - EXECUTABLE_PREFIX = lib; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = /usr/local/lib; - PREBINDING = NO; - PRODUCT_NAME = openjpeg; - USER_HEADER_SEARCH_PATHS = ./libopenjpeg; - ZERO_LINK = NO; - }; - name = Release; - }; - 69F9864C0D40A7F200C2791C /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_LINK_WITH_DYNAMIC_LIBRARIES = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = "$(HOME)/bin"; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ( - "$(BUILD_DIR)/$(CONFIGURATION)/libopenjpeg.a", - "-lpng", - "-ltiff", - ); - PREBINDING = NO; - PRODUCT_NAME = image_to_j2k; - USER_HEADER_SEARCH_PATHS = ./libopenjpeg; - ZERO_LINK = YES; - }; - name = Debug; - }; - 69F9864D0D40A7F200C2791C /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_LINK_WITH_DYNAMIC_LIBRARIES = YES; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = "$(HOME)/bin"; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ( - "$(BUILD_DIR)/$(CONFIGURATION)/libopenjpeg.a", - "-lpng", - "-ltiff", - ); - PREBINDING = NO; - PRODUCT_NAME = image_to_j2k; - USER_HEADER_SEARCH_PATHS = ./libopenjpeg; - ZERO_LINK = NO; - }; - name = Release; - }; - 69F986660D40A93B00C2791C /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_LINK_WITH_DYNAMIC_LIBRARIES = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = "$(HOME)/bin"; - OTHER_LDFLAGS = ( - "$(BUILD_DIR)/$(CONFIGURATION)/libopenjpeg.a", - "-lpng", - "-ltiff", - ); - PREBINDING = NO; - PRODUCT_NAME = j2k_to_image; - USER_HEADER_SEARCH_PATHS = ./libopenjpeg; - ZERO_LINK = YES; - }; - name = Debug; - }; - 69F986670D40A93B00C2791C /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_LINK_WITH_DYNAMIC_LIBRARIES = YES; - GCC_MODEL_TUNING = G5; - INSTALL_PATH = "$(HOME)/bin"; - OTHER_LDFLAGS = ( - "$(BUILD_DIR)/$(CONFIGURATION)/libopenjpeg.a", - "-lpng", - "-ltiff", - ); - PREBINDING = NO; - PRODUCT_NAME = j2k_to_image; - USER_HEADER_SEARCH_PATHS = ./libopenjpeg; - ZERO_LINK = NO; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 692CF224122BAFBF0010088E /* Build configuration list for PBXNativeTarget "opj_JPWL_static" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 692CF20F122BAF7A0010088E /* Debug */, - 692CF210122BAF7A0010088E /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 692CF244122BB1D60010088E /* Build configuration list for PBXNativeTarget "JPWL_image_to_j2k" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 692CF245122BB1D60010088E /* Debug */, - 692CF246122BB1D60010088E /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 692CF252122BB2110010088E /* Build configuration list for PBXNativeTarget "JPWL_j2k_to_image" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 692CF253122BB2110010088E /* Debug */, - 692CF254122BB2110010088E /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 692CF261122BB2640010088E /* Build configuration list for PBXAggregateTarget "build OPJ_JPWL" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 692CF262122BB2640010088E /* Debug */, - 692CF263122BB2640010088E /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 692CF271122BB2850010088E /* Build configuration list for PBXAggregateTarget "build all" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 692CF272122BB2850010088E /* Debug */, - 692CF273122BB2850010088E /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 694039A9117B7E2E0079DE22 /* Build configuration list for PBXAggregateTarget "build OPJ" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 694039A7117B7E0A0079DE22 /* Debug */, - 694039A8117B7E0A0079DE22 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 694E0D4712912A8F008AFCC7 /* Build configuration list for PBXAggregateTarget "opj_config" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 694E0D4512912A71008AFCC7 /* Debug */, - 694E0D4612912A71008AFCC7 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 694E0D9F1291330E008AFCC7 /* Build configuration list for PBXNativeTarget "j2k_dump" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 694E0D9C129132D8008AFCC7 /* Debug */, - 694E0D9D129132D8008AFCC7 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 694E0DAC1291342C008AFCC7 /* Build configuration list for PBXNativeTarget "opj_JPWL_dynamic" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 694E0DAA1291340E008AFCC7 /* Debug */, - 694E0DAB1291340E008AFCC7 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 694E0EBD12953E23008AFCC7 /* Build configuration list for PBXNativeTarget "extract_j2k_from_mj2" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 694E0EB912953DF4008AFCC7 /* Debug */, - 694E0EBA12953DF4008AFCC7 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 694E0ECA12953EC7008AFCC7 /* Build configuration list for PBXNativeTarget "frames_to_mj2" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 694E0ECB12953EC7008AFCC7 /* Debug */, - 694E0ECC12953EC7008AFCC7 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 694E0ED912953F2B008AFCC7 /* Build configuration list for PBXNativeTarget "mj2_to_frames" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 694E0EDA12953F2B008AFCC7 /* Debug */, - 694E0EDB12953F2B008AFCC7 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 694E0EF012953F82008AFCC7 /* Build configuration list for PBXNativeTarget "wrap_j2k_in_mj2" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 694E0EF112953F82008AFCC7 /* Debug */, - 694E0EF212953F82008AFCC7 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 694E0F0612953FF2008AFCC7 /* Build configuration list for PBXAggregateTarget "build OPJ_MJ2" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 694E0EFB12953FD2008AFCC7 /* Debug */, - 694E0EFC12953FD2008AFCC7 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 69B136E0137BECFA00C06507 /* Build configuration list for PBXNativeTarget "openjpip_server" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 69B136DE137BECDC00C06507 /* Debug */, - 69B136DF137BECDC00C06507 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 69B136EF137BED6900C06507 /* Build configuration list for PBXNativeTarget "opj_server" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 69B136E6137BED3400C06507 /* Debug */, - 69B136E7137BED3400C06507 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 69B136F0137BED6900C06507 /* Build configuration list for PBXNativeTarget "opj_dec_server" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 69B136ED137BED4B00C06507 /* Debug */, - 69B136EE137BED4B00C06507 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 69B1370E137BEE7B00C06507 /* Build configuration list for PBXAggregateTarget "build OPJ_JPIP" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 69B136F9137BEE2C00C06507 /* Debug */, - 69B136FA137BEE2C00C06507 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 69B1371E137BEF0400C06507 /* Build configuration list for PBXNativeTarget "openjpip_local" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 69B13714137BEEDD00C06507 /* Debug */, - 69B13715137BEEDD00C06507 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 69B1377A137BF2AE00C06507 /* Build configuration list for PBXNativeTarget "jpt_to_j2k" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 69B13760137BF26A00C06507 /* Debug */, - 69B13761137BF26A00C06507 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 69B1377B137BF2AE00C06507 /* Build configuration list for PBXNativeTarget "jpt_to_jp2" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 69B13767137BF27B00C06507 /* Debug */, - 69B13768137BF27B00C06507 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 69B1377C137BF2AE00C06507 /* Build configuration list for PBXNativeTarget "addXMLinJP2" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 69B1376E137BF29600C06507 /* Debug */, - 69B1376F137BF29600C06507 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 69B1377D137BF2AE00C06507 /* Build configuration list for PBXNativeTarget "test_index" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 69B13775137BF2A900C06507 /* Debug */, - 69B13776137BF2A900C06507 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 69B13796137BF30B00C06507 /* Build configuration list for PBXNativeTarget "index_create" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 69B13783137BF2CF00C06507 /* Debug */, - 69B13784137BF2CF00C06507 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 69B13797137BF30B00C06507 /* Build configuration list for PBXAggregateTarget "opj_tools" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 69B13786137BF2DE00C06507 /* Debug */, - 69B13787137BF2DE00C06507 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 69F984A90D40A3AE00C2791C /* Build configuration list for PBXProject "openjpeg" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 69F984AA0D40A3AE00C2791C /* Debug */, - 69F984AB0D40A3AE00C2791C /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 69F985A30D40A48F00C2791C /* Build configuration list for PBXNativeTarget "opj_static" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 69F985A40D40A48F00C2791C /* Debug */, - 69F985A50D40A48F00C2791C /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 69F985B90D40A69400C2791C /* Build configuration list for PBXNativeTarget "opj_dynamic" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 69F985BA0D40A69400C2791C /* Debug */, - 69F985BB0D40A69400C2791C /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 69F9864B0D40A7F200C2791C /* Build configuration list for PBXNativeTarget "image_to_j2k" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 69F9864C0D40A7F200C2791C /* Debug */, - 69F9864D0D40A7F200C2791C /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 69F986650D40A93B00C2791C /* Build configuration list for PBXNativeTarget "j2k_to_image" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 69F986660D40A93B00C2791C /* Debug */, - 69F986670D40A93B00C2791C /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 69F984A80D40A3AE00C2791C /* Project object */; -} From 676f8f189f338ababaf67fe652c708e82770d524 Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Wed, 10 Aug 2011 08:12:10 +0000 Subject: [PATCH 26/33] removed unused parameters warnings with the solution proposed by myself and Bob Friesenhahn --- CHANGES | 3 +++ applications/codec/j2k_dump.c | 4 +++- libopenjpeg/j2k.c | 6 +++++- libopenjpeg/jp2.c | 9 +++++++++ libopenjpeg/openjpeg.c | 4 ++++ libopenjpeg/opj_includes.h | 3 +++ libopenjpeg/t1.c | 6 ++++-- libopenjpeg/tcd.c | 2 ++ 8 files changed, 33 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index 82c68804..7a4740dc 100644 --- a/CHANGES +++ b/CHANGES @@ -5,6 +5,9 @@ What's New for OpenJPEG ! : changed + : added +August 10, 2011 +! [mickael] removed unused parameters warnings with the solution proposed by myself and Bob Friesenhahn. + August 9, 2011 - [antonin] removed xcode project files (cmake and autotools are now the only supported build methods) diff --git a/applications/codec/j2k_dump.c b/applications/codec/j2k_dump.c index b0f44043..02f8316c 100644 --- a/applications/codec/j2k_dump.c +++ b/applications/codec/j2k_dump.c @@ -200,8 +200,10 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,i option_t long_option[]={ {"ImgDir",REQ_ARG, NULL ,'y'}, }; - const char optlist[] = "i:o:h"; + + OPJ_ARG_NOT_USED(indexfilename); + totlen=sizeof(long_option); img_fol->set_out_format = 0; do { diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c index 0b09899a..0a58a81a 100644 --- a/libopenjpeg/j2k.c +++ b/libopenjpeg/j2k.c @@ -297,6 +297,9 @@ static int j2k_get_num_tp(opj_cp_t *cp,int pino,int tileno){ /** mem allocation for TLM marker*/ int j2k_calculate_tp(opj_cp_t *cp,int img_numcomp,opj_image_t *image,opj_j2k_t *j2k ){ int pino,tileno,totnum_tp=0; + + OPJ_ARG_NOT_USED(img_numcomp); + j2k->cur_totnum_tp = (int *) opj_malloc(cp->tw * cp->th * sizeof(int)); for (tileno = 0; tileno < cp->tw * cp->th; tileno++) { int cur_totnum_tp = 0; @@ -1848,8 +1851,9 @@ opj_image_t* j2k_decode_jpt_stream(opj_j2k_t *j2k, opj_cio_t *cio, opj_codestre opj_jpt_msg_header_t header; int position; + OPJ_ARG_NOT_USED(cstr_info); + opj_common_ptr cinfo = j2k->cinfo; - j2k->cio = cio; /* create an empty image */ diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c index 39d48a5f..9c9c476f 100644 --- a/libopenjpeg/jp2.c +++ b/libopenjpeg/jp2.c @@ -398,6 +398,9 @@ static opj_bool jp2_read_pclr(opj_jp2_t *jp2, opj_cio_t *cio, unsigned short i, j; unsigned char uc; + OPJ_ARG_NOT_USED(box); + OPJ_ARG_NOT_USED(jp2); + /* Part 1, I.5.3.4: 'There shall be at most one Palette box inside * a JP2 Header box' : */ @@ -446,6 +449,9 @@ static opj_bool jp2_read_cmap(opj_jp2_t *jp2, opj_cio_t *cio, opj_jp2_cmap_comp_t *cmap; unsigned short i, nr_channels; + OPJ_ARG_NOT_USED(box); + OPJ_ARG_NOT_USED(jp2); + /* Need nr_channels: */ if(color->jp2_pclr == NULL) return OPJ_FALSE; @@ -511,6 +517,9 @@ static opj_bool jp2_read_cdef(opj_jp2_t *jp2, opj_cio_t *cio, opj_jp2_cdef_info_t *info; unsigned short i, n; + OPJ_ARG_NOT_USED(box); + OPJ_ARG_NOT_USED(jp2); + /* Part 1, I.5.3.6: 'The shall be at most one Channel Definition box * inside a JP2 Header box.' */ diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c index 790f2eea..00a910ec 100644 --- a/libopenjpeg/openjpeg.c +++ b/libopenjpeg/openjpeg.c @@ -36,6 +36,10 @@ #ifndef OPJ_STATIC BOOL APIENTRY DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) { + + OPJ_ARG_NOT_USED(lpReserved); + OPJ_ARG_NOT_USED(hModule); + switch (ul_reason_for_call) { case DLL_PROCESS_ATTACH : break; diff --git a/libopenjpeg/opj_includes.h b/libopenjpeg/opj_includes.h index 53a0c4a7..8da9dbdc 100644 --- a/libopenjpeg/opj_includes.h +++ b/libopenjpeg/opj_includes.h @@ -104,6 +104,9 @@ static INLINE long lrintf(float f){ } #endif +// Avoid compile-time warning because parameter is not used +#define OPJ_ARG_NOT_USED(x) (void)(x) + #include "j2k_lib.h" #include "opj_malloc.h" #include "event.h" diff --git a/libopenjpeg/t1.c b/libopenjpeg/t1.c index 002a82d4..b3ede36a 100644 --- a/libopenjpeg/t1.c +++ b/libopenjpeg/t1.c @@ -382,9 +382,10 @@ static INLINE void t1_dec_sigpass_step_raw( int vsc) { int v, flag; - opj_raw_t *raw = t1->raw; /* RAW component */ + OPJ_ARG_NOT_USED(orient); + flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp); if ((flag & T1_SIG_OTH) && !(flag & (T1_SIG | T1_VISIT))) { if (raw_decode(raw)) { @@ -823,9 +824,10 @@ static void t1_dec_clnpass_step_partial( int oneplushalf) { int v, flag; - opj_mqc_t *mqc = t1->mqc; /* MQC component */ + OPJ_ARG_NOT_USED(orient); + flag = *flagsp; mqc_setcurctx(mqc, t1_getctxno_sc(flag)); v = mqc_decode(mqc) ^ t1_getspb(flag); diff --git a/libopenjpeg/tcd.c b/libopenjpeg/tcd.c index 26548564..fc25179a 100644 --- a/libopenjpeg/tcd.c +++ b/libopenjpeg/tcd.c @@ -676,6 +676,8 @@ void tcd_malloc_decode_tile(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp, opj_tcp_t *tcp; opj_tcd_tile_t *tile; + OPJ_ARG_NOT_USED(cstr_info); + tcd->cp = cp; tcp = &(cp->tcps[cp->tileno[tileno]]); From e634cd0d623d64f8bb64f3efc06aafbda3aa4097 Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Wed, 10 Aug 2011 08:14:49 +0000 Subject: [PATCH 27/33] add copyright header into new test functions --- CHANGES | 1 + tests/comparePGXimages.c | 26 ++++++++++++++++++++++++++ tests/compare_dump_files.c | 26 ++++++++++++++++++++++++++ 3 files changed, 53 insertions(+) diff --git a/CHANGES b/CHANGES index 7a4740dc..74b36e88 100644 --- a/CHANGES +++ b/CHANGES @@ -7,6 +7,7 @@ What's New for OpenJPEG August 10, 2011 ! [mickael] removed unused parameters warnings with the solution proposed by myself and Bob Friesenhahn. +! [mickael] add copyright header into new test functions. August 9, 2011 - [antonin] removed xcode project files (cmake and autotools are now the only supported build methods) diff --git a/tests/comparePGXimages.c b/tests/comparePGXimages.c index 7a1e8f1c..7839e299 100644 --- a/tests/comparePGXimages.c +++ b/tests/comparePGXimages.c @@ -1,3 +1,29 @@ +/* + * Copyright (c) 2011, Mickael Savinaud, Communications & Systemes + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + /* * comparePGXimages.c * diff --git a/tests/compare_dump_files.c b/tests/compare_dump_files.c index 48b9d40f..c95d1610 100644 --- a/tests/compare_dump_files.c +++ b/tests/compare_dump_files.c @@ -1,3 +1,29 @@ +/* + * Copyright (c) 2011, Mickael Savinaud, Communications & Systemes + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + /* * compare_dump_files.c * From 9e419fdaf76d8100207b80627ec25ccfc535cb40 Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Wed, 10 Aug 2011 08:47:20 +0000 Subject: [PATCH 28/33] fixed glibc error with broken2 and broken4 images --- CHANGES | 1 + libopenjpeg/j2k.c | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 74b36e88..8ee45225 100644 --- a/CHANGES +++ b/CHANGES @@ -8,6 +8,7 @@ What's New for OpenJPEG August 10, 2011 ! [mickael] removed unused parameters warnings with the solution proposed by myself and Bob Friesenhahn. ! [mickael] add copyright header into new test functions. +* [mickael] fixed glibc error with broken2 and broken4 images. August 9, 2011 - [antonin] removed xcode project files (cmake and autotools are now the only supported build methods) diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c index 0a58a81a..32e8bd95 100644 --- a/libopenjpeg/j2k.c +++ b/libopenjpeg/j2k.c @@ -838,6 +838,15 @@ static void j2k_read_qcx(opj_j2k_t *j2k, int compno, int len) { }; }; + +#else + /* We check whether there are too many subbands */ + if ((numbands < 0) || (numbands >= J2K_MAXBANDS)) { + opj_event_msg(j2k->cinfo, EVT_WARNING , + "bad number of subbands in Sqcx (%d) regarding to J2K_MAXBANDS (%d) \n" + "- limiting number of bands to J2K_MAXBANDS and try to move to the next markers\n", numbands, J2K_MAXBANDS); + } + #endif /* USE_JPWL */ for (bandno = 0; bandno < numbands; bandno++) { @@ -850,8 +859,10 @@ static void j2k_read_qcx(opj_j2k_t *j2k, int compno, int len) { expn = tmp >> 11; mant = tmp & 0x7ff; } - tccp->stepsizes[bandno].expn = expn; - tccp->stepsizes[bandno].mant = mant; + if (bandno < J2K_MAXBANDS){ + tccp->stepsizes[bandno].expn = expn; + tccp->stepsizes[bandno].mant = mant; + } } /* Add Antonin : if scalar_derived -> compute other stepsizes */ @@ -915,7 +926,7 @@ static void j2k_read_qcc(opj_j2k_t *j2k) { int len, compno; int numcomp = j2k->image->numcomps; opj_cio_t *cio = j2k->cio; - + len = cio_read(cio, 2); /* Lqcc */ compno = cio_read(cio, numcomp <= 256 ? 1 : 2); /* Cqcc */ From 6fb9794200d0d096ef2ee8734fd10c920cc0febe Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Wed, 10 Aug 2011 09:00:34 +0000 Subject: [PATCH 29/33] fixed segfault with 123.j2c and bug.j2c images (thanks to Tim Mattox for his contribution to this patch) --- CHANGES | 1 + libopenjpeg/tcd.c | 29 +++++++++++++++++------------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/CHANGES b/CHANGES index 8ee45225..9402b7de 100644 --- a/CHANGES +++ b/CHANGES @@ -9,6 +9,7 @@ August 10, 2011 ! [mickael] removed unused parameters warnings with the solution proposed by myself and Bob Friesenhahn. ! [mickael] add copyright header into new test functions. * [mickael] fixed glibc error with broken2 and broken4 images. +* [mickael] fixed segfault with 123.j2c and bug.j2c images (thanks to Tim Mattox for his improvement). August 9, 2011 - [antonin] removed xcode project files (cmake and autotools are now the only supported build methods) diff --git a/libopenjpeg/tcd.c b/libopenjpeg/tcd.c index fc25179a..9c7bcc0d 100644 --- a/libopenjpeg/tcd.c +++ b/libopenjpeg/tcd.c @@ -1418,18 +1418,23 @@ opj_bool tcd_decode_tile(opj_tcd_t *tcd, unsigned char *src, int len, int tileno if (tcd->tcp->mct) { int n = (tile->comps[0].x1 - tile->comps[0].x0) * (tile->comps[0].y1 - tile->comps[0].y0); - if (tcd->tcp->tccps[0].qmfbid == 1) { - mct_decode( - tile->comps[0].data, - tile->comps[1].data, - tile->comps[2].data, - n); - } else { - mct_decode_real( - (float*)tile->comps[0].data, - (float*)tile->comps[1].data, - (float*)tile->comps[2].data, - n); + + if (tile->numcomps >= 3 ){ + if (tcd->tcp->tccps[0].qmfbid == 1) { + mct_decode( + tile->comps[0].data, + tile->comps[1].data, + tile->comps[2].data, + n); + } else { + mct_decode_real( + (float*)tile->comps[0].data, + (float*)tile->comps[1].data, + (float*)tile->comps[2].data, + n); + } + } else{ + opj_event_msg(tcd->cinfo, EVT_WARNING,"Number of components (%d) is inconsistent with a MCT. Skip the MCT step.\n",tile->numcomps); } } From 7812030886663e64bc6cae27dec153eded3de6d7 Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Wed, 10 Aug 2011 09:33:33 +0000 Subject: [PATCH 30/33] moved the definition of OPJ_ARG_NOT_USED from opj_includes.h to openjpeg.h --- CHANGES | 1 + libopenjpeg/openjpeg.h | 2 ++ libopenjpeg/opj_includes.h | 3 --- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 9402b7de..68f07ce8 100644 --- a/CHANGES +++ b/CHANGES @@ -10,6 +10,7 @@ August 10, 2011 ! [mickael] add copyright header into new test functions. * [mickael] fixed glibc error with broken2 and broken4 images. * [mickael] fixed segfault with 123.j2c and bug.j2c images (thanks to Tim Mattox for his improvement). +! [mickael] moved the definition of OPJ_ARG_NOT_USED from opj_includes.h to openjpeg.h August 9, 2011 - [antonin] removed xcode project files (cmake and autotools are now the only supported build methods) diff --git a/libopenjpeg/openjpeg.h b/libopenjpeg/openjpeg.h index dfc4dc64..c46d896f 100644 --- a/libopenjpeg/openjpeg.h +++ b/libopenjpeg/openjpeg.h @@ -63,6 +63,8 @@ typedef int opj_bool; #define OPJ_TRUE 1 #define OPJ_FALSE 0 +// Avoid compile-time warning because parameter is not used +#define OPJ_ARG_NOT_USED(x) (void)(x) /* ========================================================== Useful constant definitions diff --git a/libopenjpeg/opj_includes.h b/libopenjpeg/opj_includes.h index 8da9dbdc..53a0c4a7 100644 --- a/libopenjpeg/opj_includes.h +++ b/libopenjpeg/opj_includes.h @@ -104,9 +104,6 @@ static INLINE long lrintf(float f){ } #endif -// Avoid compile-time warning because parameter is not used -#define OPJ_ARG_NOT_USED(x) (void)(x) - #include "j2k_lib.h" #include "opj_malloc.h" #include "event.h" From 0e8995aa7e02e6f26c55f28f41f2990d77f011a4 Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Wed, 10 Aug 2011 15:54:15 +0000 Subject: [PATCH 31/33] fixed error with the return value of fgets into convert.c file --- CHANGES | 1 + applications/codec/convert.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 68f07ce8..1a645c4e 100644 --- a/CHANGES +++ b/CHANGES @@ -11,6 +11,7 @@ August 10, 2011 * [mickael] fixed glibc error with broken2 and broken4 images. * [mickael] fixed segfault with 123.j2c and bug.j2c images (thanks to Tim Mattox for his improvement). ! [mickael] moved the definition of OPJ_ARG_NOT_USED from opj_includes.h to openjpeg.h +* [mickael] fixed error with the return value of fgets into convert.c file August 9, 2011 - [antonin] removed xcode project files (cmake and autotools are now the only supported build methods) diff --git a/applications/codec/convert.c b/applications/codec/convert.c index 7b255092..18fa03ff 100644 --- a/applications/codec/convert.c +++ b/applications/codec/convert.c @@ -1415,7 +1415,6 @@ static void read_pnm_header(FILE *reader, struct pnm_header *ph) free(return_value_fgets); return; } - free(return_value_fgets); if(line[0] != 'P') { From 4f329cbb450e3f8934aa6a378b92e615ca7957a7 Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Thu, 11 Aug 2011 08:21:28 +0000 Subject: [PATCH 32/33] fixed wrong patch with the return value of fgets into convert.c file --- CHANGES | 3 +++ applications/codec/convert.c | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index 1a645c4e..c9f3b724 100644 --- a/CHANGES +++ b/CHANGES @@ -5,6 +5,9 @@ What's New for OpenJPEG ! : changed + : added +August 11, 2011 +! [mickael] fixed wrong patch with the return value of fgets into convert.c file + August 10, 2011 ! [mickael] removed unused parameters warnings with the solution proposed by myself and Bob Friesenhahn. ! [mickael] add copyright header into new test functions. diff --git a/applications/codec/convert.c b/applications/codec/convert.c index 18fa03ff..c7afc074 100644 --- a/applications/codec/convert.c +++ b/applications/codec/convert.c @@ -1408,11 +1408,9 @@ static void read_pnm_header(FILE *reader, struct pnm_header *ph) char idf[256], type[256]; char line[256]; - char* return_value_fgets = fgets(line, 250, reader); - if (!strcmp(return_value_fgets,line)) + if (fgets(line, 250, reader) == NULL) { - fprintf(stderr,"\nWARNING: fgets return a value different that the first argument"); - free(return_value_fgets); + fprintf(stderr,"\nWARNING: fgets return a NULL value"); return; } From e3e2dc1f6e5045ba7b180a7917b5b91a3a9b9e31 Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Thu, 11 Aug 2011 08:37:11 +0000 Subject: [PATCH 33/33] fixed build error with position of variable declaration after patch 856 --- CHANGES | 3 ++- libopenjpeg/j2k.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index c9f3b724..edf2a338 100644 --- a/CHANGES +++ b/CHANGES @@ -6,7 +6,8 @@ What's New for OpenJPEG + : added August 11, 2011 -! [mickael] fixed wrong patch with the return value of fgets into convert.c file +* [mickael] fixed wrong patch with the return value of fgets into convert.c file +* [mickael] fixed build error with position of variable declaration after patch 856 August 10, 2011 ! [mickael] removed unused parameters warnings with the solution proposed by myself and Bob Friesenhahn. diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c index 32e8bd95..a07951ad 100644 --- a/libopenjpeg/j2k.c +++ b/libopenjpeg/j2k.c @@ -1861,10 +1861,10 @@ opj_image_t* j2k_decode_jpt_stream(opj_j2k_t *j2k, opj_cio_t *cio, opj_codestre opj_image_t *image = NULL; opj_jpt_msg_header_t header; int position; + opj_common_ptr cinfo = j2k->cinfo; OPJ_ARG_NOT_USED(cstr_info); - opj_common_ptr cinfo = j2k->cinfo; j2k->cio = cio; /* create an empty image */