[2.0] Backport all changes since r2798 (included) from trunk

Make sure to have a non empty list

.gitignore

@@ -1,4 +0,0 @@
-
-CMakeLists.txt.user
-
-*.bak

AUTHORS

@@ -3,8 +3,10 @@ See also the files THANKS and CHANGES
 
 David Janssens designed and implemented the first version of OpenJPEG.
 Kaori Hagihara designed and implemented the first version of OpenJPIP.
-Jerome Fimes implemented the alpha version of OpenJPEG v2.
+Jerome Fimes implemented the alpha version of OpenJPEG 2.0.
 Giuseppe Baruffa added the JPWL functionalities.
+Micka<EFBFBD>l Savinaud implemented the final OpenJPEG 2.0 version based on a big merge between 1.5 version and alpha version of 2.0.
+Mathieu Malaterre participated to the OpenJPEG 2.0 version and improved the libraries and utilities. 
 Yannick Verschueren, 
 Herve Drolon, 
 Francois-Olivier Devaux, 

CMake/FindFCGI.cmake

@@ -1,20 +0,0 @@
-# Look for the header file.
-FIND_PATH(FCGI_INCLUDE_DIR NAMES fastcgi.h)
-
-# Look for the library.
-FIND_LIBRARY(FCGI_LIBRARY NAMES fcgi)
-
-# Handle the QUIETLY and REQUIRED arguments and set FCGI_FOUND to TRUE if all listed variables are TRUE.
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(FCGI DEFAULT_MSG FCGI_LIBRARY FCGI_INCLUDE_DIR)
-
-# Copy the results to the output variables.
-IF(FCGI_FOUND)
-	SET(FCGI_LIBRARIES ${FCGI_LIBRARY})
-	SET(FCGI_INCLUDE_DIRS ${FCGI_INCLUDE_DIR})
-ELSE(FCGI_FOUND)
-	SET(FCGI_LIBRARIES)
-	SET(FCGI_INCLUDE_DIRS)
-ENDIF(FCGI_FOUND)
-
-MARK_AS_ADVANCED(FCGI_INCLUDE_DIR FCGI_LIBRARY)

CMake/FindJPYLYZER.cmake

@@ -1,12 +0,0 @@
-#
-# this module looks for JPYLYZER
-# http://jpylyzer.openpreservation.org
-#
-
-find_program(JPYLYZER_EXECUTABLE
-  jpylyzer
-  )
-
-mark_as_advanced(
-  JPYLYZER_EXECUTABLE
-  )

CMake/OpenJPEGConfig.cmake.in

@@ -1,54 +0,0 @@
-#-----------------------------------------------------------------------------
-#
-# OPENJPEGConfig.cmake - CMake configuration file for external projects.
-#
-# This file is configured by OPENJPEG and used by the UseOPENJPEG.cmake
-# module to load OPENJPEG's settings for an external project.
-@OPENJPEG_CONFIG_INSTALL_ONLY@
-# The OPENJPEG version number.
-SET(OPENJPEG_MAJOR_VERSION "@OPENJPEG_VERSION_MAJOR@")
-SET(OPENJPEG_MINOR_VERSION "@OPENJPEG_VERSION_MINOR@")
-SET(OPENJPEG_BUILD_VERSION "@OPENJPEG_VERSION_BUILD@")
-
-# The libraries.
-SET(OPENJPEG_LIBRARIES "@OPENJPEG_LIBRARY_NAME@")
-
-# The CMake macros dir.
-SET(OPENJPEG_CMAKE_DIR "@OPENJPEG_INSTALL_PACKAGE_DIR@")
-
-# The configuration options.
-SET(OPENJPEG_BUILD_SHARED_LIBS "@BUILD_SHARED_LIBS@")
-
-# The "use" file.
-SET(OPENJPEG_USE_FILE "@OPENJPEG_USE_FILE_CONFIG@")
-
-get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-# The following is inspired from:
-# http://www.cmake.org/Wiki/CMake/Tutorials/Packaging#Packaging_and_Exporting
-# However the following is difficult to handle:
-# get_filename_component(myproj_INCLUDE_DIRS "${SELF_DIR}/../../include/myproj" ABSOLUTE)
-# it asssumes a non multi-arch system, where 'include' is located '../include' from lib
-# therefore we need to take into account the number of subdirs in OPENJPEG_INSTALL_LIB_DIR
-if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
-  # This is an install tree
-  include(${SELF_DIR}/OpenJPEGTargets.cmake)
-  get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/@relative_parent@/@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE)
-  set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_ROOT})
-
-else(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
-  if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake)
-    # This is a build tree
-    SET( OPENJPEG_INCLUDE_DIRS @OPENJPEG_INCLUDE_PATH@)
-
-    include(${SELF_DIR}/OpenJPEGExports.cmake)
-
-  else(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake)
-    message(FATAL_ERROR "ooops")
-  endif(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake)
-endif(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
-
-set(OPENJPEG_USE_FILE ${SELF_DIR}/UseOPENJPEG.cmake)
-
-# Backward compatible part:
-SET(OPENJPEG_FOUND       TRUE)
-

CMakeLists.txt

@@ -6,40 +6,38 @@
 # you will eventually like to prefix the library to avoid linking confusion
 # For this purpose you can define a CMake var: OPENJPEG_NAMESPACE to whatever you like
 # e.g.:
-# SET(OPENJPEG_NAMESPACE "GDCMOPENJPEG")
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+# set(OPENJPEG_NAMESPACE "GDCMOPENJPEG")
+cmake_minimum_required(VERSION 2.8.2)
 
-IF(COMMAND CMAKE_POLICY)
-  CMAKE_POLICY(SET CMP0003 NEW)
-  if (NOT (${CMAKE_VERSION} VERSION_LESS 3.0))
-    cmake_policy(SET CMP0042 NEW)
-  endif()
-ENDIF(COMMAND CMAKE_POLICY)
+if(COMMAND CMAKE_POLICY)
+  cmake_policy(SET CMP0003 NEW)
+endif()
 
-IF(NOT OPENJPEG_NAMESPACE)
-  SET(OPENJPEG_NAMESPACE "OPENJPEG")
-  SET(OPENJPEG_STANDALONE 1)
-ENDIF(NOT OPENJPEG_NAMESPACE)
+if(NOT OPENJPEG_NAMESPACE)
+  set(OPENJPEG_NAMESPACE "OPENJPEG")
+  set(OPENJPEG_STANDALONE 1)
+endif()
 # In all cases:
-STRING(TOLOWER ${OPENJPEG_NAMESPACE} OPENJPEG_LIBRARY_NAME)
+#string(TOLOWER ${OPENJPEG_NAMESPACE} OPENJPEG_LIBRARY_NAME)
+set(OPENJPEG_LIBRARY_NAME openjp2)
 
-PROJECT(${OPENJPEG_NAMESPACE} C)
+project(${OPENJPEG_NAMESPACE} C)
 
 # Do full dependency headers.
-INCLUDE_REGULAR_EXPRESSION("^.*$")
+include_regular_expression("^.*$")
 
 #-----------------------------------------------------------------------------
 # OPENJPEG version number, useful for packaging and doxygen doc:
-SET(OPENJPEG_VERSION_MAJOR 1)
-SET(OPENJPEG_VERSION_MINOR 5)
-SET(OPENJPEG_VERSION_BUILD 3)
-SET(OPENJPEG_VERSION
+set(OPENJPEG_VERSION_MAJOR 2)
+set(OPENJPEG_VERSION_MINOR 0)
+set(OPENJPEG_VERSION_BUILD 1)
+set(OPENJPEG_VERSION
   "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}")
-SET(PACKAGE_VERSION
+set(PACKAGE_VERSION
   "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}")
 
 # Because autotools does not support X.Y notation for SOVERSION, we have to use
-# two numerorations, one for the openjpeg version and one for openjpeg soversion
+# two numbering, one for the openjpeg version and one for openjpeg soversion
 # version | soversion
 #   1.0   |  0
 #   1.1   |  1
@@ -49,32 +47,33 @@ SET(PACKAGE_VERSION
 #   1.5   |  5
 #   1.5.1 |  5
 #   2.0   |  6
+#   2.0.1 |  6
 # above is the recommendation by the OPJ team. If you really need to override this default,
 # you can specify your own OPENJPEG_SOVERSION at cmake configuration time:
 # cmake -DOPENJPEG_SOVERSION:STRING=42 /path/to/openjpeg
 if(NOT OPENJPEG_SOVERSION)
-  SET(OPENJPEG_SOVERSION 5)
+  SET(OPENJPEG_SOVERSION 7)
 endif(NOT OPENJPEG_SOVERSION)
-SET(OPENJPEG_LIBRARY_PROPERTIES
+set(OPENJPEG_LIBRARY_PROPERTIES
   VERSION   "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}"
   SOVERSION "${OPENJPEG_SOVERSION}"
 )
 
 # --------------------------------------------------------------------------
 # Path to additional CMake modules
-SET(CMAKE_MODULE_PATH
-    ${CMAKE_SOURCE_DIR}/CMake
+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)
-  IF(NOT BORLAND)
-    IF(NOT CYGWIN)
-      IF(NOT MINGW)
-        IF(NOT ITK_ENABLE_VISUAL_STUDIO_DEPRECATED_C_WARNINGS)
-          ADD_DEFINITIONS(
+if(WIN32)
+  if(NOT BORLAND)
+    if(NOT CYGWIN)
+      if(NOT MINGW)
+        if(NOT ITK_ENABLE_VISUAL_STUDIO_DEPRECATED_C_WARNINGS)
+          add_definitions(
             -D_CRT_FAR_MAPPINGS_NO_DEPRECATE
             -D_CRT_IS_WCTYPE_NO_DEPRECATE
             -D_CRT_MANAGED_FP_NO_DEPRECATE
@@ -86,58 +85,46 @@ IF(WIN32)
             -D_CRT_VCCLRIT_NO_DEPRECATE
             -D_SCL_SECURE_NO_DEPRECATE
             )
-        ENDIF(NOT ITK_ENABLE_VISUAL_STUDIO_DEPRECATED_C_WARNINGS)
-      ENDIF(NOT MINGW)
-    ENDIF(NOT CYGWIN)
-  ENDIF(NOT BORLAND)
-ENDIF(WIN32)
+        endif()
+      endif()
+    endif()
+  endif()
+endif()
 
 
 # --------------------------------------------------------------------------
 # Install directories
 
-STRING(TOLOWER ${PROJECT_NAME} projectname)
-SET(OPENJPEG_INSTALL_SUBDIR "${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}")
+string(TOLOWER ${PROJECT_NAME} projectname)
+set(OPENJPEG_INSTALL_SUBDIR "${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}")
 
-IF(NOT OPENJPEG_INSTALL_BIN_DIR)
-  SET(OPENJPEG_INSTALL_BIN_DIR "bin")
-ENDIF(NOT OPENJPEG_INSTALL_BIN_DIR)
+if(NOT OPENJPEG_INSTALL_BIN_DIR)
+  set(OPENJPEG_INSTALL_BIN_DIR "bin")
+endif()
 
-IF(NOT OPENJPEG_INSTALL_LIB_DIR)
-  SET(OPENJPEG_INSTALL_LIB_DIR "lib")
-ENDIF(NOT OPENJPEG_INSTALL_LIB_DIR)
+if(NOT OPENJPEG_INSTALL_LIB_DIR)
+  set(OPENJPEG_INSTALL_LIB_DIR "lib")
+endif()
 
-# The following will compute the amount of parent dir to go
-# from include to lib. it works nicely with 
-# OPENJPEG_INSTALL_LIB_DIR=lib
-# OPENJPEG_INSTALL_LIB_DIR=lib/
-# OPENJPEG_INSTALL_LIB_DIR=/lib
-# OPENJPEG_INSTALL_LIB_DIR=lib/gnu-linux-x64
-STRING(REPLACE "/" ";" relative_to_lib ${OPENJPEG_INSTALL_LIB_DIR})
-set(relative_parent "..")
-foreach( elem ${relative_to_lib})
-  set( relative_parent "${relative_parent}/.." )
-endforeach()
+if(NOT OPENJPEG_INSTALL_SHARE_DIR)
+  set(OPENJPEG_INSTALL_SHARE_DIR "share")
+endif()
 
-IF(NOT OPENJPEG_INSTALL_SHARE_DIR)
-  SET(OPENJPEG_INSTALL_SHARE_DIR "share")
-ENDIF(NOT OPENJPEG_INSTALL_SHARE_DIR)
+if(NOT OPENJPEG_INSTALL_DATA_DIR)
+  set(OPENJPEG_INSTALL_DATA_DIR "${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
+endif()
 
-IF(NOT OPENJPEG_INSTALL_DATA_DIR)
-  SET(OPENJPEG_INSTALL_DATA_DIR "${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
-ENDIF(NOT OPENJPEG_INSTALL_DATA_DIR)
+if(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
+  set(OPENJPEG_INSTALL_INCLUDE_DIR "include/${OPENJPEG_INSTALL_SUBDIR}")
+endif()
 
-IF(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
-  SET(OPENJPEG_INSTALL_INCLUDE_DIR "include/${OPENJPEG_INSTALL_SUBDIR}")
-ENDIF(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
+if(NOT OPENJPEG_INSTALL_MAN_DIR)
+  set(OPENJPEG_INSTALL_MAN_DIR "share/man/")
+endif()
 
-IF(NOT OPENJPEG_INSTALL_MAN_DIR)
-  SET(OPENJPEG_INSTALL_MAN_DIR "share/man/")
-ENDIF(NOT OPENJPEG_INSTALL_MAN_DIR)
-
-IF(NOT OPENJPEG_INSTALL_DOC_DIR)
-  SET(OPENJPEG_INSTALL_DOC_DIR "share/doc/${OPENJPEG_INSTALL_SUBDIR}")
-ENDIF(NOT OPENJPEG_INSTALL_DOC_DIR)
+if(NOT OPENJPEG_INSTALL_DOC_DIR)
+  set(OPENJPEG_INSTALL_DOC_DIR "share/doc/${OPENJPEG_INSTALL_SUBDIR}")
+endif()
 
 if(NOT OPENJPEG_INSTALL_JNI_DIR)
   if(WIN32)
@@ -147,163 +134,218 @@ if(NOT OPENJPEG_INSTALL_JNI_DIR)
   endif()
 endif()
 
-IF(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
+if(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
   # We could install *.cmake files in share/ however those files contains
   # hardcoded path to libraries on a multi-arch system (fedora/debian) those
   # path will be different (lib/i386-linux-gnu vs lib/x86_64-linux-gnu)
-  SET(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
-ENDIF(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
+  set(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
+endif()
 
 #-----------------------------------------------------------------------------
 # Big endian test:
-INCLUDE (${CMAKE_ROOT}/Modules/TestBigEndian.cmake)
+include (${CMAKE_ROOT}/Modules/TestBigEndian.cmake)
 TEST_BIG_ENDIAN(OPJ_BIG_ENDIAN)
 
 #-----------------------------------------------------------------------------
 # Setup file for setting custom ctest vars
-CONFIGURE_FILE(
-  ${CMAKE_SOURCE_DIR}/CMake/CTestCustom.cmake.in
+configure_file(
+  ${CMAKE_SOURCE_DIR}/cmake/CTestCustom.cmake.in
   ${CMAKE_BINARY_DIR}/CTestCustom.cmake
   @ONLY
   )
 
 #-----------------------------------------------------------------------------
 # OpenJPEG build configuration options.
-OPTION(BUILD_SHARED_LIBS "Build OpenJPEG shared library and link executables against it." ON)
-SET (EXECUTABLE_OUTPUT_PATH ${OPENJPEG_BINARY_DIR}/bin CACHE PATH "Single output directory for building all executables.")
-SET (LIBRARY_OUTPUT_PATH ${OPENJPEG_BINARY_DIR}/bin CACHE PATH "Single output directory for building all libraries.")
-MARK_AS_ADVANCED(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH)
+option(BUILD_SHARED_LIBS "Build OpenJPEG shared library and link executables against it." ON)
+set (EXECUTABLE_OUTPUT_PATH ${OPENJPEG_BINARY_DIR}/bin CACHE PATH "Single output directory for building all executables.")
+set (LIBRARY_OUTPUT_PATH ${OPENJPEG_BINARY_DIR}/bin CACHE PATH "Single output directory for building all libraries.")
+mark_as_advanced(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH)
 
 #-----------------------------------------------------------------------------
 # configure name mangling to allow multiple libraries to coexist
 # peacefully
-IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in)
-SET(MANGLE_PREFIX ${OPENJPEG_LIBRARY_NAME})
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in
+if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in)
+set(MANGLE_PREFIX ${OPENJPEG_LIBRARY_NAME})
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in
                ${CMAKE_CURRENT_BINARY_DIR}/openjpeg_mangle.h
                @ONLY)
-ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in)
-
-#-----------------------------------------------------------------------------
-# pkgconfig support
-IF(UNIX)
-  # install in lib and not share (see multi-arch note above)
-  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libopenjpeg1.pc.cmake
-    ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc @ONLY)
-  INSTALL( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc DESTINATION
-    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
-  INSTALL( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink
-  \"libopenjpeg1.pc\"
-  \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_SHARE_DIR}/pkgconfig/libopenjpeg.pc\")")
-ENDIF(UNIX)
+endif()
 
 #-----------------------------------------------------------------------------
 # Compiler specific flags:
-IF(CMAKE_COMPILER_IS_GNUCC)
+if(CMAKE_COMPILER_IS_GNUCC)
   # For all builds, make sure openjpeg is std99 compliant:
-  # SET(CMAKE_C_FLAGS "-Wall -std=c99 ${CMAKE_C_FLAGS}") # FIXME: this setting prevented us from setting a coverage build.
+  # set(CMAKE_C_FLAGS "-Wall -std=c99 ${CMAKE_C_FLAGS}") # FIXME: this setting prevented us from setting a coverage build.
   # Do not use ffast-math for all build, it would produce incorrect results, only set for release:
-  SET(OPENJPEG_LIBRARY_COMPILE_OPTIONS ${OPENJPEG_LIBRARY_COMPILE_OPTIONS} "$<$<CONFIG:Release>:-ffast-math>")
-ENDIF(CMAKE_COMPILER_IS_GNUCC)
+  set(CMAKE_C_FLAGS_RELEASE "-ffast-math ${CMAKE_C_FLAGS_RELEASE}")
+endif()
 
 #-----------------------------------------------------------------------------
 # opj_config.h generation (1/2)
-INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
+
+# Check if some include files are provided by the system
+include(EnsureFileInclude)
+# These files are mandatory
+ensure_file_include("string.h"   HAVE_STRING_H YES)
+ensure_file_include("memory.h"   HAVE_MEMORY_H YES)
+ensure_file_include("stdlib.h"   HAVE_STDLIB_H YES)
+ensure_file_include("stdio.h"    HAVE_STDIO_H  YES)
+ensure_file_include("math.h"     HAVE_MATH_H   YES)
+ensure_file_include("float.h"    HAVE_FLOAT_H  YES)
+ensure_file_include("time.h"     HAVE_TIME_H   YES)
+ensure_file_include("stdarg.h"   HAVE_STDARG_H YES)
+ensure_file_include("ctype.h"    HAVE_CTYPE_H  YES)
+ensure_file_include("assert.h"   HAVE_ASSERT_H YES)
+
+# For the following files, we provide an alternative, they are not mandatory
+ensure_file_include("stdint.h"   OPJ_HAVE_STDINT_H   NO)
+ensure_file_include("inttypes.h" OPJ_HAVE_INTTYPES_H NO)
+
+# why check this one ? for openjpip ?
+include (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
 CHECK_INCLUDE_FILE("strings.h"      HAVE_STRINGS_H)
-CHECK_INCLUDE_FILE("inttypes.h"     HAVE_INTTYPES_H)
-CHECK_INCLUDE_FILE("memory.h"       HAVE_MEMORY_H)
-CHECK_INCLUDE_FILE("stdint.h"       HAVE_STDINT_H)
-CHECK_INCLUDE_FILE("stdlib.h"       HAVE_STDLIB_H)
-CHECK_INCLUDE_FILE("string.h"       HAVE_STRING_H)
 CHECK_INCLUDE_FILE("sys/stat.h"     HAVE_SYS_STAT_H)
 CHECK_INCLUDE_FILE("sys/types.h"    HAVE_SYS_TYPES_H)
 CHECK_INCLUDE_FILE("unistd.h"       HAVE_UNISTD_H)
 
+# Enable Large file support
+include(TestLargeFiles)
+OPJ_TEST_LARGE_FILES(OPJ_HAVE_LARGEFILES)
 
 #-----------------------------------------------------------------------------
 # Build Library
-INCLUDE_DIRECTORIES(BEFORE ${OPENJPEG_BINARY_DIR})
-ADD_SUBDIRECTORY(libopenjpeg)
+if(BUILD_JPIP_SERVER)
+  find_package(CURL REQUIRED)
+  find_package(FCGI REQUIRED)
+  find_package(Threads REQUIRED)
+  if(NOT CMAKE_USE_PTHREADS_INIT)
+    message(FATAL_ERROR "Only pthread are supported")
+  endif()
+endif()
+add_subdirectory(src/lib)
 
 #-----------------------------------------------------------------------------
 # Build Applications
-OPTION(BUILD_CODEC "Build the CODEC executables" ON)
-OPTION(BUILD_MJ2 "Build the MJ2 executables." OFF)
-OPTION(BUILD_JPWL "Build the JPWL library and executables" OFF)
-OPTION(BUILD_JPIP "Build the JPIP library and executables." OFF)
-IF(BUILD_JPIP)
-  OPTION(BUILD_JPIP_SERVER "Build the JPIP server." OFF)
-ENDIF(BUILD_JPIP)
-OPTION(BUILD_VIEWER "Build the OPJViewer executable (C++)" OFF)
-OPTION(BUILD_JAVA "Build the openjpeg jar (Java)" OFF)
-OPTION(USE_SYSTEM_GETOPT "Prefer system installed getopt()" OFF)
-MARK_AS_ADVANCED(USE_SYSTEM_GETOPT)
-MARK_AS_ADVANCED(BUILD_VIEWER)
-MARK_AS_ADVANCED(BUILD_JAVA)
+option(BUILD_CODEC "Build the CODEC executables" ON)
+option(BUILD_MJ2 "Build the MJ2 executables." OFF)
+option(BUILD_JPWL "Build the JPWL library and executables" OFF)
+option(BUILD_JPIP "Build the JPIP library and executables." OFF)
+if(BUILD_JPIP)
+  option(BUILD_JPIP_SERVER "Build the JPIP server." OFF)
+endif()
+option(BUILD_VIEWER "Build the OPJViewer executable (C++)" OFF)
+option(BUILD_JAVA "Build the openjpeg jar (Java)" OFF)
+option(BUILD_JP3D "Build the JP3D comp" OFF)
+mark_as_advanced(BUILD_VIEWER)
+mark_as_advanced(BUILD_JAVA)
+mark_as_advanced(BUILD_JP3D)
 
-IF(BUILD_CODEC OR BUILD_MJ2)
+if(BUILD_CODEC OR BUILD_MJ2)
   # OFF: It will only build 3rd party libs if they are not found on the system
   # ON: 3rd party libs will ALWAYS be build, and used
-  OPTION(BUILD_THIRDPARTY "Build the thirdparty executables if it is needed" OFF)
-  ADD_SUBDIRECTORY(thirdparty)
-  ADD_SUBDIRECTORY(applications)
-ENDIF (BUILD_CODEC OR BUILD_MJ2)
+  option(BUILD_THIRDPARTY "Build the thirdparty executables if it is needed" OFF)
+  add_subdirectory(thirdparty)
+  add_subdirectory(src/bin)
+endif ()
+add_subdirectory(wrapping)
 
 #-----------------------------------------------------------------------------
 # opj_config.h generation (2/2)
-CONFIGURE_FILE("${OPENJPEG_SOURCE_DIR}/opj_config.h.cmake.in"
- "${OPENJPEG_BINARY_DIR}/opj_config.h"
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/opj_config.h.cmake.in
+ ${CMAKE_CURRENT_BINARY_DIR}/src/lib/openjp2/opj_config.h
+ @ONLY
+ )
+ 
+ configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/opj_config_private.h.cmake.in
+ ${CMAKE_CURRENT_BINARY_DIR}/src/lib/openjp2/opj_config_private.h
  @ONLY
  )
 
 #-----------------------------------------------------------------------------
 # Build DOCUMENTATION (not in ALL target and only if Doxygen is found)
-OPTION(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF)
-IF(BUILD_DOC)
-    ADD_SUBDIRECTORY(doc)
-ENDIF(BUILD_DOC)
+option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF)
+if(BUILD_DOC)
+  add_subdirectory(doc)
+endif()
 
 #-----------------------------------------------------------------------------
 # Buld Testing
-OPTION(BUILD_TESTING "Build the tests." OFF)
-IF(BUILD_TESTING)
-  IF(BUILD_CODEC)
-    ENABLE_TESTING()
-    INCLUDE(CTest)
-  
+option(BUILD_TESTING "Build the tests." OFF)
+if(BUILD_TESTING)
+  if(BUILD_CODEC)
+    enable_testing()
+    include(CTest)
+
     # 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}/../data
-        ${CMAKE_SOURCE_DIR}/../../data
+    # 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}/../../data
       NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
       )
 
     # Add repository where to find tests
-    ADD_SUBDIRECTORY(tests)
-    
-  ELSE(BUILD_CODEC)
+    add_subdirectory(tests)
+
+  else()
     message(FATAL_ERROR "You need build codec to run the tests")
-  ENDIF(BUILD_CODEC)
-ENDIF(BUILD_TESTING)
+  endif()
+endif()
 
 #-----------------------------------------------------------------------------
 # install all targets referenced as OPENJPEGTargets
-INSTALL(EXPORT OpenJPEGTargets DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR})
-CONFIGURE_FILE( ${OPENJPEG_SOURCE_DIR}/CMake/OpenJPEGConfig.cmake.in
+install(EXPORT OpenJPEGTargets DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR})
+configure_file( ${OPENJPEG_SOURCE_DIR}/cmake/OpenJPEGConfig.cmake.in
   ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
   @ONLY
 )
-INSTALL( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
+install( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
   DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}
 )
 
 #-----------------------------------------------------------------------------
 # install CHANGES and LICENSE
-IF(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES)
-  INSTALL(FILES CHANGES DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
-ENDIF(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES)
-INSTALL(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
+if(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES)
+  install(FILES CHANGES DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
+endif()
+install(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
 
-INCLUDE (CMake/OpenJPEGCPack.cmake)
+include (cmake/OpenJPEGCPack.cmake)
+
+#-----------------------------------------------------------------------------
+# pkgconfig support
+if(UNIX)
+  # install in lib and not share (see multi-arch note above)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in
+    ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY)
+  install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc DESTINATION
+    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
+#
+  if(BUILD_JPWL)
+  # install in lib and not share (see multi-arch note above)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpwl/libopenjpwl.pc.cmake.in
+    ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc @ONLY)
+  install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc DESTINATION
+    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
+  endif()
+#
+  if(BUILD_JPIP)
+  # install in lib and not share (see multi-arch note above)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpip/libopenjpip.pc.cmake.in
+    ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc @ONLY)
+  install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc DESTINATION
+    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
+  endif()
+#
+  if(BUILD_JP3D)
+  # install in lib and not share (see multi-arch note above)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp3d/libopenjp3d.pc.cmake.in
+    ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc @ONLY)
+  install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc DESTINATION
+    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
+  endif()
+endif()
+
+#-----------------------------------------------------------------------------

INSTALL

@@ -2,63 +2,10 @@
 How to build and install openjpeg binaries
 ==========================================
 
-UNIX/LINUX similar systems
+UNIX/LINUX/MacOSX/Windows systems
 --------------------------
 
-1) Using autotools
-
-It is highly recommended that pkg-config is installed. If needed, you have to
-properly set the environment variable PKG_CONFIG_PATH so that the .pc files
-are found.
-
-To build from top-level directory, you can simply type: 
-  ./bootstrap.sh
-  ./configure
-  make
-
-To keep all build files in a separate directory, you can type instead: 
-  ./bootstrap.sh
-  mkdir build
-  cd build
-  ../configure
-  make
-
-To install:
-  sudo make install
-  
-To clean:
-  make clean
-  make distclean
-
-To build doc (requires 'doxygen' to be found on your system):
-(this will create an html directory in TOP_LEVEL/doc)
-  make doc
-
-Main './configure' options (type './configure --help' for more details)
-  '--enable-mj2'
-  '--enable-jpwl'
-  '--enable-jpip'
-  '--prefix=/path/to/install/directory' (example : '--prefix=$PWD/installed')
-  '--enable-debug' (default : disabled)
-
-You can also specify your own CFLAGS and LDFLAGS with (for example):
-  CFLAGS="-O3 -pipe" LDFLAGS="-Wl,-s" ./configure
-
-The (optional) dependencies of some binaries are libpng, libtiff, libcms 1 or 2
-and FastCGI. Only libtiff and FastCGI have no .pc file. There should be some
-automatic detection if they are installed in /usr, /usr/local or /opt/local.
-Otherwise, you can tune their detection (as well as for libpng and libcms1 or 2
-too) with the environment variables:
-
-TIFF_CFLAGS
-TIFF_LIBS
-FCGI_CFLAGS
-FCGI_LIBS
-
-See './configure --help' output for more details.
-
-
-2) Using cmake (see www.cmake.org)
+Using cmake (see www.cmake.org)
 
 Type:
   cmake .
@@ -84,9 +31,15 @@ Main available cmake flags:
 * To build the shared libraries and links the executables against it: '-DBUILD_SHARED_LIBS:bool=on' (default: 'ON')
   Note: when using this option, static libraries are not built and executables are dynamically linked.
 * To build the CODEC executables: '-DBUILD_CODEC:bool=on' (default: 'ON')
+* To build the documentation: '-DBUILD_DOC:bool=on' (default: 'OFF')
 * To build the MJ2 executables: '-DBUILD_MJ2:bool=on' (default: 'OFF')
 * To build the JPWL executables and JPWL library: '-DBUILD_JPWL:bool=on' (default: 'OFF')
 * To build the JPIP library and utilities: '-DBUILD_JPIP:bool=on' (default: 'OFF')
+** To build the JPIP server: '-DBUILD_JPIP_SERVER:bool=on' (default: 'OFF')
+* To build the JP3D library and utilities: '-DBUILD_JP3D:bool=on' (default: 'OFF') (experimental)
+* To build the Java binding: '-DBUILD_JAVA:bool=on' (default: 'OFF') (experimental).
+** to choose which java implementation, you can set your JAVA_HOME env var.
+* To build the wxWidgets/C++ viewer: 'BUILD_VIEWER:BOOL=ON' (default OFF) (experimental)
 * To enable testing (and automatic result upload to http://my.cdash.org/index.php?project=OPENJPEG):
     cmake . -DBUILD_TESTING:BOOL=ON -DOPJ_DATA_ROOT:PATH='path/to/the/data/directory'
     make
@@ -99,7 +52,7 @@ Main available cmake flags:
 MACOSX
 ------
 
-The same building procedures as above (autotools and cmake) work for MACOSX.
+The same building procedures as above work for MACOSX.
 The xcode project file can also be used.
 
 If it does not work, try adding the following flag to the cmake command : 
@@ -108,7 +61,9 @@ If it does not work, try adding the following flag to the cmake command :
 WINDOWS
 -------
 
-If you're using cygwin or MinGW+MSYS, the same procedures as for Unix can be used. 
-
-Otherwise you can use cmake to generate project files for the IDE you are using (VC2010, etc).
+You can use cmake to generate project files for the IDE you are using (VS2010, NMake, etc).
 Type 'cmake --help' for available generators on your platform.
+
+Make sure to build the third party libs (png, zlib ...):
+
+  '-DBUILD_THIRDPARTY:BOOL=ON'

LICENSE

@@ -1,11 +1,19 @@
 /*
- * Copyright (c) 2002-2012, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2012, Professor Benoit Macq
- * Copyright (c) 2003-2012, Antonin Descampe
+ * The copyright in this software is being made available under the 2-clauses 
+ * BSD License, included below. This software may be subject to other third 
+ * party and contributor rights, including patent rights, and no such rights
+ * are granted under this license.
+ *
+ * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2014, Professor Benoit Macq
+ * Copyright (c) 2003-2014, Antonin Descampe
  * Copyright (c) 2003-2009, Francois-Olivier Devaux
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2011-2012, Centre National d'Etudes Spatiales (CNES), France 
+ * Copyright (c) 2012, CS Systemes d'Information, France
+ *
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

Makefile.am

@@ -1,75 +0,0 @@
-DISTCHECK_CONFIGURE_FLAGS = --enable-jpip=yes --enable-jpip-server=yes --enable-jpwl=yes --enable-mj2=yes
-
-ACLOCAL_AMFLAGS = -I m4
-
-SUBDIRS = libopenjpeg applications doc
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libopenjpeg1.pc
-
-if WANT_JPWL
-pkgconfig_DATA += libopenjpeg-jpwl.pc
-endif
-
-
-MAINTAINERCLEANFILES = \
-Makefile.in \
-aclocal.m4 \
-config.guess \
-opj_config.h.in \
-opj_config.h.in~ \
-config.sub \
-configure \
-depcomp \
-install-sh \
-ltmain.sh \
-missing
-
-EXTRA_DIST = \
-CMake/CTestCustom.cmake.in \
-CMake/FindFCGI.cmake \
-CMake/FindLCMS2.cmake \
-CMake/FindLCMS.cmake \
-CMake/OpenJPEGConfig.cmake.in \
-CMakeLists.txt \
-CTestConfig.cmake \
-AUTHORS \
-CHANGES \
-INSTALL \
-LICENSE \
-NEWS \
-README \
-THANKS \
-bootstrap.sh \
-libopenjpeg1.pc.cmake \
-libopenjpeg1.pc.in \
-libopenjpeg-jpwl.pc.in \
-opj_config.h.cmake.in \
-m4/opj_check_lib.m4 \
-m4/opj_doxygen.m4 \
-m4/pkg.m4
-
-.PHONY: doc
-
-# Documentation
-
-doc:
-	@echo "entering doc/"
-	@cd doc && make doc
-
-install-data-hook:
-if HAVE_WIN32
-	$(LN_S) -f libopenjpeg1.pc $(DESTDIR)$(pkgconfigdir)/libopenjpeg.pc
-else
-	$(LN_S) -nf libopenjpeg1.pc $(DESTDIR)$(pkgconfigdir)/libopenjpeg.pc
-endif
-	@echo -e " (PC)\t$(pkgconfigdir)/libopenjpeg1.pc" >> $(top_builddir)/report.txt
-	@echo -e " (LN)\t$(pkgconfigdir)/libopenjpeg.pc" >> $(top_builddir)/report.txt
-if WANT_JPWL
-	@echo -e " (PC)\t$(pkgconfigdir)/libopenjpeg-jpwl.pc" >> $(top_builddir)/report.txt
-endif
-	@cat $(top_builddir)/report.txt
-	@rm $(top_builddir)/report.txt
-
-uninstall-hook:
-	rm -f $(DESTDIR)$(pkgconfigdir)/libopenjpeg.pc

NEWS

@@ -2,23 +2,42 @@
 OpenJPEG NEWS - user visible changes
 ====================================
 
-Changes from OpenJPEG 1.5.1 to OpenJPEG 1.5.0
+Changes from OpenJPEG 2.0.0 to OpenJPEG 2.0.1
 ----------------------------------------------
 
-Security:
-
-    * Fixes: CVE-2012-3535
-    * Fixes: CVE-2012-3358
-
 New Features:
 
-    * Use a new API scheme and solve the SOVERSIONing in OpenJPEG
-    * Allow better integration with multi-arch system
-    * Compile & Install Java bindings (CMake)
-    * Install required addXMLinJP2 (JPIP)
+    * Digital Cinema profiles have been fixed and updated
+	* New option to disable MCT if needed
+    * extended RAW support: it is now possible to input raw images
+	  with subsampled color components (422, 420, etc)
+	  
+API/ABI modifications: (see abi_compat_report_2.0.1.html in dev-utils/scripts)
 
+    * No changes, API/ABI fully compatible with 2.0.0
+    
 Misc:
 
-    * fix linker error by resolving all symbols (eg. missing -lm)
-    * fix some man page typos
+    * OpenJPEG is now officialy conformant with JPEG 2000 Part-1
+	  and will soon become official reference software at the 
+	  JPEG committee.
+	* Huge amount of bug fixes. See CHANGES for details.
+
+
+Changes from OpenJPEG 1.5.x to OpenJPEG 2.0.0
+----------------------------------------------
+
+New Features:
+
+    * streaming capabilities
+    * merge JP3D
+
+API modifications:
+
+    * Use a 64bits capable API
+    
+Misc:
+
+    * removed autotools build system
+    * folders hierarchies reorganisation
     * Huge amount of bug fixes. See CHANGES for details.

README

@@ -4,22 +4,44 @@ OPENJPEG LIBRARY and APPLICATIONS
 
 Details on folders hierarchy:
 
-* libopenjpeg: contains the sources of the openjpeg library
-    * jpwl: contains the additional sources if you want to build a JPWL-flavoured library.
-* applications: contains all applications that use the openjpeg library
+* src
+  * lib
+    * openjp2: contains the sources of the openjp2 library (Part 1 & 2)
+    * openjpwl: contains the additional sources if you want to build a JPWL-flavoured library.
+    * openjpip: complete client-server architecture for remote browsing of jpeg 2000 images.
+    * openjp3d: JP3D implementation
+    * openmj2: MJ2 implementation
+  * bin: contains all applications that use the openjpeg library
     * common: common files to all applications
-    * codec: a basic codec
+    * jp2: a basic codec
     * mj2: motion jpeg 2000 executables
-    * JavaOpenJPEG: java jni to use openjpeg in a java program
-    * jpip: complete client-server architecture for remote browsing of jpeg 2000 images. See corresponding README for more details.
-    * OPJViewer: gui for displaying j2k files (based on wxWidget)
+    * jpip: OpenJPIP applications (server and dec server)
+      * java: a Java client viewer for JPIP
+    * jp3d: JP3D applications
+      * tcltk: a test tool for JP3D
+    * wx
+      * OPJViewer: gui for displaying j2k files (based on wxWidget)
+* wrapping
+  * java: java jni to use openjpeg in a java program
 * thirdparty: thirdparty libraries used by some applications. These libraries will be built only if there are not found on the system. Note that libopenjpeg itself does not have any dependency.
 * doc: doxygen documentation setup file and man pages
 * tests: configuration files and utilities for the openjpeg test suite. All test images are located in 'http://openjpeg.googlecode.com/svn/data' folder.
-* CMake: cmake related files
-* m4: autotools related files
+* cmake: cmake related files
 
 see LICENSE for license and copyright information.
 see INSTALL for installation procedures.
 see NEWS for user visible changes in successive releases.
 see CHANGES for per-revision changes.
+
+----------------
+API/ABI
+
+OpenJPEG strives to provide a stable API/ABI for your applications. As such it
+only exposes a limited subset of its functions.  It uses a mecanism of
+exporting/hiding functions. If you are unsure which functions you can use in
+your applications, you should compile OpenJPEG using something similar to gcc:
+-fvisibility=hidden compilation flag.
+See also: http://gcc.gnu.org/wiki/Visibility
+
+On windows, MSVC directly supports export/hidding function and as such the only
+API available is the one supported by OpenJPEG.

THANKS

@@ -4,13 +4,11 @@ Many people have contributed to OpenJPEG by reporting problems, suggesting vario
 or submitting actual code. Here is a list of these people. Help me keep
 it complete and exempt of errors.
 
-Mathieu Malaterre
 Winfried Szukalski
 Vincent Torri
 Bob Friesenhahn
 Callum Lerwick
 Dzonatas Sol
-Mickaël Savinaud
 Julien Malik
 Jerôme Fimes
 Herve Drolon
@@ -31,3 +29,5 @@ Arnaud Maye
 Rex Dieter
 David Burken
 Parvatha Elangovan
+Hans Johnson
+Luc Hermitte

applications/CMakeLists.txt

@@ -1,22 +0,0 @@
-# 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)
-
-# Client & Server:
-IF(BUILD_JPIP)
-  ADD_SUBDIRECTORY(jpip)
-ENDIF(BUILD_JPIP)
-
-IF(BUILD_VIEWER)
-  ADD_SUBDIRECTORY(OPJViewer)
-ENDIF(BUILD_VIEWER)
-
-IF(BUILD_JAVA)
-	ADD_SUBDIRECTORY(JavaOpenJPEG)
-ENDIF(BUILD_JAVA)

applications/Makefile.am

@@ -1,19 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS = codec
-
-if WANT_MJ2
-SUBDIRS += mj2
-endif
-
-if WANT_JPIP_CODE
-SUBDIRS += jpip
-endif
-
-EXTRA_DIST = \
-CMakeLists.txt \
-common/color.c \
-common/color.h \
-common/format_defs.h \
-common/opj_getopt.c \
-common/opj_getopt.h

applications/codec/CMakeLists.txt

@@ -1,120 +0,0 @@
-# Build the demo app, small examples
-
-# First thing define the common source:
-SET(common_SRCS
-  convert.c
-  converttif.c
-  convertbmp.c
-  convertpng.c
-  index.c
-  ${OPENJPEG_SOURCE_DIR}/applications/common/color.c
-  )
-if(NOT USE_SYSTEM_GETOPT)
-  list(APPEND common_SRCS
-    ${OPENJPEG_SOURCE_DIR}/applications/common/opj_getopt.c
-  )
-endif()
-
-# Headers file are located here:
-INCLUDE_DIRECTORIES(
-  ${OPENJPEG_SOURCE_DIR}/libopenjpeg
-  ${LCMS_INCLUDE_DIRNAME}
-  ${OPENJPEG_SOURCE_DIR}/applications/common
-  ${Z_INCLUDE_DIRNAME}
-  ${PNG_INCLUDE_DIRNAME}
-  ${TIFF_INCLUDE_DIRNAME}
-  )
-
-IF(WIN32)
-  IF(BUILD_SHARED_LIBS)
-    ADD_DEFINITIONS(-DOPJ_EXPORTS)
-  ELSE(BUILD_SHARED_LIBS)
-    ADD_DEFINITIONS(-DOPJ_STATIC)
-  ENDIF(BUILD_SHARED_LIBS)
-ENDIF(WIN32)
-
-# Loop over all executables:
-FOREACH(exe j2k_to_image image_to_j2k j2k_dump)
-  ADD_EXECUTABLE(${exe} ${exe}.c ${common_SRCS})
-  TARGET_LINK_LIBRARIES(${exe} ${OPENJPEG_LIBRARY_NAME} 
-    ${PNG_LIBNAME} ${TIFF_LIBNAME} ${LCMS_LIBNAME}
-    )
-  # To support universal exe:
-  IF(ZLIB_FOUND AND APPLE)
-    TARGET_LINK_LIBRARIES(${exe} z)
-  ELSe(ZLIB_FOUND AND APPLE)
-    TARGET_LINK_LIBRARIES(${exe} ${Z_LIBNAME})
-  ENDIF(ZLIB_FOUND AND APPLE)
-
-  # On unix you need to link to the math library:
-  IF(UNIX)
-    TARGET_LINK_LIBRARIES(${exe} m)
-  ENDIF(UNIX)
-  # Install exe
-  INSTALL(TARGETS ${exe}
-    EXPORT OpenJPEGTargets
-    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
-  )
-ENDFOREACH(exe)
-
-# Install man pages
-INSTALL(
-  FILES       ${OPENJPEG_SOURCE_DIR}/doc/man/man1/image_to_j2k.1
-              ${OPENJPEG_SOURCE_DIR}/doc/man/man1/j2k_dump.1
-              ${OPENJPEG_SOURCE_DIR}/doc/man/man1/j2k_to_image.1
-  DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man1)
-#
-
-IF(BUILD_JPWL)
-  ADD_EXECUTABLE(JPWL_j2k_to_image
-  j2k_to_image.c
-  ${common_SRCS}
-  )
-  
-  SET_PROPERTY(
-     TARGET JPWL_j2k_to_image
-     APPEND PROPERTY COMPILE_DEFINITIONS USE_JPWL
-  )
-
-  TARGET_LINK_LIBRARIES(JPWL_j2k_to_image ${OPENJPEG_LIBRARY_NAME}_JPWL
-    ${LCMS_LIBNAME} ${PNG_LIBNAME} ${TIFF_LIBNAME})
-    
-  # To support universal exe:
-  IF(ZLIB_FOUND AND APPLE)
-    TARGET_LINK_LIBRARIES(JPWL_j2k_to_image z)
-  ELSe(ZLIB_FOUND AND APPLE)
-    TARGET_LINK_LIBRARIES(JPWL_j2k_to_image ${Z_LIBNAME})
-  ENDIF(ZLIB_FOUND AND APPLE)
-  
-  IF(UNIX)
-    TARGET_LINK_LIBRARIES(JPWL_j2k_to_image m)
-  ENDIF(UNIX)
-
-  ADD_EXECUTABLE(JPWL_image_to_j2k
-  image_to_j2k.c
-  ${common_SRCS}
-  )
-  
-  SET_PROPERTY(
-     TARGET JPWL_image_to_j2k
-     APPEND PROPERTY COMPILE_DEFINITIONS USE_JPWL
-  )
-
-  TARGET_LINK_LIBRARIES(JPWL_image_to_j2k ${OPENJPEG_LIBRARY_NAME}_JPWL 
-  	${LCMS_LIBNAME} ${PNG_LIBNAME} ${TIFF_LIBNAME})
-  	
-  # To support universal exe:
-  IF(ZLIB_FOUND AND APPLE)
-    TARGET_LINK_LIBRARIES(JPWL_image_to_j2k z)
-  ELSe(ZLIB_FOUND AND APPLE)
-    TARGET_LINK_LIBRARIES(JPWL_image_to_j2k ${Z_LIBNAME})
-  ENDIF(ZLIB_FOUND AND APPLE)
-
-  IF(UNIX)
-    TARGET_LINK_LIBRARIES(JPWL_image_to_j2k m)
-  ENDIF(UNIX)
-
-  INSTALL(TARGETS JPWL_image_to_j2k JPWL_j2k_to_image
-    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
-  )
-ENDIF(BUILD_JPWL)

applications/codec/Makefile.am

@@ -1,118 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-bin_PROGRAMS = j2k_to_image image_to_j2k j2k_dump
-
-if WANT_JPWL
-bin_PROGRAMS += JPWL_j2k_to_image JPWL_image_to_j2k
-endif
-
-j2k_to_image_CPPFLAGS = \
--I. \
--I$(top_srcdir)/applications/codec \
--I$(top_builddir)/applications/codec \
--I$(top_srcdir)/applications/common \
--I$(top_builddir)/applications/common \
--I$(top_srcdir)/libopenjpeg \
--I$(top_builddir)/libopenjpeg \
-@PNG_CFLAGS@ \
-@TIFF_CFLAGS@ \
-@LCMS1_CFLAGS@ \
-@LCMS2_CFLAGS@
-j2k_to_image_CFLAGS = 
-j2k_to_image_LDADD = $(top_builddir)/libopenjpeg/libopenjpeg.la @LCMS1_LIBS@ @LCMS2_LIBS@ @TIFF_LIBS@ @PNG_LIBS@ -lm
-j2k_to_image_SOURCES = \
-../common/color.c \
-../common/opj_getopt.c \
-convert.c \
-index.c \
-j2k_to_image.c \
-../common/color.h
-
-image_to_j2k_CPPFLAGS = \
--I. \
--I$(top_srcdir)/applications/codec \
--I$(top_builddir)/applications/codec \
--I$(top_srcdir)/applications/common \
--I$(top_builddir)/applications/common \
--I$(top_srcdir)/libopenjpeg \
--I$(top_builddir)/libopenjpeg \
-@PNG_CFLAGS@ \
-@TIFF_CFLAGS@
-image_to_j2k_CFLAGS = 
-image_to_j2k_LDADD = $(top_builddir)/libopenjpeg/libopenjpeg.la @TIFF_LIBS@ @PNG_LIBS@ -lm
-image_to_j2k_SOURCES = \
-../common/opj_getopt.c \
-convert.c \
-index.c \
-image_to_j2k.c \
-convert.h \
-../common/format_defs.h \
-index.h
-
-j2k_dump_CPPFLAGS = \
--I. \
--I$(top_srcdir)/applications/codec \
--I$(top_builddir)/applications/codec \
--I$(top_srcdir)/applications/common \
--I$(top_builddir)/applications/common \
--I$(top_srcdir)/libopenjpeg \
--I$(top_builddir)/libopenjpeg
-j2k_dump_CFLAGS = 
-j2k_dump_LDADD = $(top_builddir)/libopenjpeg/libopenjpeg.la -lm
-j2k_dump_SOURCES = \
-../common/opj_getopt.c \
-index.c \
-j2k_dump.c \
-../common/opj_getopt.h \
-index.h
-
-JPWL_j2k_to_image_CPPFLAGS = \
--I. \
--I$(top_srcdir)/applications/common \
--I$(top_builddir)/applications/common \
--I$(top_srcdir)/libopenjpeg \
--I$(top_builddir)/libopenjpeg \
--DUSE_JPWL \
-@TIFF_CFLAGS@ \
-@PNG_CFLAGS@ \
-@LCMS1_CFLAGS@ \
-@LCMS2_CFLAGS@
-JPWL_j2k_to_image_CFLAGS =
-JPWL_j2k_to_image_LDADD = $(top_builddir)/libopenjpeg/jpwl/libopenjpeg_JPWL.la  @LCMS1_LIBS@ @LCMS2_LIBS@ @TIFF_LIBS@ @PNG_LIBS@ -lm
-JPWL_j2k_to_image_SOURCES = \
-../common/color.c \
-../common/opj_getopt.c \
-index.c \
-convert.c \
-j2k_to_image.c
-
-JPWL_image_to_j2k_CPPFLAGS = \
--I. \
--I$(top_srcdir)/applications/common \
--I$(top_builddir)/applications/common \
--I$(top_srcdir)/libopenjpeg \
--I$(top_builddir)/libopenjpeg \
--DUSE_JPWL \
-@TIFF_CFLAGS@ \
-@PNG_CFLAGS@
-JPWL_image_to_j2k_CFLAGS =
-JPWL_image_to_j2k_LDADD = $(top_builddir)/libopenjpeg/jpwl/libopenjpeg_JPWL.la @TIFF_LIBS@ @PNG_LIBS@ -lm
-
-JPWL_image_to_j2k_SOURCES = \
-../common/opj_getopt.c \
-index.c \
-convert.c \
-image_to_j2k.c
-
-EXTRA_DIST = \
-CMakeLists.txt \
-windirent.h
-
-install-data-hook:
-	@echo -e " (B)\t$(bindir)/j2k_to_image$(EXEEXT)" >> $(top_builddir)/report.txt
-	@echo -e " (B)\t$(bindir)/image_to_j2k$(EXEEXT)" >> $(top_builddir)/report.txt
-	@echo -e " (B)\t$(bindir)/j2k_dump$(EXEEXT)" >> $(top_builddir)/report.txt
-if WANT_JPWL
-	@echo -e " (B)\t$(bindir)/JPWL_j2k_to_image$(EXEEXT)" >> $(top_builddir)/report.txt
-	@echo -e " (B)\t$(bindir)/JPWL_image_to_j2k$(EXEEXT)" >> $(top_builddir)/report.txt
-endif

applications/codec/README

@@ -1,8 +0,0 @@
-Simple codec compilation
-------------------------
-Once you've built the library, you might want to test it with a basic codec. To do this, go to the codec directory and either use the provided Makefile or use one of the following commands to build an encoder and decoder respectively:
-
-gcc index.c convert.c image_to_j2k.c -o image_to_j2k -lopenjpeg -I ../libopenjpeg/ -lm -ltiff
-gcc index.c convert.c j2k_to_image.c -o j2k_to_image -lopenjpeg -I ../libopenjpeg/ -lm -ltiff
-
-You should add '-L..' to those lines if you did not use the 'install' target when building the library.

applications/codec/convertbmp.c

@@ -1,995 +0,0 @@
-/*
- * The copyright in this software is being made available under the 2-clauses 
- * BSD License, included below. This software may be subject to other third 
- * party and contributor rights, including patent rights, and no such rights
- * are granted under this license.
- *
- * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2014, Professor Benoit Macq
- * Copyright (c) 2001-2003, David Janssens
- * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux 
- * Copyright (c) 2003-2014, Antonin Descampe
- * Copyright (c) 2005, Herve Drolon, FreeImage Team
- * Copyright (c) 2006-2007, Parvatha Elangovan
- * 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.
- */
-#include "opj_config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-#include "openjpeg.h"
-#include "convert.h"
-
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#else
-#if defined(_WIN32)
-typedef   signed __int8   int8_t;
-typedef unsigned __int8   uint8_t;
-typedef   signed __int16  int16_t;
-typedef unsigned __int16  uint16_t;
-typedef   signed __int32  int32_t;
-typedef unsigned __int32  uint32_t;
-typedef   signed __int64  int64_t;
-typedef unsigned __int64  uint64_t;
-#else
-#error unsupported platform
-#endif
-#endif
-
-typedef struct {
-	uint16_t bfType;      /* 'BM' for Bitmap (19776) */
-	uint32_t bfSize;      /* Size of the file        */
-	uint16_t bfReserved1; /* Reserved : 0            */
-	uint16_t bfReserved2; /* Reserved : 0            */
-	uint32_t bfOffBits;   /* Offset                  */
-} OPJ_BITMAPFILEHEADER;
-
-typedef struct {
-	uint32_t biSize;             /* Size of the structure in bytes */
-	uint32_t biWidth;            /* Width of the image in pixels */
-	uint32_t biHeight;           /* Heigth of the image in pixels */
-	uint16_t biPlanes;           /* 1 */
-	uint16_t biBitCount;         /* Number of color bits by pixels */
-	uint32_t biCompression;      /* Type of encoding 0: none 1: RLE8 2: RLE4 */
-	uint32_t biSizeImage;        /* Size of the image in bytes */
-	uint32_t biXpelsPerMeter;    /* Horizontal (X) resolution in pixels/meter */
-	uint32_t biYpelsPerMeter;    /* Vertical (Y) resolution in pixels/meter */
-	uint32_t biClrUsed;          /* Number of color used in the image (0: ALL) */
-	uint32_t biClrImportant;     /* Number of important color (0: ALL) */
-	uint32_t biRedMask;          /* Red channel bit mask */
-	uint32_t biGreenMask;        /* Green channel bit mask */
-	uint32_t biBlueMask;         /* Blue channel bit mask */
-	uint32_t biAlphaMask;        /* Alpha channel bit mask */
-	uint32_t biColorSpaceType;   /* Color space type */
-	uint8_t  biColorSpaceEP[36]; /* Color space end points */
-	uint32_t biRedGamma;         /* Red channel gamma */
-	uint32_t biGreenGamma;       /* Green channel gamma */
-	uint32_t biBlueGamma;        /* Blue channel gamma */
-	uint32_t biIntent;           /* Intent */
-	uint32_t biIccProfileData;   /* ICC profile data */
-	uint32_t biIccProfileSize;   /* ICC profile size */
-	uint32_t biReserved;         /* Reserved */
-} OPJ_BITMAPINFOHEADER;
-
-static void opj_applyLUT8u_8u32s_C1R(
-	uint8_t const* pSrc, int32_t srcStride,
-	int32_t* pDst, int32_t dstStride,
-	uint8_t const* pLUT,
-	uint32_t width, uint32_t height)
-{
-	uint32_t y;
-	
-	for (y = height; y != 0U; --y) {
-		uint32_t x;
-		
-		for(x = 0; x < width; x++)
-		{
-			pDst[x] = (int32_t)pLUT[pSrc[x]];
-		}
-		pSrc += srcStride;
-		pDst += dstStride;
-	}
-}
-
-static void opj_applyLUT8u_8u32s_C1P3R(
-	uint8_t const* pSrc, int32_t srcStride,
-	int32_t* const* pDst, int32_t const* pDstStride,
-	uint8_t const* const* pLUT,
-	uint32_t width, uint32_t height)
-{
-	uint32_t y;
-	int32_t* pR = pDst[0];
-	int32_t* pG = pDst[1];
-	int32_t* pB = pDst[2];
-	uint8_t const* pLUT_R = pLUT[0];
-	uint8_t const* pLUT_G = pLUT[1];
-	uint8_t const* pLUT_B = pLUT[2];
-	
-	for (y = height; y != 0U; --y) {
-		uint32_t x;
-		
-		for(x = 0; x < width; x++)
-		{
-			uint8_t idx = pSrc[x];
-			pR[x] = (int32_t)pLUT_R[idx];
-			pG[x] = (int32_t)pLUT_G[idx];
-			pB[x] = (int32_t)pLUT_B[idx];
-		}
-		pSrc += srcStride;
-		pR += pDstStride[0];
-		pG += pDstStride[1];
-		pB += pDstStride[2];
-	}
-}
-
-static void bmp24toimage(const uint8_t* pData, uint32_t stride, opj_image_t* image)
-{
-	int index;
-	uint32_t width, height;
-	uint32_t x, y;
-	const uint8_t *pSrc = NULL;
-
-	width  = image->comps[0].w;
-	height = image->comps[0].h;
-	
-	index = 0;
-	pSrc = pData + (height - 1U) * stride;
-	for(y = 0; y < height; y++)
-	{
-		for(x = 0; x < width; x++)
-		{
-			image->comps[0].data[index] = (int32_t)pSrc[3*x+2];	/* R */
-			image->comps[1].data[index] = (int32_t)pSrc[3*x+1];	/* G */
-			image->comps[2].data[index] = (int32_t)pSrc[3*x+0];	/* B */
-			index++;
-		}
-		pSrc -= stride;
-	}
-}
-
-static void bmp_mask_get_shift_and_prec(uint32_t mask, uint32_t* shift, uint32_t* prec)
-{
-	uint32_t l_shift, l_prec;
-	
-	l_shift = l_prec = 0U;
-	
-	if (mask != 0U) {
-		while ((mask & 1U) == 0U) {
-			mask >>= 1;
-			l_shift++;
-		}
-		while (mask & 1U) {
-			mask >>= 1;
-			l_prec++;
-		}
-	}
-	*shift = l_shift; *prec = l_prec;
-}
-
-static void bmpmask32toimage(const uint8_t* pData, uint32_t stride, opj_image_t* image, uint32_t redMask, uint32_t greenMask, uint32_t blueMask, uint32_t alphaMask)
-{
-	int index;
-	uint32_t width, height;
-	uint32_t x, y;
-	const uint8_t *pSrc = NULL;
-	opj_bool hasAlpha = OPJ_FALSE;
-	uint32_t redShift,   redPrec;
-	uint32_t greenShift, greenPrec;
-	uint32_t blueShift,  bluePrec;
-	uint32_t alphaShift, alphaPrec;
-	
-	width  = image->comps[0].w;
-	height = image->comps[0].h;
-	
-	hasAlpha = image->numcomps > 3U;
-	
-	bmp_mask_get_shift_and_prec(redMask,   &redShift,   &redPrec);
-	bmp_mask_get_shift_and_prec(greenMask, &greenShift, &greenPrec);
-	bmp_mask_get_shift_and_prec(blueMask,  &blueShift,  &bluePrec);
-	bmp_mask_get_shift_and_prec(alphaMask, &alphaShift, &alphaPrec);
-	
-	image->comps[0].bpp = redPrec;
-	image->comps[0].prec = redPrec;
-	image->comps[1].bpp = greenPrec;
-	image->comps[1].prec = greenPrec;
-	image->comps[2].bpp = bluePrec;
-	image->comps[2].prec = bluePrec;
-	if (hasAlpha) {
-		image->comps[3].bpp = alphaPrec;
-		image->comps[3].prec = alphaPrec;
-	}
-	
-	index = 0;
-	pSrc = pData + (height - 1U) * stride;
-	for(y = 0; y < height; y++)
-	{
-		for(x = 0; x < width; x++)
-		{
-			uint32_t value = 0U;
-			
-			value |= ((uint32_t)pSrc[4*x+0]) <<  0;
-			value |= ((uint32_t)pSrc[4*x+1]) <<  8;
-			value |= ((uint32_t)pSrc[4*x+2]) << 16;
-			value |= ((uint32_t)pSrc[4*x+3]) << 24;
-			
-			image->comps[0].data[index] = (int32_t)((value & redMask)   >> redShift);   /* R */
-			image->comps[1].data[index] = (int32_t)((value & greenMask) >> greenShift); /* G */
-			image->comps[2].data[index] = (int32_t)((value & blueMask)  >> blueShift);  /* B */
-			if (hasAlpha) {
-				image->comps[3].data[index] = (int32_t)((value & alphaMask)  >> alphaShift);  /* A */
-			}
-			index++;
-		}
-		pSrc -= stride;
-	}
-}
-
-static void bmpmask16toimage(const uint8_t* pData, uint32_t stride, opj_image_t* image, uint32_t redMask, uint32_t greenMask, uint32_t blueMask, uint32_t alphaMask)
-{
-	int index;
-	uint32_t width, height;
-	uint32_t x, y;
-	const uint8_t *pSrc = NULL;
-	opj_bool hasAlpha = OPJ_FALSE;
-	uint32_t redShift,   redPrec;
-	uint32_t greenShift, greenPrec;
-	uint32_t blueShift,  bluePrec;
-	uint32_t alphaShift, alphaPrec;
-	
-	width  = image->comps[0].w;
-	height = image->comps[0].h;
-	
-	hasAlpha = image->numcomps > 3U;
-	
-	bmp_mask_get_shift_and_prec(redMask,   &redShift,   &redPrec);
-	bmp_mask_get_shift_and_prec(greenMask, &greenShift, &greenPrec);
-	bmp_mask_get_shift_and_prec(blueMask,  &blueShift,  &bluePrec);
-	bmp_mask_get_shift_and_prec(alphaMask, &alphaShift, &alphaPrec);
-	
-	image->comps[0].bpp = redPrec;
-	image->comps[0].prec = redPrec;
-	image->comps[1].bpp = greenPrec;
-	image->comps[1].prec = greenPrec;
-	image->comps[2].bpp = bluePrec;
-	image->comps[2].prec = bluePrec;
-	if (hasAlpha) {
-		image->comps[3].bpp = alphaPrec;
-		image->comps[3].prec = alphaPrec;
-	}
-	
-	index = 0;
-	pSrc = pData + (height - 1U) * stride;
-	for(y = 0; y < height; y++)
-	{
-		for(x = 0; x < width; x++)
-		{
-			uint32_t value = 0U;
-			
-			value |= ((uint32_t)pSrc[2*x+0]) <<  0;
-			value |= ((uint32_t)pSrc[2*x+1]) <<  8;
-			
-			image->comps[0].data[index] = (int32_t)((value & redMask)   >> redShift);   /* R */
-			image->comps[1].data[index] = (int32_t)((value & greenMask) >> greenShift); /* G */
-			image->comps[2].data[index] = (int32_t)((value & blueMask)  >> blueShift);  /* B */
-			if (hasAlpha) {
-				image->comps[3].data[index] = (int32_t)((value & alphaMask)  >> alphaShift);  /* A */
-			}
-			index++;
-		}
-		pSrc -= stride;
-	}
-}
-
-static opj_image_t* bmp8toimage(const uint8_t* pData, uint32_t stride, opj_image_t* image, uint8_t const* const* pLUT)
-{
-	uint32_t width, height;
-	const uint8_t *pSrc = NULL;
-	
-	width  = image->comps[0].w;
-	height = image->comps[0].h;
-	
-	pSrc = pData + (height - 1U) * stride;
-	if (image->numcomps == 1U) {
-		opj_applyLUT8u_8u32s_C1R(pSrc, -(int32_t)stride, image->comps[0].data, (int32_t)width, pLUT[0], width, height);
-	}
-	else {
-		int32_t* pDst[3];
-		int32_t  pDstStride[3];
-		
-		pDst[0] = image->comps[0].data; pDst[1] = image->comps[1].data; pDst[2] = image->comps[2].data;
-		pDstStride[0] = (int32_t)width; pDstStride[1] = (int32_t)width; pDstStride[2] = (int32_t)width;
-		opj_applyLUT8u_8u32s_C1P3R(pSrc, -(int32_t)stride, pDst, pDstStride, pLUT, width, height);
-	}
-	return image;
-}
-
-static opj_bool bmp_read_file_header(FILE* IN, OPJ_BITMAPFILEHEADER* header)
-{
-	header->bfType  = (uint16_t)getc(IN);
-	header->bfType |= (uint16_t)((uint32_t)getc(IN) << 8);
-	
-	if (header->bfType != 19778) {
-		fprintf(stderr,"Error, not a BMP file!\n");
-		return OPJ_FALSE;
-	}
-	
-	/* FILE HEADER */
-	/* ------------- */
-	header->bfSize  = (uint32_t)getc(IN);
-	header->bfSize |= (uint32_t)getc(IN) << 8;
-	header->bfSize |= (uint32_t)getc(IN) << 16;
-	header->bfSize |= (uint32_t)getc(IN) << 24;
-	
-	header->bfReserved1  = (uint16_t)getc(IN);
-	header->bfReserved1 |= (uint16_t)((uint32_t)getc(IN) << 8);
-	
-	header->bfReserved2  = (uint16_t)getc(IN);
-	header->bfReserved2 |= (uint16_t)((uint32_t)getc(IN) << 8);
-	
-	header->bfOffBits  = (uint32_t)getc(IN);
-	header->bfOffBits |= (uint32_t)getc(IN) << 8;
-	header->bfOffBits |= (uint32_t)getc(IN) << 16;
-	header->bfOffBits |= (uint32_t)getc(IN) << 24;
-	return OPJ_TRUE;
-}
-static opj_bool bmp_read_info_header(FILE* IN, OPJ_BITMAPINFOHEADER* header)
-{
-	memset(header, 0, sizeof(*header));
-	/* INFO HEADER */
-	/* ------------- */
-	header->biSize  = (uint32_t)getc(IN);
-	header->biSize |= (uint32_t)getc(IN) << 8;
-	header->biSize |= (uint32_t)getc(IN) << 16;
-	header->biSize |= (uint32_t)getc(IN) << 24;
-	
-	switch (header->biSize) {
-		case 12U:  /* BITMAPCOREHEADER */
-		case 40U:  /* BITMAPINFOHEADER */
-		case 52U:  /* BITMAPV2INFOHEADER */
-		case 56U:  /* BITMAPV3INFOHEADER */
-		case 108U: /* BITMAPV4HEADER */
-		case 124U: /* BITMAPV5HEADER */
-			break;
-  default:
-			fprintf(stderr,"Error, unknown BMP header size %d\n", header->biSize);
-			return OPJ_FALSE;
-	}
-	
-	header->biWidth  = (uint32_t)getc(IN);
-	header->biWidth |= (uint32_t)getc(IN) << 8;
-	header->biWidth |= (uint32_t)getc(IN) << 16;
-	header->biWidth |= (uint32_t)getc(IN) << 24;
-	
-	header->biHeight  = (uint32_t)getc(IN);
-	header->biHeight |= (uint32_t)getc(IN) << 8;
-	header->biHeight |= (uint32_t)getc(IN) << 16;
-	header->biHeight |= (uint32_t)getc(IN) << 24;
-	
-	header->biPlanes  = (uint16_t)getc(IN);
-	header->biPlanes |= (uint16_t)((uint32_t)getc(IN) << 8);
-	
-	header->biBitCount  = (uint16_t)getc(IN);
-	header->biBitCount |= (uint16_t)((uint32_t)getc(IN) << 8);
-	
-	if(header->biSize >= 40U) {
-		header->biCompression  = (uint32_t)getc(IN);
-		header->biCompression |= (uint32_t)getc(IN) << 8;
-		header->biCompression |= (uint32_t)getc(IN) << 16;
-		header->biCompression |= (uint32_t)getc(IN) << 24;
-		
-		header->biSizeImage  = (uint32_t)getc(IN);
-		header->biSizeImage |= (uint32_t)getc(IN) << 8;
-		header->biSizeImage |= (uint32_t)getc(IN) << 16;
-		header->biSizeImage |= (uint32_t)getc(IN) << 24;
-		
-		header->biXpelsPerMeter  = (uint32_t)getc(IN);
-		header->biXpelsPerMeter |= (uint32_t)getc(IN) << 8;
-		header->biXpelsPerMeter |= (uint32_t)getc(IN) << 16;
-		header->biXpelsPerMeter |= (uint32_t)getc(IN) << 24;
-		
-		header->biYpelsPerMeter  = (uint32_t)getc(IN);
-		header->biYpelsPerMeter |= (uint32_t)getc(IN) << 8;
-		header->biYpelsPerMeter |= (uint32_t)getc(IN) << 16;
-		header->biYpelsPerMeter |= (uint32_t)getc(IN) << 24;
-		
-		header->biClrUsed  = (uint32_t)getc(IN);
-		header->biClrUsed |= (uint32_t)getc(IN) << 8;
-		header->biClrUsed |= (uint32_t)getc(IN) << 16;
-		header->biClrUsed |= (uint32_t)getc(IN) << 24;
-		
-		header->biClrImportant  = (uint32_t)getc(IN);
-		header->biClrImportant |= (uint32_t)getc(IN) << 8;
-		header->biClrImportant |= (uint32_t)getc(IN) << 16;
-		header->biClrImportant |= (uint32_t)getc(IN) << 24;
-	}
-	
-	if(header->biSize >= 56U) {
-		header->biRedMask  = (uint32_t)getc(IN);
-		header->biRedMask |= (uint32_t)getc(IN) << 8;
-		header->biRedMask |= (uint32_t)getc(IN) << 16;
-		header->biRedMask |= (uint32_t)getc(IN) << 24;
-		
-		header->biGreenMask  = (uint32_t)getc(IN);
-		header->biGreenMask |= (uint32_t)getc(IN) << 8;
-		header->biGreenMask |= (uint32_t)getc(IN) << 16;
-		header->biGreenMask |= (uint32_t)getc(IN) << 24;
-		
-		header->biBlueMask  = (uint32_t)getc(IN);
-		header->biBlueMask |= (uint32_t)getc(IN) << 8;
-		header->biBlueMask |= (uint32_t)getc(IN) << 16;
-		header->biBlueMask |= (uint32_t)getc(IN) << 24;
-		
-		header->biAlphaMask  = (uint32_t)getc(IN);
-		header->biAlphaMask |= (uint32_t)getc(IN) << 8;
-		header->biAlphaMask |= (uint32_t)getc(IN) << 16;
-		header->biAlphaMask |= (uint32_t)getc(IN) << 24;
-	}
-	
-	if(header->biSize >= 108U) {
-		header->biColorSpaceType  = (uint32_t)getc(IN);
-		header->biColorSpaceType |= (uint32_t)getc(IN) << 8;
-		header->biColorSpaceType |= (uint32_t)getc(IN) << 16;
-		header->biColorSpaceType |= (uint32_t)getc(IN) << 24;
-		
-		if (fread(&(header->biColorSpaceEP), 1U, sizeof(header->biColorSpaceEP), IN) != sizeof(header->biColorSpaceEP)) {
-			fprintf(stderr,"Error, can't  read BMP header\n");
-			return OPJ_FALSE;
-		}
-		
-		header->biRedGamma  = (uint32_t)getc(IN);
-		header->biRedGamma |= (uint32_t)getc(IN) << 8;
-		header->biRedGamma |= (uint32_t)getc(IN) << 16;
-		header->biRedGamma |= (uint32_t)getc(IN) << 24;
-		
-		header->biGreenGamma  = (uint32_t)getc(IN);
-		header->biGreenGamma |= (uint32_t)getc(IN) << 8;
-		header->biGreenGamma |= (uint32_t)getc(IN) << 16;
-		header->biGreenGamma |= (uint32_t)getc(IN) << 24;
-		
-		header->biBlueGamma  = (uint32_t)getc(IN);
-		header->biBlueGamma |= (uint32_t)getc(IN) << 8;
-		header->biBlueGamma |= (uint32_t)getc(IN) << 16;
-		header->biBlueGamma |= (uint32_t)getc(IN) << 24;
-	}
-	
-	if(header->biSize >= 124U) {
-		header->biIntent  = (uint32_t)getc(IN);
-		header->biIntent |= (uint32_t)getc(IN) << 8;
-		header->biIntent |= (uint32_t)getc(IN) << 16;
-		header->biIntent |= (uint32_t)getc(IN) << 24;
-		
-		header->biIccProfileData  = (uint32_t)getc(IN);
-		header->biIccProfileData |= (uint32_t)getc(IN) << 8;
-		header->biIccProfileData |= (uint32_t)getc(IN) << 16;
-		header->biIccProfileData |= (uint32_t)getc(IN) << 24;
-		
-		header->biIccProfileSize  = (uint32_t)getc(IN);
-		header->biIccProfileSize |= (uint32_t)getc(IN) << 8;
-		header->biIccProfileSize |= (uint32_t)getc(IN) << 16;
-		header->biIccProfileSize |= (uint32_t)getc(IN) << 24;
-		
-		header->biReserved  = (uint32_t)getc(IN);
-		header->biReserved |= (uint32_t)getc(IN) << 8;
-		header->biReserved |= (uint32_t)getc(IN) << 16;
-		header->biReserved |= (uint32_t)getc(IN) << 24;
-	}
-	return OPJ_TRUE;
-}
-
-static opj_bool bmp_read_raw_data(FILE* IN, uint8_t* pData, uint32_t stride, uint32_t width, uint32_t height)
-{
-	OPJ_ARG_NOT_USED(width);
-	
-	if ( fread(pData, sizeof(uint8_t), stride * height, IN) != (stride * height) )
-	{
-		fprintf(stderr, "\nError: fread return a number of element different from the expected.\n");
-		return OPJ_FALSE;
-	}
-	return OPJ_TRUE;
-}
-
-static opj_bool bmp_read_rle8_data(FILE* IN, uint8_t* pData, uint32_t stride, uint32_t width, uint32_t height)
-{
-	uint32_t x, y;
-	uint8_t *pix;
-	const uint8_t *beyond;
-	
-	beyond = pData + stride * height;
-	pix = pData;
-	
-	x = y = 0U;
-	while (y < height)
-	{
-		int c = getc(IN);
-		
-		if (c) {
-			int j;
-			uint8_t c1 = (uint8_t)getc(IN);
-			
-			for (j = 0; (j < c) && (x < width) && ((size_t)pix < (size_t)beyond); j++, x++, pix++) {
-				*pix = c1;
-			}
-		}
-		else {
-			c = getc(IN);
-			if (c == 0x00) { /* EOL */
-				x = 0;
-				++y;
-				pix = pData + y * stride + x;
-			}
-			else if (c == 0x01) { /* EOP */
-				break;
-			}
-			else if (c == 0x02) { /* MOVE by dxdy */
-				c = getc(IN);
-				x += (uint32_t)c;
-				c = getc(IN);
-				y += (uint32_t)c;
-				pix = pData + y * stride + x;
-			}
-			else /* 03 .. 255 */
-			{
-				int j;
-				for (j = 0; (j < c) && (x < width) && ((size_t)pix < (size_t)beyond); j++, x++, pix++)
-				{
-					uint8_t c1 = (uint8_t)getc(IN);
-					*pix = c1;
-				}
-				if ((uint32_t)c & 1U) { /* skip padding byte */
-					getc(IN);
-				}
-			}
-		}
-	}/* while() */
-	return OPJ_TRUE;
-}
-
-static opj_bool bmp_read_rle4_data(FILE* IN, uint8_t* pData, uint32_t stride, uint32_t width, uint32_t height)
-{
-	uint32_t x, y;
-	uint8_t *pix;
-	const uint8_t *beyond;
-	
-	beyond = pData + stride * height;
-	pix = pData;
-	x = y = 0U;
-	while(y < height)
-	{
-		int c = getc(IN);
-		if(c == EOF) break;
-		
-		if(c) {/* encoded mode */
-			int j;
-			uint8_t c1 = (uint8_t)getc(IN);
-		
-			for (j = 0; (j < c) && (x < width) && ((size_t)pix < (size_t)beyond); j++, x++, pix++) {
-				*pix = (uint8_t)((j&1) ? (c1 & 0x0fU) : ((c1>>4)&0x0fU));
-			}
-		}
-		else { /* absolute mode */
-			c = getc(IN);
-			if(c == EOF) break;
-		
-			if(c == 0x00) { /* EOL */
-				x = 0;  y++;  pix = pData + y * stride;
-			}
-			else if(c == 0x01) { /* EOP */
-				break;
-			}
-			else if(c == 0x02) { /* MOVE by dxdy */
-				c = getc(IN);  x += (uint32_t)c;
-				c = getc(IN);  y += (uint32_t)c;
-				pix = pData + y * stride + x;
-			}
-			else { /* 03 .. 255 : absolute mode */
-				int j;
-				uint8_t c1 = 0U;
-				
-				for (j = 0; (j < c) && (x < width) && ((size_t)pix < (size_t)beyond); j++, x++, pix++) {
-					if((j&1) == 0) {
-							c1 = (uint8_t)getc(IN);
-					}
-					*pix =  (uint8_t)((j&1) ? (c1 & 0x0fU) : ((c1>>4)&0x0fU));
-				}
-				if(((c&3) == 1) || ((c&3) == 2)) { /* skip padding byte */
-						getc(IN);
-				}
-			}
-		}
-	}  /* while(y < height) */
-	return OPJ_TRUE;
-}
-
-opj_image_t* bmptoimage(const char *filename, opj_cparameters_t *parameters)
-{
-	opj_image_cmptparm_t cmptparm[4];	/* maximum of 4 components */
-	uint8_t lut_R[256], lut_G[256], lut_B[256];
-	uint8_t const* pLUT[3];
-	opj_image_t * image = NULL;
-	FILE *IN;
-	OPJ_BITMAPFILEHEADER File_h;
-	OPJ_BITMAPINFOHEADER Info_h;
-	uint32_t i, palette_len, numcmpts = 1U;
-	opj_bool l_result = OPJ_FALSE;
-	uint8_t* pData = NULL;
-	uint32_t stride;
-	
-	pLUT[0] = lut_R; pLUT[1] = lut_G; pLUT[2] = lut_B;
-	
-	IN = fopen(filename, "rb");
-	if (!IN)
-	{
-		fprintf(stderr, "Failed to open %s for reading !!\n", filename);
-		return NULL;
-	}
-
-	if (!bmp_read_file_header(IN, &File_h)) {
-		fclose(IN);
-		return NULL;
-	}
-	if (!bmp_read_info_header(IN, &Info_h)) {
-		fclose(IN);
-		return NULL;
-	}
-	
-	/* Load palette */
-	if (Info_h.biBitCount <= 8U)
-	{
-		memset(&lut_R[0], 0, sizeof(lut_R));
-		memset(&lut_G[0], 0, sizeof(lut_G));
-		memset(&lut_B[0], 0, sizeof(lut_B));
-		
-		palette_len = Info_h.biClrUsed;
-		if((palette_len == 0U) && (Info_h.biBitCount <= 8U)) {
-			palette_len = (1U << Info_h.biBitCount);
-		}
-		if (palette_len > 256U) {
-			palette_len = 256U;
-		}
-		if (palette_len > 0U) {
-			uint8_t has_color = 0U;
-			for (i = 0U; i < palette_len; i++) {
-				lut_B[i] = (uint8_t)getc(IN);
-				lut_G[i] = (uint8_t)getc(IN);
-				lut_R[i] = (uint8_t)getc(IN);
-				(void)getc(IN); /* padding */
-				has_color |= (lut_B[i] ^ lut_G[i]) | (lut_G[i] ^ lut_R[i]);
-			}
-			if(has_color) {
-				numcmpts = 3U;
-			}
-		}
-	} else {
-		numcmpts = 3U;
-		if ((Info_h.biCompression == 3) && (Info_h.biAlphaMask != 0U)) {
-			numcmpts++;
-		}
-	}
-	
-	stride = ((Info_h.biWidth * Info_h.biBitCount + 31U) / 32U) * 4U; /* rows are aligned on 32bits */
-	if (Info_h.biBitCount == 4 && Info_h.biCompression == 2) { /* RLE 4 gets decoded as 8 bits data for now... */
-		stride = ((Info_h.biWidth * 8U + 31U) / 32U) * 4U;
-	}
-	pData = (uint8_t *) calloc(1, stride * Info_h.biHeight * sizeof(uint8_t));
-	if (pData == NULL) {
-		fclose(IN);
-		return NULL;
-	}
-	/* Place the cursor at the beginning of the image information */
-	fseek(IN, 0, SEEK_SET);
-	fseek(IN, (long)File_h.bfOffBits, SEEK_SET);
-	
-	switch (Info_h.biCompression) {
-		case 0:
-		case 3:
-			/* read raw data */
-			l_result = bmp_read_raw_data(IN, pData, stride, Info_h.biWidth, Info_h.biHeight);
-			break;
-		case 1:
-			/* read rle8 data */
-			l_result = bmp_read_rle8_data(IN, pData, stride, Info_h.biWidth, Info_h.biHeight);
-			break;
-		case 2:
-			/* read rle4 data */
-			l_result = bmp_read_rle4_data(IN, pData, stride, Info_h.biWidth, Info_h.biHeight);
-			break;
-  default:
-			fprintf(stderr, "Unsupported BMP compression\n");
-			l_result = OPJ_FALSE;
-			break;
-	}
-	if (!l_result) {
-		free(pData);
-		fclose(IN);
-		return NULL;
-	}
-	
-	/* create the image */
-	memset(&cmptparm[0], 0, sizeof(cmptparm));
-	for(i = 0; i < 4U; i++)
-	{
-		cmptparm[i].prec = 8;
-		cmptparm[i].bpp  = 8;
-		cmptparm[i].sgnd = 0;
-		cmptparm[i].dx   = parameters->subsampling_dx;
-		cmptparm[i].dy   = parameters->subsampling_dy;
-		cmptparm[i].w    = Info_h.biWidth;
-		cmptparm[i].h    = Info_h.biHeight;
-	}
-
-	image = opj_image_create(numcmpts, &cmptparm[0], (numcmpts == 1U) ? CLRSPC_GRAY : CLRSPC_SRGB);
-	if(!image) {
-		fclose(IN);
-		free(pData);
-		return NULL;
-	}
-	/* if (numcmpts == 4U) {
-		image->comps[3].alpha = 1;
-	} */
-	
-	/* set image offset and reference grid */
-	image->x0 = (uint32_t)parameters->image_offset_x0;
-	image->y0 = (uint32_t)parameters->image_offset_y0;
-	image->x1 =	image->x0 + (Info_h.biWidth  - 1U) * (uint32_t)parameters->subsampling_dx + 1U;
-	image->y1 = image->y0 + (Info_h.biHeight - 1U) * (uint32_t)parameters->subsampling_dy + 1U;
-	
-	/* Read the data */
-	if (Info_h.biBitCount == 24 && Info_h.biCompression == 0) { /*RGB */
-		bmp24toimage(pData, stride, image);
-	}
-	else if (Info_h.biBitCount == 8 && Info_h.biCompression == 0) { /* RGB 8bpp Indexed */
-		bmp8toimage(pData, stride, image, pLUT);
-	}
-	else if (Info_h.biBitCount == 8 && Info_h.biCompression == 1) { /*RLE8*/
-		bmp8toimage(pData, stride, image, pLUT);
-	}
-	else if (Info_h.biBitCount == 4 && Info_h.biCompression == 2) { /*RLE4*/
-		bmp8toimage(pData, stride, image, pLUT); /* RLE 4 gets decoded as 8 bits data for now */
-	}
-	else if (Info_h.biBitCount == 32 && Info_h.biCompression == 0) { /* RGBX */
-		bmpmask32toimage(pData, stride, image, 0x00FF0000U, 0x0000FF00U, 0x000000FFU, 0x00000000U);
-	}
-	else if (Info_h.biBitCount == 32 && Info_h.biCompression == 3) { /* bitmask */
-		bmpmask32toimage(pData, stride, image, Info_h.biRedMask, Info_h.biGreenMask, Info_h.biBlueMask, Info_h.biAlphaMask);
-	}
-	else if (Info_h.biBitCount == 16 && Info_h.biCompression == 0) { /* RGBX */
-		bmpmask16toimage(pData, stride, image, 0x7C00U, 0x03E0U, 0x001FU, 0x0000U);
-	}
-	else if (Info_h.biBitCount == 16 && Info_h.biCompression == 3) { /* bitmask */
-		if ((Info_h.biRedMask == 0U) && (Info_h.biGreenMask == 0U) && (Info_h.biBlueMask == 0U)) {
-			Info_h.biRedMask   = 0xF800U;
-			Info_h.biGreenMask = 0x07E0U;
-			Info_h.biBlueMask  = 0x001FU;
-		}
-		bmpmask16toimage(pData, stride, image, Info_h.biRedMask, Info_h.biGreenMask, Info_h.biBlueMask, Info_h.biAlphaMask);
-	}
-	else {
-		opj_image_destroy(image);
-		image = NULL;
-		fprintf(stderr, "Other system than 24 bits/pixels or 8 bits (no RLE coding) is not yet implemented [%d]\n", Info_h.biBitCount);
-	}
-	free(pData);
-	fclose(IN);
-	return image;
-}
-
-int imagetobmp(opj_image_t * image, const char *outfile) {
-    int w, h;
-    int i, pad;
-    FILE *fdest = NULL;
-    int adjustR, adjustG, adjustB;
-
-    if (image->comps[0].prec < 8) {
-        fprintf(stderr, "Unsupported number of components: %d\n", image->comps[0].prec);
-        return 1;
-    }
-    if (image->numcomps >= 3 && image->comps[0].dx == image->comps[1].dx
-            && image->comps[1].dx == image->comps[2].dx
-            && image->comps[0].dy == image->comps[1].dy
-            && image->comps[1].dy == image->comps[2].dy
-            && image->comps[0].prec == image->comps[1].prec
-            && image->comps[1].prec == image->comps[2].prec) {
-
-        /* -->> -->> -->> -->>
-        24 bits color
-        <<-- <<-- <<-- <<-- */
-
-        fdest = fopen(outfile, "wb");
-        if (!fdest) {
-            fprintf(stderr, "ERROR -> failed to open %s for writing\n", outfile);
-            return 1;
-        }
-
-        w = (int)image->comps[0].w;
-        h = (int)image->comps[0].h;
-
-        fprintf(fdest, "BM");
-
-        /* FILE HEADER */
-        /* ------------- */
-        fprintf(fdest, "%c%c%c%c",
-                (uint8_t) (h * w * 3 + 3 * h * (w % 2) + 54) & 0xff,
-                (uint8_t) ((h * w * 3 + 3 * h * (w % 2) + 54)	>> 8) & 0xff,
-                (uint8_t) ((h * w * 3 + 3 * h * (w % 2) + 54)	>> 16) & 0xff,
-                (uint8_t) ((h * w * 3 + 3 * h * (w % 2) + 54)	>> 24) & 0xff);
-        fprintf(fdest, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff, ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
-        fprintf(fdest, "%c%c%c%c", (54) & 0xff, ((54) >> 8) & 0xff,((54) >> 16) & 0xff, ((54) >> 24) & 0xff);
-
-        /* INFO HEADER   */
-        /* ------------- */
-        fprintf(fdest, "%c%c%c%c", (40) & 0xff, ((40) >> 8) & 0xff,	((40) >> 16) & 0xff, ((40) >> 24) & 0xff);
-        fprintf(fdest, "%c%c%c%c", (uint8_t) ((w) & 0xff),
-                (uint8_t) ((w) >> 8) & 0xff,
-                (uint8_t) ((w) >> 16) & 0xff,
-                (uint8_t) ((w) >> 24) & 0xff);
-        fprintf(fdest, "%c%c%c%c", (uint8_t) ((h) & 0xff),
-                (uint8_t) ((h) >> 8) & 0xff,
-                (uint8_t) ((h) >> 16) & 0xff,
-                (uint8_t) ((h) >> 24) & 0xff);
-        fprintf(fdest, "%c%c", (1) & 0xff, ((1) >> 8) & 0xff);
-        fprintf(fdest, "%c%c", (24) & 0xff, ((24) >> 8) & 0xff);
-        fprintf(fdest, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff, ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
-        fprintf(fdest, "%c%c%c%c", (uint8_t) (3 * h * w + 3 * h * (w % 2)) & 0xff,
-                (uint8_t) ((h * w * 3 + 3 * h * (w % 2)) >> 8) & 0xff,
-                (uint8_t) ((h * w * 3 + 3 * h * (w % 2)) >> 16) & 0xff,
-                (uint8_t) ((h * w * 3 + 3 * h * (w % 2)) >> 24) & 0xff);
-        fprintf(fdest, "%c%c%c%c", (7834) & 0xff, ((7834) >> 8) & 0xff, ((7834) >> 16) & 0xff, ((7834) >> 24) & 0xff);
-        fprintf(fdest, "%c%c%c%c", (7834) & 0xff, ((7834) >> 8) & 0xff,	((7834) >> 16) & 0xff, ((7834) >> 24) & 0xff);
-        fprintf(fdest, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff, ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
-        fprintf(fdest, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff, ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
-
-        if (image->comps[0].prec > 8) {
-            adjustR = (int)image->comps[0].prec - 8;
-            printf("BMP CONVERSION: Truncating component 0 from %d bits to 8 bits\n", image->comps[0].prec);
-        }
-        else
-            adjustR = 0;
-        if (image->comps[1].prec > 8) {
-            adjustG = (int)image->comps[1].prec - 8;
-            printf("BMP CONVERSION: Truncating component 1 from %d bits to 8 bits\n", image->comps[1].prec);
-        }
-        else
-            adjustG = 0;
-        if (image->comps[2].prec > 8) {
-            adjustB = (int)image->comps[2].prec - 8;
-            printf("BMP CONVERSION: Truncating component 2 from %d bits to 8 bits\n", image->comps[2].prec);
-        }
-        else
-            adjustB = 0;
-
-        for (i = 0; i < w * h; i++) {
-            uint8_t rc, gc, bc;
-            int r, g, b;
-
-            r = image->comps[0].data[w * h - ((i) / (w) + 1) * w + (i) % (w)];
-            r += (image->comps[0].sgnd ? 1 << (image->comps[0].prec - 1) : 0);
-            r = ((r >> adjustR)+((r >> (adjustR-1))%2));
-            if(r > 255) r = 255; else if(r < 0) r = 0;
-            rc = (uint8_t)r;
-
-            g = image->comps[1].data[w * h - ((i) / (w) + 1) * w + (i) % (w)];
-            g += (image->comps[1].sgnd ? 1 << (image->comps[1].prec - 1) : 0);
-            g = ((g >> adjustG)+((g >> (adjustG-1))%2));
-            if(g > 255) g = 255; else if(g < 0) g = 0;
-            gc = (uint8_t)g;
-
-            b = image->comps[2].data[w * h - ((i) / (w) + 1) * w + (i) % (w)];
-            b += (image->comps[2].sgnd ? 1 << (image->comps[2].prec - 1) : 0);
-            b = ((b >> adjustB)+((b >> (adjustB-1))%2));
-            if(b > 255) b = 255; else if(b < 0) b = 0;
-            bc = (uint8_t)b;
-
-            fprintf(fdest, "%c%c%c", bc, gc, rc);
-
-            if ((i + 1) % w == 0) {
-                for (pad = (3 * w) % 4 ? 4 - (3 * w) % 4 : 0; pad > 0; pad--)	/* ADD */
-                    fprintf(fdest, "%c", 0);
-            }
-        }
-        fclose(fdest);
-    } else {			/* Gray-scale */
-
-        /* -->> -->> -->> -->>
-        8 bits non code (Gray scale)
-        <<-- <<-- <<-- <<-- */
-
-        fdest = fopen(outfile, "wb");
-        if (!fdest) {
-            fprintf(stderr, "ERROR -> failed to open %s for writing\n", outfile);
-            return 1;
-        }
-        w = (int)image->comps[0].w;
-        h = (int)image->comps[0].h;
-
-        fprintf(fdest, "BM");
-
-        /* FILE HEADER */
-        /* ------------- */
-        fprintf(fdest, "%c%c%c%c", (uint8_t) (h * w + 54 + 1024 + h * (w % 2)) & 0xff,
-                (uint8_t) ((h * w + 54 + 1024 + h * (w % 2)) >> 8) & 0xff,
-                (uint8_t) ((h * w + 54 + 1024 + h * (w % 2)) >> 16) & 0xff,
-                (uint8_t) ((h * w + 54 + 1024 + w * (w % 2)) >> 24) & 0xff);
-        fprintf(fdest, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff, ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
-        fprintf(fdest, "%c%c%c%c", (54 + 1024) & 0xff, ((54 + 1024) >> 8) & 0xff,
-                ((54 + 1024) >> 16) & 0xff,
-                ((54 + 1024) >> 24) & 0xff);
-
-        /* INFO HEADER */
-        /* ------------- */
-        fprintf(fdest, "%c%c%c%c", (40) & 0xff, ((40) >> 8) & 0xff,	((40) >> 16) & 0xff, ((40) >> 24) & 0xff);
-        fprintf(fdest, "%c%c%c%c", (uint8_t) ((w) & 0xff),
-                (uint8_t) ((w) >> 8) & 0xff,
-                (uint8_t) ((w) >> 16) & 0xff,
-                (uint8_t) ((w) >> 24) & 0xff);
-        fprintf(fdest, "%c%c%c%c", (uint8_t) ((h) & 0xff),
-                (uint8_t) ((h) >> 8) & 0xff,
-                (uint8_t) ((h) >> 16) & 0xff,
-                (uint8_t) ((h) >> 24) & 0xff);
-        fprintf(fdest, "%c%c", (1) & 0xff, ((1) >> 8) & 0xff);
-        fprintf(fdest, "%c%c", (8) & 0xff, ((8) >> 8) & 0xff);
-        fprintf(fdest, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff, ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
-        fprintf(fdest, "%c%c%c%c", (uint8_t) (h * w + h * (w % 2)) & 0xff,
-                (uint8_t) ((h * w + h * (w % 2)) >> 8) &	0xff,
-                (uint8_t) ((h * w + h * (w % 2)) >> 16) &	0xff,
-                (uint8_t) ((h * w + h * (w % 2)) >> 24) & 0xff);
-        fprintf(fdest, "%c%c%c%c", (7834) & 0xff, ((7834) >> 8) & 0xff,	((7834) >> 16) & 0xff, ((7834) >> 24) & 0xff);
-        fprintf(fdest, "%c%c%c%c", (7834) & 0xff, ((7834) >> 8) & 0xff,	((7834) >> 16) & 0xff, ((7834) >> 24) & 0xff);
-        fprintf(fdest, "%c%c%c%c", (256) & 0xff, ((256) >> 8) & 0xff, ((256) >> 16) & 0xff, ((256) >> 24) & 0xff);
-        fprintf(fdest, "%c%c%c%c", (256) & 0xff, ((256) >> 8) & 0xff, ((256) >> 16) & 0xff, ((256) >> 24) & 0xff);
-
-        if (image->comps[0].prec > 8) {
-            adjustR = (int)image->comps[0].prec - 8;
-            printf("BMP CONVERSION: Truncating component 0 from %d bits to 8 bits\n", image->comps[0].prec);
-        }else
-            adjustR = 0;
-
-        for (i = 0; i < 256; i++) {
-            fprintf(fdest, "%c%c%c%c", i, i, i, 0);
-        }
-
-        for (i = 0; i < w * h; i++) {
-            int r;
-
-            r = image->comps[0].data[w * h - ((i) / (w) + 1) * w + (i) % (w)];
-            r += (image->comps[0].sgnd ? 1 << (image->comps[0].prec - 1) : 0);
-            r = ((r >> adjustR)+((r >> (adjustR-1))%2));
-            if(r > 255) r = 255; else if(r < 0) r = 0;
-
-            fprintf(fdest, "%c", (uint8_t)r);
-
-            if ((i + 1) % w == 0) {
-                for (pad = w % 4 ? 4 - w % 4 : 0; pad > 0; pad--)	/* ADD */
-                    fprintf(fdest, "%c", 0);
-            }
-        }
-        fclose(fdest);
-    }
-
-    return 0;
-}

applications/codec/convertpng.c

@@ -1,496 +0,0 @@
-/*
- * The copyright in this software is being made available under the 2-clauses
- * BSD License, included below. This software may be subject to other third
- * party and contributor rights, including patent rights, and no such rights
- * are granted under this license.
- *
- * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2014, Professor Benoit Macq
- * Copyright (c) 2001-2003, David Janssens
- * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux
- * Copyright (c) 2003-2014, Antonin Descampe
- * Copyright (c) 2005, Herve Drolon, FreeImage Team
- * Copyright (c) 2006-2007, Parvatha Elangovan
- * Copyright (c) 2015, Matthieu Darbois
- * 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.
- */
-#include "opj_config.h"
-
-#ifndef HAVE_LIBPNG
-# error HAVE_LIBPNG_NOT_DEFINED
-#endif /* HAVE_LIBPNG */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-#include <zlib.h>
-#include <png.h>
-
-#include "openjpeg.h"
-#include "convert.h"
-
-#define PNG_MAGIC "\x89PNG\x0d\x0a\x1a\x0a"
-#define MAGIC_SIZE 8
-/* PNG allows bits per sample: 1, 2, 4, 8, 16 */
-
-
-static void convert_16u32s_C1R(const png_byte* pSrc, png_int_32* pDst, size_t length)
-{
-	size_t i;
-	for (i = 0; i < length; i++) {
-		png_int_32 val0 = *pSrc++;
-		png_int_32 val1 = *pSrc++;
-		pDst[i] = val0 << 8 | val1;
-	}
-}
-
-opj_image_t *pngtoimage(const char *read_idf, opj_cparameters_t * params)
-{
-	png_structp  png = NULL;
-	png_infop    info = NULL;
-	double gamma;
-	int bit_depth, interlace_type,compression_type, filter_type;
-	png_uint_32 i;
-	png_uint_32  width, height = 0U;
-	int color_type;
-	FILE *reader = NULL;
-	png_byte** rows = NULL;
-	png_int_32* row32s = NULL;
-	/* j2k: */
-	opj_image_t *image = NULL;
-	opj_image_cmptparm_t cmptparm[4];
-	png_uint_32 nr_comp;
-	png_byte sigbuf[8];
-	convert_XXx32s_C1R cvtXXTo32s = NULL;
-	convert_32s_CXPX cvtCxToPx = NULL;
-	png_int_32* planes[4];
-	
-	if((reader = fopen(read_idf, "rb")) == NULL)
-	{
-		fprintf(stderr,"pngtoimage: can not open %s\n",read_idf);
-		return NULL;
-	}
-	
-	if(fread(sigbuf, 1, MAGIC_SIZE, reader) != MAGIC_SIZE
-		 || memcmp(sigbuf, PNG_MAGIC, MAGIC_SIZE) != 0)
-	{
-		fprintf(stderr,"pngtoimage: %s is no valid PNG file\n",read_idf);
-		goto fin;
-	}
-	
-	if((png = png_create_read_struct(PNG_LIBPNG_VER_STRING,
-																	 NULL, NULL, NULL)) == NULL)
-		goto fin;
-	if((info = png_create_info_struct(png)) == NULL)
-		goto fin;
-	
-	if(setjmp(png_jmpbuf(png)))
-		goto fin;
-	
-	png_init_io(png, reader);
-	png_set_sig_bytes(png, MAGIC_SIZE);
-	
-	png_read_info(png, info);
-	
-	if(png_get_IHDR(png, info, &width, &height,
-									&bit_depth, &color_type, &interlace_type,
-									&compression_type, &filter_type) == 0)
-		goto fin;
-	
-	/* png_set_expand():
-	 * expand paletted images to RGB, expand grayscale images of
-	 * less than 8-bit depth to 8-bit depth, and expand tRNS chunks
-	 * to alpha channels.
-	 */
-	if(color_type == PNG_COLOR_TYPE_PALETTE) {
-		png_set_expand(png);
-	}
-	
-	if(png_get_valid(png, info, PNG_INFO_tRNS)) {
-		png_set_expand(png);
-	}
-	/* We might wan't to expand background */
-	/*
-	if(png_get_valid(png, info, PNG_INFO_bKGD)) {
-		png_color_16p bgnd;
-		png_get_bKGD(png, info, &bgnd);
-		png_set_background(png, bgnd, PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
-	}
-	*/
-	
-	if( !png_get_gAMA(png, info, &gamma))
-		gamma = 1.0;
-	
-	/* we're not displaying but converting, screen gamma == 1.0 */
-	png_set_gamma(png, 1.0, gamma);
-	
-	png_read_update_info(png, info);
-	
-	color_type = png_get_color_type(png, info);
-	
-	switch (color_type) {
-		case PNG_COLOR_TYPE_GRAY:
-			nr_comp = 1;
-			break;
-		case PNG_COLOR_TYPE_GRAY_ALPHA:
-			nr_comp = 2;
-			break;
-		case PNG_COLOR_TYPE_RGB:
-			nr_comp = 3;
-			break;
-		case PNG_COLOR_TYPE_RGB_ALPHA:
-			nr_comp = 4;
-			break;
-		default:
-			fprintf(stderr,"pngtoimage: colortype %d is not supported\n", color_type);
-			goto fin;
-	}
-	cvtCxToPx = convert_32s_CXPX_LUT[nr_comp];
-	bit_depth = png_get_bit_depth(png, info);
-	
-	switch (bit_depth) {
-		case 1:
-		case 2:
-		case 4:
-		case 8:
-			cvtXXTo32s = convert_XXu32s_C1R_LUT[bit_depth];
-			break;
-		case 16: /* 16 bpp is specific to PNG */
-			cvtXXTo32s = convert_16u32s_C1R;
-			break;
-		default:
-			fprintf(stderr,"pngtoimage: bit depth %d is not supported\n", bit_depth);
-			goto fin;
-	}
-
-	
-	rows = (png_byte**)calloc(height+1, sizeof(png_byte*));
-	for(i = 0; i < height; ++i)
-		rows[i] = (png_byte*)malloc(png_get_rowbytes(png,info));
-	
-	png_read_image(png, rows);
-	
-	/* Create image */
-	memset(cmptparm, 0, sizeof(cmptparm));
-	for(i = 0; i < nr_comp; ++i)
-	{
-		cmptparm[i].prec = (png_uint_32)bit_depth;
-		/* bits_per_pixel: 8 or 16 */
-		cmptparm[i].bpp = (png_uint_32)bit_depth;
-		cmptparm[i].sgnd = 0;
-		cmptparm[i].dx = (png_uint_32)params->subsampling_dx;
-		cmptparm[i].dy = (png_uint_32)params->subsampling_dy;
-		cmptparm[i].w = (png_uint_32)width;
-		cmptparm[i].h = (png_uint_32)height;
-	}
-	
-	image = opj_image_create(nr_comp, &cmptparm[0], (nr_comp > 2U) ? CLRSPC_SRGB : CLRSPC_GRAY);
-	if(image == NULL) goto fin;
-	image->x0 = (png_uint_32)params->image_offset_x0;
-	image->y0 = (png_uint_32)params->image_offset_y0;
-	image->x1 = (png_uint_32)(image->x0 + (width  - 1) * (png_uint_32)params->subsampling_dx + 1 + image->x0);
-	image->y1 = (png_uint_32)(image->y0 + (height - 1) * (png_uint_32)params->subsampling_dy + 1 + image->y0);
-	
-	row32s = (png_int_32 *)malloc((size_t)width * nr_comp * sizeof(png_int_32));
-	if(row32s == NULL) goto fin;
-	
-	/* Set alpha channel */
-	/* image->comps[nr_comp-1U].alpha = 1U - (nr_comp & 1U); */
-	
-	for(i = 0; i < nr_comp; i++)
-	{
-		planes[i] = image->comps[i].data;
-	}
-	
-	for(i = 0; i < height; ++i)
-	{
-		cvtXXTo32s(rows[i], row32s, (size_t)width * nr_comp);
-		cvtCxToPx(row32s, planes, width);
-		planes[0] += width;
-		planes[1] += width;
-		planes[2] += width;
-		planes[3] += width;
-	}
-fin:
-	if(rows)
-	{
-		for(i = 0; i < height; ++i)
-			free(rows[i]);
-		free(rows);
-	}
-	if (row32s) {
-		free(row32s);
-	}
-	if(png)
-		png_destroy_read_struct(&png, &info, NULL);
-	
-	fclose(reader);
-	
-	return image;
-	
-}/* pngtoimage() */
-
-
-static void convert_32s16u_C1R(const png_int_32* pSrc, png_byte* pDst, size_t length)
-{
-	size_t i;
-	for (i = 0; i < length; i++) {
-		png_uint_32 val = (png_uint_32)pSrc[i];
-		*pDst++ = (png_byte)(val >> 8);
-		*pDst++ = (png_byte)val;
-	}
-}
-int imagetopng(opj_image_t * image, const char *write_idf)
-{
-	FILE * volatile writer = NULL;
-	png_structp png = NULL;
-	png_infop info = NULL;
-	png_bytep volatile row_buf = NULL;
-	int nr_comp, color_type;
-	volatile int prec;
-	png_color_8 sig_bit;
-	png_int_32 const* planes[4];
-	int i;
-	png_int_32* volatile buffer32s = NULL;
-	
-	volatile int fails = 1;
-	
-	memset(&sig_bit, 0, sizeof(sig_bit));
-	prec = (int)image->comps[0].prec;
-	planes[0] = image->comps[0].data;
-	nr_comp = (int)image->numcomps;
-	
-	if (nr_comp > 4) {
-		nr_comp = 4;
-	}
-	for (i = 1; i < nr_comp; ++i) {
-		if (image->comps[0].dx != image->comps[i].dx) {
-			break;
-		}
-		if (image->comps[0].dy != image->comps[i].dy) {
-			break;
-		}
-		if (image->comps[0].prec != image->comps[i].prec) {
-			break;
-		}
-		if (image->comps[0].sgnd != image->comps[i].sgnd) {
-			break;
-		}
-		planes[i] = image->comps[i].data;
-	}
-	if (i != nr_comp) {
-		fprintf(stderr,"imagetopng: All components shall have the same subsampling, same bit depth, same sign.\n");
-		fprintf(stderr,"\tAborting\n");
-		return 1;
-	}
-	for (i = 0; i < nr_comp; ++i) {
-		clip_component(&(image->comps[i]), image->comps[0].prec);
-	}
-	if(prec > 8 && prec < 16)
-	{
-		for (i = 0; i < nr_comp; ++i) {
-			scale_component(&(image->comps[i]), 16);
-		}
-		prec = 16;
-	}
-	else if(prec < 8 && nr_comp > 1)/* GRAY_ALPHA, RGB, RGB_ALPHA */
-	{
-		for (i = 0; i < nr_comp; ++i) {
-			scale_component(&(image->comps[i]), 8);
-		}
-		prec = 8;
-	} else if((prec > 1) && (prec < 8) && ((prec == 6) || ((prec & 1)==1))) { /* GRAY with non native precision */
-		if ((prec == 5) || (prec == 6)) {
-			prec = 8;
-		} else {
-			prec++;
-		}
-		for (i = 0; i < nr_comp; ++i) {
-			scale_component(&(image->comps[i]), (png_uint_32)prec);
-		}
-	}
-	
-	if(prec != 1 && prec != 2 && prec != 4 && prec != 8 && prec != 16)
-	{
-		fprintf(stderr,"imagetopng: can not create %s\n\twrong bit_depth %d\n", write_idf, prec);
-		return fails;
-	}
-	
-	writer = fopen(write_idf, "wb");
-	
-	if(writer == NULL) return fails;
-	
-	/* Create and initialize the png_struct with the desired error handler
-	 * functions.  If you want to use the default stderr and longjump method,
-	 * you can supply NULL for the last three parameters.  We also check that
-	 * the library version is compatible with the one used at compile time,
-	 * in case we are using dynamically linked libraries.  REQUIRED.
-	 */
-	png = png_create_write_struct(PNG_LIBPNG_VER_STRING,
-																NULL, NULL, NULL);
-	/*png_voidp user_error_ptr, user_error_fn, user_warning_fn); */
-	
-	if(png == NULL) goto fin;
-	
-	/* Allocate/initialize the image information data.  REQUIRED
-	 */
-	info = png_create_info_struct(png);
-	
-	if(info == NULL) goto fin;
-	
-	/* Set error handling.  REQUIRED if you are not supplying your own
-	 * error handling functions in the png_create_write_struct() call.
-	 */
-	if(setjmp(png_jmpbuf(png))) goto fin;
-	
-	/* I/O initialization functions is REQUIRED
-	 */
-	png_init_io(png, writer);
-	
-	/* Set the image information here.  Width and height are up to 2^31,
-	 * bit_depth is one of 1, 2, 4, 8, or 16, but valid values also depend on
-	 * the color_type selected. color_type is one of PNG_COLOR_TYPE_GRAY,
-	 * PNG_COLOR_TYPE_GRAY_ALPHA, PNG_COLOR_TYPE_PALETTE, PNG_COLOR_TYPE_RGB,
-	 * or PNG_COLOR_TYPE_RGB_ALPHA.  interlace is either PNG_INTERLACE_NONE or
-	 * PNG_INTERLACE_ADAM7, and the compression_type and filter_type MUST
-	 * currently be PNG_COMPRESSION_TYPE_BASE and PNG_FILTER_TYPE_BASE.
-	 * REQUIRED
-	 *
-	 * ERRORS:
-	 *
-	 * color_type == PNG_COLOR_TYPE_PALETTE && bit_depth > 8
-	 * color_type == PNG_COLOR_TYPE_RGB && bit_depth < 8
-	 * color_type == PNG_COLOR_TYPE_GRAY_ALPHA && bit_depth < 8
-	 * color_type == PNG_COLOR_TYPE_RGB_ALPHA) && bit_depth < 8
-	 *
-	 */
-	png_set_compression_level(png, Z_BEST_COMPRESSION);
-	
-	if(nr_comp >= 3) /* RGB(A) */
-	{
-		color_type = PNG_COLOR_TYPE_RGB;
-		sig_bit.red = sig_bit.green = sig_bit.blue = (png_byte)prec;
-	}
-	else /* GRAY(A) */
-	{
-		color_type = PNG_COLOR_TYPE_GRAY;
-		sig_bit.gray = (png_byte)prec;
-	}
-	if((nr_comp & 1) == 0) /* ALPHA */
-	{
-		color_type |= PNG_COLOR_MASK_ALPHA;
-		sig_bit.alpha = (png_byte)prec;
-	}
-	
-	png_set_IHDR(png, info, image->comps[0].w, image->comps[0].h, prec, color_type,
-							 PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE,  PNG_FILTER_TYPE_BASE);
-	
-	png_set_sBIT(png, info, &sig_bit);
-	/* png_set_gamma(png, 2.2, 1./2.2); */
-	/* png_set_sRGB(png, info, PNG_sRGB_INTENT_PERCEPTUAL); */
-	png_write_info(png, info);
-	
-	/* setup conversion */
-	{
-		size_t rowStride;
-		png_size_t png_row_size;
-		
-		png_row_size = png_get_rowbytes(png, info);
-		rowStride = ((size_t)image->comps[0].w * (size_t)nr_comp * (size_t)prec + 7U) / 8U;
-		if (rowStride != (size_t)png_row_size) {
-			fprintf(stderr, "Invalid PNG row size\n");
-			goto fin;
-		}
-		row_buf = (png_bytep)malloc(png_row_size);
-		if (row_buf == NULL) {
-			fprintf(stderr, "Can't allocate memory for PNG row\n");
-			goto fin;
-		}
-		buffer32s = (png_int_32*)malloc((size_t)image->comps[0].w * (size_t)nr_comp * sizeof(png_int_32));
-		if (buffer32s == NULL) {
-			fprintf(stderr, "Can't allocate memory for interleaved 32s row\n");
-			goto fin;
-		}
-	}
-	
-	/* convert */
-	{
-		size_t width= image->comps[0].w;
-		int y;
-		convert_32s_PXCX cvtPxToCx = convert_32s_PXCX_LUT[nr_comp];
-		convert_32sXXx_C1R cvt32sToPack = NULL;
-		png_int_32 adjust = image->comps[0].sgnd ? 1 << (prec - 1) : 0;
-		png_bytep row_buf_cpy = row_buf;
-		png_int_32* buffer32s_cpy = buffer32s;
-
-		switch (prec) {
-			case 1:
-			case 2:
-			case 4:
-			case 8:
-				cvt32sToPack = convert_32sXXu_C1R_LUT[prec];
-				break;
-			case 16:
-				cvt32sToPack = convert_32s16u_C1R;
-				break;
-			default:
-				/* never here */
-				break;
-		}
-	
-		for(y = 0; y < image->comps[0].h; ++y)
-		{
-			cvtPxToCx(planes, buffer32s_cpy, width, adjust);
-			cvt32sToPack(buffer32s_cpy, row_buf_cpy, width * (size_t)nr_comp);
-			png_write_row(png, row_buf_cpy);
-			planes[0] += width;
-			planes[1] += width;
-			planes[2] += width;
-			planes[3] += width;
-		}
-	}
-
-	png_write_end(png, info);
-	
-	fails = 0;
-	
-fin:
-	if(png) {
-		png_destroy_write_struct(&png, &info);
-	}
-	if(row_buf) {
-		free(row_buf);
-	}
-	if(buffer32s) {
-		free(buffer32s);
-	}
-	fclose(writer);
-	
-	if(fails) (void)remove(write_idf); /* ignore return value */
-	
-	return fails;
-}/* imagetopng() */

applications/codec/converttif.c

@@ -1,633 +0,0 @@
-/*
- * The copyright in this software is being made available under the 2-clauses
- * BSD License, included below. This software may be subject to other third
- * party and contributor rights, including patent rights, and no such rights
- * are granted under this license.
- *
- * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2014, Professor Benoit Macq
- * Copyright (c) 2001-2003, David Janssens
- * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux
- * Copyright (c) 2003-2014, Antonin Descampe
- * Copyright (c) 2005, Herve Drolon, FreeImage Team
- * Copyright (c) 2006-2007, Parvatha Elangovan
- * Copyright (c) 2015, Matthieu Darbois
- * 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.
- */
-#include "opj_config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-#ifndef HAVE_LIBTIFF
-# error HAVE_LIBTIFF_NOT_DEFINED
-#endif /* HAVE_LIBTIFF */
-
-#include <tiffio.h>
-#include "openjpeg.h"
-#include "convert.h"
-
-/* -->> -->> -->> -->>
- 
- TIFF IMAGE FORMAT
- 
- <<-- <<-- <<-- <<-- */
-
-static void tif_32sto10u(const int32* pSrc, uint8* pDst, size_t length)
-{
-	size_t i;
-	for (i = 0; i < (length & ~(size_t)3U); i+=4U) {
-		uint32 src0 = (uint32)pSrc[i+0];
-		uint32 src1 = (uint32)pSrc[i+1];
-		uint32 src2 = (uint32)pSrc[i+2];
-		uint32 src3 = (uint32)pSrc[i+3];
-		
-		*pDst++ = (uint8)(src0 >> 2);
-		*pDst++ = (uint8)(((src0 & 0x3U) << 6) | (src1 >> 4));
-		*pDst++ = (uint8)(((src1 & 0xFU) << 4) | (src2 >> 6));
-		*pDst++ = (uint8)(((src2 & 0x3FU) << 2) | (src3 >> 8));
-		*pDst++ = (uint8)(src3);
-	}
-	
-	if (length & 3U) {
-		uint32 src0 = (uint32)pSrc[i+0];
-		uint32 src1 = 0U;
-		uint32 src2 = 0U;
-		length = length & 3U;
-		
-		if (length > 1U) {
-			src1 = (uint32)pSrc[i+1];
-			if (length > 2U) {
-				src2 = (uint32)pSrc[i+2];
-			}
-		}
-		*pDst++ = (uint8)(src0 >> 2);
-		*pDst++ = (uint8)(((src0 & 0x3U) << 6) | (src1 >> 4));
-		if (length > 1U) {
-			*pDst++ = (uint8)(((src1 & 0xFU) << 4) | (src2 >> 6));
-			if (length > 2U) {
-				*pDst++ = (uint8)(((src2 & 0x3FU) << 2));
-			}
-		}
-	}
-}
-static void tif_32sto12u(const int32* pSrc, uint8* pDst, size_t length)
-{
-	size_t i;
-	for (i = 0; i < (length & ~(size_t)1U); i+=2U) {
-		uint32 src0 = (uint32)pSrc[i+0];
-		uint32 src1 = (uint32)pSrc[i+1];
-		
-		*pDst++ = (uint8)(src0 >> 4);
-		*pDst++ = (uint8)(((src0 & 0xFU) << 4) | (src1 >> 8));
-		*pDst++ = (uint8)(src1);
-	}
-	
-	if (length & 1U) {
-		uint32 src0 = (uint32)pSrc[i+0];
-		*pDst++ = (uint8)(src0 >> 4);
-		*pDst++ = (uint8)(((src0 & 0xFU) << 4));
-	}
-}
-static void tif_32sto14u(const int32* pSrc, uint8* pDst, size_t length)
-{
-	size_t i;
-	for (i = 0; i < (length & ~(size_t)3U); i+=4U) {
-		uint32 src0 = (uint32)pSrc[i+0];
-		uint32 src1 = (uint32)pSrc[i+1];
-		uint32 src2 = (uint32)pSrc[i+2];
-		uint32 src3 = (uint32)pSrc[i+3];
-		
-		*pDst++ = (uint8)(src0 >> 6);
-		*pDst++ = (uint8)(((src0 & 0x3FU) << 2) | (src1 >> 12));
-		*pDst++ = (uint8)(src1 >> 4);
-		*pDst++ = (uint8)(((src1 & 0xFU) << 4) | (src2 >> 10));
-		*pDst++ = (uint8)(src2 >> 2);
-		*pDst++ = (uint8)(((src2 & 0x3U) << 6) | (src3 >> 8));
-		*pDst++ = (uint8)(src3);
-	}
-	
-	if (length & 3U) {
-		uint32 src0 = (uint32)pSrc[i+0];
-		uint32 src1 = 0U;
-		uint32 src2 = 0U;
-		length = length & 3U;
-		
-		if (length > 1U) {
-			src1 = (uint32)pSrc[i+1];
-			if (length > 2U) {
-				src2 = (uint32)pSrc[i+2];
-			}
-		}
-		*pDst++ = (uint8)(src0 >> 6);
-		*pDst++ = (uint8)(((src0 & 0x3FU) << 2) | (src1 >> 12));
-		if (length > 1U) {
-			*pDst++ = (uint8)(src1 >> 4);
-			*pDst++ = (uint8)(((src1 & 0xFU) << 4) | (src2 >> 10));
-			if (length > 2U) {
-				*pDst++ = (uint8)(src2 >> 2);
-				*pDst++ = (uint8)(((src2 & 0x3U) << 6));
-			}
-		}
-	}
-}
-static void tif_32sto16u(const int32* pSrc, uint16* pDst, size_t length)
-{
-	size_t i;
-	for (i = 0; i < length; ++i) {
-		pDst[i] = (uint16)pSrc[i];
-	}
-}
-
-int imagetotif(opj_image_t * image, const char *outfile)
-{
-	int width, height;
-	int bps,adjust, sgnd;
-	int tiPhoto;
-	TIFF *tif;
-	tdata_t buf;
-	tsize_t strip_size;
-	int32 i, numcomps;
-	size_t rowStride;
-	int32* buffer32s = NULL;
-	int32 const* planes[4];
-	convert_32s_PXCX cvtPxToCx = NULL;
-	convert_32sXXx_C1R cvt32sToTif = NULL;
-
-	bps = image->comps[0].prec;
-	planes[0] = image->comps[0].data;
-	
-	numcomps = image->numcomps;
-	
-	if (numcomps > 2) {
-		tiPhoto = PHOTOMETRIC_RGB;
-		if (numcomps > 4) {
-			numcomps = 4;
-		}
-	} else {
-		tiPhoto = PHOTOMETRIC_MINISBLACK;
-	}
-	for (i = 1; i < numcomps; ++i) {
-		if (image->comps[0].dx != image->comps[i].dx) {
-			break;
-		}
-		if (image->comps[0].dy != image->comps[i].dy) {
-			break;
-		}
-		if (image->comps[0].prec != image->comps[i].prec) {
-			break;
-		}
-		if (image->comps[0].sgnd != image->comps[i].sgnd) {
-			break;
-		}
-		planes[i] = image->comps[i].data;
-	}
-	if (i != numcomps) {
-		fprintf(stderr,"imagetotif: All components shall have the same subsampling, same bit depth.\n");
-		fprintf(stderr,"\tAborting\n");
-		return 1;
-	}
-	
-	if((bps > 16) || ((bps != 1) && (bps & 1))) bps = 0;
-	if(bps == 0)
-	{
-		fprintf(stderr,"imagetotif: Bits=%d, Only 1, 2, 4, 6, 8, 10, 12, 14 and 16 bits implemented\n",bps);
-		fprintf(stderr,"\tAborting\n");
-		return 1;
-	}
-	tif = TIFFOpen(outfile, "wb");
-	if (!tif)
-	{
-		fprintf(stderr, "imagetotif:failed to open %s for writing\n", outfile);
-		return 1;
-	}
-	for (i = 0; i < numcomps; ++i) {
-		clip_component(&(image->comps[i]), image->comps[0].prec);
-	}
-	cvtPxToCx = convert_32s_PXCX_LUT[numcomps];
-	switch (bps) {
-		case 1:
-		case 2:
-		case 4:
-		case 6:
-		case 8:
-			cvt32sToTif = convert_32sXXu_C1R_LUT[bps];
-			break;
-		case 10:
-			cvt32sToTif = tif_32sto10u;
-			break;
-		case 12:
-			cvt32sToTif = tif_32sto12u;
-			break;
-		case 14:
-			cvt32sToTif = tif_32sto14u;
-			break;
-		case 16:
-			cvt32sToTif = (convert_32sXXx_C1R)tif_32sto16u;
-			break;
-		default:
-			/* never here */
-			break;
-	}
-	sgnd = (int)image->comps[0].sgnd;
-	adjust = sgnd ? 1 << (image->comps[0].prec - 1) : 0;
-	width   = (int)image->comps[0].w;
-	height  = (int)image->comps[0].h;
-	
-	TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, width);
-	TIFFSetField(tif, TIFFTAG_IMAGELENGTH, height);
-	TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, numcomps);
-	TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, bps);
-	TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
-	TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
-	TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, tiPhoto);
-	TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP, 1);
-	
-	strip_size = TIFFStripSize(tif);
-	rowStride = ((size_t)width * numcomps * (size_t)bps + 7U) / 8U;
-	if (rowStride != (size_t)strip_size) {
-		fprintf(stderr, "Invalid TIFF strip size\n");
-		TIFFClose(tif);
-		return 1;
-	}
-	buf = _TIFFmalloc(strip_size);
-	if (buf == NULL) {
-		TIFFClose(tif);
-		return 1;
-	}
-	buffer32s = (int32 *)malloc((size_t)width * numcomps * sizeof(int32));
-	if (buffer32s == NULL) {
-		_TIFFfree(buf);
-		TIFFClose(tif);
-		return 1;
-	}
-	
-	for (i = 0; i < image->comps[0].h; ++i) {
-		cvtPxToCx(planes, buffer32s, (size_t)width, adjust);
-		cvt32sToTif(buffer32s, (uint8 *)buf, (size_t)width * numcomps);
-		(void)TIFFWriteEncodedStrip(tif, i, (void*)buf, strip_size);
-		planes[0] += width;
-		planes[1] += width;
-		planes[2] += width;
-		planes[3] += width;
-	}
-	_TIFFfree((void*)buf);
-	TIFFClose(tif);
-	free(buffer32s);
-		
-	return 0;
-}/* imagetotif() */
-
-static void tif_10uto32s(const uint8* pSrc, int32* pDst, size_t length)
-{
-	size_t i;
-	for (i = 0; i < (length & ~(size_t)3U); i+=4U) {
-		uint32 val0 = *pSrc++;
-		uint32 val1 = *pSrc++;
-		uint32 val2 = *pSrc++;
-		uint32 val3 = *pSrc++;
-		uint32 val4 = *pSrc++;
-		
-		pDst[i+0] = (int32)((val0 << 2) | (val1 >> 6));
-		pDst[i+1] = (int32)(((val1 & 0x3FU) << 4) | (val2 >> 4));
-		pDst[i+2] = (int32)(((val2 & 0xFU) << 6) | (val3 >> 2));
-		pDst[i+3] = (int32)(((val3 & 0x3U) << 8) | val4);
-		
-	}
-	if (length & 3U) {
-		uint32 val0 = *pSrc++;
-		uint32 val1 = *pSrc++;
-		length = length & 3U;
-		pDst[i+0] = (int32)((val0 << 2) | (val1 >> 6));
-		
-		if (length > 1U) {
-			uint32 val2 = *pSrc++;
-			pDst[i+1] = (int32)(((val1 & 0x3FU) << 4) | (val2 >> 4));
-			if (length > 2U) {
-				uint32 val3 = *pSrc++;
-				pDst[i+2] = (int32)(((val2 & 0xFU) << 6) | (val3 >> 2));
-			}
-		}
-	}
-}
-static void tif_12uto32s(const uint8* pSrc, int32* pDst, size_t length)
-{
-	size_t i;
-	for (i = 0; i < (length & ~(size_t)1U); i+=2U) {
-		uint32 val0 = *pSrc++;
-		uint32 val1 = *pSrc++;
-		uint32 val2 = *pSrc++;
-
-		pDst[i+0] = (int32)((val0 << 4) | (val1 >> 4));
-		pDst[i+1] = (int32)(((val1 & 0xFU) << 8) | val2);
-	}
-	if (length & 1U) {
-		uint32 val0 = *pSrc++;
-		uint32 val1 = *pSrc++;
-		pDst[i+0] = (int32)((val0 << 4) | (val1 >> 4));
-	}
-}
-static void tif_14uto32s(const uint8* pSrc, int32* pDst, size_t length)
-{
-	size_t i;
-	for (i = 0; i < (length & ~(size_t)3U); i+=4U) {
-		uint32 val0 = *pSrc++;
-		uint32 val1 = *pSrc++;
-		uint32 val2 = *pSrc++;
-		uint32 val3 = *pSrc++;
-		uint32 val4 = *pSrc++;
-		uint32 val5 = *pSrc++;
-		uint32 val6 = *pSrc++;
-		
-		pDst[i+0] = (int32)((val0 << 6) | (val1 >> 2));
-		pDst[i+1] = (int32)(((val1 & 0x3U) << 12) | (val2 << 4) | (val3 >> 4));
-		pDst[i+2] = (int32)(((val3 & 0xFU) << 10) | (val4 << 2) | (val5 >> 6));
-		pDst[i+3] = (int32)(((val5 & 0x3FU) << 8) | val6);
-		
-	}
-	if (length & 3U) {
-		uint32 val0 = *pSrc++;
-		uint32 val1 = *pSrc++;
-		length = length & 3U;
-		pDst[i+0] = (int32)((val0 << 6) | (val1 >> 2));
-		
-		if (length > 1U) {
-			uint32 val2 = *pSrc++;
-			uint32 val3 = *pSrc++;
-			pDst[i+1] = (int32)(((val1 & 0x3U) << 12) | (val2 << 4) | (val3 >> 4));
-			if (length > 2U) {
-				uint32 val4 = *pSrc++;
-				uint32 val5 = *pSrc++;
-				pDst[i+2] = (int32)(((val3 & 0xFU) << 10) | (val4 << 2) | (val5 >> 6));
-			}
-		}
-	}
-}
-
-/* seems that libtiff decodes this to machine endianness */
-static void tif_16uto32s(const uint16* pSrc, int32* pDst, size_t length)
-{
-	size_t i;
-	for (i = 0; i < length; i++) {
-		pDst[i] = pSrc[i];
-	}
-}
-
-/*
- * libtiff/tif_getimage.c : 1,2,4,8,16 bitspersample accepted
- * CINEMA                 : 12 bit precision
- */
-opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters)
-{
-	int subsampling_dx = parameters->subsampling_dx;
-	int subsampling_dy = parameters->subsampling_dy;
-	TIFF *tif;
-	tdata_t buf;
-	tstrip_t strip;
-	tsize_t strip_size;
-	int j, currentPlane, numcomps = 0, w, h;
-	OPJ_COLOR_SPACE color_space = CLRSPC_UNKNOWN;
-	opj_image_cmptparm_t cmptparm[4]; /* RGBA */
-	opj_image_t *image = NULL;
-	int has_alpha = 0;
-	unsigned short tiBps, tiPhoto, tiSf, tiSpp, tiPC;
-	unsigned int tiWidth, tiHeight;
-	opj_bool is_cinema = (parameters->cp_cinema != OFF) ? OPJ_TRUE : OPJ_FALSE;
-	convert_XXx32s_C1R cvtTifTo32s = NULL;
-	convert_32s_CXPX cvtCxToPx = NULL;
-	int32* buffer32s = NULL;
-	int32* planes[4];
-	size_t rowStride;
-	
-	tif = TIFFOpen(filename, "r");
-	
-	if(!tif)
-	{
-		fprintf(stderr, "tiftoimage:Failed to open %s for reading\n", filename);
-		return 0;
-	}
-	tiBps = tiPhoto = tiSf = tiSpp = tiPC = 0;
-	tiWidth = tiHeight = 0;
-	
-	TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, &tiWidth);
-	TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &tiHeight);
-	TIFFGetField(tif, TIFFTAG_BITSPERSAMPLE, &tiBps);
-	TIFFGetField(tif, TIFFTAG_SAMPLEFORMAT, &tiSf);
-	TIFFGetField(tif, TIFFTAG_SAMPLESPERPIXEL, &tiSpp);
-	TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &tiPhoto);
-	TIFFGetField(tif, TIFFTAG_PLANARCONFIG, &tiPC);
-	w= (int)tiWidth;
-	h= (int)tiHeight;
-	
-	if((tiBps > 16U) || ((tiBps != 1U) && (tiBps & 1U))) {
-		fprintf(stderr,"tiftoimage: Bits=%d, Only 1, 2, 4, 6, 8, 10, 12, 14 and 16 bits implemented\n",tiBps);
-		fprintf(stderr,"\tAborting\n");
-		TIFFClose(tif);
-		return NULL;
-	}
-	if(tiPhoto != PHOTOMETRIC_MINISBLACK && tiPhoto != PHOTOMETRIC_RGB) {
-		fprintf(stderr,"tiftoimage: Bad color format %d.\n\tOnly RGB(A) and GRAY(A) has been implemented\n",(int) tiPhoto);
-		fprintf(stderr,"\tAborting\n");
-		TIFFClose(tif);
-		return NULL;
-	}
-	
-	switch (tiBps) {
-		case 1:
-		case 2:
-		case 4:
-		case 6:
-		case 8:
-			cvtTifTo32s = convert_XXu32s_C1R_LUT[tiBps];
-			break;
-		/* others are specific to TIFF */
-		case 10:
-			cvtTifTo32s = tif_10uto32s;
-			break;
-		case 12:
-			cvtTifTo32s = tif_12uto32s;
-			break;
-		case 14:
-			cvtTifTo32s = tif_14uto32s;
-			break;
-		case 16:
-			cvtTifTo32s = (convert_XXx32s_C1R)tif_16uto32s;
-			break;
-		default:
-			/* never here */
-			break;
-	}
-	
-	{/* From: tiff-4.0.x/libtiff/tif_getimage.c : */
-		uint16* sampleinfo;
-		uint16 extrasamples;
-		
-		TIFFGetFieldDefaulted(tif, TIFFTAG_EXTRASAMPLES,
-													&extrasamples, &sampleinfo);
-		
-		if(extrasamples >= 1)
-		{
-			switch(sampleinfo[0])
-			{
-				case EXTRASAMPLE_UNSPECIFIED:
-					/* Workaround for some images without correct info about alpha channel
-					 */
-					if(tiSpp > 3)
-						has_alpha = 1;
-					break;
-					
-				case EXTRASAMPLE_ASSOCALPHA: /* data pre-multiplied */
-				case EXTRASAMPLE_UNASSALPHA: /* data not pre-multiplied */
-					has_alpha = 1;
-					break;
-			}
-		}
-		else /* extrasamples == 0 */
-			if(tiSpp == 4 || tiSpp == 2) has_alpha = 1;
-	}
-	
-	/* initialize image components */
-	memset(&cmptparm[0], 0, 4 * sizeof(opj_image_cmptparm_t));
-	
-	if ((tiPhoto == PHOTOMETRIC_RGB) && (is_cinema) && (tiBps != 12U)) {
-		fprintf(stdout,"WARNING:\n"
-						"Input image bitdepth is %d bits\n"
-						"TIF conversion has automatically rescaled to 12-bits\n"
-						"to comply with cinema profiles.\n",
-						tiBps);
-	} else {
-		is_cinema = 0U;
-	}
-	
-	if(tiPhoto == PHOTOMETRIC_RGB) /* RGB(A) */
-	{
-		numcomps = 3 + has_alpha;
-		color_space = CLRSPC_SRGB;
-	}
-	else if (tiPhoto == PHOTOMETRIC_MINISBLACK) /* GRAY(A) */
-	{
-		numcomps = 1 + has_alpha;
-		color_space = CLRSPC_GRAY;
-	}
-	
-	cvtCxToPx = convert_32s_CXPX_LUT[numcomps];
-	if (tiPC == PLANARCONFIG_SEPARATE) {
-		cvtCxToPx = convert_32s_CXPX_LUT[1]; /* override */
-		tiSpp = 1U; /* consider only one sample per plane */
-	}
-
-	for(j = 0; j < numcomps; j++)
-	{
-		cmptparm[j].prec = tiBps;
-		cmptparm[j].bpp = tiBps;
-		cmptparm[j].dx = (uint32)subsampling_dx;
-		cmptparm[j].dy = (uint32)subsampling_dy;
-		cmptparm[j].w = (uint32)w;
-		cmptparm[j].h = (uint32)h;
-	}
-		
-	image = opj_image_create((uint32)numcomps, &cmptparm[0], color_space);
-	if(!image)
-	{
-		TIFFClose(tif);
-		return NULL;
-	}
-	/* set image offset and reference grid */
-	image->x0 = (uint32)parameters->image_offset_x0;
-	image->y0 = (uint32)parameters->image_offset_y0;
-	image->x1 =	!image->x0 ? (uint32)(w - 1) * (uint32)subsampling_dx + 1 :
-	image->x0 + (uint32)(w - 1) * (uint32)subsampling_dx + 1;
-	image->y1 =	!image->y0 ? (uint32)(h - 1) * (uint32)subsampling_dy + 1 :
-	image->y0 + (uint32)(h - 1) * (uint32)subsampling_dy + 1;
-
-	for(j = 0; j < numcomps; j++)
-	{
-		planes[j] = image->comps[j].data;
-	}
-	/* image->comps[numcomps - 1].alpha = (uint16)(1 - (numcomps & 1)); */
-		
-	strip_size = TIFFStripSize(tif);
-	
-	buf = _TIFFmalloc(strip_size);
-	if (buf == NULL) {
-		TIFFClose(tif);
-		opj_image_destroy(image);
-		return NULL;
-	}
-	rowStride = ((size_t)w * tiSpp * tiBps + 7U) / 8U;
-	buffer32s = (int32 *)malloc((size_t)w * tiSpp * sizeof(int32));
-	if (buffer32s == NULL) {
-		_TIFFfree(buf);
-		TIFFClose(tif);
-		opj_image_destroy(image);
-		return NULL;
-	}
-	
-	strip = 0;
-	currentPlane = 0;
-	do
-	{
-		planes[0] = image->comps[currentPlane].data; /* to manage planar data */
-		h= (int)tiHeight;
-		/* Read the Image components */
-		for(; (h > 0) && (strip < TIFFNumberOfStrips(tif)); strip++)
-		{
-				const uint8 *dat8;
-				size_t ssize;
-				
-				ssize = (size_t)TIFFReadEncodedStrip(tif, strip, buf, strip_size);
-				dat8 = (const uint8*)buf;
-				
-				while (ssize >= rowStride) {
-					cvtTifTo32s(dat8, buffer32s, (size_t)w * tiSpp);
-					cvtCxToPx(buffer32s, planes, (size_t)w);
-					planes[0] += w;
-					planes[1] += w;
-					planes[2] += w;
-					planes[3] += w;
-					dat8  += rowStride;
-					ssize -= rowStride;
-					h--;
-				}
-		}
-		currentPlane++;
-	} while ((tiPC == PLANARCONFIG_SEPARATE) && (currentPlane < numcomps));
-	
-	free(buffer32s);
-	_TIFFfree(buf);
-	TIFFClose(tif);
-	
-	if (is_cinema) {
-		for (j=0; j < numcomps; ++j) {
-			scale_component(&(image->comps[j]), 12);
-		}
-		
-	}
-	return image;
-
-}/* tiftoimage() */
-

applications/common/color.c

@@ -1,537 +0,0 @@
-/*
- * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2007, Professor Benoit Macq
- * Copyright (c) 2001-2003, David Janssens
- * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
- * Copyright (c) 2005, Herve Drolon, FreeImage Team
- * 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.
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
-
-#include "opj_config.h"
-#include "openjpeg.h"
-#include "color.h"
-
-#ifdef HAVE_LIBLCMS2
-#include <lcms2.h>
-#endif
-#ifdef HAVE_LIBLCMS1
-#include <lcms.h>
-#endif
-
-/*--------------------------------------------------------
- Matrix for sYCC, Amendment 1 to IEC 61966-2-1
- 
- Y :   0.299   0.587    0.114   :R
- Cb:  -0.1687 -0.3312   0.5     :G
- Cr:   0.5    -0.4187  -0.0812  :B
- 
- Inverse:
- 
- R: 1        -3.68213e-05    1.40199      :Y
- G: 1.00003  -0.344125      -0.714128     :Cb - 2^(prec - 1)
- B: 0.999823  1.77204       -8.04142e-06  :Cr - 2^(prec - 1)
- 
- -----------------------------------------------------------*/
-static void sycc_to_rgb(int offset, int upb, int y, int cb, int cr,
-												int *out_r, int *out_g, int *out_b)
-{
-	int r, g, b;
-	
-	cb -= offset; cr -= offset;
-	r = y + (int)(1.402 * (float)cr);
-	if(r < 0) r = 0; else if(r > upb) r = upb; *out_r = r;
-	
-	g = y - (int)(0.344 * (float)cb + 0.714 * (float)cr);
-	if(g < 0) g = 0; else if(g > upb) g = upb; *out_g = g;
-	
-	b = y + (int)(1.772 * (float)cb);
-	if(b < 0) b = 0; else if(b > upb) b = upb; *out_b = b;
-}
-
-static void sycc444_to_rgb(opj_image_t *img)
-{
-	int *d0, *d1, *d2, *r, *g, *b;
-	const int *y, *cb, *cr;
-	unsigned int maxw, maxh, max, i;
-	int offset, upb;
-	
-	upb = (int)img->comps[0].prec;
-	offset = 1<<(upb - 1); upb = (1<<upb)-1;
-	
-	maxw = (unsigned int)img->comps[0].w; maxh = (unsigned int)img->comps[0].h;
-	max = maxw * maxh;
-	
-	y = img->comps[0].data;
-	cb = img->comps[1].data;
-	cr = img->comps[2].data;
-	
-	d0 = r = (int*)malloc(sizeof(int) * (size_t)max);
-	d1 = g = (int*)malloc(sizeof(int) * (size_t)max);
-	d2 = b = (int*)malloc(sizeof(int) * (size_t)max);
-	
-	for(i = 0U; i < max; ++i)
-	{
-		sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
-		++y; ++cb; ++cr; ++r; ++g; ++b;
-	}
-	free(img->comps[0].data); img->comps[0].data = d0;
-	free(img->comps[1].data); img->comps[1].data = d1;
-	free(img->comps[2].data); img->comps[2].data = d2;
-	
-}/* sycc444_to_rgb() */
-
-static void sycc422_to_rgb(opj_image_t *img)
-{
-	int *d0, *d1, *d2, *r, *g, *b;
-	const int *y, *cb, *cr;
-	unsigned int maxw, maxh, max;
-	int offset, upb;
-	unsigned int i, j;
-	
-	upb = (int)img->comps[0].prec;
-	offset = 1<<(upb - 1); upb = (1<<upb)-1;
-	
-	maxw = (unsigned int)img->comps[0].w; maxh = (unsigned int)img->comps[0].h;
-	max = maxw * maxh;
-	
-	y = img->comps[0].data;
-	cb = img->comps[1].data;
-	cr = img->comps[2].data;
-	
-	d0 = r = (int*)malloc(sizeof(int) * (size_t)max);
-	d1 = g = (int*)malloc(sizeof(int) * (size_t)max);
-	d2 = b = (int*)malloc(sizeof(int) * (size_t)max);
-	
-	for(i=0U; i < maxh; ++i)
-	{
-		for(j=0U; j < (maxw & ~(unsigned int)1U); j += 2U)
-		{
-			sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
-			++y; ++r; ++g; ++b;
-			sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
-			++y; ++r; ++g; ++b; ++cb; ++cr;
-		}
-		if (j < maxw) {
-			sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
-			++y; ++r; ++g; ++b; ++cb; ++cr;
-		}
-	}
-	free(img->comps[0].data); img->comps[0].data = d0;
-	free(img->comps[1].data); img->comps[1].data = d1;
-	free(img->comps[2].data); img->comps[2].data = d2;
-	
-	img->comps[1].w = maxw; img->comps[1].h = maxh;
-	img->comps[2].w = maxw; img->comps[2].h = maxh;
-	img->comps[1].dx = img->comps[0].dx;
-	img->comps[2].dx = img->comps[0].dx;
-	img->comps[1].dy = img->comps[0].dy;
-	img->comps[2].dy = img->comps[0].dy;
-}/* sycc422_to_rgb() */
-
-static void sycc420_to_rgb(opj_image_t *img)
-{
-	int *d0, *d1, *d2, *r, *g, *b, *nr, *ng, *nb;
-	const int *y, *cb, *cr, *ny;
-	unsigned int maxw, maxh, max;
-	int offset, upb;
-	unsigned int i, j;
-	
-	upb = (int)img->comps[0].prec;
-	offset = 1<<(upb - 1); upb = (1<<upb)-1;
-	
-	maxw = (unsigned int)img->comps[0].w; maxh = (unsigned int)img->comps[0].h;
-	max = maxw * maxh;
-	
-	y = img->comps[0].data;
-	cb = img->comps[1].data;
-	cr = img->comps[2].data;
-	
-	d0 = r = (int*)malloc(sizeof(int) * (size_t)max);
-	d1 = g = (int*)malloc(sizeof(int) * (size_t)max);
-	d2 = b = (int*)malloc(sizeof(int) * (size_t)max);
-	
-	for(i=0U; i < (maxh & ~(unsigned int)1U); i += 2U)
-	{
-		ny = y + maxw;
-		nr = r + maxw; ng = g + maxw; nb = b + maxw;
-		
-		for(j=0; j < (maxw & ~(unsigned int)1U); j += 2U)
-		{
-			sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
-			++y; ++r; ++g; ++b;
-			sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
-			++y; ++r; ++g; ++b;
-			
-			sycc_to_rgb(offset, upb, *ny, *cb, *cr, nr, ng, nb);
-			++ny; ++nr; ++ng; ++nb;
-			sycc_to_rgb(offset, upb, *ny, *cb, *cr, nr, ng, nb);
-			++ny; ++nr; ++ng; ++nb; ++cb; ++cr;
-		}
-		if(j < maxw)
-		{
-			sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
-			++y; ++r; ++g; ++b;
-			
-			sycc_to_rgb(offset, upb, *ny, *cb, *cr, nr, ng, nb);
-			++ny; ++nr; ++ng; ++nb; ++cb; ++cr;
-		}
-		y += maxw; r += maxw; g += maxw; b += maxw;
-	}
-	if(i < maxh)
-	{
-		for(j=0U; j < (maxw & ~(unsigned int)1U); j += 2U)
-		{
-			sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
-			
-			++y; ++r; ++g; ++b;
-			
-			sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
-			
-			++y; ++r; ++g; ++b; ++cb; ++cr;
-		}
-		if(j < maxw)
-		{
-			sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
-		}
-	}
-	
-	free(img->comps[0].data); img->comps[0].data = d0;
-	free(img->comps[1].data); img->comps[1].data = d1;
-	free(img->comps[2].data); img->comps[2].data = d2;
-	
-	img->comps[1].w = maxw; img->comps[1].h = maxh;
-	img->comps[2].w = maxw; img->comps[2].h = maxh;
-	img->comps[1].dx = img->comps[0].dx;
-	img->comps[2].dx = img->comps[0].dx;
-	img->comps[1].dy = img->comps[0].dy;
-	img->comps[2].dy = img->comps[0].dy;
-	
-}/* sycc420_to_rgb() */
-
-void color_sycc_to_rgb(opj_image_t *img)
-{
-	if(img->numcomps < 3)
-	{
-		img->color_space = CLRSPC_GRAY;
-		return;
-	}
-	
-	if((img->comps[0].dx == 1)
-		 && (img->comps[1].dx == 2)
-		 && (img->comps[2].dx == 2)
-		 && (img->comps[0].dy == 1)
-		 && (img->comps[1].dy == 2)
-		 && (img->comps[2].dy == 2))/* horizontal and vertical sub-sample */
-	{
-		sycc420_to_rgb(img);
-	}
-	else
-		if((img->comps[0].dx == 1)
-			 && (img->comps[1].dx == 2)
-			 && (img->comps[2].dx == 2)
-			 && (img->comps[0].dy == 1)
-			 && (img->comps[1].dy == 1)
-			 && (img->comps[2].dy == 1))/* horizontal sub-sample only */
-  {
-		sycc422_to_rgb(img);
-	}
-		else
-			if((img->comps[0].dx == 1)
-				 && (img->comps[1].dx == 1)
-				 && (img->comps[2].dx == 1)
-				 && (img->comps[0].dy == 1)
-				 && (img->comps[1].dy == 1)
-				 && (img->comps[2].dy == 1))/* no sub-sample */
-			{
-				sycc444_to_rgb(img);
-			}
-			else
-			{
-				fprintf(stderr,"%s:%d:color_sycc_to_rgb\n\tCAN NOT CONVERT\n", __FILE__,__LINE__);
-				return;
-			}
-	img->color_space = CLRSPC_SRGB;
-	
-}/* color_sycc_to_rgb() */
-
-#if defined(HAVE_LIBLCMS2) || defined(HAVE_LIBLCMS1)
-#ifdef HAVE_LIBLCMS1
-/* Bob Friesenhahn proposed:*/
-#define cmsSigXYZData   icSigXYZData
-#define cmsSigLabData   icSigLabData
-#define cmsSigCmykData  icSigCmykData
-#define cmsSigYCbCrData icSigYCbCrData
-#define cmsSigLuvData   icSigLuvData
-#define cmsSigGrayData  icSigGrayData
-#define cmsSigRgbData   icSigRgbData
-#define cmsUInt32Number DWORD
-
-#define cmsColorSpaceSignature icColorSpaceSignature
-#define cmsGetHeaderRenderingIntent cmsTakeRenderingIntent
-
-#endif /* HAVE_LIBLCMS1 */
-
-void color_apply_icc_profile(opj_image_t *image)
-{
-	cmsHPROFILE in_prof, out_prof;
-	cmsHTRANSFORM transform;
-	cmsColorSpaceSignature in_space, out_space;
-	cmsUInt32Number intent, in_type, out_type, nr_samples;
-	int *r, *g, *b;
-	int prec, i, max, max_w, max_h;
-	OPJ_COLOR_SPACE oldspace;
-	
-	in_prof =
-	cmsOpenProfileFromMem(image->icc_profile_buf, image->icc_profile_len);
-#ifdef DEBUG_PROFILE
-	FILE *icm = fopen("debug.icm","wb");
-	fwrite( image->icc_profile_buf,1, image->icc_profile_len,icm);
-	fclose(icm);
-#endif
-	
-	if(in_prof == NULL) return;
-	
-	in_space = cmsGetPCS(in_prof);
-	out_space = cmsGetColorSpace(in_prof);
-	intent = cmsGetHeaderRenderingIntent(in_prof);
-	
-	
-	max_w = (int)image->comps[0].w;
-	max_h = (int)image->comps[0].h;
-	prec = (int)image->comps[0].prec;
-	oldspace = image->color_space;
-	
-	if(out_space == cmsSigRgbData) /* enumCS 16 */
-	{
-		if( prec <= 8 )
-		{
-			in_type = TYPE_RGB_8;
-			out_type = TYPE_RGB_8;
-		}
-		else
-		{
-			in_type = TYPE_RGB_16;
-			out_type = TYPE_RGB_16;
-		}
-		out_prof = cmsCreate_sRGBProfile();
-		image->color_space = CLRSPC_SRGB;
-	}
-	else if(out_space == cmsSigGrayData) /* enumCS 17 */
-	{
-		in_type = TYPE_GRAY_8;
-		out_type = TYPE_RGB_8;
-		out_prof = cmsCreate_sRGBProfile();
-		image->color_space = CLRSPC_SRGB;
-	}
-	else if(out_space == cmsSigYCbCrData) /* enumCS 18 */
-	{
-		in_type = TYPE_YCbCr_16;
-		out_type = TYPE_RGB_16;
-		out_prof = cmsCreate_sRGBProfile();
-		image->color_space = CLRSPC_SRGB;
-	}
-	else
-	{
-#ifdef DEBUG_PROFILE
-		fprintf(stderr,"%s:%d: color_apply_icc_profile\n\tICC Profile has unknown "
-						 "output colorspace(%#x)(%c%c%c%c)\n\tICC Profile ignored.\n",
-						 __FILE__,__LINE__,out_space,
-						 (out_space>>24) & 0xff,(out_space>>16) & 0xff,
-						 (out_space>>8) & 0xff, out_space & 0xff);
-#endif
-		return;
-	}
-	
-#ifdef DEBUG_PROFILE
-	fprintf(stderr,"%s:%d:color_apply_icc_profile\n\tchannels(%d) prec(%d) w(%d) h(%d)"
-					"\n\tprofile: in(%p) out(%p)\n",__FILE__,__LINE__,image->numcomps,prec,
-					max_w,max_h, (void*)in_prof,(void*)out_prof);
-	
-	fprintf(stderr,"\trender_intent (%u)\n\t"
-					"color_space: in(%#x)(%c%c%c%c)   out:(%#x)(%c%c%c%c)\n\t"
-					"       type: in(%u)              out:(%u)\n",
-					intent,
-					in_space,
-					(in_space>>24) & 0xff,(in_space>>16) & 0xff,
-					(in_space>>8) & 0xff, in_space & 0xff,
-					
-					out_space,
-					(out_space>>24) & 0xff,(out_space>>16) & 0xff,
-					(out_space>>8) & 0xff, out_space & 0xff,
-					
-					in_type,out_type
-					);
-#else
-	(void)prec;
-	(void)in_space;
-#endif /* DEBUG_PROFILE */
-	
-	transform = cmsCreateTransform(in_prof, in_type, out_prof, out_type, intent, 0);
-	
-#ifdef HAVE_LIBLCMS2
-	/* Possible for: LCMS_VERSION >= 2000 :*/
-	cmsCloseProfile(in_prof);
-	cmsCloseProfile(out_prof);
-#endif
-	
-	if(transform == NULL)
-	{
-#ifdef DEBUG_PROFILE
-		fprintf(stderr,"%s:%d:color_apply_icc_profile\n\tcmsCreateTransform failed. "
-						"ICC Profile ignored.\n",__FILE__,__LINE__);
-#endif
-		image->color_space = oldspace;
-#ifdef HAVE_LIBLCMS1
-		cmsCloseProfile(in_prof);
-		cmsCloseProfile(out_prof);
-#endif
-		return;
-	}
-	
-	if(image->numcomps > 2)/* RGB, RGBA */
-	{
-		if( prec <= 8 )
-		{
-			unsigned char *inbuf, *outbuf, *in, *out;
-			max = max_w * max_h;
-			nr_samples = (cmsUInt32Number)max * 3 * (cmsUInt32Number)sizeof(unsigned char);
-			in = inbuf = (unsigned char*)malloc(nr_samples);
-			out = outbuf = (unsigned char*)malloc(nr_samples);
-		
-			r = image->comps[0].data;
-			g = image->comps[1].data;
-			b = image->comps[2].data;
-		
-			for(i = 0; i < max; ++i)
-			{
-				*in++ = (unsigned char)*r++;
-				*in++ = (unsigned char)*g++;
-				*in++ = (unsigned char)*b++;
-			}
-		
-			cmsDoTransform(transform, inbuf, outbuf, (cmsUInt32Number)max);
-		
-			r = image->comps[0].data;
-			g = image->comps[1].data;
-			b = image->comps[2].data;
-		
-			for(i = 0; i < max; ++i)
-			{
-				*r++ = (int)*out++;
-				*g++ = (int)*out++;
-				*b++ = (int)*out++;
-			}
-			free(inbuf); free(outbuf);
-		}
-		else
-		{
-			unsigned short *inbuf, *outbuf, *in, *out;
-			max = max_w * max_h;
-			nr_samples = (cmsUInt32Number)max * 3 * (cmsUInt32Number)sizeof(unsigned short);
-			in = inbuf = (unsigned short*)malloc(nr_samples);
-			out = outbuf = (unsigned short*)malloc(nr_samples);
-		
-			r = image->comps[0].data;
-			g = image->comps[1].data;
-			b = image->comps[2].data;
-		
-			for(i = 0; i < max; ++i)
-			{
-				*in++ = (unsigned short)*r++;
-				*in++ = (unsigned short)*g++;
-				*in++ = (unsigned short)*b++;
-			}
-		
-			cmsDoTransform(transform, inbuf, outbuf, (cmsUInt32Number)max);
-		
-			r = image->comps[0].data;
-			g = image->comps[1].data;
-			b = image->comps[2].data;
-		
-			for(i = 0; i < max; ++i)
-			{
-				*r++ = (int)*out++;
-				*g++ = (int)*out++;
-				*b++ = (int)*out++;
-			}
-			free(inbuf); free(outbuf);
-		}
-	}
-	else /* GRAY, GRAYA */
-	{
-		unsigned char *in, *inbuf, *out, *outbuf;
-		max = max_w * max_h;
-		nr_samples = (cmsUInt32Number)max * 3 * sizeof(unsigned char);
-		in = inbuf = (unsigned char*)malloc(nr_samples);
-		out = outbuf = (unsigned char*)malloc(nr_samples);
-		
-		image->comps = (opj_image_comp_t*)realloc(image->comps, (image->numcomps+2)*sizeof(opj_image_comp_t));
-		
-		if(image->numcomps == 2)
-			image->comps[3] = image->comps[1];
-		
-		image->comps[1] = image->comps[0];
-		image->comps[2] = image->comps[0];
-		
-		image->comps[1].data = (int*)calloc((size_t)max, sizeof(int));
-		image->comps[2].data = (int*)calloc((size_t)max, sizeof(int));
-		
-		image->numcomps += 2;
-		
-		r = image->comps[0].data;
-		
-		for(i = 0; i < max; ++i)
-		{
-			*in++ = (unsigned char)*r++;
-		}
-		cmsDoTransform(transform, inbuf, outbuf, (cmsUInt32Number)max);
-		
-		r = image->comps[0].data;
-		g = image->comps[1].data;
-		b = image->comps[2].data;
-		
-		for(i = 0; i < max; ++i)
-		{
-			*r++ = (int)*out++; *g++ = (int)*out++; *b++ = (int)*out++;
-		}
-		free(inbuf); free(outbuf);
-		
-	}/* if(image->numcomps */
-	
-	cmsDeleteTransform(transform);
-	
-#ifdef HAVE_LIBLCMS1
-	cmsCloseProfile(in_prof);
-	cmsCloseProfile(out_prof);
-#endif
-}/* color_apply_icc_profile() */
-
-#endif /* HAVE_LIBLCMS2 || HAVE_LIBLCMS1 */
-

applications/jpip/CHANGES

@@ -1,127 +0,0 @@
-What's New for OpenJPIP
-
-* : fixed
-- : removed
-! : changed
-+ : added
-
-Feburary 28, 2012
-+ [kaori] enabled the opj_server to reply the first query consisting with len request from kakadu client
-
-February 9, 2012
-* [kaori] fixed Doxygen configuration file to document the utilities
-+ [kaori] added execution argument to set port number for opj_dec_server, opj_viewer*
-
-January 26, 2012
-! [kaori] unapplied auxtrans_manager to the local mode
-
-December 24, 2011
-* [kaori] additional modification for the warning
-
-December 22, 2011
-* [kaori] fixed auxtrans_manager to enable MAC
-* [kaori] warnings due to disregarding return value are removed
-
-November 30, 2011
-+ [kaori] TCP return (http-tcp) implemented
-
-November 16, 2011
-* [kaori] fixed Region of Interest option, and memory leak of opj_dec_server
-+ [kaori] new feature to target JP2 files from www (libcurl required)
-* [kaori] fixed opj_server execusion error (instant terminating) with autotool, cmake still need to be fixed
-
-November 8, 2011
-! [kaori] updated main page of doxygen
-
-November 3, 2011
-* [kaori] solved memory leak of opj_server
-! [kaori] removed redundant defines
-
-November 2, 2011
-* [antonin] additional patches for autotools and cmake
-
-October 26, 2011
-* [kaori] additional patches for autotool are applied
-
-October 25, 2011
-* [kaori] patches for cmake and autotool are applied
-* [kaori] fixed client viewer to be compatible with server response header both Content-type and Content-Type
-
-October 20, 2011
-+ [added] API style in openJPIP library
-! [kaori] rearranged directories, applications are all under util/ directory, currently only 'make -f Makefile.nix' works
-
-October 18, 2011
-! [kaori] rearranged opj_server, opj_dec_server directory
-
-October 14, 2011
-+ [kaori] enable all progression orders
-
-October 12, 2011
-+ [kaori] enable layers requests; restricting the number of codesream quality layers
-
-October 11, 2011
-+ [antonin] enable JPT-stream request from client viewer option (credit to kaori)
-
-October 10, 2011
-- [antonin] removed obsolete indexer utility (credit to kaori)
-+ [antonin] enabled JPP-stream (credit to kaori)
-
-September 16, 2011
-+ [kaori] enabled stateless requests from the opj_viewers
-
-Septempber 1, 2011
-* [kaori] changed terminating status of opj_server in debug/non-server mode
-
-August 27, 2011
-* [antonin] fixed missing include directory in opj_client/opj_dec_server/CMakeLists.txt
-
-August 26, 2011
-* [antonin] fixed cmake and autotools files to reflect recent indexer changes in JPIP
-! [kaori] indexer using the latest openjpeg library
-* [antonin] fixed cmake and autotools files to reflect recent changes in JPIP
-! [kaori] fixed Makefile.nix to load openjpeg library from this archive
-
-August 25, 2011
-+ [kaori] added tid request support to JPIP client
-+ [kaori] added quit JPIP server request
-
-August 24, 2011
-+ [kaori] added cachemodel_manager, which had been managed in target_manager previously
-+ [kaori] added tid request support to JPIP server
-
-August 16, 2011
-* [antonin] fixed cmake support for openjpip
-
-August 12, 2011
-+ [antonin] added cmake support to openjpip
-
-July 6, 2011
-* [antonin] JPIP : fixed autotools to work with recent name changes
-
-July 5, 2011
-! [kaori] changed parameter, file names, message names regarding JPT-stream to JPIP-stream, which handles also JPP-stream
-
-May 26, 2011
-! [antonin] changed Makefile to Makefile.nix to avoid having autotools overwrite them.
-
-May 23, 2011
-+ [antonin] added autotools for the 'tools' directory
-+ [antonin] added autotools as a build method for jpip (credit to Vincent Torri)
-
-May 10, 2011
-! [kaori] opj_viewer removed the xml functions (for users without Xersus2)
-+ [kaori] renamed opj_viewer  to opj_viewer_xerces ( needs Xersus2)
-! [kaori] Modification of opj_dec_server to be portable to windows  
-
-May 9, 2011
-* [kaori] Removal of c99 from the compile option (to be compatible to win platform) and bool definition in libopenjpip/bool.h
-
-May 9, 2011
-* [antonin] OpenJPIP: small bug fixes to compile on win platform
-
-May 8, 2011
-* [antonin] OpenJPIP: fixed several bugs in opj_server (removal of strsep function, duplication of query string) + some changes to compile opj_server under windows (replacement of strcasecmp(), bzero()).
-
-April 14, 2011
-+ [antonin] initial commit of OpenJPIP 1.0, a JPIP client-server architecture based on OpenJPEG (see README file in jpip directory for more details)

applications/jpip/CMakeLists.txt

@@ -1,16 +0,0 @@
-# required dep for server:
-IF(BUILD_JPIP_SERVER)
-  FIND_PACKAGE(CURL REQUIRED)
-  FIND_PACKAGE(FCGI REQUIRED)
-  FIND_PACKAGE(Threads REQUIRED)
-  IF(NOT CMAKE_USE_PTHREADS_INIT)
-    MESSAGE(FATAL_ERROR "Only pthread are supported")
-  ENDIF(NOT CMAKE_USE_PTHREADS_INIT)
-ENDIF(BUILD_JPIP_SERVER)
-
-# JPIP library:
-ADD_SUBDIRECTORY(libopenjpip)
-
-# JPIP binaries:
-ADD_SUBDIRECTORY(util)
-

applications/jpip/Makefile.am

@@ -1,3 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS = libopenjpip util

applications/jpip/libopenjpip/Makefile.am

@@ -1,151 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-includesdir = $(includedir)/openjpeg-$(MAJOR_NR).$(MINOR_NR)
-includes_HEADERS = 
-
-lib_LTLIBRARIES =
-
-if WANT_JPIP
-lib_LTLIBRARIES += libopenjpip_local.la
-endif
-
-if WANT_JPIP_SERVER
-lib_LTLIBRARIES += libopenjpip_server.la
-endif
-
-JPIP_SRC = \
-openjpip.c \
-query_parser.c \
-channel_manager.c \
-session_manager.c \
-jpip_parser.c \
-boxheader_manager.c \
-codestream_manager.c \
-imgreg_manager.c \
-marker_manager.c \
-msgqueue_manager.c \
-box_manager.c \
-faixbox_manager.c \
-index_manager.c \
-metadata_manager.c \
-placeholder_manager.c \
-byte_manager.c \
-ihdrbox_manager.c \
-manfbox_manager.c \
-mhixbox_manager.c \
-target_manager.c \
-cachemodel_manager.c \
-j2kheader_manager.c \
-jp2k_encoder.c \
-sock_manager.c \
-openjpip.h \
-bool.h \
-boxheader_manager.h \
-box_manager.h \
-byte_manager.h \
-codestream_manager.h \
-faixbox_manager.h \
-ihdrbox_manager.h \
-imgreg_manager.h \
-index_manager.h \
-manfbox_manager.h \
-marker_manager.h \
-metadata_manager.h \
-mhixbox_manager.h \
-msgqueue_manager.h \
-placeholder_manager.h \
-target_manager.h \
-cachemodel_manager.h \
-j2kheader_manager.h \
-jp2k_encoder.h \
-query_parser.h \
-channel_manager.h \
-session_manager.h \
-jpip_parser.h \
-jp2k_decoder.h \
-sock_manager.h 
-
-SERVER_SRC = auxtrans_manager.c \
-auxtrans_manager.h
-
-LOCAL_SRC = jp2k_decoder.c \
-imgsock_manager.c \
-jpipstream_manager.c \
-cache_manager.c \
-dec_clientmsg_handler.c \
-imgsock_manager.h \
-jpipstream_manager.h \
-cache_manager.h \
-dec_clientmsg_handler.h
-
-libopenjpip_server_la_CPPFLAGS = \
--I. \
--I$(top_srcdir)/applications/jpip/libopenjpip \
--I$(top_builddir)/applications/jpip/libopenjpip \
-@FCGI_CFLAGS@ \
-@LIBCURL_CFLAGS@ \
--DSERVER
-libopenjpip_server_la_CFLAGS = @THREAD_CFLAGS@
-libopenjpip_server_la_LIBADD = @FCGI_LIBS@ @LIBCURL_LIBS@ @THREAD_LIBS@ -lm
-libopenjpip_server_la_LDFLAGS = -no-undefined -version-info @lt_version@
-libopenjpip_server_la_SOURCES = $(JPIP_SRC) $(SERVER_SRC)
-
-libopenjpip_local_la_CPPFLAGS = \
--I. \
--I$(top_srcdir)/libopenjpeg \
--I$(top_builddir)/libopenjpeg \
--I$(top_srcdir)/applications/jpip/libopenjpip \
--I$(top_builddir)/applications/jpip/libopenjpip \
-@LIBCURL_CFLAGS@
-libopenjpip_local_la_CFLAGS = 
-libopenjpip_local_la_LIBADD = $(top_builddir)/libopenjpeg/libopenjpeg.la -lm
-libopenjpip_local_la_LDFLAGS = -no-undefined -version-info @lt_version@
-libopenjpip_local_la_SOURCES = $(JPIP_SRC) $(LOCAL_SRC)
-
-install-data-hook:
-if WANT_JPIP_SERVER
-	@echo -e " (LA)\t$(libdir)/libopenjpip_server.la" >> $(top_builddir)/report.txt
-if BUILD_SHARED
-	@( $(call solist_s) ) >> $(top_builddir)/report.txt
-endif
-if BUILD_STATIC
-	@echo -e " (A)\t$(base_s)/$(a_s)" >> $(top_builddir)/report.txt
-endif
-endif
-if WANT_JPIP
-	@echo -e " (LA)\t$(libdir)/libopenjpip_local.la" >> $(top_builddir)/report.txt
-if BUILD_SHARED
-	@( $(call solist_c) ) >> $(top_builddir)/report.txt
-endif
-if BUILD_STATIC
-	@echo -e " (A)\t$(base_c)/$(a_c)" >> $(top_builddir)/report.txt
-endif
-endif
-
-solist_s    = $(foreach f, $(dll_s) $(so_s), echo -e ' $(SO_PREFIX)\t$(base_s)/$(f)' ;)
-get_tok_s   = $(shell grep -E "^$(1)=" libopenjpip_server.la | cut -d "'" -f 2)
-base_s      = $(call get_tok_s,libdir)
-so_s        = $(call get_tok_s,library_names)
-a_s         = $(call get_tok_s,old_library)
-
-solist_c    = $(foreach f, $(dll_c) $(so_c), echo -e ' $(SO_PREFIX)\t$(base_c)/$(f)' ;)
-get_tok_c   = $(shell grep -E "^$(1)=" libopenjpip_local.la | cut -d "'" -f 2)
-base_c      = $(call get_tok_c,libdir)
-so_c        = $(call get_tok_c,library_names)
-a_c         = $(call get_tok_c,old_library)
-
-if HAVE_WIN32
-SO_PREFIX = (DLL)
-dll_s     = $(call get_tok_s,dlname)
-dll_c     = $(call get_tok_c,dlname)
-else
-if HAVE_DARWIN
-SO_PREFIX = (DY)
-dll_s     =
-dll_c     =
-else
-SO_PREFIX = (SO)
-dll_s     =
-dll_c     =
-endif
-endif

applications/jpip/util/Makefile.am

@@ -1,75 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-bin_PROGRAMS =
-
-if WANT_JPIP
-bin_PROGRAMS += opj_dec_server test_index jpip_to_j2k jpip_to_jp2
-endif
-
-if WANT_JPIP_SERVER
-bin_PROGRAMS += opj_server
-endif
-
-opj_server_CPPFLAGS = \
-@FCGI_CFLAGS@ \
--I. \
--I$(top_srcdir)/applications/jpip/libopenjpip \
--I$(top_builddir)/applications/jpip/libopenjpip \
--DSERVER \
--DQUIT_SIGNAL=\"quitJPIP\"
-#
-opj_server_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_server.la @FCGI_LIBS@ -lm
-#
-opj_server_SOURCES = opj_server.c
-
-#-------------
-opj_dec_server_CPPFLAGS = \
--I. \
--I$(top_srcdir)/applications/jpip/libopenjpip \
--I$(top_builddir)/applications/jpip/libopenjpip
-#
-opj_dec_server_CFLAGS =
-opj_dec_server_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la
-opj_dec_server_SOURCES = opj_dec_server.c
-
-#-------------
-jpip_to_jp2_CPPFLAGS = \
--I. \
--I$(top_srcdir)/applications/jpip/libopenjpip \
--I$(top_builddir)/applications/jpip/libopenjpip
-#
-jpip_to_jp2_CFLAGS =
-jpip_to_jp2_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la
-jpip_to_jp2_SOURCES = jpip_to_jp2.c
-
-#-------------
-jpip_to_j2k_CPPFLAGS = \
--I. \
--I$(top_srcdir)/applications/jpip/libopenjpip \
--I$(top_builddir)/applications/jpip/libopenjpip
-#
-jpip_to_j2k_CFLAGS =
-jpip_to_j2k_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la
-jpip_to_j2k_SOURCES = jpip_to_j2k.c
-
-#-------------
-test_index_CPPFLAGS = \
--I. \
--I$(top_srcdir)/applications/jpip/libopenjpip \
--I$(top_builddir)/applications/jpip/libopenjpip
-#
-test_index_CFLAGS =
-test_index_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la
-test_index_SOURCES = test_index.c
-
-#-------------
-install-data-hook:
-if WANT_JPIP_SERVER
-	@echo -e " (B)\t$(bindir)/opj_server$(EXEEXT)" >> $(top_builddir)/report.txt
-endif
-if WANT_JPIP
-	@echo -e " (B)\t$(bindir)/opj_dec_server$(EXEEXT)" >> $(top_builddir)/report.txt
-	@echo -e " (B)\t$(bindir)/jpip_to_jp2$(EXEEXT)" >> $(top_builddir)/report.txt
-	@echo -e " (B)\t$(bindir)/jpip_to_j2k$(EXEEXT)" >> $(top_builddir)/report.txt
-	@echo -e " (B)\t$(bindir)/test_index$(EXEEXT)" >> $(top_builddir)/report.txt
-endif

applications/jpip/util/jpip_to_jp2.c

@@ -1,72 +0,0 @@
-/*
- * $Id$
- *
- * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2011, Professor Benoit Macq
- * Copyright (c) 2010-2011, Kaori Hagihara
- * 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.
- */
-
-/*! \file
- *  \brief jpip_to_jp2 is a program to convert JPT- JPP- stream to JP2 file
- *
- *  \section impinst Implementing instructions
- *  This program takes two arguments. \n
- *   -# Input JPT or JPP file
- *   -# Output JP2 file\n
- *   % ./jpip_to_jp2 input.jpt output.jp2
- *   or
- *   % ./jpip_to_jp2 input.jpp output.jp2
- */
-
-#include <stdio.h>
-#include "openjpip.h"
-
-int main(int argc,char *argv[])
-{
-  jpip_dec_param_t *dec;
-    
-  if( argc < 3){
-    fprintf( stderr, "Too few arguments:\n");
-    fprintf( stderr, " - input  jpt or jpp file\n");
-    fprintf( stderr, " - output jp2 file\n");
-    return -1;
-  }
-  
-  dec = init_jpipdecoder( true);
-  
-  if(!( fread_jpip( argv[1], dec)))
-    return -1;
-  
-  decode_jpip( dec);
-  
-  if(!(fwrite_jp2k( argv[2], dec)))
-    return -1;
-
-  output_log( true, false, true, dec);
-
-  destroy_jpipdecoder( &dec);
-
-  return 0;
-}

applications/mj2/CMakeLists.txt

@@ -1,95 +0,0 @@
-# Makefile for the MJ2 codecs of the OpenJPEG library: frames_to_mj2, mj2_to_frames, extract_j2k_from_mj2 and wrap_j2k_in_mj2
-
-if(NOT USE_SYSTEM_GETOPT)
-SET(common_SRCS ${OPENJPEG_SOURCE_DIR}/applications/common/opj_getopt.c)
-endif()
-
-# While mj2 executables do not use the API correctly, we do not link with the library but rather compile the sources files.
-SET(OPJ_SRCS
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/bio.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/cio.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/dwt.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/event.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/image.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/j2k.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/j2k_lib.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/jp2.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/jpt.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/mct.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/mqc.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/openjpeg.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/pi.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/raw.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/t1.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/t2.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/tcd.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/tgt.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/cidx_manager.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/phix_manager.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/ppix_manager.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/thix_manager.c
-${OPENJPEG_SOURCE_DIR}/libopenjpeg/tpix_manager.c
-)
-
-SET(MJ2_SRCS mj2.c mj2_convert.c)
-
-IF(WIN32)
-  ADD_DEFINITIONS(-DOPJ_STATIC)
-ENDIF(WIN32)
-
-# Headers file are located here:
-INCLUDE_DIRECTORIES(
-  ${OPENJPEG_SOURCE_DIR}/libopenjpeg
-  ${OPENJPEG_SOURCE_DIR}/applications/common
-  ${LCMS_INCLUDE_DIRNAME}
-  )
-
-ADD_EXECUTABLE(frames_to_mj2
-  frames_to_mj2.c
-  ${common_SRCS}
-  ${OPJ_SRCS}
-  ${MJ2_SRCS}
-  )
-TARGET_LINK_LIBRARIES(frames_to_mj2 ${LCMS_LIBNAME})
-
-IF(UNIX)
-  TARGET_LINK_LIBRARIES(frames_to_mj2 m)
-ENDIF(UNIX)
-
-ADD_EXECUTABLE(mj2_to_frames
-    mj2_to_frames.c
-    ${common_SRCS}
-    ${OPJ_SRCS}
-    ${MJ2_SRCS}
-    ${OPENJPEG_SOURCE_DIR}/applications/common/color.c
-    )
-TARGET_LINK_LIBRARIES(mj2_to_frames ${LCMS_LIBNAME})
-
-IF(UNIX)
-  TARGET_LINK_LIBRARIES(mj2_to_frames m)
-ENDIF(UNIX)
-
-ADD_EXECUTABLE(extract_j2k_from_mj2
-    extract_j2k_from_mj2.c
-    ${OPJ_SRCS}
-    ${MJ2_SRCS}
-    )
-TARGET_LINK_LIBRARIES(extract_j2k_from_mj2 ${LCMS_LIBNAME})
-
-IF(UNIX)
-  TARGET_LINK_LIBRARIES(extract_j2k_from_mj2 m)
-ENDIF(UNIX)
-
-ADD_EXECUTABLE(wrap_j2k_in_mj2
-    wrap_j2k_in_mj2.c
-    ${OPJ_SRCS}
-    ${MJ2_SRCS}
-    )
-TARGET_LINK_LIBRARIES(wrap_j2k_in_mj2 ${LCMS_LIBNAME})
-
-IF(UNIX)
-  TARGET_LINK_LIBRARIES(wrap_j2k_in_mj2 m)
-ENDIF(UNIX)
-
-INSTALL(TARGETS frames_to_mj2 mj2_to_frames extract_j2k_from_mj2 wrap_j2k_in_mj2
-	DESTINATION ${OPENJPEG_INSTALL_BIN_DIR})

applications/mj2/Makefile.am

@@ -1,110 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-OPJ_SRC = \
-../../libopenjpeg/bio.c \
-../../libopenjpeg/cio.c \
-../../libopenjpeg/dwt.c \
-../../libopenjpeg/event.c \
-../../libopenjpeg/image.c \
-../../libopenjpeg/j2k.c \
-../../libopenjpeg/j2k_lib.c \
-../../libopenjpeg/jp2.c \
-../../libopenjpeg/jpt.c \
-../../libopenjpeg/mct.c \
-../../libopenjpeg/mqc.c \
-../../libopenjpeg/openjpeg.c \
-../../libopenjpeg/pi.c \
-../../libopenjpeg/raw.c \
-../../libopenjpeg/t1.c \
-../../libopenjpeg/t2.c \
-../../libopenjpeg/tcd.c \
-../../libopenjpeg/tgt.c \
-../../libopenjpeg/cidx_manager.c \
-../../libopenjpeg/phix_manager.c \
-../../libopenjpeg/ppix_manager.c \
-../../libopenjpeg/thix_manager.c \
-../../libopenjpeg/tpix_manager.c
-
-bin_PROGRAMS = \
-frames_to_mj2 \
-mj2_to_frames \
-extract_j2k_from_mj2 \
-wrap_j2k_in_mj2
-
-frames_to_mj2_CPPFLAGS = \
--I. \
--I$(top_srcdir)/applications/common \
--I$(top_builddir)/applications/common \
--I$(top_srcdir)/libopenjpeg \
--I$(top_builddir)/libopenjpeg \
--DOPJ_STATIC
-frames_to_mj2_CFLAGS = 
-frames_to_mj2_LDADD = -lm
-frames_to_mj2_SOURCES = \
-$(OPJ_SRC) \
-../common/opj_getopt.c \
-mj2_convert.c \
-mj2.c \
-frames_to_mj2.c \
-mj2.h \
-mj2_convert.h
-
-mj2_to_frames_CPPFLAGS = \
--I. \
--I$(top_srcdir)/applications/common \
--I$(top_builddir)/applications/common \
--I$(top_srcdir)/libopenjpeg \
--I$(top_builddir)/libopenjpeg \
-@LCMS2_CFLAGS@ \
-@LCMS1_CFLAGS@ \
--DOPJ_STATIC
-mj2_to_frames_CFLAGS = 
-mj2_to_frames_LDADD = @LCMS2_LIBS@ @LCMS1_LIBS@ -lm
-mj2_to_frames_SOURCES = \
-$(OPJ_SRC) \
-../common/color.c \
-../common/opj_getopt.c \
-mj2_convert.c \
-mj2.c \
-mj2_to_frames.c \
-mj2.h \
-mj2_convert.h
-
-extract_j2k_from_mj2_CPPFLAGS = \
--I. \
--I$(top_srcdir)/applications/common \
--I$(top_builddir)/applications/common \
--I$(top_srcdir)/libopenjpeg \
--I$(top_builddir)/libopenjpeg \
--DOPJ_STATIC
-extract_j2k_from_mj2_CFLAGS = 
-extract_j2k_from_mj2_LDADD = -lm
-extract_j2k_from_mj2_SOURCES = \
-$(OPJ_SRC) \
-mj2.c \
-extract_j2k_from_mj2.c \
-mj2.h
-
-wrap_j2k_in_mj2_CPPFLAGS = \
--I. \
--I$(top_srcdir)/applications/common \
--I$(top_builddir)/applications/common \
--I$(top_srcdir)/libopenjpeg \
--I$(top_builddir)/libopenjpeg \
--DOPJ_STATIC
-wrap_j2k_in_mj2_CFLAGS = 
-wrap_j2k_in_mj2_LDADD = -lm
-wrap_j2k_in_mj2_SOURCES = \
-$(OPJ_SRC) \
-mj2.c \
-wrap_j2k_in_mj2.c \
-mj2.h
-
-EXTRA_DIST = \
-CMakeLists.txt
-
-install-data-hook:
-	@echo -e " (B)\t$(bindir)/frames_to_mj2$(EXEEXT)" >> $(top_builddir)/report.txt
-	@echo -e " (B)\t$(bindir)/mj2_to_frames$(EXEEXT)" >> $(top_builddir)/report.txt
-	@echo -e " (B)\t$(bindir)/extract_j2k_from_mj2$(EXEEXT)" >> $(top_builddir)/report.txt
-	@echo -e " (B)\t$(bindir)/wrap_j2k_in_mj2$(EXEEXT)" >> $(top_builddir)/report.txt

bootstrap.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-autoreconf --install --force
-

cmake/CTestCustom.cmake.in

@@ -8,11 +8,11 @@
 #
 #----------------------------------------------------------------------
 
-SET(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE 1000000)
-SET(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS   50)
-SET(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 2000)
+set(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE 1000000)
+set(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS   50)
+set(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 2000)
 
-SET(CTEST_CUSTOM_COVERAGE_EXCLUDE
+set(CTEST_CUSTOM_COVERAGE_EXCLUDE
   ${CTEST_CUSTOM_COVERAGE_EXCLUDE}
 
   # Exclude files from the Testing directories
@@ -22,11 +22,14 @@ SET(CTEST_CUSTOM_COVERAGE_EXCLUDE
   ".*/thirdparty/.*"
   )
 
-SET(CTEST_CUSTOM_WARNING_EXCEPTION
+set(CTEST_CUSTOM_WARNING_EXCEPTION
   ${CTEST_CUSTOM_WARNING_EXCEPTION}
 
   # Suppress warning caused by intentional messages about deprecation
   ".*warning,.* is deprecated"
+  # java also warns about deprecated API
+  ".*java.*deprecation"
+  ".*deprecation.*"
   # supress warnings caused by 3rd party libs:
   ".*thirdparty.*"
   "libtiff.*has no symbols"

cmake/EnsureFileInclude.cmake

@@ -0,0 +1,26 @@
+# Ensure that an include file is provided by the system
+# Add the check about the mandatory status to the check_include_file macro 
+# provided by cmake
+
+include (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
+
+macro(ensure_file_include INCLUDE_FILENAME VARIABLE_NAME MANDATORY_STATUS)
+
+#message(WARNING "INCLUDE_FILENAME=${INCLUDE_FILENAME} \n"
+#                "VARIABLE_NAME=${VARIABLE_NAME} \n"
+#                "MANDATORY_STATUS=${MANDATORY_STATUS}")
+
+CHECK_INCLUDE_FILE(${INCLUDE_FILENAME} ${VARIABLE_NAME})
+
+#message(WARNING "INCLUDE_FILENAME=${INCLUDE_FILENAME} \n"
+#                "VARIABLE_NAME=${VARIABLE_NAME} \n"
+#                "VARIABLE_NAME_VALUE=${${VARIABLE_NAME}} \n"
+#                "MANDATORY_STATUS=${MANDATORY_STATUS}")
+
+if (NOT ${${VARIABLE_NAME}})
+  if (${MANDATORY_STATUS})
+    message(FATAL_ERROR "The file ${INCLUDE_FILENAME} is mandatory but not found on your system")
+  endif()
+endif()
+
+endmacro()

cmake/FindFCGI.cmake

@@ -0,0 +1,20 @@
+# Look for the header file.
+find_path(FCGI_INCLUDE_DIR NAMES fastcgi.h)
+
+# Look for the library.
+find_library(FCGI_LIBRARY NAMES fcgi)
+
+# Handle the QUIETLY and REQUIRED arguments and set FCGI_FOUND to TRUE if all listed variables are TRUE.
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(FCGI DEFAULT_MSG FCGI_LIBRARY FCGI_INCLUDE_DIR)
+
+# Copy the results to the output variables.
+if(FCGI_FOUND)
+	set(FCGI_LIBRARIES ${FCGI_LIBRARY})
+	set(FCGI_INCLUDE_DIRS ${FCGI_INCLUDE_DIR})
+else()
+	set(FCGI_LIBRARIES)
+	set(FCGI_INCLUDE_DIRS)
+endif()
+
+mark_as_advanced(FCGI_INCLUDE_DIR FCGI_LIBRARY)

cmake/FindKAKADU.cmake

@@ -1,19 +1,24 @@
 #
-# this module looks for KAKADu
+# this module looks for KAKADU
 # http://www.kakadusoftware.com/
 #
 #
-#  Copyright (c) 2006-2011 Mathieu Malaterre <mathieu.malaterre@gmail.com>
+#  Copyright (c) 2006-2014 Mathieu Malaterre <mathieu.malaterre@gmail.com>
 #
 #  Redistribution and use is allowed according to the terms of the New
 #  BSD license.
 #  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 #
 
-FIND_PROGRAM(KDU_EXPAND_EXECUTABLE
+find_program(KDU_EXPAND_EXECUTABLE
   kdu_expand
   )
 
-MARK_AS_ADVANCED(
-  KDU_EXPAND_EXECUTABLE
+find_program(KDU_COMPRESS_EXECUTABLE
+  kdu_compress
+  )
+
+mark_as_advanced(
+  KDU_EXPAND_EXECUTABLE
+  KDU_COMPRESS_EXECUTABLE
   )

cmake/FindLCMS.cmake

@@ -12,20 +12,20 @@
 #=============================================================================
 #=============================================================================
 
-FIND_PATH(LCMS_INCLUDE_DIR lcms.h  PATHS /usr/include /usr/local/include /opt/include /opt/local/include)
+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)
+set(LCMS_NAMES ${LCMS_NAMES} lcms liblcms liblcms_static)
 
-FIND_LIBRARY(LCMS_LIBRARY NAMES ${LCMS_NAMES} )
+find_library(LCMS_LIBRARY NAMES ${LCMS_NAMES} )
 
-MARK_AS_ADVANCED(LCMS_INCLUDE_DIR LCMS_LIBRARY)
+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)
+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)
+if(LCMS_FOUND)
+  set( LCMS_INCLUDE_DIRS ${LCMS_INCLUDE_DIR})
+  set( LCMS_LIBRARIES ${LCMS_LIBRARY} )
+endif()

cmake/FindLCMS2.cmake

@@ -12,20 +12,20 @@
 #=============================================================================
 #=============================================================================
 
-FIND_PATH(LCMS2_INCLUDE_DIR lcms2.h PATHS /usr/include /usr/local/include /opt/include /opt/local/include)
+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)
+set(LCMS2_NAMES ${LCMS2_NAMES} lcms2 liblcms2 liblcms2_static)
 
-FIND_LIBRARY(LCMS2_LIBRARY NAMES ${LCMS2_NAMES} )
+find_library(LCMS2_LIBRARY NAMES ${LCMS2_NAMES} )
 
-MARK_AS_ADVANCED(LCMS2_INCLUDE_DIR LCMS2_LIBRARY)
+mark_as_advanced(LCMS2_INCLUDE_DIR LCMS2_LIBRARY)
 
-# handle the QUIETLY and REQUIRED arguments and set LCMS2_FOUND to TRUE if 
+# handle the QUIETLY and REQUIRED arguments and set LCMS2_FOUND to TRUE if
 # all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
+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)
+if(LCMS2_FOUND)
+  set( LCMS2_INCLUDE_DIRS ${LCMS2_INCLUDE_DIR})
+  set( LCMS2_LIBRARIES ${LCMS2_LIBRARY} )
+endif()

cmake/OpenJPEGCPack.cmake

@@ -7,7 +7,7 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
       set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON)
     endif()
     include(${CMAKE_ROOT}/Modules/InstallRequiredSystemLibraries.cmake)
-  endif(EXISTS "${CMAKE_ROOT}/Modules/InstallRequiredSystemLibraries.cmake")
+  endif()
 
   set(OPJ_PACKAGE_DESCRIPTION_SUMMARY "OpenJPEG - OpenJPEG a JPEG 2000 implementation.")
   set(OPJ_PACKAGE_CONTACT "openjpeg users <openjpeg@googlegroups.com>")
@@ -28,43 +28,45 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
 
   # Make this explicit here, rather than accepting the CPack default value,
   # so we can refer to it:
-  SET(CPACK_PACKAGE_NAME "${OPENJPEG_LIBRARY_NAME}")
+  set(CPACK_PACKAGE_NAME "${OPENJPEG_LIBRARY_NAME}")
 
-  IF(NOT DEFINED CPACK_SYSTEM_NAME)
+  if(NOT DEFINED CPACK_SYSTEM_NAME)
     # make sure package is not Cygwin-unknown, for Cygwin just
     # cygwin is good for the system name
-    IF("${CMAKE_SYSTEM_NAME}" STREQUAL "CYGWIN")
-      SET(CPACK_SYSTEM_NAME Cygwin)
-    ELSE("${CMAKE_SYSTEM_NAME}" STREQUAL "CYGWIN")
-      SET(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR})
-    ENDIF("${CMAKE_SYSTEM_NAME}" STREQUAL "CYGWIN")
-  ENDIF(NOT DEFINED CPACK_SYSTEM_NAME)
-  IF(${CPACK_SYSTEM_NAME} MATCHES Windows)
-    IF(CMAKE_CL_64)
-      SET(CPACK_SYSTEM_NAME win64-x64)
-    ELSE(CMAKE_CL_64)
-      SET(CPACK_SYSTEM_NAME win32-x86)
-    ENDIF(CMAKE_CL_64)
-  ENDIF(${CPACK_SYSTEM_NAME} MATCHES Windows)
+    if("${CMAKE_SYSTEM_NAME}" STREQUAL "CYGWIN")
+      set(CPACK_SYSTEM_NAME Cygwin)
+    else()
+      set(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR})
+    endif()
+  endif()
+  if(${CPACK_SYSTEM_NAME} MATCHES Windows)
+    if(CMAKE_CL_64)
+      set(CPACK_SYSTEM_NAME win64-x64)
+    else()
+      set(CPACK_SYSTEM_NAME win32-x86)
+    endif()
+  endif()
 
-  IF(NOT DEFINED CPACK_PACKAGE_FILE_NAME)
+  if(NOT DEFINED CPACK_PACKAGE_FILE_NAME)
     # if the CPACK_PACKAGE_FILE_NAME is not defined by the cache
-    # default to source package - system, on cygwin system is not 
+    # default to source package - system, on cygwin system is not
     # needed
-    IF(CYGWIN)
-      SET(CPACK_PACKAGE_FILE_NAME "${CPACK_SOURCE_PACKAGE_FILE_NAME}")
-    ELSE(CYGWIN)
-      SET(CPACK_PACKAGE_FILE_NAME 
+    if(CYGWIN)
+      set(CPACK_PACKAGE_FILE_NAME "${CPACK_SOURCE_PACKAGE_FILE_NAME}")
+    else()
+      set(CPACK_PACKAGE_FILE_NAME
         "${CPACK_SOURCE_PACKAGE_FILE_NAME}-${CPACK_SYSTEM_NAME}")
-    ENDIF(CYGWIN)
-  ENDIF(NOT DEFINED CPACK_PACKAGE_FILE_NAME)
+    endif()
+  endif()
 
   set(CPACK_BUNDLE_NAME "OpenJPEG ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
-  configure_file(${CMAKE_ROOT}/Templates/AppleInfo.plist
-    ${CMAKE_CURRENT_BINARY_DIR}/opj.plist)
-  SET(CPACK_BUNDLE_PLIST
-    ${CMAKE_CURRENT_BINARY_DIR}/opj.plist)
-  #include(BundleUtilities)
+  if(APPLE)
+    configure_file(${CMAKE_ROOT}/Templates/AppleInfo.plist
+      ${CMAKE_CURRENT_BINARY_DIR}/opj.plist)
+    set(CPACK_BUNDLE_PLIST
+      ${CMAKE_CURRENT_BINARY_DIR}/opj.plist)
+    #include(BundleUtilities)
+  endif()
 
   include(CPack)
 endiF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")

cmake/OpenJPEGConfig.cmake.in

@@ -0,0 +1,48 @@
+#-----------------------------------------------------------------------------
+#
+# OPENJPEGConfig.cmake - CMake configuration file for external projects.
+#
+# This file is configured by OPENJPEG and used by the UseOPENJPEG.cmake
+# module to load OPENJPEG's settings for an external project.
+@OPENJPEG_CONFIG_INSTALL_ONLY@
+# The OPENJPEG version number.
+set(OPENJPEG_MAJOR_VERSION "@OPENJPEG_VERSION_MAJOR@")
+set(OPENJPEG_MINOR_VERSION "@OPENJPEG_VERSION_MINOR@")
+set(OPENJPEG_BUILD_VERSION "@OPENJPEG_VERSION_BUILD@")
+
+# The libraries.
+set(OPENJPEG_LIBRARIES "@OPENJPEG_LIBRARY_NAME@")
+
+# The CMake macros dir.
+set(OPENJPEG_CMAKE_DIR "@OPENJPEG_INSTALL_PACKAGE_DIR@")
+
+# The configuration options.
+set(OPENJPEG_BUILD_SHARED_LIBS "@BUILD_SHARED_LIBS@")
+
+# The "use" file.
+set(OPENJPEG_USE_FILE "@OPENJPEG_USE_FILE_CONFIG@")
+
+get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
+  # This is an install tree
+  include(${SELF_DIR}/OpenJPEGTargets.cmake)
+  get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE)
+  set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_ROOT})
+
+else()
+  if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake)
+    # This is a build tree
+    set( OPENJPEG_INCLUDE_DIRS @OPENJPEG_INCLUDE_PATH@)
+
+    include(${SELF_DIR}/OpenJPEGExports.cmake)
+
+  else()
+    message(FATAL_ERROR "ooops")
+  endif()
+endif()
+
+set(OPENJPEG_USE_FILE ${SELF_DIR}/UseOPENJPEG.cmake)
+
+# Backward compatible part:
+set(OPENJPEG_FOUND       TRUE)
+

cmake/TestFileOffsetBits.c

@@ -0,0 +1,11 @@
+#include <sys/types.h>
+
+/* Cause a compile-time error if off_t is smaller than 64 bits */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+int off_t_is_large[ (LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1 ];  
+
+int main(int argc, char **argv)
+{
+  return 0;
+}
+

cmake/TestLargeFiles.c.cmake.in

@@ -0,0 +1,23 @@
+#cmakedefine _LARGEFILE_SOURCE
+#cmakedefine _LARGE_FILES
+#cmakedefine _FILE_OFFSET_BITS @_FILE_OFFSET_BITS@
+
+#include <sys/types.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int main(int argc, char **argv)
+{
+  /* Cause a compile-time error if off_t is smaller than 64 bits,
+   * and make sure we have ftello / fseeko.
+   */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[ (LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1 ];
+  FILE *fp = fopen(argv[0],"r");
+  off_t offset = ftello( fp );
+
+  fseeko( fp, offset, SEEK_CUR );
+  fclose(fp);
+  return 0;
+}
+

cmake/TestLargeFiles.cmake

@@ -0,0 +1,134 @@
+# - Define macro to check large file support
+#
+#  OPJ_TEST_LARGE_FILES(VARIABLE)
+#
+#  VARIABLE will be set to true if off_t is 64 bits, and fseeko/ftello present.
+#  This macro will also defines the necessary variable enable large file support, for instance
+#  _LARGE_FILES
+#  _LARGEFILE_SOURCE
+#  _FILE_OFFSET_BITS 64
+#  OPJ_HAVE_FSEEKO
+#
+#  However, it is YOUR job to make sure these defines are set in a #cmakedefine so they
+#  end up in a config.h file that is included in your source if necessary!
+#
+#  Adapted from Gromacs project (http://www.gromacs.org/)
+#  by Julien Malik
+#
+
+macro(OPJ_TEST_LARGE_FILES VARIABLE)
+    if("${VARIABLE}" MATCHES "^${VARIABLE}$")
+
+        # On most platforms it is probably overkill to first test the flags for 64-bit off_t,
+        # and then separately fseeko. However, in the future we might have 128-bit filesystems
+        # (ZFS), so it might be dangerous to indiscriminately set e.g. _FILE_OFFSET_BITS=64.
+
+        message(STATUS "Checking for 64-bit off_t")
+
+        # First check without any special flags
+        try_compile(FILE64_OK "${PROJECT_BINARY_DIR}"
+                    "${PROJECT_SOURCE_DIR}/cmake/TestFileOffsetBits.c")
+        if(FILE64_OK)
+          message(STATUS "Checking for 64-bit off_t - present")
+       	endif()
+
+        if(NOT FILE64_OK)
+            # Test with _FILE_OFFSET_BITS=64
+            try_compile(FILE64_OK "${PROJECT_BINARY_DIR}"
+                        "${PROJECT_SOURCE_DIR}/cmake/TestFileOffsetBits.c"
+                        COMPILE_DEFINITIONS "-D_FILE_OFFSET_BITS=64" )
+            if(FILE64_OK)
+                message(STATUS "Checking for 64-bit off_t - present with _FILE_OFFSET_BITS=64")
+                set(_FILE_OFFSET_BITS 64)
+            endif()
+        endif()
+
+        if(NOT FILE64_OK)
+            # Test with _LARGE_FILES
+            try_compile(FILE64_OK "${PROJECT_BINARY_DIR}"
+                        "${PROJECT_SOURCE_DIR}/cmake/TestFileOffsetBits.c"
+                        COMPILE_DEFINITIONS "-D_LARGE_FILES" )
+            if(FILE64_OK)
+                message(STATUS "Checking for 64-bit off_t - present with _LARGE_FILES")
+                set(_LARGE_FILES 1)
+            endif()
+        endif()
+	
+        if(NOT FILE64_OK)
+            # Test with _LARGEFILE_SOURCE
+            try_compile(FILE64_OK "${PROJECT_BINARY_DIR}"
+                        "${PROJECT_SOURCE_DIR}/cmake/TestFileOffsetBits.c"
+                        COMPILE_DEFINITIONS "-D_LARGEFILE_SOURCE" )
+            if(FILE64_OK)
+                message(STATUS "Checking for 64-bit off_t - present with _LARGEFILE_SOURCE")
+                set(_LARGEFILE_SOURCE 1)
+            endif()
+        endif()
+
+
+        #if(NOT FILE64_OK)
+        #    # now check for Windows stuff
+        #    try_compile(FILE64_OK "${PROJECT_BINARY_DIR}"
+        #                "${PROJECT_SOURCE_DIR}/cmake/TestWindowsFSeek.c")
+        #    if(FILE64_OK)
+        #        message(STATUS "Checking for 64-bit off_t - present with _fseeki64")
+        #        set(HAVE__FSEEKI64 1)
+        #    endif()
+        #endif()
+
+        if(NOT FILE64_OK)
+            message(STATUS "Checking for 64-bit off_t - not present")
+        endif()
+
+        set(_FILE_OFFSET_BITS ${_FILE_OFFSET_BITS} CACHE INTERNAL "Result of test for needed _FILE_OFFSET_BITS=64")
+        set(_LARGE_FILES      ${_LARGE_FILES}      CACHE INTERNAL "Result of test for needed _LARGE_FILES")
+        set(_LARGEFILE_SOURCE ${_LARGEFILE_SOURCE} CACHE INTERNAL "Result of test for needed _LARGEFILE_SOURCE")
+
+        # Set the flags we might have determined to be required above
+        configure_file("${PROJECT_SOURCE_DIR}/cmake/TestLargeFiles.c.cmake.in"
+                       "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/TestLargeFiles.c")
+
+        message(STATUS "Checking for fseeko/ftello")
+
+	    # Test if ftello/fseeko are	available
+	    try_compile(FSEEKO_COMPILE_OK
+	                "${PROJECT_BINARY_DIR}"
+                    "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/TestLargeFiles.c")
+	
+	    if(FSEEKO_COMPILE_OK)
+            message(STATUS "Checking for fseeko/ftello - present")
+        endif()
+
+        if(NOT FSEEKO_COMPILE_OK)
+                # glibc 2.2 needs _LARGEFILE_SOURCE for fseeko (but not for 64-bit off_t...)
+                try_compile(FSEEKO_COMPILE_OK
+                            "${PROJECT_BINARY_DIR}"
+                            "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/TestLargeFiles.c"
+                            COMPILE_DEFINITIONS "-D_LARGEFILE_SOURCE" )
+
+                if(FSEEKO_COMPILE_OK)
+                    message(STATUS "Checking for fseeko/ftello - present with _LARGEFILE_SOURCE")
+                    set(_LARGEFILE_SOURCE ${_LARGEFILE_SOURCE} CACHE INTERNAL "Result of test for needed _LARGEFILE_SOURCE")
+                endif()
+        endif()
+
+	    if(FSEEKO_COMPILE_OK)
+                set(OPJ_HAVE_FSEEKO ON CACHE INTERNAL "Result of test for fseeko/ftello")
+        else()
+                message(STATUS "Checking for fseeko/ftello - not found")
+                set(OPJ_HAVE_FSEEKO OFF CACHE INTERNAL "Result of test for fseeko/ftello")
+        endif()
+
+	    if(FILE64_OK AND FSEEKO_COMPILE_OK)
+                message(STATUS "Large File support - found")
+                set(${VARIABLE} ON CACHE INTERNAL "Result of test for large file support")
+        else()
+                message(STATUS "Large File support - not found")
+                set(${VARIABLE} OFF CACHE INTERNAL "Result of test for large file support")
+        endif()
+
+    endif()
+endmacro()
+
+
+

cmake/TestWindowsFSeek.c

@@ -0,0 +1,11 @@
+
+#include <stdio.h>
+    
+int main()
+{
+  __int64 off=0;
+
+  _fseeki64(NULL, off, SEEK_SET);
+        
+  return 0;
+}

cmake/openjpeg_valgrind.supp

@@ -0,0 +1,39 @@
+
+
+{
+   <Appears with libpng uses with Ubuntu10.04 (hulk)>
+   Memcheck:Cond
+   fun:deflate
+   obj:/lib/libpng12.so.0.42.0
+   obj:/lib/libpng12.so.0.42.0
+   obj:/lib/libpng12.so.0.42.0
+   fun:png_write_row
+   fun:imagetopng
+   fun:main
+}
+{
+   <Appears with libpng uses with Ubuntu10.04 (hulk)>
+   Memcheck:Value8
+   fun:crc32
+   obj:/lib/libpng12.so.0.42.0
+   fun:png_write_chunk
+   obj:/lib/libpng12.so.0.42.0
+   obj:/lib/libpng12.so.0.42.0
+   obj:/lib/libpng12.so.0.42.0
+   obj:/lib/libpng12.so.0.42.0
+   fun:png_write_row
+   fun:imagetopng
+   fun:main
+}
+{
+   <Appears with libpng uses with Ubuntu10.04 (hulk)>
+   Memcheck:Param
+   write(buf)
+   fun:__write_nocancel
+   fun:_IO_file_write@@GLIBC_2.2.5
+   fun:_IO_do_write@@GLIBC_2.2.5
+   fun:_IO_file_close_it@@GLIBC_2.2.5
+   fun:fclose@@GLIBC_2.2.5
+   fun:imagetopng
+   fun:main
+}

configure.ac

@@ -1,545 +0,0 @@
-
-# According to http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info :
-#
-# 1) when bugs are fixed or internal code is changed: increase MICRO
-# 2) if API is added, increase MINOR and set MICRO to 0
-# 3) if API or ABI is broken (this case should (must) never happen as it's very bad for a library), or a new designed library, increase MAJOR and set MINOR and MICRO to 0
-
-m4_define([OPJ_MAJOR], [1])
-m4_define([OPJ_MINOR], [5])
-m4_define([OPJ_MICRO], [2])
-
-m4_define([lt_cur], m4_eval(OPJ_MAJOR + OPJ_MINOR))
-m4_define([lt_rev], OPJ_MICRO)
-m4_define([lt_age], OPJ_MINOR)
-
-AC_PREREQ([2.62])
-AC_INIT([OpenJPEG],
-   [OPJ_MAJOR.OPJ_MINOR.OPJ_MICRO],
-   [openjpeg@googlegroups.com],
-   [openjpeg],
-   [http://www.openjpeg.org])
-AC_CONFIG_SRCDIR([configure.ac])
-AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_HEADERS([opj_config.h])
-
-AC_CANONICAL_HOST
-
-AM_INIT_AUTOMAKE([1.11 foreign dist-bzip2 dist-xz dist-zip])
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-MAJOR_NR=OPJ_MAJOR
-MINOR_NR=OPJ_MINOR
-MICRO_NR=OPJ_MICRO
-AC_SUBST([MAJOR_NR])
-AC_SUBST([MINOR_NR])
-AC_SUBST([MICRO_NR])
-
-LT_PREREQ([2.0])
-LT_INIT([win32-dll])
-
-lt_version=lt_cur:lt_rev:lt_age
-AC_SUBST([lt_version])
-
-
-### Needed information
-
-have_win32=no
-have_darwin="no"
-case "$host_os" in
-   mingw*)
-      have_win32="yes"
-      ;;
-   darwin*)
-      have_darwin="yes"
-      ;;
-esac
-
-AM_CONDITIONAL([HAVE_WIN32], [test "x${have_win32}" = "xyes"])
-AM_CONDITIONAL([HAVE_DARWIN], [test "x${have_darwin}" = "xyes"])
-
-
-### Additional options to configure
-
-# debug
-
-AC_ARG_ENABLE([debug],
-   [AC_HELP_STRING([--enable-debug], [build with debug symbols @<:@default=disabled@:>@])],
-   [
-    if test "x${enableval}" = "xyes" ; then
-       want_debug="yes"
-    else
-       want_debug="no"
-    fi
-   ],
-   [want_debug="no"])
-
-AC_MSG_CHECKING([whether to build in debug mode])
-AC_MSG_RESULT([${want_debug}])
-
-# MJ2
-
-AC_ARG_ENABLE([mj2],
-   [AC_HELP_STRING([--enable-mj2], [build mj2 binaries @<:@default=disabled@:>@])],
-   [
-    if test "x${enableval}" = "xyes" ; then
-       want_mj2="yes"
-    else
-       want_mj2="no"
-    fi
-   ],
-   [want_mj2="no"])
-
-AC_MSG_CHECKING([whether to build the MJ2 binaries])
-AC_MSG_RESULT([${want_mj2}])
-
-if test "x${want_mj2}" = "xyes" ; then
-   AC_DEFINE(USE_MJ2, [1], [define to 1 if you use mj2])
-fi
-
-AM_CONDITIONAL([WANT_MJ2], [test "x${want_mj2}" = "xyes"])
-
-# JPWL
-
-AC_ARG_ENABLE([jpwl],
-   [AC_HELP_STRING([--enable-jpwl], [build JPWL library @<:@default=disabled@:>@])],
-   [
-    if test "x${enableval}" = "xyes" ; then
-       want_jpwl="yes"
-    else
-       want_jpwl="no"
-    fi
-   ],
-   [want_jpwl="no"])
-
-AC_MSG_CHECKING([whether to build the JPWL library])
-AC_MSG_RESULT([${want_jpwl}])
-
-AM_CONDITIONAL([WANT_JPWL], [test "x${want_jpwl}" = "xyes"])
-
-# JPIP
-
-AC_ARG_ENABLE([jpip],
-   [AC_HELP_STRING([--enable-jpip], [build jpip library @<:@default=disabled@:>@])],
-   [
-    if test "x${enableval}" = "xyes" ; then
-       want_jpip="yes"
-    else
-       want_jpip="no"
-    fi
-   ],
-   [want_jpip="no"])
-
-AC_MSG_CHECKING([whether to build the JPIP library])
-AC_MSG_RESULT([${want_jpip}])
-
-AC_ARG_ENABLE([jpip-server],
-   [AC_HELP_STRING([--enable-jpip-server], [build jpip server @<:@default=disabled@:>@])],
-   [
-    if test "x${enableval}" = "xyes" ; then
-       want_jpip_server="yes"
-    else
-       want_jpip_server="no"
-    fi
-   ],
-   [want_jpip_server="no"])
-
-AC_MSG_CHECKING([whether to build the JPIP server])
-AC_MSG_RESULT([${want_jpip_server}])
-
-
-### Checks for programs
-
-AC_PROG_CC
-
-# pkg-config
-
-PKG_PROG_PKG_CONFIG
-
-# Check whether pkg-config supports Requires.private
-if $PKG_CONFIG --atleast-pkgconfig-version 0.22 ; then
-   pkgconfig_requires_private="Requires.private"
-else
-   pkgconfig_requires_private="Requires"
-fi
-AC_SUBST([pkgconfig_requires_private])
-AC_SUBST([requirements])
-
-# doxygen
-
-OPJ_CHECK_DOXYGEN
-
-#  ln -s
-
-AC_PROG_LN_S
-
-
-### Checks for libraries
-
-# libpng
-
-have_libpng="no"
-
-AC_ARG_ENABLE([png],
-   [AC_HELP_STRING([--disable-png], [disable PNG support @<:@default=enabled@:>@])],
-   [
-    if test "x${enableval}" = "xyes" ; then
-       want_png="yes"
-    else
-       want_png="no"
-    fi
-   ],
-   [want_png="yes"])
-
-AC_MSG_CHECKING([whether to build with PNG support])
-AC_MSG_RESULT([${want_png}])
-
-if test "x${want_png}" = "xyes" ; then
-
-   PKG_CHECK_MODULES([PNG], [libpng15 zlib],
-      [have_libpng="yes"],
-      [
-       PKG_CHECK_MODULES([PNG], [libpng14 zlib],
-          [have_libpng="yes"],
-          [
-           PKG_CHECK_MODULES([PNG], [libpng12 zlib],
-              [have_libpng="yes"],
-              [
-               PKG_CHECK_MODULES([PNG], [libpng zlib],
-                  [have_libpng="yes"],
-                  [have_libpng="no"])
-              ])
-          ])
-      ])
-
-   if ! test "x${have_libpng}" = "xyes" ; then
-
-      OPJ_CHECK_LIB([zlib.h],
-         [z],
-         [zlibVersion],
-         [
-          OPJ_CHECK_LIB([png.h],
-             [png],
-             [png_access_version_number],
-             [
-              have_libpng="yes"
-              PNG_CFLAGS="${PNG_CFLAGS} ${Z_CFLAGS}"
-              PNG_LIBS="${PNG_LIBS} ${Z_LIBS}"
-             ],
-             [have_libpng="no"])
-         ],
-         [have_libpng="no"])
-
-   fi
-
-   if test "x${have_libpng}" = "xno" ; then
-      AC_MSG_WARN([Can not find a usuable PNG library. Make sure that CPPFLAGS and LDFLAGS are correctly set.])
-   fi
-
-fi
-
-AC_MSG_CHECKING([whether PNG is available])
-AC_MSG_RESULT([${have_libpng}])
-
-if test "x${have_libpng}" = "xyes" ; then
-   AC_DEFINE(HAVE_LIBPNG, [1], [define to 1 if you have libpng])
-fi
-
-AM_CONDITIONAL([with_libpng], [test x${have_libpng} = "xyes"])
-
-# libtiff
-
-have_libtiff="no"
-
-AC_ARG_ENABLE([tiff],
-   [AC_HELP_STRING([--disable-tiff], [disable TIFF support @<:@default=enabled@:>@])],
-   [
-    if test "x${enableval}" = "xyes" ; then
-       want_tiff="yes"
-    else
-       want_tiff="no"
-    fi
-   ],
-   [want_tiff="yes"])
-
-AC_MSG_CHECKING([whether to build with TIFF support])
-AC_MSG_RESULT([${want_tiff}])
-
-if test "x${want_tiff}" = "xyes" ; then
-
-   OPJ_CHECK_LIB(
-      [tiff.h],
-      [tiff],
-      [TIFFOpen],
-      [have_libtiff="yes"],
-      [have_libtiff="no"])
-
-   if test "x${have_libtiff}" = "xno" ; then
-      AC_MSG_WARN([Can not find a usuable TIFF library. Make sure that CPPFLAGS and LDFLAGS are correctly set.])
-   fi
-fi
-
-AC_MSG_CHECKING([whether TIFF is available])
-AC_MSG_RESULT([${have_libtiff}])
-
-if test "x${have_libtiff}" = "xyes" ; then
-   AC_DEFINE(HAVE_LIBTIFF, [1], [define to 1 if you have libtiff])
-fi
-
-AM_CONDITIONAL([with_libtiff], [test "x${have_libtiff}" = "xyes"])
-
-# libcms2
-
-lcms_output="no"
-have_lcms2="no"
-
-AC_ARG_ENABLE([lcms2],
-   [AC_HELP_STRING([--disable-lcms2], [disable LCMS-2 support @<:@default=enabled@:>@])],
-   [
-    if test "x${enableval}" = "xyes" ; then
-       want_lcms2="yes"
-    else
-       want_lcms2="no"
-    fi
-   ],
-   [want_lcms2="yes"])
-
-AC_MSG_CHECKING([whether to build with LCMS-2 support])
-AC_MSG_RESULT([${want_lcms2}])
-
-if test "x${want_lcms2}" = "xyes" ; then
-   PKG_CHECK_MODULES([LCMS2], [lcms2],
-      [have_lcms2="yes"],
-      [have_lcms2="no"])
-fi
-
-AC_MSG_CHECKING([whether LCMS-2 is available])
-AC_MSG_RESULT([${have_lcms2}])
-
-if test "x${have_lcms2}" = "xyes" ; then
-   AC_DEFINE(HAVE_LIBLCMS2, [1], [define to 1 if you have lcms version 2.x])
-   lcms_output="lcms version 2.x"
-fi
-
-# libcms1
-
-AC_ARG_ENABLE([lcms1],
-   [AC_HELP_STRING([--disable-lcms1], [disable LCMS-1 support @<:@default=enabled@:>@])],
-   [
-    if test "x${enableval}" = "xyes" ; then
-       want_lcms1="yes"
-    else
-       want_lcms1="no"
-    fi
-   ],
-   [want_lcms1="yes"])
-
-AC_MSG_CHECKING([whether to build with LCMS-1 support])
-AC_MSG_RESULT([${want_lcms1}])
-
-if test "x${have_lcms2}" = "xno" ; then
-
-   if test "x${want_lcms1}" = "xyes" ; then
-      PKG_CHECK_MODULES([LCMS1], [lcms1],
-         [have_lcms1="yes"],
-         [PKG_CHECK_MODULES([LCMS1], [lcms],
-            [have_lcms1="yes"],
-            [have_lcms1="no"])])
-   fi
-
-   AC_MSG_CHECKING([whether LCMS-1 is available])
-   AC_MSG_RESULT([${have_lcms1}])
-
-   if test "x${have_lcms1}" = "xyes" ; then
-      AC_DEFINE(HAVE_LIBLCMS1, [1], [define to 1 if you have lcms version 1.x])
-      lcms_output="lcms version 1.x"
-   fi
-
-fi
-
-# threads
-
-if test "x${want_jpip_server}" = "xyes" ; then
-
-   if test "x${have_win32}" = "xno" ; then
-
-      SAVE_CFLAGS=${CFLAGS}
-      CFLAGS="${CFLAGS} -pthread"
-      SAVE_LIBS=${LIBS}
-      LIBS="${LIBS} -pthread"
-      AC_LINK_IFELSE(
-         [AC_LANG_PROGRAM([[
-#include <pthread.h>
-                          ]],
-                          [[
-pthread_t id;
-id = pthread_self();
-                          ]])],
-         [have_pthread="yes"],
-         [have_pthread="no"])
-      CFLAGS=${SAVE_CFLAGS}
-      LIBS=${SAVE_LIBS}
-
-      AC_MSG_CHECKING([whether Pthread library is available])
-      AC_MSG_RESULT([${have_pthread}])
-
-      if ! test "x${have_pthread}" = "xyes" ; then
-         AC_MSG_WARN([Pthread library not found. OpenJPIP server will not be compiled.])
-         want_jpip_server="no"
-      else
-         THREAD_CFLAGS="-pthread"
-         THREAD_LIBS="-pthread"
-      fi
-
-   else
-      THREAD_LIBS="-lws2_32"
-   fi
-
-fi
-
-AC_ARG_VAR([THREAD_CFLAGS], [compiler flag for the thread library])
-AC_SUBST([THREAD_CFLAGS])
-AC_ARG_VAR([THREAD_LIBS], [linker flags for thread library])
-AC_SUBST([THREAD_LIBS])
-
-# libfcgi
-
-if test "x${want_jpip_server}" = "xyes" ; then
-
-   have_fcgi="no"
-   OPJ_CHECK_LIB(
-      [fcgi_stdio.h],
-      [fcgi],
-      [FCGI_Accept],
-      [have_fcgi="yes"],
-      [have_fcgi="no"])
-
-   if ! test "x${have_fcgi}" = "xyes" ; then
-      AC_MSG_WARN([FastCGI library not found. OpenJPIP server will not be compiled.])
-      want_jpip_server="no"
-   fi
-
-fi
-
-# libcurl
-
-if test "x${want_jpip_server}" = "xyes" ; then
-
-   PKG_CHECK_MODULES([LIBCURL], [libcurl],
-      [have_libcurl="yes"],
-      [have_libcurl="no"])
-
-   if ! test "x${have_libcurl}" = "xyes" ; then
-      AC_MSG_WARN([libcurl library not found. OpenJPIP server will not be compiled.])
-      want_jpip_server="no"
-   fi
-
-fi
-
-if test "x${want_jpip}" = "xyes" ; then
-   AC_DEFINE(USE_JPIP, [1], [define to 1 if you use jpip])
-fi
-
-AM_CONDITIONAL([WANT_JPIP], [test "x${want_jpip}" = "xyes"])
-
-if test "x${want_jpip_server}" = "xyes" ; then
-   AC_DEFINE(USE_JPIP_SERVER, [1], [define to 1 if you use jpip server])
-fi
-
-AM_CONDITIONAL([WANT_JPIP_SERVER], [test "x${want_jpip_server}" = "xyes"])
-
-AM_CONDITIONAL([WANT_JPIP_CODE], [test "x${want_jpip}" = "xyes" || test "x${want_jpip_server}" = "xyes"])
-
-### Checks for header files
-
-## FIXME: declarations must be fixed in source code. See autoconf manual
-AC_HEADER_DIRENT
-
-
-### Checks for types
-
-
-### Checks for structures
-
-
-### Checks for compiler characteristics
-
-AM_PROG_CC_C_O
-ac_cv_c_big_endian=0
-AC_C_BIGENDIAN([ac_cv_c_big_endian=yes], [ac_cv_c_big_endian=no],[])
-#
-if test "x${ac_cv_c_big_endian}" = "xyes" ; then
- AC_DEFINE(OPJ_BIG_ENDIAN, [1], [define to 1 if your machine has BE])
- AC_DEFINE(WORDS_BIGENDIAN, [1], [define to 1 if your machine has BE])
-fi
-#
-#OPJ_COMPILER_FLAG([-Wall])
-#OPJ_COMPILER_FLAG([-Wextra])
-#OPJ_COMPILER_FLAG([-Wshadow])
-#OPJ_COMPILER_FLAG([-Wpointer-arith])
-OPJ_COMPILER_FLAG([-Wno-unused-result])
-
-if test "x${want_debug}" = "xyes" ; then
-   OPJ_COMPILER_FLAG([-g])
-   OPJ_COMPILER_FLAG([-O0])
-else
-   OPJ_COMPILER_FLAG([-O3])
-fi
-
-
-### Checks for linker characteristics
-
-
-### Checks for library functions
-
-
-### Post configuration
-
-AM_CONDITIONAL([BUILD_SHARED], [test "x${enable_shared}" = "xyes"])
-AM_CONDITIONAL([BUILD_STATIC], [test "x${enable_static}" = "xyes"])
-
-
-AC_CONFIG_FILES([
-Makefile
-libopenjpeg1.pc
-libopenjpeg-jpwl.pc
-libopenjpeg/Makefile
-libopenjpeg/jpwl/Makefile
-applications/Makefile
-applications/codec/Makefile
-applications/mj2/Makefile
-applications/jpip/Makefile
-applications/jpip/libopenjpip/Makefile
-applications/jpip/util/Makefile
-doc/Makefile
-])
-
-AC_OUTPUT
-
-### Summary
-
-echo
-echo
-echo
-echo "------------------------------------------------------------------------"
-echo "$PACKAGE $VERSION"
-echo "------------------------------------------------------------------------"
-echo
-echo
-echo "Configuration Options Summary:"
-echo
-echo "  Debug...............: ${want_debug}"
-echo
-echo "  Optional support:"
-echo "    libpng............: ${have_libpng}"
-echo "    libtiff...........: ${have_libtiff}"
-echo "    libcms............: ${lcms_output}"
-echo
-echo "  Documentation.......: ${opj_have_doxygen}"
-echo "    Build.............: make doc"
-echo
-echo "  mj2.................: ${want_mj2}"
-echo "  jpwl................: ${want_jpwl}"
-echo "  jpip................: ${want_jpip}"
-echo "  jpip server.........: ${want_jpip_server}"
-echo

doc/CMakeLists.txt

@@ -3,24 +3,50 @@
 # to generate the html documentation in the doc/html repository of the build folder.
 
 # Try to find the doxygen tool
-FIND_PACKAGE(Doxygen)
+find_package(Doxygen)
 
-IF(DOXYGEN_FOUND)
+if(DOXYGEN_FOUND)
   # Configure the doxygen config file with variable from CMake and move it
-  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.dox.cmake.in
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.dox.cmake.in
     ${CMAKE_BINARY_DIR}/doc/Doxyfile-html.dox @ONLY)
 
   # Configure the html mainpage file of the doxygen documentation with variable
-  # from CMake and move it  
-  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mainpage.dox.cmake
+  # from CMake and move it
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/mainpage.dox.in
     ${CMAKE_BINARY_DIR}/doc/mainpage.dox @ONLY)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/openjpip.dox.in
+    ${CMAKE_BINARY_DIR}/doc/openjpip.dox @ONLY)
+  # copy png file to make local (binary tree) documentation valid:
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/jpip_architect.png
+    ${CMAKE_BINARY_DIR}/doc/html/jpip_architect.png COPYONLY)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/jpip_protocol.png
+    ${CMAKE_BINARY_DIR}/doc/html/jpip_protocol.png COPYONLY)
 
+  file(GLOB headers
+    ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/*.h
+    ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/*.c
+    ${OPENJPEG_SOURCE_DIR}/src/lib/openjpip/*.h
+    ${OPENJPEG_SOURCE_DIR}/src/lib/openjpip/*.c
+  )
   # Generate new target to build the html documentation
-  ADD_CUSTOM_TARGET(doc ALL
-    ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/doc/Doxyfile-html.dox)
+  add_custom_command(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/html/index.html
+    COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/doc/Doxyfile-html.dox
+    DEPENDS ${CMAKE_BINARY_DIR}/doc/Doxyfile-html.dox
+            ${CMAKE_BINARY_DIR}/doc/mainpage.dox
+            ${CMAKE_BINARY_DIR}/doc/openjpip.dox
+            ${headers}
+  )
+  add_custom_target(doc ALL
+    DEPENDS ${CMAKE_BINARY_DIR}/doc/html/index.html
+    COMMENT "Building doxygen documentation"
+  )
 
-ELSE(DOXYGEN_FOUND)
-
-  MESSAGE(STATUS "Doxygen not found, we cannot generate the documentation")
-
-ENDIF(DOXYGEN_FOUND)
+  # install HTML documentation (install png files too):
+  install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/html
+    DESTINATION share/doc
+    PATTERN ".svn" EXCLUDE
+  )
+else()
+  message(STATUS "Doxygen not found, we cannot generate the documentation")
+endif()

doc/Doxyfile.dox

@@ -1,290 +0,0 @@
-# Doxyfile 1.7.3
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-DOXYFILE_ENCODING      = UTF-8
-PROJECT_NAME           = OpenJPEG
-PROJECT_NUMBER         =
-PROJECT_BRIEF          =
-PROJECT_LOGO           =
-OUTPUT_DIRECTORY       = .
-CREATE_SUBDIRS         = NO
-OUTPUT_LANGUAGE        = English
-BRIEF_MEMBER_DESC      = YES
-REPEAT_BRIEF           = YES
-ABBREVIATE_BRIEF       = "The $name class" \
-                         "The $name widget" \
-                         "The $name file" \
-                         is \
-                         provides \
-                         specifies \
-                         contains \
-                         represents \
-                         a \
-                         an \
-                         the
-ALWAYS_DETAILED_SEC    = NO
-INLINE_INHERITED_MEMB  = NO
-FULL_PATH_NAMES        = NO
-STRIP_FROM_PATH        = C://
-STRIP_FROM_INC_PATH    =
-SHORT_NAMES            = NO
-JAVADOC_AUTOBRIEF      = YES
-QT_AUTOBRIEF           = NO
-MULTILINE_CPP_IS_BRIEF = NO
-INHERIT_DOCS           = YES
-SEPARATE_MEMBER_PAGES  = NO
-TAB_SIZE               = 8
-ALIASES                =
-OPTIMIZE_OUTPUT_FOR_C  = YES
-OPTIMIZE_OUTPUT_JAVA   = NO
-OPTIMIZE_FOR_FORTRAN   = NO
-OPTIMIZE_OUTPUT_VHDL   = NO
-EXTENSION_MAPPING      =
-BUILTIN_STL_SUPPORT    = NO
-CPP_CLI_SUPPORT        = NO
-SIP_SUPPORT            = NO
-IDL_PROPERTY_SUPPORT   = YES
-DISTRIBUTE_GROUP_DOC   = NO
-SUBGROUPING            = YES
-TYPEDEF_HIDES_STRUCT   = NO
-SYMBOL_CACHE_SIZE      = 0
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-EXTRACT_ALL            = YES
-EXTRACT_PRIVATE        = YES
-EXTRACT_STATIC         = YES
-EXTRACT_LOCAL_CLASSES  = YES
-EXTRACT_LOCAL_METHODS  = NO
-EXTRACT_ANON_NSPACES   = NO
-HIDE_UNDOC_MEMBERS     = NO
-HIDE_UNDOC_CLASSES     = NO
-HIDE_FRIEND_COMPOUNDS  = NO
-HIDE_IN_BODY_DOCS      = NO
-INTERNAL_DOCS          = NO
-CASE_SENSE_NAMES       = NO
-HIDE_SCOPE_NAMES       = NO
-SHOW_INCLUDE_FILES     = YES
-FORCE_LOCAL_INCLUDES   = NO
-INLINE_INFO            = YES
-SORT_MEMBER_DOCS       = YES
-SORT_BRIEF_DOCS        = NO
-SORT_MEMBERS_CTORS_1ST = NO
-SORT_GROUP_NAMES       = NO
-SORT_BY_SCOPE_NAME     = NO
-STRICT_PROTO_MATCHING  = NO
-GENERATE_TODOLIST      = YES
-GENERATE_TESTLIST      = YES
-GENERATE_BUGLIST       = YES
-GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS       =
-MAX_INITIALIZER_LINES  = 30
-SHOW_USED_FILES        = YES
-SHOW_DIRECTORIES       = NO
-SHOW_FILES             = YES
-SHOW_NAMESPACES        = YES
-FILE_VERSION_FILTER    =
-LAYOUT_FILE            =
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET                  = NO
-WARNINGS               = YES
-WARN_IF_UNDOCUMENTED   = YES
-WARN_IF_DOC_ERROR      = YES
-WARN_NO_PARAMDOC       = NO
-WARN_FORMAT            = "$file:$line: $text"
-WARN_LOGFILE           =
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT                  = ../libopenjpeg \
-                         ../libopenjpeg/jpwl
-INPUT_ENCODING         = UTF-8
-FILE_PATTERNS          = *.h \
-                         *.c
-RECURSIVE              = NO
-EXCLUDE                =
-EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       =
-EXCLUDE_SYMBOLS        =
-EXAMPLE_PATH           =
-EXAMPLE_PATTERNS       = *
-EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             =
-INPUT_FILTER           =
-FILTER_PATTERNS        =
-FILTER_SOURCE_FILES    = NO
-FILTER_SOURCE_PATTERNS =
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER         = NO
-INLINE_SOURCES         = NO
-STRIP_CODE_COMMENTS    = YES
-REFERENCED_BY_RELATION = YES
-REFERENCES_RELATION    = YES
-REFERENCES_LINK_SOURCE = YES
-USE_HTAGS              = NO
-VERBATIM_HEADERS       = YES
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX     = NO
-COLS_IN_ALPHA_INDEX    = 5
-IGNORE_PREFIX          =
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML          = YES
-HTML_OUTPUT            = ./html
-HTML_FILE_EXTENSION    = .html
-HTML_HEADER            =
-HTML_FOOTER            =
-HTML_STYLESHEET        =
-HTML_COLORSTYLE_HUE    = 220
-HTML_COLORSTYLE_SAT    = 100
-HTML_COLORSTYLE_GAMMA  = 80
-HTML_TIMESTAMP         = NO 
-HTML_ALIGN_MEMBERS     = YES
-HTML_DYNAMIC_SECTIONS  = NO
-GENERATE_DOCSET        = NO
-DOCSET_FEEDNAME        = "Doxygen generated docs"
-DOCSET_BUNDLE_ID       = org.doxygen.Project
-DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
-DOCSET_PUBLISHER_NAME  = Publisher
-GENERATE_HTMLHELP      = NO
-CHM_FILE               =
-HHC_LOCATION           =
-GENERATE_CHI           = NO
-CHM_INDEX_ENCODING     =
-BINARY_TOC             = NO
-TOC_EXPAND             = NO
-GENERATE_QHP           = NO
-QCH_FILE               =
-QHP_NAMESPACE          = org.doxygen.Project
-QHP_VIRTUAL_FOLDER     = doc
-QHP_CUST_FILTER_NAME   =
-QHP_CUST_FILTER_ATTRS  =
-QHP_SECT_FILTER_ATTRS  =
-QHG_LOCATION           =
-GENERATE_ECLIPSEHELP   = NO
-ECLIPSE_DOC_ID         = org.doxygen.Project
-DISABLE_INDEX          = NO
-ENUM_VALUES_PER_LINE   = 4
-GENERATE_TREEVIEW      = NO
-USE_INLINE_TREES       = NO
-TREEVIEW_WIDTH         = 250
-EXT_LINKS_IN_WINDOW    = NO
-FORMULA_FONTSIZE       = 10
-FORMULA_TRANSPARENT    = YES
-USE_MATHJAX            = NO
-MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
-SEARCHENGINE           = NO
-SERVER_BASED_SEARCH    = NO
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX         = NO
-LATEX_OUTPUT           = latex
-LATEX_CMD_NAME         = latex
-MAKEINDEX_CMD_NAME     = makeindex
-COMPACT_LATEX          = NO
-PAPER_TYPE             = a4wide
-EXTRA_PACKAGES         =
-LATEX_HEADER           =
-PDF_HYPERLINKS         = NO
-USE_PDFLATEX           = NO
-LATEX_BATCHMODE        = NO
-LATEX_HIDE_INDICES     = NO
-LATEX_SOURCE_CODE      = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF           = NO
-RTF_OUTPUT             = rtf
-COMPACT_RTF            = NO
-RTF_HYPERLINKS         = NO
-RTF_STYLESHEET_FILE    =
-RTF_EXTENSIONS_FILE    =
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN           = NO
-MAN_OUTPUT             = man
-MAN_EXTENSION          = .3
-MAN_LINKS              = NO
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML           = NO
-XML_OUTPUT             = xml
-XML_SCHEMA             =
-XML_DTD                =
-XML_PROGRAMLISTING     = YES
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF   = NO
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-GENERATE_PERLMOD       = NO
-PERLMOD_LATEX          = NO
-PERLMOD_PRETTY         = YES
-PERLMOD_MAKEVAR_PREFIX =
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING   = YES
-MACRO_EXPANSION        = NO
-EXPAND_ONLY_PREDEF     = NO
-SEARCH_INCLUDES        = YES
-INCLUDE_PATH           =
-INCLUDE_FILE_PATTERNS  =
-PREDEFINED             = USE_JPWL \
-                         USE_JPSEC
-EXPAND_AS_DEFINED      =
-SKIP_FUNCTION_MACROS   = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-TAGFILES               =
-GENERATE_TAGFILE       =
-ALLEXTERNALS           = NO
-EXTERNAL_GROUPS        = YES
-PERL_PATH              = /usr/bin/perl
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS         = YES
-MSCGEN_PATH            =
-HIDE_UNDOC_RELATIONS   = YES
-HAVE_DOT               = NO
-DOT_NUM_THREADS        = 0
-DOT_FONTNAME           = Helvetica
-DOT_FONTSIZE           = 10
-DOT_FONTPATH           =
-CLASS_GRAPH            = YES
-COLLABORATION_GRAPH    = YES
-GROUP_GRAPHS           = YES
-UML_LOOK               = NO
-TEMPLATE_RELATIONS     = NO
-INCLUDE_GRAPH          = YES
-INCLUDED_BY_GRAPH      = YES
-CALL_GRAPH             = NO
-CALLER_GRAPH           = NO
-GRAPHICAL_HIERARCHY    = YES
-DIRECTORY_GRAPH        = YES
-DOT_IMAGE_FORMAT       = png
-DOT_PATH               =
-DOTFILE_DIRS           =
-MSCFILE_DIRS           =
-DOT_GRAPH_MAX_NODES    = 50
-MAX_DOT_GRAPH_DEPTH    = 1000
-DOT_TRANSPARENT        = NO
-DOT_MULTI_TARGETS      = NO
-GENERATE_LEGEND        = YES
-DOT_CLEANUP            = YES

doc/Doxyfile.dox.cmake.in

@@ -1,4 +1,4 @@
-# Doxyfile 1.7.3
+# Doxyfile 1.7.1
 
 #---------------------------------------------------------------------------
 # Project related configuration options
@@ -6,8 +6,6 @@
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = OpenJPEG
 PROJECT_NUMBER         = @OPENJPEG_VERSION@
-PROJECT_BRIEF          =
-PROJECT_LOGO           =
 OUTPUT_DIRECTORY       = @OPENJPEG_BINARY_DIR@/doc
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
@@ -74,7 +72,6 @@ SORT_BRIEF_DOCS        = NO
 SORT_MEMBERS_CTORS_1ST = NO
 SORT_GROUP_NAMES       = NO
 SORT_BY_SCOPE_NAME     = NO
-STRICT_PROTO_MATCHING  = NO
 GENERATE_TODOLIST      = YES
 GENERATE_TESTLIST      = YES
 GENERATE_BUGLIST       = YES
@@ -100,7 +97,8 @@ WARN_LOGFILE           =
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = @OPENJPEG_SOURCE_DIR@/libopenjpeg \
+INPUT                  = @OPENJPEG_SOURCE_DIR@/src/lib/openjp2 \
+                         @OPENJPEG_SOURCE_DIR@/src/lib/openjpip \
                          @OPENJPEG_BINARY_DIR@/doc
 INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          = *.h \
@@ -109,16 +107,15 @@ FILE_PATTERNS          = *.h \
 RECURSIVE              = YES
 EXCLUDE                =
 EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       =
+EXCLUDE_PATTERNS       = */.svn/*
 EXCLUDE_SYMBOLS        =
 EXAMPLE_PATH           =
 EXAMPLE_PATTERNS       = *
 EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             =
+IMAGE_PATH             = @OPENJPEG_SOURCE_DIR@/doc
 INPUT_FILTER           =
 FILTER_PATTERNS        =
 FILTER_SOURCE_FILES    = NO
-FILTER_SOURCE_PATTERNS =
 #---------------------------------------------------------------------------
 # configuration options related to source browsing
 #---------------------------------------------------------------------------
@@ -181,8 +178,6 @@ TREEVIEW_WIDTH         = 250
 EXT_LINKS_IN_WINDOW    = NO
 FORMULA_FONTSIZE       = 10
 FORMULA_TRANSPARENT    = YES
-USE_MATHJAX            = NO
-MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
 SEARCHENGINE           = NO
 SERVER_BASED_SEARCH    = NO
 #---------------------------------------------------------------------------
@@ -282,7 +277,6 @@ DIRECTORY_GRAPH        = YES
 DOT_IMAGE_FORMAT       = png
 DOT_PATH               =
 DOTFILE_DIRS           =
-MSCFILE_DIRS           =
 DOT_GRAPH_MAX_NODES    = 50
 MAX_DOT_GRAPH_DEPTH    = 1000
 DOT_TRANSPARENT        = NO

doc/Makefile.am

@@ -1,76 +0,0 @@
-
-MAINTAINERCLEANFILES = Makefile.in
-
-.PHONY: doc
-
-PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc
-
-if OPJ_BUILD_DOC
-
-doc-clean:
-	rm -rf $(top_srcdir)/doc/html/ $(top_srcdir)/doc/$(PACKAGE_DOCNAME).tar*
-
-doc: all
-	cd $(top_srcdir)/doc && \
-	$(opj_doxygen) Doxyfile.dox
-	rm -rf $(PACKAGE_DOCNAME).tar*
-	rm -rf $(top_srcdir)/doc/$(PACKAGE_DOCNAME).tar*
-	mkdir -p $(PACKAGE_DOCNAME)/doc
-	cp -R $(top_srcdir)/doc/html/ $(PACKAGE_DOCNAME)/doc
-	tar cf $(PACKAGE_DOCNAME).tar $(PACKAGE_DOCNAME)/
-	bzip2 -9 $(PACKAGE_DOCNAME).tar
-	rm -rf $(PACKAGE_DOCNAME)/
-	if ! test -f $(top_srcdir)/doc/$(PACKAGE_DOCNAME).tar.bz2 ; then \
-	   mv $(PACKAGE_DOCNAME).tar.bz2 $(top_srcdir)/doc; \
-	fi
-
-clean-local: doc-clean
-
-else
-
-doc:
-	@echo "Documentation not built. Run ./configure --help"
-
-endif
-
-docsdir = $(docdir)-$(MAJOR_NR).$(MINOR_NR)
-docs_DATA = $(top_builddir)/LICENSE
-
-dist_man1_MANS = \
-man/man1/image_to_j2k.1 \
-man/man1/j2k_dump.1 \
-man/man1/j2k_to_image.1
-
-dist_man3_MANS = \
-man/man3/libopenjpeg.3
-
-install-data-hook:
-	@echo -e " (MAN)\t$(man1dir)/image_to_j2k.1" >> $(top_builddir)/report.txt
-	@echo -e " (MAN)\t$(man1dir)/j2k_dump.1" >> $(top_builddir)/report.txt
-	@echo -e " (MAN)\t$(man1dir)/j2k_to_image.1" >> $(top_builddir)/report.txt
-	@echo -e " (MAN)\t$(man3dir)/libopenjpeg.3" >> $(top_builddir)/report.txt
-if WANT_JPWL
-	cd $(DESTDIR)$(man1dir) && \
-	  rm -f jpwl_image_to_j2k.1 && \
-	  $(LN_S) image_to_j2k.1 jpwl_image_to_j2k.1
-	cd $(DESTDIR)$(man1dir) && \
-	  rm -f jpwl_j2k_to_image.1 && \
-	  $(LN_S) j2k_to_image.1 jpwl_j2k_to_image.1
-	cd $(DESTDIR)$(man3dir) && \
-	  rm -f jpwl_libopenjpeg.3 && \
-	  $(LN_S) libopenjpeg.3 jpwl_libopenjpeg.3
-	@echo -e " (LN)\t$(man1dir)/jpwl_image_to_j2k.1" >> $(top_builddir)/report.txt
-	@echo -e " (LN)\t$(man1dir)//jpwl_j2k_to_image.1" >> $(top_builddir)/report.txt
-	@echo -e " (LN)\t$(man3dir)/jpwl_libopenjpeg.3" >> $(top_builddir)/report.txt
-endif
-
-uninstall-hook:
-if WANT_JPWL
-	rm -f $(DESTDIR)$(man1dir)/jpwl_image_to_j2k.1
-	rm -f $(DESTDIR)$(man1dir)/jpwl_j2k_to_image.1
-	rm -f $(DESTDIR)$(man3dir)/jpwl_libopenjpeg.3
-endif
-
-EXTRA_DIST = \
-CMakeLists.txt \
-Doxyfile.dox

doc/mainpage.dox.in

@@ -1,7 +1,7 @@
 /*
- * $Id: mainpage.dox.cmake 2011-09-21 Mickael Savinaud $
+ * $Id$
  *
- * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2011, Mickael Savinaud, Communications & Systemes <mickael.savinaud@c-s.fr>
  * All rights reserved.
  *
@@ -26,30 +26,30 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
- 
+
 /*! \mainpage OpenJPEG v@OPENJPEG_VERSION@ Documentation
 *
 * \section intro Introduction
 * This manual documents the low-level OpenJPEG C API.\n
 * The OpenJPEG library is an open-source JPEG 2000 library developed in order to promote the use of JPEG 2000.\n
-* This documents is focused on the main part of the library which try to implement Part 1 and Part 2 of the JPEG2000 norm.\n 
+* This documents is focused on the main part of the library which try to implement Part 1 and Part 2 of the JPEG2000 norm.\n
 *
 * \section home Home page
 *
 * The Home Page of the OpenJPEG library can be found at:
 *
 * http://code.google.com/p/openjpeg/
-* 
+*
 * More information about the OpenJPEG library is available here:
 *
 * http://www.openjpeg.org/
-* 
+*
 * The OpenJPEG mailing list is located here:
-* 
+*
 * http://groups.google.com/group/openjpeg
-* 
+*
 * All the source code is online and can be retrieved using svn from here:
-* 
+*
 * http://openjpeg.googlecode.com/svn/
 *
 * \section license License
@@ -59,4 +59,4 @@
 *
 * \author OpenJPEG Team
 *
-*/
+*/

doc/man/man1/opj_compress.1

@@ -29,10 +29,10 @@
 .SP
 .fi
 ..
-.TH image_to_j2k 1 "Version 1.4.0" "image_to_j2k" "converts to jpeg2000 files"
+.TH opj_compress 1 "Version 1.4.0" "opj_compress" "converts to jpeg2000 files"
 .P
 .SH NAME
-image_to_j2k - 
+opj_compress - 
 This program reads in an image of a certain type and converts it to a
 jpeg2000 file. It is part of the OpenJPEG library.
 .SP
@@ -43,13 +43,13 @@ Valid output image extensions are
 .B .j2k, .jp2
 .SH SYNOPSIS
 .P
-.B image_to_j2k -i \fRinfile.bmp \fB-o \fRoutfile.j2k
+.B opj_compress -i \fRinfile.bmp \fB-o \fRoutfile.j2k
 .P
-.B image_to_j2k -ImgDir \fRdirectory_name \fB-OutFor \fRjp2
+.B opj_compress -ImgDir \fRdirectory_name \fB-OutFor \fRjp2
 .P
-.B image_to_j2k -h \fRPrint a help message and exit.
+.B opj_compress -h \fRPrint a help message and exit.
 .P
-See JPWL OPTIONS for special options
+.R See JPWL OPTIONS for special options
 .SH OPTIONS
 .TP
 .B \-\^b " n,n"
@@ -194,18 +194,18 @@ Options usable only if the library has been compiled with \fB-DUSE_JPWL\fR
 .P
 .SH EXAMPLES
 .P
-.B image_to_j2k -i \fRfile.bmp \fB-o \fRfile.j2k \fB-r \fR20,10,1 (compress 20x, then 10x, then lossless).
+.B opj_compress -i \fRfile.bmp \fB-o \fRfile.j2k \fB-r \fR20,10,1 (compress 20x, then 10x, then lossless).
 .P
-.B image_to_j2k -i \fRfile.ppm \fB-o \fRfile.j2k \fB-q \fR30,40,50
+.B opj_compress -i \fRfile.ppm \fB-o \fRfile.j2k \fB-q \fR30,40,50
 .P
-.B image_to_j2k -i \fRfile.pgx \fB-o \fRfile.j2k \fB-POC \fRT1=0,0,1,5,3,CPRL
+.B opj_compress -i \fRfile.pgx \fB-o \fRfile.j2k \fB-POC \fRT1=0,0,1,5,3,CPRL
 .P
-.B image_to_j2k -i \fRlena.raw \fB-o \fRlena.j2k \fB-F \fR512,512,3,8,u
+.B opj_compress -i \fRlena.raw \fB-o \fRlena.j2k \fB-F \fR512,512,3,8,u
 .P
 .SH AUTHORS
-Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
 .br
-Copyright (c) 2002-2007, Professor Benoit Macq
+Copyright (c) 2002-2014, Professor Benoit Macq
 .br
 Copyright (c) 2001-2003, David Janssens
 .br
@@ -218,5 +218,5 @@ Copyright (c) 2005, Herve Drolon, FreeImage Team
 Copyright (c) 2006-2007, Parvatha Elangovan
 .P
 .SH "SEE ALSO"
-j2k_to_image(1) j2k_dump(1)
+opj_decompress(1) opj_dump(1)
 

doc/man/man1/opj_decompress.1

@@ -29,10 +29,10 @@
 .SP
 .fi
 ..
-.TH j2k_to_image 1 "Version 1.4.0" "j2k_to_image" "converts jpeg2000 files"
+.TH opj_decompress 1 "Version 1.4.0" "opj_decompress" "converts jpeg2000 files"
 .P
 .SH NAME
-j2k_to_image - 
+opj_decompress - 
 This program reads in a jpeg2000 image and converts it to another 
 image type. It is part of the OpenJPEG library.
 .SP
@@ -43,13 +43,13 @@ Valid output image extensions are
 .B .bmp, .pgm, .pgx, .png, .pnm, .ppm, .raw, .tga, .tif \fR. For PNG resp. TIF it needs libpng resp. libtiff .
 .SH SYNOPSIS
 .P
-.B j2k_to_image -i \fRinfile.j2k \fB-o \fRoutfile.png
+.B opj_decompress -i \fRinfile.j2k \fB-o \fRoutfile.png
 .P
-.B j2k_to_image -ImgDir \fRimages/ \fB-OutFor \fRbmp
+.B opj_decompress -ImgDir \fRimages/ \fB-OutFor \fRbmp
 .P
-.B j2k_to_image -h  \fRPrint help message and exit
+.B opj_decompress -h  \fRPrint help message and exit
 .P
-See JPWL OPTIONS for special options
+.R See JPWL OPTIONS for special options
 .SH OPTIONS
 .TP
 .B \-\^i "name"
@@ -91,9 +91,9 @@ Set the maximum number of quality layers to decode. If there are less quality la
 .P
 '\".SH BUGS
 .SH AUTHORS
-Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
 .br
-Copyright (c) 2002-2007, Professor Benoit Macq
+Copyright (c) 2002-2014, Professor Benoit Macq
 .br
 Copyright (c) 2001-2003, David Janssens
 .br
@@ -106,4 +106,4 @@ Copyright (c) 2005, Herve Drolon, FreeImage Team
 Copyright (c) 2006-2007, Parvatha Elangovan
 .P
 .SH "SEE ALSO"
-image_to_j2k(1) j2k_dump(1)
+opj_compress(1) opj_dump(1)

doc/man/man1/opj_dump.1

@@ -29,10 +29,10 @@
 .SP
 .fi
 ..
-.TH j2k_dump 1 "Version 1.4.0" "j2k_dump" "dumps jpeg2000 files"
+.TH opj_dump 1 "Version 1.4.0" "opj_dump" "dumps jpeg2000 files"
 .P
 .SH NAME
-j2k_dump - 
+opj_dump - 
 This program reads in a jpeg2000 image and dumps the contents to stdout. It is part of the OpenJPEG library.
 .SP
 Valid input image extensions are
@@ -40,11 +40,11 @@ Valid input image extensions are
 .SP
 .SH SYNOPSIS
 .P
-.B j2k_dump -i \fRinfile.j2k 
+.B opj_dump -i \fRinfile.j2k 
 .P
-.B j2k_dump -ImgDir \fRimages/ \fRDump all files in images/
+.B opj_dump -ImgDir \fRimages/ \fRDump all files in images/
 .P
-.B j2k_dump -h  \fRPrint help message and exit
+.B opj_dump -h  \fRPrint help message and exit
 .P
 .SH OPTIONS
 .TP
@@ -56,7 +56,7 @@ Valid input image extensions are
 .P
 '\".SH BUGS
 .SH AUTHORS
-Copyright (c) 20010, Mathieu Malaterre
+Copyright (c) 2010, Mathieu Malaterre
 .P
 .SH "SEE ALSO"
-image_to_j2k(1) j2k_to_image(1)
+opj_compress(1) opj_decompress(1)

doc/man/man3/libopenjp2.3

@@ -29,10 +29,10 @@
 .SP
 .fi
 ..
-.TH libopenjpeg 3 "Oct 2010" "Version 1.4.0" "Oct 2010"
+.TH libopenjp2 3 "Oct 2010" "Version 1.4.0" "Oct 2010"
 .P
 .SH NAME
-libopenjpeg - 
+libopenjp2 -
 a library for reading and writing JPEG2000 image files.
 .SP
 .SH SYNOPSIS
@@ -124,7 +124,7 @@ a library for reading and writing JPEG2000 image files.
 .B CLRSPC_UNKNOWN\fR or \fBCLRSPC_UNSPECIFIED\fR or \fBCLRSPC_SRGB\fR or \fBCLRSPC_GRAY\fR or \fBCLRSPC_SYCC
 .P
 .SH DECOMPRESSION PARAMETERS
-.P
+.p
 typedef struct opj_dparameters 
 .br
 {
@@ -313,9 +313,9 @@ typedef struct opj_cparameters
 '\".SH OPTIONS
 '\".SH BUGS
 .SH AUTHORS
-Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
 
-Copyright (c) 2002-2007, Professor Benoit Macq
+Copyright (c) 2002-2014, Professor Benoit Macq
 
 Copyright (c) 2001-2003, David Janssens
 

doc/openjpip.dox.in

@@ -1,8 +1,8 @@
 /*
- * $Id: mainpage.h 47 2011-02-17 16:57:49Z kaori $
+ * $Id$
  *
- * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2011, Professor Benoit Macq
+ * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2010-2011, Kaori Hagihara
  * All rights reserved.
  *
@@ -28,7 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*! \mainpage OpenJPIP v2.1 Documentation
+/*! \page openjpippage OpenJPIP v@OPENJPEG_VERSION@ Documentation
  *
  * \section intro Introduction
  * This manual documents the low-level OpenJPIP C API.\n
@@ -36,12 +36,11 @@
  * ( For more info about JPIP, check the website: http://www.jpeg.org/jpeg2000/j2kpart9.html)\n
  *
  * This whole documents covers the following six programs.\n
- * - opj_server.c     JPIP server supporting HTTP connection and JPT/JPP-stream
- * - opj_dec_server.c Server to decode JPT/JPP-stream and communicate locally with JPIP client, which is coded in java
- * - addXMLinJP2.c    To Embed metadata into JP2 file
- * - jpip_to_jp2.c    To Convert JPT/JPP-stream to JP2
- * - jpip_to_j2k.c    To Convert JPT/JPP-stream to J2K
- * - test_index.c     To test index code format of a JP2 file
+ * - opj_server.c          JPIP server supporting HTTP connection and JPT/JPP-stream
+ * - opj_dec_server.c      Server to decode JPT/JPP-stream and communicate locally with JPIP client, which is coded in java
+ * - opj_jpip_addxml.c     To Embed metadata into JP2 file
+ * - opj_jpip_transcode.c  To Convert JPT/JPP-stream to JP2 or J2K
+ * - opj_jpip_test.c       To test index code format of a JP2 file
  *
  * \section license License
  * This software is released under the BSD license, anybody can use or modify the library, even for commercial applications.\n

libopenjpeg-jpwl.pc.in

@@ -1,13 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@/openjpeg-@MAJOR_NR@.@MINOR_NR@
-
-Name: openjpeg
-Description: JPEG2000 Wireless (Part 11 - JPWL) library
-URL: http://www.openjpeg.org/
-Version: @VERSION@
-@pkgconfig_requires_private@: @requirements@
-Libs: -L${libdir} -lopenjpeg_JPWL
-Libs.private: -lm
-Cflags: -I${includedir}

libopenjpeg/CMakeLists.txt

@@ -1,73 +0,0 @@
-INCLUDE_REGULAR_EXPRESSION("^.*$")
-# Defines the source code for the library
-SET(OPENJPEG_SRCS
-  ${CMAKE_CURRENT_SOURCE_DIR}/bio.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/cio.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/dwt.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/event.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/image.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/j2k.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/j2k_lib.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/jp2.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/jpt.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/mct.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/mqc.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/openjpeg.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/pi.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/raw.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/t1.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/t2.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/tcd.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/tgt.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/cidx_manager.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/phix_manager.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/ppix_manager.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/thix_manager.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/tpix_manager.c
-)
-
-# Build the library
-IF(WIN32)
-  IF(BUILD_SHARED_LIBS)
-    ADD_DEFINITIONS(-DOPJ_EXPORTS)
-  ELSE(BUILD_SHARED_LIBS)
-    ADD_DEFINITIONS(-DOPJ_STATIC)
-  ENDIF(BUILD_SHARED_LIBS)
-ENDIF(WIN32)
-ADD_LIBRARY(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS})
-IF(UNIX)
-  TARGET_LINK_LIBRARIES(${OPENJPEG_LIBRARY_NAME} m)
-ENDIF(UNIX)
-SET_TARGET_PROPERTIES(${OPENJPEG_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
-IF(${CMAKE_VERSION} VERSION_GREATER "2.8.11")
-  TARGET_COMPILE_OPTIONS(${OPENJPEG_LIBRARY_NAME} PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS})
-ENDIF()
-# Build the JPWL library ?
-IF(BUILD_JPWL)
- ADD_SUBDIRECTORY(jpwl)
-ENDIF(BUILD_JPWL)
-
-# Install library
-INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME}
-  EXPORT OpenJPEGTargets
-  RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
-  LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
-  ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
-)
-
-# Install includes files
-INSTALL(FILES openjpeg.h
-  DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers
-)
-
-# install man page of the library
-INSTALL(
-  FILES       ${OPENJPEG_SOURCE_DIR}/doc/man/man3/libopenjpeg.3
-  DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man3)
-
-# internal utilities to generate t1_luts.h
-# no need to install:
-ADD_EXECUTABLE(t1_generate_luts t1_generate_luts.c)
-IF(UNIX)
-  TARGET_LINK_LIBRARIES(t1_generate_luts m)
-ENDIF()

libopenjpeg/Makefile.am

@@ -1,106 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS = .
-
-if WANT_JPWL
-SUBDIRS += jpwl
-endif
-
-includesdir = $(includedir)/openjpeg-$(MAJOR_NR).$(MINOR_NR)
-includes_HEADERS = openjpeg.h
-
-lib_LTLIBRARIES = libopenjpeg.la
-
-libopenjpeg_la_CPPFLAGS = \
--I. \
--I$(top_srcdir)/libopenjpeg \
--I$(top_builddir)/libopenjpeg
-libopenjpeg_la_CFLAGS =
-libopenjpeg_la_LIBADD = -lm
-libopenjpeg_la_LDFLAGS = -no-undefined -version-info @lt_version@
-
-libopenjpeg_la_SOURCES = \
-bio.c \
-cio.c \
-dwt.c \
-event.c \
-image.c \
-j2k.c \
-j2k_lib.c \
-jp2.c \
-jpt.c \
-mct.c \
-mqc.c \
-openjpeg.c \
-pi.c \
-raw.c \
-t1.c \
-t2.c \
-tcd.c \
-tgt.c \
-cidx_manager.c \
-phix_manager.c \
-ppix_manager.c \
-thix_manager.c \
-tpix_manager.c \
-bio.h \
-cio.h \
-dwt.h \
-event.h \
-fix.h \
-image.h \
-indexbox_manager.h \
-int.h \
-j2k.h \
-j2k_lib.h \
-jp2.h \
-jpt.h \
-mct.h \
-mqc.h \
-opj_includes.h \
-opj_malloc.h \
-pi.h \
-raw.h \
-t1.h \
-t1_luts.h \
-t2.h \
-tcd.h \
-tgt.h \
-cidx_manager.h
-
-EXTRA_DIST = \
-CMakeLists.txt
-
-install-data-hook:
-	cd $(DESTDIR)$(includedir) && rm -f openjpeg.h
-	@rm -rf $(top_builddir)/report.txt
-	@echo -e " (LA)\t$(libdir)/libopenjpeg.la" >> $(top_builddir)/report.txt
-if BUILD_SHARED
-	@( $(call solist) ) >> $(top_builddir)/report.txt
-endif
-if BUILD_STATIC
-	@echo -e " (A)\t$(base)/$(a)" >> $(top_builddir)/report.txt
-endif
-	@echo -e " (H)\t$(includedir)/openjpeg-$(MAJOR_NR).$(MINOR_NR)/openjpeg.h" >> $(top_builddir)/report.txt
-
-uninstall-hook:
-	rm -f $(DESTDIR)$(includedir)/openjpeg.h
-
-solist    = $(foreach f, $(dll) $(so), echo -e ' $(SO_PREFIX)\t$(base)/$(f)' ;)
-get_tok   = $(shell grep -E "^$(1)=" $(lib_LTLIBRARIES) | cut -d "'" -f 2)
-base      = $(call get_tok,libdir)
-so        = $(call get_tok,library_names)
-a         = $(call get_tok,old_library)
-
-if HAVE_WIN32
-SO_PREFIX = (DLL)
-dll       = $(call get_tok,dlname)
-else
-if HAVE_DARWIN
-SO_PREFIX = (DY)
-dll       =
-else
-SO_PREFIX = (SO)
-dll       =
-endif
-endif

libopenjpeg/cidx_manager.c

@@ -1,211 +0,0 @@
-/*
- * $Id: cidx_manager.c 897 2011-08-28 21:43:57Z Kaori.Hagihara@gmail.com $
- *
- * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2011, Professor Benoit Macq
- * Copyright (c) 2003-2004, Yannick Verschueren
- * Copyright (c) 2010-2011, Kaori Hagihara
- * 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.
- */
-
-#include "opj_includes.h"
-
-
-/* 
- * Write CPTR Codestream finder box
- *
- * @param[in] coff offset of j2k codestream
- * @param[in] clen length of j2k codestream
- * @param[in] cio  file output handle
- */
-void write_cptr(int coff, int clen, opj_cio_t *cio);
-
-
-/* 
- * Write main header index table (box)
- *
- * @param[in] coff offset of j2k codestream
- * @param[in] cstr_info codestream information
- * @param[in] cio  file output handle
- * @return         length of mainmhix box
- */
-int write_mainmhix( int coff, opj_codestream_info_t cstr_info, opj_cio_t *cio);
-
-
-/* 
- * Check if EPH option is used
- *
- * @param[in] coff    offset of j2k codestream
- * @param[in] markers marker information
- * @param[in] marknum number of markers
- * @param[in] cio     file output handle
- * @return            true if EPH is used
- */
-opj_bool check_EPHuse( int coff, opj_marker_info_t *markers, int marknum, opj_cio_t *cio);
-
-
-int write_cidx( int offset, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t cstr_info, int j2klen)
-{
-  int len, i, lenp;
-  opj_jp2_box_t *box;
-  int num_box = 0;
-  opj_bool  EPHused;
-  (void)image; /* unused ? */
-
-  lenp = -1;
-  box = (opj_jp2_box_t *)opj_calloc( 32, sizeof(opj_jp2_box_t));
-
-  for (i=0;i<2;i++){
-  
-    if(i)
-      cio_seek( cio, lenp);
-
-    lenp = cio_tell( cio);
-
-    cio_skip( cio, 4);              /* L [at the end] */
-    cio_write( cio, JPIP_CIDX, 4);  /* CIDX           */
-    write_cptr( offset, cstr_info.codestream_size, cio);
-
-    write_manf( i, num_box, box, cio);
-    
-    num_box = 0;
-    box[num_box].length = write_mainmhix( offset, cstr_info, cio);
-    box[num_box].type = JPIP_MHIX;
-    num_box++;
-
-    box[num_box].length = write_tpix( offset, cstr_info, j2klen, cio);
-    box[num_box].type = JPIP_TPIX;
-    num_box++;
-      
-    box[num_box].length = write_thix( offset, cstr_info, cio);
-    box[num_box].type = JPIP_THIX;
-    num_box++;
-
-    EPHused = check_EPHuse( offset, cstr_info.marker, cstr_info.marknum, cio);
-      
-    box[num_box].length = write_ppix( offset, cstr_info, EPHused, j2klen, cio);
-    box[num_box].type = JPIP_PPIX;
-    num_box++;
-    
-    box[num_box].length = write_phix( offset, cstr_info, EPHused, j2klen, cio);
-    box[num_box].type = JPIP_PHIX;
-    num_box++;
-      
-    len = cio_tell( cio)-lenp;
-    cio_seek( cio, lenp);
-    cio_write( cio, len, 4);        /* L             */
-    cio_seek( cio, lenp+len);
-  }
-
-  opj_free( box);
-  
-  return len;
-}
-
-void write_cptr(int coff, int clen, opj_cio_t *cio)
-{
-  int len, lenp;
-
-  lenp = cio_tell( cio);
-  cio_skip( cio, 4);               /* L [at the end]     */
-  cio_write( cio, JPIP_CPTR, 4);   /* T                  */
-  cio_write( cio, 0, 2);           /* DR  A PRECISER !!  */
-  cio_write( cio, 0, 2);           /* CONT               */
-  cio_write( cio, coff, 8);    /* COFF A PRECISER !! */
-  cio_write( cio, clen, 8);    /* CLEN               */
-  len = cio_tell( cio) - lenp;
-  cio_seek( cio, lenp);
-  cio_write( cio, len, 4);         /* L                  */
-  cio_seek( cio, lenp+len);
-}
-
-void write_manf(int second, int v, opj_jp2_box_t *box, opj_cio_t *cio)
-{
-  int len, lenp, i;
-  
-  lenp = cio_tell( cio); 
-  cio_skip( cio, 4);                         /* L [at the end]                    */
-  cio_write( cio, JPIP_MANF,4);              /* T                                 */
-
-  if (second){                          /* Write only during the second pass */
-    for( i=0; i<v; i++){
-      cio_write( cio, box[i].length, 4);  /* Box length                     */ 
-      cio_write( cio, box[i].type, 4); /* Box type                       */
-    }
-  }
-
-  len = cio_tell( cio) - lenp;
-  cio_seek( cio, lenp);
-  cio_write( cio, len, 4);                   /* L                                 */
-  cio_seek( cio, lenp+len);
-}
-
-int write_mainmhix( int coff, opj_codestream_info_t cstr_info, opj_cio_t *cio)
-{
-  int i;
-  int len, lenp;
-  
-  lenp = cio_tell( cio);
-  cio_skip( cio, 4);                               /* L [at the end]                    */
-  cio_write( cio, JPIP_MHIX, 4);                   /* MHIX                              */
-
-  cio_write( cio, cstr_info.main_head_end-cstr_info.main_head_start+1, 8);        /* TLEN                              */
-
-  for(i = 1; i < cstr_info.marknum; i++){    /* Marker restricted to 1 apparition, skip SOC marker */
-    cio_write( cio, cstr_info.marker[i].type, 2);
-    cio_write( cio, 0, 2);
-    cio_write( cio, cstr_info.marker[i].pos-coff, 8);
-    cio_write( cio, cstr_info.marker[i].len, 2);
-  }
-
-  len = cio_tell( cio) - lenp;
-  cio_seek( cio, lenp);
-  cio_write( cio, len, 4);        /* L           */
-  cio_seek( cio, lenp+len);
-  
-  return len;
-}
-
-opj_bool check_EPHuse( int coff, opj_marker_info_t *markers, int marknum, opj_cio_t *cio)
-{
-  opj_bool EPHused = OPJ_FALSE;
-  int i=0;
-  int org_pos;
-  unsigned int Scod;
-
-  for(i = 0; i < marknum; i++){
-    if( markers[i].type == J2K_MS_COD){
-      org_pos = cio_tell( cio);
-      cio_seek( cio, coff+markers[i].pos+2);
-      
-      Scod = cio_read( cio, 1);
-      if( ((Scod >> 2) & 1))
-	EPHused = OPJ_TRUE;
-      cio_seek( cio, org_pos);
-
-      break;
-    }
-  }    
-  return EPHused;
-}

libopenjpeg/jpwl/CMakeLists.txt

@@ -1,40 +0,0 @@
-# Makefile for the main JPWL OpenJPEG codecs: JPWL_ j2k_to_image and JPWL_image_to_j2k
-
-ADD_DEFINITIONS(-DUSE_JPWL)
-
-SET(JPWL_SRCS crc.c jpwl.c jpwl_lib.c rs.c)
-IF(APPLE)
-  SET_SOURCE_FILES_PROPERTIES(
-    rs.c
-    PROPERTIES
-    COMPILE_FLAGS -fno-common)
-ENDIF(APPLE)
-
-INCLUDE_DIRECTORIES(
-  ${OPENJPEG_SOURCE_DIR}/libopenjpeg
-  )
-
-# Build the library
-IF(WIN32)
-  IF(BUILD_SHARED_LIBS)
-    ADD_DEFINITIONS(-DOPJ_EXPORTS)
-  ELSE(BUILD_SHARED_LIBS)
-    ADD_DEFINITIONS(-DOPJ_STATIC)
-  ENDIF(BUILD_SHARED_LIBS)
-ENDIF(WIN32)
-ADD_LIBRARY(${OPENJPEG_LIBRARY_NAME}_JPWL ${JPWL_SRCS} ${OPENJPEG_SRCS})
-IF(UNIX)
-  TARGET_LINK_LIBRARIES(${OPENJPEG_LIBRARY_NAME}_JPWL m)
-ENDIF(UNIX)
-SET_TARGET_PROPERTIES(${OPENJPEG_LIBRARY_NAME}_JPWL PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
-IF(${CMAKE_VERSION} VERSION_GREATER "2.8.11")
-  TARGET_COMPILE_OPTIONS(${OPENJPEG_LIBRARY_NAME}_JPWL PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS})
-ENDIF()
-
-# Install library
-INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME}_JPWL
-  EXPORT OpenJPEGTargets
-  RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
-  LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
-  ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
-)

libopenjpeg/jpwl/Makefile.am

@@ -1,76 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-lib_LTLIBRARIES = libopenjpeg_JPWL.la
-
-OPJ_SRC = \
-../bio.c \
-../cio.c \
-../dwt.c \
-../event.c \
-../image.c \
-../j2k.c \
-../j2k_lib.c \
-../jp2.c \
-../jpt.c \
-../mct.c \
-../mqc.c \
-../openjpeg.c \
-../pi.c \
-../raw.c \
-../t1.c \
-../t2.c \
-../tcd.c \
-../tgt.c \
-../cidx_manager.c \
-../phix_manager.c \
-../ppix_manager.c \
-../thix_manager.c \
-../tpix_manager.c
-
-libopenjpeg_JPWL_la_CPPFLAGS = \
--I. \
--I$(top_srcdir)/libopenjpeg \
--I$(top_builddir)/libopenjpeg \
--I$(top_srcdir)/libopenjpeg/jpwl \
--I$(top_builddir)/libopenjpeg/jpwl \
--DUSE_JPWL
-libopenjpeg_JPWL_la_CFLAGS =
-libopenjpeg_JPWL_la_LIBADD = -lm
-libopenjpeg_JPWL_la_LDFLAGS = -no-undefined -version-info @lt_version@
-libopenjpeg_JPWL_la_SOURCES = \
-$(OPJ_SRC) \
-crc.c \
-jpwl.c \
-jpwl_lib.c \
-rs.c \
-crc.h \
-jpwl.h \
-rs.h
-
-install-data-hook:
-	@echo -e " (LA)\t$(libdir)/libopenjpeg_JPWL.la" >> $(top_builddir)/report.txt
-if BUILD_SHARED
-	@( $(call solist) ) >> $(top_builddir)/report.txt
-endif
-if BUILD_STATIC
-	@echo -e " (A)\t$(base)/$(a)" >> $(top_builddir)/report.txt
-endif
-
-solist    = $(foreach f, $(dll) $(so), echo -e ' $(SO_PREFIX)\t$(base)/$(f)' ;)
-get_tok   = $(shell grep -E "^$(1)=" $(lib_LTLIBRARIES) | cut -d "'" -f 2)
-base      = $(call get_tok,libdir)
-so        = $(call get_tok,library_names)
-a         = $(call get_tok,old_library)
-
-if HAVE_WIN32
-SO_PREFIX = (DLL)
-dll       = $(call get_tok,dlname)
-else
-if HAVE_DARWIN
-SO_PREFIX = (DY)
-dll       =
-else
-SO_PREFIX = (SO)
-dll       =
-endif
-endif

libopenjpeg/phix_manager.c

@@ -1,170 +0,0 @@
-/*
- * $Id: phix_manager.c 897 2011-08-28 21:43:57Z Kaori.Hagihara@gmail.com $
- *
- * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2011, Professor Benoit Macq
- * Copyright (c) 2003-2004, Yannick Verschueren
- * Copyright (c) 2010-2011, Kaori Hagihara
- * 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.
- */
-
-/*! \file
- *  \brief Modification of jpip.c from 2KAN indexer
- */
-
-#include <stdlib.h>
-#include <math.h>
-#include "opj_includes.h"
-
-/* 
- * Write faix box of phix
- *
- * @param[in] coff      offset of j2k codestream
- * @param[in] compno    component number
- * @param[in] cstr_info codestream information
- * @param[in] EPHused   true if if EPH option used
- * @param[in] j2klen    length of j2k codestream
- * @param[in] cio       file output handle
- * @return              length of faix box
- */
-int write_phixfaix( int coff, int compno, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_cio_t *cio);
-
-int write_phix( int coff, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_cio_t *cio)
-{
-  int len, lenp=0, compno, i;
-  opj_jp2_box_t *box;
-
-  box = (opj_jp2_box_t *)opj_calloc( cstr_info.numcomps, sizeof(opj_jp2_box_t));
-  
-  for( i=0;i<2;i++){
-    if (i) cio_seek( cio, lenp);
-      
-    lenp = cio_tell( cio);
-    cio_skip( cio, 4);              /* L [at the end] */
-    cio_write( cio, JPIP_PHIX, 4);  /* PHIX           */
-      
-    write_manf( i, cstr_info.numcomps, box, cio);
-
-    for( compno=0; compno<cstr_info.numcomps; compno++){       
-      box[compno].length = write_phixfaix( coff, compno, cstr_info, EPHused, j2klen, cio);
-      box[compno].type = JPIP_FAIX;
-    }
-
-    len = cio_tell( cio)-lenp;
-    cio_seek( cio, lenp);
-    cio_write( cio, len, 4);        /* L              */
-    cio_seek( cio, lenp+len);
-  }
-
-  opj_free(box);
-
-  return len;
-}
-
-int write_phixfaix( int coff, int compno, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_cio_t *cio)
-{
-  int len, lenp, tileno, version, i, nmax, size_of_coding; /* 4 or 8 */
-  opj_tile_info_t *tile_Idx;
-  opj_packet_info_t packet;
-  int resno, precno, layno, num_packet;
-  int numOfres, numOfprec, numOflayers;
-  packet.end_ph_pos = packet.start_pos = -1;
-  (void)EPHused; /* unused ? */
-
-  if( j2klen > pow( 2, 32)){
-    size_of_coding =  8;
-    version = 1;
-  }
-  else{
-    size_of_coding = 4;
-    version = 0;
-  }
-
-  lenp = cio_tell( cio);
-  cio_skip( cio, 4);              /* L [at the end]      */
-  cio_write( cio, JPIP_FAIX, 4);  /* FAIX                */ 
-  cio_write( cio, version,1);     /* Version 0 = 4 bytes */
-
-  nmax = 0;
-  for( i=0; i<=cstr_info.numdecompos[compno]; i++)
-    nmax += cstr_info.tile[0].ph[i] * cstr_info.tile[0].pw[i] * cstr_info.numlayers;
-  
-  cio_write( cio, nmax, size_of_coding); /* NMAX */
-  cio_write( cio, cstr_info.tw*cstr_info.th, size_of_coding);      /* M    */
-  
-  for( tileno=0; tileno<cstr_info.tw*cstr_info.th; tileno++){
-    tile_Idx = &cstr_info.tile[ tileno];
-    
-    num_packet = 0;
-    numOfres = cstr_info.numdecompos[compno] + 1;
-
-    for( resno=0; resno<numOfres ; resno++){
-      numOfprec = tile_Idx->pw[resno]*tile_Idx->ph[resno];
-      for( precno=0; precno<numOfprec; precno++){
-	numOflayers = cstr_info.numlayers;
-	for( layno=0; layno<numOflayers; layno++){
-	  
-	  switch ( cstr_info.prog){
-	  case LRCP:
-	    packet = tile_Idx->packet[ ((layno*numOfres+resno)*cstr_info.numcomps+compno)*numOfprec+precno];
-	    break;
-	  case RLCP:
-	    packet = tile_Idx->packet[ ((resno*numOflayers+layno)*cstr_info.numcomps+compno)*numOfprec+precno];
-	    break;
-	  case RPCL:
-	    packet = tile_Idx->packet[ ((resno*numOfprec+precno)*cstr_info.numcomps+compno)*numOflayers+layno];
-	    break;
-	  case PCRL:
-	    packet = tile_Idx->packet[ ((precno*cstr_info.numcomps+compno)*numOfres+resno)*numOflayers + layno];
-	    break;
-	  case CPRL:
-	    packet = tile_Idx->packet[ ((compno*numOfprec+precno)*numOfres+resno)*numOflayers + layno];
-	    break;
-	  default:
-	    fprintf( stderr, "failed to ppix indexing\n");
-	  }
-
-	  cio_write( cio, packet.start_pos-coff, size_of_coding);                /* start position */
-	  cio_write( cio, packet.end_ph_pos-packet.start_pos+1, size_of_coding); /* length         */
-	  
-	  num_packet++;
-	}
-      }
-    }
-
-    /* PADDING */
-    while( num_packet < nmax){
-      cio_write( cio, 0, size_of_coding); /* start position            */
-      cio_write( cio, 0, size_of_coding); /* length                    */
-      num_packet++;
-    }
-  }
-
-  len = cio_tell( cio)-lenp;
-  cio_seek( cio, lenp);
-  cio_write( cio, len, 4);        /* L  */
-  cio_seek( cio, lenp+len);
-
-  return len;
-}

libopenjpeg/thix_manager.c

@@ -1,120 +0,0 @@
-/*
- * $Id: thix_manager.c 897 2011-08-28 21:43:57Z Kaori.Hagihara@gmail.com $
- *
- * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2011, Professor Benoit Macq
- * Copyright (c) 2003-2004, Yannick Verschueren
- * Copyright (c) 2010-2011, Kaori Hagihara
- * 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.
- */
-
-/*! \file
- *  \brief Modification of jpip.c from 2KAN indexer
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include "opj_includes.h"
-
-/* 
- * Write tile-part headers mhix box
- *
- * @param[in] coff      offset of j2k codestream
- * @param[in] cstr_info codestream information
- * @param[in] tileno    tile number
- * @param[in] cio       file output handle
- * @return              length of mhix box
- */
-int write_tilemhix( int coff, opj_codestream_info_t cstr_info, int tileno, opj_cio_t *cio);
-
-int write_thix( int coff, opj_codestream_info_t cstr_info, opj_cio_t *cio)
-{
-  int len, lenp, i;
-  int tileno;
-  opj_jp2_box_t *box;
-
-  lenp = 0;
-  box = (opj_jp2_box_t *)opj_calloc( cstr_info.tw*cstr_info.th, sizeof(opj_jp2_box_t));
-
-  for ( i = 0; i < 2 ; i++ ){
-    if (i)
-      cio_seek( cio, lenp);
-
-    lenp = cio_tell( cio);
-    cio_skip( cio, 4);              /* L [at the end] */
-    cio_write( cio, JPIP_THIX, 4);  /* THIX           */
-    write_manf( i, cstr_info.tw*cstr_info.th, box, cio);
-    
-    for (tileno = 0; tileno < cstr_info.tw*cstr_info.th; tileno++){
-      box[tileno].length = write_tilemhix( coff, cstr_info, tileno, cio);
-      box[tileno].type = JPIP_MHIX;
-    }
- 
-    len = cio_tell( cio)-lenp;
-    cio_seek( cio, lenp);
-    cio_write( cio, len, 4);        /* L              */
-    cio_seek( cio, lenp+len);
-  }
-
-  opj_free(box);
-
-  return len;
-}
-
-int write_tilemhix( int coff, opj_codestream_info_t cstr_info, int tileno, opj_cio_t *cio)
-{
-  int i;
-  opj_tile_info_t tile;
-  opj_tp_info_t tp;
-  int len, lenp;
-  opj_marker_info_t *marker;
-
-  lenp = cio_tell( cio);
-  cio_skip( cio, 4);                               /* L [at the end]                    */
-  cio_write( cio, JPIP_MHIX, 4);                   /* MHIX                              */
-
-  tile = cstr_info.tile[tileno];
-  tp = tile.tp[0];
-
-  cio_write( cio, tp.tp_end_header-tp.tp_start_pos+1, 8);  /* TLEN                              */ 
-
-  marker = cstr_info.tile[tileno].marker;
-
-  for( i=0; i<cstr_info.tile[tileno].marknum; i++){             /* Marker restricted to 1 apparition */
-    cio_write( cio, marker[i].type, 2);
-    cio_write( cio, 0, 2);
-    cio_write( cio, marker[i].pos-coff, 8);
-    cio_write( cio, marker[i].len, 2);
-  }
-     
-  /*  free( marker);*/
-
-  len = cio_tell( cio) - lenp;
-  cio_seek( cio, lenp);
-  cio_write( cio, len, 4);        /* L           */
-  cio_seek( cio, lenp+len);
-
-  return len;
-}

libopenjpeg/tpix_manager.c

@@ -1,153 +0,0 @@
-/*
- * $Id: tpix_manager.c 897 2011-08-28 21:43:57Z Kaori.Hagihara@gmail.com $
- *
- * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2011, Professor Benoit Macq
- * Copyright (c) 2003-2004, Yannick Verschueren
- * Copyright (c) 2010-2011, Kaori Hagihara
- * 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.
- */
-
-/*! \file
- *  \brief Modification of jpip.c from 2KAN indexer
- */
-
-#include <math.h>
-#include "opj_includes.h"
-
-#define MAX(a,b) ((a)>(b)?(a):(b))
-
-
-/* 
- * Write faix box of tpix
- *
- * @param[in] coff offset of j2k codestream
- * @param[in] compno    component number
- * @param[in] cstr_info codestream information
- * @param[in] j2klen    length of j2k codestream
- * @param[in] cio       file output handle
- * @return              length of faix box
- */
-int write_tpixfaix( int coff, int compno, opj_codestream_info_t cstr_info, int j2klen, opj_cio_t *cio);
-
-
-int write_tpix( int coff, opj_codestream_info_t cstr_info, int j2klen, opj_cio_t *cio)
-{
-  int len, lenp;
-  lenp = cio_tell( cio);
-  cio_skip( cio, 4);              /* L [at the end] */
-  cio_write( cio, JPIP_TPIX, 4);  /* TPIX           */
-  
-  write_tpixfaix( coff, 0, cstr_info, j2klen, cio);
-
-  len = cio_tell( cio)-lenp;
-  cio_seek( cio, lenp);
-  cio_write( cio, len, 4);        /* L              */
-  cio_seek( cio, lenp+len);
-
-  return len;
-}
-
-
-/* 
- * Get number of maximum tile parts per tile
- *
- * @param[in] cstr_info codestream information
- * @return              number of maximum tile parts per tile
- */
-int get_num_max_tile_parts( opj_codestream_info_t cstr_info);
-
-int write_tpixfaix( int coff, int compno, opj_codestream_info_t cstr_info, int j2klen, opj_cio_t *cio)
-{
-  int len, lenp;
-  int i, j;
-  int Aux;
-  int num_max_tile_parts;
-  int size_of_coding; /* 4 or 8 */
-  opj_tp_info_t tp;
-  int version;
-
-  num_max_tile_parts = get_num_max_tile_parts( cstr_info);
-
-  if( j2klen > pow( 2, 32)){
-    size_of_coding =  8;
-    version = num_max_tile_parts == 1 ? 1:3;
-  }
-  else{
-    size_of_coding = 4;
-    version = num_max_tile_parts == 1 ? 0:2;
-  }
-
-  lenp = cio_tell( cio);
-  cio_skip( cio, 4);              /* L [at the end]      */
-  cio_write( cio, JPIP_FAIX, 4);  /* FAIX                */ 
-  cio_write( cio, version, 1);     /* Version 0 = 4 bytes */
-
-  cio_write( cio, num_max_tile_parts, size_of_coding);                      /* NMAX           */
-  cio_write( cio, cstr_info.tw*cstr_info.th, size_of_coding);                               /* M              */
-  for (i = 0; i < cstr_info.tw*cstr_info.th; i++){
-    for (j = 0; j < cstr_info.tile[i].num_tps; j++){
-      tp = cstr_info.tile[i].tp[j];
-      cio_write( cio, tp.tp_start_pos-coff, size_of_coding); /* start position */
-      cio_write( cio, tp.tp_end_pos-tp.tp_start_pos+1, size_of_coding);    /* length         */
-      if (version & 0x02){
-	if( cstr_info.tile[i].num_tps == 1 && cstr_info.numdecompos[compno] > 1)
-	  Aux = cstr_info.numdecompos[compno] + 1;
-	else
-	  Aux = j + 1;
-		  
-	cio_write( cio, Aux,4);
-	/*cio_write(img.tile[i].tile_parts[j].num_reso_AUX,4);*/ /* Aux_i,j : Auxiliary value */
-	/* fprintf(stderr,"AUX value %d\n",Aux);*/
-      }
-      /*cio_write(0,4);*/
-    }
-    /* PADDING */
-    while (j < num_max_tile_parts){
-      cio_write( cio, 0, size_of_coding); /* start position            */
-      cio_write( cio, 0, size_of_coding); /* length                    */
-      if (version & 0x02)
-	cio_write( cio, 0,4);                  /* Aux_i,j : Auxiliary value */
-      j++;
-    }
-  }
-  
-  len = cio_tell( cio)-lenp;
-  cio_seek( cio, lenp);
-  cio_write( cio, len, 4);        /* L  */
-  cio_seek( cio, lenp+len);
-
-  return len;
-
-}
-
-int get_num_max_tile_parts( opj_codestream_info_t cstr_info)
-{
-  int num_max_tp = 0, i;
-
-  for( i=0; i<cstr_info.tw*cstr_info.th; i++)
-    num_max_tp = MAX( cstr_info.tile[i].num_tps, num_max_tp);
-  
-  return num_max_tp;
-}

libopenjpeg1.pc.in

@@ -1,13 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@/openjpeg-@MAJOR_NR@.@MINOR_NR@
-
-Name: openjpeg
-Description: JPEG2000 library
-URL: http://www.openjpeg.org/
-Version: @VERSION@
-@pkgconfig_requires_private@: @requirements@
-Libs: -L${libdir} -lopenjpeg
-Libs.private: -lm
-Cflags: -I${includedir}

m4/opj_check_lib.m4

@@ -1,139 +0,0 @@
-dnl Copyright (C) 2011 Vincent Torri <vtorri at univ-evry dot fr>
-dnl That code is public domain and can be freely used or copied.
-
-dnl Macro that check if a library is in a specified directory.
-
-dnl Usage: OPJ_CHECK_LIB_WITH_PREFIX(prefix, header, lib, func [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl Call AC_SUBST(THELIB_CFLAGS)
-dnl Call AC_SUBST(THELIB_LIBS)
-dnl where THELIB is the uppercase value of 'lib'
-
-AC_DEFUN([OPJ_CHECK_LIB_WITH_PREFIX],
-[
-
-m4_pushdef([UP], m4_toupper([$3]))
-m4_pushdef([DOWN], m4_tolower([$3]))
-
-__opj_prefix=$1
-__opj_header=$2
-__opj_lib=$3
-__opj_func=$4
-__opj_have_dep="no"
-
-save_CPPFLAGS=${CPPFLAGS}
-save_LIBS=${LIBS}
-
-if test "x$UP[_CFLAGS]" != "x"; then
-   CPPFLAGS="${CPPFLAGS} $UP[_CFLAGS]"
-else
-   if test "x${__opj_prefix}" != "x" ; then
-     __opj_CPPFLAGS="-I${__opj_prefix}/include"
-   else
-     __opj_CPPFLAGS=""
-   fi
-   CPPFLAGS="${CPPFLAGS} ${__opj_CPPFLAGS}"
-fi
-
-if test "x$UP[_LIBS]" != "x"; then
-   LIBS="${LIBS} $UP[_LIBS]"
-else
-   if test "x${__opj_prefix}" != "x" ; then
-     __opj_LIBS="-L${__opj_prefix}/lib -l${__opj_lib}"
-   else
-     __opj_LIBS="-l${__opj_lib}"
-   fi
-   LIBS="${LIBS} ${__opj_LIBS}"
-fi
-
-AC_LINK_IFELSE(
-   [AC_LANG_PROGRAM(
-       [[
-#include <${__opj_header}>
-       ]],
-       [[
-${__opj_func}();
-       ]])],
-       [__opj_have_dep="yes"],
-       [__opj_have_dep="no"])
-
-CPPFLAGS=${save_CPPFLAGS}
-LIBS=${save_LIBS}
-
-if test "x${__opj_prefix}" = "x" ; then
-   AC_MSG_CHECKING([whether ]UP[ library is available in standard or predefined directories])
-else
-   AC_MSG_CHECKING([whether ]UP[ library is available in ${__opj_prefix}])
-fi
-AC_MSG_RESULT([${__opj_have_dep}])
-
-if test "x${__opj_have_dep}" = "xyes"; then
-   if test "x${UP[]_CFLAGS}" = "x" ; then
-      UP[]_CFLAGS="${__opj_CPPFLAGS}"
-   fi
-   if test "x${UP[]_LIBS}" = "x" ; then
-      UP[]_LIBS="${__opj_LIBS}"
-   fi
-fi
-
-AS_IF([test "x${__opj_have_dep}" = "xyes"], [$5], [$6])
-
-m4_popdef([UP])
-m4_popdef([DOWN])
-
-])
-
-dnl Macro that check if a library is in a set of directories.
-
-dnl Usage: OPJ_CHECK_LIB(header, lib, func [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-
-AC_DEFUN([OPJ_CHECK_LIB],
-[
-
-m4_pushdef([UP], m4_toupper([$2]))
-
-__opj_have_dep="no"
-
-OPJ_CHECK_LIB_WITH_PREFIX([],
-   [$1],
-   [$2],
-   [$3],
-   [__opj_have_dep="yes"],
-   [__opj_have_dep="no"])
-
-if ! test "x${__opj_have_dep}" = "xyes" ; then
-   OPJ_CHECK_LIB_WITH_PREFIX([/usr],
-      [$1],
-      [$2],
-      [$3],
-      [__opj_have_dep="yes"],
-      [__opj_have_dep="no"])
-fi
-
-if ! test "x${__opj_have_dep}" = "xyes" ; then
-   OPJ_CHECK_LIB_WITH_PREFIX([/usr/local],
-      [$1],
-      [$2],
-      [$3],
-      [__opj_have_dep="yes"],
-      [__opj_have_dep="no"])
-fi
-
-if ! test "x${__opj_have_dep}" = "xyes" ; then
-   OPJ_CHECK_LIB_WITH_PREFIX([/opt/local],
-      [$1],
-      [$2],
-      [$3],
-      [__opj_have_dep="yes"],
-      [__opj_have_dep="no"])
-fi
-
-AC_ARG_VAR(UP[_CFLAGS], [preprocessor flags for lib$2])
-AC_SUBST(UP[_CFLAGS])
-AC_ARG_VAR(UP[_LIBS], [linker flags for lib$2])
-AC_SUBST(UP[_LIBS])
-
-AS_IF([test "x${__opj_have_dep}" = "xyes"], [$4], [$5])
-
-m4_popdef([UP])
-
-])

m4/opj_compiler_flag.m4

@@ -1,30 +0,0 @@
-dnl Copyright (C) 2010 Vincent Torri <vtorri at univ-evry dot fr>
-dnl                and Albin Tonnerre <albin dot tonnerre at gmail dot com>
-dnl That code is public domain and can be freely used or copied.
-
-dnl Macro that checks if a compiler flag is supported by the compiler.
-
-dnl Usage: OPJ_COMPILER_FLAG(flag)
-dnl flag is added to CFLAGS if supported.
-
-AC_DEFUN([OPJ_COMPILER_FLAG],
-[
-
-CFLAGS_save="${CFLAGS}"
-CFLAGS="${CFLAGS} $1"
-
-AC_LANG_PUSH([C])
-AC_MSG_CHECKING([whether the compiler supports $1])
-
-AC_COMPILE_IFELSE(
-   [AC_LANG_PROGRAM([[]])],
-   [have_flag="yes"],
-   [have_flag="no"])
-AC_MSG_RESULT([${have_flag}])
-
-if test "x${have_flag}" = "xno" ; then
-   CFLAGS="${CFLAGS_save}"
-fi
-AC_LANG_POP([C])
-
-])

m4/opj_doxygen.m4

@@ -1,94 +0,0 @@
-dnl Copyright (C) 2008 Vincent Torri <vtorri at univ-evry dot fr>
-dnl That code is public domain and can be freely used or copied.
-
-dnl Macro that check if doxygen is available or not.
-
-dnl OPJ_CHECK_DOXYGEN([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl Test for the doxygen program
-dnl Defines opj_doxygen
-dnl Defines the automake conditionnal OPJ_BUILD_DOC
-dnl
-AC_DEFUN([OPJ_CHECK_DOXYGEN],
-[
-
-dnl
-dnl Disable the build of the documentation
-dnl
-AC_ARG_ENABLE([doc],
-   [AC_HELP_STRING(
-       [--disable-doc],
-       [Disable documentation build @<:@default=enabled@:>@])],
-   [
-    if test "x${enableval}" = "xyes" ; then
-       opj_enable_doc="yes"
-    else
-       opj_enable_doc="no"
-    fi
-   ],
-   [opj_enable_doc="yes"])
-
-AC_MSG_CHECKING([whether to build documentation])
-AC_MSG_RESULT([${opj_enable_doc}])
-
-if test "x${opj_enable_doc}" = "xyes" ; then
-
-dnl Specify the file name, without path
-
-   opj_doxygen="doxygen"
-
-   AC_ARG_WITH([doxygen],
-      [AC_HELP_STRING(
-          [--with-doxygen=FILE],
-          [doxygen program to use @<:@default=doxygen@:>@])],
-
-dnl Check the given doxygen program.
-
-      [opj_doxygen=${withval}
-       AC_CHECK_PROG([opj_have_doxygen],
-          [${opj_doxygen}],
-          [yes],
-          [no])
-       if test "x${opj_have_doxygen}" = "xno" ; then
-          echo "WARNING:"
-          echo "The doxygen program you specified:"
-          echo "${opj_doxygen}"
-          echo "was not found.  Please check the path and make sure "
-          echo "the program exists and is executable."
-          AC_MSG_WARN([no doxygen detected. Documentation will not be built])
-       fi
-      ],
-      [AC_CHECK_PROG([opj_have_doxygen],
-          [${opj_doxygen}],
-          [yes],
-          [no])
-       if test "x${opj_have_doxygen}" = "xno" ; then
-          echo "WARNING:"
-          echo "The doxygen program was not found in your execute path."
-          echo "You may have doxygen installed somewhere not covered by your path."
-          echo ""
-          echo "If this is the case make sure you have the packages installed, AND"
-          echo "that the doxygen program is in your execute path (see your"
-          echo "shell manual page on setting the \$PATH environment variable), OR"
-          echo "alternatively, specify the program to use with --with-doxygen."
-          AC_MSG_WARN([no doxygen detected. Documentation will not be built])
-       fi
-      ])
-else
-   opj_have_doxygen="no"
-fi
-
-dnl
-dnl Substitution
-dnl
-AC_SUBST([opj_doxygen])
-
-if ! test "x${opj_have_doxygen}" = "xyes" ; then
-   opj_enable_doc="no"
-fi
-
-AM_CONDITIONAL(OPJ_BUILD_DOC, test "x${opj_have_doxygen}" = "xyes")
-
-AS_IF([test "x${opj_have_doxygen}" = "xyes"], [$1], [$2])
-])
-
-dnl End of opj_doxygen.m4

m4/pkg.m4

@@ -1,157 +0,0 @@
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-# 
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default([$1], [0.9.0])
-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG=""
-	fi
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
-    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_default([$2], [:])
-m4_ifvaln([$3], [else
-  $3])dnl
-fi])
-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
-    pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
-    PKG_CHECK_EXISTS([$3],
-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-		     [pkg_failed=yes])
- else
-    pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
-   	AC_MSG_RESULT([no])
-        _PKG_SHORT_ERRORS_SUPPORTED
-        if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
-        else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
-	m4_default([$4], [AC_MSG_ERROR(
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT])dnl
-        ])
-elif test $pkg_failed = untried; then
-     	AC_MSG_RESULT([no])
-	m4_default([$4], [AC_MSG_FAILURE(
-[The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
-        ])
-else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-        AC_MSG_RESULT([yes])
-	$3
-fi[]dnl
-])# PKG_CHECK_MODULES

opj_config.h.cmake.in

@@ -1,36 +0,0 @@
-/* create config.h for CMake */
-#define PACKAGE_VERSION "@PACKAGE_VERSION@"
-
-#cmakedefine HAVE_INTTYPES_H
-#cmakedefine HAVE_MEMORY_H
-#cmakedefine HAVE_STDINT_H
-#cmakedefine HAVE_STDLIB_H
-#cmakedefine HAVE_STRINGS_H
-#cmakedefine HAVE_STRING_H
-#cmakedefine HAVE_SYS_STAT_H
-#cmakedefine HAVE_SYS_TYPES_H
-#cmakedefine HAVE_UNISTD_H
-#cmakedefine HAVE_LIBPNG
-#cmakedefine HAVE_PNG_H
-#cmakedefine HAVE_LIBTIFF
-#cmakedefine HAVE_TIFF_H
-
-#cmakedefine HAVE_LIBLCMS1
-#cmakedefine HAVE_LIBLCMS2
-#cmakedefine HAVE_LCMS1_H
-#cmakedefine HAVE_LCMS2_H
-#cmakedefine USE_SYSTEM_GETOPT
-
-/* Byte order.  */
-/* All compilers that support Mac OS X define either __BIG_ENDIAN__ or
-__LITTLE_ENDIAN__ to match the endianness of the architecture being
-compiled for. This is not necessarily the same as the architecture of the
-machine doing the building. In order to support Universal Binaries on
-Mac OS X, we prefer those defines to decide the endianness.
-On other platforms we use the result of the TRY_RUN. */
-#if !defined(__APPLE__)
-#cmakedefine OPJ_BIG_ENDIAN
-#elif defined(__BIG_ENDIAN__)
-# define OPJ_BIG_ENDIAN
-#endif
-

src/CMakeLists.txt

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

src/bin/CMakeLists.txt

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

src/bin/common/CMakeLists.txt

@@ -0,0 +1,7 @@
+#-----------------------------------------------------------------------------
+# opj_apps_config.h generation 
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/opj_apps_config.h.cmake.in
+ ${CMAKE_CURRENT_BINARY_DIR}/opj_apps_config.h
+ @ONLY
+ )

src/bin/common/color.c

@@ -0,0 +1,543 @@
+/*
+ * The copyright in this software is being made available under the 2-clauses 
+ * BSD License, included below. This software may be subject to other third 
+ * party and contributor rights, including patent rights, and no such rights
+ * are granted under this license.
+ *
+ * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2014, Professor Benoit Macq
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * Copyright (c) 2003-2014, Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * 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.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <math.h>
+#include <assert.h>
+
+#include "opj_apps_config.h"
+#include "openjpeg.h"
+#include "color.h"
+
+#ifdef OPJ_HAVE_LIBLCMS2
+#include <lcms2.h>
+#endif
+#ifdef OPJ_HAVE_LIBLCMS1
+#include <lcms.h>
+#endif
+
+#ifdef OPJ_USE_LEGACY
+#define OPJ_CLRSPC_GRAY CLRSPC_GRAY
+#define OPJ_CLRSPC_SRGB CLRSPC_SRGB
+#endif
+
+/*--------------------------------------------------------
+Matrix for sYCC, Amendment 1 to IEC 61966-2-1
+
+Y :   0.299   0.587    0.114   :R
+Cb:  -0.1687 -0.3312   0.5     :G
+Cr:   0.5    -0.4187  -0.0812  :B
+
+Inverse:
+
+R: 1        -3.68213e-05    1.40199      :Y
+G: 1.00003  -0.344125      -0.714128     :Cb - 2^(prec - 1)
+B: 0.999823  1.77204       -8.04142e-06  :Cr - 2^(prec - 1)
+
+-----------------------------------------------------------*/
+static void sycc_to_rgb(int offset, int upb, int y, int cb, int cr,
+	int *out_r, int *out_g, int *out_b)
+{
+	int r, g, b;
+
+	cb -= offset; cr -= offset;
+	r = y + (int)(1.402 * (float)cr);
+	if(r < 0) r = 0; else if(r > upb) r = upb; *out_r = r;
+
+	g = y - (int)(0.344 * (float)cb + 0.714 * (float)cr);
+	if(g < 0) g = 0; else if(g > upb) g = upb; *out_g = g;
+
+	b = y + (int)(1.772 * (float)cb);
+	if(b < 0) b = 0; else if(b > upb) b = upb; *out_b = b;
+}
+
+static void sycc444_to_rgb(opj_image_t *img)
+{
+	int *d0, *d1, *d2, *r, *g, *b;
+	const int *y, *cb, *cr;
+	int maxw, maxh, max, i, offset, upb;
+
+	i = (int)img->comps[0].prec;
+	offset = 1<<(i - 1); upb = (1<<i)-1;
+
+	maxw = (int)img->comps[0].w; maxh = (int)img->comps[0].h;
+	max = maxw * maxh;
+
+	y = img->comps[0].data;
+	cb = img->comps[1].data;
+	cr = img->comps[2].data;
+
+	d0 = r = (int*)malloc(sizeof(int) * (size_t)max);
+	d1 = g = (int*)malloc(sizeof(int) * (size_t)max);
+	d2 = b = (int*)malloc(sizeof(int) * (size_t)max);
+
+	for(i = 0; i < max; ++i)
+   {
+	sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);	
+
+	++y; ++cb; ++cr; ++r; ++g; ++b;
+   }	
+	free(img->comps[0].data); img->comps[0].data = d0;
+	free(img->comps[1].data); img->comps[1].data = d1;
+	free(img->comps[2].data); img->comps[2].data = d2;
+
+}/* sycc444_to_rgb() */
+
+static void sycc422_to_rgb(opj_image_t *img)
+{	
+	int *d0, *d1, *d2, *r, *g, *b;
+	const int *y, *cb, *cr;
+	int maxw, maxh, max, offset, upb;
+	int i, j;
+
+	i = (int)img->comps[0].prec;
+	offset = 1<<(i - 1); upb = (1<<i)-1;
+
+	maxw = (int)img->comps[0].w; maxh = (int)img->comps[0].h;
+	max = maxw * maxh;
+
+	y = img->comps[0].data;
+	cb = img->comps[1].data;
+	cr = img->comps[2].data;
+
+	d0 = r = (int*)malloc(sizeof(int) * (size_t)max);
+	d1 = g = (int*)malloc(sizeof(int) * (size_t)max);
+	d2 = b = (int*)malloc(sizeof(int) * (size_t)max);
+
+	for(i=0; i < maxh; ++i)
+   {
+	for(j=0; j < maxw; j += 2)
+  {
+	sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
+
+	++y; ++r; ++g; ++b;
+
+	sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
+
+	++y; ++r; ++g; ++b; ++cb; ++cr;
+  }
+   }
+	free(img->comps[0].data); img->comps[0].data = d0;
+	free(img->comps[1].data); img->comps[1].data = d1;
+	free(img->comps[2].data); img->comps[2].data = d2;
+
+#if defined(USE_JPWL) || defined(USE_MJ2)
+	img->comps[1].w = maxw; img->comps[1].h = maxh;
+	img->comps[2].w = maxw; img->comps[2].h = maxh;
+#else
+	img->comps[1].w = (OPJ_UINT32)maxw; img->comps[1].h = (OPJ_UINT32)maxh;
+	img->comps[2].w = (OPJ_UINT32)maxw; img->comps[2].h = (OPJ_UINT32)maxh;
+#endif
+	img->comps[1].dx = img->comps[0].dx;
+	img->comps[2].dx = img->comps[0].dx;
+	img->comps[1].dy = img->comps[0].dy;
+	img->comps[2].dy = img->comps[0].dy;
+
+}/* sycc422_to_rgb() */
+
+static void sycc420_to_rgb(opj_image_t *img)
+{
+	int *d0, *d1, *d2, *r, *g, *b, *nr, *ng, *nb;
+	const int *y, *cb, *cr, *ny;
+	int maxw, maxh, max, offset, upb;
+	int i, j;
+
+	i = (int)img->comps[0].prec;
+	offset = 1<<(i - 1); upb = (1<<i)-1;
+
+	maxw = (int)img->comps[0].w; maxh = (int)img->comps[0].h;
+	max = maxw * maxh;
+
+	y = img->comps[0].data;
+	cb = img->comps[1].data;
+	cr = img->comps[2].data;
+
+	d0 = r = (int*)malloc(sizeof(int) * (size_t)max);
+	d1 = g = (int*)malloc(sizeof(int) * (size_t)max);
+	d2 = b = (int*)malloc(sizeof(int) * (size_t)max);
+
+	for(i=0; i < maxh; i += 2)
+   {
+	ny = y + maxw;
+	nr = r + maxw; ng = g + maxw; nb = b + maxw;
+
+	for(j=0; j < maxw;  j += 2)
+  {
+	sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
+
+	++y; ++r; ++g; ++b;
+
+	sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
+
+	++y; ++r; ++g; ++b;
+
+	sycc_to_rgb(offset, upb, *ny, *cb, *cr, nr, ng, nb);
+
+	++ny; ++nr; ++ng; ++nb;
+
+	sycc_to_rgb(offset, upb, *ny, *cb, *cr, nr, ng, nb);
+
+	++ny; ++nr; ++ng; ++nb; ++cb; ++cr;
+  }
+	y += maxw; r += maxw; g += maxw; b += maxw;
+   }
+	free(img->comps[0].data); img->comps[0].data = d0;
+	free(img->comps[1].data); img->comps[1].data = d1;
+	free(img->comps[2].data); img->comps[2].data = d2;
+
+#if defined(USE_JPWL) || defined(USE_MJ2)
+	img->comps[1].w = maxw; img->comps[1].h = maxh;
+	img->comps[2].w = maxw; img->comps[2].h = maxh;
+#else
+	img->comps[1].w = (OPJ_UINT32)maxw; img->comps[1].h = (OPJ_UINT32)maxh;
+	img->comps[2].w = (OPJ_UINT32)maxw; img->comps[2].h = (OPJ_UINT32)maxh;
+#endif
+	img->comps[1].dx = img->comps[0].dx;
+	img->comps[2].dx = img->comps[0].dx;
+	img->comps[1].dy = img->comps[0].dy;
+	img->comps[2].dy = img->comps[0].dy;
+
+}/* sycc420_to_rgb() */
+
+void color_sycc_to_rgb(opj_image_t *img)
+{
+	if(img->numcomps < 3) 
+   {
+	img->color_space = OPJ_CLRSPC_GRAY;
+	return;
+   }
+
+	if((img->comps[0].dx == 1)
+	&& (img->comps[1].dx == 2)
+	&& (img->comps[2].dx == 2)
+	&& (img->comps[0].dy == 1)
+	&& (img->comps[1].dy == 2)
+	&& (img->comps[2].dy == 2))/* horizontal and vertical sub-sample */
+  {
+	sycc420_to_rgb(img);
+  }
+	else
+	if((img->comps[0].dx == 1)
+	&& (img->comps[1].dx == 2)
+	&& (img->comps[2].dx == 2)
+	&& (img->comps[0].dy == 1)
+	&& (img->comps[1].dy == 1)
+	&& (img->comps[2].dy == 1))/* horizontal sub-sample only */
+  {
+	sycc422_to_rgb(img);
+  }
+	else
+	if((img->comps[0].dx == 1)
+	&& (img->comps[1].dx == 1)
+	&& (img->comps[2].dx == 1)
+	&& (img->comps[0].dy == 1)
+	&& (img->comps[1].dy == 1)
+	&& (img->comps[2].dy == 1))/* no sub-sample */
+  {
+	sycc444_to_rgb(img);
+  }
+	else
+  {
+	fprintf(stderr,"%s:%d:color_sycc_to_rgb\n\tCAN NOT CONVERT\n",
+	 __FILE__,__LINE__);
+	return;
+  }
+	img->color_space = OPJ_CLRSPC_SRGB;
+
+}/* color_sycc_to_rgb() */
+
+#if defined(OPJ_HAVE_LIBLCMS2) || defined(OPJ_HAVE_LIBLCMS1)
+#ifdef OPJ_HAVE_LIBLCMS1
+/* Bob Friesenhahn proposed:*/
+#define cmsSigXYZData   icSigXYZData
+#define cmsSigLabData   icSigLabData
+#define cmsSigCmykData  icSigCmykData
+#define cmsSigYCbCrData icSigYCbCrData
+#define cmsSigLuvData   icSigLuvData
+#define cmsSigGrayData  icSigGrayData
+#define cmsSigRgbData   icSigRgbData
+#define cmsUInt32Number DWORD
+
+#define cmsColorSpaceSignature icColorSpaceSignature
+#define cmsGetHeaderRenderingIntent cmsTakeRenderingIntent
+
+#endif /* OPJ_HAVE_LIBLCMS1 */
+
+/*#define DEBUG_PROFILE*/
+void color_apply_icc_profile(opj_image_t *image)
+{
+	cmsHPROFILE in_prof, out_prof;
+	cmsHTRANSFORM transform;
+	cmsColorSpaceSignature in_space, out_space;
+	cmsUInt32Number intent, in_type, out_type, nr_samples;
+	int *r, *g, *b;
+	int prec, i, max, max_w, max_h;
+	OPJ_COLOR_SPACE oldspace;
+
+	in_prof = 
+	 cmsOpenProfileFromMem(image->icc_profile_buf, image->icc_profile_len);
+#ifdef DEBUG_PROFILE
+  FILE *icm = fopen("debug.icm","wb");
+  fwrite( image->icc_profile_buf,1, image->icc_profile_len,icm);
+  fclose(icm);
+#endif
+
+	if(in_prof == NULL) return;
+
+	in_space = cmsGetPCS(in_prof);
+	out_space = cmsGetColorSpace(in_prof);
+	intent = cmsGetHeaderRenderingIntent(in_prof);
+
+	
+	max_w = (int)image->comps[0].w;
+  max_h = (int)image->comps[0].h;
+	prec = (int)image->comps[0].prec;
+	oldspace = image->color_space;
+
+	if(out_space == cmsSigRgbData) /* enumCS 16 */
+   {
+  if( prec <= 8 )
+{
+	in_type = TYPE_RGB_8;
+	out_type = TYPE_RGB_8;
+}
+else
+{
+	in_type = TYPE_RGB_16;
+	out_type = TYPE_RGB_16;
+}
+	out_prof = cmsCreate_sRGBProfile();
+	image->color_space = OPJ_CLRSPC_SRGB;
+   }
+	else
+	if(out_space == cmsSigGrayData) /* enumCS 17 */
+   {
+	in_type = TYPE_GRAY_8;
+	out_type = TYPE_RGB_8;
+	out_prof = cmsCreate_sRGBProfile();
+	image->color_space = OPJ_CLRSPC_SRGB;
+   }
+	else
+	if(out_space == cmsSigYCbCrData) /* enumCS 18 */
+   {
+	in_type = TYPE_YCbCr_16;
+	out_type = TYPE_RGB_16;
+	out_prof = cmsCreate_sRGBProfile();
+	image->color_space = OPJ_CLRSPC_SRGB;
+   }
+	else
+   {
+#ifdef DEBUG_PROFILE
+fprintf(stderr,"%s:%d: color_apply_icc_profile\n\tICC Profile has unknown "
+"output colorspace(%#x)(%c%c%c%c)\n\tICC Profile ignored.\n",
+__FILE__,__LINE__,out_space,
+(out_space>>24) & 0xff,(out_space>>16) & 0xff,
+(out_space>>8) & 0xff, out_space & 0xff);
+#endif
+	return;
+   }
+
+#ifdef DEBUG_PROFILE
+fprintf(stderr,"%s:%d:color_apply_icc_profile\n\tchannels(%d) prec(%d) w(%d) h(%d)"
+"\n\tprofile: in(%p) out(%p)\n",__FILE__,__LINE__,image->numcomps,prec,
+max_w,max_h, (void*)in_prof,(void*)out_prof);
+
+fprintf(stderr,"\trender_intent (%u)\n\t"
+"color_space: in(%#x)(%c%c%c%c)   out:(%#x)(%c%c%c%c)\n\t"
+"       type: in(%u)              out:(%u)\n",
+intent,
+in_space,
+(in_space>>24) & 0xff,(in_space>>16) & 0xff,
+(in_space>>8) & 0xff, in_space & 0xff,
+
+out_space,
+(out_space>>24) & 0xff,(out_space>>16) & 0xff,
+(out_space>>8) & 0xff, out_space & 0xff,
+
+in_type,out_type
+ );
+#else
+  (void)prec;
+  (void)in_space;
+#endif /* DEBUG_PROFILE */
+
+	transform = cmsCreateTransform(in_prof, in_type,
+	 out_prof, out_type, intent, 0);
+
+#ifdef OPJ_HAVE_LIBLCMS2
+/* Possible for: LCMS_VERSION >= 2000 :*/
+	cmsCloseProfile(in_prof);
+	cmsCloseProfile(out_prof);
+#endif
+
+	if(transform == NULL)
+   {
+#ifdef DEBUG_PROFILE
+fprintf(stderr,"%s:%d:color_apply_icc_profile\n\tcmsCreateTransform failed. "
+"ICC Profile ignored.\n",__FILE__,__LINE__);
+#endif
+	image->color_space = oldspace;
+#ifdef OPJ_HAVE_LIBLCMS1
+	cmsCloseProfile(in_prof);
+	cmsCloseProfile(out_prof);
+#endif
+	return;
+   }
+
+	if(image->numcomps > 2)/* RGB, RGBA */
+   {
+  if( prec <= 8 )
+{
+	unsigned char *inbuf, *outbuf, *in, *out;
+	max = max_w * max_h;
+  nr_samples = (cmsUInt32Number)max * 3 * (cmsUInt32Number)sizeof(unsigned char);
+	in = inbuf = (unsigned char*)malloc(nr_samples);
+	out = outbuf = (unsigned char*)malloc(nr_samples);
+
+	r = image->comps[0].data;
+	g = image->comps[1].data;
+	b = image->comps[2].data;
+
+	for(i = 0; i < max; ++i)
+  {
+	*in++ = (unsigned char)*r++;
+	*in++ = (unsigned char)*g++;
+	*in++ = (unsigned char)*b++;
+  }
+
+	cmsDoTransform(transform, inbuf, outbuf, (cmsUInt32Number)max);
+
+	r = image->comps[0].data;
+	g = image->comps[1].data;
+	b = image->comps[2].data;
+
+	for(i = 0; i < max; ++i)
+  {
+	*r++ = (int)*out++;
+	*g++ = (int)*out++;
+	*b++ = (int)*out++;
+  }
+	free(inbuf); free(outbuf);
+}
+else
+{
+	unsigned short *inbuf, *outbuf, *in, *out;
+	max = max_w * max_h;
+  nr_samples = (cmsUInt32Number)max * 3 * (cmsUInt32Number)sizeof(unsigned short);
+	in = inbuf = (unsigned short*)malloc(nr_samples);
+	out = outbuf = (unsigned short*)malloc(nr_samples);
+
+	r = image->comps[0].data;
+	g = image->comps[1].data;
+	b = image->comps[2].data;
+
+	for(i = 0; i < max; ++i)
+  {
+	*in++ = (unsigned short)*r++;
+	*in++ = (unsigned short)*g++;
+	*in++ = (unsigned short)*b++;
+  }
+
+	cmsDoTransform(transform, inbuf, outbuf, (cmsUInt32Number)max);
+
+	r = image->comps[0].data;
+	g = image->comps[1].data;
+	b = image->comps[2].data;
+
+	for(i = 0; i < max; ++i)
+  {
+	*r++ = (int)*out++;
+	*g++ = (int)*out++;
+	*b++ = (int)*out++;
+  }
+	free(inbuf); free(outbuf);
+}
+   }
+	else /* GRAY, GRAYA */
+   {
+	unsigned char *in, *inbuf, *out, *outbuf;
+  max = max_w * max_h;
+  nr_samples = (cmsUInt32Number)max * 3 * sizeof(unsigned char);
+	in = inbuf = (unsigned char*)malloc(nr_samples);
+	out = outbuf = (unsigned char*)malloc(nr_samples);
+
+	image->comps = (opj_image_comp_t*)
+	 realloc(image->comps, (image->numcomps+2)*sizeof(opj_image_comp_t));
+
+	if(image->numcomps == 2)
+	 image->comps[3] = image->comps[1];
+
+	image->comps[1] = image->comps[0];
+	image->comps[2] = image->comps[0];
+
+	image->comps[1].data = (int*)calloc((size_t)max, sizeof(int));
+	image->comps[2].data = (int*)calloc((size_t)max, sizeof(int));
+
+	image->numcomps += 2;
+
+	r = image->comps[0].data;
+
+	for(i = 0; i < max; ++i)
+  {
+	*in++ = (unsigned char)*r++;
+  }
+	cmsDoTransform(transform, inbuf, outbuf, (cmsUInt32Number)max);
+
+	r = image->comps[0].data;
+	g = image->comps[1].data;
+	b = image->comps[2].data;
+
+	for(i = 0; i < max; ++i)
+  {
+	*r++ = (int)*out++; *g++ = (int)*out++; *b++ = (int)*out++;
+  }
+	free(inbuf); free(outbuf);
+
+   }/* if(image->numcomps */
+
+	cmsDeleteTransform(transform);
+
+#ifdef OPJ_HAVE_LIBLCMS1
+	cmsCloseProfile(in_prof);
+	cmsCloseProfile(out_prof);
+#endif
+}/* color_apply_icc_profile() */
+
+#endif /* OPJ_HAVE_LIBLCMS2 || OPJ_HAVE_LIBLCMS1 */
+

src/bin/common/color.h

@@ -1,9 +1,15 @@
 /*
- * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2007, Professor Benoit Macq
+ * The copyright in this software is being made available under the 2-clauses 
+ * BSD License, included below. This software may be subject to other third 
+ * party and contributor rights, including patent rights, and no such rights
+ * are granted under this license.
+ *
+ * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * Copyright (c) 2003-2014, Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
  *

src/bin/common/format_defs.h

@@ -1,9 +1,15 @@
 /*
- * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2007, Professor Benoit Macq
+ * The copyright in this software is being made available under the 2-clauses 
+ * BSD License, included below. This software may be subject to other third 
+ * party and contributor rights, including patent rights, and no such rights
+ * are granted under this license.
+ *
+ * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * Copyright (c) 2003-2014, Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
  *
@@ -41,8 +47,9 @@
 #define BMP_DFMT 12
 #define YUV_DFMT 13
 #define TIF_DFMT 14
-#define RAW_DFMT 15
+#define RAW_DFMT 15 /* MSB / Big Endian */
 #define TGA_DFMT 16
 #define PNG_DFMT 17
+#define RAWL_DFMT 18 /* LSB / Little Endian */
 
 #endif /* _OPJ_FORMAT_DEFS_H_ */

src/bin/common/opj_apps_config.h.cmake.in

@@ -0,0 +1,13 @@
+/* create opj_apps_config.h for CMake */
+
+#cmakedefine OPJ_HAVE_LIBPNG @HAVE_LIBPNG@
+#cmakedefine OPJ_HAVE_PNG_H @HAVE_PNG_H@
+#cmakedefine OPJ_HAVE_LIBTIFF @HAVE_LIBTIFF@
+#cmakedefine OPJ_HAVE_TIFF_H @HAVE_TIFF_H@
+
+#cmakedefine OPJ_HAVE_LIBLCMS1
+#cmakedefine OPJ_HAVE_LIBLCMS2
+#cmakedefine OPJ_HAVE_LCMS1_H
+#cmakedefine OPJ_HAVE_LCMS2_H
+
+

src/bin/common/opj_getopt.c

@@ -1,4 +1,9 @@
 /*
+ * The copyright in this software is being made available under the 3-clauses 
+ * BSD License, included below. This software may be subject to other third 
+ * party and contributor rights, including patent rights, and no such rights
+ * are granted under this license.
+ *
  * Copyright (c) 1987, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -38,10 +43,6 @@ static char sccsid[] = "@(#)opj_getopt.c	8.3 (Berkeley) 4/27/95";
 #include <string.h>
 #include "opj_getopt.h"
 
-#ifdef USE_SYSTEM_GETOPT
-#error
-#endif
-
 int opj_opterr = 1,			/* if error message should be printed */
  opj_optind = 1,			/* index into parent argv vector */
  opj_optopt,			/* character checked for validity */

src/bin/common/opj_getopt.h

@@ -1,26 +1,5 @@
 /* last review : october 29th, 2002 */
 
-#include "opj_config.h"
-
-#ifdef USE_SYSTEM_GETOPT
-#include <getopt.h>
-
-#define opj_opterr opterr
-#define opj_optind optind
-#define opj_optopt optopt
-#define opj_optreset optreset
-#define opj_optarg optarg
-
-typedef struct option opj_option_t;
-
-#define NO_ARG no_argument
-#define REQ_ARG required_argument
-#define OPT_ARG optional_argument
-
-#define opj_getopt getopt
-#define opj_getopt_long getopt_long
-
-#else
 #ifndef _GETOPT_H_
 #define _GETOPT_H_
 
@@ -30,7 +9,7 @@ typedef struct opj_option
 	int has_arg;
 	int *flag;
 	int val;
-} opj_option_t;
+}opj_option_t;
 
 #define	NO_ARG	0
 #define REQ_ARG	1
@@ -48,4 +27,3 @@ extern int opj_getopt_long(int argc, char * const argv[], const char *optstring,
 extern void reset_options_reading(void);
 
 #endif				/* _GETOPT_H_ */
-#endif /* USE_SYSTEM_GETOPT */

src/bin/jp2/CMakeLists.txt

@@ -0,0 +1,61 @@
+# Build the demo app, small examples
+
+# First thing define the common source:
+set(common_SRCS
+  convert.c
+  index.c
+  ${OPENJPEG_SOURCE_DIR}/src/bin/common/color.c
+  ${OPENJPEG_SOURCE_DIR}/src/bin/common/opj_getopt.c
+  )
+
+# Headers file are located here:
+include_directories(
+  ${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
+  ${OPENJPEG_BINARY_DIR}/src/bin/common # opj_apps_config.h
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
+  ${OPENJPEG_SOURCE_DIR}/src/bin/common
+  ${LCMS_INCLUDE_DIRNAME}
+  ${Z_INCLUDE_DIRNAME}
+  ${PNG_INCLUDE_DIRNAME}
+  ${TIFF_INCLUDE_DIRNAME}
+  )
+
+if(WIN32)
+  if(BUILD_SHARED_LIBS)
+    add_definitions(-DOPJ_EXPORTS)
+  else()
+    add_definitions(-DOPJ_STATIC)
+  endif()
+endif()
+
+# Loop over all executables:
+foreach(exe opj_decompress opj_compress opj_dump)
+  add_executable(${exe} ${exe}.c ${common_SRCS})
+  target_link_libraries(${exe} ${OPENJPEG_LIBRARY_NAME}
+    ${PNG_LIBNAME} ${TIFF_LIBNAME} ${LCMS_LIBNAME}
+    )
+  # To support universal exe:
+  if(ZLIB_FOUND AND APPLE)
+    target_link_libraries(${exe} z)
+  else(ZLIB_FOUND AND APPLE)
+    target_link_libraries(${exe} ${Z_LIBNAME})
+  endif()
+
+  # On unix you need to link to the math library:
+  if(UNIX)
+    target_link_libraries(${exe} m)
+  endif()
+  # Install exe
+  install(TARGETS ${exe}
+    EXPORT OpenJPEGTargets
+    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
+  )
+endforeach()
+
+# Install man pages
+install(
+  FILES       ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_compress.1
+              ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_decompress.1
+              ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_dump.1
+  DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man1)
+#

src/bin/jp2/convert.h

@@ -0,0 +1,102 @@
+/*
+ * The copyright in this software is being made available under the 2-clauses 
+ * BSD License, included below. This software may be subject to other third 
+ * party and contributor rights, including patent rights, and no such rights
+ * are granted under this license.
+ *
+ * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2014, Professor Benoit Macq
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * Copyright (c) 2003-2014, Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * 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.
+ */
+#ifndef __J2K_CONVERT_H
+#define __J2K_CONVERT_H
+
+/**@name RAW component encoding parameters */
+/*@{*/
+typedef struct raw_comp_cparameters {
+    /** subsampling in X direction */
+    int dx;
+    /** subsampling in Y direction */
+    int dy;
+    /*@}*/
+} raw_comp_cparameters_t;
+
+/**@name RAW image encoding parameters */
+/*@{*/
+typedef struct raw_cparameters {
+	/** width of the raw image */
+	int rawWidth;
+	/** height of the raw image */
+	int rawHeight;
+    /** number of components of the raw image */
+	int rawComp;
+    /** bit depth of the raw image */
+    int rawBitDepth;
+    /** signed/unsigned raw image */
+    OPJ_BOOL rawSigned;
+    /** raw components parameters */
+    raw_comp_cparameters_t *rawComps;
+	/*@}*/
+} raw_cparameters_t;
+
+/* TGA conversion */
+opj_image_t* tgatoimage(const char *filename, opj_cparameters_t *parameters);
+int imagetotga(opj_image_t * image, const char *outfile);
+
+/* BMP conversion */
+opj_image_t* bmptoimage(const char *filename, opj_cparameters_t *parameters);
+int imagetobmp(opj_image_t *image, const char *outfile);
+
+/* TIFF conversion*/
+opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters);
+int imagetotif(opj_image_t *image, const char *outfile);
+/**
+Load a single image component encoded in PGX file format
+@param filename Name of the PGX file to load
+@param parameters *List ?*
+@return Returns a greyscale image if successful, returns NULL otherwise
+*/
+opj_image_t* pgxtoimage(const char *filename, opj_cparameters_t *parameters);
+int imagetopgx(opj_image_t *image, const char *outfile);
+
+opj_image_t* pnmtoimage(const char *filename, opj_cparameters_t *parameters);
+int imagetopnm(opj_image_t *image, const char *outfile);
+
+/* RAW conversion */
+int imagetoraw(opj_image_t * image, const char *outfile);
+int imagetorawl(opj_image_t * image, const char *outfile);
+opj_image_t* rawtoimage(const char *filename, opj_cparameters_t *parameters, raw_cparameters_t *raw_cp);
+opj_image_t* rawltoimage(const char *filename, opj_cparameters_t *parameters, raw_cparameters_t *raw_cp);
+
+/* PNG conversion*/
+extern int imagetopng(opj_image_t *image, const char *write_idf);
+extern opj_image_t* pngtoimage(const char *filename, opj_cparameters_t *parameters);
+
+#endif /* __J2K_CONVERT_H */
+

src/bin/jp2/index.c

@@ -0,0 +1,397 @@
+/*
+ * The copyright in this software is being made available under the 2-clauses 
+ * BSD License, included below. This software may be subject to other third 
+ * party and contributor rights, including patent rights, and no such rights
+ * are granted under this license.
+ *
+ * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2014, Professor Benoit Macq
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux 
+ * 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.
+ */
+
+#include <stdio.h>
+#include <math.h>
+#include <string.h>
+#include "openjpeg.h"
+#include "index.h"
+#include "opj_inttypes.h"
+
+/* ------------------------------------------------------------------------------------ */
+
+/**
+Write a structured index to a file
+@param cstr_info Codestream information 
+@param index Index filename
+@return Returns 0 if successful, returns 1 otherwise
+*/
+int write_index_file(opj_codestream_info_t *cstr_info, char *index) {
+	int tileno, compno, layno, resno, precno, pack_nb, x, y;
+	FILE *stream = NULL;
+	double total_disto = 0;
+/* UniPG>> */
+	int tilepartno;
+	char disto_on, numpix_on;
+
+#ifdef USE_JPWL
+	if (!strcmp(index, JPWL_PRIVATEINDEX_NAME))
+		return 0;
+#endif /* USE_JPWL */
+/* <<UniPG */
+
+	if (!cstr_info)		
+		return 1;
+
+	stream = fopen(index, "w");
+	if (!stream) {
+		fprintf(stderr, "failed to open index file [%s] for writing\n", index);
+		return 1;
+	}
+	
+	if (cstr_info->tile[0].distotile)
+		disto_on = 1;
+	else 
+		disto_on = 0;
+
+	if (cstr_info->tile[0].numpix)
+		numpix_on = 1;
+	else 
+		numpix_on = 0;
+
+	fprintf(stream, "%d %d\n", cstr_info->image_w, cstr_info->image_h);
+	fprintf(stream, "%d\n", cstr_info->prog);
+	fprintf(stream, "%d %d\n", cstr_info->tile_x, cstr_info->tile_y);
+	fprintf(stream, "%d %d\n", cstr_info->tw, cstr_info->th);
+	fprintf(stream, "%d\n", cstr_info->numcomps);
+	fprintf(stream, "%d\n", cstr_info->numlayers);
+	fprintf(stream, "%d\n", cstr_info->numdecompos[0]); /* based on component 0 */
+
+	for (resno = cstr_info->numdecompos[0]; resno >= 0; resno--) {
+		fprintf(stream, "[%d,%d] ", 
+			(1 << cstr_info->tile[0].pdx[resno]), (1 << cstr_info->tile[0].pdx[resno]));	/* based on tile 0 and component 0 */
+	}
+
+	fprintf(stream, "\n");
+/* UniPG>> */
+	fprintf(stream, "%d\n", cstr_info->main_head_start);
+/* <<UniPG */
+	fprintf(stream, "%d\n", cstr_info->main_head_end);
+	fprintf(stream, "%d\n", cstr_info->codestream_size);
+	
+	fprintf(stream, "\nINFO ON TILES\n");
+	fprintf(stream, "tileno start_pos  end_hd  end_tile   nbparts");
+	if (disto_on)
+		fprintf(stream,"         disto");
+	if (numpix_on)
+		fprintf(stream,"     nbpix");
+	if (disto_on && numpix_on)
+		fprintf(stream,"  disto/nbpix");
+	fprintf(stream, "\n");
+
+	for (tileno = 0; tileno < cstr_info->tw * cstr_info->th; tileno++) {
+		fprintf(stream, "%4d %9d %9d %9d %9d", 
+			cstr_info->tile[tileno].tileno,
+			cstr_info->tile[tileno].start_pos,
+			cstr_info->tile[tileno].end_header,
+			cstr_info->tile[tileno].end_pos,
+			cstr_info->tile[tileno].num_tps);
+		if (disto_on)
+			fprintf(stream," %9e", cstr_info->tile[tileno].distotile);
+		if (numpix_on)
+			fprintf(stream," %9d", cstr_info->tile[tileno].numpix);
+		if (disto_on && numpix_on)
+			fprintf(stream," %9e", cstr_info->tile[tileno].distotile / cstr_info->tile[tileno].numpix);
+		fprintf(stream, "\n");
+	}
+		
+	for (tileno = 0; tileno < cstr_info->tw * cstr_info->th; tileno++) {
+		OPJ_OFF_T start_pos, end_ph_pos, end_pos;
+		double disto = 0;
+		int max_numdecompos = 0;
+		pack_nb = 0;
+
+		for (compno = 0; compno < cstr_info->numcomps; compno++) {
+			if (max_numdecompos < cstr_info->numdecompos[compno])
+				max_numdecompos = cstr_info->numdecompos[compno];
+		}	
+
+		fprintf(stream, "\nTILE %d DETAILS\n", tileno);	
+		fprintf(stream, "part_nb tileno  start_pack num_packs  start_pos end_tph_pos   end_pos\n");
+		for (tilepartno = 0; tilepartno < cstr_info->tile[tileno].num_tps; tilepartno++)
+			fprintf(stream, "%4d %9d   %9d %9d  %9d %11d %9d\n",
+				tilepartno, tileno,
+				cstr_info->tile[tileno].tp[tilepartno].tp_start_pack,
+				cstr_info->tile[tileno].tp[tilepartno].tp_numpacks,
+				cstr_info->tile[tileno].tp[tilepartno].tp_start_pos,
+				cstr_info->tile[tileno].tp[tilepartno].tp_end_header,
+				cstr_info->tile[tileno].tp[tilepartno].tp_end_pos
+				);
+
+		if (cstr_info->prog == OPJ_LRCP) {	/* LRCP */
+			fprintf(stream, "LRCP\npack_nb tileno layno resno compno precno start_pos end_ph_pos end_pos");
+			if (disto_on)
+				fprintf(stream, " disto");
+			fprintf(stream,"\n");
+
+			for (layno = 0; layno < cstr_info->numlayers; layno++) {
+				for (resno = 0; resno < max_numdecompos + 1; resno++) {
+					for (compno = 0; compno < cstr_info->numcomps; compno++) {
+						int prec_max;
+						if (resno > cstr_info->numdecompos[compno])
+							break;
+						prec_max = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];
+						for (precno = 0; precno < prec_max; precno++) {
+							start_pos = cstr_info->tile[tileno].packet[pack_nb].start_pos;
+							end_ph_pos = cstr_info->tile[tileno].packet[pack_nb].end_ph_pos;
+							end_pos = cstr_info->tile[tileno].packet[pack_nb].end_pos;
+							disto = cstr_info->tile[tileno].packet[pack_nb].disto;
+							fprintf(stream, "%4d %6d %7d %5d %6d  %6d    %6" PRId64 "     %6" PRId64 " %7" PRId64,
+								pack_nb, tileno, layno, resno, compno, precno, start_pos, end_ph_pos, end_pos);
+							if (disto_on)
+								fprintf(stream, " %8e", disto);
+							fprintf(stream, "\n");
+							total_disto += disto;
+							pack_nb++;
+						}
+					}
+				}
+			}
+		} /* LRCP */
+
+		else if (cstr_info->prog == OPJ_RLCP) {	/* RLCP */			
+			fprintf(stream, "RLCP\npack_nb tileno resno layno compno precno start_pos end_ph_pos end_pos\n");
+			if (disto_on)
+				fprintf(stream, " disto");
+			fprintf(stream,"\n");
+
+			for (resno = 0; resno < max_numdecompos + 1; resno++) {
+				for (layno = 0; layno < cstr_info->numlayers; layno++) {
+					for (compno = 0; compno < cstr_info->numcomps; compno++) {
+						int prec_max; 
+						if (resno > cstr_info->numdecompos[compno])
+							break;
+						prec_max = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];
+						for (precno = 0; precno < prec_max; precno++) {
+							start_pos = cstr_info->tile[tileno].packet[pack_nb].start_pos;
+							end_ph_pos = cstr_info->tile[tileno].packet[pack_nb].end_ph_pos;
+							end_pos = cstr_info->tile[tileno].packet[pack_nb].end_pos;
+							disto = cstr_info->tile[tileno].packet[pack_nb].disto;
+							fprintf(stream, "%4d %6d %5d %7d %6d %6d %9" PRId64 "   %9" PRId64 " %7" PRId64,
+								pack_nb, tileno, resno, layno, compno, precno, start_pos, end_ph_pos, end_pos);
+							if (disto_on)
+								fprintf(stream, " %8e", disto);
+							fprintf(stream, "\n");
+							total_disto += disto;
+							pack_nb++;
+						}
+					}
+				}
+			}
+		} /* RLCP */
+
+		else if (cstr_info->prog == OPJ_RPCL) {	/* RPCL */
+
+			fprintf(stream, "RPCL\npack_nb tileno resno precno compno layno start_pos end_ph_pos end_pos"); 
+			if (disto_on)
+				fprintf(stream, " disto");
+			fprintf(stream,"\n");
+
+			for (resno = 0; resno < max_numdecompos + 1; resno++) {
+				int numprec = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];
+				for (precno = 0; precno < numprec; precno++) {								
+					/* I suppose components have same XRsiz, YRsiz */
+					int x0 = cstr_info->tile_Ox + tileno - (int)floor((float)tileno/(float)cstr_info->tw ) * cstr_info->tw * cstr_info->tile_x;
+					int y0 = cstr_info->tile_Ox + (int)floor( (float)tileno/(float)cstr_info->tw ) * cstr_info->tile_y;
+					int x1 = x0 + cstr_info->tile_x;
+					int y1 = y0 + cstr_info->tile_y;
+					for (compno = 0; compno < cstr_info->numcomps; compno++) {					
+						int pcnx = cstr_info->tile[tileno].pw[resno];
+						int pcx = (int) pow( 2, cstr_info->tile[tileno].pdx[resno] + cstr_info->numdecompos[compno] - resno );
+						int pcy = (int) pow( 2, cstr_info->tile[tileno].pdy[resno] + cstr_info->numdecompos[compno] - resno );
+						int precno_x = precno - (int) floor( (float)precno/(float)pcnx ) * pcnx;
+						int precno_y = (int) floor( (float)precno/(float)pcnx );
+						if (resno > cstr_info->numdecompos[compno])
+							break;
+						for(y = y0; y < y1; y++) {							
+							if (precno_y*pcy == y ) {
+								for (x = x0; x < x1; x++) {									
+									if (precno_x*pcx == x ) {
+										for (layno = 0; layno < cstr_info->numlayers; layno++) {
+											start_pos = cstr_info->tile[tileno].packet[pack_nb].start_pos;
+											end_ph_pos = cstr_info->tile[tileno].packet[pack_nb].end_ph_pos;
+											end_pos = cstr_info->tile[tileno].packet[pack_nb].end_pos;
+											disto = cstr_info->tile[tileno].packet[pack_nb].disto;
+											fprintf(stream, "%4d %6d %5d %6d %6d %7d %9" PRId64 "   %9" PRId64 " %7" PRId64,
+												pack_nb, tileno, resno, precno, compno, layno, start_pos, end_ph_pos, end_pos); 
+											if (disto_on)
+												fprintf(stream, " %8e", disto);
+											fprintf(stream, "\n");
+											total_disto += disto;
+											pack_nb++; 
+										}
+									}
+								}/* x = x0..x1 */
+							} 
+						}  /* y = y0..y1 */
+					} /* precno */
+				} /* compno */
+			} /* resno */
+		} /* RPCL */
+
+		else if (cstr_info->prog == OPJ_PCRL) {	/* PCRL */
+			/* I suppose components have same XRsiz, YRsiz */
+			int x0 = cstr_info->tile_Ox + tileno - (int)floor( (float)tileno/(float)cstr_info->tw ) * cstr_info->tw * cstr_info->tile_x;
+			int y0 = cstr_info->tile_Ox + (int)floor( (float)tileno/(float)cstr_info->tw ) * cstr_info->tile_y;
+			int x1 = x0 + cstr_info->tile_x;
+			int y1 = y0 + cstr_info->tile_y;
+
+			/* Count the maximum number of precincts */
+			int max_numprec = 0;
+			for (resno = 0; resno < max_numdecompos + 1; resno++) {
+				int numprec = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];
+				if (numprec > max_numprec)
+					max_numprec = numprec;
+			}
+
+			fprintf(stream, "PCRL\npack_nb tileno precno compno resno layno start_pos end_ph_pos end_pos"); 
+			if (disto_on)
+				fprintf(stream, " disto");
+			fprintf(stream,"\n");
+
+			for (precno = 0; precno < max_numprec; precno++) {
+				for (compno = 0; compno < cstr_info->numcomps; compno++) {
+					for (resno = 0; resno < cstr_info->numdecompos[compno] + 1; resno++) {
+						int numprec = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];
+						int pcnx = cstr_info->tile[tileno].pw[resno];
+						int pcx = (int) pow( 2, cstr_info->tile[tileno].pdx[resno] + cstr_info->numdecompos[compno] - resno );
+						int pcy = (int) pow( 2, cstr_info->tile[tileno].pdy[resno] + cstr_info->numdecompos[compno] - resno );
+						int precno_x = precno - (int) floor( (float)precno/(float)pcnx ) * pcnx;
+						int precno_y = (int) floor( (float)precno/(float)pcnx );
+						if (precno >= numprec)
+							continue;
+						for(y = y0; y < y1; y++) {							
+							if (precno_y*pcy == y ) {
+								for (x = x0; x < x1; x++) {									
+									if (precno_x*pcx == x ) {
+										for (layno = 0; layno < cstr_info->numlayers; layno++) {
+											start_pos = cstr_info->tile[tileno].packet[pack_nb].start_pos;
+											end_ph_pos = cstr_info->tile[tileno].packet[pack_nb].end_ph_pos;
+											end_pos = cstr_info->tile[tileno].packet[pack_nb].end_pos;
+											disto = cstr_info->tile[tileno].packet[pack_nb].disto;
+											fprintf(stream, "%4d %6d %6d %6d %5d %7d %9" PRId64 "   %9" PRId64 " %7" PRId64,
+												pack_nb, tileno, precno, compno, resno, layno, start_pos, end_ph_pos, end_pos); 
+											if (disto_on)
+												fprintf(stream, " %8e", disto);
+											fprintf(stream, "\n");
+											total_disto += disto;
+											pack_nb++; 
+										}
+									}
+								}/* x = x0..x1 */
+							} 
+						}  /* y = y0..y1 */
+					} /* resno */
+				} /* compno */
+			} /* precno */
+		} /* PCRL */
+
+		else {	/* CPRL */
+			/* Count the maximum number of precincts */
+			int max_numprec = 0;
+			for (resno = 0; resno < max_numdecompos + 1; resno++) {
+				int numprec = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];
+				if (numprec > max_numprec)
+					max_numprec = numprec;
+			}
+
+			fprintf(stream, "CPRL\npack_nb tileno compno precno resno layno start_pos end_ph_pos end_pos"); 
+			if (disto_on)
+				fprintf(stream, " disto");
+			fprintf(stream,"\n");
+
+			for (compno = 0; compno < cstr_info->numcomps; compno++) {
+				/* I suppose components have same XRsiz, YRsiz */
+				int x0 = cstr_info->tile_Ox + tileno - (int)floor( (float)tileno/(float)cstr_info->tw ) * cstr_info->tw * cstr_info->tile_x;
+				int y0 = cstr_info->tile_Ox + (int)floor( (float)tileno/(float)cstr_info->tw ) * cstr_info->tile_y;
+				int x1 = x0 + cstr_info->tile_x;
+				int y1 = y0 + cstr_info->tile_y;
+
+				for (precno = 0; precno < max_numprec; precno++) {
+					for (resno = 0; resno < cstr_info->numdecompos[compno] + 1; resno++) {
+						int numprec = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];
+						int pcnx = cstr_info->tile[tileno].pw[resno];
+						int pcx = (int) pow( 2, cstr_info->tile[tileno].pdx[resno] + cstr_info->numdecompos[compno] - resno );
+						int pcy = (int) pow( 2, cstr_info->tile[tileno].pdy[resno] + cstr_info->numdecompos[compno] - resno );
+						int precno_x = precno - (int) floor( (float)precno/(float)pcnx ) * pcnx;
+						int precno_y = (int) floor( (float)precno/(float)pcnx );
+						if (precno >= numprec)
+							continue;
+
+						for(y = y0; y < y1; y++) {
+							if (precno_y*pcy == y ) {
+								for (x = x0; x < x1; x++) {
+									if (precno_x*pcx == x ) {
+										for (layno = 0; layno < cstr_info->numlayers; layno++) {
+											start_pos = cstr_info->tile[tileno].packet[pack_nb].start_pos;
+											end_ph_pos = cstr_info->tile[tileno].packet[pack_nb].end_ph_pos;
+											end_pos = cstr_info->tile[tileno].packet[pack_nb].end_pos;
+											disto = cstr_info->tile[tileno].packet[pack_nb].disto;
+											fprintf(stream, "%4d %6d %6d %6d %5d %7d %9" PRId64 "   %9" PRId64 " %7" PRId64,
+												pack_nb, tileno, compno, precno, resno, layno, start_pos, end_ph_pos, end_pos); 
+											if (disto_on)
+												fprintf(stream, " %8e", disto);
+											fprintf(stream, "\n");
+											total_disto += disto;
+											pack_nb++; 
+										}
+									}
+								}/* x = x0..x1 */
+							}
+						} /* y = y0..y1 */
+					} /* resno */
+				} /* precno */
+			} /* compno */
+		} /* CPRL */   
+	} /* tileno */
+	
+	if (disto_on) {
+		fprintf(stream, "%8e\n", cstr_info->D_max); /* SE max */	
+		fprintf(stream, "%.8e\n", total_disto);	/* SE totale */
+	}
+/* UniPG>> */
+	/* print the markers' list */
+	if (cstr_info->marknum) {
+		fprintf(stream, "\nMARKER LIST\n");
+		fprintf(stream, "%d\n", cstr_info->marknum);
+		fprintf(stream, "type\tstart_pos    length\n");
+		for (x = 0; x < cstr_info->marknum; x++)
+			fprintf(stream, "%X\t%9" PRId64 " %9d\n", cstr_info->marker[x].type, cstr_info->marker[x].pos, cstr_info->marker[x].len);
+	}
+/* <<UniPG */
+	fclose(stream);
+
+	fprintf(stderr,"Generated index file %s\n", index);
+
+	return 0;
+}

src/bin/jp2/index.h

@@ -0,0 +1,54 @@
+/*
+ * The copyright in this software is being made available under the 2-clauses 
+ * BSD License, included below. This software may be subject to other third 
+ * party and contributor rights, including patent rights, and no such rights
+ * are granted under this license.
+ *
+ * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2014, Professor Benoit Macq
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux
+ * 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.
+ */
+
+#ifndef __J2K_INDEX_H
+#define __J2K_INDEX_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+Write a structured index to a file
+@param cstr_info Codestream information 
+@param index Index filename
+@return Returns 0 if successful, returns 1 otherwise
+*/
+int write_index_file(opj_codestream_info_t *cstr_info, char *index);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __J2K_INDEX_H */
+

src/bin/jp2/opj_dump.c

@@ -0,0 +1,596 @@
+/*
+ * The copyright in this software is being made available under the 2-clauses 
+ * BSD License, included below. This software may be subject to other third 
+ * party and contributor rights, including patent rights, and no such rights
+ * are granted under this license.
+ *
+ * Copyright (c) 2010, Mathieu Malaterre, GDCM
+ * Copyright (c) 2011-2012, Centre National d'Etudes Spatiales (CNES), France 
+ * Copyright (c) 2012, CS Systemes d'Information, France
+ * 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.
+ */
+#include "opj_config.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <math.h>
+
+#ifdef _WIN32
+#include "windirent.h"
+#else
+#include <dirent.h>
+#endif /* _WIN32 */
+
+#ifdef _WIN32
+#include <windows.h>
+#else
+#include <strings.h>
+#define _stricmp strcasecmp
+#define _strnicmp strncasecmp
+#endif /* _WIN32 */
+
+#include "openjpeg.h"
+#include "opj_getopt.h"
+#include "convert.h"
+#include "index.h"
+
+#include "format_defs.h"
+
+typedef struct dircnt{
+	/** Buffer for holding images read from Directory*/
+	char *filename_buf;
+	/** Pointer to the buffer*/
+	char **filename;
+}dircnt_t;
+
+
+typedef struct img_folder{
+	/** The directory path of the folder containing input images*/
+	char *imgdirpath;
+	/** Output format*/
+	const char *out_format;
+	/** Enable option*/
+	char set_imgdir;
+	/** Enable Cod Format for output*/
+	char set_out_format;
+
+  int flag;
+}img_fol_t;
+
+/* -------------------------------------------------------------------------- */
+/* Declarations                                                               */
+static int get_num_images(char *imgdirpath);
+static int load_images(dircnt_t *dirptr, char *imgdirpath);
+static int get_file_format(const char *filename);
+static char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_dparameters_t *parameters);
+static int infile_format(const char *fname);
+
+static int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,img_fol_t *img_fol);
+
+/* -------------------------------------------------------------------------- */
+static void decode_help_display(void) {
+	fprintf(stdout,"HELP for opj_dump\n----\n\n");
+	fprintf(stdout,"- the -h option displays this help information on screen\n\n");
+
+/* UniPG>> */
+	fprintf(stdout,"List of parameters for the JPEG 2000 "
+#ifdef USE_JPWL
+		"+ JPWL "
+#endif /* USE_JPWL */
+		"decoder:\n");
+/* <<UniPG */
+	fprintf(stdout,"\n");
+	fprintf(stdout,"\n");
+	fprintf(stdout,"  -ImgDir \n");
+	fprintf(stdout,"	Image file Directory path \n");
+	fprintf(stdout,"  -i <compressed file>\n");
+	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 <output file>\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,"  -v "); /* FIXME WIP_MSD */
+	fprintf(stdout,"    OPTIONAL\n");
+	fprintf(stdout,"    Activate or not the verbose mode (display info and warning message)\n");
+	fprintf(stdout,"    By default verbose mode is off.\n");
+	fprintf(stdout,"\n");
+}
+
+/* -------------------------------------------------------------------------- */
+static int get_num_images(char *imgdirpath){
+	DIR *dir;
+	struct dirent* content;	
+	int num_images = 0;
+
+	/*Reading the input images from given input directory*/
+
+	dir= opendir(imgdirpath);
+	if(!dir){
+		fprintf(stderr,"Could not open Folder %s\n",imgdirpath);
+		return 0;
+	}
+	
+	while((content=readdir(dir))!=NULL){
+		if(strcmp(".",content->d_name)==0 || strcmp("..",content->d_name)==0 )
+			continue;
+		num_images++;
+	}
+	return num_images;
+}
+
+/* -------------------------------------------------------------------------- */
+static int load_images(dircnt_t *dirptr, char *imgdirpath){
+	DIR *dir;
+	struct dirent* content;	
+	int i = 0;
+
+	/*Reading the input images from given input directory*/
+
+	dir= opendir(imgdirpath);
+	if(!dir){
+		fprintf(stderr,"Could not open Folder %s\n",imgdirpath);
+		return 1;
+	}else	{
+		fprintf(stderr,"Folder opened successfully\n");
+	}
+	
+	while((content=readdir(dir))!=NULL){
+		if(strcmp(".",content->d_name)==0 || strcmp("..",content->d_name)==0 )
+			continue;
+
+		strcpy(dirptr->filename[i],content->d_name);
+		i++;
+	}
+	return 0;	
+}
+
+/* -------------------------------------------------------------------------- */
+static int get_file_format(const char *filename) {
+	unsigned int i;
+	static const char *extension[] = {"pgx", "pnm", "pgm", "ppm", "bmp","tif", "raw", "tga", "png", "j2k", "jp2", "jpt", "j2c", "jpc"  };
+	static const int format[] = { PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, TIF_DFMT, RAW_DFMT, TGA_DFMT, PNG_DFMT, J2K_CFMT, JP2_CFMT, JPT_CFMT, J2K_CFMT, J2K_CFMT };
+	char * ext = strrchr(filename, '.');
+	if (ext == NULL)
+		return -1;
+	ext++;
+	if(ext) {
+		for(i = 0; i < sizeof(format)/sizeof(*format); i++) {
+			if(_strnicmp(ext, extension[i], 3) == 0) {
+				return format[i];
+			}
+		}
+	}
+
+	return -1;
+}
+
+/* -------------------------------------------------------------------------- */
+static char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_dparameters_t *parameters){
+	char image_filename[OPJ_PATH_LEN], infilename[OPJ_PATH_LEN],outfilename[OPJ_PATH_LEN],temp_ofname[OPJ_PATH_LEN];
+	char *temp_p, temp1[OPJ_PATH_LEN]="";
+
+	strcpy(image_filename,dirptr->filename[imageno]);
+	fprintf(stderr,"File Number %d \"%s\"\n",imageno,image_filename);
+	parameters->decod_format = get_file_format(image_filename);
+	if (parameters->decod_format == -1)
+		return 1;
+	sprintf(infilename,"%s/%s",img_fol->imgdirpath,image_filename);
+	strncpy(parameters->infile, infilename, sizeof(infilename));
+
+	/*Set output file*/
+	strcpy(temp_ofname,strtok(image_filename,"."));
+	while((temp_p = strtok(NULL,".")) != NULL){
+		strcat(temp_ofname,temp1);
+		sprintf(temp1,".%s",temp_p);
+	}
+	if(img_fol->set_out_format==1){
+		sprintf(outfilename,"%s/%s.%s",img_fol->imgdirpath,temp_ofname,img_fol->out_format);
+		strncpy(parameters->outfile, outfilename, sizeof(outfilename));
+	}
+	return 0;
+}
+
+/* -------------------------------------------------------------------------- */
+#define JP2_RFC3745_MAGIC "\x00\x00\x00\x0c\x6a\x50\x20\x20\x0d\x0a\x87\x0a"
+#define JP2_MAGIC "\x0d\x0a\x87\x0a"
+/* position 45: "\xff\x52" */
+#define J2K_CODESTREAM_MAGIC "\xff\x4f\xff\x51"
+
+static int infile_format(const char *fname)
+{
+	FILE *reader;
+	const char *s, *magic_s;
+	int ext_format, magic_format;
+	unsigned char buf[12];
+	size_t l_nb_read; 
+
+	reader = fopen(fname, "rb");
+
+	if (reader == NULL)
+		return -1;
+
+	memset(buf, 0, 12);
+	l_nb_read = fread(buf, 1, 12, reader);
+	fclose(reader);
+	if (l_nb_read != 12)
+		return -1;
+
+
+
+	ext_format = get_file_format(fname);
+
+	if (ext_format == JPT_CFMT)
+		return JPT_CFMT;
+
+	if (memcmp(buf, JP2_RFC3745_MAGIC, 12) == 0 || memcmp(buf, JP2_MAGIC, 4) == 0) {
+		magic_format = JP2_CFMT;
+		magic_s = ".jp2";
+	}
+	else if (memcmp(buf, J2K_CODESTREAM_MAGIC, 4) == 0) {
+		magic_format = J2K_CFMT;
+		magic_s = ".j2k or .jpc or .j2c";
+	}
+	else
+		return -1;
+
+	if (magic_format == ext_format)
+		return ext_format;
+
+	s = fname + strlen(fname) - 4;
+
+	fputs("\n===========================================\n", stderr);
+	fprintf(stderr, "The extension of this file is incorrect.\n"
+					"FOUND %s. SHOULD BE %s\n", s, magic_s);
+	fputs("===========================================\n", stderr);
+
+	return magic_format;
+}
+/* -------------------------------------------------------------------------- */
+/**
+ * Parse the command line
+ */
+/* -------------------------------------------------------------------------- */
+static int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,img_fol_t *img_fol) {
+	int totlen, c;
+	opj_option_t long_option[]={
+		{"ImgDir",REQ_ARG, NULL ,'y'},
+	};
+	const char optlist[] = "i:o:f:hv";
+
+	totlen=sizeof(long_option);
+	img_fol->set_out_format = 0;
+	do {
+		c = opj_getopt_long(argc, argv,optlist,long_option,totlen);
+		if (c == -1)
+			break;
+		switch (c) {
+			case 'i':			/* input file */
+			{
+				char *infile = opj_optarg;
+				parameters->decod_format = infile_format(infile);
+				switch(parameters->decod_format) {
+					case J2K_CFMT:
+						break;
+					case JP2_CFMT:
+						break;
+					case JPT_CFMT:
+						break;
+					default:
+						fprintf(stderr, 
+							"!! Unrecognized format for infile : %s [accept only *.j2k, *.jp2, *.jpc or *.jpt] !!\n\n", 
+							infile);
+						return 1;
+				}
+				strncpy(parameters->infile, infile, sizeof(parameters->infile)-1);
+			}
+			break;
+
+				/* ------------------------------------------------------ */
+
+			case 'o':     /* output file */
+			{
+			  char *outfile = opj_optarg;
+			  strncpy(parameters->outfile, outfile, sizeof(parameters->outfile)-1);
+			}
+			break;
+				
+				/* ----------------------------------------------------- */
+      case 'f': 			/* flag */
+        img_fol->flag = atoi(opj_optarg);
+        break;
+				/* ----------------------------------------------------- */
+
+			case 'h': 			/* display an help description */
+				decode_help_display();
+				return 1;				
+
+				/* ------------------------------------------------------ */
+
+			case 'y':			/* Image Directory path */
+			{
+				img_fol->imgdirpath = (char*)malloc(strlen(opj_optarg) + 1);
+				strcpy(img_fol->imgdirpath,opj_optarg);
+				img_fol->set_imgdir=1;
+			}
+			break;
+
+			/* ----------------------------------------------------- */
+
+			case 'v':     		/* Verbose mode */
+			{
+				parameters->m_verbose = 1;
+			}
+			break;
+			
+				/* ----------------------------------------------------- */
+			default:
+				fprintf(stderr,"WARNING -> this option is not valid \"-%c %s\"\n",c, opj_optarg);
+				break;
+		}
+	}while(c != -1);
+
+	/* check for possible errors */
+	if(img_fol->set_imgdir==1){
+		if(!(parameters->infile[0]==0)){
+			fprintf(stderr, "Error: options -ImgDir and -i cannot be used together !!\n");
+			return 1;
+		}
+		if(img_fol->set_out_format == 0){
+			fprintf(stderr, "Error: When -ImgDir is used, -OutFor <FORMAT> must be used !!\n");
+			fprintf(stderr, "Only one format allowed! Valid format PGM, PPM, PNM, PGX, BMP, TIF, RAW and TGA!!\n");
+			return 1;
+		}
+		if(!(parameters->outfile[0] == 0)){
+			fprintf(stderr, "Error: options -ImgDir and -o cannot be used together !!\n");
+			return 1;
+		}
+	}else{
+		if(parameters->infile[0] == 0) {
+			fprintf(stderr, "Example: %s -i image.j2k\n",argv[0]);
+			fprintf(stderr, "    Try: %s -h\n",argv[0]);
+			return 1;
+		}
+	}
+
+	return 0;
+}
+
+/* -------------------------------------------------------------------------- */
+
+/**
+sample error debug callback expecting no client object
+*/
+static void error_callback(const char *msg, void *client_data) {
+	(void)client_data;
+	fprintf(stdout, "[ERROR] %s", msg);
+}
+/**
+sample warning debug callback expecting no client object
+*/
+static void warning_callback(const char *msg, void *client_data) {
+	(void)client_data;
+	fprintf(stdout, "[WARNING] %s", msg);
+}
+/**
+sample debug callback expecting no client object
+*/
+static void info_callback(const char *msg, void *client_data) {
+	(void)client_data;
+	fprintf(stdout, "[INFO] %s", msg);
+}
+
+/* -------------------------------------------------------------------------- */
+/**
+ * OPJ_DUMP MAIN
+ */
+/* -------------------------------------------------------------------------- */
+int main(int argc, char *argv[])
+{
+	FILE *fsrc = NULL, *fout = NULL;
+
+	opj_dparameters_t parameters;			/* Decompression parameters */
+	opj_image_t* image = NULL;					/* Image structure */
+	opj_codec_t* l_codec = NULL;				/* Handle to a decompressor */
+	opj_stream_t *l_stream = NULL;				/* Stream */
+	opj_codestream_info_v2_t* cstr_info = NULL;
+	opj_codestream_index_t* cstr_index = NULL;
+
+	OPJ_INT32 num_images, imageno;
+	img_fol_t img_fol;
+	dircnt_t *dirptr = NULL;
+
+#ifdef MSD
+	OPJ_BOOL l_go_on = OPJ_TRUE;
+	OPJ_UINT32 l_max_data_size = 1000;
+	OPJ_BYTE * l_data = (OPJ_BYTE *) malloc(1000);
+#endif
+
+	/* Set decoding parameters to default values */
+	opj_set_default_decoder_parameters(&parameters);
+
+	/* Initialize img_fol */
+	memset(&img_fol,0,sizeof(img_fol_t));
+  img_fol.flag = OPJ_IMG_INFO | OPJ_J2K_MH_INFO | OPJ_J2K_MH_IND;
+
+	/* Parse input and get user encoding parameters */
+	if(parse_cmdline_decoder(argc, argv, &parameters,&img_fol) == 1) {
+		return EXIT_FAILURE;
+	}
+
+	/* Initialize reading of directory */
+	if(img_fol.set_imgdir==1){	
+		int it_image;
+		num_images=get_num_images(img_fol.imgdirpath);
+
+		dirptr=(dircnt_t*)malloc(sizeof(dircnt_t));
+		if(dirptr){
+			dirptr->filename_buf = (char*)malloc((size_t)num_images*OPJ_PATH_LEN*sizeof(char));	/* Stores at max 10 image file names*/
+			dirptr->filename = (char**) malloc((size_t)num_images*sizeof(char*));
+
+			if(!dirptr->filename_buf){
+				return EXIT_FAILURE;
+			}
+
+			for(it_image=0;it_image<num_images;it_image++){
+				dirptr->filename[it_image] = dirptr->filename_buf + it_image*OPJ_PATH_LEN;
+			}
+		}
+		if(load_images(dirptr,img_fol.imgdirpath)==1){
+			return EXIT_FAILURE;
+		}
+
+		if (num_images==0){
+			fprintf(stdout,"Folder is empty\n");
+			return EXIT_FAILURE;
+		}
+	}else{
+		num_images=1;
+	}
+
+	/* Try to open for writing the output file if necessary */
+	if (parameters.outfile[0] != 0){
+		fout = fopen(parameters.outfile,"w");
+		if (!fout){
+			fprintf(stderr, "ERROR -> failed to open %s for writing\n", parameters.outfile);
+			return EXIT_FAILURE;
+		}
+	}
+	else
+		fout = stdout;
+
+	/* Read the header of each image one by one */
+	for(imageno = 0; imageno < num_images ; imageno++){
+
+		fprintf(stderr,"\n");
+
+		if(img_fol.set_imgdir==1){
+			if (get_next_file(imageno, dirptr,&img_fol, &parameters)) {
+				fprintf(stderr,"skipping file...\n");
+				continue;
+			}
+		}
+
+		/* Read the input file and put it in memory */
+		/* ---------------------------------------- */
+		fsrc = fopen(parameters.infile, "rb");
+		if (!fsrc) {
+			fprintf(stderr, "ERROR -> failed to open %s for reading\n", parameters.infile);
+			return EXIT_FAILURE;
+		}
+
+		l_stream = opj_stream_create_default_file_stream(fsrc,1);
+		if (!l_stream){
+			fclose(fsrc);
+			fprintf(stderr, "ERROR -> failed to create the stream from the file\n");
+			return EXIT_FAILURE;
+		}
+
+		/* Read the JPEG2000 stream */
+		/* ------------------------ */
+
+		switch(parameters.decod_format) {
+			case J2K_CFMT:	/* JPEG-2000 codestream */
+			{
+				/* Get a decoder handle */
+				l_codec = opj_create_decompress(OPJ_CODEC_J2K);
+				break;
+			}
+			case JP2_CFMT:	/* JPEG 2000 compressed image data */
+			{
+				/* Get a decoder handle */
+				l_codec = opj_create_decompress(OPJ_CODEC_JP2);
+				break;
+			}
+			case JPT_CFMT:	/* JPEG 2000, JPIP */
+			{
+				/* Get a decoder handle */
+				l_codec = opj_create_decompress(OPJ_CODEC_JPT);
+				break;
+			}
+			default:
+				fprintf(stderr, "skipping file..\n");
+				opj_stream_destroy(l_stream);
+				continue;
+		}
+
+		/* catch events using our callbacks and give a local context */		
+		opj_set_info_handler(l_codec, info_callback,00);
+		opj_set_warning_handler(l_codec, warning_callback,00);
+		opj_set_error_handler(l_codec, error_callback,00);
+
+		/* Setup the decoder decoding parameters using user parameters */
+		if ( !opj_setup_decoder(l_codec, &parameters) ){
+			fprintf(stderr, "ERROR -> opj_dump: failed to setup the decoder\n");
+			opj_stream_destroy(l_stream);
+			fclose(fsrc);
+			opj_destroy_codec(l_codec);
+			fclose(fout);
+			return EXIT_FAILURE;
+		}
+
+		/* Read the main header of the codestream and if necessary the JP2 boxes*/
+		if(! opj_read_header(l_stream, l_codec, &image)){
+			fprintf(stderr, "ERROR -> opj_dump: failed to read the header\n");
+			opj_stream_destroy(l_stream);
+			fclose(fsrc);
+			opj_destroy_codec(l_codec);
+			opj_image_destroy(image);
+			fclose(fout);
+			return EXIT_FAILURE;
+		}
+
+		opj_dump_codec(l_codec, img_fol.flag, fout );
+
+		cstr_info = opj_get_cstr_info(l_codec);
+
+		cstr_index = opj_get_cstr_index(l_codec);
+
+		/* close the byte stream */
+		opj_stream_destroy(l_stream);
+		fclose(fsrc);
+
+		/* free remaining structures */
+		if (l_codec) {
+			opj_destroy_codec(l_codec);
+		}
+
+		/* destroy the image header */
+		opj_image_destroy(image);
+
+		/* destroy the codestream index */
+		opj_destroy_cstr_index(&cstr_index);
+
+		/* destroy the codestream info */
+		opj_destroy_cstr_info(&cstr_info);
+
+	}
+
+	/* Close the output file */
+	fclose(fout);
+
+  return EXIT_SUCCESS;
+}

src/bin/jp3d/CMakeLists.txt

@@ -0,0 +1,41 @@
+# Build the demo app, small examples
+
+# First thing define the common source:
+SET(common_SRCS
+  convert.c
+  ${OPENJPEG_SOURCE_DIR}/src/bin/common/opj_getopt.c
+  )
+
+# Headers file are located here:
+include_directories(
+  ${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp3d
+  ${LCMS_INCLUDE_DIRNAME}
+  ${OPENJPEG_SOURCE_DIR}/src/bin/common
+  ${Z_INCLUDE_DIRNAME}
+  ${PNG_INCLUDE_DIRNAME}
+  ${TIFF_INCLUDE_DIRNAME}
+  )
+
+if(WIN32)
+  if(BUILD_SHARED_LIBS)
+    add_definitions(-DOPJ_EXPORTS)
+  else()
+    add_definitions(-DOPJ_STATIC)
+  endif()
+endif()
+
+# Loop over all executables:
+FOREACH(exe opj_jp3d_compress opj_jp3d_decompress)
+  ADD_EXECUTABLE(${exe} ${exe}.c ${common_SRCS})
+  TARGET_LINK_LIBRARIES(${exe} openjp3d)
+  # On unix you need to link to the math library:
+  IF(UNIX)
+    TARGET_LINK_LIBRARIES(${exe} m)
+  ENDIF(UNIX)
+  # Install exe
+  INSTALL(TARGETS ${exe}
+    EXPORT OpenJP3DTargets
+    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
+  )
+endforeach()

src/bin/jp3d/convert.h

@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
+ * Copyright (c) 2006, M<>nica D<>ez Garc<72>a, Image Processing Laboratory, University of Valladolid, Spain
+ * 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.
+ */
+#ifndef __JP3D_CONVERT_H
+#define __JP3D_CONVERT_H
+
+/**
+Load a single volume component encoded in PGX file format
+@param filename Name of the PGX file to load
+@param parameters *List ?*
+@return Returns a greyscale volume if successful, returns NULL otherwise
+*/
+opj_volume_t* pgxtovolume(char *filename, opj_cparameters_t *parameters);
+
+int volumetopgx(opj_volume_t *volume, char *outfile);
+
+opj_volume_t* bintovolume(char *filename,char *fileimg, opj_cparameters_t *parameters);
+
+int volumetobin(opj_volume_t *volume, char *outfile);
+
+opj_volume_t* imgtovolume(char *fileimg, opj_cparameters_t *parameters);
+
+#endif /* __J2K_CONVERT_H */
+

src/bin/jp3d/getopt.c

@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 1987, 1993, 1994
+ *	The Regents of the University of California.  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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ */
+
+/* last review : october 29th, 2002 */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)getopt.c	8.3 (Berkeley) 4/27/95";
+#endif				/* LIBC_SCCS and not lint */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+int opterr = 1,			/* if error message should be printed */
+ optind = 1,			/* index into parent argv vector */
+ optopt,				/* character checked for validity */
+ optreset;				/* reset getopt */
+char *optarg;			/* argument associated with option */
+
+#define	BADCH	(int)'?'
+#define	BADARG	(int)':'
+#define	EMSG	""
+
+/*
+ * getopt --
+ *	Parse argc/argv argument vector.
+ */
+int getopt(int nargc, char *const *nargv, const char *ostr) {
+	
+  #  define __progname nargv[0] /* program name */
+	
+  static char *place = EMSG;	/* option letter processing */
+  char *oli;					/* option letter list index */
+
+  if (optreset || !*place) {	/* update scanning pointer */
+    optreset = 0;
+    if (optind >= nargc || *(place = nargv[optind]) != '-') {
+      place = EMSG;
+      return (-1);
+    }
+    if (place[1] && *++place == '-') {	/* found "--" */
+      ++optind;
+      place = EMSG;
+      return (-1);
+    }
+  }	/* option letter okay? */
+  
+  if ((optopt = (int) *place++) == (int) ':' || !(oli = strchr(ostr, optopt))) {
+    /* if the user didn't specify '-' as an option, assume it means -1. */
+    if (optopt == (int) '-')
+      return (-1);
+    if (!*place)
+      ++optind;
+    if (opterr && *ostr != ':')
+      (void) fprintf(stdout,"[ERROR] %s: illegal option -- %c\n", __progname, optopt);
+    return (BADCH);
+  }
+
+  if (*++oli != ':') {		/* don't need argument */
+    optarg = NULL;
+    if (!*place)
+      ++optind;
+  } else {					/* need an argument */
+    if (*place)						/* no white space */
+      optarg = place;
+    else if (nargc <= ++optind) {	/* no arg */
+      place = EMSG;
+      if (*ostr == ':')
+		return (BADARG);
+      if (opterr)
+		(void) fprintf(stdout, "[ERROR] %s: option requires an argument -- %c\n", __progname, optopt);
+      return (BADCH);
+    } else							/* white space */
+      optarg = nargv[optind];
+    place = EMSG;
+    ++optind;
+  }
+  return (optopt);		/* dump back option letter */
+}

src/bin/jp3d/getopt.h

@@ -0,0 +1,14 @@
+/* last review : october 29th, 2002 */
+
+#ifndef _GETOPT_H_
+#define _GETOPT_H_
+
+extern int opterr;
+extern int optind;
+extern int optopt;
+extern int optreset;
+extern char *optarg;
+
+extern int getopt(int nargc, char *const *nargv, const char *ostr);
+
+#endif				/* _GETOPT_H_ */