diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/AUTHORS b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/AUTHORS
deleted file mode 100644
index dd765ac07d02b70ebf2269ed1104922c755afbfa..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/AUTHORS
+++ /dev/null
@@ -1,13 +0,0 @@
-Authors of OpenJPEG
-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.
-Giuseppe Baruffa added the JPWL functionalities.
-Yannick Verschueren, 
-Herve Drolon, 
-Francois-Olivier Devaux, 
-Antonin Descampe
-    improved the libraries and utilities.
-
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/CMake/TestFileOffsetBits.c b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/CMake/TestFileOffsetBits.c
deleted file mode 100644
index 993b2da43e9a6c423b5604285d881f4ea12f09a9..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/CMake/TestFileOffsetBits.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <sys/types.h>
-
-int main(int argc, char **argv)
-{
-  /* 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 ];  
-  return 0;
-}
-
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/CMake/TestLargeFiles.c.cmake.in b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/CMake/TestLargeFiles.c.cmake.in
deleted file mode 100644
index 623f95f8ce98477e0d0b1eb053b9895ce93931e6..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/CMake/TestLargeFiles.c.cmake.in
+++ /dev/null
@@ -1,23 +0,0 @@
-#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;
-}
-
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/CMake/TestLargeFiles.cmake b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/CMake/TestLargeFiles.cmake
deleted file mode 100644
index 35ed9d2b67d8662d0e8c716eddb01b7ff5d34dda..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/CMake/TestLargeFiles.cmake
+++ /dev/null
@@ -1,134 +0,0 @@
-# - 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
-#  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(HAVE_FSEEKO ON CACHE INTERNAL "Result of test for fseeko/ftello")
-        else()
-                message(STATUS "Checking for fseeko/ftello - not found")
-                set(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()
-
-
-
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/CMake/TestWindowsFSeek.c b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/CMake/TestWindowsFSeek.c
deleted file mode 100644
index ad9f0be15482c13a7cf7ef99860e732c40182d00..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/CMake/TestWindowsFSeek.c
+++ /dev/null
@@ -1,11 +0,0 @@
-
-#include <stdio.h>
-    
-int main()
-{
-  __int64 off=0;
-
-  _fseeki64(NULL, off, SEEK_SET);
-        
-  return 0;
-}
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/LICENSE b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/LICENSE
deleted file mode 100644
index 48469dff45e2f8b5a4b743e6d6850ad558b7c12f..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/LICENSE
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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-2011, 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
- * 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.
- */
\ No newline at end of file
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/README-OTB.txt b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/README-OTB.txt
deleted file mode 100644
index 9e8254909fac6398ab60cf99687665c149f80ad3..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/README-OTB.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-This directory contains a subset of the OpenJPEG project (http://www.openjpeg.org/).
-
-The OpenJPEG library is an open-source JPEG 2000 codec written in C language. It
-has been developed in order to promote the use of JPEG 2000, the new still-image
-compression standard from the Joint Photographic Experts Group (JPEG). In
-addition to the basic codec, various other features are under development, among
-them the  JP2 and MJ2 (Motion JPEG 2000) file formats, an indexing tool useful
-for the JPIP  protocol, JPWL-tools for error-resilience, a Java-viewer for
-j2k-images, ...
-
-The library is developed by the Communications and Remote Sensing Lab  (TELE),
-in the Universit� Catholique de Louvain (UCL).
-
-We only include enough of distribution to build libopenjpeg. For instance we do not
-include the codec subdirs.
-Furthermore, the standard OpenJPEG build process is replaced with a lightweight CMake process.
-
-We'd like to thank the OpenJPEG project for releasing an open source
-implementation of the JPEG2000 codec. In particular, thanks to Antonin Descampe
-for fixing the 'well known' 16bits j2k issue.
-
-The current version is based on SVN revision 1111
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/THANKS b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/THANKS
deleted file mode 100644
index c0d136ae0d9c43a30903e4f7d583154a17ce36fe..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/THANKS
+++ /dev/null
@@ -1,33 +0,0 @@
-OpenJPEG THANKS file
-
-Many people have contributed to OpenJPEG by reporting problems, suggesting various improvements,
-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
-Yannick Verschueren
-Sebastien Lugan
-Kaori Hagihara
-Peter Wimmer
-Francois-Olivier Devaux
-Antonin Descampe
-David Janssens
-Pr. Benoit Macq
-Luis Ibanez
-Ben Boeckel
-Vincent Nicolas
-Glenn Pearson
-Giuseppe Baruffa
-Arnaud Maye
-Rex Dieter
-David Burken
-Parvatha Elangovan
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/bio.c b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/bio.c
deleted file mode 100644
index 4c02f464d8da86f2b0ac743a6ce472c0006edd0e..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/bio.c
+++ /dev/null
@@ -1,187 +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 "opj_includes.h"
-
-/** @defgroup BIO BIO - Individual bit input-output stream */
-/*@{*/
-
-/** @name Local static functions */
-/*@{*/
-
-/**
-Write a bit
-@param bio BIO handle
-@param b Bit to write (0 or 1)
-*/
-static void bio_putbit(opj_bio_t *bio, int b);
-/**
-Read a bit
-@param bio BIO handle
-@return Returns the read bit
-*/
-static int bio_getbit(opj_bio_t *bio);
-/**
-Write a byte
-@param bio BIO handle
-@return Returns 0 if successful, returns 1 otherwise
-*/
-static int bio_byteout(opj_bio_t *bio);
-/**
-Read a byte
-@param bio BIO handle
-@return Returns 0 if successful, returns 1 otherwise
-*/
-static int bio_bytein(opj_bio_t *bio);
-
-/*@}*/
-
-/*@}*/
-
-/* 
-==========================================================
-   local functions
-==========================================================
-*/
-
-static int bio_byteout(opj_bio_t *bio) {
-	bio->buf = (bio->buf << 8) & 0xffff;
-	bio->ct = bio->buf == 0xff00 ? 7 : 8;
-	if (bio->bp >= bio->end) {
-		return 1;
-	}
-	*bio->bp++ = bio->buf >> 8;
-	return 0;
-}
-
-static int bio_bytein(opj_bio_t *bio) {
-	bio->buf = (bio->buf << 8) & 0xffff;
-	bio->ct = bio->buf == 0xff00 ? 7 : 8;
-	if (bio->bp >= bio->end) {
-		return 1;
-	}
-	bio->buf |= *bio->bp++;
-	return 0;
-}
-
-static void bio_putbit(opj_bio_t *bio, int b) {
-	if (bio->ct == 0) {
-		bio_byteout(bio);
-	}
-	bio->ct--;
-	bio->buf |= b << bio->ct;
-}
-
-static int bio_getbit(opj_bio_t *bio) {
-	if (bio->ct == 0) {
-		bio_bytein(bio);
-	}
-	bio->ct--;
-	return (bio->buf >> bio->ct) & 1;
-}
-
-/* 
-==========================================================
-   Bit Input/Output interface
-==========================================================
-*/
-
-opj_bio_t* bio_create(void) {
-	opj_bio_t *bio = (opj_bio_t*)opj_malloc(sizeof(opj_bio_t));
-	return bio;
-}
-
-void bio_destroy(opj_bio_t *bio) {
-	if(bio) {
-		opj_free(bio);
-	}
-}
-
-int bio_numbytes(opj_bio_t *bio) {
-	return (bio->bp - bio->start);
-}
-
-void bio_init_enc(opj_bio_t *bio, unsigned char *bp, int len) {
-	bio->start = bp;
-	bio->end = bp + len;
-	bio->bp = bp;
-	bio->buf = 0;
-	bio->ct = 8;
-}
-
-void bio_init_dec(opj_bio_t *bio, unsigned char *bp, int len) {
-	bio->start = bp;
-	bio->end = bp + len;
-	bio->bp = bp;
-	bio->buf = 0;
-	bio->ct = 0;
-}
-
-void bio_write(opj_bio_t *bio, int v, int n) {
-	int i;
-	for (i = n - 1; i >= 0; i--) {
-		bio_putbit(bio, (v >> i) & 1);
-	}
-}
-
-int bio_read(opj_bio_t *bio, int n) {
-	int i, v;
-	v = 0;
-	for (i = n - 1; i >= 0; i--) {
-		v += bio_getbit(bio) << i;
-	}
-	return v;
-}
-
-int bio_flush(opj_bio_t *bio) {
-	bio->ct = 0;
-	if (bio_byteout(bio)) {
-		return 1;
-	}
-	if (bio->ct == 7) {
-		bio->ct = 0;
-		if (bio_byteout(bio)) {
-			return 1;
-		}
-	}
-	return 0;
-}
-
-int bio_inalign(opj_bio_t *bio) {
-	bio->ct = 0;
-	if ((bio->buf & 0xff) == 0xff) {
-		if (bio_bytein(bio)) {
-			return 1;
-		}
-		bio->ct = 0;
-	}
-	return 0;
-}
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/bio.h b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/bio.h
deleted file mode 100644
index 764d7cb2e92a51ea2a6cbbb1750de837e06ed3aa..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/bio.h
+++ /dev/null
@@ -1,125 +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.
- */
-
-#ifndef __BIO_H
-#define __BIO_H
-/** 
-@file bio.h
-@brief Implementation of an individual bit input-output (BIO)
-
-The functions in BIO.C have for goal to realize an individual bit input - output.
-*/
-
-/** @defgroup BIO BIO - Individual bit input-output stream */
-/*@{*/
-
-/**
-Individual bit input-output stream (BIO)
-*/
-typedef struct opj_bio {
-	/** pointer to the start of the buffer */
-	unsigned char *start;
-	/** pointer to the end of the buffer */
-	unsigned char *end;
-	/** pointer to the present position in the buffer */
-	unsigned char *bp;
-	/** temporary place where each byte is read or written */
-	unsigned int buf;
-	/** coder : number of bits free to write. decoder : number of bits read */
-	int ct;
-} opj_bio_t;
-
-/** @name Exported functions */
-/*@{*/
-/* ----------------------------------------------------------------------- */
-/**
-Create a new BIO handle 
-@return Returns a new BIO handle if successful, returns NULL otherwise
-*/
-opj_bio_t* bio_create(void);
-/**
-Destroy a previously created BIO handle
-@param bio BIO handle to destroy
-*/
-void bio_destroy(opj_bio_t *bio);
-/**
-Number of bytes written.
-@param bio BIO handle
-@return Returns the number of bytes written
-*/
-int bio_numbytes(opj_bio_t *bio);
-/**
-Init encoder
-@param bio BIO handle
-@param bp Output buffer
-@param len Output buffer length 
-*/
-void bio_init_enc(opj_bio_t *bio, unsigned char *bp, int len);
-/**
-Init decoder
-@param bio BIO handle
-@param bp Input buffer
-@param len Input buffer length 
-*/
-void bio_init_dec(opj_bio_t *bio, unsigned char *bp, int len);
-/**
-Write bits
-@param bio BIO handle
-@param v Value of bits
-@param n Number of bits to write
-*/
-void bio_write(opj_bio_t *bio, int v, int n);
-/**
-Read bits
-@param bio BIO handle
-@param n Number of bits to read 
-@return Returns the corresponding read number
-*/
-int bio_read(opj_bio_t *bio, int n);
-/**
-Flush bits
-@param bio BIO handle
-@return Returns 1 if successful, returns 0 otherwise
-*/
-int bio_flush(opj_bio_t *bio);
-/**
-Passes the ending bits (coming from flushing)
-@param bio BIO handle
-@return Returns 1 if successful, returns 0 otherwise
-*/
-int bio_inalign(opj_bio_t *bio);
-/* ----------------------------------------------------------------------- */
-/*@}*/
-
-/*@}*/
-
-#endif /* __BIO_H */
-
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/cidx_manager.c b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/cidx_manager.c
deleted file mode 100644
index 4b1c242cfed5e5f69f88c0644b4cab5165be0e24..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/cidx_manager.c
+++ /dev/null
@@ -1,209 +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;
-
-  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;
-}
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/cidx_manager.h b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/cidx_manager.h
deleted file mode 100644
index 23eebd52baa7641420357a88bb4ac6342e5a92cc..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/cidx_manager.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * $Id: cidx_manager.h 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.h from 2KAN indexer
- */
-
-
-#ifndef  CIDX_MANAGER_H_
-# define CIDX_MANAGER_H_
-
-#include "openjpeg.h"
-
-
-/* 
- * Write Codestream index box (superbox)
- *
- * @param[in] offset    offset of j2k codestream
- * @param[in] cio       file output handle
- * @param[in] image     image data
- * @param[in] cstr_info codestream information
- * @param[in] j2klen    length of j2k codestream
- * @return              length of cidx box
- */
-int write_cidx( int offset, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t cstr_info, int j2klen);
-
-
-#endif      /* !CIDX_MANAGER_H_ */
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/cio.c b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/cio.c
deleted file mode 100644
index 1628c215e2870cb38d74af6205a456252b771482..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/cio.c
+++ /dev/null
@@ -1,988 +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 "opj_includes.h"
-
-/* ----------------------------------------------------------------------- */
-
-opj_cio_t* OPJ_CALLCONV opj_cio_open(opj_common_ptr cinfo, unsigned char *buffer, int length) {
-	opj_cp_t *cp = NULL;
-	opj_cio_t *cio = (opj_cio_t*)opj_malloc(sizeof(opj_cio_t));
-	if(!cio) return NULL;
-	cio->cinfo = cinfo;
-	if(buffer && length) {
-		/* wrap a user buffer containing the encoded image */
-		cio->openmode = OPJ_STREAM_READ;
-		cio->buffer = buffer;
-		cio->length = length;
-	}
-	else if(!buffer && !length && cinfo) {
-		/* allocate a buffer for the encoded image */
-		cio->openmode = OPJ_STREAM_WRITE;
-		switch(cinfo->codec_format) {
-			case CODEC_J2K:
-				cp = ((opj_j2k_t*)cinfo->j2k_handle)->cp;
-				break;
-			case CODEC_JP2:
-				cp = ((opj_jp2_t*)cinfo->jp2_handle)->j2k->cp;
-				break;
-			default:
-				opj_free(cio);
-				return NULL;
-		}
-		cio->length = (unsigned int) (0.1625 * cp->img_size + 2000); /* 0.1625 = 1.3/8 and 2000 bytes as a minimum for headers */
-		cio->buffer = (unsigned char *)opj_malloc(cio->length);
-		if(!cio->buffer) {
-			opj_event_msg(cio->cinfo, EVT_ERROR, "Error allocating memory for compressed bitstream\n");
-			opj_free(cio);
-			return NULL;
-		}
-	}
-	else {
-		opj_free(cio);
-		return NULL;
-	}
-
-	/* Initialize byte IO */
-	cio->start = cio->buffer;
-	cio->end = cio->buffer + cio->length;
-	cio->bp = cio->buffer;
-
-	return cio;
-}
-
-void OPJ_CALLCONV opj_cio_close(opj_cio_t *cio) {
-	if(cio) {
-		if(cio->openmode == OPJ_STREAM_WRITE) {
-			/* destroy the allocated buffer */
-			opj_free(cio->buffer);
-		}
-		/* destroy the cio */
-		opj_free(cio);
-	}
-}
-
-
-/* ----------------------------------------------------------------------- */
-
-/*
- * Get position in byte stream.
- */
-int OPJ_CALLCONV cio_tell(opj_cio_t *cio) {
-	return cio->bp - cio->start;
-}
-
-/*
- * Set position in byte stream.
- *
- * pos : position, in number of bytes, from the beginning of the stream
- */
-void OPJ_CALLCONV cio_seek(opj_cio_t *cio, int pos) {
-	cio->bp = cio->start + pos;
-}
-
-/*
- * Number of bytes left before the end of the stream.
- */
-int cio_numbytesleft(opj_cio_t *cio) {
-	return cio->end - cio->bp;
-}
-
-/*
- * Get pointer to the current position in the stream.
- */
-unsigned char *cio_getbp(opj_cio_t *cio) {
-	return cio->bp;
-}
-
-/*
- * Write a byte.
- */
-opj_bool cio_byteout(opj_cio_t *cio, unsigned char v) {
-	if (cio->bp >= cio->end) {
-		opj_event_msg(cio->cinfo, EVT_ERROR, "write error\n");
-		return OPJ_FALSE;
-	}
-	*cio->bp++ = v;
-	return OPJ_TRUE;
-}
-
-/*
- * Read a byte.
- */
-unsigned char cio_bytein(opj_cio_t *cio) {
-	if (cio->bp >= cio->end) {
-		opj_event_msg(cio->cinfo, EVT_ERROR, "read error: passed the end of the codestream (start = %d, current = %d, end = %d\n", cio->start, cio->bp, cio->end);
-		return 0;
-	}
-	return *cio->bp++;
-}
-
-/*
- * Write some bytes.
- *
- * v : value to write
- * n : number of bytes to write
- */
-unsigned int cio_write(opj_cio_t *cio, unsigned long long int v, int n) {
-	int i;
-	for (i = n - 1; i >= 0; i--) {
-		if( !cio_byteout(cio, (unsigned char) ((v >> (i << 3)) & 0xff)) )
-			return 0;
-	}
-	return n;
-}
-
-/*
- * Read some bytes.
- *
- * n : number of bytes to read
- *
- * return : value of the n bytes read
- */
-unsigned int cio_read(opj_cio_t *cio, int n) {
-	int i;
-	unsigned int v;
-	v = 0;
-	for (i = n - 1; i >= 0; i--) {
-		v += cio_bytein(cio) << (i << 3);
-	}
-	return v;
-}
-
-/* 
- * Skip some bytes.
- *
- * n : number of bytes to skip
- */
-void cio_skip(opj_cio_t *cio, int n) {
-	cio->bp += n;
-}
-
-
-/* ----------------------------------------------------------------------- */
-
-
-/**
- * Write some bytes to the given data buffer, this function is used in Big Endian cpus.
- * @param p_buffer		pointer the data buffer to write data to.
- * @param p_value		the value to write
- * @param p_nb_bytes	the number of bytes to write
-*/
-void opj_write_bytes_BE (OPJ_BYTE * p_buffer, OPJ_UINT32 p_value, OPJ_UINT32 p_nb_bytes)
-{
-	const OPJ_BYTE * l_data_ptr = ((const OPJ_BYTE *) &p_value) + p_nb_bytes;
-
-	assert(p_nb_bytes > 0 && p_nb_bytes <=  sizeof(OPJ_UINT32));
-
-	memcpy(p_buffer,l_data_ptr,p_nb_bytes);
-}
-
-/**
- * Write some bytes to the given data buffer, this function is used in Little Endian cpus.
- * @param p_buffer		pointer the data buffer to write data to.
- * @param p_value		the value to write
- * @param p_nb_bytes	the number of bytes to write
- * @return				the number of bytes written or -1 if an error occured
-*/
-void opj_write_bytes_LE (OPJ_BYTE * p_buffer, OPJ_UINT32 p_value, OPJ_UINT32 p_nb_bytes)
-{
-	const OPJ_BYTE * l_data_ptr = ((const OPJ_BYTE *) &p_value) + p_nb_bytes - 1;
-	OPJ_UINT32 i;
-
-	assert(p_nb_bytes > 0 && p_nb_bytes <= sizeof(OPJ_UINT32));
-
-	for	(i=0;i<p_nb_bytes;++i) {
-		*(p_buffer++) = *(l_data_ptr--);
-	}
-}
-
-/**
- * Reads some bytes from the given data buffer, this function is used in Big Endian cpus.
- * @param p_buffer		pointer the data buffer to read data from.
- * @param p_value		pointer to the value that will store the data.
- * @param p_nb_bytes	the nb bytes to read.
- * @return				the number of bytes read or -1 if an error occured.
- */
-void opj_read_bytes_BE(const OPJ_BYTE * p_buffer, OPJ_UINT32 * p_value, OPJ_UINT32 p_nb_bytes)
-{
-	OPJ_BYTE * l_data_ptr = ((OPJ_BYTE *) p_value);
-
-	assert(p_nb_bytes > 0 && p_nb_bytes <= sizeof(OPJ_UINT32));
-
-	*p_value = 0;
-	memcpy(l_data_ptr+4-p_nb_bytes,p_buffer,p_nb_bytes);
-}
-
-/**
- * Reads some bytes from the given data buffer, this function is used in Little Endian cpus.
- * @param p_buffer		pointer the data buffer to read data from.
- * @param p_value		pointer to the value that will store the data.
- * @param p_nb_bytes	the nb bytes to read.
- * @return				the number of bytes read or -1 if an error occured.
- */
-void opj_read_bytes_LE(const OPJ_BYTE * p_buffer, OPJ_UINT32 * p_value, OPJ_UINT32 p_nb_bytes)
-{
-	OPJ_BYTE * l_data_ptr = ((OPJ_BYTE *) p_value) + p_nb_bytes-1;
-	OPJ_UINT32 i;
-
-	assert(p_nb_bytes > 0 && p_nb_bytes <= sizeof(OPJ_UINT32));
-
-	*p_value = 0;
-	for (i=0;i<p_nb_bytes;++i) {
-		*(l_data_ptr--) = *(p_buffer++);
-	}
-}
-
-/**
- * Write some bytes to the given data buffer, this function is used in Big Endian cpus.
- * @param p_buffer		pointer the data buffer to write data to.
- * @param p_value		the value to write
- * @return				the number of bytes written or -1 if an error occured
- */
-void opj_write_double_BE(OPJ_BYTE * p_buffer, OPJ_FLOAT64 p_value)
-{
-	const OPJ_BYTE * l_data_ptr = ((const OPJ_BYTE *) &p_value);
-	memcpy(p_buffer,l_data_ptr,sizeof(OPJ_FLOAT64));
-}
-
-/**
- * Write some bytes to the given data buffer, this function is used in Little Endian cpus.
- * @param p_buffer		pointer the data buffer to write data to.
- * @param p_value		the value to write
- */
-void opj_write_double_LE(OPJ_BYTE * p_buffer, OPJ_FLOAT64 p_value)
-{
-	const OPJ_BYTE * l_data_ptr = ((const OPJ_BYTE *) &p_value) + sizeof(OPJ_FLOAT64) - 1;
-	OPJ_UINT32 i;
-	for	(i=0;i<sizeof(OPJ_FLOAT64);++i) {
-		*(p_buffer++) = *(l_data_ptr--);
-	}
-}
-
-/**
- * Reads some bytes from the given data buffer, this function is used in Big Endian cpus.
- * @param p_buffer		pointer the data buffer to read data from.
- * @param p_value		pointer to the value that will store the data.
- */
-void opj_read_double_BE(const OPJ_BYTE * p_buffer, OPJ_FLOAT64 * p_value)
-{
-	OPJ_BYTE * l_data_ptr = ((OPJ_BYTE *) p_value);
-	memcpy(l_data_ptr,p_buffer,sizeof(OPJ_FLOAT64));
-}
-
-
-/**
- * Reads some bytes from the given data buffer, this function is used in Little Endian cpus.
- * @param p_buffer		pointer the data buffer to read data from.
- * @param p_value		pointer to the value that will store the data.
- */
-void opj_read_double_LE(const OPJ_BYTE * p_buffer, OPJ_FLOAT64 * p_value)
-{
-	OPJ_BYTE * l_data_ptr = ((OPJ_BYTE *) p_value) + sizeof(OPJ_FLOAT64)-1;
-	OPJ_UINT32 i;
-	for (i=0;i<sizeof(OPJ_FLOAT64);++i) {
-		*(l_data_ptr--) = *(p_buffer++);
-	}
-}
-
-/**
- * Write some bytes to the given data buffer, this function is used in Big Endian cpus.
- * @param p_buffer		pointer the data buffer to write data to.
- * @param p_value		the value to write
- * @return				the number of bytes written or -1 if an error occured
- */
-void opj_write_float_BE(OPJ_BYTE * p_buffer, OPJ_FLOAT32 p_value)
-{
-	const OPJ_BYTE * l_data_ptr = ((const OPJ_BYTE *) &p_value);
-	memcpy(p_buffer,l_data_ptr,sizeof(OPJ_FLOAT32));
-}
-
-/**
- * Write some bytes to the given data buffer, this function is used in Little Endian cpus.
- * @param p_buffer		pointer the data buffer to write data to.
- * @param p_value		the value to write
- */
-void opj_write_float_LE(OPJ_BYTE * p_buffer, OPJ_FLOAT32 p_value)
-{
-	const OPJ_BYTE * l_data_ptr = ((const OPJ_BYTE *) &p_value) + sizeof(OPJ_FLOAT32) - 1;
-	OPJ_UINT32 i;
-	for	(i=0;i<sizeof(OPJ_FLOAT32);++i) {
-		*(p_buffer++) = *(l_data_ptr--);
-	}
-}
-
-/**
- * Reads some bytes from the given data buffer, this function is used in Big Endian cpus.
- * @param p_buffer		pointer the data buffer to read data from.
- * @param p_value		pointer to the value that will store the data.
- */
-void opj_read_float_BE(const OPJ_BYTE * p_buffer, OPJ_FLOAT32 * p_value)
-{
-	OPJ_BYTE * l_data_ptr = ((OPJ_BYTE *) p_value);
-	memcpy(l_data_ptr,p_buffer,sizeof(OPJ_FLOAT32));
-}
-
-
-/**
- * Reads some bytes from the given data buffer, this function is used in Little Endian cpus.
- * @param p_buffer		pointer the data buffer to read data from.
- * @param p_value		pointer to the value that will store the data.
- */
-void opj_read_float_LE(const OPJ_BYTE * p_buffer, OPJ_FLOAT32 * p_value)
-{
-	OPJ_BYTE * l_data_ptr = ((OPJ_BYTE *) p_value) + sizeof(OPJ_FLOAT32)-1;
-	OPJ_UINT32 i;
-	for	(i=0;i<sizeof(OPJ_FLOAT32);++i) {
-		*(l_data_ptr--) = *(p_buffer++);
-	}
-}
-
-
-/**
- * Creates an abstract stream. This function does nothing except allocating memory and initializing the abstract stream.
- * @return a stream object.
-*/
-opj_stream_t* OPJ_CALLCONV opj_stream_create(OPJ_SIZE_T p_buffer_size,opj_bool l_is_input)
-{
-	opj_stream_private_t * l_stream = 00;
-	l_stream = (opj_stream_private_t*) opj_malloc(sizeof(opj_stream_private_t));
-	if (! l_stream) {
-		return 00;
-	}
-
-	memset(l_stream,0,sizeof(opj_stream_private_t));
-	l_stream->m_buffer_size = p_buffer_size;
-	l_stream->m_stored_data = (OPJ_BYTE *) opj_malloc(p_buffer_size);
-	if (! l_stream->m_stored_data) {
-		opj_free(l_stream);
-		return 00;
-	}
-
-	l_stream->m_current_data = l_stream->m_stored_data;
-
-	if (l_is_input) {
-		l_stream->m_status |= opj_stream_e_input;
-		l_stream->m_opj_skip = opj_stream_read_skip;
-		l_stream->m_opj_seek = opj_stream_read_seek;
-	}
-	else {
-		l_stream->m_status |= opj_stream_e_output;
-		l_stream->m_opj_skip = opj_stream_write_skip;
-		l_stream->m_opj_seek = opj_stream_write_seek;
-	}
-
-	l_stream->m_read_fn = opj_stream_default_read;
-	l_stream->m_write_fn = opj_stream_default_write;
-	l_stream->m_skip_fn = opj_stream_default_skip;
-	l_stream->m_seek_fn = opj_stream_default_seek;
-
-	return (opj_stream_t *) l_stream;
-}
-
-/**
- * Creates an abstract stream. This function does nothing except allocating memory and initializing the abstract stream.
- * @return a stream object.
-*/
-opj_stream_t* OPJ_CALLCONV opj_stream_default_create(opj_bool l_is_input)
-{
-	return opj_stream_create(J2K_STREAM_CHUNK_SIZE,l_is_input);
-}
-
-/**
- * Destroys a stream created by opj_create_stream. This function does NOT close the abstract stream. If needed the user must
- * close its own implementation of the stream.
- */
-OPJ_API void OPJ_CALLCONV opj_stream_destroy(opj_stream_t* p_stream)
-{
-	opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
-	if (l_stream) {
-		opj_free(l_stream->m_stored_data);
-		l_stream->m_stored_data = 00;
-		opj_free(l_stream);
-	}
-}
-
-/**
- * Sets the given function to be used as a read function.
- * @param		p_stream	the stream to modify
- * @param		p_function	the function to use a read function.
-*/
-OPJ_API void OPJ_CALLCONV opj_stream_set_read_function(opj_stream_t* p_stream, opj_stream_read_fn p_function)
-{
-	opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
-
-	if ((!l_stream) || (! (l_stream->m_status & opj_stream_e_input))) {
-		return;
-	}
-
-	l_stream->m_read_fn = p_function;
-}
-
-OPJ_API void OPJ_CALLCONV opj_stream_set_seek_function(opj_stream_t* p_stream, opj_stream_seek_fn p_function)
-{
-	opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
-	if
-		(!l_stream)
-	{
-		return;
-	}
-	l_stream->m_seek_fn = p_function;
-}
-
-/**
- * Sets the given function to be used as a write function.
- * @param		p_stream	the stream to modify
- * @param		p_function	the function to use a write function.
-*/
-OPJ_API void OPJ_CALLCONV opj_stream_set_write_function(opj_stream_t* p_stream, opj_stream_write_fn p_function)
-{
-	opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
-	if
-		((!l_stream )|| (! (l_stream->m_status & opj_stream_e_output)))
-	{
-		return;
-	}
-	l_stream->m_write_fn = p_function;
-}
-
-/**
- * Sets the given function to be used as a skip function.
- * @param		p_stream	the stream to modify
- * @param		p_function	the function to use a skip function.
-*/
-OPJ_API void OPJ_CALLCONV opj_stream_set_skip_function(opj_stream_t* p_stream, opj_stream_skip_fn p_function)
-{
-	opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
-	if
-		(! l_stream)
-	{
-		return;
-	}
-	l_stream->m_skip_fn = p_function;
-}
-
-/**
- * Sets the given data to be used as a user data for the stream.
- * @param		p_stream	the stream to modify
- * @param		p_data		the data to set.
-*/
-OPJ_API void OPJ_CALLCONV opj_stream_set_user_data(opj_stream_t* p_stream, void * p_data)
-{
-	opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
-	l_stream->m_user_data = p_data;
-}
-
-/**
- * Sets the given data to be used as a user data for the stream.
- * @param		p_stream	the stream to modify
- * @param		p_data		the data to set.
-*/
-OPJ_API void OPJ_CALLCONV opj_stream_set_user_data_length(opj_stream_t* p_stream, OPJ_UINT64 data_length)
-{
-	opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
-	l_stream->m_user_data_length = data_length;
-}
-
-/**
- * Reads some bytes from the stream.
- * @param		p_stream	the stream to read data from.
- * @param		p_buffer	pointer to the data buffer that will receive the data.
- * @param		p_size		number of bytes to read.
- * @param		p_event_mgr	the user event manager to be notified of special events.
- * @return		the number of bytes read, or -1 if an error occured or if the stream is at the end.
- */
-OPJ_SIZE_T opj_stream_read_data (opj_stream_private_t * p_stream,OPJ_BYTE * p_buffer, OPJ_SIZE_T p_size, opj_event_mgr_t * p_event_mgr)
-{
-	OPJ_SIZE_T l_read_nb_bytes = 0;
-	if (p_stream->m_bytes_in_buffer >= p_size) {
-		memcpy(p_buffer,p_stream->m_current_data,p_size);
-		p_stream->m_current_data += p_size;
-		p_stream->m_bytes_in_buffer -= p_size;
-		l_read_nb_bytes += p_size;
-		p_stream->m_byte_offset += p_size;
-		return l_read_nb_bytes;
-	}
-
-	/* we are now in the case when the remaining data if not sufficient */
-	if (p_stream->m_status & opj_stream_e_end) {
-		l_read_nb_bytes += p_stream->m_bytes_in_buffer;
-		memcpy(p_buffer,p_stream->m_current_data,p_stream->m_bytes_in_buffer);
-		p_stream->m_current_data += p_stream->m_bytes_in_buffer;
-		p_stream->m_byte_offset += p_stream->m_bytes_in_buffer;
-		p_stream->m_bytes_in_buffer = 0;
-		return l_read_nb_bytes ? l_read_nb_bytes : -1;
-	}
-
-	/* the flag is not set, we copy data and then do an actual read on the stream */
-	if (p_stream->m_bytes_in_buffer) {
-		l_read_nb_bytes += p_stream->m_bytes_in_buffer;
-		memcpy(p_buffer,p_stream->m_current_data,p_stream->m_bytes_in_buffer);
-		p_stream->m_current_data = p_stream->m_stored_data;
-		p_buffer += p_stream->m_bytes_in_buffer;
-		p_size -= p_stream->m_bytes_in_buffer;
-		p_stream->m_byte_offset += p_stream->m_bytes_in_buffer;
-		p_stream->m_bytes_in_buffer = 0;
-	}
-	else {
-    /* case where we are already at the end of the buffer
-       so reset the m_current_data to point to the start of the
-       stored buffer to get ready to read from disk*/
-		p_stream->m_current_data = p_stream->m_stored_data;
-	}
-
-
-	while(1){
-		/* we should read less than a chunk -> read a chunk */
-		if (p_size < p_stream->m_buffer_size) {
-			/* we should do an actual read on the media */
-			p_stream->m_bytes_in_buffer = p_stream->m_read_fn(p_stream->m_stored_data,p_stream->m_buffer_size,p_stream->m_user_data);
-
-			if (p_stream->m_bytes_in_buffer == -1) {
-				/* end of stream */
-				opj_event_msg_v2(p_event_mgr, EVT_INFO, "Stream reached its end !\n");
-
-				p_stream->m_bytes_in_buffer = 0;
-				p_stream->m_status |= opj_stream_e_end;
-				/* end of stream */
-				return l_read_nb_bytes ? l_read_nb_bytes : -1;
-			}
-			else if	(p_stream->m_bytes_in_buffer < p_size) {
-				/* not enough data */
-				l_read_nb_bytes += p_stream->m_bytes_in_buffer;
-				memcpy(p_buffer,p_stream->m_current_data,p_stream->m_bytes_in_buffer);
-				p_stream->m_current_data = p_stream->m_stored_data;
-				p_buffer += p_stream->m_bytes_in_buffer;
-				p_size -= p_stream->m_bytes_in_buffer;
-				p_stream->m_byte_offset += p_stream->m_bytes_in_buffer;
-				p_stream->m_bytes_in_buffer = 0;
-			}
-			else {
-				l_read_nb_bytes += p_size;
-				memcpy(p_buffer,p_stream->m_current_data,p_size);
-				p_stream->m_current_data += p_size;
-				p_stream->m_bytes_in_buffer -= p_size;
-				p_stream->m_byte_offset += p_size;
-				return l_read_nb_bytes;
-			}
-		}
-		else {
-			/* direct read on the dest buffer */
-			p_stream->m_bytes_in_buffer = p_stream->m_read_fn(p_buffer,p_size,p_stream->m_user_data);
-
-			if (p_stream->m_bytes_in_buffer == -1) {
-				/*  end of stream */
-				opj_event_msg_v2(p_event_mgr, EVT_INFO, "Stream reached its end !\n");
-
-				p_stream->m_bytes_in_buffer = 0;
-				p_stream->m_status |= opj_stream_e_end;
-				/* end of stream */
-				return l_read_nb_bytes ? l_read_nb_bytes : -1;
-			}
-			else if (p_stream->m_bytes_in_buffer < p_size) {
-				/* not enough data */
-				l_read_nb_bytes += p_stream->m_bytes_in_buffer;
-				p_stream->m_current_data = p_stream->m_stored_data;
-				p_buffer += p_stream->m_bytes_in_buffer;
-				p_size -= p_stream->m_bytes_in_buffer;
-				p_stream->m_byte_offset += p_stream->m_bytes_in_buffer;
-				p_stream->m_bytes_in_buffer = 0;
-			}
-			else {
-				/* we have read the exact size */
-				l_read_nb_bytes += p_stream->m_bytes_in_buffer;
-				p_stream->m_byte_offset += p_stream->m_bytes_in_buffer;
-				p_stream->m_current_data = p_stream->m_stored_data;
-				p_stream->m_bytes_in_buffer = 0;
-				return l_read_nb_bytes;
-			}
-		}
-	}
-}
-
-/**
- * Writes some bytes from the stream.
- * @param		p_stream	the stream to write data to.
- * @param		p_buffer	pointer to the data buffer holds the data to be writtent.
- * @param		p_size		number of bytes to write.
- * @param		p_event_mgr	the user event manager to be notified of special events.
- * @return		the number of bytes writtent, or -1 if an error occured.
- */
-OPJ_SIZE_T opj_stream_write_data (opj_stream_private_t * p_stream,const OPJ_BYTE * p_buffer,OPJ_SIZE_T p_size, opj_event_mgr_t * p_event_mgr)
-{
-	OPJ_SIZE_T l_remaining_bytes = 0;
-	OPJ_SIZE_T l_write_nb_bytes = 0;
-
-	if
-		(p_stream->m_status & opj_stream_e_error)
-	{
-		return -1;
-	}
-
-	while(1)
-	{
-		l_remaining_bytes = p_stream->m_buffer_size - p_stream->m_bytes_in_buffer;
-		// we have more memory than required
-		if
-			(l_remaining_bytes >= p_size)
-		{
-			memcpy(p_stream->m_current_data,p_buffer,p_size);
-			p_stream->m_current_data += p_size;
-			p_stream->m_bytes_in_buffer += p_size;
-			l_write_nb_bytes += p_size;
-			p_stream->m_byte_offset += p_size;
-			return l_write_nb_bytes;
-		}
-
-		// we copy data and then do an actual read on the stream
-		if
-			(l_remaining_bytes)
-		{
-			l_write_nb_bytes += l_remaining_bytes;
-			memcpy(p_stream->m_current_data,p_buffer,l_remaining_bytes);
-			p_stream->m_current_data = p_stream->m_stored_data;
-			p_buffer += l_remaining_bytes;
-			p_size -= l_remaining_bytes;
-			p_stream->m_bytes_in_buffer += l_remaining_bytes;
-			p_stream->m_byte_offset += l_remaining_bytes;
-		}
-		if
-			(! opj_stream_flush(p_stream, p_event_mgr))
-		{
-			return -1;
-		}
-	}
-
-}
-
-/**
- * Writes the content of the stream buffer to the stream.
- * @param		p_stream	the stream to write data to.
- * @param		p_event_mgr	the user event manager to be notified of special events.
- * @return		the number of bytes written, or -1 if an error occured.
- */
-opj_bool opj_stream_flush (opj_stream_private_t * p_stream, opj_event_mgr_t * p_event_mgr)
-{
-	// the number of bytes written on the media.
-	OPJ_SIZE_T l_current_write_nb_bytes = 0;
-	p_stream->m_current_data = p_stream->m_stored_data;
-
-	while
-		(p_stream->m_bytes_in_buffer)
-	{
-		// we should do an actual write on the media
-		l_current_write_nb_bytes = p_stream->m_write_fn(p_stream->m_current_data,p_stream->m_bytes_in_buffer,p_stream->m_user_data);
-		if
-			(l_current_write_nb_bytes == -1)
-		{
-			p_stream->m_status |= opj_stream_e_error;
-			opj_event_msg_v2(p_event_mgr, EVT_INFO, "Error on writting stream!\n");
-
-			return EXIT_FAILURE;
-		}
-		p_stream->m_current_data += l_current_write_nb_bytes;
-		p_stream->m_bytes_in_buffer -= l_current_write_nb_bytes;
-	}
-	p_stream->m_current_data = p_stream->m_stored_data;
-	return EXIT_SUCCESS;
-}
-
-/**
- * Skips a number of bytes from the stream.
- * @param		p_stream	the stream to skip data from.
- * @param		p_size		the number of bytes to skip.
- * @param		p_event_mgr	the user event manager to be notified of special events.
- * @return		the number of bytes skipped, or -1 if an error occured.
- */
-OPJ_OFF_T opj_stream_read_skip (opj_stream_private_t * p_stream, OPJ_OFF_T p_size, opj_event_mgr_t * p_event_mgr)
-{
-	OPJ_OFF_T l_skip_nb_bytes = 0;
-	OPJ_OFF_T l_current_skip_nb_bytes = 0;
-
-	if
-		(p_stream->m_bytes_in_buffer >= p_size)
-	{
-		p_stream->m_current_data += p_size;
-		// it is safe to cast p_size to OPJ_SIZE_T since it is <= m_bytes_in_buffer
-		// which is of type OPJ_SIZE_T
-		p_stream->m_bytes_in_buffer -= (OPJ_SIZE_T)p_size;
-		l_skip_nb_bytes += p_size;
-		p_stream->m_byte_offset += l_skip_nb_bytes;
-		return l_skip_nb_bytes;
-	}
-
-	// we are now in the case when the remaining data if not sufficient
-	if
-		(p_stream->m_status & opj_stream_e_end)
-	{
-		l_skip_nb_bytes += p_stream->m_bytes_in_buffer;
-		p_stream->m_current_data += p_stream->m_bytes_in_buffer;
-		p_stream->m_bytes_in_buffer = 0;
-		p_stream->m_byte_offset += l_skip_nb_bytes;
-		return l_skip_nb_bytes ? l_skip_nb_bytes : (OPJ_OFF_T) -1;
-	}
-
-	// the flag is not set, we copy data and then do an actual skip on the stream
-	if
-		(p_stream->m_bytes_in_buffer)
-	{
-		l_skip_nb_bytes += p_stream->m_bytes_in_buffer;
-		p_stream->m_current_data = p_stream->m_stored_data;
-		p_size -= p_stream->m_bytes_in_buffer;
-		p_stream->m_bytes_in_buffer = 0;
-	}
-
-	while
-		(p_size > 0)
-	{
-		// we should do an actual skip on the media
-		l_current_skip_nb_bytes = p_stream->m_skip_fn(p_size, p_stream->m_user_data);
-		if
-			(l_current_skip_nb_bytes == (OPJ_OFF_T) -1)
-		{
-			opj_event_msg_v2(p_event_mgr, EVT_INFO, "Stream reached its end !\n");
-
-			p_stream->m_status |= opj_stream_e_end;
-			p_stream->m_byte_offset += l_skip_nb_bytes;
-			// end if stream
-			return l_skip_nb_bytes ? l_skip_nb_bytes : (OPJ_OFF_T) -1;
-		}
-		p_size -= l_current_skip_nb_bytes;
-		l_skip_nb_bytes += l_current_skip_nb_bytes;
-	}
-	p_stream->m_byte_offset += l_skip_nb_bytes;
-	return l_skip_nb_bytes;
-}
-
-/**
- * Skips a number of bytes from the stream.
- * @param		p_stream	the stream to skip data from.
- * @param		p_size		the number of bytes to skip.
- * @param		p_event_mgr	the user event manager to be notified of special events.
- * @return		the number of bytes skipped, or -1 if an error occured.
- */
-OPJ_OFF_T opj_stream_write_skip (opj_stream_private_t * p_stream, OPJ_OFF_T p_size, opj_event_mgr_t * p_event_mgr)
-{
-	opj_bool l_is_written = 0;
-	OPJ_OFF_T l_current_skip_nb_bytes = 0;
-	OPJ_OFF_T l_skip_nb_bytes = 0;
-
-	if
-		(p_stream->m_status & opj_stream_e_error)
-	{
-		return (OPJ_OFF_T) -1;
-	}
-
-	// we should flush data
-	l_is_written = opj_stream_flush (p_stream, p_event_mgr);
-	if
-		(! l_is_written)
-	{
-		p_stream->m_status |= opj_stream_e_error;
-		p_stream->m_bytes_in_buffer = 0;
-		p_stream->m_current_data = p_stream->m_current_data;
-		return (OPJ_OFF_T) -1;
-	}
-	// then skip
-
-	while
-		(p_size > 0)
-	{
-		// we should do an actual skip on the media
-		l_current_skip_nb_bytes = p_stream->m_skip_fn(p_size, p_stream->m_user_data);
-		if
-			(l_current_skip_nb_bytes == (OPJ_OFF_T)-1)
-		{
-			opj_event_msg_v2(p_event_mgr, EVT_INFO, "Stream error!\n");
-
-			p_stream->m_status |= opj_stream_e_error;
-			p_stream->m_byte_offset += l_skip_nb_bytes;
-			// end if stream
-			return l_skip_nb_bytes ? l_skip_nb_bytes : (OPJ_OFF_T)-1;
-		}
-		p_size -= l_current_skip_nb_bytes;
-		l_skip_nb_bytes += l_current_skip_nb_bytes;
-	}
-	p_stream->m_byte_offset += l_skip_nb_bytes;
-	return l_skip_nb_bytes;
-}
-
-/**
- * Tells the byte offset on the stream (similar to ftell).
- *
- * @param		p_stream	the stream to get the information from.
- *
- * @return		the current position of the stream.
- */
-OPJ_OFF_T opj_stream_tell (const opj_stream_private_t * p_stream)
-{
-	return p_stream->m_byte_offset;
-}
-
-
-/**
- * Get the number of bytes left before the end of the stream (similar to cio_numbytesleft).
- *
- * @param		p_stream	the stream to get the information from.
- *
- * @return		Number of bytes left before the end of the stream.
- */
-OPJ_OFF_T opj_stream_get_number_byte_left (const opj_stream_private_t * p_stream)
-{
-	return p_stream->m_user_data_length ?
-				p_stream->m_user_data_length - p_stream->m_byte_offset :
-				0;
-}
-
-/**
- * Skips a number of bytes from the stream.
- * @param		p_stream	the stream to skip data from.
- * @param		p_size		the number of bytes to skip.
- * @param		p_event_mgr	the user event manager to be notified of special events.
- * @return		the number of bytes skipped, or -1 if an error occured.
- */
-OPJ_OFF_T opj_stream_skip (opj_stream_private_t * p_stream, OPJ_OFF_T p_size, opj_event_mgr_t * p_event_mgr)
-{
-	assert(p_size >= 0);
-	return p_stream->m_opj_skip(p_stream,p_size,p_event_mgr);
-}
-
-
-/**
- * Skips a number of bytes from the stream.
- * @param		p_stream	the stream to skip data from.
- * @param		p_size		the number of bytes to skip.
- * @param		p_event_mgr	the user event manager to be notified of special events.
- * @return		the number of bytes skipped, or -1 if an error occured.
- */
-opj_bool opj_stream_read_seek (opj_stream_private_t * p_stream, OPJ_OFF_T p_size, opj_event_mgr_t * p_event_mgr)
-{
-	OPJ_ARG_NOT_USED(p_event_mgr);
-	p_stream->m_current_data = p_stream->m_stored_data;
-	p_stream->m_bytes_in_buffer = 0;
-
-	if( p_stream->m_seek_fn(p_size,p_stream->m_user_data)) {
-		p_stream->m_status |= opj_stream_e_end;
-		return EXIT_FAILURE;
-	}
-	else {
-		// reset stream status
-		p_stream->m_status &= (~opj_stream_e_end);
-		p_stream->m_byte_offset = p_size;
-
-	}
-
-	return EXIT_SUCCESS;
-}
-
-/**
- * Skips a number of bytes from the stream.
- * @param		p_stream	the stream to skip data from.
- * @param		p_size		the number of bytes to skip.
- * @param		p_event_mgr	the user event manager to be notified of special events.
- * @return		the number of bytes skipped, or -1 if an error occured.
- */
-opj_bool opj_stream_write_seek (opj_stream_private_t * p_stream, OPJ_OFF_T p_size, opj_event_mgr_t * p_event_mgr)
-{
-	if
-		(! opj_stream_flush(p_stream,p_event_mgr))
-	{
-		p_stream->m_status |= opj_stream_e_error;
-		return EXIT_FAILURE;
-	}
-
-	p_stream->m_current_data = p_stream->m_stored_data;
-	p_stream->m_bytes_in_buffer = 0;
-
-	if
-		(! p_stream->m_seek_fn(p_size,p_stream->m_user_data))
-	{
-		p_stream->m_status |= opj_stream_e_error;
-		return EXIT_FAILURE;
-	}
-	else
-	{
-		p_stream->m_byte_offset = p_size;
-	}
-	return EXIT_SUCCESS;
-}
-
-
-/**
- * Seeks a number of bytes from the stream.
- * @param		p_stream	the stream to skip data from.
- * @param		p_size		the number of bytes to skip.
- * @param		p_event_mgr	the user event manager to be notified of special events.
- * @return		true if the stream is seekable.
- */
-opj_bool opj_stream_seek (opj_stream_private_t * p_stream, OPJ_OFF_T p_size, struct opj_event_mgr * p_event_mgr)
-{
-	assert(p_size >= 0);
-	return p_stream->m_opj_seek(p_stream,p_size,p_event_mgr);
-}
-
-/**
- * Tells if the given stream is seekable.
- */
-opj_bool opj_stream_has_seek (const opj_stream_private_t * p_stream)
-{
-	return p_stream->m_seek_fn != opj_stream_default_seek;
-}
-
-OPJ_SIZE_T opj_stream_default_read (void * p_buffer, OPJ_SIZE_T p_nb_bytes, void * p_user_data)
-{
-	OPJ_ARG_NOT_USED(p_buffer);
-	OPJ_ARG_NOT_USED(p_nb_bytes);
-	OPJ_ARG_NOT_USED(p_user_data);
-	return (OPJ_SIZE_T) -1;
-}
-
-OPJ_SIZE_T opj_stream_default_write (void * p_buffer, OPJ_SIZE_T p_nb_bytes, void * p_user_data)
-{
-	OPJ_ARG_NOT_USED(p_buffer);
-	OPJ_ARG_NOT_USED(p_nb_bytes);
-	OPJ_ARG_NOT_USED(p_user_data);
-	return (OPJ_SIZE_T) -1;
-}
-
-OPJ_OFF_T opj_stream_default_skip (OPJ_OFF_T p_nb_bytes, void * p_user_data)
-{
-	OPJ_ARG_NOT_USED(p_nb_bytes);
-	OPJ_ARG_NOT_USED(p_user_data);
-	return (OPJ_OFF_T) -1;
-}
-
-opj_bool opj_stream_default_seek (OPJ_OFF_T p_nb_bytes, void * p_user_data)
-{
-	OPJ_ARG_NOT_USED(p_nb_bytes);
-	OPJ_ARG_NOT_USED(p_user_data);
-	return EXIT_FAILURE;
-}
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/cio.h b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/cio.h
deleted file mode 100644
index b276930806e6ef703690eabdb5eccf1630c584a1..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/cio.h
+++ /dev/null
@@ -1,402 +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.
- */
-
-#ifndef __CIO_H
-#define __CIO_H
-/**
-@file cio.h
-@brief Implementation of a byte input-output process (CIO)
-
-The functions in CIO.C have for goal to realize a byte input / output process.
-*/
-
-/** @defgroup CIO CIO - byte input-output stream */
-/*@{*/
-
-#include "opj_config.h"
-
-/** @name Exported functions (see also openjpeg.h) */
-/*@{*/
-/* ----------------------------------------------------------------------- */
-/**
-Number of bytes left before the end of the stream
-@param cio CIO handle
-@return Returns the number of bytes before the end of the stream
-*/
-int cio_numbytesleft(opj_cio_t *cio);
-/**
-Get pointer to the current position in the stream
-@param cio CIO handle
-@return Returns a pointer to the current position
-*/
-unsigned char *cio_getbp(opj_cio_t *cio);
-/**
-Write some bytes
-@param cio CIO handle
-@param v Value to write
-@param n Number of bytes to write
-@return Returns the number of bytes written or 0 if an error occured
-*/
-unsigned int cio_write(opj_cio_t *cio, unsigned long long int v, int n);
-/**
-Read some bytes
-@param cio CIO handle
-@param n Number of bytes to read
-@return Returns the value of the n bytes read
-*/
-unsigned int cio_read(opj_cio_t *cio, int n);
-/**
-Skip some bytes
-@param cio CIO handle
-@param n Number of bytes to skip
-*/
-void cio_skip(opj_cio_t *cio, int n);
-/* ----------------------------------------------------------------------- */
-/*@}*/
-
-/*@}*/
-
-
-
-/* ----------------------------------------------------------------------- */
-
-#if defined(OPJ_BIG_ENDIAN)
-	#define opj_write_bytes		opj_write_bytes_BE
-	#define opj_read_bytes		opj_read_bytes_BE
-	#define opj_write_double	opj_write_double_BE
-	#define opj_read_double		opj_read_double_BE
-	#define opj_write_float		opj_write_float_BE
-	#define opj_read_float		opj_read_float_BE
-#else
-	#define opj_write_bytes		opj_write_bytes_LE
-	#define opj_read_bytes		opj_read_bytes_LE
-	#define opj_write_double	opj_write_double_LE
-	#define opj_read_double		opj_read_double_LE
-	#define opj_write_float		opj_write_float_LE
-	#define opj_read_float		opj_read_float_LE
-#endif
-
-
-
-typedef enum
-{
-	opj_stream_e_output		= 0x1,
-	opj_stream_e_input		= 0x2,
-	opj_stream_e_end		= 0x4,
-	opj_stream_e_error		= 0x8
-}
-opj_stream_flag ;
-
-/**
-Byte input-output stream.
-*/
-typedef struct opj_stream_private
-{
-	/**
-	 * User data, be it files, ... The actual data depends on the type of the stream.
-	 */
-	void *					m_user_data;
-
-	/**
-	 * User data length
-	 */
-	OPJ_UINT64 				m_user_data_length;
-
-	/**
-	 * Pointer to actual read function (NULL at the initialization of the cio.
-	 */
-	opj_stream_read_fn		m_read_fn;
-
-	/**
-	 * Pointer to actual write function (NULL at the initialization of the cio.
-	 */
-	opj_stream_write_fn		m_write_fn;
-
-	/**
-	 * Pointer to actual skip function (NULL at the initialization of the cio.
-	 * There is no seek function to prevent from back and forth slow procedures.
-	 */
-	opj_stream_skip_fn		m_skip_fn;
-
-	/**
-	 * Pointer to actual seek function (if available).
-	 */
-	opj_stream_seek_fn		m_seek_fn;
-
-
-
-
-	/**
-	 * Actual data stored into the stream if readed from. Data is read by chunk of fixed size.
-	 * you should never access this data directly.
-	 */
-	OPJ_BYTE *					m_stored_data;
-
-	/**
-	 * Pointer to the current read data.
-	 */
-	OPJ_BYTE *					m_current_data;
-
-	OPJ_OFF_T (* m_opj_skip)(struct opj_stream_private * ,OPJ_OFF_T , struct opj_event_mgr *);
-
-	opj_bool (* m_opj_seek) (struct opj_stream_private * , OPJ_OFF_T , struct opj_event_mgr *);
-
-	/**
-	 * number of bytes containing in the buffer.
-	 */
-	OPJ_SIZE_T			m_bytes_in_buffer;
-
-	/**
-	 * The number of bytes read/written from the beginning of the stream
-	 */
-	OPJ_OFF_T			m_byte_offset;
-
-	/**
-	 * The size of the buffer.
-	 */
-	OPJ_SIZE_T			m_buffer_size;
-
-	/**
-	 * Flags to tell the status of the stream.
-	 */
-	OPJ_UINT32			m_status;
-
-}
-opj_stream_private_t;
-
-
-/**
- * Write some bytes to the given data buffer, this function is used in Big Endian cpus.
- * @param p_buffer		pointer the data buffer to write data to.
- * @param p_value		the value to write
- * @param p_nb_bytes	the number of bytes to write
-*/
-void opj_write_bytes_BE (OPJ_BYTE * p_buffer, OPJ_UINT32 p_value, OPJ_UINT32 p_nb_bytes);
-
-/**
- * Reads some bytes from the given data buffer, this function is used in Big Endian cpus.
- * @param p_buffer		pointer the data buffer to read data from.
- * @param p_value		pointer to the value that will store the data.
- * @param p_nb_bytes	the nb bytes to read.
- * @return				the number of bytes read or -1 if an error occured.
- */
-void opj_read_bytes_BE(const OPJ_BYTE * p_buffer, OPJ_UINT32 * p_value, OPJ_UINT32 p_nb_bytes);
-
-/**
- * Write some bytes to the given data buffer, this function is used in Little Endian cpus.
- * @param p_buffer		pointer the data buffer to write data to.
- * @param p_value		the value to write
- * @param p_nb_bytes	the number of bytes to write
- * @return				the number of bytes written or -1 if an error occured
-*/
-void opj_write_bytes_LE (OPJ_BYTE * p_buffer, OPJ_UINT32 p_value, OPJ_UINT32 p_nb_bytes);
-
-/**
- * Reads some bytes from the given data buffer, this function is used in Little Endian cpus.
- * @param p_buffer		pointer the data buffer to read data from.
- * @param p_value		pointer to the value that will store the data.
- * @param p_nb_bytes	the nb bytes to read.
- * @return				the number of bytes read or -1 if an error occured.
- */
-void opj_read_bytes_LE(const OPJ_BYTE * p_buffer, OPJ_UINT32 * p_value, OPJ_UINT32 p_nb_bytes);
-
-
-/**
- * Write some bytes to the given data buffer, this function is used in Little Endian cpus.
- * @param p_buffer		pointer the data buffer to write data to.
- * @param p_value		the value to write
- */
-void opj_write_double_LE(OPJ_BYTE * p_buffer, OPJ_FLOAT64 p_value);
-
-/***
- * Write some bytes to the given data buffer, this function is used in Big Endian cpus.
- * @param p_buffer		pointer the data buffer to write data to.
- * @param p_value		the value to write
- */
-void opj_write_double_BE(OPJ_BYTE * p_buffer, OPJ_FLOAT64 p_value);
-
-/**
- * Reads some bytes from the given data buffer, this function is used in Little Endian cpus.
- * @param p_buffer		pointer the data buffer to read data from.
- * @param p_value		pointer to the value that will store the data.
- */
-void opj_read_double_LE(const OPJ_BYTE * p_buffer, OPJ_FLOAT64 * p_value);
-
-/**
- * Reads some bytes from the given data buffer, this function is used in Big Endian cpus.
- * @param p_buffer		pointer the data buffer to read data from.
- * @param p_value		pointer to the value that will store the data.
- */
-void opj_read_double_BE(const OPJ_BYTE * p_buffer, OPJ_FLOAT64 * p_value);
-
-/**
- * Reads some bytes from the given data buffer, this function is used in Little Endian cpus.
- * @param p_buffer		pointer the data buffer to read data from.
- * @param p_value		pointer to the value that will store the data.
- */
-void opj_read_float_LE(const OPJ_BYTE * p_buffer, OPJ_FLOAT32 * p_value);
-
-/**
- * Reads some bytes from the given data buffer, this function is used in Big Endian cpus.
- * @param p_buffer		pointer the data buffer to read data from.
- * @param p_value		pointer to the value that will store the data.
- */
-void opj_read_float_BE(const OPJ_BYTE * p_buffer, OPJ_FLOAT32 * p_value);
-
-/**
- * Write some bytes to the given data buffer, this function is used in Little Endian cpus.
- * @param p_buffer		pointer the data buffer to write data to.
- * @param p_value		the value to write
- */
-void opj_write_float_LE(OPJ_BYTE * p_buffer, OPJ_FLOAT32 p_value);
-
-/***
- * Write some bytes to the given data buffer, this function is used in Big Endian cpus.
- * @param p_buffer		pointer the data buffer to write data to.
- * @param p_value		the value to write
- */
-void opj_write_float_BE(OPJ_BYTE * p_buffer, OPJ_FLOAT32 p_value);
-
-/**
- * Reads some bytes from the stream.
- * @param		p_stream	the stream to read data from.
- * @param		p_buffer	pointer to the data buffer that will receive the data.
- * @param		p_size		number of bytes to read.
- * @param		p_event_mgr	the user event manager to be notified of special events.
- * @return		the number of bytes read, or -1 if an error occured or if the stream is at the end.
- */
-OPJ_SIZE_T opj_stream_read_data (opj_stream_private_t * p_stream,OPJ_BYTE * p_buffer, OPJ_SIZE_T p_size, struct opj_event_mgr * p_event_mgr);
-
-/**
- * Writes some bytes to the stream.
- * @param		p_stream	the stream to write data to.
- * @param		p_buffer	pointer to the data buffer holds the data to be writtent.
- * @param		p_size		number of bytes to write.
- * @param		p_event_mgr	the user event manager to be notified of special events.
- * @return		the number of bytes writtent, or -1 if an error occured.
- */
-OPJ_SIZE_T opj_stream_write_data (opj_stream_private_t * p_stream,const OPJ_BYTE * p_buffer, OPJ_SIZE_T p_size, struct opj_event_mgr * p_event_mgr);
-
-/**
- * Writes the content of the stream buffer to the stream.
- * @param		p_stream	the stream to write data to.
- * @param		p_event_mgr	the user event manager to be notified of special events.
- * @return		true if the data could be flushed, false else.
- */
-opj_bool opj_stream_flush (opj_stream_private_t * p_stream, struct opj_event_mgr * p_event_mgr);
-
-/**
- * Skips a number of bytes from the stream.
- * @param		p_stream	the stream to skip data from.
- * @param		p_size		the number of bytes to skip.
- * @param		p_event_mgr	the user event manager to be notified of special events.
- * @return		the number of bytes skipped, or -1 if an error occured.
- */
-OPJ_OFF_T opj_stream_skip (opj_stream_private_t * p_stream,OPJ_OFF_T p_size, struct opj_event_mgr * p_event_mgr);
-
-/**
- * Tells the byte offset on the stream (similar to ftell).
- *
- * @param		p_stream	the stream to get the information from.
- *
- * @return		the current position o fthe stream.
- */
-OPJ_OFF_T opj_stream_tell (const opj_stream_private_t * p_stream);
-
-
-/**
- * Get the number of bytes left before the end of the stream (similar to cio_numbytesleft).
- *
- * @param		p_stream	the stream to get the information from.
- *
- * @return		Number of bytes left before the end of the stream.
- */
-OPJ_OFF_T opj_stream_get_number_byte_left (const opj_stream_private_t * p_stream);
-
-/**
- * Skips a number of bytes from the stream.
- * @param		p_stream	the stream to skip data from.
- * @param		p_size		the number of bytes to skip.
- * @param		p_event_mgr	the user event manager to be notified of special events.
- * @return		the number of bytes skipped, or -1 if an error occured.
- */
-OPJ_OFF_T opj_stream_write_skip (opj_stream_private_t * p_stream, OPJ_OFF_T p_size, struct opj_event_mgr * p_event_mgr);
-
-/**
- * Skips a number of bytes from the stream.
- * @param		p_stream	the stream to skip data from.
- * @param		p_size		the number of bytes to skip.
- * @param		p_event_mgr	the user event manager to be notified of special events.
- * @return		the number of bytes skipped, or -1 if an error occured.
- */
-OPJ_OFF_T opj_stream_read_skip (opj_stream_private_t * p_stream, OPJ_OFF_T p_size, struct opj_event_mgr * p_event_mgr);
-
-/**
- * Skips a number of bytes from the stream.
- * @param		p_stream	the stream to skip data from.
- * @param		p_size		the number of bytes to skip.
- * @param		p_event_mgr	the user event manager to be notified of special events.
- * @return		the number of bytes skipped, or -1 if an error occured.
- */
-opj_bool opj_stream_read_seek (opj_stream_private_t * p_stream, OPJ_OFF_T p_size, struct opj_event_mgr * p_event_mgr);
-
-/**
- * Skips a number of bytes from the stream.
- * @param		p_stream	the stream to skip data from.
- * @param		p_size		the number of bytes to skip.
- * @param		p_event_mgr	the user event manager to be notified of special events.
- * @return		the number of bytes skipped, or -1 if an error occured.
- */
-opj_bool opj_stream_write_seek (opj_stream_private_t * p_stream, OPJ_OFF_T p_size, struct opj_event_mgr * p_event_mgr);
-
-/**
- * Seeks a number of bytes from the stream.
- * @param		p_stream	the stream to skip data from.
- * @param		p_size		the number of bytes to skip.
- * @param		p_event_mgr	the user event manager to be notified of special events.
- * @return		true if the stream is seekable.
- */
-opj_bool opj_stream_seek (opj_stream_private_t * p_stream, OPJ_OFF_T p_size, struct opj_event_mgr * p_event_mgr);
-
-/**
- * Tells if the given stream is seekable.
- */
-opj_bool opj_stream_has_seek (const opj_stream_private_t * p_stream);
-
-OPJ_SIZE_T opj_stream_default_read (void * p_buffer, OPJ_SIZE_T p_nb_bytes, void * p_user_data);
-OPJ_SIZE_T opj_stream_default_write (void * p_buffer, OPJ_SIZE_T p_nb_bytes, void * p_user_data);
-OPJ_OFF_T opj_stream_default_skip (OPJ_OFF_T p_nb_bytes, void * p_user_data);
-opj_bool opj_stream_default_seek (OPJ_OFF_T p_nb_bytes, void * p_user_data);
-
-
-
-#endif /* __CIO_H */
-
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/dwt.c b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/dwt.c
deleted file mode 100644
index 9675de31ddd2529a329ebff5179b0fc057073709..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/dwt.c
+++ /dev/null
@@ -1,1160 +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
- * Copyright (c) 2007, Jonathan Ballard <dzonatas@dzonux.net>
- * Copyright (c) 2007, Callum Lerwick <seg@haxxed.com>
- * 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.
- */
-
-#ifdef __SSE__
-#include <xmmintrin.h>
-#endif
-
-#include "opj_includes.h"
-
-/** @defgroup DWT DWT - Implementation of a discrete wavelet transform */
-/*@{*/
-
-#define WS(i) v->mem[(i)*2]
-#define WD(i) v->mem[(1+(i)*2)]
-
-/** @name Local data structures */
-/*@{*/
-
-typedef struct dwt_local {
-	int* mem;
-	int dn;
-	int sn;
-	int cas;
-} dwt_t;
-
-typedef union {
-	float	f[4];
-} v4;
-
-typedef struct v4dwt_local {
-	v4*	wavelet ;
-	int		dn ;
-	int		sn ;
-	int		cas ;
-} v4dwt_t ;
-
-static const float dwt_alpha =  1.586134342f; //  12994
-static const float dwt_beta  =  0.052980118f; //    434
-static const float dwt_gamma = -0.882911075f; //  -7233
-static const float dwt_delta = -0.443506852f; //  -3633
-
-static const float K      = 1.230174105f; //  10078
-/* FIXME: What is this constant? */
-static const float c13318 = 1.625732422f;
-
-/*@}*/
-
-/**
-Virtual function type for wavelet transform in 1-D 
-*/
-typedef void (*DWT1DFN)(dwt_t* v);
-
-/** @name Local static functions */
-/*@{*/
-
-/**
-Forward lazy transform (horizontal)
-*/
-static void dwt_deinterleave_h(int *a, int *b, int dn, int sn, int cas);
-/**
-Forward lazy transform (vertical)
-*/
-static void dwt_deinterleave_v(int *a, int *b, int dn, int sn, int x, int cas);
-/**
-Inverse lazy transform (horizontal)
-*/
-static void dwt_interleave_h(dwt_t* h, int *a);
-/**
-Inverse lazy transform (vertical)
-*/
-static void dwt_interleave_v(dwt_t* v, int *a, int x);
-/**
-Forward 5-3 wavelet transform in 1-D
-*/
-static void dwt_encode_1(int *a, int dn, int sn, int cas);
-/**
-Inverse 5-3 wavelet transform in 1-D
-*/
-static void dwt_decode_1(dwt_t *v);
-/**
-Forward 9-7 wavelet transform in 1-D
-*/
-static void dwt_encode_1_real(int *a, int dn, int sn, int cas);
-/**
-Explicit calculation of the Quantization Stepsizes 
-*/
-static void dwt_encode_stepsize(int stepsize, int numbps, opj_stepsize_t *bandno_stepsize);
-/**
-Inverse wavelet transform in 2-D.
-*/
-#ifdef OPJ_V1
-static void dwt_decode_tile(opj_tcd_tilecomp_t* tilec, int i, DWT1DFN fn);
-#endif
-static opj_bool dwt_decode_tile(opj_tcd_tilecomp_t* tilec, OPJ_UINT32 i, DWT1DFN fn);
-
-/**
-Inverse wavelet transform in 2-D.
-*/
-static opj_bool dwt_decode_tile_v2(opj_tcd_tilecomp_v2_t* tilec, OPJ_UINT32 i, DWT1DFN fn);
-
-/*@}*/
-
-/*@}*/
-
-#define S(i) a[(i)*2]
-#define D(i) a[(1+(i)*2)]
-#define S_(i) ((i)<0?S(0):((i)>=sn?S(sn-1):S(i)))
-#define D_(i) ((i)<0?D(0):((i)>=dn?D(dn-1):D(i)))
-/* new */
-#define SS_(i) ((i)<0?S(0):((i)>=dn?S(dn-1):S(i)))
-#define DD_(i) ((i)<0?D(0):((i)>=sn?D(sn-1):D(i)))
-
-/* <summary>                                                              */
-/* This table contains the norms of the 5-3 wavelets for different bands. */
-/* </summary>                                                             */
-static const double dwt_norms[4][10] = {
-	{1.000, 1.500, 2.750, 5.375, 10.68, 21.34, 42.67, 85.33, 170.7, 341.3},
-	{1.038, 1.592, 2.919, 5.703, 11.33, 22.64, 45.25, 90.48, 180.9},
-	{1.038, 1.592, 2.919, 5.703, 11.33, 22.64, 45.25, 90.48, 180.9},
-	{.7186, .9218, 1.586, 3.043, 6.019, 12.01, 24.00, 47.97, 95.93}
-};
-
-/* <summary>                                                              */
-/* This table contains the norms of the 9-7 wavelets for different bands. */
-/* </summary>                                                             */
-static const double dwt_norms_real[4][10] = {
-	{1.000, 1.965, 4.177, 8.403, 16.90, 33.84, 67.69, 135.3, 270.6, 540.9},
-	{2.022, 3.989, 8.355, 17.04, 34.27, 68.63, 137.3, 274.6, 549.0},
-	{2.022, 3.989, 8.355, 17.04, 34.27, 68.63, 137.3, 274.6, 549.0},
-	{2.080, 3.865, 8.307, 17.18, 34.71, 69.59, 139.3, 278.6, 557.2}
-};
-
-/* 
-==========================================================
-   local functions
-==========================================================
-*/
-
-/* <summary>			                 */
-/* Forward lazy transform (horizontal).  */
-/* </summary>                            */ 
-static void dwt_deinterleave_h(int *a, int *b, int dn, int sn, int cas) {
-	int i;
-    for (i=0; i<sn; i++) b[i]=a[2*i+cas];
-    for (i=0; i<dn; i++) b[sn+i]=a[(2*i+1-cas)];
-}
-
-/* <summary>                             */  
-/* Forward lazy transform (vertical).    */
-/* </summary>                            */ 
-static void dwt_deinterleave_v(int *a, int *b, int dn, int sn, int x, int cas) {
-    int i;
-    for (i=0; i<sn; i++) b[i*x]=a[2*i+cas];
-    for (i=0; i<dn; i++) b[(sn+i)*x]=a[(2*i+1-cas)];
-}
-
-/* <summary>                             */
-/* Inverse lazy transform (horizontal).  */
-/* </summary>                            */
-static void dwt_interleave_h(dwt_t* h, int *a) {
-    int *ai = a;
-    int *bi = h->mem + h->cas;
-    int  i	= h->sn;
-    while( i-- ) {
-      *bi = *(ai++);
-	  bi += 2;
-    }
-    ai	= a + h->sn;
-    bi	= h->mem + 1 - h->cas;
-    i	= h->dn ;
-    while( i-- ) {
-      *bi = *(ai++);
-	  bi += 2;
-    }
-}
-
-/* <summary>                             */  
-/* Inverse lazy transform (vertical).    */
-/* </summary>                            */ 
-static void dwt_interleave_v(dwt_t* v, int *a, int x) {
-    int *ai = a;
-    int *bi = v->mem + v->cas;
-    int  i = v->sn;
-    while( i-- ) {
-      *bi = *ai;
-	  bi += 2;
-	  ai += x;
-    }
-    ai = a + (v->sn * x);
-    bi = v->mem + 1 - v->cas;
-    i = v->dn ;
-    while( i-- ) {
-      *bi = *ai;
-	  bi += 2;  
-	  ai += x;
-    }
-}
-
-
-/* <summary>                            */
-/* Forward 5-3 wavelet transform in 1-D. */
-/* </summary>                           */
-static void dwt_encode_1(int *a, int dn, int sn, int cas) {
-	int i;
-	
-	if (!cas) {
-		if ((dn > 0) || (sn > 1)) {	/* NEW :  CASE ONE ELEMENT */
-			for (i = 0; i < dn; i++) D(i) -= (S_(i) + S_(i + 1)) >> 1;
-			for (i = 0; i < sn; i++) S(i) += (D_(i - 1) + D_(i) + 2) >> 2;
-		}
-	} else {
-		if (!sn && dn == 1)		    /* NEW :  CASE ONE ELEMENT */
-			S(0) *= 2;
-		else {
-			for (i = 0; i < dn; i++) S(i) -= (DD_(i) + DD_(i - 1)) >> 1;
-			for (i = 0; i < sn; i++) D(i) += (SS_(i) + SS_(i + 1) + 2) >> 2;
-		}
-	}
-}
-
-/* <summary>                            */
-/* Inverse 5-3 wavelet transform in 1-D. */
-/* </summary>                           */ 
-static void dwt_decode_1_(int *a, int dn, int sn, int cas) {
-	int i;
-	
-	if (!cas) {
-		if ((dn > 0) || (sn > 1)) { /* NEW :  CASE ONE ELEMENT */
-			for (i = 0; i < sn; i++) S(i) -= (D_(i - 1) + D_(i) + 2) >> 2;
-			for (i = 0; i < dn; i++) D(i) += (S_(i) + S_(i + 1)) >> 1;
-		}
-	} else {
-		if (!sn  && dn == 1)          /* NEW :  CASE ONE ELEMENT */
-			S(0) /= 2;
-		else {
-			for (i = 0; i < sn; i++) D(i) -= (SS_(i) + SS_(i + 1) + 2) >> 2;
-			for (i = 0; i < dn; i++) S(i) += (DD_(i) + DD_(i - 1)) >> 1;
-		}
-	}
-}
-
-/* <summary>                            */
-/* Inverse 5-3 wavelet transform in 1-D. */
-/* </summary>                           */ 
-static void dwt_decode_1(dwt_t *v) {
-	dwt_decode_1_(v->mem, v->dn, v->sn, v->cas);
-}
-
-/* <summary>                             */
-/* Forward 9-7 wavelet transform in 1-D. */
-/* </summary>                            */
-static void dwt_encode_1_real(int *a, int dn, int sn, int cas) {
-	int i;
-	if (!cas) {
-		if ((dn > 0) || (sn > 1)) {	/* NEW :  CASE ONE ELEMENT */
-			for (i = 0; i < dn; i++)
-				D(i) -= fix_mul(S_(i) + S_(i + 1), 12993);
-			for (i = 0; i < sn; i++)
-				S(i) -= fix_mul(D_(i - 1) + D_(i), 434);
-			for (i = 0; i < dn; i++)
-				D(i) += fix_mul(S_(i) + S_(i + 1), 7233);
-			for (i = 0; i < sn; i++)
-				S(i) += fix_mul(D_(i - 1) + D_(i), 3633);
-			for (i = 0; i < dn; i++)
-				D(i) = fix_mul(D(i), 5038);	/*5038 */
-			for (i = 0; i < sn; i++)
-				S(i) = fix_mul(S(i), 6659);	/*6660 */
-		}
-	} else {
-		if ((sn > 0) || (dn > 1)) {	/* NEW :  CASE ONE ELEMENT */
-			for (i = 0; i < dn; i++)
-				S(i) -= fix_mul(DD_(i) + DD_(i - 1), 12993);
-			for (i = 0; i < sn; i++)
-				D(i) -= fix_mul(SS_(i) + SS_(i + 1), 434);
-			for (i = 0; i < dn; i++)
-				S(i) += fix_mul(DD_(i) + DD_(i - 1), 7233);
-			for (i = 0; i < sn; i++)
-				D(i) += fix_mul(SS_(i) + SS_(i + 1), 3633);
-			for (i = 0; i < dn; i++)
-				S(i) = fix_mul(S(i), 5038);	/*5038 */
-			for (i = 0; i < sn; i++)
-				D(i) = fix_mul(D(i), 6659);	/*6660 */
-		}
-	}
-}
-
-static void dwt_encode_stepsize(int stepsize, int numbps, opj_stepsize_t *bandno_stepsize) {
-	int p, n;
-	p = int_floorlog2(stepsize) - 13;
-	n = 11 - int_floorlog2(stepsize);
-	bandno_stepsize->mant = (n < 0 ? stepsize >> -n : stepsize << n) & 0x7ff;
-	bandno_stepsize->expn = numbps - p;
-}
-
-/* 
-==========================================================
-   DWT interface
-==========================================================
-*/
-
-/* <summary>                            */
-/* Forward 5-3 wavelet transform in 2-D. */
-/* </summary>                           */
-void dwt_encode(opj_tcd_tilecomp_t * tilec) {
-	int i, j, k;
-	int *a = NULL;
-	int *aj = NULL;
-	int *bj = NULL;
-	int w, l;
-	
-	w = tilec->x1-tilec->x0;
-	l = tilec->numresolutions-1;
-	a = tilec->data;
-	
-	for (i = 0; i < l; i++) {
-		int rw;			/* width of the resolution level computed                                                           */
-		int rh;			/* height of the resolution level computed                                                          */
-		int rw1;		/* width of the resolution level once lower than computed one                                       */
-		int rh1;		/* height of the resolution level once lower than computed one                                      */
-		int cas_col;	/* 0 = non inversion on horizontal filtering 1 = inversion between low-pass and high-pass filtering */
-		int cas_row;	/* 0 = non inversion on vertical filtering 1 = inversion between low-pass and high-pass filtering   */
-		int dn, sn;
-		
-		rw = tilec->resolutions[l - i].x1 - tilec->resolutions[l - i].x0;
-		rh = tilec->resolutions[l - i].y1 - tilec->resolutions[l - i].y0;
-		rw1= tilec->resolutions[l - i - 1].x1 - tilec->resolutions[l - i - 1].x0;
-		rh1= tilec->resolutions[l - i - 1].y1 - tilec->resolutions[l - i - 1].y0;
-		
-		cas_row = tilec->resolutions[l - i].x0 % 2;
-		cas_col = tilec->resolutions[l - i].y0 % 2;
-        
-		sn = rh1;
-		dn = rh - rh1;
-		bj = (int*)opj_malloc(rh * sizeof(int));
-		for (j = 0; j < rw; j++) {
-			aj = a + j;
-			for (k = 0; k < rh; k++)  bj[k] = aj[k*w];
-			dwt_encode_1(bj, dn, sn, cas_col);
-			dwt_deinterleave_v(bj, aj, dn, sn, w, cas_col);
-		}
-		opj_free(bj);
-		
-		sn = rw1;
-		dn = rw - rw1;
-		bj = (int*)opj_malloc(rw * sizeof(int));
-		for (j = 0; j < rh; j++) {
-			aj = a + j * w;
-			for (k = 0; k < rw; k++)  bj[k] = aj[k];
-			dwt_encode_1(bj, dn, sn, cas_row);
-			dwt_deinterleave_h(bj, aj, dn, sn, cas_row);
-		}
-		opj_free(bj);
-	}
-}
-
-#ifdef OPJ_V1
-/* <summary>                            */
-/* Inverse 5-3 wavelet transform in 2-D. */
-/* </summary>                           */
-void dwt_decode(opj_tcd_tilecomp_t* tilec, int numres) {
-	dwt_decode_tile(tilec, numres, &dwt_decode_1);
-}
-#endif
-
-/* <summary>                            */
-/* Inverse 5-3 wavelet transform in 2-D. */
-/* </summary>                           */
-opj_bool dwt_decode(opj_tcd_tilecomp_t* tilec, OPJ_UINT32 numres) {
-	return dwt_decode_tile(tilec, numres, &dwt_decode_1);
-}
-
-/* <summary>                            */
-/* Inverse 5-3 wavelet transform in 2-D. */
-/* </summary>                           */
-opj_bool dwt_decode_v2(opj_tcd_tilecomp_v2_t* tilec, OPJ_UINT32 numres) {
-	return dwt_decode_tile_v2(tilec, numres, &dwt_decode_1);
-}
-
-
-/* <summary>                          */
-/* Get gain of 5-3 wavelet transform. */
-/* </summary>                         */
-int dwt_getgain(int orient) {
-	if (orient == 0)
-		return 0;
-	if (orient == 1 || orient == 2)
-		return 1;
-	return 2;
-}
-
-/* <summary>                          */
-/* Get gain of 5-3 wavelet transform. */
-/* </summary>                         */
-OPJ_UINT32 dwt_getgain_v2(OPJ_UINT32 orient) {
-	if (orient == 0)
-		return 0;
-	if (orient == 1 || orient == 2)
-		return 1;
-	return 2;
-}
-
-/* <summary>                */
-/* Get norm of 5-3 wavelet. */
-/* </summary>               */
-double dwt_getnorm(int level, int orient) {
-	return dwt_norms[orient][level];
-}
-
-/* <summary>                             */
-/* Forward 9-7 wavelet transform in 2-D. */
-/* </summary>                            */
-
-void dwt_encode_real(opj_tcd_tilecomp_t * tilec) {
-	int i, j, k;
-	int *a = NULL;
-	int *aj = NULL;
-	int *bj = NULL;
-	int w, l;
-	
-	w = tilec->x1-tilec->x0;
-	l = tilec->numresolutions-1;
-	a = tilec->data;
-	
-	for (i = 0; i < l; i++) {
-		int rw;			/* width of the resolution level computed                                                     */
-		int rh;			/* height of the resolution level computed                                                    */
-		int rw1;		/* width of the resolution level once lower than computed one                                 */
-		int rh1;		/* height of the resolution level once lower than computed one                                */
-		int cas_col;	/* 0 = non inversion on horizontal filtering 1 = inversion between low-pass and high-pass filtering */
-		int cas_row;	/* 0 = non inversion on vertical filtering 1 = inversion between low-pass and high-pass filtering   */
-		int dn, sn;
-		
-		rw = tilec->resolutions[l - i].x1 - tilec->resolutions[l - i].x0;
-		rh = tilec->resolutions[l - i].y1 - tilec->resolutions[l - i].y0;
-		rw1= tilec->resolutions[l - i - 1].x1 - tilec->resolutions[l - i - 1].x0;
-		rh1= tilec->resolutions[l - i - 1].y1 - tilec->resolutions[l - i - 1].y0;
-		
-		cas_row = tilec->resolutions[l - i].x0 % 2;
-		cas_col = tilec->resolutions[l - i].y0 % 2;
-		
-		sn = rh1;
-		dn = rh - rh1;
-		bj = (int*)opj_malloc(rh * sizeof(int));
-		for (j = 0; j < rw; j++) {
-			aj = a + j;
-			for (k = 0; k < rh; k++)  bj[k] = aj[k*w];
-			dwt_encode_1_real(bj, dn, sn, cas_col);
-			dwt_deinterleave_v(bj, aj, dn, sn, w, cas_col);
-		}
-		opj_free(bj);
-		
-		sn = rw1;
-		dn = rw - rw1;
-		bj = (int*)opj_malloc(rw * sizeof(int));
-		for (j = 0; j < rh; j++) {
-			aj = a + j * w;
-			for (k = 0; k < rw; k++)  bj[k] = aj[k];
-			dwt_encode_1_real(bj, dn, sn, cas_row);
-			dwt_deinterleave_h(bj, aj, dn, sn, cas_row);
-		}
-		opj_free(bj);
-	}
-}
-
-
-/* <summary>                          */
-/* Get gain of 9-7 wavelet transform. */
-/* </summary>                         */
-int dwt_getgain_real(int orient) {
-	(void)orient;
-	return 0;
-}
-
-/* <summary>                          */
-/* Get gain of 9-7 wavelet transform. */
-/* </summary>                         */
-OPJ_UINT32 dwt_getgain_real_v2(OPJ_UINT32 orient) {
-	(void)orient;
-	return 0;
-}
-
-/* <summary>                */
-/* Get norm of 9-7 wavelet. */
-/* </summary>               */
-double dwt_getnorm_real(int level, int orient) {
-	return dwt_norms_real[orient][level];
-}
-
-void dwt_calc_explicit_stepsizes(opj_tccp_t * tccp, int prec) {
-	int numbands, bandno;
-	numbands = 3 * tccp->numresolutions - 2;
-	for (bandno = 0; bandno < numbands; bandno++) {
-		double stepsize;
-		int resno, level, orient, gain;
-
-		resno = (bandno == 0) ? 0 : ((bandno - 1) / 3 + 1);
-		orient = (bandno == 0) ? 0 : ((bandno - 1) % 3 + 1);
-		level = tccp->numresolutions - 1 - resno;
-		gain = (tccp->qmfbid == 0) ? 0 : ((orient == 0) ? 0 : (((orient == 1) || (orient == 2)) ? 1 : 2));
-		if (tccp->qntsty == J2K_CCP_QNTSTY_NOQNT) {
-			stepsize = 1.0;
-		} else {
-			double norm = dwt_norms_real[orient][level];
-			stepsize = (1 << (gain)) / norm;
-		}
-		dwt_encode_stepsize((int) floor(stepsize * 8192.0), prec + gain, &tccp->stepsizes[bandno]);
-	}
-}
-
-#ifdef OPJ_V1
-/* <summary>                             */
-/* Determine maximum computed resolution level for inverse wavelet transform */
-/* </summary>                            */
-static int dwt_decode_max_resolution(opj_tcd_resolution_t* restrict r, int i) {
-	int mr	= 1;
-	int w;
-	while( --i ) {
-		r++;
-		if( mr < ( w = r->x1 - r->x0 ) )
-			mr = w ;
-		if( mr < ( w = r->y1 - r->y0 ) )
-			mr = w ;
-	}
-	return mr ;
-}
-#endif
-/* <summary>                             */
-/* Determine maximum computed resolution level for inverse wavelet transform */
-/* </summary>                            */
-static OPJ_UINT32 dwt_max_resolution(opj_tcd_resolution_t* restrict r, OPJ_UINT32 i) {
-	OPJ_UINT32 mr	= 0;
-	OPJ_UINT32 w;
-	while( --i ) {
-		++r;
-		if( mr < ( w = r->x1 - r->x0 ) )
-			mr = w ;
-		if( mr < ( w = r->y1 - r->y0 ) )
-			mr = w ;
-	}
-	return mr ;
-}
-
-/* <summary>                             */
-/* Determine maximum computed resolution level for inverse wavelet transform */
-/* </summary>                            */
-static OPJ_UINT32 dwt_max_resolution_v2(opj_tcd_resolution_v2_t* restrict r, OPJ_UINT32 i) {
-	OPJ_UINT32 mr	= 0;
-	OPJ_UINT32 w;
-	while( --i ) {
-		++r;
-		if( mr < ( w = r->x1 - r->x0 ) )
-			mr = w ;
-		if( mr < ( w = r->y1 - r->y0 ) )
-			mr = w ;
-	}
-	return mr ;
-}
-
-#ifdef OPJ_V1
-/* <summary>                            */
-/* Inverse wavelet transform in 2-D.     */
-/* </summary>                           */
-static void dwt_decode_tile(opj_tcd_tilecomp_t* tilec, int numres, DWT1DFN dwt_1D) {
-	dwt_t h;
-	dwt_t v;
-
-	opj_tcd_resolution_t* tr = tilec->resolutions;
-
-	int rw = tr->x1 - tr->x0;	/* width of the resolution level computed */
-	int rh = tr->y1 - tr->y0;	/* height of the resolution level computed */
-
-	int w = tilec->x1 - tilec->x0;
-
-	h.mem = (int*)opj_aligned_malloc(dwt_max_resolution(tr, numres) * sizeof(int));
-	v.mem = h.mem;
-
-	while( --numres) {
-		int * restrict tiledp = tilec->data;
-		int j;
-
-		++tr;
-		h.sn = rw;
-		v.sn = rh;
-
-		rw = tr->x1 - tr->x0;
-		rh = tr->y1 - tr->y0;
-
-		h.dn = rw - h.sn;
-		h.cas = tr->x0 % 2;
-
-		for(j = 0; j < rh; ++j) {
-			dwt_interleave_h(&h, &tiledp[j*w]);
-			(dwt_1D)(&h);
-			memcpy(&tiledp[j*w], h.mem, rw * sizeof(int));
-		}
-
-		v.dn = rh - v.sn;
-		v.cas = tr->y0 % 2;
-
-		for(j = 0; j < rw; ++j){
-			int k;
-			dwt_interleave_v(&v, &tiledp[j], w);
-			(dwt_1D)(&v);
-			for(k = 0; k < rh; ++k) {
-				tiledp[k * w + j] = v.mem[k];
-			}
-		}
-	}
-	opj_aligned_free(h.mem);
-}
-#endif
-
-/* <summary>                            */
-/* Inverse wavelet transform in 2-D.     */
-/* </summary>                           */
-static opj_bool dwt_decode_tile(opj_tcd_tilecomp_t* tilec, OPJ_UINT32 numres, DWT1DFN dwt_1D) {
-	dwt_t h;
-	dwt_t v;
-
-	opj_tcd_resolution_t* tr = tilec->resolutions;
-
-	OPJ_UINT32 rw = tr->x1 - tr->x0;	/* width of the resolution level computed */
-	OPJ_UINT32 rh = tr->y1 - tr->y0;	/* height of the resolution level computed */
-
-	OPJ_UINT32 w = tilec->x1 - tilec->x0;
-
-	h.mem = (OPJ_INT32*)
-	opj_aligned_malloc(dwt_max_resolution(tr, numres) * sizeof(OPJ_INT32));
-	if
-		(! h.mem)
-	{
-		return OPJ_FALSE;
-	}
-
-	v.mem = h.mem;
-
-	while( --numres) {
-		OPJ_INT32 * restrict tiledp = tilec->data;
-		OPJ_UINT32 j;
-
-		++tr;
-		h.sn = rw;
-		v.sn = rh;
-
-		rw = tr->x1 - tr->x0;
-		rh = tr->y1 - tr->y0;
-
-		h.dn = rw - h.sn;
-		h.cas = tr->x0 % 2;
-
-		for(j = 0; j < rh; ++j) {
-			dwt_interleave_h(&h, &tiledp[j*w]);
-			(dwt_1D)(&h);
-			memcpy(&tiledp[j*w], h.mem, rw * sizeof(OPJ_INT32));
-		}
-
-		v.dn = rh - v.sn;
-		v.cas = tr->y0 % 2;
-
-		for(j = 0; j < rw; ++j){
-			OPJ_UINT32 k;
-			dwt_interleave_v(&v, &tiledp[j], w);
-			(dwt_1D)(&v);
-			for(k = 0; k < rh; ++k) {
-				tiledp[k * w + j] = v.mem[k];
-			}
-		}
-	}
-	opj_aligned_free(h.mem);
-	return OPJ_TRUE;
-}
-
-/* <summary>                            */
-/* Inverse wavelet transform in 2-D.     */
-/* </summary>                           */
-static opj_bool dwt_decode_tile_v2(opj_tcd_tilecomp_v2_t* tilec, OPJ_UINT32 numres, DWT1DFN dwt_1D) {
-	dwt_t h;
-	dwt_t v;
-
-	opj_tcd_resolution_v2_t* tr = tilec->resolutions;
-
-	OPJ_UINT32 rw = tr->x1 - tr->x0;	/* width of the resolution level computed */
-	OPJ_UINT32 rh = tr->y1 - tr->y0;	/* height of the resolution level computed */
-
-	OPJ_UINT32 w = tilec->x1 - tilec->x0;
-
-	h.mem = (OPJ_INT32*)
-	opj_aligned_malloc(dwt_max_resolution_v2(tr, numres) * sizeof(OPJ_INT32));
-	if
-		(! h.mem)
-	{
-		return OPJ_FALSE;
-	}
-
-	v.mem = h.mem;
-
-	while( --numres) {
-		OPJ_INT32 * restrict tiledp = tilec->data;
-		OPJ_UINT32 j;
-
-		++tr;
-		h.sn = rw;
-		v.sn = rh;
-
-		rw = tr->x1 - tr->x0;
-		rh = tr->y1 - tr->y0;
-
-		h.dn = rw - h.sn;
-		h.cas = tr->x0 % 2;
-
-		for(j = 0; j < rh; ++j) {
-			dwt_interleave_h(&h, &tiledp[j*w]);
-			(dwt_1D)(&h);
-			memcpy(&tiledp[j*w], h.mem, rw * sizeof(OPJ_INT32));
-		}
-
-		v.dn = rh - v.sn;
-		v.cas = tr->y0 % 2;
-
-		for(j = 0; j < rw; ++j){
-			OPJ_UINT32 k;
-			dwt_interleave_v(&v, &tiledp[j], w);
-			(dwt_1D)(&v);
-			for(k = 0; k < rh; ++k) {
-				tiledp[k * w + j] = v.mem[k];
-			}
-		}
-	}
-	opj_aligned_free(h.mem);
-	return OPJ_TRUE;
-}
-
-static void v4dwt_interleave_h(v4dwt_t* restrict w, float* restrict a, int x, int size){
-	float* restrict bi = (float*) (w->wavelet + w->cas);
-	int count = w->sn;
-	int i, k;
-
-	for(k = 0; k < 2; ++k){
-		if ( count + 3 * x < size && ((size_t) a & 0x0f) == 0 && ((size_t) bi & 0x0f) == 0 && (x & 0x0f) == 0 ) {
-			/* Fast code path */
-			for(i = 0; i < count; ++i){
-				int j = i;
-				bi[i*8    ] = a[j];
-				j += x;
-				bi[i*8 + 1] = a[j];
-				j += x;
-				bi[i*8 + 2] = a[j];
-				j += x;
-				bi[i*8 + 3] = a[j];
-			}
-		}
-		else {
-			/* Slow code path */
-			for(i = 0; i < count; ++i){
-				int j = i;
-				bi[i*8    ] = a[j];
-				j += x;
-				if(j >= size) continue;
-				bi[i*8 + 1] = a[j];
-				j += x;
-				if(j >= size) continue;
-				bi[i*8 + 2] = a[j];
-				j += x;
-				if(j >= size) continue;
-				bi[i*8 + 3] = a[j]; /* This one*/
-			}
-		}
-
-		bi = (float*) (w->wavelet + 1 - w->cas);
-		a += w->sn;
-		size -= w->sn;
-		count = w->dn;
-	}
-}
-
-static void v4dwt_interleave_v(v4dwt_t* restrict v , float* restrict a , int x, int nb_elts_read){
-	v4* restrict bi = v->wavelet + v->cas;
-	int i;
-
-	for(i = 0; i < v->sn; ++i){
-		memcpy(&bi[i*2], &a[i*x], nb_elts_read * sizeof(float));
-	}
-
-	a += v->sn * x;
-	bi = v->wavelet + 1 - v->cas;
-
-	for(i = 0; i < v->dn; ++i){
-		memcpy(&bi[i*2], &a[i*x], nb_elts_read * sizeof(float));
-	}
-}
-
-#ifdef __SSE__
-
-static void v4dwt_decode_step1_sse(v4* w, int count, const __m128 c){
-	__m128* restrict vw = (__m128*) w;
-	int i;
-	/* 4x unrolled loop */
-	for(i = 0; i < count >> 2; ++i){
-		*vw = _mm_mul_ps(*vw, c);
-		vw += 2;
-		*vw = _mm_mul_ps(*vw, c);
-		vw += 2;
-		*vw = _mm_mul_ps(*vw, c);
-		vw += 2;
-		*vw = _mm_mul_ps(*vw, c);
-		vw += 2;
-	}
-	count &= 3;
-	for(i = 0; i < count; ++i){
-		*vw = _mm_mul_ps(*vw, c);
-		vw += 2;
-	}
-}
-
-static void v4dwt_decode_step2_sse(v4* l, v4* w, int k, int m, __m128 c){
-	__m128* restrict vl = (__m128*) l;
-	__m128* restrict vw = (__m128*) w;
-	int i;
-	__m128 tmp1, tmp2, tmp3;
-	tmp1 = vl[0];
-	for(i = 0; i < m; ++i){
-		tmp2 = vw[-1];
-		tmp3 = vw[ 0];
-		vw[-1] = _mm_add_ps(tmp2, _mm_mul_ps(_mm_add_ps(tmp1, tmp3), c));
-		tmp1 = tmp3;
-		vw += 2;
-	}
-	vl = vw - 2;
-	if(m >= k){
-		return;
-	}
-	c = _mm_add_ps(c, c);
-	c = _mm_mul_ps(c, vl[0]);
-	for(; m < k; ++m){
-		__m128 tmp = vw[-1];
-		vw[-1] = _mm_add_ps(tmp, c);
-		vw += 2;
-	}
-}
-
-#else
-
-static void v4dwt_decode_step1(v4* w, int count, const float c){
-	float* restrict fw = (float*) w;
-	int i;
-	for(i = 0; i < count; ++i){
-		float tmp1 = fw[i*8    ];
-		float tmp2 = fw[i*8 + 1];
-		float tmp3 = fw[i*8 + 2];
-		float tmp4 = fw[i*8 + 3];
-		fw[i*8    ] = tmp1 * c;
-		fw[i*8 + 1] = tmp2 * c;
-		fw[i*8 + 2] = tmp3 * c;
-		fw[i*8 + 3] = tmp4 * c;
-	}
-}
-
-static void v4dwt_decode_step2(v4* l, v4* w, int k, int m, float c){
-	float* restrict fl = (float*) l;
-	float* restrict fw = (float*) w;
-	int i;
-	for(i = 0; i < m; ++i){
-		float tmp1_1 = fl[0];
-		float tmp1_2 = fl[1];
-		float tmp1_3 = fl[2];
-		float tmp1_4 = fl[3];
-		float tmp2_1 = fw[-4];
-		float tmp2_2 = fw[-3];
-		float tmp2_3 = fw[-2];
-		float tmp2_4 = fw[-1];
-		float tmp3_1 = fw[0];
-		float tmp3_2 = fw[1];
-		float tmp3_3 = fw[2];
-		float tmp3_4 = fw[3];
-		fw[-4] = tmp2_1 + ((tmp1_1 + tmp3_1) * c);
-		fw[-3] = tmp2_2 + ((tmp1_2 + tmp3_2) * c);
-		fw[-2] = tmp2_3 + ((tmp1_3 + tmp3_3) * c);
-		fw[-1] = tmp2_4 + ((tmp1_4 + tmp3_4) * c);
-		fl = fw;
-		fw += 8;
-	}
-	if(m < k){
-		float c1;
-		float c2;
-		float c3;
-		float c4;
-		c += c;
-		c1 = fl[0] * c;
-		c2 = fl[1] * c;
-		c3 = fl[2] * c;
-		c4 = fl[3] * c;
-		for(; m < k; ++m){
-			float tmp1 = fw[-4];
-			float tmp2 = fw[-3];
-			float tmp3 = fw[-2];
-			float tmp4 = fw[-1];
-			fw[-4] = tmp1 + c1;
-			fw[-3] = tmp2 + c2;
-			fw[-2] = tmp3 + c3;
-			fw[-1] = tmp4 + c4;
-			fw += 8;
-		}
-	}
-}
-
-#endif
-
-/* <summary>                             */
-/* Inverse 9-7 wavelet transform in 1-D. */
-/* </summary>                            */
-static void v4dwt_decode(v4dwt_t* restrict dwt){
-	int a, b;
-	if(dwt->cas == 0) {
-		if(!((dwt->dn > 0) || (dwt->sn > 1))){
-			return;
-		}
-		a = 0;
-		b = 1;
-	}else{
-		if(!((dwt->sn > 0) || (dwt->dn > 1))) {
-			return;
-		}
-		a = 1;
-		b = 0;
-	}
-#ifdef __SSE__
-	v4dwt_decode_step1_sse(dwt->wavelet+a, dwt->sn, _mm_set1_ps(K));
-	v4dwt_decode_step1_sse(dwt->wavelet+b, dwt->dn, _mm_set1_ps(c13318));
-	v4dwt_decode_step2_sse(dwt->wavelet+b, dwt->wavelet+a+1, dwt->sn, int_min(dwt->sn, dwt->dn-a), _mm_set1_ps(dwt_delta));
-	v4dwt_decode_step2_sse(dwt->wavelet+a, dwt->wavelet+b+1, dwt->dn, int_min(dwt->dn, dwt->sn-b), _mm_set1_ps(dwt_gamma));
-	v4dwt_decode_step2_sse(dwt->wavelet+b, dwt->wavelet+a+1, dwt->sn, int_min(dwt->sn, dwt->dn-a), _mm_set1_ps(dwt_beta));
-	v4dwt_decode_step2_sse(dwt->wavelet+a, dwt->wavelet+b+1, dwt->dn, int_min(dwt->dn, dwt->sn-b), _mm_set1_ps(dwt_alpha));
-#else
-	v4dwt_decode_step1(dwt->wavelet+a, dwt->sn, K);
-	v4dwt_decode_step1(dwt->wavelet+b, dwt->dn, c13318);
-	v4dwt_decode_step2(dwt->wavelet+b, dwt->wavelet+a+1, dwt->sn, int_min(dwt->sn, dwt->dn-a), dwt_delta);
-	v4dwt_decode_step2(dwt->wavelet+a, dwt->wavelet+b+1, dwt->dn, int_min(dwt->dn, dwt->sn-b), dwt_gamma);
-	v4dwt_decode_step2(dwt->wavelet+b, dwt->wavelet+a+1, dwt->sn, int_min(dwt->sn, dwt->dn-a), dwt_beta);
-	v4dwt_decode_step2(dwt->wavelet+a, dwt->wavelet+b+1, dwt->dn, int_min(dwt->dn, dwt->sn-b), dwt_alpha);
-#endif
-}
-
-
-// KEEP TRUNK VERSION + return type of v2 because rev557
-/* <summary>                             */
-/* Inverse 9-7 wavelet transform in 2-D. */
-/* </summary>                            */
-// V1 void dwt_decode_real(opj_tcd_tilecomp_t* restrict tilec, int numres){
-opj_bool dwt_decode_real(opj_tcd_tilecomp_t* restrict tilec, int numres){
-	v4dwt_t h;
-	v4dwt_t v;
-
-	opj_tcd_resolution_t* res = tilec->resolutions;
-
-	int rw = res->x1 - res->x0;	/* width of the resolution level computed */
-	int rh = res->y1 - res->y0;	/* height of the resolution level computed */
-
-	int w = tilec->x1 - tilec->x0;
-
-	h.wavelet = (v4*) opj_aligned_malloc((dwt_max_resolution(res, numres)+5) * sizeof(v4));
-	v.wavelet = h.wavelet;
-
-	while( --numres) {
-		float * restrict aj = (float*) tilec->data;
-		int bufsize = (tilec->x1 - tilec->x0) * (tilec->y1 - tilec->y0);
-		int j;
-
-		h.sn = rw;
-		v.sn = rh;
-
-		++res;
-
-		rw = res->x1 - res->x0;	/* width of the resolution level computed */
-		rh = res->y1 - res->y0;	/* height of the resolution level computed */
-
-		h.dn = rw - h.sn;
-		h.cas = res->x0 % 2;
-
-		for(j = rh; j > 3; j -= 4){
-			int k;
-			v4dwt_interleave_h(&h, aj, w, bufsize);
-			v4dwt_decode(&h);
-				for(k = rw; --k >= 0;){
-					aj[k    ] = h.wavelet[k].f[0];
-					aj[k+w  ] = h.wavelet[k].f[1];
-					aj[k+w*2] = h.wavelet[k].f[2];
-					aj[k+w*3] = h.wavelet[k].f[3];
-				}
-			aj += w*4;
-			bufsize -= w*4;
-		}
-		if (rh & 0x03) {
-				int k;
-			j = rh & 0x03;
-			v4dwt_interleave_h(&h, aj, w, bufsize);
-			v4dwt_decode(&h);
-				for(k = rw; --k >= 0;){
-					switch(j) {
-						case 3: aj[k+w*2] = h.wavelet[k].f[2];
-						case 2: aj[k+w  ] = h.wavelet[k].f[1];
-						case 1: aj[k    ] = h.wavelet[k].f[0];
-					}
-				}
-			}
-
-		v.dn = rh - v.sn;
-		v.cas = res->y0 % 2;
-
-		aj = (float*) tilec->data;
-		for(j = rw; j > 3; j -= 4){
-			int k;
-			v4dwt_interleave_v(&v, aj, w, 4);
-			v4dwt_decode(&v);
-				for(k = 0; k < rh; ++k){
-					memcpy(&aj[k*w], &v.wavelet[k], 4 * sizeof(float));
-				}
-			aj += 4;
-		}
-		if (rw & 0x03){
-				int k;
-			j = rw & 0x03;
-			v4dwt_interleave_v(&v, aj, w, j);
-			v4dwt_decode(&v);
-				for(k = 0; k < rh; ++k){
-					memcpy(&aj[k*w], &v.wavelet[k], j * sizeof(float));
-				}
-			}
-	}
-
-	opj_aligned_free(h.wavelet);
-	return OPJ_TRUE;
-}
-
-
-/* <summary>                             */
-/* Inverse 9-7 wavelet transform in 2-D. */
-/* </summary>                            */
-opj_bool dwt_decode_real_v2(opj_tcd_tilecomp_v2_t* restrict tilec, OPJ_UINT32 numres){
-	v4dwt_t h;
-	v4dwt_t v;
-
-	opj_tcd_resolution_v2_t* res = tilec->resolutions;
-
-	OPJ_UINT32 rw = res->x1 - res->x0;	/* width of the resolution level computed */
-	OPJ_UINT32 rh = res->y1 - res->y0;	/* height of the resolution level computed */
-
-	OPJ_UINT32 w = tilec->x1 - tilec->x0;
-
-	h.wavelet = (v4*) opj_aligned_malloc((dwt_max_resolution_v2(res, numres)+5) * sizeof(v4));
-	v.wavelet = h.wavelet;
-
-	while( --numres) {
-		OPJ_FLOAT32 * restrict aj = (OPJ_FLOAT32*) tilec->data;
-		OPJ_UINT32 bufsize = (tilec->x1 - tilec->x0) * (tilec->y1 - tilec->y0);
-		OPJ_INT32 j;
-
-		h.sn = rw;
-		v.sn = rh;
-
-		++res;
-
-		rw = res->x1 - res->x0;	/* width of the resolution level computed */
-		rh = res->y1 - res->y0;	/* height of the resolution level computed */
-
-		h.dn = rw - h.sn;
-		h.cas = res->x0 % 2;
-
-		for(j = rh; j > 3; j -= 4) {
-			OPJ_INT32 k;
-			v4dwt_interleave_h(&h, aj, w, bufsize);
-			v4dwt_decode(&h);
-
-			for(k = rw; --k >= 0;){
-				aj[k    ] = h.wavelet[k].f[0];
-				aj[k+w  ] = h.wavelet[k].f[1];
-				aj[k+w*2] = h.wavelet[k].f[2];
-				aj[k+w*3] = h.wavelet[k].f[3];
-			}
-
-			aj += w*4;
-			bufsize -= w*4;
-		}
-
-		if (rh & 0x03) {
-			int k;
-			j = rh & 0x03;
-			v4dwt_interleave_h(&h, aj, w, bufsize);
-			v4dwt_decode(&h);
-			for(k = rw; --k >= 0;){
-				switch(j) {
-					case 3: aj[k+w*2] = h.wavelet[k].f[2];
-					case 2: aj[k+w  ] = h.wavelet[k].f[1];
-					case 1: aj[k    ] = h.wavelet[k].f[0];
-				}
-			}
-		}
-
-		v.dn = rh - v.sn;
-		v.cas = res->y0 % 2;
-
-		aj = (OPJ_FLOAT32*) tilec->data;
-		for(j = rw; j > 3; j -= 4){
-			OPJ_INT32 k;
-
-			v4dwt_interleave_v(&v, aj, w, 4);
-			v4dwt_decode(&v);
-
-			for(k = 0; k < rh; ++k){
-				memcpy(&aj[k*w], &v.wavelet[k], 4 * sizeof(OPJ_FLOAT32));
-			}
-			aj += 4;
-		}
-
-		if (rw & 0x03){
-			OPJ_INT32 k;
-
-			j = rw & 0x03;
-
-			v4dwt_interleave_v(&v, aj, w, j);
-			v4dwt_decode(&v);
-
-			for(k = 0; k < rh; ++k){
-				memcpy(&aj[k*w], &v.wavelet[k], j * sizeof(OPJ_FLOAT32));
-			}
-		}
-	}
-
-	opj_aligned_free(h.wavelet);
-	return OPJ_TRUE;
-}
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/dwt.h b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/dwt.h
deleted file mode 100644
index c2ed90fff7ecec52c7f7184f32e878b7dd0da6d5..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/dwt.h
+++ /dev/null
@@ -1,127 +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.
- */
-
-#ifndef __DWT_H
-#define __DWT_H
-/**
-@file dwt.h
-@brief Implementation of a discrete wavelet transform (DWT)
-
-The functions in DWT.C have for goal to realize forward and inverse discret wavelet
-transform with filter 5-3 (reversible) and filter 9-7 (irreversible). The functions in
-DWT.C are used by some function in TCD.C.
-*/
-
-/** @defgroup DWT DWT - Implementation of a discrete wavelet transform */
-/*@{*/
-
-
-/** @name Exported functions */
-/*@{*/
-/* ----------------------------------------------------------------------- */
-/**
-Forward 5-3 wavelet tranform in 2-D. 
-Apply a reversible DWT transform to a component of an image.
-@param tilec Tile component information (current tile)
-*/
-void dwt_encode(opj_tcd_tilecomp_t * tilec);
-/**
-Inverse 5-3 wavelet tranform in 2-D.
-Apply a reversible inverse DWT transform to a component of an image.
-@param tilec Tile component information (current tile)
-@param numres Number of resolution levels to decode
-*/
-#ifdef OPJ_V1
-void dwt_decode(opj_tcd_tilecomp_t* tilec, int numres);
-#endif
-opj_bool dwt_decode(opj_tcd_tilecomp_t* tilec, OPJ_UINT32 numres);
-
-opj_bool dwt_decode_v2(opj_tcd_tilecomp_v2_t* tilec, OPJ_UINT32 numres);
-
-/**
-Get the gain of a subband for the reversible 5-3 DWT.
-@param orient Number that identifies the subband (0->LL, 1->HL, 2->LH, 3->HH)
-@return Returns 0 if orient = 0, returns 1 if orient = 1 or 2, returns 2 otherwise
-*/
-int dwt_getgain(int orient);
-
-OPJ_UINT32 dwt_getgain_v2(OPJ_UINT32 orient) ;
-/**
-Get the norm of a wavelet function of a subband at a specified level for the reversible 5-3 DWT.
-@param level Level of the wavelet function
-@param orient Band of the wavelet function
-@return Returns the norm of the wavelet function
-*/
-double dwt_getnorm(int level, int orient);
-/**
-Forward 9-7 wavelet transform in 2-D. 
-Apply an irreversible DWT transform to a component of an image.
-@param tilec Tile component information (current tile)
-*/
-void dwt_encode_real(opj_tcd_tilecomp_t * tilec);
-/**
-KEEP TRUNK VERSION + return type of v2 because rev557
-Inverse 9-7 wavelet transform in 2-D. 
-Apply an irreversible inverse DWT transform to a component of an image.
-@param tilec Tile component information (current tile)
-@param numres Number of resolution levels to decode
-*/
-// V1 void dwt_decode_real(opj_tcd_tilecomp_t* tilec, int numres);
-opj_bool dwt_decode_real(opj_tcd_tilecomp_t* tilec, int numres);
-
-opj_bool dwt_decode_real_v2(opj_tcd_tilecomp_v2_t* restrict tilec, OPJ_UINT32 numres);
-
-/**
-Get the gain of a subband for the irreversible 9-7 DWT.
-@param orient Number that identifies the subband (0->LL, 1->HL, 2->LH, 3->HH)
-@return Returns the gain of the 9-7 wavelet transform
-*/
-int dwt_getgain_real(int orient);
-OPJ_UINT32 dwt_getgain_real_v2(OPJ_UINT32 orient);
-/**
-Get the norm of a wavelet function of a subband at a specified level for the irreversible 9-7 DWT
-@param level Level of the wavelet function
-@param orient Band of the wavelet function
-@return Returns the norm of the 9-7 wavelet
-*/
-double dwt_getnorm_real(int level, int orient);
-/**
-Explicit calculation of the Quantization Stepsizes 
-@param tccp Tile-component coding parameters
-@param prec Precint analyzed
-*/
-void dwt_calc_explicit_stepsizes(opj_tccp_t * tccp, int prec);
-/* ----------------------------------------------------------------------- */
-/*@}*/
-
-/*@}*/
-
-#endif /* __DWT_H */
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/event.c b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/event.c
deleted file mode 100644
index 2a7006559c9e5bde82df70715158182f340ef1bc..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/event.c
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * 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 "opj_includes.h"
-
-/* ==========================================================
-     Utility functions
-   ==========================================================*/
-
-#ifdef OPJ_CODE_NOT_USED
-#ifndef _WIN32
-static char*
-i2a(unsigned i, char *a, unsigned r) {
-	if (i/r > 0) a = i2a(i/r,a,r);
-	*a = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"[i%r];
-	return a+1;
-}
-
-/** 
- Transforms integer i into an ascii string and stores the result in a; 
- string is encoded in the base indicated by r.
- @param i Number to be converted
- @param a String result
- @param r Base of value; must be in the range 2 - 36
- @return Returns a
-*/
-static char *
-_itoa(int i, char *a, int r) {
-	r = ((r < 2) || (r > 36)) ? 10 : r;
-	if(i < 0) {
-		*a = '-';
-		*i2a(-i, a+1, r) = 0;
-	}
-	else *i2a(i, a, r) = 0;
-	return a;
-}
-
-#endif /* !_WIN32 */
-#endif
-
-/* ----------------------------------------------------------------------- */
-opj_event_mgr_t* OPJ_CALLCONV opj_set_event_mgr(opj_common_ptr cinfo, opj_event_mgr_t *event_mgr, void *context) {
-	if(cinfo) {
-		opj_event_mgr_t *previous = cinfo->event_mgr;
-		cinfo->event_mgr = event_mgr;
-		cinfo->client_data = context;
-		return previous;
-	}
-
-	return NULL;
-}
-
-/* ----------------------------------------------------------------------- */
-opj_bool opj_event_msg(opj_common_ptr cinfo, int event_type, const char *fmt, ...) {
-#define MSG_SIZE 512 /* 512 bytes should be more than enough for a short message */
-	opj_msg_callback msg_handler = NULL;
-
-	opj_event_mgr_t *event_mgr = cinfo->event_mgr;
-	if(event_mgr != NULL) {
-		switch(event_type) {
-			case EVT_ERROR:
-				msg_handler = event_mgr->error_handler;
-				break;
-			case EVT_WARNING:
-				msg_handler = event_mgr->warning_handler;
-				break;
-			case EVT_INFO:
-				msg_handler = event_mgr->info_handler;
-				break;
-			default:
-				break;
-		}
-		if(msg_handler == NULL) {
-			return OPJ_FALSE;
-		}
-	} else {
-		return OPJ_FALSE;
-	}
-
-	if ((fmt != NULL) && (event_mgr != NULL)) {
-		va_list arg;
-		int str_length/*, i, j*/; /* UniPG */
-		char message[MSG_SIZE];
-		memset(message, 0, MSG_SIZE);
-		/* initialize the optional parameter list */
-		va_start(arg, fmt);
-		/* check the length of the format string */
-		str_length = (strlen(fmt) > MSG_SIZE) ? MSG_SIZE : strlen(fmt);
-		/* parse the format string and put the result in 'message' */
-		vsprintf(message, fmt, arg); /* UniPG */
-		/* deinitialize the optional parameter list */
-		va_end(arg);
-
-		/* output the message to the user program */
-		msg_handler(message, cinfo->client_data);
-	}
-
-	return OPJ_TRUE;
-}
-
-/* ----------------------------------------------------------------------- */
-opj_bool opj_event_msg_v2(opj_event_mgr_t* event_mgr, int event_type, const char *fmt, ...) {
-#define MSG_SIZE 512 /* 512 bytes should be more than enough for a short message */
-	opj_msg_callback msg_handler = NULL;
-
-	if(event_mgr != NULL) {
-		switch(event_type) {
-			case EVT_ERROR:
-				msg_handler = event_mgr->error_handler;
-				break;
-			case EVT_WARNING:
-				msg_handler = event_mgr->warning_handler;
-				break;
-			case EVT_INFO:
-				msg_handler = event_mgr->info_handler;
-				break;
-			default:
-				break;
-		}
-		if(msg_handler == NULL) {
-			return OPJ_FALSE;
-		}
-	} else {
-		return OPJ_FALSE;
-	}
-
-	if ((fmt != NULL) && (event_mgr != NULL)) {
-		va_list arg;
-		int str_length/*, i, j*/; /* UniPG */
-		char message[MSG_SIZE];
-		memset(message, 0, MSG_SIZE);
-		/* initialize the optional parameter list */
-		va_start(arg, fmt);
-		/* check the length of the format string */
-		str_length = (strlen(fmt) > MSG_SIZE) ? MSG_SIZE : strlen(fmt);
-		/* parse the format string and put the result in 'message' */
-		vsprintf(message, fmt, arg); /* UniPG */
-		/* deinitialize the optional parameter list */
-		va_end(arg);
-
-		/* output the message to the user program */
-		msg_handler(message, event_mgr->client_data);
-	}
-
-	return OPJ_TRUE;
-}
-
-/* ----------------------------------------------------------------------- */
-void OPJ_CALLCONV opj_initialize_default_event_handler(opj_event_mgr_t * p_event, opj_bool verbose)
-{
-	if (! p_event){
-		fprintf(stderr, "[ERROR] Event structure provided to the opj_set_default_event_handler is equal to null pointer.\n");
-		return;
-	}
-
-	p_event->client_data = NULL;
-	p_event->error_handler = opj_error_default_callback;
-
-	if (verbose) {
-		p_event->info_handler = opj_info_default_callback;
-		p_event->warning_handler = opj_warning_default_callback;
-	}
-	else {
-		/* FIXME (MSD) This message should be remove when the documentation will be updated */
-		fprintf(stdout, "[INFO] Verbose mode = OFF => no other info/warning output.\n");
-		p_event->info_handler = opj_default_callback ;
-		p_event->warning_handler = opj_default_callback ;
-	}
-}
-
-/* ---------------------------------------------------------------------- */
-/* Default callback functions                                             */
-
-/**
- * Default callback function.
- * Do nothing.
- */
-void opj_default_callback (const char *msg, void *client_data)
-{
-}
-
-/**
- * Default info callback function.
- * Output = stdout.
- */
-void opj_info_default_callback (const char *msg, void *client_data)
-{
-	(void)client_data;
-	fprintf(stdout, "[INFO] %s", msg);
-}
-
-/**
- * Default warning callback function.
- * Output = stderr.
- */
-void opj_warning_default_callback (const char *msg, void *client_data)
-{
-	(void)client_data;
-	fprintf(stderr, "[WARNING] %s", msg);
-}
-
-/**
- * Default error callback function.
- * Output = stderr.
- */
-void opj_error_default_callback (const char *msg, void *client_data)
-{
-	(void)client_data;
-	fprintf(stderr, "[ERROR] %s", msg);
-}
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/event.h b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/event.h
deleted file mode 100644
index e8e0a7514e725ba614004faca5b9f33075011005..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/event.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * 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 __EVENT_H
-#define __EVENT_H
-/**
-@file event.h
-@brief Implementation of a event callback system
-
-The functions in EVENT.C have for goal to send output messages (errors, warnings, debug) to the user.
-*/
-
-#define EVT_ERROR	1	/**< Error event type */
-#define EVT_WARNING	2	/**< Warning event type */
-#define EVT_INFO	4	/**< Debug event type */
-
-/** @defgroup EVENT EVENT - Implementation of a event callback system */
-/*@{*/
-
-/** @name Exported functions (see also openjpeg.h) */
-/*@{*/
-/* ----------------------------------------------------------------------- */
-/**
-Write formatted data to a string and send the string to a user callback. 
-@param cinfo Codec context info
-@param event_type Event type or callback to use to send the message
-@param fmt Format-control string (plus optional arguments)
-@return Returns true if successful, returns false otherwise
-* FIXME Change by its v2 version this function after ended the merge 
-*/
-opj_bool opj_event_msg(opj_common_ptr cinfo, int event_type, const char *fmt, ...);
-
-/* ----------------------------------------------------------------------- */
-/*@}*/
-
-/**
- * Write formatted data to a string and send the string to a user callback.
- *
- * @param event_mgr			Event handler
- * @param event_type 		Event type or callback to use to send the message
- * @param fmt 				Format-control string (plus optional arguments)
- *
- * @return Returns true if successful, returns false otherwise
- */
-opj_bool opj_event_msg_v2(opj_event_mgr_t* event_mgr, int event_type, const char *fmt, ...);
-
-/**
- * Default callback function. No message sent to output.
- */
-void opj_default_callback (const char *msg, void *client_data);
-
-/**
- * Default info callback function, message is sent to the stdout output.
- */
-void opj_info_default_callback (const char *msg, void *client_data);
-
-/**
- * Default warning callback function, message is sent to stderr output.
- */
-void opj_warning_default_callback (const char *msg, void *client_data);
-
-/**
- * Default error callback function, message is sent to stderr output.
- */
-void opj_error_default_callback (const char *msg, void *client_data);
-
-
-/*@}*/
-
-#endif /* __EVENT_H */
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/fix.h b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/fix.h
deleted file mode 100644
index bcb2acb54c8ff9946df869bb872341297d43e2a6..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/fix.h
+++ /dev/null
@@ -1,64 +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.
- */
-#ifndef __FIX_H
-#define __FIX_H
-
-#if defined(_MSC_VER) || defined(__BORLANDC__)
-#define int64 __int64
-#else
-#define int64 long long
-#endif
-
-/**
-@file fix.h
-@brief Implementation of operations of specific multiplication (FIX)
-
-The functions in FIX.H have for goal to realize specific multiplication.
-*/
-
-/** @defgroup FIX FIX - Implementation of operations of specific multiplication */
-/*@{*/
-
-/**
-Multiply two fixed-precision rational numbers.
-@param a
-@param b
-@return Returns a * b
-*/
-static INLINE int fix_mul(int a, int b) {
-    int64 temp = (int64) a * (int64) b ;
-    temp += temp & 4096;
-    return (int) (temp >> 13) ;
-}
-
-/*@}*/
-
-#endif /* __FIX_H */
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/function_list.c b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/function_list.c
deleted file mode 100644
index 10a3baf30d6620364cad5581a95d61d947a3da54..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/function_list.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (c) 2008, Jerome Fimes, Communications & Systemes <jerome.fimes@c-s.fr>
- * 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"
-
-/**
- * Default size of the validation list, if not sufficient, data will be reallocated with a double size.
- */
-#define OPJ_VALIDATION_SIZE 10
-
-/**
- * Creates a validation list.
- *
- * @return	the newly created validation list.
- */
-opj_procedure_list_t *  opj_procedure_list_create()
-{
-	/* memory allocation */
-	opj_procedure_list_t * l_validation = (opj_procedure_list_t *) opj_malloc(sizeof(opj_procedure_list_t));
-	if
-		(! l_validation)
-	{
-		return 00;
-	}
-	/* initialization */
-	memset(l_validation,0,sizeof(opj_procedure_list_t));
-	l_validation->m_nb_max_procedures = OPJ_VALIDATION_SIZE;
-	l_validation->m_procedures = (void**)opj_malloc(
-		OPJ_VALIDATION_SIZE * sizeof(opj_procedure));
-	if
-		(! l_validation->m_procedures)
-	{
-		opj_free(l_validation);
-		return 00;
-	}
-	memset(l_validation->m_procedures,0,OPJ_VALIDATION_SIZE * sizeof(opj_procedure));
-	return l_validation;
-}
-
-
-
-/**
- * Destroys a validation list.
- *
- * @param p_list the list to destroy.
- */
-void  opj_procedure_list_destroy(opj_procedure_list_t * p_list)
-{
-	if
-		(! p_list)
-	{
-		return;
-	}
-	/* initialization */
-	if
-		(p_list->m_procedures)
-	{
-		opj_free(p_list->m_procedures);
-	}
-	opj_free(p_list);
-}
-
-/**
- * Adds a new validation procedure.
- *
- * @param	p_validation_list the list of procedure to modify.
- * @param	p_procedure		the procedure to add.
- */
-opj_bool  opj_procedure_list_add_procedure (opj_procedure_list_t * p_validation_list, opj_procedure p_procedure)
-{
-	if
-		(p_validation_list->m_nb_max_procedures == p_validation_list->m_nb_procedures)
-	{
-		p_validation_list->m_nb_max_procedures += OPJ_VALIDATION_SIZE;
-		p_validation_list->m_procedures = (void**)opj_realloc(
-		p_validation_list->m_procedures,p_validation_list->m_nb_max_procedures * sizeof(opj_procedure));
-		if
-			(! p_validation_list->m_procedures)
-		{
-			p_validation_list->m_nb_max_procedures = 0;
-			p_validation_list->m_nb_procedures = 0;
-			return OPJ_FALSE;
-		}
-	}
-	p_validation_list->m_procedures[p_validation_list->m_nb_procedures] = p_procedure;
-	++p_validation_list->m_nb_procedures;
-	return OPJ_TRUE;
-}
-
-/**
- * Gets the number of validation procedures.
- *
- * @param	p_validation_list the list of procedure to modify.
- *
- * @return the number of validation procedures.
- */
-OPJ_UINT32 opj_procedure_list_get_nb_procedures (opj_procedure_list_t * p_validation_list)
-{
-	return p_validation_list->m_nb_procedures;
-}
-
-/**
- * Gets the pointer on the first validation procedure. This function is similar to the C++
- * iterator class to iterate through all the procedures inside the validation list.
- * the caller does not take ownership of the pointer.
- *
- * @param	p_validation_list the list of procedure to get the first procedure from.
- *
- * @return	a pointer to the first procedure.
- */
-opj_procedure* opj_procedure_list_get_first_procedure (opj_procedure_list_t * p_validation_list)
-{
-	return p_validation_list->m_procedures;
-}
-
-/**
- * Clears the list of validation procedures.
- *
- * @param	p_validation_list the list of procedure to clear.
- *
- */
-void  opj_procedure_list_clear (opj_procedure_list_t * p_validation_list)
-{
-	p_validation_list->m_nb_procedures = 0;
-}
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/function_list.h b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/function_list.h
deleted file mode 100644
index ed1576cd965f775add1749c56aec8a11ef59d96a..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/function_list.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (c) 2008, Jerome Fimes, Communications & Systemes <jerome.fimes@c-s.fr>
- * 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 __FUNCTION_LIST_H
-#define __FUNCTION_LIST_H
-
-/** 
- * @file function_list.h
- * @brief Implementation of a list of procedures.
-
- * The functions in validation.c aims to have access to a list of procedures.
-*/
-
-/** @defgroup validation validation procedure*/
-/*@{*/
-
-//#include "openjpeg.h"
-/**************************************************************************************************
- ***************************************** FORWARD DECLARATION ************************************
- **************************************************************************************************/
-struct opj_jp2;
-
-/**
- * ARGGGG, when will the template be added to the C language ???
- * in order not to have to duplicate the code in a vast number of times, use void * and downcast
- * it after => UGLY but faster and easier
- * TODO : make the class template in C++, use STL vector or duplicate code for each procedure type.
- */
-typedef void * opj_procedure;
-
-/**
- * A list of procedures.
-*/
-typedef struct opj_procedure_list 
-{
-	/**
-	 * The number of validation procedures.
-	 */
-	OPJ_UINT32 m_nb_procedures;
-	/**
-	 * The number of the array of validation procedures.
-	 */
-	OPJ_UINT32 m_nb_max_procedures;
-	/**
-	 * The array of procedures.
-	 */
-	opj_procedure * m_procedures;
-
-} opj_procedure_list_t;
-
-/* ----------------------------------------------------------------------- */
-
-/**
- * Creates a validation list.
- *
- * @return	the newly created validation list.
- */
-opj_procedure_list_t *  opj_procedure_list_create();
-
-/**
- * Destroys a validation list.
- *
- * @param p_list the list to destroy.
- */
-void  opj_procedure_list_destroy(opj_procedure_list_t * p_list);
-
-/**
- * Adds a new validation procedure.
- *
- * @param	p_validation_list the list of procedure to modify.
- * @param	p_procedure		the procedure to add.
- *
- * @return	true if the procedure could ne added.
- */
-opj_bool  opj_procedure_list_add_procedure (opj_procedure_list_t * p_validation_list, opj_procedure p_procedure);
-
-/**
- * Gets the number of validation procedures.
- *
- * @param	p_validation_list the list of procedure to modify.
- *
- * @return the number of validation procedures.
- */
-OPJ_UINT32 opj_procedure_list_get_nb_procedures (opj_procedure_list_t * p_validation_list);
-
-/**
- * Gets the pointer on the first validation procedure. This function is similar to the C++
- * iterator class to iterate through all the procedures inside the validation list.
- * the caller does not take ownership of the pointer.
- *
- * @param	p_validation_list the list of procedure to get the first procedure from.
- *
- * @return	a pointer to the first procedure.
- */
-opj_procedure* opj_procedure_list_get_first_procedure (opj_procedure_list_t * p_validation_list);
-
-
-/**
- * Clears the list of validation procedures.
- *
- * @param	p_validation_list the list of procedure to clear.
- *
- */
-void  opj_procedure_list_clear (opj_procedure_list_t * p_validation_list);
-
-
-#endif /* __FUNCTION_LIST_H */
-
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/image.c b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/image.c
deleted file mode 100644
index 40184c2112148849973e6add7bf026fd02a411a4..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/image.c
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * 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 "opj_includes.h"
-
-opj_image_t* opj_image_create0(void) {
-	opj_image_t *image = (opj_image_t*)opj_calloc(1, sizeof(opj_image_t));
-	return image;
-}
-
-opj_image_t* OPJ_CALLCONV opj_image_create(int numcmpts, opj_image_cmptparm_t *cmptparms, OPJ_COLOR_SPACE clrspc) {
-	int compno;
-	opj_image_t *image = NULL;
-
-	image = (opj_image_t*) opj_calloc(1, sizeof(opj_image_t));
-	if(image) {
-		image->color_space = clrspc;
-		image->numcomps = numcmpts;
-		/* allocate memory for the per-component information */
-		image->comps = (opj_image_comp_t*)opj_malloc(image->numcomps * sizeof(opj_image_comp_t));
-		if(!image->comps) {
-			fprintf(stderr,"Unable to allocate memory for image.\n");
-			opj_image_destroy(image);
-			return NULL;
-		}
-		/* create the individual image components */
-		for(compno = 0; compno < numcmpts; compno++) {
-			opj_image_comp_t *comp = &image->comps[compno];
-			comp->dx = cmptparms[compno].dx;
-			comp->dy = cmptparms[compno].dy;
-			comp->w = cmptparms[compno].w;
-			comp->h = cmptparms[compno].h;
-			comp->x0 = cmptparms[compno].x0;
-			comp->y0 = cmptparms[compno].y0;
-			comp->prec = cmptparms[compno].prec;
-			comp->bpp = cmptparms[compno].bpp;
-			comp->sgnd = cmptparms[compno].sgnd;
-			comp->data = (int*) opj_calloc(comp->w * comp->h, sizeof(int));
-			if(!comp->data) {
-				fprintf(stderr,"Unable to allocate memory for image.\n");
-				opj_image_destroy(image);
-				return NULL;
-			}
-		}
-	}
-
-	return image;
-}
-
-void OPJ_CALLCONV opj_image_destroy(opj_image_t *image) {
-	if(image) {
-		if(image->comps) {
-			OPJ_UINT32 compno;
-
-			/* image components */
-			for(compno = 0; compno < image->numcomps; compno++) {
-				opj_image_comp_t *image_comp = &(image->comps[compno]);
-				if(image_comp->data) {
-					opj_free(image_comp->data);
-				}
-			}
-			opj_free(image->comps);
-		}
-
-		if(image->icc_profile_buf) {
-			opj_free(image->icc_profile_buf);
-		}
-
-		opj_free(image);
-	}
-}
-
-/**
- * Updates the components characteristics of the image from the coding parameters.
- *
- * @param p_image_header	the image header to update.
- * @param p_cp				the coding parameters from which to update the image.
- */
-void opj_image_comp_header_update(opj_image_t * p_image_header, const struct opj_cp_v2 * p_cp)
-{
-	OPJ_UINT32 i, l_width, l_height;
-	OPJ_INT32 l_x0, l_y0, l_x1, l_y1;
-	OPJ_INT32 l_comp_x0, l_comp_y0, l_comp_x1, l_comp_y1;
-	opj_image_comp_t* l_img_comp = NULL;
-
-	l_x0 = int_max(p_cp->tx0 , p_image_header->x0);
-	l_y0 = int_max(p_cp->ty0 , p_image_header->y0);
-	l_x1 = int_min(p_cp->tx0 + p_cp->tw * p_cp->tdx, p_image_header->x1);
-	l_y1 = int_min(p_cp->ty0 + p_cp->th * p_cp->tdy, p_image_header->y1);
-
-	l_img_comp = p_image_header->comps;
-	for	(i = 0; i < p_image_header->numcomps; ++i) {
-		l_comp_x0 = int_ceildiv(l_x0, l_img_comp->dx);
-		l_comp_y0 = int_ceildiv(l_y0, l_img_comp->dy);
-		l_comp_x1 = int_ceildiv(l_x1, l_img_comp->dx);
-		l_comp_y1 = int_ceildiv(l_y1, l_img_comp->dy);
-		l_width = int_ceildivpow2(l_comp_x1 - l_comp_x0, l_img_comp->factor);
-		l_height = int_ceildivpow2(l_comp_y1 - l_comp_y0, l_img_comp->factor);
-		l_img_comp->w = l_width;
-		l_img_comp->h = l_height;
-		l_img_comp->x0 = l_comp_x0/*l_x0*/;
-		l_img_comp->y0 = l_comp_y0/*l_y0*/;
-		++l_img_comp;
-	}
-}
-
-
-/**
- * Copy only header of image and its component header (no data are copied)
- * if dest image have data, they will be freed
- *
- * @param	p_image_src		the src image
- * @param	p_image_dest	the dest image
- *
- */
-void opj_copy_image_header(const opj_image_t* p_image_src, opj_image_t* p_image_dest)
-{
-	OPJ_UINT32 compno;
-
-	/* preconditions */
-	assert(p_image_src != 00);
-	assert(p_image_dest != 00);
-
-	p_image_dest->x0 = p_image_src->x0;
-	p_image_dest->y0 = p_image_src->y0;
-	p_image_dest->x1 = p_image_src->x1;
-	p_image_dest->y1 = p_image_src->y1;
-
-	if (p_image_dest->comps){
-		for(compno = 0; compno < p_image_dest->numcomps; compno++) {
-			opj_image_comp_t *image_comp = &(p_image_dest->comps[compno]);
-			if(image_comp->data) {
-				opj_free(image_comp->data);
-			}
-		}
-		opj_free(p_image_dest->comps);
-		p_image_dest->comps = NULL;
-	}
-
-	p_image_dest->numcomps = p_image_src->numcomps;
-
-	p_image_dest->comps = (opj_image_comp_t*) opj_malloc(p_image_dest->numcomps * sizeof(opj_image_comp_t));
-	if (!p_image_dest->comps){
-		p_image_dest->comps = NULL;
-		p_image_dest->numcomps = 0;
-		return;
-	}
-
-	for (compno=0; compno < p_image_dest->numcomps; compno++){
-		memcpy( &(p_image_dest->comps[compno]),
-				&(p_image_src->comps[compno]),
-				sizeof(opj_image_comp_t));
-		p_image_dest->comps[compno].data = NULL;
-	}
-
-	p_image_dest->color_space = p_image_src->color_space;
-	p_image_dest->icc_profile_len = p_image_src->icc_profile_len;
-
-	if (p_image_dest->icc_profile_len) {
-		p_image_dest->icc_profile_buf = (OPJ_BYTE*)opj_malloc(p_image_dest->icc_profile_len);
-		if (!p_image_dest->icc_profile_buf){
-			p_image_dest->icc_profile_buf = NULL;
-			p_image_dest->icc_profile_len = 0;
-			return;
-		}
-		memcpy( p_image_dest->icc_profile_buf,
-				p_image_src->icc_profile_buf,
-				p_image_src->icc_profile_len);
-		}
-		else
-			p_image_dest->icc_profile_buf = NULL;
-
-	return;
-}
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/image.h b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/image.h
deleted file mode 100644
index a6cd9f58e33a909bf2edd7d845911d481e7c7d59..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/image.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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 __IMAGE_H
-#define __IMAGE_H
-/**
-@file image.h
-@brief Implementation of operations on images (IMAGE)
-
-The functions in IMAGE.C have for goal to realize operations on images.
-*/
-
-struct opj_image;
-struct opj_cp_v2;
-
-/** @defgroup IMAGE IMAGE - Implementation of operations on images */
-/*@{*/
-
-/**
- * Create an empty image
- *
- * @return returns an empty image if successful, returns NULL otherwise
- */
-opj_image_t* opj_image_create0(void);
-
-
-
-/**
- * Updates the components characteristics of the image from the coding parameters.
- *
- * @param p_image_header		the image header to update.
- * @param p_cp					the coding parameters from which to update the image.
- */
-void opj_image_comp_header_update(opj_image_t * p_image, const struct opj_cp_v2* p_cp);
-
-void opj_copy_image_header(const opj_image_t* p_image_src, opj_image_t* p_image_dest);
-
-/*@}*/
-
-#endif /* __IMAGE_H */
-
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/indexbox_manager.h b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/indexbox_manager.h
deleted file mode 100644
index ac5fca8539c2084832fb668c912b9e1578703e3a..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/indexbox_manager.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * $Id: indexbox_manager.h 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
- */
-
-#ifndef  INDEXBOX_MANAGER_H_
-# define INDEXBOX_MANAGER_H_
-
-#include "openjpeg.h"
-#include "j2k.h" // needed to use jp2.h
-#include "jp2.h"
-
-#define JPIP_CIDX 0x63696478   /* Codestream index                */
-#define JPIP_CPTR 0x63707472   /* Codestream Finder Box           */
-#define JPIP_MANF 0x6d616e66   /* Manifest Box                    */
-#define JPIP_FAIX 0x66616978   /* Fragment array Index box        */
-#define JPIP_MHIX 0x6d686978   /* Main Header Index Table         */
-#define JPIP_TPIX 0x74706978   /* Tile-part Index Table box       */
-#define JPIP_THIX 0x74686978   /* Tile header Index Table box     */
-#define JPIP_PPIX 0x70706978   /* Precinct Packet Index Table box */
-#define JPIP_PHIX 0x70686978   /* Packet Header index Table       */
-#define JPIP_FIDX 0x66696478   /* File Index                      */
-#define JPIP_FPTR 0x66707472   /* File Finder                     */
-#define JPIP_PRXY 0x70727879   /* Proxy boxes                     */
-#define JPIP_IPTR 0x69707472   /* Index finder box                */
-#define JPIP_PHLD 0x70686c64   /* Place holder                    */
-
-
-/* 
- * Write tile-part Index table box (superbox)
- *
- * @param[in] coff      offset of j2k codestream
- * @param[in] cstr_info codestream information
- * @param[in] j2klen    length of j2k codestream
- * @param[in] cio       file output handle
- * @return              length of tpix box
- */
-int write_tpix( int coff, opj_codestream_info_t cstr_info, int j2klen, opj_cio_t *cio);
-
-
-/* 
- * Write tile header index table box (superbox)
- *
- * @param[in] coff      offset of j2k codestream
- * @param[in] cstr_info codestream information pointer
- * @param[in] cio       file output handle
- * @return              length of thix box
- */
-int write_thix( int coff, opj_codestream_info_t cstr_info, opj_cio_t *cio);
-
-
-/* 
- * Write precinct packet index table box (superbox)
- *
- * @param[in] coff      offset of j2k codestream
- * @param[in] cstr_info codestream information
- * @param[in] EPHused   true if EPH option used
- * @param[in] j2klen    length of j2k codestream
- * @param[in] cio       file output handle
- * @return              length of ppix box
- */
-int write_ppix( int coff, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_cio_t *cio);
-
-
-/* 
- * Write packet header index table box (superbox)
- *
- * @param[in] coff      offset of j2k codestream
- * @param[in] cstr_info codestream information
- * @param[in] EPHused   true if EPH option used
- * @param[in] j2klen    length of j2k codestream
- * @param[in] cio       file output handle
- * @return              length of ppix box
- */
-int write_phix( int coff, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_cio_t *cio);
-
-/* 
- * Wriet manifest box (box)
- *
- * @param[in] second number to be visited
- * @param[in] v      number of boxes
- * @param[in] box    box to be manifested
- * @param[in] cio    file output handle
- */
-void write_manf(int second, int v, opj_jp2_box_t *box, opj_cio_t *cio);
-
-
-#endif      /* !INDEXBOX_MANAGER_H_ */
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/int.h b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/int.h
deleted file mode 100644
index a39772b02266d40659339762443d039af5099bd9..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/int.h
+++ /dev/null
@@ -1,150 +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.
- */
-#ifndef __INT_H
-#define __INT_H
-/**
-@file int.h
-@brief Implementation of operations on integers (INT)
-
-The functions in INT.H have for goal to realize operations on integers.
-*/
-
-/** @defgroup INT INT - Implementation of operations on integers */
-/*@{*/
-
-/** @name Exported functions (see also openjpeg.h) */
-/*@{*/
-/* ----------------------------------------------------------------------- */
-/**
-Get the minimum of two integers
-@return Returns a if a < b else b
-*/
-static INLINE int int_min(int a, int b) {
-	return a < b ? a : b;
-}
-
-/**
-Get the minimum of two integers
-@return Returns a if a < b else b
-*/
-static INLINE OPJ_UINT32 uint_min(OPJ_UINT32 a, OPJ_UINT32 b) {
-	return a < b ? a : b;
-}
-
-/**
-Get the maximum of two integers
-@return Returns a if a > b else b
-*/
-static INLINE int int_max(int a, int b) {
-	return (a > b) ? a : b;
-}
-
-/**
-Get the maximum of two integers
-@return Returns a if a > b else b
-*/
-static INLINE OPJ_UINT32 uint_max(OPJ_UINT32  a, OPJ_UINT32  b) {
-	return (a > b) ? a : b;
-}
-
-/**
-Clamp an integer inside an interval
-@return
-<ul>
-<li>Returns a if (min < a < max)
-<li>Returns max if (a > max)
-<li>Returns min if (a < min) 
-</ul>
-*/
-static INLINE int int_clamp(int a, int min, int max) {
-	if (a < min)
-		return min;
-	if (a > max)
-		return max;
-	return a;
-}
-/**
-@return Get absolute value of integer
-*/
-static INLINE int int_abs(int a) {
-	return a < 0 ? -a : a;
-}
-/**
-Divide an integer and round upwards
-@return Returns a divided by b
-*/
-static INLINE int int_ceildiv(int a, int b) {
-	return (a + b - 1) / b;
-}
-/**
-Divide an integer by a power of 2 and round upwards
-@return Returns a divided by 2^b
-*/
-static INLINE int int_ceildivpow2(int a, int b) {
-	return (a + (1 << b) - 1) >> b;
-}
-/**
-Divide an integer by a power of 2 and round downwards
-@return Returns a divided by 2^b
-*/
-static INLINE int int_floordivpow2(int a, int b) {
-	return a >> b;
-}
-/**
-Get logarithm of an integer and round downwards
-@return Returns log2(a)
-*/
-static INLINE int int_floorlog2(int a) {
-	int l;
-	for (l = 0; a > 1; l++) {
-		a >>= 1;
-	}
-	return l;
-}
-/**
-Get logarithm of an integer and round downwards
-@return Returns log2(a)
-*/
-static INLINE OPJ_UINT32  uint_floorlog2(OPJ_UINT32  a) {
-	OPJ_UINT32  l;
-	for (l = 0; a > 1; ++l)
-	{
-		a >>= 1;
-	}
-	return l;
-}
-
-/* ----------------------------------------------------------------------- */
-/*@}*/
-
-/*@}*/
-
-#endif
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/j2k.c b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/j2k.c
deleted file mode 100644
index 4072a168744b819248c1885a3b2b9c3c564a8ca9..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/j2k.c
+++ /dev/null
@@ -1,8543 +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
- * Copyright (c) 2008, Jerome Fimes, Communications & Systemes <jerome.fimes@c-s.fr>
- * Copyright (c) 2006-2007, Parvatha Elangovan
- * Copyright (c) 2010-2011, Kaori Hagihara
- * Copyright (c) 2011, Mickael Savinaud, Communications & Systemes <mickael.savinaud@c-s.fr>
- * 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"
-
-/** @defgroup J2K J2K - JPEG-2000 codestream reader/writer */
-/*@{*/
-
-/** @name Local static functions */
-/*@{*/
-
-/**
- * Sets up the procedures to do on reading header. Developpers wanting to extend the library can add their own reading procedures.
- */
-void j2k_setup_header_reading (opj_j2k_v2_t *p_j2k);
-
-/**
- * The read header procedure.
- */
-opj_bool j2k_read_header_procedure(
-							    opj_j2k_v2_t *p_j2k,
-								struct opj_stream_private *p_stream,
-								struct opj_event_mgr * p_manager);
-
-/**
- * The default decoding validation procedure without any extension.
- *
- * @param	p_j2k			the jpeg2000 codec to validate.
- * @param	p_stream				the input stream to validate.
- * @param	p_manager		the user event manager.
- *
- * @return true if the parameters are correct.
- */
-opj_bool j2k_decoding_validation (
-								opj_j2k_v2_t * p_j2k,
-								opj_stream_private_t *p_stream,
-								opj_event_mgr_t * p_manager
-							);
-
-/**
- * Sets up the validation ,i.e. adds the procedures to lauch to make sure the codec parameters
- * are valid. Developpers wanting to extend the library can add their own validation procedures.
- */
-static void j2k_setup_decoding_validation (opj_j2k_v2_t *p_j2k);
-
-/**
- * Builds the tcd decoder to use to decode tile.
- */
-opj_bool j2k_build_decoder (
-						opj_j2k_v2_t * p_j2k,
-						opj_stream_private_t *p_stream,
-						opj_event_mgr_t * p_manager
-						);
-
-/**
- * Excutes the given procedures on the given codec.
- *
- * @param	p_procedure_list	the list of procedures to execute
- * @param	p_j2k					the jpeg2000 codec to execute the procedures on.
- * @param	p_stream					the stream to execute the procedures on.
- * @param	p_manager			the user manager.
- *
- * @return	true				if all the procedures were successfully executed.
- */
-static opj_bool j2k_exec (
-					opj_j2k_v2_t * p_j2k,
-					opj_procedure_list_t * p_procedure_list,
-					opj_stream_private_t *p_stream,
-					opj_event_mgr_t * p_manager
-				  );
-
-/**
- * Copies the decoding tile parameters onto all the tile parameters.
- * Creates also the tile decoder.
- */
-opj_bool j2k_copy_default_tcp_and_create_tcd (	opj_j2k_v2_t * p_j2k,
-												opj_stream_private_t *p_stream,
-												opj_event_mgr_t * p_manager );
-
-/**
- * Reads the lookup table containing all the marker, status and action, and returns the handler associated
- * with the marker value.
- * @param	p_id		Marker value to look up
- *
- * @return	the handler associated with the id.
-*/
-static const struct opj_dec_memory_marker_handler * j2k_get_marker_handler (OPJ_UINT32 p_id);
-
-/**
- * Destroys a tile coding parameter structure.
- *
- * @param	p_tcp		the tile coding parameter to destroy.
- */
-static void j2k_tcp_destroy (opj_tcp_v2_t *p_tcp);
-
-/**
- * Destroys the data inside a tile coding parameter structure.
- *
- * @param	p_tcp		the tile coding parameter which contain data to destroy.
- */
-static void j2k_tcp_data_destroy (opj_tcp_v2_t *p_tcp);
-
-/**
- * Destroys a coding parameter structure.
- *
- * @param	p_cp		the coding parameter to destroy.
- */
-static void j2k_cp_destroy (opj_cp_v2_t *p_cp);
-
-
-/**
- * Reads a SPCod or SPCoc element, i.e. the coding style of a given component of a tile.
- * @param	p_header_data	the data contained in the COM box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the COM marker.
- * @param	p_manager		the user event manager.
-*/
-static opj_bool j2k_read_SPCod_SPCoc(
-							opj_j2k_v2_t *p_j2k,
-							OPJ_UINT32 compno,
-							OPJ_BYTE * p_header_data,
-							OPJ_UINT32 * p_header_size,
-							struct opj_event_mgr * p_manager
-							);
-
-/**
- * Reads a SQcd or SQcc element, i.e. the quantization values of a band in the QCD or QCC.
- *
- * @param	p_tile_no		the tile to output.
- * @param	p_comp_no		the component number to output.
- * @param	p_data			the data buffer.
- * @param	p_header_size	pointer to the size of the data buffer, it is changed by the function.
- * @param	p_j2k				J2K codec.
- * @param	p_manager		the user event manager.
- *
-*/
-static opj_bool j2k_read_SQcd_SQcc(
-							opj_j2k_v2_t *p_j2k,
-							OPJ_UINT32 compno,
-							OPJ_BYTE * p_header_data,
-							OPJ_UINT32 * p_header_size,
-							struct opj_event_mgr * p_manager
-					);
-
-/**
- * Copies the tile component parameters of all the component from the first tile component.
- *
- * @param		p_j2k		the J2k codec.
- */
-static void j2k_copy_tile_component_parameters(
-							opj_j2k_v2_t *p_j2k
-							);
-
-/**
- * Copies the tile quantization parameters of all the component from the first tile component.
- *
- * @param		p_j2k		the J2k codec.
- */
-static void j2k_copy_tile_quantization_parameters(
-							opj_j2k_v2_t *p_j2k
-							);
-
-/**
- * Reads the tiles.
- */
-opj_bool j2k_decode_tiles (		opj_j2k_v2_t *p_j2k,
-								opj_stream_private_t *p_stream,
-								opj_event_mgr_t * p_manager);
-
-static opj_bool j2k_update_image_data (opj_tcd_v2_t * p_tcd, OPJ_BYTE * p_data, opj_image_t* p_output_image);
-
-
-/*
- * -----------------------------------------------------------------------
- * -----------------------------------------------------------------------
- * -----------------------------------------------------------------------
- */
-
-/**
-Write the SOC marker (Start Of Codestream)
-@param j2k J2K handle
-*/
-static void j2k_write_soc(opj_j2k_t *j2k);
-/**
-Read the SOC marker (Start of Codestream)
-@param j2k J2K handle
-*/
-static void j2k_read_soc(opj_j2k_t *j2k);
-
-/**
- * Reads a SOC marker (Start of Codestream)
- * @param	p_header_data	the data contained in the SOC box.
- * @param	jp2				the jpeg2000 file codec.
- * @param	p_header_size	the size of the data contained in the SOC marker.
- * @param	p_manager		the user event manager.
-*/
-static opj_bool j2k_read_soc_v2(
-					opj_j2k_v2_t *p_j2k,
-					struct opj_stream_private *p_stream,
-					struct opj_event_mgr * p_manager
-				 );
-
-/**
-Write the SIZ marker (image and tile size)
-@param j2k J2K handle
-*/
-static void j2k_write_siz(opj_j2k_t *j2k);
-/**
-Read the SIZ marker (image and tile size)
-@param j2k J2K handle
-*/
-static void j2k_read_siz(opj_j2k_t *j2k);
-
-/**
- * Reads a SIZ marker (image and tile size)
- * @param	p_header_data	the data contained in the SIZ box.
- * @param	jp2				the jpeg2000 file codec.
- * @param	p_header_size	the size of the data contained in the SIZ marker.
- * @param	p_manager		the user event manager.
-*/
-static opj_bool j2k_read_siz_v2 (
-						  opj_j2k_v2_t *p_j2k,
-						  OPJ_BYTE * p_header_data,
-						  OPJ_UINT32 p_header_size,
-						  struct opj_event_mgr * p_manager
-					);
-
-/**
-Write the COM marker (comment)
-@param j2k J2K handle
-*/
-static void j2k_write_com(opj_j2k_t *j2k);
-/**
-Read the COM marker (comment)
-@param j2k J2K handle
-*/
-static void j2k_read_com(opj_j2k_t *j2k);
-/**
- * Reads a COM marker (comments)
- * @param	p_header_data	the data contained in the COM box.
- * @param	jp2				the jpeg2000 file codec.
- * @param	p_header_size	the size of the data contained in the COM marker.
- * @param	p_manager		the user event manager.
-*/
-static opj_bool j2k_read_com_v2 (
-					opj_j2k_v2_t *p_j2k,
-					OPJ_BYTE * p_header_data,
-					OPJ_UINT32 p_header_size,
-					struct opj_event_mgr * p_manager
-					);
-/**
-Write the value concerning the specified component in the marker COD and COC
-@param j2k J2K handle
-@param compno Number of the component concerned by the information written
-*/
-static void j2k_write_cox(opj_j2k_t *j2k, int compno);
-/**
-Read the value concerning the specified component in the marker COD and COC
-@param j2k J2K handle
-@param compno Number of the component concerned by the information read
-*/
-static void j2k_read_cox(opj_j2k_t *j2k, int compno);
-/**
-Write the COD marker (coding style default)
-@param j2k J2K handle
-*/
-static void j2k_write_cod(opj_j2k_t *j2k);
-/**
-Read the COD marker (coding style default)
-@param j2k J2K handle
-*/
-static void j2k_read_cod(opj_j2k_t *j2k);
-
-/**
- * Reads a COD marker (Coding Styke defaults)
- * @param	p_header_data	the data contained in the COD box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the COD marker.
- * @param	p_manager		the user event manager.
-*/
-static opj_bool j2k_read_cod_v2 (
-					opj_j2k_v2_t *p_j2k,
-					OPJ_BYTE * p_header_data,
-					OPJ_UINT32 p_header_size,
-					struct opj_event_mgr * p_manager
-					);
-
-/**
-Write the COC marker (coding style component)
-@param j2k J2K handle
-@param compno Number of the component concerned by the information written
-*/
-static void j2k_write_coc(opj_j2k_t *j2k, int compno);
-/**
-Read the COC marker (coding style component)
-@param j2k J2K handle
-*/
-static void j2k_read_coc(opj_j2k_t *j2k);
-
-/**
- * Reads a COC marker (Coding Style Component)
- * @param	p_header_data	the data contained in the COC box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the COC marker.
- * @param	p_manager		the user event manager.
-*/
-static opj_bool j2k_read_coc_v2 (
-					opj_j2k_v2_t *p_j2k,
-					OPJ_BYTE * p_header_data,
-					OPJ_UINT32 p_header_size,
-					struct opj_event_mgr * p_manager
-					);
-
-/**
-Write the value concerning the specified component in the marker QCD and QCC
-@param j2k J2K handle
-@param compno Number of the component concerned by the information written
-*/
-static void j2k_write_qcx(opj_j2k_t *j2k, int compno);
-/**
-Read the value concerning the specified component in the marker QCD and QCC
-@param j2k J2K handle
-@param compno Number of the component concern by the information read
-@param len Length of the information in the QCX part of the marker QCD/QCC
-*/
-static void j2k_read_qcx(opj_j2k_t *j2k, int compno, int len);
-/**
-Write the QCD marker (quantization default)
-@param j2k J2K handle
-*/
-static void j2k_write_qcd(opj_j2k_t *j2k);
-/**
-Read the QCD marker (quantization default)
-@param j2k J2K handle
-*/
-static void j2k_read_qcd(opj_j2k_t *j2k);
-
-/**
- * Reads a QCD marker (Quantization defaults)
- * @param	p_header_data	the data contained in the QCD box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the QCD marker.
- * @param	p_manager		the user event manager.
-*/
-static opj_bool j2k_read_qcd_v2 (
-					opj_j2k_v2_t *p_j2k,
-					OPJ_BYTE * p_header_data,
-					OPJ_UINT32 p_header_size,
-					struct opj_event_mgr * p_manager
-					);
-
-/**
-Write the QCC marker (quantization component)
-@param j2k J2K handle
-@param compno Number of the component concerned by the information written
-*/
-static void j2k_write_qcc(opj_j2k_t *j2k, int compno);
-/**
-Read the QCC marker (quantization component)
-@param j2k J2K handle
-*/
-static void j2k_read_qcc(opj_j2k_t *j2k);
-/**
- * Reads a QCC marker (Quantization component)
- * @param	p_header_data	the data contained in the QCC box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the QCC marker.
- * @param	p_manager		the user event manager.
-*/
-static opj_bool j2k_read_qcc_v2(
-							opj_j2k_v2_t *p_j2k,
-							OPJ_BYTE * p_header_data,
-							OPJ_UINT32 p_header_size,
-							struct opj_event_mgr * p_manager);
-
-/**
-Write the POC marker (progression order change)
-@param j2k J2K handle
-*/
-static void j2k_write_poc(opj_j2k_t *j2k);
-/**
-Read the POC marker (progression order change)
-@param j2k J2K handle
-*/
-static void j2k_read_poc(opj_j2k_t *j2k);
-/**
- * Reads a POC marker (Progression Order Change)
- *
- * @param	p_header_data	the data contained in the POC box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the POC marker.
- * @param	p_manager		the user event manager.
-*/
-static opj_bool j2k_read_poc_v2 (
-						opj_j2k_v2_t *p_j2k,
-						OPJ_BYTE * p_header_data,
-						OPJ_UINT32 p_header_size,
-						struct opj_event_mgr * p_manager
-					);
-/**
-Read the CRG marker (component registration)
-@param j2k J2K handle
-*/
-static void j2k_read_crg(opj_j2k_t *j2k);
-/**
- * Reads a CRG marker (Component registration)
- *
- * @param	p_header_data	the data contained in the TLM box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the TLM marker.
- * @param	p_manager		the user event manager.
-*/
-static opj_bool j2k_read_crg_v2 (
-						opj_j2k_v2_t *p_j2k,
-						OPJ_BYTE * p_header_data,
-						OPJ_UINT32 p_header_size,
-						struct opj_event_mgr * p_manager
-					);
-/**
-Read the TLM marker (tile-part lengths)
-@param j2k J2K handle
-*/
-static void j2k_read_tlm(opj_j2k_t *j2k);
-/**
- * Reads a TLM marker (Tile Length Marker)
- *
- * @param	p_header_data	the data contained in the TLM box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the TLM marker.
- * @param	p_manager		the user event manager.
-*/
-static opj_bool j2k_read_tlm_v2 (
-						opj_j2k_v2_t *p_j2k,
-						OPJ_BYTE * p_header_data,
-						OPJ_UINT32 p_header_size,
-						struct opj_event_mgr * p_manager
-					);
-/**
-Read the PLM marker (packet length, main header)
-@param j2k J2K handle
-*/
-static void j2k_read_plm(opj_j2k_t *j2k);
-
-/**
- * Reads a PLM marker (Packet length, main header marker)
- *
- * @param	p_header_data	the data contained in the TLM box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the TLM marker.
- * @param	p_manager		the user event manager.
-*/
-static opj_bool j2k_read_plm_v2 (
-						opj_j2k_v2_t *p_j2k,
-						OPJ_BYTE * p_header_data,
-						OPJ_UINT32 p_header_size,
-						struct opj_event_mgr * p_manager
-					);
-/**
-Read the PLT marker (packet length, tile-part header)
-@param j2k J2K handle
-*/
-static void j2k_read_plt(opj_j2k_t *j2k);
-/**
- * Reads a PLT marker (Packet length, tile-part header)
- *
- * @param	p_header_data	the data contained in the PLT box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the PLT marker.
- * @param	p_manager		the user event manager.
-*/
-static opj_bool j2k_read_plt_v2 (
-						opj_j2k_v2_t *p_j2k,
-						OPJ_BYTE * p_header_data,
-						OPJ_UINT32 p_header_size,
-						struct opj_event_mgr * p_manager
-					);
-/**
-Read the PPM marker (packet packet headers, main header)
-@param j2k J2K handle
-*/
-static void j2k_read_ppm(opj_j2k_t *j2k);
-/**
- * Reads a PPM marker (Packed packet headers, main header)
- *
- * @param	p_header_data	the data contained in the POC box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the POC marker.
- * @param	p_manager		the user event manager.
-*/
-static opj_bool j2k_read_ppm_v2 (
-						opj_j2k_v2_t *p_j2k,
-						OPJ_BYTE * p_header_data,
-						OPJ_UINT32 p_header_size,
-						struct opj_event_mgr * p_manager
-					);
-
-static opj_bool j2k_read_ppm_v3 (
-						opj_j2k_v2_t *p_j2k,
-						OPJ_BYTE * p_header_data,
-						OPJ_UINT32 p_header_size,
-						struct opj_event_mgr * p_manager
-					);
-
-/**
-Read the PPT marker (packet packet headers, tile-part header)
-@param j2k J2K handle
-*/
-static void j2k_read_ppt(opj_j2k_t *j2k);
-/**
- * Reads a PPT marker (Packed packet headers, tile-part header)
- *
- * @param	p_header_data	the data contained in the PPT box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the PPT marker.
- * @param	p_manager		the user event manager.
-*/
-static opj_bool j2k_read_ppt_v2 (
-						opj_j2k_v2_t *p_j2k,
-						OPJ_BYTE * p_header_data,
-						OPJ_UINT32 p_header_size,
-						struct opj_event_mgr * p_manager
-					);
-/**
-Write the TLM marker (Mainheader)
-@param j2k J2K handle
-*/
-static void j2k_write_tlm(opj_j2k_t *j2k);
-/**
-Write the SOT marker (start of tile-part)
-@param j2k J2K handle
-*/
-static void j2k_write_sot(opj_j2k_t *j2k);
-/**
-Read the SOT marker (start of tile-part)
-@param j2k J2K handle
-*/
-static void j2k_read_sot(opj_j2k_t *j2k);
-
-/**
- * Reads a PPT marker (Packed packet headers, tile-part header)
- *
- * @param	p_header_data	the data contained in the PPT box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the PPT marker.
- * @param	p_manager		the user event manager.
-*/
-static opj_bool j2k_read_sot_v2 (
-						opj_j2k_v2_t *p_j2k,
-						OPJ_BYTE * p_header_data,
-						OPJ_UINT32 p_header_size,
-						struct opj_event_mgr * p_manager
-					);
-/**
-Write the SOD marker (start of data)
-@param j2k J2K handle
-@param tile_coder Pointer to a TCD handle
-*/
-static void j2k_write_sod(opj_j2k_t *j2k, void *tile_coder);
-/**
-Read the SOD marker (start of data)
-@param j2k J2K handle
-*/
-static void j2k_read_sod(opj_j2k_t *j2k);
-
-/**
- * Reads a SOD marker (Start Of Data)
- *
- * @param	p_header_data	the data contained in the SOD box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the SOD marker.
- * @param	p_manager		the user event manager.
-*/
-static opj_bool j2k_read_sod_v2 (
-						opj_j2k_v2_t *p_j2k,
-						struct opj_stream_private *p_stream,
-						struct opj_event_mgr * p_manager
-					);
-
-/**
-Write the RGN marker (region-of-interest)
-@param j2k J2K handle
-@param compno Number of the component concerned by the information written
-@param tileno Number of the tile concerned by the information written
-*/
-static void j2k_write_rgn(opj_j2k_t *j2k, int compno, int tileno);
-/**
-Read the RGN marker (region-of-interest)
-@param j2k J2K handle
-*/
-static void j2k_read_rgn(opj_j2k_t *j2k);
-
-/**
- * Reads a RGN marker (Region Of Interest)
- *
- * @param	p_header_data	the data contained in the POC box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the POC marker.
- * @param	p_manager		the user event manager.
-*/
-static opj_bool j2k_read_rgn_v2 (
-						opj_j2k_v2_t *p_j2k,
-						OPJ_BYTE * p_header_data,
-						OPJ_UINT32 p_header_size,
-						struct opj_event_mgr * p_manager
-					) ;
-
-/**
-Write the EOC marker (end of codestream)
-@param j2k J2K handle
-*/
-static void j2k_write_eoc(opj_j2k_t *j2k);
-/**
-Read the EOC marker (end of codestream)
-@param j2k J2K handle
-*/
-static void j2k_read_eoc(opj_j2k_t *j2k);
-
-/**
- * Reads a EOC marker (End Of Codestream)
- *
- * @param	p_header_data	the data contained in the SOD box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the SOD marker.
- * @param	p_manager		the user event manager.
-*/
-static opj_bool j2k_read_eoc_v2 (
-					    opj_j2k_v2_t *p_j2k,
-						struct opj_stream_private *p_stream,
-						struct opj_event_mgr * p_manager
-					) ;
-
-/**
-Read an unknown marker
-@param j2k J2K handle
-*/
-static void j2k_read_unk(opj_j2k_t *j2k);
-/**
-Add main header marker information
-@param cstr_info Codestream information structure
-@param type marker type
-@param pos byte offset of marker segment
-@param len length of marker segment
- */
-static void j2k_add_mhmarker(opj_codestream_info_t *cstr_info, unsigned short int type, int pos, int len);
-
-static void j2k_add_mhmarker_v2(opj_codestream_index_t *cstr_index, OPJ_UINT32 type, OPJ_OFF_T pos, OPJ_UINT32 len) ;
-/**
-Add tile header marker information
-@param tileno tile index number
-@param cstr_info Codestream information structure
-@param type marker type
-@param pos byte offset of marker segment
-@param len length of marker segment
- */
-static void j2k_add_tlmarker( int tileno, opj_codestream_info_t *cstr_info, unsigned short int type, int pos, int len);
-
-static void j2k_add_tlmarker_v2(OPJ_UINT32 tileno, opj_codestream_index_t *cstr_index, OPJ_UINT32 type, OPJ_OFF_T pos, OPJ_UINT32 len);
-
-/**
- * Reads an unknown marker
- *
- * @param	p_stream		the stream object to read from.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_manager		the user event manager.
- *
- * @return	true			if the marker could be deduced.
-*/
-static opj_bool j2k_read_unk_v2 (	opj_j2k_v2_t *p_j2k,
-									struct opj_stream_private *p_stream,
-									OPJ_UINT32 *output_marker,
-									struct opj_event_mgr * p_manager );
-
-/**
- * Reads a MCT marker (Multiple Component Transform)
- *
- * @param	p_header_data	the data contained in the MCT box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the MCT marker.
- * @param	p_manager		the user event manager.
-*/
-static opj_bool j2k_read_mct (	opj_j2k_v2_t *p_j2k,
-								OPJ_BYTE * p_header_data,
-								OPJ_UINT32 p_header_size,
-								struct opj_event_mgr * p_manager );
-
-/**
- * Reads a MCC marker (Multiple Component Collection)
- *
- * @param	p_header_data	the data contained in the MCC box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the MCC marker.
- * @param	p_manager		the user event manager.
-*/
-static opj_bool j2k_read_mcc (	opj_j2k_v2_t *p_j2k,
-							OPJ_BYTE * p_header_data,
-							OPJ_UINT32 p_header_size,
-							struct opj_event_mgr * p_manager );
-
-/**
- * Reads a MCO marker (Multiple Component Transform Ordering)
- *
- * @param	p_header_data	the data contained in the MCO box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the MCO marker.
- * @param	p_manager		the user event manager.
-*/
-static opj_bool j2k_read_mco (	opj_j2k_v2_t *p_j2k,
-								OPJ_BYTE * p_header_data,
-								OPJ_UINT32 p_header_size,
-								struct opj_event_mgr * p_manager );
-
-static opj_bool j2k_add_mct(opj_tcp_v2_t * p_tcp, opj_image_t * p_image, OPJ_UINT32 p_index);
-
-static void  j2k_read_int16_to_float (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem);
-static void  j2k_read_int32_to_float (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem);
-static void  j2k_read_float32_to_float (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem);
-static void  j2k_read_float64_to_float (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem);
-
-static void  j2k_read_int16_to_int32 (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem);
-static void  j2k_read_int32_to_int32 (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem);
-static void  j2k_read_float32_to_int32 (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem);
-static void  j2k_read_float64_to_int32 (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem);
-
-static void  j2k_write_float_to_int16 (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem);
-static void  j2k_write_float_to_int32 (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem);
-static void  j2k_write_float_to_float (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem);
-static void  j2k_write_float_to_float64 (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem);
-
-/**
- * Reads a CBD marker (Component bit depth definition)
- * @param	p_header_data	the data contained in the CBD box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the CBD marker.
- * @param	p_manager		the user event manager.
-*/
-static opj_bool j2k_read_cbd (	opj_j2k_v2_t *p_j2k,
-							OPJ_BYTE * p_header_data,
-							OPJ_UINT32 p_header_size,
-							struct opj_event_mgr * p_manager);
-
-
-static void j2k_dump_MH_info(opj_j2k_v2_t* p_j2k, FILE* out_stream);
-
-static void j2k_dump_MH_index(opj_j2k_v2_t* p_j2k, FILE* out_stream);
-
-static opj_codestream_index_t* j2k_create_cstr_index(void);
-
-/*@}*/
-
-/*@}*/
-
-/* ----------------------------------------------------------------------- */
-typedef struct j2k_prog_order{
-	OPJ_PROG_ORDER enum_prog;
-	char str_prog[5];
-}j2k_prog_order_t;
-
-j2k_prog_order_t j2k_prog_order_list[] = {
-	{CPRL, "CPRL"},
-	{LRCP, "LRCP"},
-	{PCRL, "PCRL"},
-	{RLCP, "RLCP"},
-	{RPCL, "RPCL"},
-	{(OPJ_PROG_ORDER)-1, ""}
-};
-
-
-
-/**
- * FIXME DOC
- */
-const OPJ_UINT32 MCT_ELEMENT_SIZE [] =
-{
-	2,
-	4,
-	4,
-	8
-};
-
-typedef void (* j2k_mct_function) (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem);
-
-const j2k_mct_function j2k_mct_read_functions_to_float [] =
-{
-	j2k_read_int16_to_float,
-	j2k_read_int32_to_float,
-	j2k_read_float32_to_float,
-	j2k_read_float64_to_float
-};
-
-const j2k_mct_function j2k_mct_read_functions_to_int32 [] =
-{
-	j2k_read_int16_to_int32,
-	j2k_read_int32_to_int32,
-	j2k_read_float32_to_int32,
-	j2k_read_float64_to_int32
-};
-
-const j2k_mct_function j2k_mct_write_functions_from_float [] =
-{
-	j2k_write_float_to_int16,
-	j2k_write_float_to_int32,
-	j2k_write_float_to_float,
-	j2k_write_float_to_float64
-};
-
-typedef struct opj_dec_memory_marker_handler
-{
-	/** marker value */
-	OPJ_UINT32 id;
-	/** value of the state when the marker can appear */
-	OPJ_UINT32 states;
-	/** action linked to the marker */
-	opj_bool (*handler) (
-					opj_j2k_v2_t *p_j2k,
-					OPJ_BYTE * p_header_data,
-					OPJ_UINT32 p_header_size,
-					struct opj_event_mgr * p_manager
-						);
-}
-opj_dec_memory_marker_handler_t;
-
-const opj_dec_memory_marker_handler_t j2k_memory_marker_handler_tab [] =
-{
-#ifdef TODO_MS
-  {J2K_MS_SOT, J2K_DEC_STATE_MH | J2K_DEC_STATE_TPHSOT, j2k_read_sot},
-  {J2K_MS_COD, J2K_DEC_STATE_MH | J2K_DEC_STATE_TPH, j2k_read_cod},
-  {J2K_MS_COC, J2K_DEC_STATE_MH | J2K_DEC_STATE_TPH, j2k_read_coc},
-  {J2K_MS_RGN, J2K_DEC_STATE_MH | J2K_DEC_STATE_TPH, j2k_read_rgn},
-  {J2K_MS_QCD, J2K_DEC_STATE_MH | J2K_DEC_STATE_TPH, j2k_read_qcd},
-  {J2K_MS_QCC, J2K_DEC_STATE_MH | J2K_DEC_STATE_TPH, j2k_read_qcc},
-  {J2K_MS_POC, J2K_DEC_STATE_MH | J2K_DEC_STATE_TPH, j2k_read_poc},
-  {J2K_MS_SIZ, J2K_DEC_STATE_MHSIZ , j2k_read_siz},
-  {J2K_MS_TLM, J2K_DEC_STATE_MH, j2k_read_tlm},
-  {J2K_MS_PLM, J2K_DEC_STATE_MH, j2k_read_plm},
-  {J2K_MS_PLT, J2K_DEC_STATE_TPH, j2k_read_plt},
-  {J2K_MS_PPM, J2K_DEC_STATE_MH, j2k_read_ppm},
-  {J2K_MS_PPT, J2K_DEC_STATE_TPH, j2k_read_ppt},
-  {J2K_MS_SOP, 0, 0},
-  {J2K_MS_CRG, J2K_DEC_STATE_MH, j2k_read_crg},
-  {J2K_MS_COM, J2K_DEC_STATE_MH | J2K_DEC_STATE_TPH, j2k_read_com},
-  {J2K_MS_MCT, J2K_DEC_STATE_MH | J2K_DEC_STATE_TPH, j2k_read_mct},
-  {J2K_MS_CBD, J2K_DEC_STATE_MH , j2k_read_cbd},
-  {J2K_MS_MCC, J2K_DEC_STATE_MH | J2K_DEC_STATE_TPH, j2k_read_mcc},
-  {J2K_MS_MCO, J2K_DEC_STATE_MH | J2K_DEC_STATE_TPH, j2k_read_mco},
-#endif
-  {J2K_MS_SOT, J2K_STATE_MH | J2K_STATE_TPHSOT, j2k_read_sot_v2},
-  {J2K_MS_COD, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_cod_v2},
-  {J2K_MS_COC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_coc_v2},
-  {J2K_MS_RGN, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_rgn_v2},
-  {J2K_MS_QCD, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_qcd_v2},
-  {J2K_MS_QCC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_qcc_v2},
-  {J2K_MS_POC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_poc_v2},
-  {J2K_MS_SIZ, J2K_STATE_MHSIZ , j2k_read_siz_v2},
-  {J2K_MS_TLM, J2K_STATE_MH, j2k_read_tlm_v2},
-  {J2K_MS_PLM, J2K_STATE_MH, j2k_read_plm_v2},
-  {J2K_MS_PLT, J2K_STATE_TPH, j2k_read_plt_v2},
-  {J2K_MS_PPM, J2K_STATE_MH, j2k_read_ppm_v3},
-  {J2K_MS_PPT, J2K_STATE_TPH, j2k_read_ppt_v2},
-  {J2K_MS_SOP, 0, 0},
-  {J2K_MS_CRG, J2K_STATE_MH, j2k_read_crg_v2},
-  {J2K_MS_COM, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_com_v2},
-  {J2K_MS_MCT, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_mct},
-  {J2K_MS_CBD, J2K_STATE_MH , j2k_read_cbd},
-  {J2K_MS_MCC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_mcc},
-  {J2K_MS_MCO, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_mco},
-#ifdef USE_JPWL
-#ifdef TODO_MS /* FIXME */
-  {J2K_MS_EPC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_epc},
-  {J2K_MS_EPB, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_epb},
-  {J2K_MS_ESD, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_esd},
-  {J2K_MS_RED, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_red},
-#endif
-#endif /* USE_JPWL */
-#ifdef USE_JPSEC
-  {J2K_MS_SEC, J2K_DEC_STATE_MH, j2k_read_sec},
-  {J2K_MS_INSEC, 0, j2k_read_insec}
-#endif /* USE_JPSEC */
-  {J2K_MS_UNK, J2K_STATE_MH | J2K_STATE_TPH, 0}//j2k_read_unk_v2}
-};
-
-
-
-void  j2k_read_int16_to_float (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem)
-{
-	OPJ_BYTE * l_src_data = (OPJ_BYTE *) p_src_data;
-	OPJ_FLOAT32 * l_dest_data = (OPJ_FLOAT32 *) p_dest_data;
-	OPJ_UINT32 i;
-	OPJ_UINT32 l_temp;
-
-	for (i=0;i<p_nb_elem;++i) {
-		opj_read_bytes(l_src_data,&l_temp,2);
-
-		l_src_data+=sizeof(OPJ_INT16);
-
-		*(l_dest_data++) = (OPJ_FLOAT32) l_temp;
-	}
-}
-
-void  j2k_read_int32_to_float (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem)
-{
-	OPJ_BYTE * l_src_data = (OPJ_BYTE *) p_src_data;
-	OPJ_FLOAT32 * l_dest_data = (OPJ_FLOAT32 *) p_dest_data;
-	OPJ_UINT32 i;
-	OPJ_UINT32 l_temp;
-
-	for (i=0;i<p_nb_elem;++i) {
-		opj_read_bytes(l_src_data,&l_temp,4);
-
-		l_src_data+=sizeof(OPJ_INT32);
-
-		*(l_dest_data++) = (OPJ_FLOAT32) l_temp;
-	}
-}
-
-void  j2k_read_float32_to_float (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem)
-{
-	OPJ_BYTE * l_src_data = (OPJ_BYTE *) p_src_data;
-	OPJ_FLOAT32 * l_dest_data = (OPJ_FLOAT32 *) p_dest_data;
-	OPJ_UINT32 i;
-	OPJ_FLOAT32 l_temp;
-
-	for (i=0;i<p_nb_elem;++i) {
-		opj_read_float(l_src_data,&l_temp);
-
-		l_src_data+=sizeof(OPJ_FLOAT32);
-
-		*(l_dest_data++) = l_temp;
-	}
-}
-
-void  j2k_read_float64_to_float (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem)
-{
-	OPJ_BYTE * l_src_data = (OPJ_BYTE *) p_src_data;
-	OPJ_FLOAT32 * l_dest_data = (OPJ_FLOAT32 *) p_dest_data;
-	OPJ_UINT32 i;
-	OPJ_FLOAT64 l_temp;
-
-	for (i=0;i<p_nb_elem;++i) {
-		opj_read_double(l_src_data,&l_temp);
-
-		l_src_data+=sizeof(OPJ_FLOAT64);
-
-		*(l_dest_data++) = (OPJ_FLOAT32) l_temp;
-	}
-}
-
-void  j2k_read_int16_to_int32 (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem)
-{
-	OPJ_BYTE * l_src_data = (OPJ_BYTE *) p_src_data;
-	OPJ_INT32 * l_dest_data = (OPJ_INT32 *) p_dest_data;
-	OPJ_UINT32 i;
-	OPJ_UINT32 l_temp;
-
-	for (i=0;i<p_nb_elem;++i) {
-		opj_read_bytes(l_src_data,&l_temp,2);
-
-		l_src_data+=sizeof(OPJ_INT16);
-
-		*(l_dest_data++) = (OPJ_INT32) l_temp;
-	}
-}
-
-void  j2k_read_int32_to_int32 (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem)
-{
-	OPJ_BYTE * l_src_data = (OPJ_BYTE *) p_src_data;
-	OPJ_INT32 * l_dest_data = (OPJ_INT32 *) p_dest_data;
-	OPJ_UINT32 i;
-	OPJ_UINT32 l_temp;
-
-	for (i=0;i<p_nb_elem;++i) {
-		opj_read_bytes(l_src_data,&l_temp,4);
-
-		l_src_data+=sizeof(OPJ_INT32);
-
-		*(l_dest_data++) = (OPJ_INT32) l_temp;
-	}
-}
-
-void  j2k_read_float32_to_int32 (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem)
-{
-	OPJ_BYTE * l_src_data = (OPJ_BYTE *) p_src_data;
-	OPJ_INT32 * l_dest_data = (OPJ_INT32 *) p_dest_data;
-	OPJ_UINT32 i;
-	OPJ_FLOAT32 l_temp;
-
-	for (i=0;i<p_nb_elem;++i) {
-		opj_read_float(l_src_data,&l_temp);
-
-		l_src_data+=sizeof(OPJ_FLOAT32);
-
-		*(l_dest_data++) = (OPJ_INT32) l_temp;
-	}
-}
-
-void  j2k_read_float64_to_int32 (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem)
-{
-	OPJ_BYTE * l_src_data = (OPJ_BYTE *) p_src_data;
-	OPJ_INT32 * l_dest_data = (OPJ_INT32 *) p_dest_data;
-	OPJ_UINT32 i;
-	OPJ_FLOAT64 l_temp;
-
-	for (i=0;i<p_nb_elem;++i) {
-		opj_read_double(l_src_data,&l_temp);
-
-		l_src_data+=sizeof(OPJ_FLOAT64);
-
-		*(l_dest_data++) = (OPJ_INT32) l_temp;
-	}
-}
-
-void  j2k_write_float_to_int16 (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem)
-{
-	OPJ_BYTE * l_dest_data = (OPJ_BYTE *) p_dest_data;
-	OPJ_FLOAT32 * l_src_data = (OPJ_FLOAT32 *) p_src_data;
-	OPJ_UINT32 i;
-	OPJ_UINT32 l_temp;
-
-	for (i=0;i<p_nb_elem;++i) {
-		l_temp = (OPJ_UINT32) *(l_src_data++);
-
-		opj_write_bytes(l_dest_data,l_temp,sizeof(OPJ_INT16));
-
-		l_dest_data+=sizeof(OPJ_INT16);
-	}
-}
-
-void  j2k_write_float_to_int32 (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem)
-{
-	OPJ_BYTE * l_dest_data = (OPJ_BYTE *) p_dest_data;
-	OPJ_FLOAT32 * l_src_data = (OPJ_FLOAT32 *) p_src_data;
-	OPJ_UINT32 i;
-	OPJ_UINT32 l_temp;
-
-	for (i=0;i<p_nb_elem;++i) {
-		l_temp = (OPJ_UINT32) *(l_src_data++);
-
-		opj_write_bytes(l_dest_data,l_temp,sizeof(OPJ_INT32));
-
-		l_dest_data+=sizeof(OPJ_INT32);
-	}
-}
-
-void  j2k_write_float_to_float (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem)
-{
-	OPJ_BYTE * l_dest_data = (OPJ_BYTE *) p_dest_data;
-	OPJ_FLOAT32 * l_src_data = (OPJ_FLOAT32 *) p_src_data;
-	OPJ_UINT32 i;
-	OPJ_FLOAT32 l_temp;
-
-	for (i=0;i<p_nb_elem;++i) {
-		l_temp = (OPJ_FLOAT32) *(l_src_data++);
-
-		opj_write_float(l_dest_data,l_temp);
-
-		l_dest_data+=sizeof(OPJ_FLOAT32);
-	}
-}
-
-void  j2k_write_float_to_float64 (const void * p_src_data, void * p_dest_data, OPJ_UINT32 p_nb_elem)
-{
-	OPJ_BYTE * l_dest_data = (OPJ_BYTE *) p_dest_data;
-	OPJ_FLOAT32 * l_src_data = (OPJ_FLOAT32 *) p_src_data;
-	OPJ_UINT32 i;
-	OPJ_FLOAT64 l_temp;
-
-	for (i=0;i<p_nb_elem;++i) {
-		l_temp = (OPJ_FLOAT64) *(l_src_data++);
-
-		opj_write_double(l_dest_data,l_temp);
-
-		l_dest_data+=sizeof(OPJ_FLOAT64);
-	}
-}
-
-
-/**
- * Converts an enum type progression order to string type.
- *
- * @param prg_order		the progression order to get.
- *
- * @return	the string representation of the given progression order.
- */
-char *j2k_convert_progression_order(OPJ_PROG_ORDER prg_order){
-	j2k_prog_order_t *po;
-	for(po = j2k_prog_order_list; po->enum_prog != -1; po++ ){
-		if(po->enum_prog == prg_order){
-			return po->str_prog;
-		}
-	}
-	return po->str_prog;
-}
-
-/* ----------------------------------------------------------------------- */
-static int j2k_get_num_tp(opj_cp_t *cp,int pino,int tileno){
-	char *prog;
-	int i;
-	int tpnum=1,tpend=0;
-	opj_tcp_t *tcp = &cp->tcps[tileno];
-	prog = j2k_convert_progression_order(tcp->prg);
-	
-	if(cp->tp_on == 1){
-		for(i=0;i<4;i++){
-			if(tpend!=1){
-				if( cp->tp_flag == prog[i] ){
-					tpend=1;cp->tp_pos=i;
-				}
-				switch(prog[i]){
-				case 'C':
-					tpnum= tpnum * tcp->pocs[pino].compE;
-					break;
-				case 'R':
-					tpnum= tpnum * tcp->pocs[pino].resE;
-					break;
-				case 'P':
-					tpnum= tpnum * tcp->pocs[pino].prcE;
-					break;
-				case 'L':
-					tpnum= tpnum * tcp->pocs[pino].layE;
-					break;
-				}
-			}
-		}
-	}else{
-		tpnum=1;
-	}
-	return tpnum;
-}
-
-/**	mem allocation for TLM marker*/
-int j2k_calculate_tp(opj_cp_t *cp,int img_numcomp,opj_image_t *image,opj_j2k_t *j2k ){
-	int pino,tileno,totnum_tp=0;
-
-	OPJ_ARG_NOT_USED(img_numcomp);
-
-	j2k->cur_totnum_tp = (int *) opj_malloc(cp->tw * cp->th * sizeof(int));
-	for (tileno = 0; tileno < cp->tw * cp->th; tileno++) {
-		int cur_totnum_tp = 0;
-		opj_tcp_t *tcp = &cp->tcps[tileno];
-		for(pino = 0; pino <= tcp->numpocs; pino++) {
-			int tp_num=0;
-			opj_pi_iterator_t *pi = pi_initialise_encode(image, cp, tileno,FINAL_PASS);
-			if(!pi) { return -1;}
-			tp_num = j2k_get_num_tp(cp,pino,tileno);
-			totnum_tp = totnum_tp + tp_num;
-			cur_totnum_tp = cur_totnum_tp + tp_num;
-			pi_destroy(pi, cp, tileno);
-		}
-		j2k->cur_totnum_tp[tileno] = cur_totnum_tp;
-		/* INDEX >> */
-		if (j2k->cstr_info) {
-			j2k->cstr_info->tile[tileno].num_tps = cur_totnum_tp;
-			j2k->cstr_info->tile[tileno].tp = (opj_tp_info_t *) opj_malloc(cur_totnum_tp * sizeof(opj_tp_info_t));
-		}
-		/* << INDEX */
-	}
-	return totnum_tp;
-}
-
-static void j2k_write_soc(opj_j2k_t *j2k) {
-	opj_cio_t *cio = j2k->cio;
-	cio_write(cio, J2K_MS_SOC, 2);
-
-	if(j2k->cstr_info)
-	  j2k_add_mhmarker(j2k->cstr_info, J2K_MS_SOC, cio_tell(cio), 0);
-
-/* UniPG>> */
-#ifdef USE_JPWL
-
-	/* update markers struct */
-	j2k_add_marker(j2k->cstr_info, J2K_MS_SOC, cio_tell(cio) - 2, 2);
-#endif /* USE_JPWL */
-/* <<UniPG */
-}
-
-static void j2k_read_soc(opj_j2k_t *j2k) {	
-	j2k->state = J2K_STATE_MHSIZ;
-	/* Index */
-	if (j2k->cstr_info) {
-		j2k->cstr_info->main_head_start = cio_tell(j2k->cio) - 2;
-		j2k->cstr_info->codestream_size = cio_numbytesleft(j2k->cio) + 2 - j2k->cstr_info->main_head_start;
-	}
-}
-
-/**
- * Reads a SOC marker (Start of Codestream)
- * @param	p_header_data	the data contained in the SOC box.
- * @param	jp2				the jpeg2000 file codec.
- * @param	p_header_size	the size of the data contained in the SOC marker.
- * @param	p_manager		the user event manager.
-*/
-static opj_bool j2k_read_soc_v2(	opj_j2k_v2_t *p_j2k,
-									struct opj_stream_private *p_stream,
-									struct opj_event_mgr * p_manager )
-{
-	OPJ_BYTE l_data [2];
-	OPJ_UINT32 l_marker;
-
-	/* preconditions */
-	assert(p_j2k != 00);
-	assert(p_manager != 00);
-	assert(p_stream != 00);
-
-	if (opj_stream_read_data(p_stream,l_data,2,p_manager) != 2) {
-		return OPJ_FALSE;
-	}
-
-	opj_read_bytes(l_data,&l_marker,2);
-	if (l_marker != J2K_MS_SOC) {
-		return OPJ_FALSE;
-	}
-
-	/* Next marker should be a SIZ marker in the main header */
-	p_j2k->m_specific_param.m_decoder.m_state = J2K_STATE_MHSIZ;
-
-	/* FIXME move it in a index structure included in p_j2k*/
-	p_j2k->cstr_index->main_head_start = opj_stream_tell(p_stream) - 2;
-
-	opj_event_msg_v2(p_manager, EVT_INFO, "Start to read j2k main header (%d).\n", p_j2k->cstr_index->main_head_start);
-
-	/* Add the marker to the codestream index*/
-	j2k_add_mhmarker_v2(p_j2k->cstr_index, J2K_MS_SOC, p_j2k->cstr_index->main_head_start, 2);
-
-	return OPJ_TRUE;
-}
-
-static void j2k_write_siz(opj_j2k_t *j2k) {
-	int i;
-	int lenp, len;
-
-	opj_cio_t *cio = j2k->cio;
-	opj_image_t *image = j2k->image;
-	opj_cp_t *cp = j2k->cp;
-
-	cio_write(cio, J2K_MS_SIZ, 2);	/* SIZ */
-	lenp = cio_tell(cio);
-	cio_skip(cio, 2);
-	cio_write(cio, cp->rsiz, 2);			/* Rsiz (capabilities) */
-	cio_write(cio, image->x1, 4);	/* Xsiz */
-	cio_write(cio, image->y1, 4);	/* Ysiz */
-	cio_write(cio, image->x0, 4);	/* X0siz */
-	cio_write(cio, image->y0, 4);	/* Y0siz */
-	cio_write(cio, cp->tdx, 4);		/* XTsiz */
-	cio_write(cio, cp->tdy, 4);		/* YTsiz */
-	cio_write(cio, cp->tx0, 4);		/* XT0siz */
-	cio_write(cio, cp->ty0, 4);		/* YT0siz */
-	cio_write(cio, image->numcomps, 2);	/* Csiz */
-	for (i = 0; i < image->numcomps; i++) {
-		cio_write(cio, image->comps[i].prec - 1 + (image->comps[i].sgnd << 7), 1);	/* Ssiz_i */
-		cio_write(cio, image->comps[i].dx, 1);	/* XRsiz_i */
-		cio_write(cio, image->comps[i].dy, 1);	/* YRsiz_i */
-	}
-	len = cio_tell(cio) - lenp;
-	cio_seek(cio, lenp);
-	cio_write(cio, len, 2);		/* Lsiz */
-	cio_seek(cio, lenp + len);
-	
-	if(j2k->cstr_info)
-	  j2k_add_mhmarker(j2k->cstr_info, J2K_MS_SIZ, lenp, len);
-}
-
-static void j2k_read_siz(opj_j2k_t *j2k) {
-	int len, i;
-	
-	opj_cio_t *cio = j2k->cio;
-	opj_image_t *image = j2k->image;
-	opj_cp_t *cp = j2k->cp;
-	
-	len = cio_read(cio, 2);			/* Lsiz */
-	cio_read(cio, 2);				/* Rsiz (capabilities) */
-	image->x1 = cio_read(cio, 4);	/* Xsiz */
-	image->y1 = cio_read(cio, 4);	/* Ysiz */
-	image->x0 = cio_read(cio, 4);	/* X0siz */
-	image->y0 = cio_read(cio, 4);	/* Y0siz */
-	cp->tdx = cio_read(cio, 4);		/* XTsiz */
-	cp->tdy = cio_read(cio, 4);		/* YTsiz */
-	cp->tx0 = cio_read(cio, 4);		/* XT0siz */
-	cp->ty0 = cio_read(cio, 4);		/* YT0siz */
-	
-	if ((image->x0<0)||(image->x1<0)||(image->y0<0)||(image->y1<0)) {
-		opj_event_msg(j2k->cinfo, EVT_ERROR,
-									"%s: invalid image size (x0:%d, x1:%d, y0:%d, y1:%d)\n",
-									image->x0,image->x1,image->y0,image->y1);
-		return;
-	}
-	
-	image->numcomps = cio_read(cio, 2);	/* Csiz */
-
-#ifdef USE_JPWL
-	if (j2k->cp->correct) {
-		/* if JPWL is on, we check whether TX errors have damaged
-		  too much the SIZ parameters */
-		if (!(image->x1 * image->y1)) {
-			opj_event_msg(j2k->cinfo, EVT_ERROR,
-				"JPWL: bad image size (%d x %d)\n",
-				image->x1, image->y1);
-			if (!JPWL_ASSUME || JPWL_ASSUME) {
-				opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
-				return;
-			}
-		}
-		if (image->numcomps != ((len - 38) / 3)) {
-			opj_event_msg(j2k->cinfo, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR,
-				"JPWL: Csiz is %d => space in SIZ only for %d comps.!!!\n",
-				image->numcomps, ((len - 38) / 3));
-			if (!JPWL_ASSUME) {
-				opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
-				return;
-			}
-			/* we try to correct */
-			opj_event_msg(j2k->cinfo, EVT_WARNING, "- trying to adjust this\n");
-			if (image->numcomps < ((len - 38) / 3)) {
-				len = 38 + 3 * image->numcomps;
-				opj_event_msg(j2k->cinfo, EVT_WARNING, "- setting Lsiz to %d => HYPOTHESIS!!!\n",
-					len);				
-			} else {
-				image->numcomps = ((len - 38) / 3);
-				opj_event_msg(j2k->cinfo, EVT_WARNING, "- setting Csiz to %d => HYPOTHESIS!!!\n",
-					image->numcomps);				
-			}
-		}
-
-		/* update components number in the jpwl_exp_comps filed */
-		cp->exp_comps = image->numcomps;
-	}
-#endif /* USE_JPWL */
-
-	image->comps = (opj_image_comp_t*) opj_calloc(image->numcomps, sizeof(opj_image_comp_t));
-	for (i = 0; i < image->numcomps; i++) {
-		int tmp, w, h;
-		tmp = cio_read(cio, 1);		/* Ssiz_i */
-		image->comps[i].prec = (tmp & 0x7f) + 1;
-		image->comps[i].sgnd = tmp >> 7;
-		image->comps[i].dx = cio_read(cio, 1);	/* XRsiz_i */
-		image->comps[i].dy = cio_read(cio, 1);	/* YRsiz_i */
-		
-#ifdef USE_JPWL
-		if (j2k->cp->correct) {
-		/* if JPWL is on, we check whether TX errors have damaged
-			too much the SIZ parameters, again */
-			if (!(image->comps[i].dx * image->comps[i].dy)) {
-				opj_event_msg(j2k->cinfo, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR,
-					"JPWL: bad XRsiz_%d/YRsiz_%d (%d x %d)\n",
-					i, i, image->comps[i].dx, image->comps[i].dy);
-				if (!JPWL_ASSUME) {
-					opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
-					return;
-				}
-				/* we try to correct */
-				opj_event_msg(j2k->cinfo, EVT_WARNING, "- trying to adjust them\n");
-				if (!image->comps[i].dx) {
-					image->comps[i].dx = 1;
-					opj_event_msg(j2k->cinfo, EVT_WARNING, "- setting XRsiz_%d to %d => HYPOTHESIS!!!\n",
-						i, image->comps[i].dx);
-				}
-				if (!image->comps[i].dy) {
-					image->comps[i].dy = 1;
-					opj_event_msg(j2k->cinfo, EVT_WARNING, "- setting YRsiz_%d to %d => HYPOTHESIS!!!\n",
-						i, image->comps[i].dy);
-				}
-			}
-			
-		}
-#endif /* USE_JPWL */
-
-		/* TODO: unused ? */
-		w = int_ceildiv(image->x1 - image->x0, image->comps[i].dx);
-		h = int_ceildiv(image->y1 - image->y0, image->comps[i].dy);
-
-		image->comps[i].resno_decoded = 0;	/* number of resolution decoded */
-		image->comps[i].factor = cp->reduce; /* reducing factor per component */
-	}
-	
-	cp->tw = int_ceildiv(image->x1 - cp->tx0, cp->tdx);
-	cp->th = int_ceildiv(image->y1 - cp->ty0, cp->tdy);
-
-#ifdef USE_JPWL
-	if (j2k->cp->correct) {
-		/* if JPWL is on, we check whether TX errors have damaged
-		  too much the SIZ parameters */
-		if ((cp->tw < 1) || (cp->th < 1) || (cp->tw > cp->max_tiles) || (cp->th > cp->max_tiles)) {
-			opj_event_msg(j2k->cinfo, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR,
-				"JPWL: bad number of tiles (%d x %d)\n",
-				cp->tw, cp->th);
-			if (!JPWL_ASSUME) {
-				opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
-				return;
-			}
-			/* we try to correct */
-			opj_event_msg(j2k->cinfo, EVT_WARNING, "- trying to adjust them\n");
-			if (cp->tw < 1) {
-				cp->tw= 1;
-				opj_event_msg(j2k->cinfo, EVT_WARNING, "- setting %d tiles in x => HYPOTHESIS!!!\n",
-					cp->tw);
-			}
-			if (cp->tw > cp->max_tiles) {
-				cp->tw= 1;
-				opj_event_msg(j2k->cinfo, EVT_WARNING, "- too large x, increase expectance of %d\n"
-					"- setting %d tiles in x => HYPOTHESIS!!!\n",
-					cp->max_tiles, cp->tw);
-			}
-			if (cp->th < 1) {
-				cp->th= 1;
-				opj_event_msg(j2k->cinfo, EVT_WARNING, "- setting %d tiles in y => HYPOTHESIS!!!\n",
-					cp->th);
-			}
-			if (cp->th > cp->max_tiles) {
-				cp->th= 1;
-				opj_event_msg(j2k->cinfo, EVT_WARNING, "- too large y, increase expectance of %d to continue\n",
-					"- setting %d tiles in y => HYPOTHESIS!!!\n",
-					cp->max_tiles, cp->th);
-			}
-		}
-	}
-#endif /* USE_JPWL */
-
-	cp->tcps = (opj_tcp_t*) opj_calloc(cp->tw * cp->th, sizeof(opj_tcp_t));
-	cp->tileno = (int*) opj_malloc(cp->tw * cp->th * sizeof(int));
-	cp->tileno_size = 0;
-	
-#ifdef USE_JPWL
-	if (j2k->cp->correct) {
-		if (!cp->tcps) {
-			opj_event_msg(j2k->cinfo, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR,
-				"JPWL: could not alloc tcps field of cp\n");
-			if (!JPWL_ASSUME || JPWL_ASSUME) {
-				opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
-				return;
-			}
-		}
-	}
-#endif /* USE_JPWL */
-
-	for (i = 0; i < cp->tw * cp->th; i++) {
-		cp->tcps[i].POC = 0;
-		cp->tcps[i].numpocs = 0;
-		cp->tcps[i].first = 1;
-	}
-	
-	/* Initialization for PPM marker */
-	cp->ppm = 0;
-	cp->ppm_data = NULL;
-	cp->ppm_data_first = NULL;
-	cp->ppm_previous = 0;
-	cp->ppm_store = 0;
-
-	j2k->default_tcp->tccps = (opj_tccp_t*) opj_calloc(image->numcomps, sizeof(opj_tccp_t));
-	for (i = 0; i < cp->tw * cp->th; i++) {
-		cp->tcps[i].tccps = (opj_tccp_t*) opj_malloc(image->numcomps * sizeof(opj_tccp_t));
-	}	
-	j2k->tile_data = (unsigned char**) opj_calloc(cp->tw * cp->th, sizeof(unsigned char*));
-	j2k->tile_len = (int*) opj_calloc(cp->tw * cp->th, sizeof(int));
-	j2k->state = J2K_STATE_MH;
-
-	/* Index */
-	if (j2k->cstr_info) {
-		opj_codestream_info_t *cstr_info = j2k->cstr_info;
-		cstr_info->image_w = image->x1 - image->x0;
-		cstr_info->image_h = image->y1 - image->y0;
-		cstr_info->numcomps = image->numcomps;
-		cstr_info->tw = cp->tw;
-		cstr_info->th = cp->th;
-		cstr_info->tile_x = cp->tdx;	
-		cstr_info->tile_y = cp->tdy;	
-		cstr_info->tile_Ox = cp->tx0;	
-		cstr_info->tile_Oy = cp->ty0;			
-		cstr_info->tile = (opj_tile_info_t*) opj_calloc(cp->tw * cp->th, sizeof(opj_tile_info_t));		
-	}
-}
-
-
-/**
- * Reads a SIZ marker (image and tile size)
- * @param	p_header_data	the data contained in the SIZ box.
- * @param	jp2				the jpeg2000 file codec.
- * @param	p_header_size	the size of the data contained in the SIZ marker.
- * @param	p_manager		the user event manager.
-*/
-opj_bool j2k_read_siz_v2 (
-				    opj_j2k_v2_t *p_j2k,
-					OPJ_BYTE * p_header_data,
-					OPJ_UINT32 p_header_size,
-					struct opj_event_mgr * p_manager
-					)
-{
-	OPJ_UINT32 l_size, i;
-	OPJ_UINT32 l_nb_comp;
-	OPJ_UINT32 l_nb_comp_remain;
-	OPJ_UINT32 l_remaining_size;
-	OPJ_UINT32 l_nb_tiles;
-	OPJ_UINT32 l_tmp;
-	opj_image_t *l_image = 00;
-	opj_cp_v2_t *l_cp = 00;
-	opj_image_comp_t * l_img_comp = 00;
-	opj_tcp_v2_t * l_current_tile_param = 00;
-
-	// preconditions
-	assert(p_j2k != 00);
-	assert(p_manager != 00);
-	assert(p_header_data != 00);
-
-	l_image = p_j2k->m_private_image;
-	l_cp = &(p_j2k->m_cp);
-
-	// minimum size == 39 - 3 (= minimum component parameter)
-	if (p_header_size < 36) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error with SIZ marker size\n");
-		return OPJ_FALSE;
-	}
-
-	l_remaining_size = p_header_size - 36;
-	l_nb_comp = l_remaining_size / 3;
-	l_nb_comp_remain = l_remaining_size % 3;
-	if (l_nb_comp_remain != 0){
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error with SIZ marker size\n");
-		return OPJ_FALSE;
-	}
-
-	l_size = p_header_size + 2;										/* Lsiz */
-
-	opj_read_bytes(p_header_data,&l_tmp ,2);						/* Rsiz (capabilities) */
-	p_header_data+=2;
-	l_cp->rsiz = (OPJ_RSIZ_CAPABILITIES) l_tmp;
-	opj_read_bytes(p_header_data, (OPJ_UINT32*) &l_image->x1, 4);	/* Xsiz */
-	p_header_data+=4;
-	opj_read_bytes(p_header_data, (OPJ_UINT32*) &l_image->y1, 4);	/* Ysiz */
-	p_header_data+=4;
-	opj_read_bytes(p_header_data, (OPJ_UINT32*) &l_image->x0, 4);	/* X0siz */
-	p_header_data+=4;
-	opj_read_bytes(p_header_data, (OPJ_UINT32*) &l_image->y0, 4);	/* Y0siz */
-	p_header_data+=4;
-	opj_read_bytes(p_header_data, (OPJ_UINT32*) &l_cp->tdx, 4);		/* XTsiz */
-	p_header_data+=4;
-	opj_read_bytes(p_header_data, (OPJ_UINT32*) &l_cp->tdy, 4);		/* YTsiz */
-	p_header_data+=4;
-	opj_read_bytes(p_header_data, (OPJ_UINT32*) &l_cp->tx0, 4);		/* XT0siz */
-	p_header_data+=4;
-	opj_read_bytes(p_header_data, (OPJ_UINT32*) &l_cp->ty0, 4);		/* YT0siz */
-	p_header_data+=4;
-	opj_read_bytes(p_header_data, (OPJ_UINT32*) &l_tmp, 2);			/* Csiz */
-	p_header_data+=2;
-	if (l_tmp < 16385)
-		l_image->numcomps = (OPJ_UINT16) l_tmp;
-	else {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error with SIZ marker: number of component is illegal -> %d\n", l_tmp);
-		return OPJ_FALSE;
-	}
-
-	if (l_image->numcomps != l_nb_comp) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error with SIZ marker: number of component is not compatible with the remaining number of parameters ( %d vs %d)\n", l_image->numcomps, l_nb_comp);
-		return OPJ_FALSE;
-	}
-
-#ifdef USE_JPWL
-	if (l_cp->correct) {
-		/* if JPWL is on, we check whether TX errors have damaged
-		  too much the SIZ parameters */
-		if (!(l_image->x1 * l_image->y1)) {
-			opj_event_msg_v2(p_manager, EVT_ERROR,
-				"JPWL: bad image size (%d x %d)\n",
-				l_image->x1, l_image->y1);
-			if (!JPWL_ASSUME || JPWL_ASSUME) {
-				opj_event_msg_v2(p_manager, EVT_ERROR, "JPWL: giving up\n");
-				return OPJ_FALSE;
-			}
-		}
-
-	/* FIXME check previously in the function so why keep this piece of code ? Need by the norm ?
-		if (l_image->numcomps != ((len - 38) / 3)) {
-			opj_event_msg_v2(p_manager, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR,
-				"JPWL: Csiz is %d => space in SIZ only for %d comps.!!!\n",
-				l_image->numcomps, ((len - 38) / 3));
-			if (!JPWL_ASSUME) {
-				opj_event_msg_v2(p_manager, EVT_ERROR, "JPWL: giving up\n");
-				return OPJ_FALSE;
-			}
-	*/		/* we try to correct */
-	/*		opj_event_msg_v2(p_manager, EVT_WARNING, "- trying to adjust this\n");
-			if (l_image->numcomps < ((len - 38) / 3)) {
-				len = 38 + 3 * l_image->numcomps;
-				opj_event_msg_v2(p_manager, EVT_WARNING, "- setting Lsiz to %d => HYPOTHESIS!!!\n",
-					len);
-			} else {
-				l_image->numcomps = ((len - 38) / 3);
-				opj_event_msg_v2(p_manager, EVT_WARNING, "- setting Csiz to %d => HYPOTHESIS!!!\n",
-					l_image->numcomps);
-			}
-		}
-	*/
-
-		/* update components number in the jpwl_exp_comps filed */
-		l_cp->exp_comps = l_image->numcomps;
-	}
-#endif /* USE_JPWL */
-
-	// Allocate the resulting image components
-	l_image->comps = (opj_image_comp_t*) opj_calloc(l_image->numcomps, sizeof(opj_image_comp_t));
-	if (l_image->comps == 00){
-		l_image->numcomps = 0;
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory to take in charge SIZ marker\n");
-		return OPJ_FALSE;
-	}
-
-	memset(l_image->comps,0,l_image->numcomps * sizeof(opj_image_comp_t));
-	l_img_comp = l_image->comps;
-
-	// Read the component information
-	for (i = 0; i < l_image->numcomps; ++i){
-		OPJ_UINT32 tmp;
-		opj_read_bytes(p_header_data,&tmp,1);	/* Ssiz_i */
-		++p_header_data;
-		l_img_comp->prec = (tmp & 0x7f) + 1;
-		l_img_comp->sgnd = tmp >> 7;
-		opj_read_bytes(p_header_data,&tmp,1);	/* XRsiz_i */
-		++p_header_data;
-		l_img_comp->dx = (OPJ_INT32)tmp; // should be between 1 and 255
-		opj_read_bytes(p_header_data,&tmp,1);	/* YRsiz_i */
-		++p_header_data;
-		l_img_comp->dy = (OPJ_INT32)tmp; // should be between 1 and 255
-
-#ifdef USE_JPWL
-		if (l_cp->correct) {
-		/* if JPWL is on, we check whether TX errors have damaged
-			too much the SIZ parameters, again */
-			if (!(l_image->comps[i].dx * l_image->comps[i].dy)) {
-				opj_event_msg_v2(p_manager, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR,
-					"JPWL: bad XRsiz_%d/YRsiz_%d (%d x %d)\n",
-					i, i, l_image->comps[i].dx, l_image->comps[i].dy);
-				if (!JPWL_ASSUME) {
-					opj_event_msg_v2(p_manager, EVT_ERROR, "JPWL: giving up\n");
-					return OPJ_FALSE;
-				}
-				/* we try to correct */
-				opj_event_msg_v2(p_manager, EVT_WARNING, "- trying to adjust them\n");
-				if (!l_image->comps[i].dx) {
-					l_image->comps[i].dx = 1;
-					opj_event_msg_v2(p_manager, EVT_WARNING, "- setting XRsiz_%d to %d => HYPOTHESIS!!!\n",
-						i, l_image->comps[i].dx);
-				}
-				if (!l_image->comps[i].dy) {
-					l_image->comps[i].dy = 1;
-					opj_event_msg_v2(p_manager, EVT_WARNING, "- setting YRsiz_%d to %d => HYPOTHESIS!!!\n",
-						i, l_image->comps[i].dy);
-				}
-			}
-		}
-#endif /* USE_JPWL */
-		l_img_comp->resno_decoded = 0;								/* number of resolution decoded */
-		l_img_comp->factor = l_cp->m_specific_param.m_dec.m_reduce; /* reducing factor per component */
-		++l_img_comp;
-	}
-
-	// Compute the number of tiles
-	l_cp->tw = int_ceildiv(l_image->x1 - l_cp->tx0, l_cp->tdx);
-	l_cp->th = int_ceildiv(l_image->y1 - l_cp->ty0, l_cp->tdy);
-	l_nb_tiles = l_cp->tw * l_cp->th;
-
-	// Define the tiles which will be decoded
-	if (p_j2k->m_specific_param.m_decoder.m_discard_tiles) {
-		p_j2k->m_specific_param.m_decoder.m_start_tile_x = (p_j2k->m_specific_param.m_decoder.m_start_tile_x - l_cp->tx0) / l_cp->tdx;
-		p_j2k->m_specific_param.m_decoder.m_start_tile_y = (p_j2k->m_specific_param.m_decoder.m_start_tile_y - l_cp->ty0) / l_cp->tdy;
-		p_j2k->m_specific_param.m_decoder.m_end_tile_x = int_ceildiv((p_j2k->m_specific_param.m_decoder.m_end_tile_x - l_cp->tx0), l_cp->tdx);
-		p_j2k->m_specific_param.m_decoder.m_end_tile_y = int_ceildiv((p_j2k->m_specific_param.m_decoder.m_end_tile_y - l_cp->ty0), l_cp->tdy);
-	}
-	else {
-		p_j2k->m_specific_param.m_decoder.m_start_tile_x = 0;
-		p_j2k->m_specific_param.m_decoder.m_start_tile_y = 0;
-		p_j2k->m_specific_param.m_decoder.m_end_tile_x = l_cp->tw;
-		p_j2k->m_specific_param.m_decoder.m_end_tile_y = l_cp->th;
-	}
-
-#ifdef USE_JPWL
-	if (l_cp->correct) {
-		/* if JPWL is on, we check whether TX errors have damaged
-		  too much the SIZ parameters */
-		if ((l_cp->tw < 1) || (l_cp->th < 1) || (l_cp->tw > l_cp->max_tiles) || (l_cp->th > l_cp->max_tiles)) {
-			opj_event_msg_v2(p_manager, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR,
-				"JPWL: bad number of tiles (%d x %d)\n",
-				l_cp->tw, l_cp->th);
-			if (!JPWL_ASSUME) {
-				opj_event_msg_v2(p_manager, EVT_ERROR, "JPWL: giving up\n");
-				return OPJ_FALSE;
-			}
-			/* we try to correct */
-			opj_event_msg_v2(p_manager, EVT_WARNING, "- trying to adjust them\n");
-			if (l_cp->tw < 1) {
-				l_cp->tw= 1;
-				opj_event_msg_v2(p_manager, EVT_WARNING, "- setting %d tiles in x => HYPOTHESIS!!!\n",
-						l_cp->tw);
-			}
-			if (l_cp->tw > l_cp->max_tiles) {
-				l_cp->tw= 1;
-				opj_event_msg_v2(p_manager, EVT_WARNING, "- too large x, increase expectance of %d\n"
-					"- setting %d tiles in x => HYPOTHESIS!!!\n",
-					l_cp->max_tiles, l_cp->tw);
-			}
-			if (l_cp->th < 1) {
-				l_cp->th= 1;
-				opj_event_msg_v2(p_manager, EVT_WARNING, "- setting %d tiles in y => HYPOTHESIS!!!\n",
-						l_cp->th);
-			}
-			if (l_cp->th > l_cp->max_tiles) {
-				l_cp->th= 1;
-				opj_event_msg_v2(p_manager, EVT_WARNING, "- too large y, increase expectance of %d to continue\n",
-					"- setting %d tiles in y => HYPOTHESIS!!!\n",
-					l_cp->max_tiles, l_cp->th);
-			}
-		}
-	}
-#endif /* USE_JPWL */
-
-	/* memory allocations */
-	l_cp->tcps = (opj_tcp_v2_t*) opj_calloc(l_nb_tiles, sizeof(opj_tcp_v2_t));
-	if (l_cp->tcps == 00) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory to take in charge SIZ marker\n");
-		return OPJ_FALSE;
-	}
-	memset(l_cp->tcps,0,l_nb_tiles*sizeof(opj_tcp_t));
-
-#ifdef USE_JPWL
-	if (l_cp->correct) {
-		if (!l_cp->tcps) {
-			opj_event_msg_v2(p_manager, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR,
-				"JPWL: could not alloc tcps field of cp\n");
-			if (!JPWL_ASSUME || JPWL_ASSUME) {
-				opj_event_msg_v2(p_manager, EVT_ERROR, "JPWL: giving up\n");
-				return OPJ_FALSE;
-			}
-		}
-	}
-#endif /* USE_JPWL */
-
-	p_j2k->m_specific_param.m_decoder.m_default_tcp->tccps =
-			(opj_tccp_t*) opj_calloc(l_image->numcomps, sizeof(opj_tccp_t));
-	if(p_j2k->m_specific_param.m_decoder.m_default_tcp->tccps  == 00) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory to take in charge SIZ marker\n");
-		return OPJ_FALSE;
-	}
-	memset(p_j2k->m_specific_param.m_decoder.m_default_tcp->tccps ,0,l_image->numcomps*sizeof(opj_tccp_t));
-
-	p_j2k->m_specific_param.m_decoder.m_default_tcp->m_mct_records =
-			(opj_mct_data_t*)opj_malloc(J2K_MCT_DEFAULT_NB_RECORDS * sizeof(opj_mct_data_t));
-
-	if (! p_j2k->m_specific_param.m_decoder.m_default_tcp->m_mct_records) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory to take in charge SIZ marker\n");
-		return OPJ_FALSE;
-	}
-	memset(p_j2k->m_specific_param.m_decoder.m_default_tcp->m_mct_records,0,J2K_MCT_DEFAULT_NB_RECORDS * sizeof(opj_mct_data_t));
-	p_j2k->m_specific_param.m_decoder.m_default_tcp->m_nb_max_mct_records = J2K_MCT_DEFAULT_NB_RECORDS;
-
-	p_j2k->m_specific_param.m_decoder.m_default_tcp->m_mcc_records =
-			(opj_simple_mcc_decorrelation_data_t*)
-			opj_malloc(J2K_MCC_DEFAULT_NB_RECORDS * sizeof(opj_simple_mcc_decorrelation_data_t));
-
-	if (! p_j2k->m_specific_param.m_decoder.m_default_tcp->m_mcc_records) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory to take in charge SIZ marker\n");
-		return OPJ_FALSE;
-	}
-	memset(p_j2k->m_specific_param.m_decoder.m_default_tcp->m_mcc_records,0,J2K_MCC_DEFAULT_NB_RECORDS * sizeof(opj_simple_mcc_decorrelation_data_t));
-	p_j2k->m_specific_param.m_decoder.m_default_tcp->m_nb_max_mcc_records = J2K_MCC_DEFAULT_NB_RECORDS;
-
-	/* set up default dc level shift */
-	for (i=0;i<l_image->numcomps;++i) {
-		if (! l_image->comps[i].sgnd) {
-			p_j2k->m_specific_param.m_decoder.m_default_tcp->tccps[i].m_dc_level_shift = 1 << (l_image->comps[i].prec - 1);
-		}
-	}
-
-	l_current_tile_param = l_cp->tcps;
-	for	(i = 0; i < l_nb_tiles; ++i) {
-		l_current_tile_param->tccps = (opj_tccp_t*) opj_malloc(l_image->numcomps * sizeof(opj_tccp_t));
-		if (l_current_tile_param->tccps == 00) {
-			opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory to take in charge SIZ marker\n");
-			return OPJ_FALSE;
-		}
-		memset(l_current_tile_param->tccps,0,l_image->numcomps * sizeof(opj_tccp_t));
-
-		++l_current_tile_param;
-	}
-
-	p_j2k->m_specific_param.m_decoder.m_state =  J2K_STATE_MH; // FIXME J2K_DEC_STATE_MH;
-	opj_image_comp_header_update(l_image,l_cp);
-
-	return OPJ_TRUE;
-}
-
-
-
-static void j2k_write_com(opj_j2k_t *j2k) {
-	unsigned int i;
-	int lenp, len;
-
-	if(j2k->cp->comment) {
-		opj_cio_t *cio = j2k->cio;
-		char *comment = j2k->cp->comment;
-
-		cio_write(cio, J2K_MS_COM, 2);
-		lenp = cio_tell(cio);
-		cio_skip(cio, 2);
-		cio_write(cio, 1, 2);		/* General use (IS 8859-15:1999 (Latin) values) */
-		for (i = 0; i < strlen(comment); i++) {
-			cio_write(cio, comment[i], 1);
-		}
-		len = cio_tell(cio) - lenp;
-		cio_seek(cio, lenp);
-		cio_write(cio, len, 2);
-		cio_seek(cio, lenp + len);
-
-		
-		if(j2k->cstr_info)
-		  j2k_add_mhmarker(j2k->cstr_info, J2K_MS_COM, lenp, len);
-
-	}
-}
-
-static void j2k_read_com(opj_j2k_t *j2k) {
-	int len;
-	
-	opj_cio_t *cio = j2k->cio;
-
-	len = cio_read(cio, 2);
-	cio_skip(cio, len - 2);  
-}
-/**
- * Reads a COM marker (comments)
- * @param	p_header_data	the data contained in the COM box.
- * @param	jp2				the jpeg2000 file codec.
- * @param	p_header_size	the size of the data contained in the COM marker.
- * @param	p_manager		the user event manager.
-*/
-opj_bool j2k_read_com_v2 (
-					opj_j2k_v2_t *p_j2k,
-					OPJ_BYTE * p_header_data,
-					OPJ_UINT32 p_header_size,
-					struct opj_event_mgr * p_manager
-					)
-{
-	// preconditions
-	assert(p_j2k != 00);
-	assert(p_manager != 00);
-	assert(p_header_data != 00);
-
-	return OPJ_TRUE;
-}
-
-static void j2k_write_cox(opj_j2k_t *j2k, int compno) {
-	int i;
-
-	opj_cp_t *cp = j2k->cp;
-	opj_tcp_t *tcp = &cp->tcps[j2k->curtileno];
-	opj_tccp_t *tccp = &tcp->tccps[compno];
-	opj_cio_t *cio = j2k->cio;
-	
-	cio_write(cio, tccp->numresolutions - 1, 1);	/* SPcox (D) */
-	cio_write(cio, tccp->cblkw - 2, 1);				/* SPcox (E) */
-	cio_write(cio, tccp->cblkh - 2, 1);				/* SPcox (F) */
-	cio_write(cio, tccp->cblksty, 1);				/* SPcox (G) */
-	cio_write(cio, tccp->qmfbid, 1);				/* SPcox (H) */
-	
-	if (tccp->csty & J2K_CCP_CSTY_PRT) {
-		for (i = 0; i < tccp->numresolutions; i++) {
-			cio_write(cio, tccp->prcw[i] + (tccp->prch[i] << 4), 1);	/* SPcox (I_i) */
-		}
-	}
-}
-
-static void j2k_read_cox(opj_j2k_t *j2k, int compno) {
-	int i;
-
-	opj_cp_t *cp = j2k->cp;
-	opj_tcp_t *tcp = j2k->state == J2K_STATE_TPH ? &cp->tcps[j2k->curtileno] : j2k->default_tcp;
-	opj_tccp_t *tccp = &tcp->tccps[compno];
-	opj_cio_t *cio = j2k->cio;
-
-	tccp->numresolutions = cio_read(cio, 1) + 1;	/* SPcox (D) */
-
-	// If user wants to remove more resolutions than the codestream contains, return error
-	if (cp->reduce >= tccp->numresolutions) {
-		opj_event_msg(j2k->cinfo, EVT_ERROR, "Error decoding component %d.\nThe number of resolutions to remove is higher than the number "
-					"of resolutions of this component\nModify the cp_reduce parameter.\n\n", compno);
-		j2k->state |= J2K_STATE_ERR;
-	}
-
-	tccp->cblkw = cio_read(cio, 1) + 2;	/* SPcox (E) */
-	tccp->cblkh = cio_read(cio, 1) + 2;	/* SPcox (F) */
-	tccp->cblksty = cio_read(cio, 1);	/* SPcox (G) */
-	tccp->qmfbid = cio_read(cio, 1);	/* SPcox (H) */
-	if (tccp->csty & J2K_CP_CSTY_PRT) {
-		for (i = 0; i < tccp->numresolutions; i++) {
-			int tmp = cio_read(cio, 1);	/* SPcox (I_i) */
-			tccp->prcw[i] = tmp & 0xf;
-			tccp->prch[i] = tmp >> 4;
-		}
-	}
-
-	/* INDEX >> */
-	if(j2k->cstr_info && compno == 0) {
-		for (i = 0; i < tccp->numresolutions; i++) {
-			if (tccp->csty & J2K_CP_CSTY_PRT) {
-				j2k->cstr_info->tile[j2k->curtileno].pdx[i] = tccp->prcw[i];
-				j2k->cstr_info->tile[j2k->curtileno].pdy[i] = tccp->prch[i];
-			}
-			else {
-				j2k->cstr_info->tile[j2k->curtileno].pdx[i] = 15;
-				j2k->cstr_info->tile[j2k->curtileno].pdx[i] = 15;
-			}
-		}
-	}
-	/* << INDEX */
-}
-
-static void j2k_write_cod(opj_j2k_t *j2k) {
-	opj_cp_t *cp = NULL;
-	opj_tcp_t *tcp = NULL;
-	int lenp, len;
-
-	opj_cio_t *cio = j2k->cio;
-	
-	cio_write(cio, J2K_MS_COD, 2);	/* COD */
-	
-	lenp = cio_tell(cio);
-	cio_skip(cio, 2);
-	
-	cp = j2k->cp;
-	tcp = &cp->tcps[j2k->curtileno];
-
-	cio_write(cio, tcp->csty, 1);		/* Scod */
-	cio_write(cio, tcp->prg, 1);		/* SGcod (A) */
-	cio_write(cio, tcp->numlayers, 2);	/* SGcod (B) */
-	cio_write(cio, tcp->mct, 1);		/* SGcod (C) */
-	
-	j2k_write_cox(j2k, 0);
-	len = cio_tell(cio) - lenp;
-	cio_seek(cio, lenp);
-	cio_write(cio, len, 2);		/* Lcod */
-	cio_seek(cio, lenp + len);
-
-	if(j2k->cstr_info)
-	  j2k_add_mhmarker(j2k->cstr_info, J2K_MS_COD, lenp, len);
-
-}
-
-static void j2k_read_cod(opj_j2k_t *j2k) {
-	int len, i, pos;
-	
-	opj_cio_t *cio = j2k->cio;
-	opj_cp_t *cp = j2k->cp;
-	opj_tcp_t *tcp = j2k->state == J2K_STATE_TPH ? &cp->tcps[j2k->curtileno] : j2k->default_tcp;
-	opj_image_t *image = j2k->image;
-	
-	len = cio_read(cio, 2);				/* Lcod */
-	tcp->csty = cio_read(cio, 1);		/* Scod */
-	tcp->prg = (OPJ_PROG_ORDER)cio_read(cio, 1);		/* SGcod (A) */
-	tcp->numlayers = cio_read(cio, 2);	/* SGcod (B) */
-	tcp->mct = cio_read(cio, 1);		/* SGcod (C) */
-	
-	pos = cio_tell(cio);
-	for (i = 0; i < image->numcomps; i++) {
-		tcp->tccps[i].csty = tcp->csty & J2K_CP_CSTY_PRT;
-		cio_seek(cio, pos);
-		j2k_read_cox(j2k, i);
-	}
-
-	/* Index */
-	if (j2k->cstr_info) {
-		opj_codestream_info_t *cstr_info = j2k->cstr_info;
-		cstr_info->prog = tcp->prg;
-		cstr_info->numlayers = tcp->numlayers;
-		cstr_info->numdecompos = (int*) opj_malloc(image->numcomps * sizeof(int));
-		for (i = 0; i < image->numcomps; i++) {
-			cstr_info->numdecompos[i] = tcp->tccps[i].numresolutions - 1;
-		}
-	}
-}
-
-/**
- * Reads a COD marker (Coding Styke defaults)
- * @param	p_header_data	the data contained in the COD box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the COD marker.
- * @param	p_manager		the user event manager.
-*/
-opj_bool j2k_read_cod_v2 (
-					opj_j2k_v2_t *p_j2k,
-					OPJ_BYTE * p_header_data,
-					OPJ_UINT32 p_header_size,
-					struct opj_event_mgr * p_manager
-					)
-{
-	// loop
-	OPJ_UINT32 i;
-	OPJ_UINT32 l_tmp;
-	opj_cp_v2_t *l_cp = 00;
-	opj_tcp_v2_t *l_tcp = 00;
-	opj_image_t *l_image = 00;
-
-	/* preconditions */
-	assert(p_header_data != 00);
-	assert(p_j2k != 00);
-	assert(p_manager != 00);
-
-	l_image = p_j2k->m_private_image;
-	l_cp = &(p_j2k->m_cp);
-
-	/* If we are in the first tile-part header of the current tile */
-	l_tcp = (p_j2k->m_specific_param.m_decoder.m_state == J2K_STATE_TPH) ?
-				&l_cp->tcps[p_j2k->m_current_tile_number] :
-				p_j2k->m_specific_param.m_decoder.m_default_tcp;
-
-	/* Make sure room is sufficient */
-	if (p_header_size < 5) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading COD marker\n");
-		return OPJ_FALSE;
-	}
-
-	opj_read_bytes(p_header_data,&l_tcp->csty,1);		/* Scod */
-	++p_header_data;
-	opj_read_bytes(p_header_data,&l_tmp,1);				/* SGcod (A) */
-	++p_header_data;
-	l_tcp->prg = (OPJ_PROG_ORDER) l_tmp;
-	opj_read_bytes(p_header_data,&l_tcp->numlayers,2);	/* SGcod (B) */
-	p_header_data+=2;
-
-	// If user didn't set a number layer to decode take the max specify in the codestream.
-	if	(l_cp->m_specific_param.m_dec.m_layer) {
-		l_tcp->num_layers_to_decode = l_cp->m_specific_param.m_dec.m_layer;
-	}
-	else {
-		l_tcp->num_layers_to_decode = l_tcp->numlayers;
-	}
-
-	opj_read_bytes(p_header_data,&l_tcp->mct,1);		/* SGcod (C) */
-	++p_header_data;
-
-	p_header_size -= 5;
-	for	(i = 0; i < l_image->numcomps; ++i) {
-		l_tcp->tccps[i].csty = l_tcp->csty & J2K_CCP_CSTY_PRT;
-	}
-
-	if (! j2k_read_SPCod_SPCoc(p_j2k,0,p_header_data,&p_header_size,p_manager)) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading COD marker\n");
-		return OPJ_FALSE;
-	}
-
-	if (p_header_size != 0) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading COD marker\n");
-		return OPJ_FALSE;
-	}
-
-	/* Apply the coding style to other components of the current tile or the m_default_tcp*/
-	j2k_copy_tile_component_parameters(p_j2k);
-
-	/* Index */
-#ifdef WIP_REMOVE_MSD
-	if (p_j2k->cstr_info) {
-		//opj_codestream_info_t *l_cstr_info = p_j2k->cstr_info;
-		p_j2k->cstr_info->prog = l_tcp->prg;
-		p_j2k->cstr_info->numlayers = l_tcp->numlayers;
-		p_j2k->cstr_info->numdecompos = (OPJ_INT32*) opj_malloc(l_image->numcomps * sizeof(OPJ_UINT32));
-		for	(i = 0; i < l_image->numcomps; ++i) {
-			p_j2k->cstr_info->numdecompos[i] = l_tcp->tccps[i].numresolutions - 1;
-		}
-	}
-#endif
-
-	return OPJ_TRUE;
-}
-
-static void j2k_write_coc(opj_j2k_t *j2k, int compno) {
-	int lenp, len;
-
-	opj_cp_t *cp = j2k->cp;
-	opj_tcp_t *tcp = &cp->tcps[j2k->curtileno];
-	opj_image_t *image = j2k->image;
-	opj_cio_t *cio = j2k->cio;
-	
-	cio_write(cio, J2K_MS_COC, 2);	/* COC */
-	lenp = cio_tell(cio);
-	cio_skip(cio, 2);
-	cio_write(cio, compno, image->numcomps <= 256 ? 1 : 2);	/* Ccoc */
-	cio_write(cio, tcp->tccps[compno].csty, 1);	/* Scoc */
-	j2k_write_cox(j2k, compno);
-	len = cio_tell(cio) - lenp;
-	cio_seek(cio, lenp);
-	cio_write(cio, len, 2);			/* Lcoc */
-	cio_seek(cio, lenp + len);
-}
-
-static void j2k_read_coc(opj_j2k_t *j2k) {
-	int len, compno;
-
-	opj_cp_t *cp = j2k->cp;
-	opj_tcp_t *tcp = j2k->state == J2K_STATE_TPH ? &cp->tcps[j2k->curtileno] : j2k->default_tcp;
-	opj_image_t *image = j2k->image;
-	opj_cio_t *cio = j2k->cio;
-	
-	len = cio_read(cio, 2);		/* Lcoc */
-	compno = cio_read(cio, image->numcomps <= 256 ? 1 : 2);	/* Ccoc */
-	tcp->tccps[compno].csty = cio_read(cio, 1);	/* Scoc */
-	j2k_read_cox(j2k, compno);
-}
-
-/**
- * Reads a COC marker (Coding Style Component)
- * @param	p_header_data	the data contained in the COC box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the COC marker.
- * @param	p_manager		the user event manager.
-*/
-opj_bool j2k_read_coc_v2 (
-					opj_j2k_v2_t *p_j2k,
-					OPJ_BYTE * p_header_data,
-					OPJ_UINT32 p_header_size,
-					struct opj_event_mgr * p_manager
-					)
-{
-	opj_cp_v2_t *l_cp = NULL;
-	opj_tcp_v2_t *l_tcp = NULL;
-	opj_image_t *l_image = NULL;
-	OPJ_UINT32 l_comp_room;
-	OPJ_UINT32 l_comp_no;
-
-	// preconditions
-	assert(p_header_data != 00);
-	assert(p_j2k != 00);
-	assert(p_manager != 00);
-
-	l_cp = &(p_j2k->m_cp);
-	l_tcp = (p_j2k->m_specific_param.m_decoder.m_state == J2K_STATE_TPH ) ? /*FIXME J2K_DEC_STATE_TPH*/
-				&l_cp->tcps[p_j2k->m_current_tile_number] :
-				p_j2k->m_specific_param.m_decoder.m_default_tcp;
-	l_image = p_j2k->m_private_image;
-
-	l_comp_room = l_image->numcomps <= 256 ? 1 : 2;
-
-	// make sure room is sufficient
-	if (p_header_size < l_comp_room + 1) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading COC marker\n");
-		return OPJ_FALSE;
-	}
-	p_header_size -= l_comp_room + 1;
-
-	opj_read_bytes(p_header_data,&l_comp_no,l_comp_room);			/* Ccoc */
-	p_header_data += l_comp_room;
-	if (l_comp_no >= l_image->numcomps) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading COC marker (bad number of components)\n");
-		return OPJ_FALSE;
-	}
-
-	opj_read_bytes(p_header_data,&l_tcp->tccps[l_comp_no].csty,1);			/* Scoc */
-	++p_header_data ;
-
-	if (! j2k_read_SPCod_SPCoc(p_j2k,l_comp_no,p_header_data,&p_header_size,p_manager)) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading COC marker\n");
-		return OPJ_FALSE;
-	}
-
-	if (p_header_size != 0) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading COC marker\n");
-		return OPJ_FALSE;
-	}
-	return OPJ_TRUE;
-}
-
-static void j2k_write_qcx(opj_j2k_t *j2k, int compno) {
-	int bandno, numbands;
-	int expn, mant;
-	
-	opj_cp_t *cp = j2k->cp;
-	opj_tcp_t *tcp = &cp->tcps[j2k->curtileno];
-	opj_tccp_t *tccp = &tcp->tccps[compno];
-	opj_cio_t *cio = j2k->cio;
-	
-	cio_write(cio, tccp->qntsty + (tccp->numgbits << 5), 1);	/* Sqcx */
-	numbands = tccp->qntsty == J2K_CCP_QNTSTY_SIQNT ? 1 : tccp->numresolutions * 3 - 2;
-	
-	for (bandno = 0; bandno < numbands; bandno++) {
-		expn = tccp->stepsizes[bandno].expn;
-		mant = tccp->stepsizes[bandno].mant;
-		
-		if (tccp->qntsty == J2K_CCP_QNTSTY_NOQNT) {
-			cio_write(cio, expn << 3, 1);	/* SPqcx_i */
-		} else {
-			cio_write(cio, (expn << 11) + mant, 2);	/* SPqcx_i */
-		}
-	}
-}
-
-static void j2k_read_qcx(opj_j2k_t *j2k, int compno, int len) {
-	int tmp;
-	int bandno, numbands;
-
-	opj_cp_t *cp = j2k->cp;
-	opj_tcp_t *tcp = j2k->state == J2K_STATE_TPH ? &cp->tcps[j2k->curtileno] : j2k->default_tcp;
-	opj_tccp_t *tccp = &tcp->tccps[compno];
-	opj_cio_t *cio = j2k->cio;
-
-	tmp = cio_read(cio, 1);		/* Sqcx */
-	tccp->qntsty = tmp & 0x1f;
-	tccp->numgbits = tmp >> 5;
-	numbands = (tccp->qntsty == J2K_CCP_QNTSTY_SIQNT) ? 
-		1 : ((tccp->qntsty == J2K_CCP_QNTSTY_NOQNT) ? len - 1 : (len - 1) / 2);
-
-#ifdef USE_JPWL
-	if (j2k->cp->correct) {
-
-		/* if JPWL is on, we check whether there are too many subbands */
-		if ((numbands < 0) || (numbands >= J2K_MAXBANDS)) {
-			opj_event_msg(j2k->cinfo, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR,
-				"JPWL: bad number of subbands in Sqcx (%d)\n",
-				numbands);
-			if (!JPWL_ASSUME) {
-				opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
-				return;
-			}
-			/* we try to correct */
-			numbands = 1;
-			opj_event_msg(j2k->cinfo, EVT_WARNING, "- trying to adjust them\n"
-				"- setting number of bands to %d => HYPOTHESIS!!!\n",
-				numbands);
-		};
-
-	};
-
-#else
-	/* We check whether there are too many subbands */
-	if ((numbands < 0) || (numbands >= J2K_MAXBANDS)) {
-		opj_event_msg(j2k->cinfo, EVT_WARNING ,
-					"bad number of subbands in Sqcx (%d) regarding to J2K_MAXBANDS (%d) \n"
-				    "- limiting number of bands to J2K_MAXBANDS and try to move to the next markers\n", numbands, J2K_MAXBANDS);
-	}
-
-#endif /* USE_JPWL */
-
-	for (bandno = 0; bandno < numbands; bandno++) {
-		int expn, mant;
-		if (tccp->qntsty == J2K_CCP_QNTSTY_NOQNT) {
-			expn = cio_read(cio, 1) >> 3;	/* SPqcx_i */
-			mant = 0;
-		} else {
-			tmp = cio_read(cio, 2);	/* SPqcx_i */
-			expn = tmp >> 11;
-			mant = tmp & 0x7ff;
-		}
-		if (bandno < J2K_MAXBANDS){
-			tccp->stepsizes[bandno].expn = expn;
-			tccp->stepsizes[bandno].mant = mant;
-		}
-	}
-	
-	/* Add Antonin : if scalar_derived -> compute other stepsizes */
-	if (tccp->qntsty == J2K_CCP_QNTSTY_SIQNT) {
-		for (bandno = 1; bandno < J2K_MAXBANDS; bandno++) {
-			tccp->stepsizes[bandno].expn = 
-				((tccp->stepsizes[0].expn) - ((bandno - 1) / 3) > 0) ? 
-					(tccp->stepsizes[0].expn) - ((bandno - 1) / 3) : 0;
-			tccp->stepsizes[bandno].mant = tccp->stepsizes[0].mant;
-		}
-	}
-	/* ddA */
-}
-
-static void j2k_write_qcd(opj_j2k_t *j2k) {
-	int lenp, len;
-
-	opj_cio_t *cio = j2k->cio;
-	
-	cio_write(cio, J2K_MS_QCD, 2);	/* QCD */
-	lenp = cio_tell(cio);
-	cio_skip(cio, 2);
-	j2k_write_qcx(j2k, 0);
-	len = cio_tell(cio) - lenp;
-	cio_seek(cio, lenp);
-	cio_write(cio, len, 2);			/* Lqcd */
-	cio_seek(cio, lenp + len);
-
-	if(j2k->cstr_info)
-	  j2k_add_mhmarker(j2k->cstr_info, J2K_MS_QCD, lenp, len);
-}
-
-static void j2k_read_qcd(opj_j2k_t *j2k) {
-	int len, i, pos;
-
-	opj_cio_t *cio = j2k->cio;
-	opj_image_t *image = j2k->image;
-	
-	len = cio_read(cio, 2);		/* Lqcd */
-	pos = cio_tell(cio);
-	for (i = 0; i < image->numcomps; i++) {
-		cio_seek(cio, pos);
-		j2k_read_qcx(j2k, i, len - 2);
-	}
-}
-
-/**
- * Reads a QCD marker (Quantization defaults)
- * @param	p_header_data	the data contained in the QCD box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the QCD marker.
- * @param	p_manager		the user event manager.
-*/
-opj_bool j2k_read_qcd_v2 (
-				    opj_j2k_v2_t *p_j2k,
-					OPJ_BYTE * p_header_data,
-					OPJ_UINT32 p_header_size,
-					struct opj_event_mgr * p_manager
-					)
-{
-	/* preconditions */
-	assert(p_header_data != 00);
-	assert(p_j2k != 00);
-	assert(p_manager != 00);
-
-	if (! j2k_read_SQcd_SQcc(p_j2k,0,p_header_data,&p_header_size,p_manager)) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading QCD marker\n");
-		return OPJ_FALSE;
-	}
-
-	if (p_header_size != 0) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading QCD marker\n");
-		return OPJ_FALSE;
-	}
-
-	/* Apply the quantization parameters to other components of the current tile or the m_default_tcp */
-	j2k_copy_tile_quantization_parameters(p_j2k);
-
-	return OPJ_TRUE;
-}
-
-static void j2k_write_qcc(opj_j2k_t *j2k, int compno) {
-	int lenp, len;
-
-	opj_cio_t *cio = j2k->cio;
-	
-	cio_write(cio, J2K_MS_QCC, 2);	/* QCC */
-	lenp = cio_tell(cio);
-	cio_skip(cio, 2);
-	cio_write(cio, compno, j2k->image->numcomps <= 256 ? 1 : 2);	/* Cqcc */
-	j2k_write_qcx(j2k, compno);
-	len = cio_tell(cio) - lenp;
-	cio_seek(cio, lenp);
-	cio_write(cio, len, 2);			/* Lqcc */
-	cio_seek(cio, lenp + len);
-}
-
-static void j2k_read_qcc(opj_j2k_t *j2k) {
-	int len, compno;
-	int numcomp = j2k->image->numcomps;
-	opj_cio_t *cio = j2k->cio;
-
-	len = cio_read(cio, 2);	/* Lqcc */
-	compno = cio_read(cio, numcomp <= 256 ? 1 : 2);	/* Cqcc */
-
-#ifdef USE_JPWL
-	if (j2k->cp->correct) {
-
-		static int backup_compno = 0;
-
-		/* compno is negative or larger than the number of components!!! */
-		if ((compno < 0) || (compno >= numcomp)) {
-			opj_event_msg(j2k->cinfo, EVT_ERROR,
-				"JPWL: bad component number in QCC (%d out of a maximum of %d)\n",
-				compno, numcomp);
-			if (!JPWL_ASSUME) {
-				opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
-				return;
-			}
-			/* we try to correct */
-			compno = backup_compno % numcomp;
-			opj_event_msg(j2k->cinfo, EVT_WARNING, "- trying to adjust this\n"
-				"- setting component number to %d\n",
-				compno);
-		}
-
-		/* keep your private count of tiles */
-		backup_compno++;
-	};
-#endif /* USE_JPWL */
-
-	j2k_read_qcx(j2k, compno, len - 2 - (numcomp <= 256 ? 1 : 2));
-}
-
-/**
- * Reads a QCC marker (Quantization component)
- * @param	p_header_data	the data contained in the QCC box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the QCC marker.
- * @param	p_manager		the user event manager.
-*/
-opj_bool j2k_read_qcc_v2(	opj_j2k_v2_t *p_j2k,
-							OPJ_BYTE * p_header_data,
-							OPJ_UINT32 p_header_size,
-							struct opj_event_mgr * p_manager)
-{
-	OPJ_UINT32 l_num_comp,l_comp_no;
-
-	/* preconditions */
-	assert(p_header_data != 00);
-	assert(p_j2k != 00);
-	assert(p_manager != 00);
-
-	l_num_comp = p_j2k->m_private_image->numcomps;
-
-	if (l_num_comp <= 256) {
-		if (p_header_size < 1) {
-			opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading QCC marker\n");
-			return OPJ_FALSE;
-		}
-		opj_read_bytes(p_header_data,&l_comp_no,1);
-		++p_header_data;
-		--p_header_size;
-	}
-	else {
-		if (p_header_size < 2) {
-			opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading QCC marker\n");
-			return OPJ_FALSE;
-		}
-		opj_read_bytes(p_header_data,&l_comp_no,2);
-		p_header_data+=2;
-		p_header_size-=2;
-	}
-
-#ifdef USE_JPWL
-	if (p_j2k->m_cp.correct) {
-
-		static OPJ_UINT32 backup_compno = 0;
-
-		/* compno is negative or larger than the number of components!!! */
-		if ((l_comp_no < 0) || (l_comp_no >= l_num_comp)) {
-			opj_event_msg_v2(p_manager, EVT_ERROR,
-				"JPWL: bad component number in QCC (%d out of a maximum of %d)\n",
-				l_comp_no, l_num_comp);
-			if (!JPWL_ASSUME) {
-				opj_event_msg_v2(p_manager, EVT_ERROR, "JPWL: giving up\n");
-				return OPJ_FALSE;
-			}
-			/* we try to correct */
-			l_comp_no = backup_compno % l_num_comp;
-			opj_event_msg_v2(p_manager, EVT_WARNING, "- trying to adjust this\n"
-				"- setting component number to %d\n",
-				l_comp_no);
-		}
-
-		/* keep your private count of tiles */
-		backup_compno++;
-	};
-#endif /* USE_JPWL */
-
-	if (! j2k_read_SQcd_SQcc(p_j2k,l_comp_no,p_header_data,&p_header_size,p_manager)) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading QCC marker\n");
-		return OPJ_FALSE;
-	}
-
-	if (p_header_size != 0) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading QCC marker\n");
-		return OPJ_FALSE;
-	}
-
-	return OPJ_TRUE;
-}
-
-
-static void j2k_write_poc(opj_j2k_t *j2k) {
-	int len, numpchgs, i;
-
-	int numcomps = j2k->image->numcomps;
-	
-	opj_cp_t *cp = j2k->cp;
-	opj_tcp_t *tcp = &cp->tcps[j2k->curtileno];
-	opj_tccp_t *tccp = &tcp->tccps[0];
-	opj_cio_t *cio = j2k->cio;
-
-	numpchgs = 1 + tcp->numpocs;
-	cio_write(cio, J2K_MS_POC, 2);	/* POC  */
-	len = 2 + (5 + 2 * (numcomps <= 256 ? 1 : 2)) * numpchgs;
-	cio_write(cio, len, 2);		/* Lpoc */
-	for (i = 0; i < numpchgs; i++) {
-		opj_poc_t *poc = &tcp->pocs[i];
-		cio_write(cio, poc->resno0, 1);	/* RSpoc_i */
-		cio_write(cio, poc->compno0, (numcomps <= 256 ? 1 : 2));	/* CSpoc_i */
-		cio_write(cio, poc->layno1, 2);	/* LYEpoc_i */
-		poc->layno1 = int_min(poc->layno1, tcp->numlayers);
-		cio_write(cio, poc->resno1, 1);	/* REpoc_i */
-		poc->resno1 = int_min(poc->resno1, tccp->numresolutions);
-		cio_write(cio, poc->compno1, (numcomps <= 256 ? 1 : 2));	/* CEpoc_i */
-		poc->compno1 = int_min(poc->compno1, numcomps);
-		cio_write(cio, poc->prg, 1);	/* Ppoc_i */
-	}
-}
-
-static void j2k_read_poc(opj_j2k_t *j2k) {
-	int len, numpchgs, i, old_poc;
-
-	int numcomps = j2k->image->numcomps;
-	
-	opj_cp_t *cp = j2k->cp;
-	opj_tcp_t *tcp = j2k->state == J2K_STATE_TPH ? &cp->tcps[j2k->curtileno] : j2k->default_tcp;
-	opj_cio_t *cio = j2k->cio;
-	
-	old_poc = tcp->POC ? tcp->numpocs + 1 : 0;
-	tcp->POC = 1;
-	len = cio_read(cio, 2);		/* Lpoc */
-	numpchgs = (len - 2) / (5 + 2 * (numcomps <= 256 ? 1 : 2));
-	
-	for (i = old_poc; i < numpchgs + old_poc; i++) {
-		opj_poc_t *poc;
-		poc = &tcp->pocs[i];
-		poc->resno0 = cio_read(cio, 1);	/* RSpoc_i */
-		poc->compno0 = cio_read(cio, numcomps <= 256 ? 1 : 2);	/* CSpoc_i */
-		poc->layno1 = cio_read(cio, 2);    /* LYEpoc_i */
-		poc->resno1 = cio_read(cio, 1);    /* REpoc_i */
-		poc->compno1 = int_min(
-			cio_read(cio, numcomps <= 256 ? 1 : 2), (unsigned int) numcomps);	/* CEpoc_i */
-		poc->prg = (OPJ_PROG_ORDER)cio_read(cio, 1);	/* Ppoc_i */
-	}
-	
-	tcp->numpocs = numpchgs + old_poc - 1;
-}
-
-/**
- * Reads a POC marker (Progression Order Change)
- *
- * @param	p_header_data	the data contained in the POC box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the POC marker.
- * @param	p_manager		the user event manager.
-*/
-opj_bool j2k_read_poc_v2 (
-						opj_j2k_v2_t *p_j2k,
-						OPJ_BYTE * p_header_data,
-						OPJ_UINT32 p_header_size,
-						struct opj_event_mgr * p_manager)
-{
-	OPJ_UINT32 i, l_nb_comp, l_tmp;
-	opj_image_t * l_image = 00;
-	OPJ_UINT32 l_old_poc_nb, l_current_poc_nb, l_current_poc_remaining;
-	OPJ_UINT32 l_chunk_size, l_comp_room;
-
-	opj_cp_v2_t *l_cp = 00;
-	opj_tcp_v2_t *l_tcp = 00;
-	opj_poc_t *l_current_poc = 00;
-
-	/* preconditions */
-	assert(p_header_data != 00);
-	assert(p_j2k != 00);
-	assert(p_manager != 00);
-
-	l_image = p_j2k->m_private_image;
-	l_nb_comp = l_image->numcomps;
-	if (l_nb_comp <= 256) {
-		l_comp_room = 1;
-	}
-	else {
-		l_comp_room = 2;
-	}
-	l_chunk_size = 5 + 2 * l_comp_room;
-	l_current_poc_nb = p_header_size / l_chunk_size;
-	l_current_poc_remaining = p_header_size % l_chunk_size;
-
-	if ((l_current_poc_nb <= 0) || (l_current_poc_remaining != 0)) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading POC marker\n");
-		return OPJ_FALSE;
-	}
-
-	l_cp = &(p_j2k->m_cp);
-	l_tcp = (p_j2k->m_specific_param.m_decoder.m_state == J2K_STATE_TPH) ?
-				&l_cp->tcps[p_j2k->m_current_tile_number] :
-				p_j2k->m_specific_param.m_decoder.m_default_tcp;
-	l_old_poc_nb = l_tcp->POC ? l_tcp->numpocs + 1 : 0;
-	l_current_poc_nb += l_old_poc_nb;
-
-	assert(l_current_poc_nb < 32);
-
-	/* now poc is in use.*/
-	l_tcp->POC = 1;
-
-	l_current_poc = &l_tcp->pocs[l_old_poc_nb];
-	for	(i = l_old_poc_nb; i < l_current_poc_nb; ++i) {
-		opj_read_bytes(p_header_data,&(l_current_poc->resno0),1);				/* RSpoc_i */
-		++p_header_data;
-		opj_read_bytes(p_header_data,&(l_current_poc->compno0),l_comp_room);	/* CSpoc_i */
-		p_header_data+=l_comp_room;
-		opj_read_bytes(p_header_data,&(l_current_poc->layno1),2);				/* LYEpoc_i */
-		p_header_data+=2;
-		opj_read_bytes(p_header_data,&(l_current_poc->resno1),1);				/* REpoc_i */
-		++p_header_data;
-		opj_read_bytes(p_header_data,&(l_current_poc->compno1),l_comp_room);	/* CEpoc_i */
-		p_header_data+=l_comp_room;
-		opj_read_bytes(p_header_data,&l_tmp,1);									/* Ppoc_i */
-		++p_header_data;
-		l_current_poc->prg = (OPJ_PROG_ORDER) l_tmp;
-		/* make sure comp is in acceptable bounds */
-		l_current_poc->compno1 = uint_min(l_current_poc->compno1, l_nb_comp);
-		++l_current_poc;
-	}
-
-	l_tcp->numpocs = l_current_poc_nb - 1;
-	return OPJ_TRUE;
-}
-
-static void j2k_read_crg(opj_j2k_t *j2k) {
-	int len, i, Xcrg_i, Ycrg_i;
-	
-	opj_cio_t *cio = j2k->cio;
-	int numcomps = j2k->image->numcomps;
-	
-	len = cio_read(cio, 2);			/* Lcrg */
-	for (i = 0; i < numcomps; i++) {
-		Xcrg_i = cio_read(cio, 2);	/* Xcrg_i */
-		Ycrg_i = cio_read(cio, 2);	/* Ycrg_i */
-	}
-}
-
-/**
- * Reads a CRG marker (Component registration)
- *
- * @param	p_header_data	the data contained in the TLM box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the TLM marker.
- * @param	p_manager		the user event manager.
-*/
-opj_bool j2k_read_crg_v2 (
-						opj_j2k_v2_t *p_j2k,
-						OPJ_BYTE * p_header_data,
-						OPJ_UINT32 p_header_size,
-						struct opj_event_mgr * p_manager
-					)
-{
-	OPJ_UINT32 l_nb_comp;
-	// preconditions
-	assert(p_header_data != 00);
-	assert(p_j2k != 00);
-	assert(p_manager != 00);
-
-	l_nb_comp = p_j2k->m_private_image->numcomps;
-
-	if (p_header_size != l_nb_comp *4) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading CRG marker\n");
-		return OPJ_FALSE;
-	}
-	/* Do not care of this at the moment since only local variables are set here */
-	/*
-	for
-		(i = 0; i < l_nb_comp; ++i)
-	{
-		opj_read_bytes(p_header_data,&l_Xcrg_i,2);				// Xcrg_i
-		p_header_data+=2;
-		opj_read_bytes(p_header_data,&l_Ycrg_i,2);				// Xcrg_i
-		p_header_data+=2;
-	}
-	*/
-	return OPJ_TRUE;
-}
-
-static void j2k_read_tlm(opj_j2k_t *j2k) {
-	int len, Ztlm, Stlm, ST, SP, tile_tlm, i;
-	long int Ttlm_i, Ptlm_i;
-
-	opj_cio_t *cio = j2k->cio;
-	
-	len = cio_read(cio, 2);		/* Ltlm */
-	Ztlm = cio_read(cio, 1);	/* Ztlm */
-	Stlm = cio_read(cio, 1);	/* Stlm */
-	ST = ((Stlm >> 4) & 0x01) + ((Stlm >> 4) & 0x02);
-	SP = (Stlm >> 6) & 0x01;
-	tile_tlm = (len - 4) / ((SP + 1) * 2 + ST);
-	for (i = 0; i < tile_tlm; i++) {
-		Ttlm_i = cio_read(cio, ST);	/* Ttlm_i */
-		Ptlm_i = cio_read(cio, SP ? 4 : 2);	/* Ptlm_i */
-	}
-}
-
-/**
- * Reads a TLM marker (Tile Length Marker)
- *
- * @param	p_header_data	the data contained in the TLM box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the TLM marker.
- * @param	p_manager		the user event manager.
-*/
-opj_bool j2k_read_tlm_v2 (
-						opj_j2k_v2_t *p_j2k,
-						OPJ_BYTE * p_header_data,
-						OPJ_UINT32 p_header_size,
-						struct opj_event_mgr * p_manager
-					)
-{
-	OPJ_UINT32 l_Ztlm, l_Stlm, l_ST, l_SP, l_tot_num_tp, l_tot_num_tp_remaining, l_quotient, l_Ptlm_size;
-	// preconditions
-	assert(p_header_data != 00);
-	assert(p_j2k != 00);
-	assert(p_manager != 00);
-
-	if (p_header_size < 2) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading TLM marker\n");
-		return OPJ_FALSE;
-	}
-	p_header_size -= 2;
-
-	opj_read_bytes(p_header_data,&l_Ztlm,1);				/* Ztlm */
-	++p_header_data;
-	opj_read_bytes(p_header_data,&l_Stlm,1);				/* Stlm */
-	++p_header_data;
-
-	l_ST = ((l_Stlm >> 4) & 0x3);
-	l_SP = (l_Stlm >> 6) & 0x1;
-
-	l_Ptlm_size = (l_SP + 1) * 2;
-	l_quotient = l_Ptlm_size + l_ST;
-
-	l_tot_num_tp = p_header_size / l_quotient;
-	l_tot_num_tp_remaining = p_header_size % l_quotient;
-
-	if (l_tot_num_tp_remaining != 0) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading TLM marker\n");
-		return OPJ_FALSE;
-	}
-	/* FIXME Do not care of this at the moment since only local variables are set here */
-	/*
-	for
-		(i = 0; i < l_tot_num_tp; ++i)
-	{
-		opj_read_bytes(p_header_data,&l_Ttlm_i,l_ST);				// Ttlm_i
-		p_header_data += l_ST;
-		opj_read_bytes(p_header_data,&l_Ptlm_i,l_Ptlm_size);		// Ptlm_i
-		p_header_data += l_Ptlm_size;
-	}*/
-	return OPJ_TRUE;
-}
-
-static void j2k_read_plm(opj_j2k_t *j2k) {
-	int len, i, Zplm, Nplm, add, packet_len = 0;
-	
-	opj_cio_t *cio = j2k->cio;
-
-	len = cio_read(cio, 2);		/* Lplm */
-	Zplm = cio_read(cio, 1);	/* Zplm */
-	len -= 3;
-	while (len > 0) {
-		Nplm = cio_read(cio, 4);		/* Nplm */
-		len -= 4;
-		for (i = Nplm; i > 0; i--) {
-			add = cio_read(cio, 1);
-			len--;
-			packet_len = (packet_len << 7) + add;	/* Iplm_ij */
-			if ((add & 0x80) == 0) {
-				/* New packet */
-				packet_len = 0;
-			}
-			if (len <= 0)
-				break;
-		}
-	}
-}
-
-/**
- * Reads a PLM marker (Packet length, main header marker)
- *
- * @param	p_header_data	the data contained in the TLM box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the TLM marker.
- * @param	p_manager		the user event manager.
-*/
-opj_bool j2k_read_plm_v2 (
-						opj_j2k_v2_t *p_j2k,
-						OPJ_BYTE * p_header_data,
-						OPJ_UINT32 p_header_size,
-						struct opj_event_mgr * p_manager
-					)
-{
-	// preconditions
-	assert(p_header_data != 00);
-	assert(p_j2k != 00);
-	assert(p_manager != 00);
-
-	if (p_header_size < 1) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading PLM marker\n");
-		return OPJ_FALSE;
-	}
-	/* Do not care of this at the moment since only local variables are set here */
-	/*
-	opj_read_bytes(p_header_data,&l_Zplm,1);					// Zplm
-	++p_header_data;
-	--p_header_size;
-
-	while
-		(p_header_size > 0)
-	{
-		opj_read_bytes(p_header_data,&l_Nplm,1);				// Nplm
-		++p_header_data;
-		p_header_size -= (1+l_Nplm);
-		if
-			(p_header_size < 0)
-		{
-			opj_event_msg(p_manager, EVT_ERROR, "Error reading PLM marker\n");
-			return false;
-		}
-		for
-			(i = 0; i < l_Nplm; ++i)
-		{
-			opj_read_bytes(p_header_data,&l_tmp,1);				// Iplm_ij
-			++p_header_data;
-			// take only the last seven bytes
-			l_packet_len |= (l_tmp & 0x7f);
-			if
-				(l_tmp & 0x80)
-			{
-				l_packet_len <<= 7;
-			}
-			else
-			{
-                // store packet length and proceed to next packet
-				l_packet_len = 0;
-			}
-		}
-		if
-			(l_packet_len != 0)
-		{
-			opj_event_msg(p_manager, EVT_ERROR, "Error reading PLM marker\n");
-			return false;
-		}
-	}
-	*/
-	return OPJ_TRUE;
-}
-
-static void j2k_read_plt(opj_j2k_t *j2k) {
-	int len, i, Zplt, packet_len = 0, add;
-	
-	opj_cio_t *cio = j2k->cio;
-	
-	len = cio_read(cio, 2);		/* Lplt */
-	Zplt = cio_read(cio, 1);	/* Zplt */
-	for (i = len - 3; i > 0; i--) {
-		add = cio_read(cio, 1);
-		packet_len = (packet_len << 7) + add;	/* Iplt_i */
-		if ((add & 0x80) == 0) {
-			/* New packet */
-			packet_len = 0;
-		}
-	}
-}
-
-/**
- * Reads a PLT marker (Packet length, tile-part header)
- *
- * @param	p_header_data	the data contained in the PLT box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the PLT marker.
- * @param	p_manager		the user event manager.
-*/
-opj_bool j2k_read_plt_v2 (
-						opj_j2k_v2_t *p_j2k,
-						OPJ_BYTE * p_header_data,
-						OPJ_UINT32 p_header_size,
-						struct opj_event_mgr * p_manager
-					)
-{
-	OPJ_UINT32 l_Zplt, l_tmp, l_packet_len = 0, i;
-
-	// preconditions
-	assert(p_header_data != 00);
-	assert(p_j2k != 00);
-	assert(p_manager != 00);
-
-	if (p_header_size < 1) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading PLM marker\n");
-		return OPJ_FALSE;
-	}
-
-	opj_read_bytes(p_header_data,&l_Zplt,1);		/* Zplt */
-	++p_header_data;
-	--p_header_size;
-
-	for (i = 0; i < p_header_size; ++i) {
-		opj_read_bytes(p_header_data,&l_tmp,1);		/* Iplt_ij */
-		++p_header_data;
-		// take only the last seven bits
-		l_packet_len |= (l_tmp & 0x7f);
-		if (l_tmp & 0x80) {
-			l_packet_len <<= 7;
-		}
-		else {
-            // store packet length and proceed to next packet
-			l_packet_len = 0;
-		}
-	}
-
-	if (l_packet_len != 0) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading PLM marker\n");
-		return OPJ_FALSE;
-	}
-
-	return OPJ_TRUE;
-}
-
-static void j2k_read_ppm(opj_j2k_t *j2k) {
-	int len, Z_ppm, i, j;
-	int N_ppm;
-
-	opj_cp_t *cp = j2k->cp;
-	opj_cio_t *cio = j2k->cio;
-	
-	len = cio_read(cio, 2);
-	cp->ppm = 1;
-	
-	Z_ppm = cio_read(cio, 1);	/* Z_ppm */
-	len -= 3;
-	while (len > 0) {
-		if (cp->ppm_previous == 0) {
-			N_ppm = cio_read(cio, 4);	/* N_ppm */
-			len -= 4;
-		} else {
-			N_ppm = cp->ppm_previous;
-		}
-		j = cp->ppm_store;
-		if (Z_ppm == 0) {	/* First PPM marker */
-			cp->ppm_data = (unsigned char *) opj_malloc(N_ppm * sizeof(unsigned char));
-			cp->ppm_data_first = cp->ppm_data;
-			cp->ppm_len = N_ppm;
-		} else {			/* NON-first PPM marker */
-			cp->ppm_data = (unsigned char *) opj_realloc(cp->ppm_data, (N_ppm +	cp->ppm_store) * sizeof(unsigned char));
-
-#ifdef USE_JPWL
-			/* this memory allocation check could be done even in non-JPWL cases */
-			if (cp->correct) {
-				if (!cp->ppm_data) {
-					opj_event_msg(j2k->cinfo, EVT_ERROR,
-						"JPWL: failed memory allocation during PPM marker parsing (pos. %x)\n",
-						cio_tell(cio));
-					if (!JPWL_ASSUME || JPWL_ASSUME) {
-						opj_free(cp->ppm_data);
-						opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
-						return;
-					}
-				}
-			}
-#endif
-
-			cp->ppm_data_first = cp->ppm_data;
-			cp->ppm_len = N_ppm + cp->ppm_store;
-		}
-		for (i = N_ppm; i > 0; i--) {	/* Read packet header */
-			cp->ppm_data[j] = cio_read(cio, 1);
-			j++;
-			len--;
-			if (len == 0)
-				break;			/* Case of non-finished packet header in present marker but finished in next one */
-		}
-		cp->ppm_previous = i - 1;
-		cp->ppm_store = j;
-	}
-}
-/**
- * Reads a PPM marker (Packed packet headers, main header)
- *
- * @param	p_header_data	the data contained in the POC box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the POC marker.
- * @param	p_manager		the user event manager.
-*/
-opj_bool j2k_read_ppm_v2 (
-						opj_j2k_v2_t *p_j2k,
-						OPJ_BYTE * p_header_data,
-						OPJ_UINT32 p_header_size,
-						struct opj_event_mgr * p_manager
-					)
-{
-
-	opj_cp_v2_t *l_cp = 00;
-	OPJ_UINT32 l_remaining_data, l_Z_ppm, l_N_ppm;
-
-	// preconditions
-	assert(p_header_data != 00);
-	assert(p_j2k != 00);
-	assert(p_manager != 00);
-
-	if (p_header_size < 1) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading PPM marker\n");
-		return OPJ_FALSE;
-	}
-
-	l_cp = &(p_j2k->m_cp);
-	l_cp->ppm = 1;
-
-	opj_read_bytes(p_header_data,&l_Z_ppm,1);		/* Z_ppm */
-	++p_header_data;
-	--p_header_size;
-
-	// First PPM marker
-	if (l_Z_ppm == 0) {
-		if (p_header_size < 4) {
-			opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading PPM marker\n");
-			return OPJ_FALSE;
-		}
-
-		opj_read_bytes(p_header_data,&l_N_ppm,4);		/* N_ppm */
-		p_header_data+=4;
-		p_header_size-=4;
-
-		/* First PPM marker: Initialization */
-		l_cp->ppm_len = l_N_ppm;
-		l_cp->ppm_data_size = 0;
-
-		l_cp->ppm_buffer = (OPJ_BYTE *) opj_malloc(l_cp->ppm_len);
-		if (l_cp->ppm_buffer == 00) {
-			opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory reading ppm marker\n");
-			return OPJ_FALSE;
-		}
-		memset(l_cp->ppm_buffer,0,l_cp->ppm_len);
-
-		l_cp->ppm_data = l_cp->ppm_buffer;
-	}
-
-	while (1) {
-		if (l_cp->ppm_data_size == l_cp->ppm_len) {
-			if (p_header_size >= 4) {
-				// read a N_ppm
-				opj_read_bytes(p_header_data,&l_N_ppm,4);		/* N_ppm */
-				p_header_data+=4;
-				p_header_size-=4;
-				l_cp->ppm_len += l_N_ppm ;
-
-				l_cp->ppm_buffer = (OPJ_BYTE *) opj_realloc(l_cp->ppm_buffer, l_cp->ppm_len);
-				if (l_cp->ppm_buffer == 00) {
-					opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory reading ppm marker\n");
-					return OPJ_FALSE;
-				}
-				memset(l_cp->ppm_buffer+l_cp->ppm_data_size,0,l_N_ppm);
-
-				l_cp->ppm_data = l_cp->ppm_buffer;
-			}
-			else {
-				return OPJ_FALSE;
-			}
-		}
-
-		l_remaining_data = l_cp->ppm_len - l_cp->ppm_data_size;
-
-		if (l_remaining_data <= p_header_size) {
-			/* we must store less information than available in the packet */
-			memcpy(l_cp->ppm_buffer + l_cp->ppm_data_size , p_header_data , l_remaining_data);
-			l_cp->ppm_data_size = l_cp->ppm_len;
-			p_header_size -= l_remaining_data;
-			p_header_data += l_remaining_data;
-		}
-		else {
-			memcpy(l_cp->ppm_buffer + l_cp->ppm_data_size , p_header_data , p_header_size);
-			l_cp->ppm_data_size += p_header_size;
-			p_header_data += p_header_size;
-			p_header_size = 0;
-			break;
-		}
-	}
-
-	return OPJ_TRUE;
-}
-
-
-
-/**
- * Reads a PPM marker (Packed packet headers, main header)
- *
- * @param	p_header_data	the data contained in the POC box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the POC marker.
- * @param	p_manager		the user event manager.
-*/
-opj_bool j2k_read_ppm_v3 (
-						opj_j2k_v2_t *p_j2k,
-						OPJ_BYTE * p_header_data,
-						OPJ_UINT32 p_header_size,
-						struct opj_event_mgr * p_manager
-					)
-{
-	opj_cp_v2_t *l_cp = 00;
-	OPJ_UINT32 l_remaining_data, l_Z_ppm, l_N_ppm;
-
-	// preconditions
-	assert(p_header_data != 00);
-	assert(p_j2k != 00);
-	assert(p_manager != 00);
-
-	// Minimum size of PPM marker is equal to the size of Zppm element
-	if (p_header_size < 1) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading PPM marker\n");
-		return OPJ_FALSE;
-	}
-
-	l_cp = &(p_j2k->m_cp);
-	l_cp->ppm = 1;
-
-	opj_read_bytes(p_header_data,&l_Z_ppm,1);		/* Z_ppm */
-	++p_header_data;
-	--p_header_size;
-
-	// First PPM marker
-	if (l_Z_ppm == 0) {
-		// We need now at least the Nppm^0 element
-		if (p_header_size < 4) {
-			opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading PPM marker\n");
-			return OPJ_FALSE;
-		}
-
-		opj_read_bytes(p_header_data,&l_N_ppm,4);		/* First N_ppm */
-		p_header_data+=4;
-		p_header_size-=4;
-
-		/* First PPM marker: Initialization */
-		l_cp->ppm_len = l_N_ppm;
-		l_cp->ppm_data_read = 0;
-
-		l_cp->ppm_data = (OPJ_BYTE *) opj_malloc(l_cp->ppm_len);
-		if (l_cp->ppm_data == 00) {
-			opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory reading ppm marker\n");
-			return OPJ_FALSE;
-		}
-		memset(l_cp->ppm_data,0,l_cp->ppm_len);
-
-		l_cp->ppm_data_current = l_cp->ppm_data;
-
-		//l_cp->ppm_data = l_cp->ppm_buffer;
-	}
-	else {
-		if (p_header_size < 4) {
-			opj_event_msg_v2(p_manager, EVT_WARNING, "Empty PPM marker\n");
-			return OPJ_TRUE;
-		}
-		else {
-			// Uncompleted Ippm series in the previous PPM marker?
-			if (l_cp->ppm_data_read < l_cp->ppm_len) {
-				// Get the place where add the remaining Ippm series
-				l_cp->ppm_data_current = &(l_cp->ppm_data[l_cp->ppm_data_read]);
-				l_N_ppm = l_cp->ppm_len - l_cp->ppm_data_read;
-			}
-			else {
-				opj_read_bytes(p_header_data,&l_N_ppm,4);		/* First N_ppm */
-				p_header_data+=4;
-				p_header_size-=4;
-
-				// Increase the size of ppm_data to add the new Ippm series
-				l_cp->ppm_data = (OPJ_BYTE *) opj_realloc(l_cp->ppm_data, l_cp->ppm_len + l_N_ppm);
-
-				// Keep the position of the place where concatenate the new series
-				l_cp->ppm_data_current = &(l_cp->ppm_data[l_cp->ppm_len]);
-				l_cp->ppm_len += l_N_ppm;
-			}
-		}
-	}
-
-	l_remaining_data = p_header_size;
-
-	while (l_remaining_data >= l_N_ppm) {
-		// read a complete Ippm series
-		memcpy(l_cp->ppm_data_current, p_header_data, l_N_ppm);
-		p_header_size -= l_N_ppm;
-		p_header_data += l_N_ppm;
-
-		l_cp->ppm_data_read += l_N_ppm; // Increase the number of data read
-
-		if (p_header_size)
-		{
-			opj_read_bytes(p_header_data,&l_N_ppm,4);		/* N_ppm^i */
-			p_header_data+=4;
-			p_header_size-=4;
-		}
-		else {
-			l_remaining_data = p_header_size;
-			break;
-		}
-
-		l_remaining_data = p_header_size;
-
-		// Next Ippm series is a complete series ?
-		if (l_remaining_data > l_N_ppm) {
-			// Increase the size of ppm_data to add the new Ippm series
-			l_cp->ppm_data = (OPJ_BYTE *) opj_realloc(l_cp->ppm_data, l_cp->ppm_len + l_N_ppm);
-
-			// Keep the position of the place where concatenate the new series
-			l_cp->ppm_data_current = &(l_cp->ppm_data[l_cp->ppm_len]);
-			l_cp->ppm_len += l_N_ppm;
-		}
-
-	}
-
-	// Need to read an incomplete Ippm series
-	if (l_remaining_data) {
-		l_cp->ppm_data = (OPJ_BYTE *) opj_realloc(l_cp->ppm_data, l_cp->ppm_len + l_N_ppm);
-
-		// Keep the position of the place where concatenate the new series
-		l_cp->ppm_data_current = &(l_cp->ppm_data[l_cp->ppm_len]);
-		l_cp->ppm_len += l_N_ppm;
-
-		// Read incomplete Ippm series
-		memcpy(l_cp->ppm_data_current, p_header_data, l_remaining_data);
-		p_header_size -= l_remaining_data;
-		p_header_data += l_remaining_data;
-
-		l_cp->ppm_data_read += l_remaining_data; // Increase the number of data read
-	}
-
-#ifdef CLEAN_MSD
-
-		if (l_cp->ppm_data_size == l_cp->ppm_len) {
-			if (p_header_size >= 4) {
-				// read a N_ppm
-				opj_read_bytes(p_header_data,&l_N_ppm,4);		/* N_ppm */
-				p_header_data+=4;
-				p_header_size-=4;
-				l_cp->ppm_len += l_N_ppm ;
-
-				l_cp->ppm_buffer = (OPJ_BYTE *) opj_realloc(l_cp->ppm_buffer, l_cp->ppm_len);
-				if (l_cp->ppm_buffer == 00) {
-					opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory reading ppm marker\n");
-					return OPJ_FALSE;
-				}
-				memset(l_cp->ppm_buffer+l_cp->ppm_data_size,0,l_N_ppm);
-
-				l_cp->ppm_data = l_cp->ppm_buffer;
-			}
-			else {
-				return OPJ_FALSE;
-			}
-		}
-
-		l_remaining_data = l_cp->ppm_len - l_cp->ppm_data_size;
-
-		if (l_remaining_data <= p_header_size) {
-			/* we must store less information than available in the packet */
-			memcpy(l_cp->ppm_buffer + l_cp->ppm_data_size , p_header_data , l_remaining_data);
-			l_cp->ppm_data_size = l_cp->ppm_len;
-			p_header_size -= l_remaining_data;
-			p_header_data += l_remaining_data;
-		}
-		else {
-			memcpy(l_cp->ppm_buffer + l_cp->ppm_data_size , p_header_data , p_header_size);
-			l_cp->ppm_data_size += p_header_size;
-			p_header_data += p_header_size;
-			p_header_size = 0;
-			break;
-		}
-	}
-#endif
-	return OPJ_TRUE;
-}
-
-static void j2k_read_ppt(opj_j2k_t *j2k) {
-	int len, Z_ppt, i, j = 0;
-
-	opj_cp_t *cp = j2k->cp;
-	opj_tcp_t *tcp = cp->tcps + j2k->curtileno;
-	opj_cio_t *cio = j2k->cio;
-
-	len = cio_read(cio, 2);
-	Z_ppt = cio_read(cio, 1);
-	tcp->ppt = 1;
-	if (Z_ppt == 0) {		/* First PPT marker */
-		tcp->ppt_data = (unsigned char *) opj_malloc((len - 3) * sizeof(unsigned char));
-		tcp->ppt_data_first = tcp->ppt_data;
-		tcp->ppt_store = 0;
-		tcp->ppt_len = len - 3;
-	} else {			/* NON-first PPT marker */
-		tcp->ppt_data =	(unsigned char *) opj_realloc(tcp->ppt_data, (len - 3 + tcp->ppt_store) * sizeof(unsigned char));
-		tcp->ppt_data_first = tcp->ppt_data;
-		tcp->ppt_len = len - 3 + tcp->ppt_store;
-	}
-	j = tcp->ppt_store;
-	for (i = len - 3; i > 0; i--) {
-		tcp->ppt_data[j] = cio_read(cio, 1);
-		j++;
-	}
-	tcp->ppt_store = j;
-}
-
-/**
- * Reads a PPT marker (Packed packet headers, tile-part header)
- *
- * @param	p_header_data	the data contained in the PPT box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the PPT marker.
- * @param	p_manager		the user event manager.
-*/
-opj_bool j2k_read_ppt_v2 (	opj_j2k_v2_t *p_j2k,
-							OPJ_BYTE * p_header_data,
-							OPJ_UINT32 p_header_size,
-							struct opj_event_mgr * p_manager )
-{
-	opj_cp_v2_t *l_cp = 00;
-	opj_tcp_v2_t *l_tcp = 00;
-	OPJ_UINT32 l_Z_ppt;
-
-	/* preconditions */
-	assert(p_header_data != 00);
-	assert(p_j2k != 00);
-	assert(p_manager != 00);
-
-	/* We need to have the Z_ppt element at minimum */
-	if (p_header_size < 1) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading PPT marker\n");
-		return OPJ_FALSE;
-	}
-
-	l_cp = &(p_j2k->m_cp);
-	if (l_cp->ppm){
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading PPT marker: packet header have been previously found in the main header (PPM marker).\n");
-		return OPJ_FALSE;
-	}
-
-	l_tcp = &(l_cp->tcps[p_j2k->m_current_tile_number]);
-	l_tcp->ppt = 1;
-
-	opj_read_bytes(p_header_data,&l_Z_ppt,1);		/* Z_ppt */
-	++p_header_data;
-	--p_header_size;
-
-	/* Allocate buffer to read the packet header */
-	if (l_Z_ppt == 0) {
-		/* First PPT marker */
-		l_tcp->ppt_data_size = 0;
-		l_tcp->ppt_len = p_header_size;
-
-		l_tcp->ppt_buffer = (OPJ_BYTE *) opj_calloc(l_tcp->ppt_len, sizeof(OPJ_BYTE) );
-		if (l_tcp->ppt_buffer == 00) {
-			opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory reading PPT marker\n");
-			return OPJ_FALSE;
-		}
-		l_tcp->ppt_data = l_tcp->ppt_buffer;
-
-		/* memset(l_tcp->ppt_buffer,0,l_tcp->ppt_len); */
-	}
-	else {
-		l_tcp->ppt_len += p_header_size;
-
-		l_tcp->ppt_buffer = (OPJ_BYTE *) opj_realloc(l_tcp->ppt_buffer,l_tcp->ppt_len);
-		if (l_tcp->ppt_buffer == 00) {
-			opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory reading PPT marker\n");
-			return OPJ_FALSE;
-		}
-		l_tcp->ppt_data = l_tcp->ppt_buffer;
-
-		memset(l_tcp->ppt_buffer+l_tcp->ppt_data_size,0,p_header_size);
-	}
-
-	/* Read packet header from buffer */
-	memcpy(l_tcp->ppt_buffer+l_tcp->ppt_data_size,p_header_data,p_header_size);
-
-	l_tcp->ppt_data_size += p_header_size;
-
-	return OPJ_TRUE;
-}
-
-static void j2k_write_tlm(opj_j2k_t *j2k){
-	int lenp;
-	opj_cio_t *cio = j2k->cio;
-	j2k->tlm_start = cio_tell(cio);
-	cio_write(cio, J2K_MS_TLM, 2);/* TLM */
-	lenp = 4 + (5*j2k->totnum_tp);
-	cio_write(cio,lenp,2);				/* Ltlm */
-	cio_write(cio, 0,1);					/* Ztlm=0*/
-	cio_write(cio,80,1);					/* Stlm ST=1(8bits-255 tiles max),SP=1(Ptlm=32bits) */
-	cio_skip(cio,5*j2k->totnum_tp);
-}
-
-static void j2k_write_sot(opj_j2k_t *j2k) {
-	int lenp, len;
-
-	opj_cio_t *cio = j2k->cio;
-
-	j2k->sot_start = cio_tell(cio);
-	cio_write(cio, J2K_MS_SOT, 2);		/* SOT */
-	lenp = cio_tell(cio);
-	cio_skip(cio, 2);					/* Lsot (further) */
-	cio_write(cio, j2k->curtileno, 2);	/* Isot */
-	cio_skip(cio, 4);					/* Psot (further in j2k_write_sod) */
-	cio_write(cio, j2k->cur_tp_num , 1);	/* TPsot */
-	cio_write(cio, j2k->cur_totnum_tp[j2k->curtileno], 1);		/* TNsot */
-	len = cio_tell(cio) - lenp;
-	cio_seek(cio, lenp);
-	cio_write(cio, len, 2);				/* Lsot */
-	cio_seek(cio, lenp + len);
-
-	/* UniPG>> */
-#ifdef USE_JPWL
-	/* update markers struct */
-	j2k_add_marker(j2k->cstr_info, J2K_MS_SOT, j2k->sot_start, len + 2);
-#endif /* USE_JPWL */
-	/* <<UniPG */
-
-	if( j2k->cstr_info && j2k->cur_tp_num==0){
-	  j2k_add_tlmarker( j2k->curtileno, j2k->cstr_info, J2K_MS_SOT, lenp, len);
-	}
-}
-
-static void j2k_read_sot(opj_j2k_t *j2k) {
-	int len, tileno, totlen, partno, numparts, i;
-	opj_tcp_t *tcp = NULL;
-	char status = 0;
-
-	opj_cp_t *cp = j2k->cp;
-	opj_cio_t *cio = j2k->cio;
-
-	len = cio_read(cio, 2);
-	tileno = cio_read(cio, 2);
-
-#ifdef USE_JPWL
-	if (j2k->cp->correct) {
-
-		static int backup_tileno = 0;
-
-		/* tileno is negative or larger than the number of tiles!!! */
-		if ((tileno < 0) || (tileno > (cp->tw * cp->th))) {
-			opj_event_msg(j2k->cinfo, EVT_ERROR,
-				"JPWL: bad tile number (%d out of a maximum of %d)\n",
-				tileno, (cp->tw * cp->th));
-			if (!JPWL_ASSUME) {
-				opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
-				return;
-			}
-			/* we try to correct */
-			tileno = backup_tileno;
-			opj_event_msg(j2k->cinfo, EVT_WARNING, "- trying to adjust this\n"
-				"- setting tile number to %d\n",
-				tileno);
-		}
-
-		/* keep your private count of tiles */
-		backup_tileno++;
-	};
-#endif /* USE_JPWL */
-	
-	if (cp->tileno_size == 0) {
-		cp->tileno[cp->tileno_size] = tileno;
-		cp->tileno_size++;
-	} else {
-		i = 0;
-		while (i < cp->tileno_size && status == 0) {
-			status = cp->tileno[i] == tileno ? 1 : 0;
-			i++;
-		}
-		if (status == 0) {
-			cp->tileno[cp->tileno_size] = tileno;
-			cp->tileno_size++;
-		}
-	}
-	
-	totlen = cio_read(cio, 4);
-
-#ifdef USE_JPWL
-	if (j2k->cp->correct) {
-
-		/* totlen is negative or larger than the bytes left!!! */
-		if ((totlen < 0) || (totlen > (cio_numbytesleft(cio) + 8))) {
-			opj_event_msg(j2k->cinfo, EVT_ERROR,
-				"JPWL: bad tile byte size (%d bytes against %d bytes left)\n",
-				totlen, cio_numbytesleft(cio) + 8);
-			if (!JPWL_ASSUME) {
-				opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
-				return;
-			}
-			/* we try to correct */
-			totlen = 0;
-			opj_event_msg(j2k->cinfo, EVT_WARNING, "- trying to adjust this\n"
-				"- setting Psot to %d => assuming it is the last tile\n",
-				totlen);
-		}
-
-	};
-#endif /* USE_JPWL */
-
-	if (!totlen)
-		totlen = cio_numbytesleft(cio) + 8;
-	
-	partno = cio_read(cio, 1);
-	numparts = cio_read(cio, 1);
-  
-  if (partno >= numparts) {
-    opj_event_msg(j2k->cinfo, EVT_WARNING, "SOT marker inconsistency in tile %d: tile-part index greater (%d) than number of tile-parts (%d)\n", tileno, partno, numparts);
-    numparts = partno+1;
-  }
-	
-	j2k->curtileno = tileno;
-	j2k->cur_tp_num = partno;
-	j2k->eot = cio_getbp(cio) - 12 + totlen;
-	j2k->state = J2K_STATE_TPH;
-	tcp = &cp->tcps[j2k->curtileno];
-
-	/* Index */
-	if (j2k->cstr_info) {
-		if (tcp->first) {
-			if (tileno == 0) 
-				j2k->cstr_info->main_head_end = cio_tell(cio) - 13;
-			j2k->cstr_info->tile[tileno].tileno = tileno;
-			j2k->cstr_info->tile[tileno].start_pos = cio_tell(cio) - 12;
-			j2k->cstr_info->tile[tileno].end_pos = j2k->cstr_info->tile[tileno].start_pos + totlen - 1;				
-    } else {
-			j2k->cstr_info->tile[tileno].end_pos += totlen;
-		}
-    j2k->cstr_info->tile[tileno].num_tps = numparts;
-    if (numparts)
-      j2k->cstr_info->tile[tileno].tp = (opj_tp_info_t *) opj_realloc(j2k->cstr_info->tile[tileno].tp, numparts * sizeof(opj_tp_info_t));
-    else
-      j2k->cstr_info->tile[tileno].tp = (opj_tp_info_t *) opj_realloc(j2k->cstr_info->tile[tileno].tp, 10 * sizeof(opj_tp_info_t)); // Fixme (10)
-		j2k->cstr_info->tile[tileno].tp[partno].tp_start_pos = cio_tell(cio) - 12;
-		j2k->cstr_info->tile[tileno].tp[partno].tp_end_pos = 
-			j2k->cstr_info->tile[tileno].tp[partno].tp_start_pos + totlen - 1;
-	}
-	
-	if (tcp->first == 1) {		
-		/* Initialization PPT */
-		opj_tccp_t *tmp = tcp->tccps;
-		memcpy(tcp, j2k->default_tcp, sizeof(opj_tcp_t));
-		tcp->ppt = 0;
-		tcp->ppt_data = NULL;
-		tcp->ppt_data_first = NULL;
-		tcp->tccps = tmp;
-
-		for (i = 0; i < j2k->image->numcomps; i++) {
-			tcp->tccps[i] = j2k->default_tcp->tccps[i];
-		}
-		cp->tcps[j2k->curtileno].first = 0;
-	}
-}
-
-/**
- * Reads a PPT marker (Packed packet headers, tile-part header)
- *
- * @param	p_header_data	the data contained in the PPT box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the PPT marker.
- * @param	p_manager		the user event manager.
-*/
-opj_bool j2k_read_sot_v2 (
-						opj_j2k_v2_t *p_j2k,
-						OPJ_BYTE * p_header_data,
-						OPJ_UINT32 p_header_size,
-						struct opj_event_mgr * p_manager
-					)
-{
-
-	opj_cp_v2_t *l_cp = 00;
-	opj_tcp_v2_t *l_tcp = 00;
-	OPJ_UINT32 l_tot_len, l_num_parts = 0;
-	OPJ_UINT32 l_current_part;
-	OPJ_UINT32 l_tile_x,l_tile_y;
-
-	/* preconditions */
-	assert(p_header_data != 00);
-	assert(p_j2k != 00);
-	assert(p_manager != 00);
-
-	/* Size of this marker is fixed = 12 (we have already read marker and its size)*/
-	if (p_header_size != 8) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading SOT marker\n");
-		return OPJ_FALSE;
-	}
-
-	l_cp = &(p_j2k->m_cp);
-	opj_read_bytes(p_header_data,&(p_j2k->m_current_tile_number),2);		/* Isot */
-	p_header_data+=2;
-
-	l_tcp = &l_cp->tcps[p_j2k->m_current_tile_number];
-	l_tile_x = p_j2k->m_current_tile_number % l_cp->tw;
-	l_tile_y = p_j2k->m_current_tile_number / l_cp->tw;
-
-#ifdef USE_JPWL
-	if (l_cp->correct) {
-
-		int tileno = p_j2k->m_current_tile_number;
-		static int backup_tileno = 0;
-
-		/* tileno is negative or larger than the number of tiles!!! */
-		if ((tileno < 0) || (tileno > (l_cp->tw * l_cp->th))) {
-			opj_event_msg_v2(p_manager, EVT_ERROR,
-				"JPWL: bad tile number (%d out of a maximum of %d)\n",
-				tileno, (l_cp->tw * l_cp->th));
-			if (!JPWL_ASSUME) {
-				opj_event_msg_v2(p_manager, EVT_ERROR, "JPWL: giving up\n");
-				return OPJ_FALSE;
-			}
-			/* we try to correct */
-			tileno = backup_tileno;
-			opj_event_msg_v2(p_manager, EVT_WARNING, "- trying to adjust this\n"
-				"- setting tile number to %d\n",
-				tileno);
-		}
-
-		/* keep your private count of tiles */
-		backup_tileno++;
-	};
-#endif /* USE_JPWL */
-
-	/* look for the tile in the list of already processed tile (in parts). */
-	/* Optimization possible here with a more complex data structure and with the removing of tiles */
-	/* since the time taken by this function can only grow at the time */
-
-	opj_read_bytes(p_header_data,&l_tot_len,4);		/* Psot */
-	p_header_data+=4;
-
-	/* PSot should be equal to zero or >=14 or <= 2^32-1 */
-	if ((l_tot_len !=0 ) && (l_tot_len < 14) )
-	{
-		if (l_tot_len == 12 ) /* MSD: Special case for the new PHR data */
-		{
-			opj_event_msg_v2(p_manager, EVT_WARNING, "Psot value is not correct regards to the JPEG2000 norm: %d.\n", l_tot_len);
-		}
-		else
-		{
-			opj_event_msg_v2(p_manager, EVT_ERROR, "Psot value is not correct regards to the JPEG2000 norm: %d.\n", l_tot_len);
-			return OPJ_FALSE;
-		}
-	}
-
-#ifdef USE_JPWL
-	if (l_cp->correct) {
-
-		/* totlen is negative or larger than the bytes left!!! */
-		if ((l_tot_len < 0) || (l_tot_len > p_header_size ) ) { /* FIXME it seems correct; for info in V1 -> (p_stream_numbytesleft(p_stream) + 8))) { */
-			opj_event_msg_v2(p_manager, EVT_ERROR,
-				"JPWL: bad tile byte size (%d bytes against %d bytes left)\n",
-				l_tot_len, p_header_size ); /* FIXME it seems correct; for info in V1 -> p_stream_numbytesleft(p_stream) + 8); */
-			if (!JPWL_ASSUME) {
-				opj_event_msg_v2(p_manager, EVT_ERROR, "JPWL: giving up\n");
-				return OPJ_FALSE;
-			}
-			/* we try to correct */
-			l_tot_len = 0;
-			opj_event_msg_v2(p_manager, EVT_WARNING, "- trying to adjust this\n"
-				"- setting Psot to %d => assuming it is the last tile\n",
-				l_tot_len);
-		}
-	};
-#endif /* USE_JPWL */
-
-	/* Ref A.4.2: Psot could be equal zero if it is the last tile-part of the codestream.*/
-	if (!l_tot_len) {
-		opj_event_msg_v2(p_manager, EVT_INFO, "Psot value of the current tile-part is equal to zero, "
-				"we assuming it is the last tile-part of the codestream.\n");
-		p_j2k->m_specific_param.m_decoder.m_last_tile_part = 1;
-	}
-
-	opj_read_bytes(p_header_data,&l_current_part ,1);	/* TPsot */
-	++p_header_data;
-
-	opj_read_bytes(p_header_data,&l_num_parts ,1);		/* TNsot */
-	++p_header_data;
-
-	if (l_num_parts != 0) { /* Number of tile-part header is provided by this tile-part header */
-		/* Useful to manage the case of textGBR.jp2 file because two values of TNSot are allowed: the correct numbers of
-		 * tile-parts for that tile and zero (A.4.2 of 15444-1 : 2002). */
-		if (l_tcp->m_nb_tile_parts) {
-			if (l_current_part >= l_tcp->m_nb_tile_parts){
-				opj_event_msg_v2(p_manager, EVT_ERROR, "In SOT marker, TPSot (%d) is not valid regards to the current "
-						"number of tile-part (%d), giving up\n", l_current_part, l_tcp->m_nb_tile_parts );
-				p_j2k->m_specific_param.m_decoder.m_last_tile_part = 1;
-				return OPJ_FALSE;
-			}
-		}
-		l_tcp->m_nb_tile_parts = l_num_parts;
-	}
-
-	/* If know the number of tile part header we will check if we didn't read the last*/
-	if (l_tcp->m_nb_tile_parts) {
-		if (l_tcp->m_nb_tile_parts == (l_current_part + 1)) {
-			p_j2k->m_specific_param.m_decoder.m_can_decode = 1; /* Process the last tile-part header*/
-		}
-	}
-
-	if (!p_j2k->m_specific_param.m_decoder.m_last_tile_part){
-		/* Keep the size of data to skip after this marker */
-		p_j2k->m_specific_param.m_decoder.m_sot_length = l_tot_len - 12; /* SOT_marker_size = 12 */
-	}
-	else {
-		/* FIXME: need to be computed from the number of bytes remaining in the codestream */
-		p_j2k->m_specific_param.m_decoder.m_sot_length = 0;
-	}
-
-	p_j2k->m_specific_param.m_decoder.m_state = J2K_STATE_TPH;
-
-	/* Check if the current tile is outside the area we want decode or not corresponding to the tile index*/
-	if (p_j2k->m_specific_param.m_decoder.m_tile_ind_to_dec == -1) {
-		p_j2k->m_specific_param.m_decoder.m_skip_data =
-				(l_tile_x < p_j2k->m_specific_param.m_decoder.m_start_tile_x)
-			||	(l_tile_x >= p_j2k->m_specific_param.m_decoder.m_end_tile_x)
-			||  (l_tile_y < p_j2k->m_specific_param.m_decoder.m_start_tile_y)
-			||	(l_tile_y >= p_j2k->m_specific_param.m_decoder.m_end_tile_y);
-	}
-	else
-		p_j2k->m_specific_param.m_decoder.m_skip_data =
-			(p_j2k->m_current_tile_number != p_j2k->m_specific_param.m_decoder.m_tile_ind_to_dec);
-
-	/* Index */
-	if (p_j2k->cstr_index)
-	{
-		p_j2k->cstr_index->tile_index[p_j2k->m_current_tile_number].tileno = p_j2k->m_current_tile_number;
-		p_j2k->cstr_index->tile_index[p_j2k->m_current_tile_number].current_tpsno = l_current_part;
-
-		if (l_num_parts != 0){
-			p_j2k->cstr_index->tile_index[p_j2k->m_current_tile_number].nb_tps = l_num_parts;
-			p_j2k->cstr_index->tile_index[p_j2k->m_current_tile_number].current_nb_tps = l_num_parts;
-
-
-			if (!p_j2k->cstr_index->tile_index[p_j2k->m_current_tile_number].tp_index)
-				p_j2k->cstr_index->tile_index[p_j2k->m_current_tile_number].tp_index =
-					(opj_tp_index_t*)opj_calloc(l_num_parts, sizeof(opj_tp_index_t));
-			else
-				p_j2k->cstr_index->tile_index[p_j2k->m_current_tile_number].tp_index =
-					(opj_tp_index_t*)opj_realloc(
-							p_j2k->cstr_index->tile_index[p_j2k->m_current_tile_number].tp_index,
-							l_num_parts* sizeof(opj_tp_index_t));
-		}
-		else{
-			/*if (!p_j2k->cstr_index->tile_index[p_j2k->m_current_tile_number].tp_index)*/ {
-
-				if (!p_j2k->cstr_index->tile_index[p_j2k->m_current_tile_number].tp_index) {
-					p_j2k->cstr_index->tile_index[p_j2k->m_current_tile_number].current_nb_tps = 10;
-					p_j2k->cstr_index->tile_index[p_j2k->m_current_tile_number].tp_index =
-						(opj_tp_index_t*)opj_calloc( p_j2k->cstr_index->tile_index[p_j2k->m_current_tile_number].current_nb_tps,
-													 sizeof(opj_tp_index_t));
-				}
-
-				if ( l_current_part >= p_j2k->cstr_index->tile_index[p_j2k->m_current_tile_number].current_nb_tps ){
-					p_j2k->cstr_index->tile_index[p_j2k->m_current_tile_number].current_nb_tps += 10;
-					p_j2k->cstr_index->tile_index[p_j2k->m_current_tile_number].tp_index =
-						(opj_tp_index_t*)opj_realloc( p_j2k->cstr_index->tile_index[p_j2k->m_current_tile_number].tp_index,
-													  p_j2k->cstr_index->tile_index[p_j2k->m_current_tile_number].current_nb_tps
-													  * sizeof(opj_tp_index_t));
-				}
-			}
-
-		}
-
-	}
-
-
-	/* FIXME move this onto a separate method to call before reading any SOT, remove part about main_end header, use a index struct inside p_j2k */
-	/* if (p_j2k->cstr_info) {
-		if (l_tcp->first) {
-			if (tileno == 0) {
-				p_j2k->cstr_info->main_head_end = p_stream_tell(p_stream) - 13;
-			}
-
-			p_j2k->cstr_info->tile[tileno].tileno = tileno;
-			p_j2k->cstr_info->tile[tileno].start_pos = p_stream_tell(p_stream) - 12;
-			p_j2k->cstr_info->tile[tileno].end_pos = p_j2k->cstr_info->tile[tileno].start_pos + totlen - 1;
-			p_j2k->cstr_info->tile[tileno].num_tps = numparts;
-
-			if (numparts) {
-				p_j2k->cstr_info->tile[tileno].tp = (opj_tp_info_t *) opj_malloc(numparts * sizeof(opj_tp_info_t));
-			}
-			else {
-				p_j2k->cstr_info->tile[tileno].tp = (opj_tp_info_t *) opj_malloc(10 * sizeof(opj_tp_info_t)); // Fixme (10)
-			}
-		}
-		else {
-			p_j2k->cstr_info->tile[tileno].end_pos += totlen;
-		}
-
-		p_j2k->cstr_info->tile[tileno].tp[partno].tp_start_pos = p_stream_tell(p_stream) - 12;
-		p_j2k->cstr_info->tile[tileno].tp[partno].tp_end_pos =
-		p_j2k->cstr_info->tile[tileno].tp[partno].tp_start_pos + totlen - 1;
-	}*/
-	return OPJ_TRUE;
-}
-
-static void j2k_write_sod(opj_j2k_t *j2k, void *tile_coder) {
-	int l, layno;
-	int totlen;
-	opj_tcp_t *tcp = NULL;
-	opj_codestream_info_t *cstr_info = NULL;
-	
-	opj_tcd_t *tcd = (opj_tcd_t*)tile_coder;	/* cast is needed because of conflicts in header inclusions */
-	opj_cp_t *cp = j2k->cp;
-	opj_cio_t *cio = j2k->cio;
-
-	tcd->tp_num = j2k->tp_num ;
-	tcd->cur_tp_num = j2k->cur_tp_num;
-	
-	cio_write(cio, J2K_MS_SOD, 2);
-
-	if( j2k->cstr_info && j2k->cur_tp_num==0){
-	  j2k_add_tlmarker( j2k->curtileno, j2k->cstr_info, J2K_MS_SOD, cio_tell(cio), 0);
-	}
-
-	if (j2k->curtileno == 0) {
-		j2k->sod_start = cio_tell(cio) + j2k->pos_correction;
-	}
-
-	/* INDEX >> */
-	cstr_info = j2k->cstr_info;
-	if (cstr_info) {
-		if (!j2k->cur_tp_num ) {
-			cstr_info->tile[j2k->curtileno].end_header = cio_tell(cio) + j2k->pos_correction - 1;
-			j2k->cstr_info->tile[j2k->curtileno].tileno = j2k->curtileno;
-		}
-		else{
-			if(cstr_info->tile[j2k->curtileno].packet[cstr_info->packno - 1].end_pos < cio_tell(cio))
-				cstr_info->tile[j2k->curtileno].packet[cstr_info->packno].start_pos = cio_tell(cio);
-		}
-		/* UniPG>> */
-#ifdef USE_JPWL
-		/* update markers struct */
-		j2k_add_marker(j2k->cstr_info, J2K_MS_SOD, j2k->sod_start, 2);
-#endif /* USE_JPWL */
-		/* <<UniPG */
-	}
-	/* << INDEX */
-	
-	tcp = &cp->tcps[j2k->curtileno];
-	for (layno = 0; layno < tcp->numlayers; layno++) {
-		if (tcp->rates[layno]>(j2k->sod_start / (cp->th * cp->tw))) {
-			tcp->rates[layno]-=(j2k->sod_start / (cp->th * cp->tw));
-		} else if (tcp->rates[layno]) {
-			tcp->rates[layno]=1;
-		}
-	}
-	if(j2k->cur_tp_num == 0){
-		tcd->tcd_image->tiles->packno = 0;
-		if(cstr_info)
-			cstr_info->packno = 0;
-	}
-	
-	l = tcd_encode_tile(tcd, j2k->curtileno, cio_getbp(cio), cio_numbytesleft(cio) - 2, cstr_info);
-	
-	/* Writing Psot in SOT marker */
-	totlen = cio_tell(cio) + l - j2k->sot_start;
-	cio_seek(cio, j2k->sot_start + 6);
-	cio_write(cio, totlen, 4);
-	cio_seek(cio, j2k->sot_start + totlen);
-	/* Writing Ttlm and Ptlm in TLM marker */
-	if(cp->cinema){
-		cio_seek(cio, j2k->tlm_start + 6 + (5*j2k->cur_tp_num));
-		cio_write(cio, j2k->curtileno, 1);
-		cio_write(cio, totlen, 4);
-	}
-	cio_seek(cio, j2k->sot_start + totlen);
-}
-
-static void j2k_read_sod(opj_j2k_t *j2k) {
-	int len, truncate = 0, i;
-	unsigned char *data = NULL, *data_ptr = NULL;
-
-	opj_cio_t *cio = j2k->cio;
-	int curtileno = j2k->curtileno;
-
-	/* Index */
-	if (j2k->cstr_info) {
-		j2k->cstr_info->tile[j2k->curtileno].tp[j2k->cur_tp_num].tp_end_header =
-			cio_tell(cio) + j2k->pos_correction - 1;
-		if (j2k->cur_tp_num == 0)
-			j2k->cstr_info->tile[j2k->curtileno].end_header = cio_tell(cio) + j2k->pos_correction - 1;
-		j2k->cstr_info->packno = 0;
-	}
-	
-	len = int_min(j2k->eot - cio_getbp(cio), cio_numbytesleft(cio) + 1);
-
-	if (len == cio_numbytesleft(cio) + 1) {
-		truncate = 1;		/* Case of a truncate codestream */
-	}	
-
-	data = j2k->tile_data[curtileno];
-	data = (unsigned char*) opj_realloc(data, (j2k->tile_len[curtileno] + len) * sizeof(unsigned char));
-
-	data_ptr = data + j2k->tile_len[curtileno];
-	for (i = 0; i < len; i++) {
-		data_ptr[i] = cio_read(cio, 1);
-	}
-
-	j2k->tile_len[curtileno] += len;
-	j2k->tile_data[curtileno] = data;
-	
-	if (!truncate) {
-		j2k->state = J2K_STATE_TPHSOT;
-	} else {
-		j2k->state = J2K_STATE_NEOC;	/* RAJOUTE !! */
-	}
-	j2k->cur_tp_num++;
-}
-
-/**
- * Reads a SOD marker (Start Of Data)
- *
- * @param	p_header_data	the data contained in the SOD box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the SOD marker.
- * @param	p_manager		the user event manager.
-*/
-opj_bool j2k_read_sod_v2 (
-						opj_j2k_v2_t *p_j2k,
-						struct opj_stream_private *p_stream,
-						struct opj_event_mgr * p_manager
-					)
-{
-	OPJ_UINT32 l_current_read_size;
-	opj_codestream_index_t * l_cstr_index = 00;
-	OPJ_BYTE ** l_current_data = 00;
-	opj_tcp_v2_t * l_tcp = 00;
-	OPJ_UINT32 * l_tile_len = 00;
-	opj_bool l_sot_length_pb_detected = OPJ_FALSE;
-
-	/* preconditions */
-	assert(p_j2k != 00);
-	assert(p_manager != 00);
-	assert(p_stream != 00);
-
-	l_tcp = &(p_j2k->m_cp.tcps[p_j2k->m_current_tile_number]);
-
-	if (p_j2k->m_specific_param.m_decoder.m_last_tile_part) {
-		// opj_stream_get_number_byte_left returns OPJ_OFF_T
-		// but we are in the last tile part,
-		// so its result will fit on OPJ_UINT32 unless we find
-		// a file with a single tile part of more than 4 GB...
-		p_j2k->m_specific_param.m_decoder.m_sot_length = (OPJ_UINT32)(opj_stream_get_number_byte_left(p_stream) - 2);
-	}
-	else
-	{
-		/* Check to avoid pass the limit of OPJ_UINT32 */
-		if (p_j2k->m_specific_param.m_decoder.m_sot_length >= 2 )
-			p_j2k->m_specific_param.m_decoder.m_sot_length -= 2;
-		else {
-			/* MSD: case commented for the moment to support new PHR data */
-			/*opj_event_msg_v2(p_manager, EVT_ERROR, "SOT length is incoherent\n");
-			return OPJ_FALSE;*/
-		}
-	}
-
-
-	l_current_data = &(l_tcp->m_data);
-	l_tile_len = &l_tcp->m_data_size;
-
-	/* Patch to support new PHR data */
-	if (p_j2k->m_specific_param.m_decoder.m_sot_length) {
-		if (! *l_current_data) {
-			*l_current_data = (OPJ_BYTE*) opj_malloc(p_j2k->m_specific_param.m_decoder.m_sot_length);
-		}
-		else {
-		*l_current_data = (OPJ_BYTE*) opj_realloc(*l_current_data, *l_tile_len + p_j2k->m_specific_param.m_decoder.m_sot_length);
-		}
-
-		if (*l_current_data == 00) {
-			opj_event_msg_v2(p_manager, EVT_ERROR, "Cannot decode tile: problem while reading SOD marker!\n");
-			return OPJ_FALSE;
-		}
-	}
-	else {
-		l_sot_length_pb_detected = OPJ_TRUE;
-	}
-
-	/* Index */
-	l_cstr_index = p_j2k->cstr_index;
-	if (l_cstr_index) {
-		OPJ_OFF_T l_current_pos = opj_stream_tell(p_stream) - 2;
-
-		OPJ_UINT32 l_current_tile_part = l_cstr_index->tile_index[p_j2k->m_current_tile_number].current_tpsno;
-		l_cstr_index->tile_index[p_j2k->m_current_tile_number].tp_index[l_current_tile_part].end_header =
-				l_current_pos;
-		l_cstr_index->tile_index[p_j2k->m_current_tile_number].tp_index[l_current_tile_part].end_pos =
-				l_current_pos + p_j2k->m_specific_param.m_decoder.m_sot_length + 2;
-
-		j2k_add_tlmarker_v2(p_j2k->m_current_tile_number,
-							l_cstr_index,
-							J2K_MS_SOD,
-							l_current_pos,
-							p_j2k->m_specific_param.m_decoder.m_sot_length + 2);
-
-		/*l_cstr_index->packno = 0;*/
-	}
-
-	/* Patch to support new PHR data */
-	if (!l_sot_length_pb_detected)
-	{
-		l_current_read_size = opj_stream_read_data(	p_stream,
-													*l_current_data + *l_tile_len,
-													p_j2k->m_specific_param.m_decoder.m_sot_length,
-													p_manager);
-	}
-	else {
-		l_current_read_size = 0;
-	}
-
-
-	if (l_current_read_size != p_j2k->m_specific_param.m_decoder.m_sot_length) {
-		p_j2k->m_specific_param.m_decoder.m_state = J2K_STATE_NEOC;
-	}
-	else {
-		p_j2k->m_specific_param.m_decoder.m_state = J2K_STATE_TPHSOT;
-	}
-
-	*l_tile_len +=  l_current_read_size;
-
-	return OPJ_TRUE;
-}
-
-
-static void j2k_write_rgn(opj_j2k_t *j2k, int compno, int tileno) {
-	opj_cp_t *cp = j2k->cp;
-	opj_tcp_t *tcp = &cp->tcps[tileno];
-	opj_cio_t *cio = j2k->cio;
-	int numcomps = j2k->image->numcomps;
-	
-	cio_write(cio, J2K_MS_RGN, 2);						/* RGN  */
-	cio_write(cio, numcomps <= 256 ? 5 : 6, 2);			/* Lrgn */
-	cio_write(cio, compno, numcomps <= 256 ? 1 : 2);	/* Crgn */
-	cio_write(cio, 0, 1);								/* Srgn */
-	cio_write(cio, tcp->tccps[compno].roishift, 1);		/* SPrgn */
-}
-
-static void j2k_read_rgn(opj_j2k_t *j2k) {
-	int len, compno, roisty;
-
-	opj_cp_t *cp = j2k->cp;
-	opj_tcp_t *tcp = j2k->state == J2K_STATE_TPH ? &cp->tcps[j2k->curtileno] : j2k->default_tcp;
-	opj_cio_t *cio = j2k->cio;
-	int numcomps = j2k->image->numcomps;
-
-	len = cio_read(cio, 2);										/* Lrgn */
-	compno = cio_read(cio, numcomps <= 256 ? 1 : 2);			/* Crgn */
-	roisty = cio_read(cio, 1);									/* Srgn */
-
-#ifdef USE_JPWL
-	if (j2k->cp->correct) {
-		/* totlen is negative or larger than the bytes left!!! */
-		if (compno >= numcomps) {
-			opj_event_msg(j2k->cinfo, EVT_ERROR,
-				"JPWL: bad component number in RGN (%d when there are only %d)\n",
-				compno, numcomps);
-			if (!JPWL_ASSUME || JPWL_ASSUME) {
-				opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
-				return;
-			}
-		}
-	};
-#endif /* USE_JPWL */
-
-	tcp->tccps[compno].roishift = cio_read(cio, 1);				/* SPrgn */
-}
-
-static void j2k_write_eoc(opj_j2k_t *j2k) {
-	opj_cio_t *cio = j2k->cio;
-	/* opj_event_msg(j2k->cinfo, "%.8x: EOC\n", cio_tell(cio) + j2k->pos_correction); */
-	cio_write(cio, J2K_MS_EOC, 2);
-
-/* UniPG>> */
-#ifdef USE_JPWL
-	/* update markers struct */
-	j2k_add_marker(j2k->cstr_info, J2K_MS_EOC, cio_tell(cio) - 2, 2);
-#endif /* USE_JPWL */
-/* <<UniPG */
-}
-
-/**
- * Reads a RGN marker (Region Of Interest)
- *
- * @param	p_header_data	the data contained in the POC box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the POC marker.
- * @param	p_manager		the user event manager.
-*/
-opj_bool j2k_read_rgn_v2 (
-						opj_j2k_v2_t *p_j2k,
-						OPJ_BYTE * p_header_data,
-						OPJ_UINT32 p_header_size,
-						struct opj_event_mgr * p_manager
-					)
-{
-	OPJ_UINT32 l_nb_comp;
-	opj_image_t * l_image = 00;
-
-	opj_cp_v2_t *l_cp = 00;
-	opj_tcp_v2_t *l_tcp = 00;
-	OPJ_UINT32 l_comp_room, l_comp_no, l_roi_sty;
-
-	// preconditions
-	assert(p_header_data != 00);
-	assert(p_j2k != 00);
-	assert(p_manager != 00);
-
-	l_image = p_j2k->m_private_image;
-	l_nb_comp = l_image->numcomps;
-
-	if (l_nb_comp <= 256) {
-		l_comp_room = 1; }
-	else {
-		l_comp_room = 2; }
-
-	if (p_header_size != 2 + l_comp_room) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading RGN marker\n");
-		return OPJ_FALSE;
-	}
-
-	l_cp = &(p_j2k->m_cp);
-	l_tcp = (p_j2k->m_specific_param.m_decoder.m_state == J2K_STATE_TPH) ?
-				&l_cp->tcps[p_j2k->m_current_tile_number] :
-				p_j2k->m_specific_param.m_decoder.m_default_tcp;
-
-	opj_read_bytes(p_header_data,&l_comp_no,l_comp_room);		/* Crgn */
-	p_header_data+=l_comp_room;
-	opj_read_bytes(p_header_data,&l_roi_sty,1);					/* Srgn */
-	++p_header_data;
-
-#ifdef USE_JPWL
-	if (l_cp->correct) {
-		/* totlen is negative or larger than the bytes left!!! */
-		if (l_comp_room >= l_nb_comp) {
-			opj_event_msg_v2(p_manager, EVT_ERROR,
-				"JPWL: bad component number in RGN (%d when there are only %d)\n",
-				l_comp_room, l_nb_comp);
-			if (!JPWL_ASSUME || JPWL_ASSUME) {
-				opj_event_msg_v2(p_manager, EVT_ERROR, "JPWL: giving up\n");
-				return OPJ_FALSE;
-			}
-		}
-	};
-#endif /* USE_JPWL */
-
-	opj_read_bytes(p_header_data,(OPJ_UINT32 *) (&(l_tcp->tccps[l_comp_no].roishift)),1);	/* SPrgn */
-	++p_header_data;
-
-	return OPJ_TRUE;
-
-}
-
-static void j2k_read_eoc(opj_j2k_t *j2k) {
-	int i, tileno;
-	opj_bool success;
-
-	/* if packets should be decoded */
-	if (j2k->cp->limit_decoding != DECODE_ALL_BUT_PACKETS) {
-		opj_tcd_t *tcd = tcd_create(j2k->cinfo);
-		tcd_malloc_decode(tcd, j2k->image, j2k->cp);
-		for (i = 0; i < j2k->cp->tileno_size; i++) {
-			tcd_malloc_decode_tile(tcd, j2k->image, j2k->cp, i, j2k->cstr_info);
-			tileno = j2k->cp->tileno[i];
-			success = tcd_decode_tile(tcd, j2k->tile_data[tileno], j2k->tile_len[tileno], tileno, j2k->cstr_info);
-			opj_free(j2k->tile_data[tileno]);
-			j2k->tile_data[tileno] = NULL;
-			tcd_free_decode_tile(tcd, i);
-			if (success == OPJ_FALSE) {
-				j2k->state |= J2K_STATE_ERR;
-				break;
-			}
-		}
-		tcd_free_decode(tcd);
-		tcd_destroy(tcd);
-	}
-	/* if packets should not be decoded  */
-	else {
-		for (i = 0; i < j2k->cp->tileno_size; i++) {
-			tileno = j2k->cp->tileno[i];
-			opj_free(j2k->tile_data[tileno]);
-			j2k->tile_data[tileno] = NULL;
-		}
-	}	
-	if (j2k->state & J2K_STATE_ERR)
-		j2k->state = J2K_STATE_MT + J2K_STATE_ERR;
-	else
-		j2k->state = J2K_STATE_MT; 
-}
-
-/**
- * Reads a EOC marker (End Of Codestream)
- *
- * @param	p_header_data	the data contained in the SOD box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the SOD marker.
- * @param	p_manager		the user event manager.
-*/
-opj_bool j2k_read_eoc_v2 (	opj_j2k_v2_t *p_j2k,
-							struct opj_stream_private *p_stream,
-							struct opj_event_mgr * p_manager )
-{
-	OPJ_UINT32 i;
-	opj_tcd_v2_t * l_tcd = 00;
-	OPJ_UINT32 l_nb_tiles;
-	opj_tcp_v2_t * l_tcp = 00;
-	opj_bool l_success;
-
-	/* preconditions */
-	assert(p_j2k != 00);
-	assert(p_manager != 00);
-	assert(p_stream != 00);
-
-	l_nb_tiles = p_j2k->m_cp.th * p_j2k->m_cp.tw;
-	l_tcp = p_j2k->m_cp.tcps;
-
-	l_tcd = tcd_create_v2(OPJ_TRUE);
-	if (l_tcd == 00) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Cannot decode tile, memory error\n");
-		return OPJ_FALSE;
-	}
-
-	for (i = 0; i < l_nb_tiles; ++i) {
-		if (l_tcp->m_data) {
-			if (! tcd_init_decode_tile(l_tcd, i)) {
-				tcd_destroy_v2(l_tcd);
-				opj_event_msg_v2(p_manager, EVT_ERROR, "Cannot decode tile, memory error\n");
-				return OPJ_FALSE;
-			}
-
-			l_success = tcd_decode_tile_v2(l_tcd, l_tcp->m_data, l_tcp->m_data_size, i, p_j2k->cstr_index);
-			/* cleanup */
-
-			if (! l_success) {
-				p_j2k->m_specific_param.m_decoder.m_state |= J2K_STATE_ERR;
-				break;
-			}
-		}
-
-		j2k_tcp_destroy(l_tcp);
-		++l_tcp;
-	}
-
-	tcd_destroy_v2(l_tcd);
-	return OPJ_TRUE;
-}
-
-typedef struct opj_dec_mstabent {
-	/** marker value */
-	int id;
-	/** value of the state when the marker can appear */
-	int states;
-	/** action linked to the marker */
-	void (*handler) (opj_j2k_t *j2k);
-} opj_dec_mstabent_t;
-
-opj_dec_mstabent_t j2k_dec_mstab[] = {
-  {J2K_MS_SOC, J2K_STATE_MHSOC, j2k_read_soc},
-  {J2K_MS_SOT, J2K_STATE_MH | J2K_STATE_TPHSOT, j2k_read_sot},
-  {J2K_MS_SOD, J2K_STATE_TPH, j2k_read_sod},
-  {J2K_MS_EOC, J2K_STATE_TPHSOT, j2k_read_eoc},
-  {J2K_MS_SIZ, J2K_STATE_MHSIZ, j2k_read_siz},
-  {J2K_MS_COD, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_cod},
-  {J2K_MS_COC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_coc},
-  {J2K_MS_RGN, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_rgn},
-  {J2K_MS_QCD, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_qcd},
-  {J2K_MS_QCC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_qcc},
-  {J2K_MS_POC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_poc},
-  {J2K_MS_TLM, J2K_STATE_MH, j2k_read_tlm},
-  {J2K_MS_PLM, J2K_STATE_MH, j2k_read_plm},
-  {J2K_MS_PLT, J2K_STATE_TPH, j2k_read_plt},
-  {J2K_MS_PPM, J2K_STATE_MH, j2k_read_ppm},
-  {J2K_MS_PPT, J2K_STATE_TPH, j2k_read_ppt},
-  {J2K_MS_SOP, 0, 0},
-  {J2K_MS_CRG, J2K_STATE_MH, j2k_read_crg},
-  {J2K_MS_COM, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_com},
-
-#ifdef USE_JPWL
-  {J2K_MS_EPC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_epc},
-  {J2K_MS_EPB, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_epb},
-  {J2K_MS_ESD, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_esd},
-  {J2K_MS_RED, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_red},
-#endif /* USE_JPWL */
-#ifdef USE_JPSEC
-  {J2K_MS_SEC, J2K_STATE_MH, j2k_read_sec},
-  {J2K_MS_INSEC, 0, j2k_read_insec},
-#endif /* USE_JPSEC */
-
-  {0, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_unk}
-};
-
-static void j2k_read_unk(opj_j2k_t *j2k) {
-	opj_event_msg(j2k->cinfo, EVT_WARNING, "Unknown marker\n");
-
-#ifdef USE_JPWL
-	if (j2k->cp->correct) {
-		int m = 0, id, i;
-		int min_id = 0, min_dist = 17, cur_dist = 0, tmp_id;
-		cio_seek(j2k->cio, cio_tell(j2k->cio) - 2);
-		id = cio_read(j2k->cio, 2);
-		opj_event_msg(j2k->cinfo, EVT_ERROR,
-			"JPWL: really don't know this marker %x\n",
-			id);
-		if (!JPWL_ASSUME) {
-			opj_event_msg(j2k->cinfo, EVT_ERROR,
-				"- possible synch loss due to uncorrectable codestream errors => giving up\n");
-			return;
-		}
-		/* OK, activate this at your own risk!!! */
-		/* we look for the marker at the minimum hamming distance from this */
-		while (j2k_dec_mstab[m].id) {
-			
-			/* 1's where they differ */
-			tmp_id = j2k_dec_mstab[m].id ^ id;
-
-			/* compute the hamming distance between our id and the current */
-			cur_dist = 0;
-			for (i = 0; i < 16; i++) {
-				if ((tmp_id >> i) & 0x0001) {
-					cur_dist++;
-				}
-			}
-
-			/* if current distance is smaller, set the minimum */
-			if (cur_dist < min_dist) {
-				min_dist = cur_dist;
-				min_id = j2k_dec_mstab[m].id;
-			}
-			
-			/* jump to the next marker */
-			m++;
-		}
-
-		/* do we substitute the marker? */
-		if (min_dist < JPWL_MAXIMUM_HAMMING) {
-			opj_event_msg(j2k->cinfo, EVT_ERROR,
-				"- marker %x is at distance %d from the read %x\n",
-				min_id, min_dist, id);
-			opj_event_msg(j2k->cinfo, EVT_ERROR,
-				"- trying to substitute in place and crossing fingers!\n");
-			cio_seek(j2k->cio, cio_tell(j2k->cio) - 2);
-			cio_write(j2k->cio, min_id, 2);
-
-			/* rewind */
-			cio_seek(j2k->cio, cio_tell(j2k->cio) - 2);
-
-		}
-
-	};
-#endif /* USE_JPWL */
-
-}
-
-/**
- * Reads an unknown marker
- *
- * @param	p_stream				the stream object to read from.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_manager		the user event manager.
- *
- * @return	true			if the marker could be deduced.
-*/
-opj_bool j2k_read_unk_v2 (	opj_j2k_v2_t *p_j2k,
-							struct opj_stream_private *p_stream,
-							OPJ_UINT32 *output_marker,
-							struct opj_event_mgr * p_manager
-							)
-{
-	OPJ_UINT32 l_unknown_marker;
-	const opj_dec_memory_marker_handler_t * l_marker_handler;
-	OPJ_UINT32 l_size_unk = 2;
-
-	// preconditions
-	assert(p_j2k != 00);
-	assert(p_manager != 00);
-	assert(p_stream != 00);
-
-	opj_event_msg_v2(p_manager, EVT_WARNING, "Unknown marker\n");
-
-	while(1) {
-		// Try to read 2 bytes (the next marker ID) from stream and copy them into the buffer
-		if (opj_stream_read_data(p_stream,p_j2k->m_specific_param.m_decoder.m_header_data,2,p_manager) != 2) {
-			opj_event_msg_v2(p_manager, EVT_ERROR, "Stream too short\n");
-			return OPJ_FALSE;
-		}
-
-		// read 2 bytes as the new marker ID
-		opj_read_bytes(p_j2k->m_specific_param.m_decoder.m_header_data,&l_unknown_marker,2);
-
-		if (!(l_unknown_marker < 0xff00)) {
-
-			// Get the marker handler from the marker ID
-			l_marker_handler = j2k_get_marker_handler(l_unknown_marker);
-
-			if (!(p_j2k->m_specific_param.m_decoder.m_state & l_marker_handler->states)) {
-				opj_event_msg_v2(p_manager, EVT_ERROR, "Marker is not compliant with its position\n");
-				return OPJ_FALSE;
-			}
-			else {
-				if (l_marker_handler->id != J2K_MS_UNK) {
-					/* Add the marker to the codestream index*/
-					if (l_marker_handler->id != J2K_MS_SOT)
-						j2k_add_mhmarker_v2(p_j2k->cstr_index, J2K_MS_UNK,
-											(OPJ_UINT32) opj_stream_tell(p_stream) - l_size_unk,
-											l_size_unk);
-					break; /* next marker is known and well located */
-				}
-				else
-					l_size_unk += 2;
-			}
-		}
-	}
-
-	*output_marker = l_marker_handler->id ;
-
-	return OPJ_TRUE;
-}
-
-/**
-Read the lookup table containing all the marker, status and action
-@param id Marker value
-*/
-static opj_dec_mstabent_t *j2k_dec_mstab_lookup(int id) {
-	opj_dec_mstabent_t *e;
-	for (e = j2k_dec_mstab; e->id != 0; e++) {
-		if (e->id == id) {
-			break;
-		}
-	}
-	return e;
-}
-
-
-/**
- * Reads a MCT marker (Multiple Component Transform)
- *
- * @param	p_header_data	the data contained in the MCT box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the MCT marker.
- * @param	p_manager		the user event manager.
-*/
-opj_bool j2k_read_mct (	opj_j2k_v2_t *p_j2k,
-						OPJ_BYTE * p_header_data,
-						OPJ_UINT32 p_header_size,
-						struct opj_event_mgr * p_manager )
-{
-	OPJ_UINT32 i;
-	opj_tcp_v2_t *l_tcp = 00;
-	OPJ_UINT32 l_tmp;
-	OPJ_UINT32 l_indix;
-	opj_mct_data_t * l_mct_data;
-
-	/* preconditions */
-	assert(p_header_data != 00);
-	assert(p_j2k != 00);
-
-	l_tcp = p_j2k->m_specific_param.m_decoder.m_state == J2K_STATE_TPH ?
-			&p_j2k->m_cp.tcps[p_j2k->m_current_tile_number] :
-			p_j2k->m_specific_param.m_decoder.m_default_tcp;
-
-	if (p_header_size < 2) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading MCT marker\n");
-		return OPJ_FALSE;
-	}
-
-	/* first marker */
-	opj_read_bytes(p_header_data,&l_tmp,2);				/* Zmct */
-	p_header_data += 2;
-	if (l_tmp != 0) {
-		opj_event_msg_v2(p_manager, EVT_WARNING, "Cannot take in charge mct data within multiple MCT records\n");
-		return OPJ_TRUE;
-	}
-
-	if(p_header_size <= 6) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading MCT marker\n");
-		return OPJ_FALSE;
-	}
-
-	/* Imct -> no need for other values, take the first, type is double with decorrelation x0000 1101 0000 0000*/
-	opj_read_bytes(p_header_data,&l_tmp,2); 			/* Imct */
-	p_header_data += 2;
-
-	l_indix = l_tmp & 0xff;
-	l_mct_data = l_tcp->m_mct_records;
-
-	for (i=0;i<l_tcp->m_nb_mct_records;++i) {
-		if (l_mct_data->m_index == l_indix) {
-			break;
-		}
-		++l_mct_data;
-	}
-
-	/* NOT FOUND */
-	if (i == l_tcp->m_nb_mct_records) {
-		if (l_tcp->m_nb_mct_records == l_tcp->m_nb_max_mct_records) {
-			l_tcp->m_nb_max_mct_records += J2K_MCT_DEFAULT_NB_RECORDS;
-
-			l_tcp->m_mct_records = (opj_mct_data_t*)opj_realloc(l_tcp->m_mct_records,l_tcp->m_nb_max_mct_records * sizeof(opj_mct_data_t));
-			if(! l_tcp->m_mct_records) {
-				opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading MCT marker\n");
-				return OPJ_FALSE;
-			}
-
-			l_mct_data = l_tcp->m_mct_records + l_tcp->m_nb_mct_records;
-			memset(l_mct_data ,0,(l_tcp->m_nb_max_mct_records - l_tcp->m_nb_mct_records) * sizeof(opj_mct_data_t));
-		}
-
-		l_mct_data = l_tcp->m_mct_records + l_tcp->m_nb_mct_records;
-	}
-
-	if (l_mct_data->m_data) {
-		opj_free(l_mct_data->m_data);
-		l_mct_data->m_data = 00;
-	}
-
-	l_mct_data->m_index = l_indix;
-	l_mct_data->m_array_type = (J2K_MCT_ARRAY_TYPE)((l_tmp  >> 8) & 3);
-	l_mct_data->m_element_type = (J2K_MCT_ELEMENT_TYPE)((l_tmp  >> 10) & 3);
-
-	opj_read_bytes(p_header_data,&l_tmp,2);				/* Ymct */
-	p_header_data+=2;
-	if (l_tmp != 0) {
-		opj_event_msg_v2(p_manager, EVT_WARNING, "Cannot take in charge multiple MCT markers\n");
-		return OPJ_TRUE;
-	}
-
-	p_header_size -= 6;
-
-	l_mct_data->m_data = (OPJ_BYTE*)opj_malloc(p_header_size);
-	if (! l_mct_data->m_data) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading MCT marker\n");
-		return OPJ_FALSE;
-	}
-	memcpy(l_mct_data->m_data,p_header_data,p_header_size);
-
-	l_mct_data->m_data_size = p_header_size;
-	++l_tcp->m_nb_mct_records;
-
-	return OPJ_TRUE;
-}
-
-/**
- * Reads a MCC marker (Multiple Component Collection)
- *
- * @param	p_header_data	the data contained in the MCC box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the MCC marker.
- * @param	p_manager		the user event manager.
-*/
-opj_bool j2k_read_mcc (	opj_j2k_v2_t *p_j2k,
-					OPJ_BYTE * p_header_data,
-					OPJ_UINT32 p_header_size,
-					struct opj_event_mgr * p_manager )
-{
-	OPJ_UINT32 i,j;
-	OPJ_UINT32 l_tmp;
-	OPJ_UINT32 l_indix;
-	opj_tcp_v2_t * l_tcp;
-	opj_simple_mcc_decorrelation_data_t * l_mcc_record;
-	opj_mct_data_t * l_mct_data;
-	OPJ_UINT32 l_nb_collections;
-	OPJ_UINT32 l_nb_comps;
-	OPJ_UINT32 l_nb_bytes_by_comp;
-
-
-	/* preconditions */
-	assert(p_header_data != 00);
-	assert(p_j2k != 00);
-	assert(p_manager != 00);
-
-	l_tcp = p_j2k->m_specific_param.m_decoder.m_state == J2K_STATE_TPH ?
-			&p_j2k->m_cp.tcps[p_j2k->m_current_tile_number] :
-			p_j2k->m_specific_param.m_decoder.m_default_tcp;
-
-	if (p_header_size < 2) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading MCC marker\n");
-		return OPJ_FALSE;
-	}
-
-	/* first marker */
-	opj_read_bytes(p_header_data,&l_tmp,2);				/* Zmcc */
-	p_header_data += 2;
-	if (l_tmp != 0) {
-		opj_event_msg_v2(p_manager, EVT_WARNING, "Cannot take in charge multiple data spanning\n");
-		return OPJ_TRUE;
-	}
-
-	if (p_header_size < 7) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading MCC marker\n");
-		return OPJ_FALSE;
-	}
-
-	opj_read_bytes(p_header_data,&l_indix,1); /* Imcc -> no need for other values, take the first */
-	++p_header_data;
-
-	l_mcc_record = l_tcp->m_mcc_records;
-
-	for(i=0;i<l_tcp->m_nb_mcc_records;++i) {
-		if (l_mcc_record->m_index == l_indix) {
-			break;
-		}
-		++l_mcc_record;
-	}
-
-	/** NOT FOUND */
-	if (i == l_tcp->m_nb_mcc_records) {
-		if (l_tcp->m_nb_mcc_records == l_tcp->m_nb_max_mcc_records) {
-			l_tcp->m_nb_max_mcc_records += J2K_MCC_DEFAULT_NB_RECORDS;
-
-			l_tcp->m_mcc_records = (opj_simple_mcc_decorrelation_data_t*)
-					opj_realloc(l_tcp->m_mcc_records,l_tcp->m_nb_max_mcc_records * sizeof(opj_simple_mcc_decorrelation_data_t));
-			if (! l_tcp->m_mcc_records) {
-				opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading MCC marker\n");
-				return OPJ_FALSE;
-			}
-			l_mcc_record = l_tcp->m_mcc_records + l_tcp->m_nb_mcc_records;
-			memset(l_mcc_record,0,(l_tcp->m_nb_max_mcc_records-l_tcp->m_nb_mcc_records) * sizeof(opj_simple_mcc_decorrelation_data_t));
-		}
-		l_mcc_record = l_tcp->m_mcc_records + l_tcp->m_nb_mcc_records;
-	}
-	l_mcc_record->m_index = l_indix;
-
-	/* only one marker atm */
-	opj_read_bytes(p_header_data,&l_tmp,2);				/* Ymcc */
-	p_header_data+=2;
-	if (l_tmp != 0) {
-		opj_event_msg_v2(p_manager, EVT_WARNING, "Cannot take in charge multiple data spanning\n");
-		return OPJ_TRUE;
-	}
-
-	opj_read_bytes(p_header_data,&l_nb_collections,2);				/* Qmcc -> number of collections -> 1 */
-	p_header_data+=2;
-
-	if (l_nb_collections > 1) {
-		opj_event_msg_v2(p_manager, EVT_WARNING, "Cannot take in charge multiple collections\n");
-		return OPJ_TRUE;
-	}
-
-	p_header_size -= 7;
-
-	for (i=0;i<l_nb_collections;++i) {
-		if (p_header_size < 3) {
-			opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading MCC marker\n");
-			return OPJ_FALSE;
-		}
-
-		opj_read_bytes(p_header_data,&l_tmp,1);	/* Xmcci type of component transformation -> array based decorrelation */
-		++p_header_data;
-
-		if (l_tmp != 1) {
-			opj_event_msg_v2(p_manager, EVT_WARNING, "Cannot take in charge collections other than array decorrelation\n");
-			return OPJ_TRUE;
-		}
-
-		opj_read_bytes(p_header_data,&l_nb_comps,2);
-
-		p_header_data+=2;
-		p_header_size-=3;
-
-		l_nb_bytes_by_comp = 1 + (l_nb_comps>>15);
-		l_mcc_record->m_nb_comps = l_nb_comps & 0x7fff;
-
-		if (p_header_size < (l_nb_bytes_by_comp * l_mcc_record->m_nb_comps + 2)) {
-			opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading MCC marker\n");
-			return OPJ_FALSE;
-		}
-
-		p_header_size -= (l_nb_bytes_by_comp * l_mcc_record->m_nb_comps + 2);
-
-		for (j=0;j<l_mcc_record->m_nb_comps;++j) {
-			opj_read_bytes(p_header_data,&l_tmp,l_nb_bytes_by_comp);	/* Cmccij Component offset*/
-			p_header_data+=l_nb_bytes_by_comp;
-
-			if (l_tmp != j) {
-				opj_event_msg_v2(p_manager, EVT_WARNING, "Cannot take in charge collections with indix shuffle\n");
-				return OPJ_TRUE;
-			}
-		}
-
-		opj_read_bytes(p_header_data,&l_nb_comps,2);
-		p_header_data+=2;
-
-		l_nb_bytes_by_comp = 1 + (l_nb_comps>>15);
-		l_nb_comps &= 0x7fff;
-
-		if (l_nb_comps != l_mcc_record->m_nb_comps) {
-			opj_event_msg_v2(p_manager, EVT_WARNING, "Cannot take in charge collections without same number of indixes\n");
-			return OPJ_TRUE;
-		}
-
-		if (p_header_size < (l_nb_bytes_by_comp * l_mcc_record->m_nb_comps + 3)) {
-			opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading MCC marker\n");
-			return OPJ_FALSE;
-		}
-
-		p_header_size -= (l_nb_bytes_by_comp * l_mcc_record->m_nb_comps + 3);
-
-		for (j=0;j<l_mcc_record->m_nb_comps;++j) {
-			opj_read_bytes(p_header_data,&l_tmp,l_nb_bytes_by_comp);	/* Wmccij Component offset*/
-			p_header_data+=l_nb_bytes_by_comp;
-
-			if (l_tmp != j) {
-				opj_event_msg_v2(p_manager, EVT_WARNING, "Cannot take in charge collections with indix shuffle\n");
-				return OPJ_TRUE;
-			}
-		}
-
-		opj_read_bytes(p_header_data,&l_tmp,3);	/* Wmccij Component offset*/
-		p_header_data += 3;
-
-		l_mcc_record->m_is_irreversible = ! ((l_tmp>>16) & 1);
-		l_mcc_record->m_decorrelation_array = 00;
-		l_mcc_record->m_offset_array = 00;
-
-		l_indix = l_tmp & 0xff;
-		if (l_indix != 0) {
-			l_mct_data = l_tcp->m_mct_records;
-			for (j=0;j<l_tcp->m_nb_mct_records;++j) {
-				if (l_mct_data->m_index == l_indix) {
-					l_mcc_record->m_decorrelation_array = l_mct_data;
-					break;
-				}
-				++l_mct_data;
-			}
-
-			if (l_mcc_record->m_decorrelation_array == 00) {
-				opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading MCC marker\n");
-				return OPJ_FALSE;
-			}
-		}
-
-		l_indix = (l_tmp >> 8) & 0xff;
-		if (l_indix != 0) {
-			l_mct_data = l_tcp->m_mct_records;
-			for (j=0;j<l_tcp->m_nb_mct_records;++j) {
-				if (l_mct_data->m_index == l_indix) {
-					l_mcc_record->m_offset_array = l_mct_data;
-					break;
-				}
-				++l_mct_data;
-			}
-
-			if (l_mcc_record->m_offset_array == 00) {
-				opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading MCC marker\n");
-				return OPJ_FALSE;
-			}
-		}
-	}
-
-	if (p_header_size != 0) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading MCC marker\n");
-		return OPJ_FALSE;
-	}
-
-	++l_tcp->m_nb_mcc_records;
-
-	return OPJ_TRUE;
-}
-
-/**
- * Reads a MCO marker (Multiple Component Transform Ordering)
- *
- * @param	p_header_data	the data contained in the MCO box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the MCO marker.
- * @param	p_manager		the user event manager.
-*/
-opj_bool j2k_read_mco (	opj_j2k_v2_t *p_j2k,
-						OPJ_BYTE * p_header_data,
-						OPJ_UINT32 p_header_size,
-						struct opj_event_mgr * p_manager )
-{
-	OPJ_UINT32 l_tmp, i;
-	OPJ_UINT32 l_nb_stages;
-	opj_tcp_v2_t * l_tcp;
-	opj_tccp_t * l_tccp;
-	opj_image_t * l_image;
-	opj_image_comp_t * l_img_comp;
-
-	/* preconditions */
-	assert(p_header_data != 00);
-	assert(p_j2k != 00);
-	assert(p_manager != 00);
-
-	l_image = p_j2k->m_private_image;
-	l_tcp = p_j2k->m_specific_param.m_decoder.m_state == J2K_STATE_TPH ?
-			&p_j2k->m_cp.tcps[p_j2k->m_current_tile_number] :
-			p_j2k->m_specific_param.m_decoder.m_default_tcp;
-
-	if (p_header_size < 1) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading MCO marker\n");
-		return OPJ_FALSE;
-	}
-
-	opj_read_bytes(p_header_data,&l_nb_stages,1);				/* Nmco : only one tranform stage*/
-	++p_header_data;
-
-	if (l_nb_stages > 1) {
-		opj_event_msg_v2(p_manager, EVT_WARNING, "Cannot take in charge multiple transformation stages.\n");
-		return OPJ_TRUE;
-	}
-
-	if (p_header_size != l_nb_stages + 1) {
-		opj_event_msg_v2(p_manager, EVT_WARNING, "Error reading MCO marker\n");
-		return OPJ_FALSE;
-	}
-
-	l_tccp = l_tcp->tccps;
-	l_img_comp = l_image->comps;
-
-	for (i=0;i<l_image->numcomps;++i) {
-		l_tccp->m_dc_level_shift = 0;
-		++l_tccp;
-	}
-
-	if (l_tcp->m_mct_decoding_matrix) {
-		opj_free(l_tcp->m_mct_decoding_matrix);
-		l_tcp->m_mct_decoding_matrix = 00;
-	}
-
-	for (i=0;i<l_nb_stages;++i) {
-		opj_read_bytes(p_header_data,&l_tmp,1);
-		++p_header_data;
-
-		if (! j2k_add_mct(l_tcp,p_j2k->m_private_image,l_tmp)) {
-			return OPJ_FALSE;
-		}
-	}
-
-	return OPJ_TRUE;
-}
-
-opj_bool j2k_add_mct(opj_tcp_v2_t * p_tcp, opj_image_t * p_image, OPJ_UINT32 p_index)
-{
-	OPJ_UINT32 i;
-	opj_simple_mcc_decorrelation_data_t * l_mcc_record;
-	opj_mct_data_t * l_deco_array, * l_offset_array;
-	OPJ_UINT32 l_data_size,l_mct_size, l_offset_size;
-	OPJ_UINT32 l_nb_elem;
-	OPJ_UINT32 * l_offset_data, * l_current_offset_data;
-	opj_tccp_t * l_tccp;
-
-	/* preconditions */
-	assert(p_tcp != 00);
-
-	l_mcc_record = p_tcp->m_mcc_records;
-
-	for (i=0;i<p_tcp->m_nb_mcc_records;++i) {
-		if (l_mcc_record->m_index == p_index) {
-			break;
-		}
-	}
-
-	if (i==p_tcp->m_nb_mcc_records) {
-		/** element discarded **/
-		return OPJ_TRUE;
-	}
-
-	if (l_mcc_record->m_nb_comps != p_image->numcomps) {
-		/** do not support number of comps != image */
-		return OPJ_TRUE;
-	}
-
-	l_deco_array = l_mcc_record->m_decorrelation_array;
-
-	if (l_deco_array) {
-		l_data_size = MCT_ELEMENT_SIZE[l_deco_array->m_element_type] * p_image->numcomps * p_image->numcomps;
-		if (l_deco_array->m_data_size != l_data_size) {
-			return OPJ_FALSE;
-		}
-
-		l_nb_elem = p_image->numcomps * p_image->numcomps;
-		l_mct_size = l_nb_elem * sizeof(OPJ_FLOAT32);
-		p_tcp->m_mct_decoding_matrix = (OPJ_FLOAT32*)opj_malloc(l_mct_size);
-
-		if (! p_tcp->m_mct_decoding_matrix ) {
-			return OPJ_FALSE;
-		}
-
-		j2k_mct_read_functions_to_float[l_deco_array->m_element_type](l_deco_array->m_data,p_tcp->m_mct_decoding_matrix,l_nb_elem);
-	}
-
-	l_offset_array = l_mcc_record->m_offset_array;
-
-	if (l_offset_array) {
-		l_data_size = MCT_ELEMENT_SIZE[l_offset_array->m_element_type] * p_image->numcomps;
-		if (l_offset_array->m_data_size != l_data_size) {
-			return OPJ_FALSE;
-		}
-
-		l_nb_elem = p_image->numcomps;
-		l_offset_size = l_nb_elem * sizeof(OPJ_UINT32);
-		l_offset_data = (OPJ_UINT32*)opj_malloc(l_offset_size);
-
-		if (! l_offset_data ) {
-			return OPJ_FALSE;
-		}
-
-		j2k_mct_read_functions_to_int32[l_offset_array->m_element_type](l_offset_array->m_data,l_offset_data,l_nb_elem);
-
-		l_tccp = p_tcp->tccps;
-		l_current_offset_data = l_offset_data;
-
-		for (i=0;i<p_image->numcomps;++i) {
-			l_tccp->m_dc_level_shift = *(l_current_offset_data++);
-			++l_tccp;
-		}
-
-		opj_free(l_offset_data);
-	}
-
-	return OPJ_TRUE;
-}
-
-/**
- * Reads a CBD marker (Component bit depth definition)
- * @param	p_header_data	the data contained in the CBD box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the CBD marker.
- * @param	p_manager		the user event manager.
-*/
-opj_bool j2k_read_cbd (	opj_j2k_v2_t *p_j2k,
-						OPJ_BYTE * p_header_data,
-						OPJ_UINT32 p_header_size,
-						struct opj_event_mgr * p_manager)
-{
-	OPJ_UINT32 l_nb_comp,l_num_comp;
-	OPJ_UINT32 l_comp_def;
-	OPJ_UINT32 i;
-	opj_image_comp_t * l_comp = 00;
-
-	/* preconditions */
-	assert(p_header_data != 00);
-	assert(p_j2k != 00);
-	assert(p_manager != 00);
-
-	l_num_comp = p_j2k->m_private_image->numcomps;
-
-	if (p_header_size != (p_j2k->m_private_image->numcomps + 2)) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Crror reading CBD marker\n");
-		return OPJ_FALSE;
-	}
-
-	opj_read_bytes(p_header_data,&l_nb_comp,2);				/* Ncbd */
-	p_header_data+=2;
-
-	if (l_nb_comp != l_num_comp) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Crror reading CBD marker\n");
-		return OPJ_FALSE;
-	}
-
-	l_comp = p_j2k->m_private_image->comps;
-	for (i=0;i<l_num_comp;++i) {
-		opj_read_bytes(p_header_data,&l_comp_def,1);			/* Component bit depth */
-		++p_header_data;
-        l_comp->sgnd = (l_comp_def>>7) & 1;
-		l_comp->prec = (l_comp_def&0x7f) + 1;
-		++l_comp;
-	}
-
-	return OPJ_TRUE;
-}
-
-
-/* ----------------------------------------------------------------------- */
-/* J2K / JPT decoder interface                                             */
-/* ----------------------------------------------------------------------- */
-
-opj_j2k_t* j2k_create_decompress(opj_common_ptr cinfo) {
-	opj_j2k_t *j2k = (opj_j2k_t*) opj_calloc(1, sizeof(opj_j2k_t));
-	if(!j2k)
-		return NULL;
-
-	j2k->default_tcp = (opj_tcp_t*) opj_calloc(1, sizeof(opj_tcp_t));
-	if(!j2k->default_tcp) {
-		opj_free(j2k);
-		return NULL;
-	}
-
-	j2k->cinfo = cinfo;
-	j2k->tile_data = NULL;
-
-	return j2k;
-}
-
-void j2k_destroy_decompress(opj_j2k_t *j2k) {
-	int i = 0;
-
-	if(j2k->tile_len != NULL) {
-		opj_free(j2k->tile_len);
-	}
-	if(j2k->tile_data != NULL) {
-		opj_free(j2k->tile_data);
-	}
-	if(j2k->default_tcp != NULL) {
-		opj_tcp_t *default_tcp = j2k->default_tcp;
-		if(default_tcp->ppt_data_first != NULL) {
-			opj_free(default_tcp->ppt_data_first);
-		}
-		if(j2k->default_tcp->tccps != NULL) {
-			opj_free(j2k->default_tcp->tccps);
-		}
-		opj_free(j2k->default_tcp);
-	}
-	if(j2k->cp != NULL) {
-		opj_cp_t *cp = j2k->cp;
-		if(cp->tcps != NULL) {
-			for(i = 0; i < cp->tw * cp->th; i++) {
-				if(cp->tcps[i].ppt_data_first != NULL) {
-					opj_free(cp->tcps[i].ppt_data_first);
-				}
-				if(cp->tcps[i].tccps != NULL) {
-					opj_free(cp->tcps[i].tccps);
-				}
-			}
-			opj_free(cp->tcps);
-		}
-		if(cp->ppm_data_first != NULL) {
-			opj_free(cp->ppm_data_first);
-		}
-		if(cp->tileno != NULL) {
-			opj_free(cp->tileno);  
-		}
-		if(cp->comment != NULL) {
-			opj_free(cp->comment);
-		}
-
-		opj_free(cp);
-	}
-	opj_free(j2k);
-}
-
-void j2k_setup_decoder(opj_j2k_t *j2k, opj_dparameters_t *parameters) {
-	if(j2k && parameters) {
-		/* create and initialize the coding parameters structure */
-		opj_cp_t *cp = (opj_cp_t*) opj_calloc(1, sizeof(opj_cp_t));
-		cp->reduce = parameters->cp_reduce;	
-		cp->layer = parameters->cp_layer;
-		cp->limit_decoding = parameters->cp_limit_decoding;
-
-#ifdef USE_JPWL
-		cp->correct = parameters->jpwl_correct;
-		cp->exp_comps = parameters->jpwl_exp_comps;
-		cp->max_tiles = parameters->jpwl_max_tiles;
-#endif /* USE_JPWL */
-
-
-		/* keep a link to cp so that we can destroy it later in j2k_destroy_decompress */
-		j2k->cp = cp;
-	}
-}
-
-void j2k_setup_decoder_v2(opj_j2k_v2_t *j2k, opj_dparameters_t *parameters)
-{
-	if(j2k && parameters) {
-		j2k->m_cp.m_specific_param.m_dec.m_layer = parameters->cp_layer;
-		j2k->m_cp.m_specific_param.m_dec.m_reduce = parameters->cp_reduce;
-
-#ifdef USE_JPWL
-		j2k->m_cp.correct = parameters->jpwl_correct;
-		j2k->m_cp.exp_comps = parameters->jpwl_exp_comps;
-		j2k->m_cp.max_tiles = parameters->jpwl_max_tiles;
-#endif /* USE_JPWL */
-	}
-}
-
-opj_image_t* j2k_decode(opj_j2k_t *j2k, opj_cio_t *cio, opj_codestream_info_t *cstr_info) {
-	opj_image_t *image = NULL;
-
-	opj_common_ptr cinfo = j2k->cinfo;	
-
-	j2k->cio = cio;
-	j2k->cstr_info = cstr_info;
-	if (cstr_info)
-		memset(cstr_info, 0, sizeof(opj_codestream_info_t));
-
-	/* create an empty image */
-	image = opj_image_create0();
-	j2k->image = image;
-
-	j2k->state = J2K_STATE_MHSOC;
-
-	for (;;) {
-		opj_dec_mstabent_t *e;
-		int id = cio_read(cio, 2);
-
-#ifdef USE_JPWL
-		/* we try to honor JPWL correction power */
-		if (j2k->cp->correct) {
-
-			int orig_pos = cio_tell(cio);
-			opj_bool status;
-
-			/* call the corrector */
-			status = jpwl_correct(j2k);
-
-			/* go back to where you were */
-			cio_seek(cio, orig_pos - 2);
-
-			/* re-read the marker */
-			id = cio_read(cio, 2);
-
-			/* check whether it begins with ff */
-			if (id >> 8 != 0xff) {
-				opj_event_msg(cinfo, EVT_ERROR,
-					"JPWL: possible bad marker %x at %d\n",
-					id, cio_tell(cio) - 2);
-				if (!JPWL_ASSUME) {
-					opj_image_destroy(image);
-					opj_event_msg(cinfo, EVT_ERROR, "JPWL: giving up\n");
-					return 0;
-				}
-				/* we try to correct */
-				id = id | 0xff00;
-				cio_seek(cio, cio_tell(cio) - 2);
-				cio_write(cio, id, 2);
-				opj_event_msg(cinfo, EVT_WARNING, "- trying to adjust this\n"
-					"- setting marker to %x\n",
-					id);
-			}
-
-		}
-#endif /* USE_JPWL */
-
-		if (id >> 8 != 0xff) {
-			opj_image_destroy(image);
-			opj_event_msg(cinfo, EVT_ERROR, "%.8x: expected a marker instead of %x\n", cio_tell(cio) - 2, id);
-			return 0;
-		}
-		e = j2k_dec_mstab_lookup(id);
-		// Check if the marker is known
-		if (!(j2k->state & e->states)) {
-			opj_image_destroy(image);
-			opj_event_msg(cinfo, EVT_ERROR, "%.8x: unexpected marker %x\n", cio_tell(cio) - 2, id);
-			return 0;
-		}
-		// Check if the decoding is limited to the main header
-		if (e->id == J2K_MS_SOT && j2k->cp->limit_decoding == LIMIT_TO_MAIN_HEADER) {
-			opj_event_msg(cinfo, EVT_INFO, "Main Header decoded.\n");
-			return image;
-		}		
-
-		if (e->handler) {
-			(*e->handler)(j2k);
-		}
-		if (j2k->state & J2K_STATE_ERR) 
-			return NULL;	
-
-		if (j2k->state == J2K_STATE_MT) {
-			break;
-		}
-		if (j2k->state == J2K_STATE_NEOC) {
-			break;
-		}
-	}
-	if (j2k->state == J2K_STATE_NEOC) {
-		j2k_read_eoc(j2k);
-	}
-
-	if (j2k->state != J2K_STATE_MT) {
-		opj_event_msg(cinfo, EVT_WARNING, "Incomplete bitstream\n");
-	}
-	return image;
-}
-
-/*
-* Read a JPT-stream and decode file
-*
-*/
-opj_image_t* j2k_decode_jpt_stream(opj_j2k_t *j2k, opj_cio_t *cio,  opj_codestream_info_t *cstr_info) {
-	opj_image_t *image = NULL;
-	opj_jpt_msg_header_t header;
-	int position;
-	opj_common_ptr cinfo = j2k->cinfo;
-
-	OPJ_ARG_NOT_USED(cstr_info);
-
-	j2k->cio = cio;
-
-	/* create an empty image */
-	image = opj_image_create0();
-	j2k->image = image;
-
-	j2k->state = J2K_STATE_MHSOC;
-	
-	/* Initialize the header */
-	jpt_init_msg_header(&header);
-	/* Read the first header of the message */
-	jpt_read_msg_header(cinfo, cio, &header);
-	
-	position = cio_tell(cio);
-	if (header.Class_Id != 6) {	/* 6 : Main header data-bin message */
-		opj_image_destroy(image);
-		opj_event_msg(cinfo, EVT_ERROR, "[JPT-stream] : Expecting Main header first [class_Id %d] !\n", header.Class_Id);
-		return 0;
-	}
-	
-	for (;;) {
-		opj_dec_mstabent_t *e = NULL;
-		int id;
-		
-		if (!cio_numbytesleft(cio)) {
-			j2k_read_eoc(j2k);
-			return image;
-		}
-		/* data-bin read -> need to read a new header */
-		if ((unsigned int) (cio_tell(cio) - position) == header.Msg_length) {
-			jpt_read_msg_header(cinfo, cio, &header);
-			position = cio_tell(cio);
-			if (header.Class_Id != 4) {	/* 4 : Tile data-bin message */
-				opj_image_destroy(image);
-				opj_event_msg(cinfo, EVT_ERROR, "[JPT-stream] : Expecting Tile info !\n");
-				return 0;
-			}
-		}
-		
-		id = cio_read(cio, 2);
-		if (id >> 8 != 0xff) {
-			opj_image_destroy(image);
-			opj_event_msg(cinfo, EVT_ERROR, "%.8x: expected a marker instead of %x\n", cio_tell(cio) - 2, id);
-			return 0;
-		}
-		e = j2k_dec_mstab_lookup(id);
-		if (!(j2k->state & e->states)) {
-			opj_image_destroy(image);
-			opj_event_msg(cinfo, EVT_ERROR, "%.8x: unexpected marker %x\n", cio_tell(cio) - 2, id);
-			return 0;
-		}
-		if (e->handler) {
-			(*e->handler)(j2k);
-		}
-		if (j2k->state == J2K_STATE_MT) {
-			break;
-		}
-		if (j2k->state == J2K_STATE_NEOC) {
-			break;
-		}
-	}
-	if (j2k->state == J2K_STATE_NEOC) {
-		j2k_read_eoc(j2k);
-	}
-	
-	if (j2k->state != J2K_STATE_MT) {
-		opj_event_msg(cinfo, EVT_WARNING, "Incomplete bitstream\n");
-	}
-
-	return image;
-}
-
-/* ----------------------------------------------------------------------- */
-/* J2K encoder interface                                                       */
-/* ----------------------------------------------------------------------- */
-
-opj_j2k_t* j2k_create_compress(opj_common_ptr cinfo) {
-	opj_j2k_t *j2k = (opj_j2k_t*) opj_calloc(1, sizeof(opj_j2k_t));
-	if(j2k) {
-		j2k->cinfo = cinfo;
-	}
-	return j2k;
-}
-
-opj_j2k_v2_t* j2k_create_compress_v2()
-{
-	opj_j2k_v2_t *l_j2k = (opj_j2k_v2_t*) opj_malloc(sizeof(opj_j2k_v2_t));
-	if (!l_j2k) {
-		return NULL;
-	}
-
-	memset(l_j2k,0,sizeof(opj_j2k_v2_t));
-
-	l_j2k->m_is_decoder = 0;
-	l_j2k->m_cp.m_is_decoder = 0;
-
-	l_j2k->m_specific_param.m_encoder.m_header_tile_data = (OPJ_BYTE *) opj_malloc(J2K_DEFAULT_HEADER_SIZE);
-	if (! l_j2k->m_specific_param.m_encoder.m_header_tile_data) {
-		j2k_destroy(l_j2k);
-		return NULL;
-	}
-
-	l_j2k->m_specific_param.m_encoder.m_header_tile_data_size = J2K_DEFAULT_HEADER_SIZE;
-
-	// validation list creation
-	l_j2k->m_validation_list = opj_procedure_list_create();
-	if (! l_j2k->m_validation_list) {
-		j2k_destroy(l_j2k);
-		return NULL;
-	}
-
-	// execution list creation
-	l_j2k->m_procedure_list = opj_procedure_list_create();
-	if (! l_j2k->m_procedure_list) {
-		j2k_destroy(l_j2k);
-		return NULL;
-	}
-
-	return l_j2k;
-}
-
-void j2k_destroy_compress(opj_j2k_t *j2k) {
-	int tileno;
-
-	if(!j2k) return;
-	if(j2k->cp != NULL) {
-		opj_cp_t *cp = j2k->cp;
-
-		if(cp->comment) {
-			opj_free(cp->comment);
-		}
-		if(cp->matrice) {
-			opj_free(cp->matrice);
-		}
-		for (tileno = 0; tileno < cp->tw * cp->th; tileno++) {
-			opj_free(cp->tcps[tileno].tccps);
-		}
-		opj_free(cp->tcps);
-		opj_free(cp);
-	}
-
-	opj_free(j2k);
-}
-
-void j2k_setup_encoder(opj_j2k_t *j2k, opj_cparameters_t *parameters, opj_image_t *image) {
-	int i, j, tileno, numpocs_tile;
-	opj_cp_t *cp = NULL;
-
-	if(!j2k || !parameters || ! image) {
-		return;
-	}
-
-	/* create and initialize the coding parameters structure */
-	cp = (opj_cp_t*) opj_calloc(1, sizeof(opj_cp_t));
-
-	/* keep a link to cp so that we can destroy it later in j2k_destroy_compress */
-	j2k->cp = cp;
-
-	/* set default values for cp */
-	cp->tw = 1;
-	cp->th = 1;
-
-	/* 
-	copy user encoding parameters 
-	*/
-	cp->cinema = parameters->cp_cinema;
-	cp->max_comp_size =	parameters->max_comp_size;
-	cp->rsiz   = parameters->cp_rsiz;
-	cp->disto_alloc = parameters->cp_disto_alloc;
-	cp->fixed_alloc = parameters->cp_fixed_alloc;
-	cp->fixed_quality = parameters->cp_fixed_quality;
-
-	/* mod fixed_quality */
-	if(parameters->cp_matrice) {
-		size_t array_size = parameters->tcp_numlayers * parameters->numresolution * 3 * sizeof(int);
-		cp->matrice = (int *) opj_malloc(array_size);
-		memcpy(cp->matrice, parameters->cp_matrice, array_size);
-	}
-
-	/* tiles */
-	cp->tdx = parameters->cp_tdx;
-	cp->tdy = parameters->cp_tdy;
-
-	/* tile offset */
-	cp->tx0 = parameters->cp_tx0;
-	cp->ty0 = parameters->cp_ty0;
-
-	/* comment string */
-	if(parameters->cp_comment) {
-		cp->comment = (char*)opj_malloc(strlen(parameters->cp_comment) + 1);
-		if(cp->comment) {
-			strcpy(cp->comment, parameters->cp_comment);
-		}
-	}
-
-	/*
-	calculate other encoding parameters
-	*/
-
-	if (parameters->tile_size_on) {
-		cp->tw = int_ceildiv(image->x1 - cp->tx0, cp->tdx);
-		cp->th = int_ceildiv(image->y1 - cp->ty0, cp->tdy);
-	} else {
-		cp->tdx = image->x1 - cp->tx0;
-		cp->tdy = image->y1 - cp->ty0;
-	}
-
-	if(parameters->tp_on){
-		cp->tp_flag = parameters->tp_flag;
-		cp->tp_on = 1;
-	}
-	
-	cp->img_size = 0;
-	for(i=0;i<image->numcomps ;i++){
-	cp->img_size += (image->comps[i].w *image->comps[i].h * image->comps[i].prec);
-	}
-
-
-#ifdef USE_JPWL
-	/*
-	calculate JPWL encoding parameters
-	*/
-
-	if (parameters->jpwl_epc_on) {
-		int i;
-
-		/* set JPWL on */
-		cp->epc_on = OPJ_TRUE;
-		cp->info_on = OPJ_FALSE; /* no informative technique */
-
-		/* set EPB on */
-		if ((parameters->jpwl_hprot_MH > 0) || (parameters->jpwl_hprot_TPH[0] > 0)) {
-			cp->epb_on = OPJ_TRUE;
-			
-			cp->hprot_MH = parameters->jpwl_hprot_MH;
-			for (i = 0; i < JPWL_MAX_NO_TILESPECS; i++) {
-				cp->hprot_TPH_tileno[i] = parameters->jpwl_hprot_TPH_tileno[i];
-				cp->hprot_TPH[i] = parameters->jpwl_hprot_TPH[i];
-			}
-			/* if tile specs are not specified, copy MH specs */
-			if (cp->hprot_TPH[0] == -1) {
-				cp->hprot_TPH_tileno[0] = 0;
-				cp->hprot_TPH[0] = parameters->jpwl_hprot_MH;
-			}
-			for (i = 0; i < JPWL_MAX_NO_PACKSPECS; i++) {
-				cp->pprot_tileno[i] = parameters->jpwl_pprot_tileno[i];
-				cp->pprot_packno[i] = parameters->jpwl_pprot_packno[i];
-				cp->pprot[i] = parameters->jpwl_pprot[i];
-			}
-		}
-
-		/* set ESD writing */
-		if ((parameters->jpwl_sens_size == 1) || (parameters->jpwl_sens_size == 2)) {
-			cp->esd_on = OPJ_TRUE;
-
-			cp->sens_size = parameters->jpwl_sens_size;
-			cp->sens_addr = parameters->jpwl_sens_addr;
-			cp->sens_range = parameters->jpwl_sens_range;
-
-			cp->sens_MH = parameters->jpwl_sens_MH;
-			for (i = 0; i < JPWL_MAX_NO_TILESPECS; i++) {
-				cp->sens_TPH_tileno[i] = parameters->jpwl_sens_TPH_tileno[i];
-				cp->sens_TPH[i] = parameters->jpwl_sens_TPH[i];
-			}
-		}
-
-		/* always set RED writing to false: we are at the encoder */
-		cp->red_on = OPJ_FALSE;
-
-	} else {
-		cp->epc_on = OPJ_FALSE;
-	}
-#endif /* USE_JPWL */
-
-
-	/* initialize the mutiple tiles */
-	/* ---------------------------- */
-	cp->tcps = (opj_tcp_t*) opj_calloc(cp->tw * cp->th, sizeof(opj_tcp_t));
-
-	for (tileno = 0; tileno < cp->tw * cp->th; tileno++) {
-		opj_tcp_t *tcp = &cp->tcps[tileno];
-		tcp->numlayers = parameters->tcp_numlayers;
-		for (j = 0; j < tcp->numlayers; j++) {
-			if(cp->cinema){
-				if (cp->fixed_quality) {
-					tcp->distoratio[j] = parameters->tcp_distoratio[j];
-				}
-				tcp->rates[j] = parameters->tcp_rates[j];
-			}else{
-				if (cp->fixed_quality) {	/* add fixed_quality */
-					tcp->distoratio[j] = parameters->tcp_distoratio[j];
-				} else {
-					tcp->rates[j] = parameters->tcp_rates[j];
-				}
-			}
-		}
-		tcp->csty = parameters->csty;
-		tcp->prg = parameters->prog_order;
-		tcp->mct = parameters->tcp_mct; 
-
-		numpocs_tile = 0;
-		tcp->POC = 0;
-		if (parameters->numpocs) {
-			/* initialisation of POC */
-			tcp->POC = 1;
-			for (i = 0; i < parameters->numpocs; i++) {
-				if((tileno == parameters->POC[i].tile - 1) || (parameters->POC[i].tile == -1)) {
-					opj_poc_t *tcp_poc = &tcp->pocs[numpocs_tile];
-					tcp_poc->resno0		= parameters->POC[numpocs_tile].resno0;
-					tcp_poc->compno0	= parameters->POC[numpocs_tile].compno0;
-					tcp_poc->layno1		= parameters->POC[numpocs_tile].layno1;
-					tcp_poc->resno1		= parameters->POC[numpocs_tile].resno1;
-					tcp_poc->compno1	= parameters->POC[numpocs_tile].compno1;
-					tcp_poc->prg1		= parameters->POC[numpocs_tile].prg1;
-					tcp_poc->tile		= parameters->POC[numpocs_tile].tile;
-					numpocs_tile++;
-				}
-			}
-			tcp->numpocs = numpocs_tile -1 ;
-		}else{ 
-			tcp->numpocs = 0;
-		}
-
-		tcp->tccps = (opj_tccp_t*) opj_calloc(image->numcomps, sizeof(opj_tccp_t));
-
-		for (i = 0; i < image->numcomps; i++) {
-			opj_tccp_t *tccp = &tcp->tccps[i];
-			tccp->csty = parameters->csty & 0x01;	/* 0 => one precinct || 1 => custom precinct  */
-			tccp->numresolutions = parameters->numresolution;
-			tccp->cblkw = int_floorlog2(parameters->cblockw_init);
-			tccp->cblkh = int_floorlog2(parameters->cblockh_init);
-			tccp->cblksty = parameters->mode;
-			tccp->qmfbid = parameters->irreversible ? 0 : 1;
-			tccp->qntsty = parameters->irreversible ? J2K_CCP_QNTSTY_SEQNT : J2K_CCP_QNTSTY_NOQNT;
-			tccp->numgbits = 2;
-			if (i == parameters->roi_compno) {
-				tccp->roishift = parameters->roi_shift;
-			} else {
-				tccp->roishift = 0;
-			}
-
-			if(parameters->cp_cinema)
-			{
-				//Precinct size for lowest frequency subband=128
-				tccp->prcw[0] = 7;
-				tccp->prch[0] = 7;
-				//Precinct size at all other resolutions = 256
-				for (j = 1; j < tccp->numresolutions; j++) {
-					tccp->prcw[j] = 8;
-					tccp->prch[j] = 8;
-				}
-			}else{
-				if (parameters->csty & J2K_CCP_CSTY_PRT) {
-					int p = 0;
-					for (j = tccp->numresolutions - 1; j >= 0; j--) {
-						if (p < parameters->res_spec) {
-							
-							if (parameters->prcw_init[p] < 1) {
-								tccp->prcw[j] = 1;
-							} else {
-								tccp->prcw[j] = int_floorlog2(parameters->prcw_init[p]);
-							}
-							
-							if (parameters->prch_init[p] < 1) {
-								tccp->prch[j] = 1;
-							}else {
-								tccp->prch[j] = int_floorlog2(parameters->prch_init[p]);
-							}
-
-						} else {
-							int res_spec = parameters->res_spec;
-							int size_prcw = parameters->prcw_init[res_spec - 1] >> (p - (res_spec - 1));
-							int size_prch = parameters->prch_init[res_spec - 1] >> (p - (res_spec - 1));
-							
-							if (size_prcw < 1) {
-								tccp->prcw[j] = 1;
-							} else {
-								tccp->prcw[j] = int_floorlog2(size_prcw);
-							}
-							
-							if (size_prch < 1) {
-								tccp->prch[j] = 1;
-							} else {
-								tccp->prch[j] = int_floorlog2(size_prch);
-							}
-						}
-						p++;
-						/*printf("\nsize precinct for level %d : %d,%d\n", j,tccp->prcw[j], tccp->prch[j]); */
-					}	//end for
-				} else {
-					for (j = 0; j < tccp->numresolutions; j++) {
-						tccp->prcw[j] = 15;
-						tccp->prch[j] = 15;
-					}
-				}
-			}
-
-			dwt_calc_explicit_stepsizes(tccp, image->comps[i].prec);
-		}
-	}
-}
-
-opj_bool j2k_encode(opj_j2k_t *j2k, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t *cstr_info) {
-	int tileno, compno;
-	opj_cp_t *cp = NULL;
-
-	opj_tcd_t *tcd = NULL;	/* TCD component */
-
-	j2k->cio = cio;	
-	j2k->image = image;
-
-	cp = j2k->cp;
-
-	/* INDEX >> */
-	j2k->cstr_info = cstr_info;
-	if (cstr_info) {
-		int compno;
-		cstr_info->tile = (opj_tile_info_t *) opj_malloc(cp->tw * cp->th * sizeof(opj_tile_info_t));
-		cstr_info->image_w = image->x1 - image->x0;
-		cstr_info->image_h = image->y1 - image->y0;
-		cstr_info->prog = (&cp->tcps[0])->prg;
-		cstr_info->tw = cp->tw;
-		cstr_info->th = cp->th;
-		cstr_info->tile_x = cp->tdx;	/* new version parser */
-		cstr_info->tile_y = cp->tdy;	/* new version parser */
-		cstr_info->tile_Ox = cp->tx0;	/* new version parser */
-		cstr_info->tile_Oy = cp->ty0;	/* new version parser */
-		cstr_info->numcomps = image->numcomps;
-		cstr_info->numlayers = (&cp->tcps[0])->numlayers;
-		cstr_info->numdecompos = (int*) opj_malloc(image->numcomps * sizeof(int));
-		for (compno=0; compno < image->numcomps; compno++) {
-			cstr_info->numdecompos[compno] = (&cp->tcps[0])->tccps->numresolutions - 1;
-		}
-		cstr_info->D_max = 0.0;		/* ADD Marcela */
-		cstr_info->main_head_start = cio_tell(cio); /* position of SOC */
-		cstr_info->maxmarknum = 100;
-		cstr_info->marker = (opj_marker_info_t *) opj_malloc(cstr_info->maxmarknum * sizeof(opj_marker_info_t));
-		cstr_info->marknum = 0;
-	}
-	/* << INDEX */
-
-	j2k_write_soc(j2k);
-	j2k_write_siz(j2k);
-	j2k_write_cod(j2k);
-	j2k_write_qcd(j2k);
-
-	if(cp->cinema){
-		for (compno = 1; compno < image->numcomps; compno++) {
-			j2k_write_coc(j2k, compno);
-			j2k_write_qcc(j2k, compno);
-		}
-	}
-
-	for (compno = 0; compno < image->numcomps; compno++) {
-		opj_tcp_t *tcp = &cp->tcps[0];
-		if (tcp->tccps[compno].roishift)
-			j2k_write_rgn(j2k, compno, 0);
-	}
-	if (cp->comment != NULL) {
-		j2k_write_com(j2k);
-	}
-
-	j2k->totnum_tp = j2k_calculate_tp(cp,image->numcomps,image,j2k);
-	/* TLM Marker*/
-	if(cp->cinema){
-		j2k_write_tlm(j2k);
-		if (cp->cinema == CINEMA4K_24) {
-			j2k_write_poc(j2k);
-		}
-	}
-
-	/* uncomment only for testing JPSEC marker writing */
-	/* j2k_write_sec(j2k); */
-
-	/* INDEX >> */
-	if(cstr_info) {
-		cstr_info->main_head_end = cio_tell(cio) - 1;
-	}
-	/* << INDEX */
-	/**** Main Header ENDS here ***/
-
-	/* create the tile encoder */
-	tcd = tcd_create(j2k->cinfo);
-
-	/* encode each tile */
-	for (tileno = 0; tileno < cp->tw * cp->th; tileno++) {
-		int pino;
-		int tilepartno=0;
-		/* UniPG>> */
-		int acc_pack_num = 0;
-		/* <<UniPG */
-
-
-		opj_tcp_t *tcp = &cp->tcps[tileno];
-		opj_event_msg(j2k->cinfo, EVT_INFO, "tile number %d / %d\n", tileno + 1, cp->tw * cp->th);
-
-		j2k->curtileno = tileno;
-		j2k->cur_tp_num = 0;
-		tcd->cur_totnum_tp = j2k->cur_totnum_tp[j2k->curtileno];
-		/* initialisation before tile encoding  */
-		if (tileno == 0) {
-			tcd_malloc_encode(tcd, image, cp, j2k->curtileno);
-		} else {
-			tcd_init_encode(tcd, image, cp, j2k->curtileno);
-		}
-
-		/* INDEX >> */
-		if(cstr_info) {
-			cstr_info->tile[j2k->curtileno].start_pos = cio_tell(cio) + j2k->pos_correction;
-			cstr_info->tile[j2k->curtileno].maxmarknum = 10;
-			cstr_info->tile[j2k->curtileno].marker = (opj_marker_info_t *) opj_malloc(cstr_info->tile[j2k->curtileno].maxmarknum * sizeof(opj_marker_info_t));
-			cstr_info->tile[j2k->curtileno].marknum = 0;
-		}
-		/* << INDEX */
-
-		for(pino = 0; pino <= tcp->numpocs; pino++) {
-			int tot_num_tp;
-			tcd->cur_pino=pino;
-
-			/*Get number of tile parts*/
-			tot_num_tp = j2k_get_num_tp(cp,pino,tileno);
-			tcd->tp_pos = cp->tp_pos;
-
-			for(tilepartno = 0; tilepartno < tot_num_tp ; tilepartno++){
-				j2k->tp_num = tilepartno;
-				/* INDEX >> */
-				if(cstr_info)
-					cstr_info->tile[j2k->curtileno].tp[j2k->cur_tp_num].tp_start_pos =
-					cio_tell(cio) + j2k->pos_correction;
-				/* << INDEX */
-				j2k_write_sot(j2k);
-
-				if(j2k->cur_tp_num == 0 && cp->cinema == 0){
-					for (compno = 1; compno < image->numcomps; compno++) {
-						j2k_write_coc(j2k, compno);
-						j2k_write_qcc(j2k, compno);
-					}
-					if (cp->tcps[tileno].numpocs) {
-						j2k_write_poc(j2k);
-					}
-				}
-
-				/* INDEX >> */
-				if(cstr_info)
-					cstr_info->tile[j2k->curtileno].tp[j2k->cur_tp_num].tp_end_header =
-					cio_tell(cio) + j2k->pos_correction + 1;
-				/* << INDEX */
-
-				j2k_write_sod(j2k, tcd);
-
-				/* INDEX >> */
-				if(cstr_info) {
-					cstr_info->tile[j2k->curtileno].tp[j2k->cur_tp_num].tp_end_pos =
-						cio_tell(cio) + j2k->pos_correction - 1;
-					cstr_info->tile[j2k->curtileno].tp[j2k->cur_tp_num].tp_start_pack =
-						acc_pack_num;
-					cstr_info->tile[j2k->curtileno].tp[j2k->cur_tp_num].tp_numpacks =
-						cstr_info->packno - acc_pack_num;
-					acc_pack_num = cstr_info->packno;
-				}
-				/* << INDEX */
-
-				j2k->cur_tp_num++;
-			}			
-		}
-		if(cstr_info) {
-			cstr_info->tile[j2k->curtileno].end_pos = cio_tell(cio) + j2k->pos_correction - 1;
-		}
-
-
-		/*
-		if (tile->PPT) { // BAD PPT !!! 
-		FILE *PPT_file;
-		int i;
-		PPT_file=fopen("PPT","rb");
-		fprintf(stderr,"%c%c%c%c",255,97,tile->len_ppt/256,tile->len_ppt%256);
-		for (i=0;i<tile->len_ppt;i++) {
-		unsigned char elmt;
-		fread(&elmt, 1, 1, PPT_file);
-		fwrite(&elmt,1,1,f);
-		}
-		fclose(PPT_file);
-		unlink("PPT");
-		}
-		*/
-
-	}
-
-	/* destroy the tile encoder */
-	tcd_free_encode(tcd);
-	tcd_destroy(tcd);
-
-	opj_free(j2k->cur_totnum_tp);
-
-	j2k_write_eoc(j2k);
-
-	if(cstr_info) {
-		cstr_info->codestream_size = cio_tell(cio) + j2k->pos_correction;
-		/* UniPG>> */
-		/* The following adjustment is done to adjust the codestream size */
-		/* if SOD is not at 0 in the buffer. Useful in case of JP2, where */
-		/* the first bunch of bytes is not in the codestream              */
-		cstr_info->codestream_size -= cstr_info->main_head_start;
-		/* <<UniPG */
-	}
-
-#ifdef USE_JPWL
-	/*
-	preparation of JPWL marker segments
-	*/
-	if(cp->epc_on) {
-
-		/* encode according to JPWL */
-		jpwl_encode(j2k, cio, image);
-
-	}
-#endif /* USE_JPWL */
-
-	return OPJ_TRUE;
-}
-
-static void j2k_add_mhmarker(opj_codestream_info_t *cstr_info, unsigned short int type, int pos, int len)
-{
-	assert(cstr_info != 00);
-
-	/* expand the list? */
-	if ((cstr_info->marknum + 1) > cstr_info->maxmarknum) {
-		cstr_info->maxmarknum = 100 + (int) ((float) cstr_info->maxmarknum * 1.0F);
-		cstr_info->marker = (opj_marker_info_t*)opj_realloc(cstr_info->marker, cstr_info->maxmarknum);
-	}
-
-	/* add the marker */
-	cstr_info->marker[cstr_info->marknum].type = type;
-	cstr_info->marker[cstr_info->marknum].pos = pos;
-	cstr_info->marker[cstr_info->marknum].len = len;
-	cstr_info->marknum++;
-
-}
-
-static void j2k_add_mhmarker_v2(opj_codestream_index_t *cstr_index, OPJ_UINT32 type, OPJ_OFF_T pos, OPJ_UINT32 len)
-{
-	assert(cstr_index != 00);
-
-	/* expand the list? */
-	if ((cstr_index->marknum + 1) > cstr_index->maxmarknum) {
-		cstr_index->maxmarknum = 100 + (int) ((float) cstr_index->maxmarknum * 1.0F);
-		cstr_index->marker = (opj_marker_info_t*)opj_realloc(cstr_index->marker, cstr_index->maxmarknum *sizeof(opj_marker_info_t));
-	}
-
-	/* add the marker */
-	cstr_index->marker[cstr_index->marknum].type = (OPJ_UINT16)type;
-	cstr_index->marker[cstr_index->marknum].pos = (OPJ_INT32)pos;
-	cstr_index->marker[cstr_index->marknum].len = (OPJ_INT32)len;
-	cstr_index->marknum++;
-
-}
-
-static void j2k_add_tlmarker( int tileno, opj_codestream_info_t *cstr_info, unsigned short int type, int pos, int len)
-{
-	opj_marker_info_t *marker;
-
-	assert(cstr_info != 00);
-
-	/* expand the list? */
-	if ((cstr_info->tile[tileno].marknum + 1) > cstr_info->tile[tileno].maxmarknum) {
-		cstr_info->tile[tileno].maxmarknum = 100 + (int) ((float) cstr_info->tile[tileno].maxmarknum * 1.0F);
-		cstr_info->tile[tileno].marker = (opj_marker_info_t*)opj_realloc(cstr_info->tile[tileno].marker, cstr_info->maxmarknum);
-	}
-
-	marker = &(cstr_info->tile[tileno].marker[cstr_info->tile[tileno].marknum]);
-
-	/* add the marker */
-	marker->type = type;
-	marker->pos = pos;
-	marker->len = len;
-	cstr_info->tile[tileno].marknum++;
-}
-
-static void j2k_add_tlmarker_v2(OPJ_UINT32 tileno, opj_codestream_index_t *cstr_index, OPJ_UINT32 type, OPJ_OFF_T pos, OPJ_UINT32 len)
-{
-	assert(cstr_index != 00);
-	assert(cstr_index->tile_index != 00);
-
-	/* expand the list? */
-	if ((cstr_index->tile_index[tileno].marknum + 1) > cstr_index->tile_index[tileno].maxmarknum) {
-		cstr_index->tile_index[tileno].maxmarknum = 100 + (int) ((float) cstr_index->tile_index[tileno].maxmarknum * 1.0F);
-		cstr_index->tile_index[tileno].marker =
-				(opj_marker_info_t*)opj_realloc(cstr_index->tile_index[tileno].marker,
-												cstr_index->tile_index[tileno].maxmarknum *sizeof(opj_marker_info_t));
-	}
-
-	/* add the marker */
-	cstr_index->tile_index[tileno].marker[cstr_index->tile_index[tileno].marknum].type = (OPJ_UINT16)type;
-	cstr_index->tile_index[tileno].marker[cstr_index->tile_index[tileno].marknum].pos = (OPJ_INT32)pos;
-	cstr_index->tile_index[tileno].marker[cstr_index->tile_index[tileno].marknum].len = (OPJ_INT32)len;
-	cstr_index->tile_index[tileno].marknum++;
-
-	if (type == J2K_MS_SOT) {
-		OPJ_UINT32 l_current_tile_part = cstr_index->tile_index[tileno].current_tpsno;
-
-		if (cstr_index->tile_index[tileno].tp_index)
-			cstr_index->tile_index[tileno].tp_index[l_current_tile_part].start_pos = pos;
-
-	}
-}
-
-
-/*
- * -----------------------------------------------------------------------
- * -----------------------------------------------------------------------
- * -----------------------------------------------------------------------
- */
-
-/**
- * Ends the decompression procedures and possibiliy add data to be read after the
- * codestream.
- */
-opj_bool j2k_end_decompress(
-						opj_j2k_v2_t *p_j2k,
-						opj_stream_private_t *p_stream,
-						opj_event_mgr_t * p_manager)
-{
-	return OPJ_TRUE;
-}
-
-/**
- * Reads a jpeg2000 codestream header structure.
-
- *
- * @param p_stream the stream to read data from.
- * @param p_j2k the jpeg2000 codec.
- * @param p_manager the user event manager.
- *
- * @return true if the box is valid.
- */
-opj_bool j2k_read_header(	struct opj_stream_private *p_stream,
-							opj_j2k_v2_t* p_j2k,
-							opj_image_t** p_image,
-							struct opj_event_mgr* p_manager )
-{
-	/* preconditions */
-	assert(p_j2k != 00);
-	assert(p_stream != 00);
-	assert(p_manager != 00);
-
-	/* create an empty image header */
-	p_j2k->m_private_image = opj_image_create0();
-	if (! p_j2k->m_private_image) {
-		return OPJ_FALSE;
-	}
-
-	/* customization of the validation */
-	j2k_setup_decoding_validation(p_j2k);
-
-	/* validation of the parameters codec */
-	if (! j2k_exec(p_j2k, p_j2k->m_validation_list, p_stream,p_manager)) {
-		opj_image_destroy(p_j2k->m_private_image);
-		p_j2k->m_private_image = NULL;
-		return OPJ_FALSE;
-	}
-
-	/* customization of the encoding */
-	j2k_setup_header_reading(p_j2k);
-
-	/* read header */
-	if (! j2k_exec (p_j2k,p_j2k->m_procedure_list,p_stream,p_manager)) {
-		opj_image_destroy(p_j2k->m_private_image);
-		p_j2k->m_private_image = NULL;
-		return OPJ_FALSE;
-	}
-
-	*p_image = opj_image_create0();
-	if (! (*p_image)) {
-		return OPJ_FALSE;
-	}
-
-	/* Copy codestream image information to the output image */
-	opj_copy_image_header(p_j2k->m_private_image, *p_image);
-
-
-	return OPJ_TRUE;
-}
-
-/**
- * Sets up the procedures to do on reading header. Developpers wanting to extend the library can add their own reading procedures.
- */
-void j2k_setup_header_reading (opj_j2k_v2_t *p_j2k)
-{
-	// preconditions
-	assert(p_j2k != 00);
-
-	opj_procedure_list_add_procedure(p_j2k->m_procedure_list,(void*)j2k_read_header_procedure);
-
-	/* DEVELOPER CORNER, add your custom procedures */
-	opj_procedure_list_add_procedure(p_j2k->m_procedure_list,(void*)j2k_copy_default_tcp_and_create_tcd);
-
-}
-
-/**
- * Sets up the validation ,i.e. adds the procedures to lauch to make sure the codec parameters
- * are valid. Developpers wanting to extend the library can add their own validation procedures.
- */
-void j2k_setup_decoding_validation (opj_j2k_v2_t *p_j2k)
-{
-	// preconditions
-	assert(p_j2k != 00);
-
-	opj_procedure_list_add_procedure(p_j2k->m_validation_list, (void*)j2k_build_decoder);
-	opj_procedure_list_add_procedure(p_j2k->m_validation_list, (void*)j2k_decoding_validation);
-	/* DEVELOPER CORNER, add your custom validation procedure */
-
-}
-
-/**
- * Builds the cp decoder parameters to use to decode tile.
- */
-opj_bool j2k_build_decoder (
-						opj_j2k_v2_t * p_j2k,
-						opj_stream_private_t *p_stream,
-						opj_event_mgr_t * p_manager
-						)
-{
-	// add here initialization of cp
-	// copy paste of setup_decoder
-	return OPJ_TRUE;
-}
-
-/**
- * The default decoding validation procedure without any extension.
- *
- * @param	p_j2k			the jpeg2000 codec to validate.
- * @param	p_stream				the input stream to validate.
- * @param	p_manager		the user event manager.
- *
- * @return true if the parameters are correct.
- */
-opj_bool j2k_decoding_validation (
-								opj_j2k_v2_t *p_j2k,
-								opj_stream_private_t *p_stream,
-								opj_event_mgr_t * p_manager
-							  )
-{
-	opj_bool l_is_valid = OPJ_TRUE;
-
-	// preconditions
-	assert(p_j2k != 00);
-	assert(p_stream != 00);
-	assert(p_manager != 00);
-
-
-	/* STATE checking */
-	/* make sure the state is at 0 */
-#ifdef TODO_MSD
-	l_is_valid &= (p_j2k->m_specific_param.m_decoder.m_state == J2K_DEC_STATE_NONE);
-#endif
-	l_is_valid &= (p_j2k->m_specific_param.m_decoder.m_state == 0x0000);
-
-	/* POINTER validation */
-	/* make sure a p_j2k codec is present */
-	/* make sure a procedure list is present */
-	l_is_valid &= (p_j2k->m_procedure_list != 00);
-	/* make sure a validation list is present */
-	l_is_valid &= (p_j2k->m_validation_list != 00);
-
-	/* PARAMETER VALIDATION */
-	return l_is_valid;
-}
-
-opj_bool j2k_read_header_procedure(	opj_j2k_v2_t *p_j2k,
-									struct opj_stream_private *p_stream,
-									struct opj_event_mgr * p_manager)
-{
-	OPJ_UINT32 l_current_marker;
-	OPJ_UINT32 l_marker_size;
-	const opj_dec_memory_marker_handler_t * l_marker_handler = 00;
-
-	/* preconditions */
-	assert(p_stream != 00);
-	assert(p_j2k != 00);
-	assert(p_manager != 00);
-
-	/*  We enter in the main header */
-	p_j2k->m_specific_param.m_decoder.m_state = J2K_STATE_MHSOC;
-
-	/* Try to read the SOC marker, the codestream must begin with SOC marker */
-	if (! j2k_read_soc_v2(p_j2k,p_stream,p_manager)) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Expected a SOC marker \n");
-		return OPJ_FALSE;
-	}
-
-	/* Try to read 2 bytes (the next marker ID) from stream and copy them into the buffer */
-	if (opj_stream_read_data(p_stream,p_j2k->m_specific_param.m_decoder.m_header_data,2,p_manager) != 2) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Stream too short\n");
-		return OPJ_FALSE;
-	}
-
-	/* Read 2 bytes as the new marker ID */
-	opj_read_bytes(p_j2k->m_specific_param.m_decoder.m_header_data,&l_current_marker,2);
-
-	/* Try to read until the SOT is detected */
-	while (l_current_marker != J2K_MS_SOT) {
-
-		/* Check if the current marker ID is valid */
-		if (l_current_marker < 0xff00) {
-			opj_event_msg_v2(p_manager, EVT_ERROR, "We expected read a marker ID (0xff--) instead of %.8x\n", l_current_marker);
-			return OPJ_FALSE;
-		}
-
-		/* Get the marker handler from the marker ID */
-		l_marker_handler = j2k_get_marker_handler(l_current_marker);
-
-		/* Manage case where marker is unknown */
-		if (l_marker_handler->id == J2K_MS_UNK) {
-			if (! j2k_read_unk_v2(p_j2k, p_stream, &l_current_marker, p_manager)){
-				opj_event_msg_v2(p_manager, EVT_ERROR, "Unknow marker have been detected and generated error.\n");
-				return OPJ_FALSE;
-			}
-
-			if (l_current_marker == J2K_MS_SOT)
-				break; /* SOT marker is detected main header is completely read */
-			else	/* Get the marker handler from the marker ID */
-				l_marker_handler = j2k_get_marker_handler(l_current_marker);
-		}
-
-		/* Check if the marker is known and if it is the right place to find it */
-		if (! (p_j2k->m_specific_param.m_decoder.m_state & l_marker_handler->states) ) {
-			opj_event_msg_v2(p_manager, EVT_ERROR, "Marker is not compliant with its position\n");
-			return OPJ_FALSE;
-		}
-
-		/* Try to read 2 bytes (the marker size) from stream and copy them into the buffer */
-		if (opj_stream_read_data(p_stream,p_j2k->m_specific_param.m_decoder.m_header_data,2,p_manager) != 2) {
-			opj_event_msg_v2(p_manager, EVT_ERROR, "Stream too short\n");
-			return OPJ_FALSE;
-		}
-
-		/* read 2 bytes as the marker size */
-		opj_read_bytes(p_j2k->m_specific_param.m_decoder.m_header_data,&l_marker_size,2);
-		l_marker_size -= 2; // Subtract the size of the marker ID already read
-
-		/* Check if the marker size is compatible with the header data size */
-		if (l_marker_size > p_j2k->m_specific_param.m_decoder.m_header_data_size) {
-			p_j2k->m_specific_param.m_decoder.m_header_data = (OPJ_BYTE*)
-					opj_realloc(p_j2k->m_specific_param.m_decoder.m_header_data,l_marker_size);
-			if (p_j2k->m_specific_param.m_decoder.m_header_data == 00) {
-				return OPJ_FALSE;
-			}
-			p_j2k->m_specific_param.m_decoder.m_header_data_size = l_marker_size;
-		}
-
-		/* Try to read the rest of the marker segment from stream and copy them into the buffer */
-		if (opj_stream_read_data(p_stream,p_j2k->m_specific_param.m_decoder.m_header_data,l_marker_size,p_manager) != l_marker_size) {
-			opj_event_msg_v2(p_manager, EVT_ERROR, "Stream too short\n");
-			return OPJ_FALSE;
-		}
-
-		/* Read the marker segment with the correct marker handler */
-		if (! (*(l_marker_handler->handler))(p_j2k,p_j2k->m_specific_param.m_decoder.m_header_data,l_marker_size,p_manager)) {
-			opj_event_msg_v2(p_manager, EVT_ERROR, "Marker handler function failed to read the marker segment\n");
-			return OPJ_FALSE;
-		}
-
-		/* Add the marker to the codestream index*/
-		j2k_add_mhmarker_v2(p_j2k->cstr_index,
-							l_marker_handler->id,
-							(OPJ_UINT32) opj_stream_tell(p_stream) - l_marker_size - 4,
-							l_marker_size + 4 );
-
-		/* Try to read 2 bytes (the next marker ID) from stream and copy them into the buffer */
-		if (opj_stream_read_data(p_stream,p_j2k->m_specific_param.m_decoder.m_header_data,2,p_manager) != 2) {
-			opj_event_msg_v2(p_manager, EVT_ERROR, "Stream too short\n");
-			return OPJ_FALSE;
-		}
-
-		/* read 2 bytes as the new marker ID */
-		opj_read_bytes(p_j2k->m_specific_param.m_decoder.m_header_data,&l_current_marker,2);
-	}
-
-	opj_event_msg_v2(p_manager, EVT_INFO, "Main header has been correctly decode.\n");
-
-	/* Position of the last element if the main header */
-	p_j2k->cstr_index->main_head_end = (OPJ_UINT32) opj_stream_tell(p_stream) - 2;
-
-	/* Next step: read a tile-part header */
-	p_j2k->m_specific_param.m_decoder.m_state = J2K_STATE_TPHSOT;
-
-	return OPJ_TRUE;
-}
-
-/**
- * Excutes the given procedures on the given codec.
- *
- * @param	p_procedure_list	the list of procedures to execute
- * @param	p_j2k					the jpeg2000 codec to execute the procedures on.
- * @param	p_stream					the stream to execute the procedures on.
- * @param	p_manager			the user manager.
- *
- * @return	true				if all the procedures were successfully executed.
- */
-opj_bool j2k_exec (	opj_j2k_v2_t * p_j2k,
-					opj_procedure_list_t * p_procedure_list,
-					opj_stream_private_t *p_stream,
-					opj_event_mgr_t * p_manager )
-{
-	opj_bool (** l_procedure) (opj_j2k_v2_t * ,opj_stream_private_t *,opj_event_mgr_t *) = 00;
-	opj_bool l_result = OPJ_TRUE;
-	OPJ_UINT32 l_nb_proc, i;
-
-	// preconditions
-	assert(p_procedure_list != 00);
-	assert(p_j2k != 00);
-	assert(p_stream != 00);
-	assert(p_manager != 00);
-
-
-	l_nb_proc = opj_procedure_list_get_nb_procedures(p_procedure_list);
-	l_procedure = (opj_bool (**) (opj_j2k_v2_t * ,opj_stream_private_t *,opj_event_mgr_t *)) opj_procedure_list_get_first_procedure(p_procedure_list);
-
-	for	(i=0;i<l_nb_proc;++i) {
-		l_result = l_result && ((*l_procedure) (p_j2k,p_stream,p_manager));
-		++l_procedure;
-	}
-
-	// and clear the procedure list at the end.
-	opj_procedure_list_clear(p_procedure_list);
-	return l_result;
-}
-
-/* FIXME DOC*/
-opj_bool j2k_copy_default_tcp_and_create_tcd
-						(
-						opj_j2k_v2_t * p_j2k,
-						opj_stream_private_t *p_stream,
-						opj_event_mgr_t * p_manager
-						)
-{
-	opj_tcp_v2_t * l_tcp = 00;
-	opj_tcp_v2_t * l_default_tcp = 00;
-	OPJ_UINT32 l_nb_tiles;
-	OPJ_UINT32 i,j;
-	opj_tccp_t *l_current_tccp = 00;
-	OPJ_UINT32 l_tccp_size;
-	OPJ_UINT32 l_mct_size;
-	opj_image_t * l_image;
-	OPJ_UINT32 l_mcc_records_size,l_mct_records_size;
-	opj_mct_data_t * l_src_mct_rec, *l_dest_mct_rec;
-	opj_simple_mcc_decorrelation_data_t * l_src_mcc_rec, *l_dest_mcc_rec;
-	OPJ_UINT32 l_offset;
-
-	/* preconditions */
-	assert(p_j2k != 00);
-	assert(p_stream != 00);
-	assert(p_manager != 00);
-
-	l_image = p_j2k->m_private_image;
-	l_nb_tiles = p_j2k->m_cp.th * p_j2k->m_cp.tw;
-	l_tcp = p_j2k->m_cp.tcps;
-	l_tccp_size = l_image->numcomps * sizeof(opj_tccp_t);
-	l_default_tcp = p_j2k->m_specific_param.m_decoder.m_default_tcp;
-	l_mct_size = l_image->numcomps * l_image->numcomps * sizeof(OPJ_FLOAT32);
-
-	/* For each tile */
-	for (i=0; i<l_nb_tiles; ++i) {
-		/* keep the tile-compo coding parameters pointer of the current tile coding parameters*/
-		l_current_tccp = l_tcp->tccps;
-		/*Copy default coding parameters into the current tile coding parameters*/
-		memcpy(l_tcp, l_default_tcp, sizeof(opj_tcp_v2_t));
-		/* Initialize some values of the current tile coding parameters*/
-		l_tcp->ppt = 0;
-		l_tcp->ppt_data = 00;
-		/* Reconnect the tile-compo coding parameters pointer to the current tile coding parameters*/
-		l_tcp->tccps = l_current_tccp;
-
-		/* Get the mct_decoding_matrix of the dflt_tile_cp and copy them into the current tile cp*/
-		if (l_default_tcp->m_mct_decoding_matrix) {
-			l_tcp->m_mct_decoding_matrix = (OPJ_FLOAT32*)opj_malloc(l_mct_size);
-			if (! l_tcp->m_mct_decoding_matrix ) {
-				return OPJ_FALSE;
-			}
-			memcpy(l_tcp->m_mct_decoding_matrix,l_default_tcp->m_mct_decoding_matrix,l_mct_size);
-		}
-
-		/* Get the mct_record of the dflt_tile_cp and copy them into the current tile cp*/
-		l_mct_records_size = l_default_tcp->m_nb_max_mct_records * sizeof(opj_mct_data_t);
-		l_tcp->m_mct_records = (opj_mct_data_t*)opj_malloc(l_mct_records_size);
-		if (! l_tcp->m_mct_records) {
-			return OPJ_FALSE;
-		}
-		memcpy(l_tcp->m_mct_records, l_default_tcp->m_mct_records,l_mct_records_size);
-
-		/* Copy the mct record data from dflt_tile_cp to the current tile*/
-		l_src_mct_rec = l_default_tcp->m_mct_records;
-		l_dest_mct_rec = l_tcp->m_mct_records;
-
-		for (j=0;j<l_default_tcp->m_nb_mct_records;++j) {
-
-			if (l_src_mct_rec->m_data) {
-
-				l_dest_mct_rec->m_data = (OPJ_BYTE*) opj_malloc(l_src_mct_rec->m_data_size);
-				if(! l_dest_mct_rec->m_data) {
-					return OPJ_FALSE;
-				}
-				memcpy(l_dest_mct_rec->m_data,l_src_mct_rec->m_data,l_src_mct_rec->m_data_size);
-			}
-
-			++l_src_mct_rec;
-			++l_dest_mct_rec;
-		}
-
-		/* Get the mcc_record of the dflt_tile_cp and copy them into the current tile cp*/
-		l_mcc_records_size = l_default_tcp->m_nb_max_mcc_records * sizeof(opj_simple_mcc_decorrelation_data_t);
-		l_tcp->m_mcc_records = (opj_simple_mcc_decorrelation_data_t*) opj_malloc(l_mcc_records_size);
-		if (! l_tcp->m_mcc_records) {
-			return OPJ_FALSE;
-		}
-		memcpy(l_tcp->m_mcc_records,l_default_tcp->m_mcc_records,l_mcc_records_size);
-
-		/* Copy the mcc record data from dflt_tile_cp to the current tile*/
-		l_src_mcc_rec = l_default_tcp->m_mcc_records;
-		l_dest_mcc_rec = l_tcp->m_mcc_records;
-
-		for (j=0;j<l_default_tcp->m_nb_max_mcc_records;++j) {
-
-			if (l_src_mcc_rec->m_decorrelation_array) {
-				l_offset = l_src_mcc_rec->m_decorrelation_array - l_default_tcp->m_mct_records;
-				l_dest_mcc_rec->m_decorrelation_array = l_tcp->m_mct_records + l_offset;
-			}
-
-			if (l_src_mcc_rec->m_offset_array) {
-				l_offset = l_src_mcc_rec->m_offset_array - l_default_tcp->m_mct_records;
-				l_dest_mcc_rec->m_offset_array = l_tcp->m_mct_records + l_offset;
-			}
-
-			++l_src_mcc_rec;
-			++l_dest_mcc_rec;
-		}
-
-		/* Copy all the dflt_tile_compo_cp to the current tile cp */
-		memcpy(l_current_tccp,l_default_tcp->tccps,l_tccp_size);
-
-		/* Move to next tile cp*/
-		++l_tcp;
-	}
-
-	/* Create the current tile decoder*/
-	p_j2k->m_tcd = (opj_tcd_v2_t*)tcd_create_v2(OPJ_TRUE); // FIXME why a cast ?
-	if (! p_j2k->m_tcd ) {
-		return OPJ_FALSE;
-	}
-
-	if ( !tcd_init_v2(p_j2k->m_tcd, l_image, &(p_j2k->m_cp)) ) {
-		tcd_destroy_v2(p_j2k->m_tcd);
-		p_j2k->m_tcd = 00;
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Cannot decode tile, memory error\n");
-		return OPJ_FALSE;
-	}
-
-	return OPJ_TRUE;
-}
-
-/**
- * Reads the lookup table containing all the marker, status and action, and returns the handler associated
- * with the marker value.
- * @param	p_id		Marker value to look up
- *
- * @return	the handler associated with the id.
-*/
-const opj_dec_memory_marker_handler_t * j2k_get_marker_handler (OPJ_UINT32 p_id)
-{
-	const opj_dec_memory_marker_handler_t *e;
-	for (e = j2k_memory_marker_handler_tab; e->id != 0; ++e) {
-		if (e->id == p_id) {
-			break; // we find a handler corresponding to the marker ID
-		}
-	}
-	return e;
-}
-
-
-/**
- * Destroys a jpeg2000 codec.
- *
- * @param	p_j2k	the jpeg20000 structure to destroy.
- */
-void j2k_destroy (opj_j2k_v2_t *p_j2k)
-{
-	if (p_j2k == 00) {
-		return;
-	}
-
-	if (p_j2k->m_is_decoder) {
-
-		if (p_j2k->m_specific_param.m_decoder.m_default_tcp != 00) {
-			j2k_tcp_destroy(p_j2k->m_specific_param.m_decoder.m_default_tcp);
-			opj_free(p_j2k->m_specific_param.m_decoder.m_default_tcp);
-			p_j2k->m_specific_param.m_decoder.m_default_tcp = 00;
-		}
-
-		if (p_j2k->m_specific_param.m_decoder.m_header_data != 00) {
-			opj_free(p_j2k->m_specific_param.m_decoder.m_header_data);
-			p_j2k->m_specific_param.m_decoder.m_header_data = 00;
-			p_j2k->m_specific_param.m_decoder.m_header_data_size = 0;
-		}
-	}
-	else {
-
-		if (p_j2k->m_specific_param.m_encoder.m_encoded_tile_data) {
-			opj_free(p_j2k->m_specific_param.m_encoder.m_encoded_tile_data);
-			p_j2k->m_specific_param.m_encoder.m_encoded_tile_data = 00;
-		}
-
-		if (p_j2k->m_specific_param.m_encoder.m_tlm_sot_offsets_buffer) {
-			opj_free(p_j2k->m_specific_param.m_encoder.m_tlm_sot_offsets_buffer);
-			p_j2k->m_specific_param.m_encoder.m_tlm_sot_offsets_buffer = 00;
-			p_j2k->m_specific_param.m_encoder.m_tlm_sot_offsets_current = 00;
-		}
-
-		if (p_j2k->m_specific_param.m_encoder.m_header_tile_data) {
-			opj_free(p_j2k->m_specific_param.m_encoder.m_header_tile_data);
-			p_j2k->m_specific_param.m_encoder.m_header_tile_data = 00;
-			p_j2k->m_specific_param.m_encoder.m_header_tile_data_size = 0;
-		}
-	}
-
-	tcd_destroy_v2(p_j2k->m_tcd);
-
-	j2k_cp_destroy(&(p_j2k->m_cp));
-	memset(&(p_j2k->m_cp),0,sizeof(opj_cp_v2_t));
-
-	opj_procedure_list_destroy(p_j2k->m_procedure_list);
-	p_j2k->m_procedure_list = 00;
-
-	opj_procedure_list_destroy(p_j2k->m_validation_list);
-	p_j2k->m_procedure_list = 00;
-
-	j2k_destroy_cstr_index(p_j2k->cstr_index);
-	p_j2k->cstr_index = NULL;
-
-	opj_image_destroy(p_j2k->m_private_image);
-	p_j2k->m_private_image = NULL;
-
-	opj_image_destroy(p_j2k->m_output_image);
-	p_j2k->m_output_image = NULL;
-
-	opj_free(p_j2k);
-}
-
-void j2k_destroy_cstr_index (opj_codestream_index_t *p_cstr_ind)
-{
-	if (p_cstr_ind) {
-
-		if (p_cstr_ind->marker) {
-			opj_free(p_cstr_ind->marker);
-			p_cstr_ind->marker = NULL;
-		}
-
-		if (p_cstr_ind->tile_index) {
-			OPJ_UINT32 it_tile = 0;
-
-			for (it_tile=0; it_tile < p_cstr_ind->nb_of_tiles; it_tile++) {
-
-				if(p_cstr_ind->tile_index[it_tile].packet_index) {
-					opj_free(p_cstr_ind->tile_index[it_tile].packet_index);
-					p_cstr_ind->tile_index[it_tile].packet_index = NULL;
-				}
-
-				if(p_cstr_ind->tile_index[it_tile].tp_index){
-					opj_free(p_cstr_ind->tile_index[it_tile].tp_index);
-					p_cstr_ind->tile_index[it_tile].tp_index = NULL;
-				}
-
-				if(p_cstr_ind->tile_index[it_tile].marker){
-					opj_free(p_cstr_ind->tile_index[it_tile].marker);
-					p_cstr_ind->tile_index[it_tile].marker = NULL;
-
-				}
-			}
-
-			opj_free( p_cstr_ind->tile_index);
-			p_cstr_ind->tile_index = NULL;
-		}
-
-		opj_free(p_cstr_ind);
-	}
-}
-
-
-
-/**
- * Destroys a tile coding parameter structure.
- *
- * @param	p_tcp		the tile coding parameter to destroy.
- */
-void j2k_tcp_destroy (opj_tcp_v2_t *p_tcp)
-{
-	if (p_tcp == 00) {
-		return;
-	}
-
-	if (p_tcp->ppt_buffer != 00) {
-		opj_free(p_tcp->ppt_buffer);
-		p_tcp->ppt_buffer = 00;
-	}
-
-	if (p_tcp->tccps != 00) {
-		opj_free(p_tcp->tccps);
-		p_tcp->tccps = 00;
-	}
-
-	if (p_tcp->m_mct_coding_matrix != 00) {
-		opj_free(p_tcp->m_mct_coding_matrix);
-		p_tcp->m_mct_coding_matrix = 00;
-	}
-
-	if (p_tcp->m_mct_decoding_matrix != 00) {
-		opj_free(p_tcp->m_mct_decoding_matrix);
-		p_tcp->m_mct_decoding_matrix = 00;
-	}
-
-	if (p_tcp->m_mcc_records) {
-		opj_free(p_tcp->m_mcc_records);
-		p_tcp->m_mcc_records = 00;
-		p_tcp->m_nb_max_mcc_records = 0;
-		p_tcp->m_nb_mcc_records = 0;
-	}
-
-	if (p_tcp->m_mct_records) {
-		opj_mct_data_t * l_mct_data = p_tcp->m_mct_records;
-		OPJ_UINT32 i;
-
-		for (i=0;i<p_tcp->m_nb_mct_records;++i) {
-			if (l_mct_data->m_data) {
-				opj_free(l_mct_data->m_data);
-				l_mct_data->m_data = 00;
-			}
-
-			++l_mct_data;
-		}
-
-		opj_free(p_tcp->m_mct_records);
-		p_tcp->m_mct_records = 00;
-	}
-
-	if (p_tcp->mct_norms != 00) {
-		opj_free(p_tcp->mct_norms);
-		p_tcp->mct_norms = 00;
-	}
-
-	j2k_tcp_data_destroy(p_tcp);
-
-}
-
-/**
- * Destroys the data inside a tile coding parameter structure.
- *
- * @param	p_tcp		the tile coding parameter which contain data to destroy.
- */
-void j2k_tcp_data_destroy (opj_tcp_v2_t *p_tcp)
-{
-	if (p_tcp->m_data) {
-		opj_free(p_tcp->m_data);
-		p_tcp->m_data = NULL;
-		p_tcp->m_data_size = 0;
-	}
-}
-
-/**
- * Destroys a coding parameter structure.
- *
- * @param	p_cp		the coding parameter to destroy.
- */
-void j2k_cp_destroy (opj_cp_v2_t *p_cp)
-{
-	OPJ_UINT32 l_nb_tiles;
-	opj_tcp_v2_t * l_current_tile = 00;
-	OPJ_UINT32 i;
-
-	if
-		(p_cp == 00)
-	{
-		return;
-	}
-	if
-		(p_cp->tcps != 00)
-	{
-		l_current_tile = p_cp->tcps;
-		l_nb_tiles = p_cp->th * p_cp->tw;
-
-		for
-			(i = 0; i < l_nb_tiles; ++i)
-		{
-			j2k_tcp_destroy(l_current_tile);
-			++l_current_tile;
-		}
-		opj_free(p_cp->tcps);
-		p_cp->tcps = 00;
-	}
-	if
-		(p_cp->ppm_buffer != 00)
-	{
-		opj_free(p_cp->ppm_buffer);
-		p_cp->ppm_buffer = 00;
-	}
-	if
-		(p_cp->comment != 00)
-	{
-		opj_free(p_cp->comment);
-		p_cp->comment = 00;
-	}
-	if
-		(! p_cp->m_is_decoder)
-	{
-		if
-			(p_cp->m_specific_param.m_enc.m_matrice)
-		{
-			opj_free(p_cp->m_specific_param.m_enc.m_matrice);
-			p_cp->m_specific_param.m_enc.m_matrice = 00;
-		}
-	}
-}
-
-
-
-/**
- * Reads a tile header.
- * @param	p_j2k		the jpeg2000 codec.
- * @param	p_stream			the stream to write data to.
- * @param	p_manager	the user event manager.
- */
-opj_bool j2k_read_tile_header(	opj_j2k_v2_t * p_j2k,
-					 	 	 	OPJ_UINT32 * p_tile_index,
-					 	 	 	OPJ_UINT32 * p_data_size,
-					 	 	 	OPJ_INT32 * p_tile_x0, OPJ_INT32 * p_tile_y0,
-					 	 	 	OPJ_INT32 * p_tile_x1, OPJ_INT32 * p_tile_y1,
-								OPJ_UINT32 * p_nb_comps,
-								opj_bool * p_go_on,
-								opj_stream_private_t *p_stream,
-								opj_event_mgr_t * p_manager )
-{
-	OPJ_UINT32 l_current_marker = J2K_MS_SOT;
-	OPJ_UINT32 l_marker_size;
-	const opj_dec_memory_marker_handler_t * l_marker_handler = 00;
-	opj_tcp_v2_t * l_tcp = NULL;
-	OPJ_UINT32 l_nb_tiles;
-
-	/* preconditions */
-	assert(p_stream != 00);
-	assert(p_j2k != 00);
-	assert(p_manager != 00);
-
-	/* Reach the End Of Codestream ?*/
-	if (p_j2k->m_specific_param.m_decoder.m_state == J2K_STATE_EOC){
-		l_current_marker = J2K_MS_EOC;
-	}
-	/* We need to encounter a SOT marker (a new tile-part header) */
-	else if	(p_j2k->m_specific_param.m_decoder.m_state != J2K_STATE_TPHSOT){
-		return OPJ_FALSE;
-	}
-
-	/* Read into the codestream until reach the EOC or ! can_decode ??? FIXME */
-	while ( (!p_j2k->m_specific_param.m_decoder.m_can_decode) && (l_current_marker != J2K_MS_EOC) ) {
-
-		/* Try to read until the Start Of Data is detected */
-		while (l_current_marker != J2K_MS_SOD) {
-
-			/* Try to read 2 bytes (the marker size) from stream and copy them into the buffer */
-			if (opj_stream_read_data(p_stream,p_j2k->m_specific_param.m_decoder.m_header_data,2,p_manager) != 2) {
-				opj_event_msg_v2(p_manager, EVT_ERROR, "Stream too short\n");
-				return OPJ_FALSE;
-			}
-
-			/* Read 2 bytes from the buffer as the marker size */
-			opj_read_bytes(p_j2k->m_specific_param.m_decoder.m_header_data,&l_marker_size,2);
-
-			/* Why this condition? FIXME */
-			if (p_j2k->m_specific_param.m_decoder.m_state & J2K_STATE_TPH){
-				p_j2k->m_specific_param.m_decoder.m_sot_length -= (l_marker_size + 2);
-			}
-			l_marker_size -= 2; /* Subtract the size of the marker ID already read */
-
-			/* Get the marker handler from the marker ID */
-			l_marker_handler = j2k_get_marker_handler(l_current_marker);
-
-			/* Check if the marker is known and if it is the right place to find it */
-			if (! (p_j2k->m_specific_param.m_decoder.m_state & l_marker_handler->states) ) {
-				opj_event_msg_v2(p_manager, EVT_ERROR, "Marker is not compliant with its position\n");
-				return OPJ_FALSE;
-			}
-/* FIXME manage case of unknown marker as in the main header ? */
-
-			/* Check if the marker size is compatible with the header data size */
-			if (l_marker_size > p_j2k->m_specific_param.m_decoder.m_header_data_size) {
-				p_j2k->m_specific_param.m_decoder.m_header_data = (OPJ_BYTE*)
-					opj_realloc(p_j2k->m_specific_param.m_decoder.m_header_data,l_marker_size);
-				if (p_j2k->m_specific_param.m_decoder.m_header_data == 00) {
-					return OPJ_FALSE;
-				}
-				p_j2k->m_specific_param.m_decoder.m_header_data_size = l_marker_size;
-			}
-
-			/* Try to read the rest of the marker segment from stream and copy them into the buffer */
-			if (opj_stream_read_data(p_stream,p_j2k->m_specific_param.m_decoder.m_header_data,l_marker_size,p_manager) != l_marker_size) {
-				opj_event_msg_v2(p_manager, EVT_ERROR, "Stream too short\n");
-				return OPJ_FALSE;
-			}
-
-			/* Read the marker segment with the correct marker handler */
-			if (! (*(l_marker_handler->handler))(p_j2k,p_j2k->m_specific_param.m_decoder.m_header_data,l_marker_size,p_manager)) {
-				opj_event_msg_v2(p_manager, EVT_ERROR, "Fail to read the current marker segment (%#x)\n", l_current_marker);
-				return OPJ_FALSE;
-			}
-
-			/* Add the marker to the codestream index*/
-			j2k_add_tlmarker_v2(p_j2k->m_current_tile_number,
-								p_j2k->cstr_index,
-								l_marker_handler->id,
-								(OPJ_UINT32) opj_stream_tell(p_stream) - l_marker_size - 4,
-								l_marker_size + 4 );
-
-			/* Keep the position of the last SOT marker read */
-			if ( l_marker_handler->id == J2K_MS_SOT ) {
-				OPJ_UINT32 sot_pos = (OPJ_UINT32) opj_stream_tell(p_stream) - l_marker_size - 4 ;
-				if (sot_pos > p_j2k->m_specific_param.m_decoder.m_last_sot_read_pos)
-				{
-					p_j2k->m_specific_param.m_decoder.m_last_sot_read_pos = sot_pos;
-				}
-			}
-
-
-			if (p_j2k->m_specific_param.m_decoder.m_skip_data) {
-				/* Skip the rest of the tile part header*/
-				if (opj_stream_skip(p_stream,p_j2k->m_specific_param.m_decoder.m_sot_length,p_manager) != p_j2k->m_specific_param.m_decoder.m_sot_length) {
-					opj_event_msg_v2(p_manager, EVT_ERROR, "Stream too short\n");
-					return OPJ_FALSE;
-				}
-				l_current_marker = J2K_MS_SOD; /* Normally we reached a SOD */
-			}
-			else {
-				/* Try to read 2 bytes (the next marker ID) from stream and copy them into the buffer*/
-				if (opj_stream_read_data(p_stream,p_j2k->m_specific_param.m_decoder.m_header_data,2,p_manager) != 2) {
-					opj_event_msg_v2(p_manager, EVT_ERROR, "Stream too short\n");
-					return OPJ_FALSE;
-				}
-				/* Read 2 bytes from the buffer as the new marker ID */
-				opj_read_bytes(p_j2k->m_specific_param.m_decoder.m_header_data,&l_current_marker,2);
-			}
-		}
-
-		/* If we didn't skip data before, we need to read the SOD marker*/
-		if (! p_j2k->m_specific_param.m_decoder.m_skip_data) {
-			/* Try to read the SOD marker and skip data ? FIXME */
-			if (! j2k_read_sod_v2(p_j2k, p_stream, p_manager)) {
-				return OPJ_FALSE;
-			}
-
-
-
-			if (! p_j2k->m_specific_param.m_decoder.m_can_decode){
-				/* Try to read 2 bytes (the next marker ID) from stream and copy them into the buffer */
-				if (opj_stream_read_data(p_stream,p_j2k->m_specific_param.m_decoder.m_header_data,2,p_manager) != 2) {
-					opj_event_msg_v2(p_manager, EVT_ERROR, "Stream too short\n");
-					return OPJ_FALSE;
-				}
-
-				/* Read 2 bytes from buffer as the new marker ID */
-				opj_read_bytes(p_j2k->m_specific_param.m_decoder.m_header_data,&l_current_marker,2);
-			}
-		}
-		else {
-			/* Indicate we will try to read a new tile-part header*/
-			p_j2k->m_specific_param.m_decoder.m_skip_data = 0;
-			p_j2k->m_specific_param.m_decoder.m_can_decode = 0;
-			p_j2k->m_specific_param.m_decoder.m_state = J2K_STATE_TPHSOT;
-
-			/* Try to read 2 bytes (the next marker ID) from stream and copy them into the buffer */
-			if (opj_stream_read_data(p_stream,p_j2k->m_specific_param.m_decoder.m_header_data,2,p_manager) != 2) {
-				opj_event_msg_v2(p_manager, EVT_ERROR, "Stream too short\n");
-				return OPJ_FALSE;
-			}
-
-			/* Read 2 bytes from buffer as the new marker ID */
-			opj_read_bytes(p_j2k->m_specific_param.m_decoder.m_header_data,&l_current_marker,2);
-		}
-	}
-
-	/* Current marker is the EOC marker ?*/
-	if (l_current_marker == J2K_MS_EOC) {
-		if (p_j2k->m_specific_param.m_decoder.m_state != J2K_STATE_EOC ){
-			p_j2k->m_current_tile_number = 0;
-			p_j2k->m_specific_param.m_decoder.m_state = J2K_STATE_EOC;
-		}
-	}
-
-	/* FIXME DOC ???*/
-	if ( ! p_j2k->m_specific_param.m_decoder.m_can_decode) {
-		l_tcp = p_j2k->m_cp.tcps + p_j2k->m_current_tile_number;
-		l_nb_tiles = p_j2k->m_cp.th * p_j2k->m_cp.tw;
-
-		while( (p_j2k->m_current_tile_number < l_nb_tiles) && (l_tcp->m_data == 00) ) {
-			++p_j2k->m_current_tile_number;
-			++l_tcp;
-		}
-
-		if (p_j2k->m_current_tile_number == l_nb_tiles) {
-			*p_go_on = OPJ_FALSE;
-			return OPJ_TRUE;
-		}
-	}
-
-	/*FIXME ???*/
-	if (! tcd_init_decode_tile(p_j2k->m_tcd, p_j2k->m_current_tile_number)) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Cannot decode tile, memory error\n");
-		return OPJ_FALSE;
-	}
-
-	opj_event_msg_v2(p_manager, EVT_INFO, "Header of tile %d / %d has been read.\n",
-			p_j2k->m_current_tile_number, (p_j2k->m_cp.th * p_j2k->m_cp.tw) - 1);
-
-	*p_tile_index = p_j2k->m_current_tile_number;
-	*p_go_on = OPJ_TRUE;
-	*p_data_size = tcd_get_decoded_tile_size(p_j2k->m_tcd);
-	*p_tile_x0 = p_j2k->m_tcd->tcd_image->tiles->x0;
-	*p_tile_y0 = p_j2k->m_tcd->tcd_image->tiles->y0;
-	*p_tile_x1 = p_j2k->m_tcd->tcd_image->tiles->x1;
-	*p_tile_y1 = p_j2k->m_tcd->tcd_image->tiles->y1;
-	*p_nb_comps = p_j2k->m_tcd->tcd_image->tiles->numcomps;
-
-	 p_j2k->m_specific_param.m_decoder.m_state |= 0x0080;// FIXME J2K_DEC_STATE_DATA;
-
-	return OPJ_TRUE;
-}
-
-
-opj_bool j2k_decode_tile (	opj_j2k_v2_t * p_j2k,
-							OPJ_UINT32 p_tile_index,
-							OPJ_BYTE * p_data,
-							OPJ_UINT32 p_data_size,
-							opj_stream_private_t *p_stream,
-							opj_event_mgr_t * p_manager )
-{
-	OPJ_UINT32 l_current_marker;
-	OPJ_BYTE l_data [2];
-	opj_tcp_v2_t * l_tcp;
-
-	/* preconditions */
-	assert(p_stream != 00);
-	assert(p_j2k != 00);
-	assert(p_manager != 00);
-
-	if ( !(p_j2k->m_specific_param.m_decoder.m_state & 0x0080/*FIXME J2K_DEC_STATE_DATA*/)
-		|| (p_tile_index != p_j2k->m_current_tile_number) ) {
-		return OPJ_FALSE;
-	}
-
-	l_tcp = &(p_j2k->m_cp.tcps[p_tile_index]);
-	if (! l_tcp->m_data) {
-		j2k_tcp_destroy(l_tcp);
-		return OPJ_FALSE;
-	}
-
-	if (! tcd_decode_tile_v2(	p_j2k->m_tcd,
-								l_tcp->m_data,
-								l_tcp->m_data_size,
-								p_tile_index,
-								p_j2k->cstr_index) ) {
-		j2k_tcp_destroy(l_tcp);
-		p_j2k->m_specific_param.m_decoder.m_state |= 0x8000;//FIXME J2K_DEC_STATE_ERR;
-		return OPJ_FALSE;
-	}
-
-	if (! tcd_update_tile_data(p_j2k->m_tcd,p_data,p_data_size)) {
-		return OPJ_FALSE;
-	}
-
-	/* To avoid to destroy the tcp which can be useful when we try to decode a tile decoded before (cf j2k_random_tile_access)
-	 * we destroy just the data which will be re-read in read_tile_header*/
-	/*j2k_tcp_destroy(l_tcp);
-	p_j2k->m_tcd->tcp = 0;*/
-	j2k_tcp_data_destroy(l_tcp);
-
-	p_j2k->m_specific_param.m_decoder.m_can_decode = 0;
-	p_j2k->m_specific_param.m_decoder.m_state &= (~ (0x0080));// FIXME J2K_DEC_STATE_DATA);
-
-	if (p_j2k->m_specific_param.m_decoder.m_state != 0x0100){ //FIXME J2K_DEC_STATE_EOC)
-		if (opj_stream_read_data(p_stream,l_data,2,p_manager) != 2) {
-			opj_event_msg_v2(p_manager, EVT_ERROR, "Stream too short\n");
-			return OPJ_FALSE;
-		}
-
-		opj_read_bytes(l_data,&l_current_marker,2);
-
-		if (l_current_marker == J2K_MS_EOC) {
-			p_j2k->m_current_tile_number = 0;
-			p_j2k->m_specific_param.m_decoder.m_state =  0x0100;//FIXME J2K_DEC_STATE_EOC;
-		}
-		else if (l_current_marker != J2K_MS_SOT)
-		{
-			opj_event_msg_v2(p_manager, EVT_ERROR, "Stream too short, expected SOT\n");
-			return OPJ_FALSE;
-		}
-	}
-
-	return OPJ_TRUE;
-}
-
-
-opj_bool j2k_update_image_data (opj_tcd_v2_t * p_tcd, OPJ_BYTE * p_data, opj_image_t* p_output_image)
-{
-	OPJ_UINT32 i,j,k = 0;
-	OPJ_UINT32 l_width_src,l_height_src;
-	OPJ_UINT32 l_width_dest,l_height_dest;
-	OPJ_INT32 l_offset_x0_src, l_offset_y0_src, l_offset_x1_src, l_offset_y1_src;
-	OPJ_INT32 l_start_offset_src, l_line_offset_src, l_end_offset_src ;
-	OPJ_UINT32 l_start_x_dest , l_start_y_dest;
-	OPJ_UINT32 l_x0_dest, l_y0_dest, l_x1_dest, l_y1_dest;
-	OPJ_INT32 l_start_offset_dest, l_line_offset_dest;
-
-	opj_image_comp_t * l_img_comp_src = 00;
-	opj_image_comp_t * l_img_comp_dest = 00;
-
-	opj_tcd_tilecomp_v2_t * l_tilec = 00;
-	opj_image_t * l_image_src = 00;
-	OPJ_UINT32 l_size_comp, l_remaining;
-	OPJ_INT32 * l_dest_ptr;
-	opj_tcd_resolution_v2_t* l_res= 00;
-
-	l_tilec = p_tcd->tcd_image->tiles->comps;
-	l_image_src = p_tcd->image;
-	l_img_comp_src = l_image_src->comps;
-
-	l_img_comp_dest = p_output_image->comps;
-
-	for (i=0; i<l_image_src->numcomps; i++) {
-
-		/* Allocate output component buffer if necessary */
-		if (!l_img_comp_dest->data) {
-
-			l_img_comp_dest->data = (OPJ_INT32*) opj_calloc(l_img_comp_dest->w * l_img_comp_dest->h, sizeof(OPJ_INT32));
-			if (! l_img_comp_dest->data) {
-				return OPJ_FALSE;
-			}
-		}
-
-		/* Copy info from decoded comp image to output image */
-		l_img_comp_dest->resno_decoded = l_img_comp_src->resno_decoded;
-
-		/*-----*/
-		/* Compute the precision of the output buffer */
-		l_size_comp = l_img_comp_src->prec >> 3; /*(/ 8)*/
-		l_remaining = l_img_comp_src->prec & 7;  /* (%8) */
-		l_res = l_tilec->resolutions + l_img_comp_src->resno_decoded;
-
-		if (l_remaining) {
-			++l_size_comp;
-		}
-
-		if (l_size_comp == 3) {
-			l_size_comp = 4;
-		}
-		/*-----*/
-
-		/* Current tile component size*/
-		/*if (i == 0) {
-		fprintf(stdout, "SRC: l_res_x0=%d, l_res_x1=%d, l_res_y0=%d, l_res_y1=%d\n",
-				l_res->x0, l_res->x1, l_res->y0, l_res->y1);
-		}*/
-
-		l_width_src = (l_res->x1 - l_res->x0);
-		l_height_src = (l_res->y1 - l_res->y0);
-
-		/* Border of the current output component*/
-		l_x0_dest = int_ceildivpow2(l_img_comp_dest->x0, l_img_comp_dest->factor);
-		l_y0_dest = int_ceildivpow2(l_img_comp_dest->y0, l_img_comp_dest->factor);
-		l_x1_dest = l_x0_dest + l_img_comp_dest->w;
-		l_y1_dest = l_y0_dest + l_img_comp_dest->h;
-
-		/*if (i == 0) {
-		fprintf(stdout, "DEST: l_x0_dest=%d, l_x1_dest=%d, l_y0_dest=%d, l_y1_dest=%d (%d)\n",
-				l_x0_dest, l_x1_dest, l_y0_dest, l_y1_dest, l_img_comp_dest->factor );
-		}*/
-
-		/*-----*/
-		/* Compute the area (l_offset_x0_src, l_offset_y0_src, l_offset_x1_src, l_offset_y1_src)
-		 * of the input buffer (decoded tile component) which will be move
-		 * in the output buffer. Compute the area of the output buffer (l_start_x_dest,
-		 * l_start_y_dest, l_width_dest, l_height_dest)  which will be modified
-		 * by this input area.
-		 * */
-		if ( l_x0_dest < l_res->x0 ) {
-			l_start_x_dest = l_res->x0 - l_x0_dest;
-			l_offset_x0_src = 0;
-
-			if ( l_x1_dest >= l_res->x1 ) {
-				l_width_dest = l_width_src;
-				l_offset_x1_src = 0;
-			}
-			else {
-				l_width_dest = l_x1_dest - l_res->x0 ;
-				l_offset_x1_src = l_width_src - l_width_dest;
-			}
-		}
-		else {
-			l_start_x_dest = 0 ;
-			l_offset_x0_src = l_x0_dest - l_res->x0;
-
-			if ( l_x1_dest >= l_res->x1 ) {
-				l_width_dest = l_width_src - l_offset_x0_src;
-				l_offset_x1_src = 0;
-			}
-			else {
-				l_width_dest = l_img_comp_dest->w ;
-				l_offset_x1_src = l_res->x1 - l_x1_dest;
-			}
-		}
-
-		if ( l_y0_dest < l_res->y0 ) {
-			l_start_y_dest = l_res->y0 - l_y0_dest;
-			l_offset_y0_src = 0;
-
-			if ( l_y1_dest >= l_res->y1 ) {
-				l_height_dest = l_height_src;
-				l_offset_y1_src = 0;
-			}
-			else {
-				l_height_dest = l_y1_dest - l_res->y0 ;
-				l_offset_y1_src =  l_height_src - l_height_dest;
-			}
-		}
-		else {
-			l_start_y_dest = 0 ;
-			l_offset_y0_src = l_y0_dest - l_res->y0;
-
-			if ( l_y1_dest >= l_res->y1 ) {
-				l_height_dest = l_height_src - l_offset_y0_src;
-				l_offset_y1_src = 0;
-			}
-			else {
-				l_height_dest = l_img_comp_dest->h ;
-				l_offset_y1_src = l_res->y1 - l_y1_dest;
-			}
-		}
-
-		if( (l_offset_x0_src < 0 ) || (l_offset_y0_src < 0 ) || (l_offset_x1_src < 0 ) || (l_offset_y1_src < 0 ) ){
-			return OPJ_FALSE;
-		}
-		/*-----*/
-
-		/* Compute the input buffer offset */
-		l_start_offset_src = l_offset_x0_src + l_offset_y0_src * l_width_src;
-		l_line_offset_src = l_offset_x1_src + l_offset_x0_src;
-		l_end_offset_src = l_offset_y1_src * l_width_src - l_offset_x0_src;
-
-		/* Compute the output buffer offset */
-		l_start_offset_dest = l_start_x_dest + l_start_y_dest * l_img_comp_dest->w;
-		l_line_offset_dest = l_img_comp_dest->w - l_width_dest;
-
-		/* Move the output buffer to the first place where we will write*/
-		l_dest_ptr = l_img_comp_dest->data + l_start_offset_dest;
-
-		/*if (i == 0) {
-			fprintf(stdout, "COMPO[%d]:\n",i);
-			fprintf(stdout, "SRC: l_start_x_src=%d, l_start_y_src=%d, l_width_src=%d, l_height_src=%d\n"
-					"\t tile offset:%d, %d, %d, %d\n"
-					"\t buffer offset: %d; %d, %d\n",
-					l_res->x0, l_res->y0, l_width_src, l_height_src,
-					l_offset_x0_src, l_offset_y0_src, l_offset_x1_src, l_offset_y1_src,
-					l_start_offset_src, l_line_offset_src, l_end_offset_src);
-
-			fprintf(stdout, "DEST: l_start_x_dest=%d, l_start_y_dest=%d, l_width_dest=%d, l_height_dest=%d\n"
-					"\t start offset: %d, line offset= %d\n",
-					l_start_x_dest, l_start_y_dest, l_width_dest, l_height_dest, l_start_offset_dest, l_line_offset_dest);
-		}*/
-
-
-		switch (l_size_comp) {
-			case 1:
-				{
-					OPJ_CHAR * l_src_ptr = (OPJ_CHAR*) p_data;
-					l_src_ptr += l_start_offset_src; /* Move to the first place where we will read*/
-
-					if (l_img_comp_src->sgnd) {
-						for (j = 0 ; j < l_height_dest ; ++j) {
-							for ( k = 0 ; k < l_width_dest ; ++k) {
-								*(l_dest_ptr++) = (OPJ_INT32) (*(l_src_ptr++)); /* Copy only the data needed for the output image */
-							}
-
-							l_dest_ptr+= l_line_offset_dest; /* Move to the next place where we will write */
-							l_src_ptr += l_line_offset_src ; /* Move to the next place where we will read */
-						}
-					}
-					else {
-						for ( j = 0 ; j < l_height_dest ; ++j ) {
-							for ( k = 0 ; k < l_width_dest ; ++k) {
-								*(l_dest_ptr++) = (OPJ_INT32) ((*(l_src_ptr++))&0xff);
-							}
-
-							l_dest_ptr+= l_line_offset_dest;
-							l_src_ptr += l_line_offset_src;
-						}
-					}
-
-					l_src_ptr += l_end_offset_src; /* Move to the end of this component-part of the input buffer */
-					p_data = (OPJ_BYTE*) l_src_ptr; /* Keep the current position for the next component-part */
-				}
-				break;
-			case 2:
-				{
-					OPJ_INT16 * l_src_ptr = (OPJ_INT16 *) p_data;
-					l_src_ptr += l_start_offset_src;
-
-					if (l_img_comp_src->sgnd) {
-						for (j=0;j<l_height_dest;++j) {
-							for (k=0;k<l_width_dest;++k) {
-								*(l_dest_ptr++) = *(l_src_ptr++);
-							}
-
-							l_dest_ptr+= l_line_offset_dest;
-							l_src_ptr += l_line_offset_src ;
-						}
-					}
-					else {
-						for (j=0;j<l_height_dest;++j) {
-							for (k=0;k<l_width_dest;++k) {
-								*(l_dest_ptr++) = (*(l_src_ptr++))&0xffff;
-							}
-
-							l_dest_ptr+= l_line_offset_dest;
-							l_src_ptr += l_line_offset_src ;
-						}
-					}
-
-					l_src_ptr += l_end_offset_src;
-					p_data = (OPJ_BYTE*) l_src_ptr;
-				}
-				break;
-			case 4:
-				{
-					OPJ_INT32 * l_src_ptr = (OPJ_INT32 *) p_data;
-					l_src_ptr += l_start_offset_src;
-
-					for (j=0;j<l_height_dest;++j) {
-						for (k=0;k<l_width_dest;++k) {
-							*(l_dest_ptr++) = (*(l_src_ptr++));
-						}
-
-						l_dest_ptr+= l_line_offset_dest;
-						l_src_ptr += l_line_offset_src ;
-					}
-
-					l_src_ptr += l_end_offset_src;
-					p_data = (OPJ_BYTE*) l_src_ptr;
-				}
-				break;
-		}
-
-		++l_img_comp_dest;
-		++l_img_comp_src;
-		++l_tilec;
-	}
-
-	return OPJ_TRUE;
-}
-
-/**
- * Sets the given area to be decoded. This function should be called right after opj_read_header and before any tile header reading.
- *
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_start_x		the left position of the rectangle to decode (in image coordinates).
- * @param	p_end_x			the right position of the rectangle to decode (in image coordinates).
- * @param	p_start_y		the up position of the rectangle to decode (in image coordinates).
- * @param	p_end_y			the bottom position of the rectangle to decode (in image coordinates).
- * @param	p_manager		the user event manager
- *
- * @return	true			if the area could be set.
- */
-opj_bool j2k_set_decode_area(	opj_j2k_v2_t *p_j2k,
-								opj_image_t* p_image,
-								OPJ_INT32 p_start_x, OPJ_INT32 p_start_y,
-								OPJ_INT32 p_end_x, OPJ_INT32 p_end_y,
-								struct opj_event_mgr * p_manager )
-{
-	opj_cp_v2_t * l_cp = &(p_j2k->m_cp);
-	opj_image_t * l_image = p_j2k->m_private_image;
-
-	OPJ_UINT32 it_comp;
-	OPJ_INT32 l_comp_x1, l_comp_y1;
-	opj_image_comp_t* l_img_comp = NULL;
-
-	/* Check if we are read the main header */
-	if (p_j2k->m_specific_param.m_decoder.m_state != J2K_STATE_TPHSOT) { // FIXME J2K_DEC_STATE_TPHSOT)
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Need to decode the main header before begin to decode the remaining codestream");
-		return OPJ_FALSE;
-	}
-
-	if ( !p_start_x && !p_start_y && !p_end_x && !p_end_y){
-		opj_event_msg_v2(p_manager, EVT_INFO, "No decoded area parameters, set the decoded area to the all image\n");
-
-		p_j2k->m_specific_param.m_decoder.m_start_tile_x = 0;
-		p_j2k->m_specific_param.m_decoder.m_start_tile_y = 0;
-		p_j2k->m_specific_param.m_decoder.m_end_tile_x = l_cp->tw;
-		p_j2k->m_specific_param.m_decoder.m_end_tile_y = l_cp->th;
-
-		return OPJ_TRUE;
-	}
-
-	/* ----- */
-	/* Check if the positions provided by the user are correct */
-
-	/* Left */
-	if (p_start_x > l_image->x1 ) {
-		opj_event_msg_v2(p_manager, EVT_ERROR,
-			"Left position of the decoded area (region_x0=%d) is outside the image area (Xsiz=%d).\n",
-			p_start_x, l_image->x1);
-		return OPJ_FALSE;
-	}
-	else if (p_start_x < l_image->x0){
-		opj_event_msg_v2(p_manager, EVT_WARNING,
-				"Left position of the decoded area (region_x0=%d) is outside the image area (XOsiz=%d).\n",
-				p_start_x, l_image->x0);
-		p_j2k->m_specific_param.m_decoder.m_start_tile_x = 0;
-		p_image->x0 = l_image->x0;
-	}
-	else {
-		p_j2k->m_specific_param.m_decoder.m_start_tile_x = (p_start_x - l_cp->tx0) / l_cp->tdx;
-		p_image->x0 = p_start_x;
-	}
-
-	/* Up */
-	if (p_start_y > l_image->y1){
-		opj_event_msg_v2(p_manager, EVT_ERROR,
-				"Up position of the decoded area (region_y0=%d) is outside the image area (Ysiz=%d).\n",
-				p_start_y, l_image->y1);
-		return OPJ_FALSE;
-	}
-	else if (p_start_y < l_image->y0){
-		opj_event_msg_v2(p_manager, EVT_WARNING,
-				"Up position of the decoded area (region_y0=%d) is outside the image area (YOsiz=%d).\n",
-				p_start_y, l_image->y0);
-		p_j2k->m_specific_param.m_decoder.m_start_tile_y = 0;
-		p_image->y0 = l_image->y0;
-	}
-	else {
-		p_j2k->m_specific_param.m_decoder.m_start_tile_y = (p_start_y - l_cp->ty0) / l_cp->tdy;
-		p_image->y0 = p_start_y;
-	}
-
-	/* Right */
-	if (p_end_x < l_image->x0) {
-		opj_event_msg_v2(p_manager, EVT_ERROR,
-			"Right position of the decoded area (region_x1=%d) is outside the image area (XOsiz=%d).\n",
-			p_end_x, l_image->x0);
-		return OPJ_FALSE;
-	}
-	else if (p_end_x > l_image->x1) {
-		opj_event_msg_v2(p_manager, EVT_WARNING,
-			"Right position of the decoded area (region_x1=%d) is outside the image area (Xsiz=%d).\n",
-			p_end_x, l_image->x1);
-		p_j2k->m_specific_param.m_decoder.m_end_tile_x = l_cp->tw;
-		p_image->x1 = l_image->x1;
-	}
-	else {
-		p_j2k->m_specific_param.m_decoder.m_end_tile_x = int_ceildiv((p_end_x - l_cp->tx0), l_cp->tdx);
-		p_image->x1 = p_end_x;
-	}
-
-	/* Bottom */
-	if (p_end_y < l_image->y0) {
-		opj_event_msg_v2(p_manager, EVT_ERROR,
-			"Right position of the decoded area (region_y1=%d) is outside the image area (YOsiz=%d).\n",
-			p_end_y, l_image->y0);
-		return OPJ_FALSE;
-	}
-	if (p_end_y > l_image->y1){
-		opj_event_msg_v2(p_manager, EVT_WARNING,
-			"Bottom position of the decoded area (region_y1=%d) is outside the image area (Ysiz=%d).\n",
-			p_end_y, l_image->y1);
-		p_j2k->m_specific_param.m_decoder.m_end_tile_y = l_cp->th;
-		p_image->y1 = l_image->y1;
-	}
-	else{
-		p_j2k->m_specific_param.m_decoder.m_end_tile_y = int_ceildiv((p_end_y - l_cp->ty0), l_cp->tdy);
-		p_image->y1 = p_end_y;
-	}
-	/* ----- */
-
-	p_j2k->m_specific_param.m_decoder.m_discard_tiles = 1;
-
-	l_img_comp = p_image->comps;
-	for (it_comp=0; it_comp < p_image->numcomps; ++it_comp)
-	{
-		OPJ_INT32 l_h,l_w;
-
-		l_img_comp->x0 = int_ceildiv(p_image->x0, l_img_comp->dx);
-		l_img_comp->y0 = int_ceildiv(p_image->y0, l_img_comp->dy);
-		l_comp_x1 = int_ceildiv(p_image->x1, l_img_comp->dx);
-		l_comp_y1 = int_ceildiv(p_image->y1, l_img_comp->dy);
-
-		l_w = int_ceildivpow2(l_comp_x1, l_img_comp->factor)
-				- int_ceildivpow2(l_img_comp->x0, l_img_comp->factor);
-		if (l_w < 0){
-			opj_event_msg_v2(p_manager, EVT_ERROR,
-				"Size x of the decoded component image is incorrect (comp[%d].w=%d).\n",
-				it_comp, l_w);
-			return OPJ_FALSE;
-		}
-		l_img_comp->w = l_w;
-
-		l_h = int_ceildivpow2(l_comp_y1, l_img_comp->factor)
-				- int_ceildivpow2(l_img_comp->y0, l_img_comp->factor);
-		if (l_h < 0){
-			opj_event_msg_v2(p_manager, EVT_ERROR,
-				"Size y of the decoded component image is incorrect (comp[%d].h=%d).\n",
-				it_comp, l_h);
-			return OPJ_FALSE;
-		}
-		l_img_comp->h = l_h;
-
-		l_img_comp++;
-	}
-
-	opj_event_msg_v2( p_manager, EVT_INFO,"Setting decoding area to %d,%d,%d,%d\n",
-			p_image->x0, p_image->y0, p_image->x1, p_image->y1);
-
-
-	return OPJ_TRUE;
-}
-
-
-/* ----------------------------------------------------------------------- */
-/* J2K / JPT decoder interface                                             */
-/* ----------------------------------------------------------------------- */
-/**
- * Creates a J2K decompression structure.
- *
- * @return a handle to a J2K decompressor if successful, NULL otherwise.
-*/
-opj_j2k_v2_t* j2k_create_decompress_v2()
-{
-	opj_j2k_v2_t *l_j2k = (opj_j2k_v2_t*) opj_malloc(sizeof(opj_j2k_v2_t));
-	if (!l_j2k) {
-		return 00;
-	}
-	memset(l_j2k,0,sizeof(opj_j2k_v2_t));
-
-	l_j2k->m_is_decoder = 1;
-	l_j2k->m_cp.m_is_decoder = 1;
-
-	l_j2k->m_specific_param.m_decoder.m_default_tcp = (opj_tcp_v2_t*) opj_malloc(sizeof(opj_tcp_v2_t));
-	if (!l_j2k->m_specific_param.m_decoder.m_default_tcp) {
-		j2k_destroy(l_j2k);
-		return 00;
-	}
-	memset(l_j2k->m_specific_param.m_decoder.m_default_tcp,0,sizeof(opj_tcp_v2_t));
-
-	l_j2k->m_specific_param.m_decoder.m_header_data = (OPJ_BYTE *) opj_malloc(J2K_DEFAULT_HEADER_SIZE);
-	if (! l_j2k->m_specific_param.m_decoder.m_header_data) {
-		j2k_destroy(l_j2k);
-		return 00;
-	}
-
-	l_j2k->m_specific_param.m_decoder.m_header_data_size = J2K_DEFAULT_HEADER_SIZE;
-
-	l_j2k->m_specific_param.m_decoder.m_tile_ind_to_dec = -1 ;
-
-	l_j2k->m_specific_param.m_decoder.m_last_sot_read_pos = 0 ;
-
-	/* codestream index creation */
-	l_j2k->cstr_index = j2k_create_cstr_index();
-
-			/*(opj_codestream_index_t*) opj_malloc(sizeof(opj_codestream_index_t));
-	if (!l_j2k->cstr_index){
-		j2k_destroy(l_j2k);
-		return NULL;
-	}
-
-	l_j2k->cstr_index->marker = (opj_marker_info_t*) opj_malloc(100 * sizeof(opj_marker_info_t));
-*/
-
-	/* validation list creation */
-	l_j2k->m_validation_list = opj_procedure_list_create();
-	if (! l_j2k->m_validation_list) {
-		j2k_destroy(l_j2k);
-		return 00;
-	}
-
-	/* execution list creation */
-	l_j2k->m_procedure_list = opj_procedure_list_create();
-	if (! l_j2k->m_procedure_list) {
-		j2k_destroy(l_j2k);
-		return 00;
-	}
-
-	return l_j2k;
-}
-
-
-opj_codestream_index_t* j2k_create_cstr_index(void)
-{
-	opj_codestream_index_t* cstr_index = (opj_codestream_index_t*)
-			opj_calloc(1,sizeof(opj_codestream_index_t));
-	if (!cstr_index)
-		return NULL;
-
-	cstr_index->maxmarknum = 100;
-	cstr_index->marknum = 0;
-	cstr_index->marker = (opj_marker_info_t*)
-			opj_calloc(cstr_index->maxmarknum, sizeof(opj_marker_info_t));
-	if (!cstr_index-> marker)
-		return NULL;
-
-	cstr_index->tile_index = NULL;
-
-	return cstr_index;
-}
-
-/**
- * Reads a SPCod or SPCoc element, i.e. the coding style of a given component of a tile.
- * @param	p_header_data	the data contained in the COM box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the COM marker.
- * @param	p_manager		the user event manager.
-*/
-opj_bool j2k_read_SPCod_SPCoc(
-						    opj_j2k_v2_t *p_j2k,
-							OPJ_UINT32 compno,
-							OPJ_BYTE * p_header_data,
-							OPJ_UINT32 * p_header_size,
-							struct opj_event_mgr * p_manager
-							)
-{
-	OPJ_UINT32 i, l_tmp;
-	opj_cp_v2_t *l_cp = NULL;
-	opj_tcp_v2_t *l_tcp = NULL;
-	opj_tccp_t *l_tccp = NULL;
-	OPJ_BYTE * l_current_ptr = NULL;
-
-	/* preconditions */
-	assert(p_j2k != 00);
-	assert(p_manager != 00);
-	assert(p_header_data != 00);
-
-	l_cp = &(p_j2k->m_cp);
-	l_tcp = (p_j2k->m_specific_param.m_decoder.m_state == J2K_STATE_TPH) ?
-				&l_cp->tcps[p_j2k->m_current_tile_number] :
-				p_j2k->m_specific_param.m_decoder.m_default_tcp;
-
-	/* precondition again */
-	assert(compno < p_j2k->m_private_image->numcomps);
-
-	l_tccp = &l_tcp->tccps[compno];
-	l_current_ptr = p_header_data;
-
-	/* make sure room is sufficient */
-	if (*p_header_size < 5) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading SPCod SPCoc element\n");
-		return OPJ_FALSE;
-	}
-
-	opj_read_bytes(l_current_ptr, &l_tccp->numresolutions ,1);		/* SPcox (D) */
-	++l_tccp->numresolutions;										/* tccp->numresolutions = read() + 1 */
-	++l_current_ptr;
-
-	/* If user wants to remove more resolutions than the codestream contains, return error */
-	if (l_cp->m_specific_param.m_dec.m_reduce >= l_tccp->numresolutions) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error decoding component %d.\nThe number of resolutions to remove is higher than the number "
-					"of resolutions of this component\nModify the cp_reduce parameter.\n\n", compno);
-		p_j2k->m_specific_param.m_decoder.m_state |= 0x8000;// FIXME J2K_DEC_STATE_ERR;
-		return OPJ_FALSE;
-	}
-
-	opj_read_bytes(l_current_ptr,&l_tccp->cblkw ,1);		/* SPcoc (E) */
-	++l_current_ptr;
-	l_tccp->cblkw += 2;
-
-	opj_read_bytes(l_current_ptr,&l_tccp->cblkh ,1);		/* SPcoc (F) */
-	++l_current_ptr;
-	l_tccp->cblkh += 2;
-
-	opj_read_bytes(l_current_ptr,&l_tccp->cblksty ,1);		/* SPcoc (G) */
-	++l_current_ptr;
-
-	opj_read_bytes(l_current_ptr,&l_tccp->qmfbid ,1);		/* SPcoc (H) */
-	++l_current_ptr;
-
-	*p_header_size = *p_header_size - 5;
-
-	/* use custom precinct size ? */
-	if (l_tccp->csty & J2K_CCP_CSTY_PRT) {
-		if (*p_header_size < l_tccp->numresolutions) {
-			opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading SPCod SPCoc element\n");
-			return OPJ_FALSE;
-		}
-
-		for	(i = 0; i < l_tccp->numresolutions; ++i) {
-			opj_read_bytes(l_current_ptr,&l_tmp ,1);		/* SPcoc (I_i) */
-			++l_current_ptr;
-			l_tccp->prcw[i] = l_tmp & 0xf;
-			l_tccp->prch[i] = l_tmp >> 4;
-		}
-
-		*p_header_size = *p_header_size - l_tccp->numresolutions;
-	}
-	else {
-		/* set default size for the precinct width and height */
-		for	(i = 0; i < l_tccp->numresolutions; ++i) {
-			l_tccp->prcw[i] = 15;
-			l_tccp->prch[i] = 15;
-		}
-	}
-
-#ifdef WIP_REMOVE_MSD
-	/* INDEX >> */
-	if (p_j2k->cstr_info && compno == 0) {
-		OPJ_UINT32 l_data_size = l_tccp->numresolutions * sizeof(OPJ_UINT32);
-
-		p_j2k->cstr_info->tile[p_j2k->m_current_tile_number].tccp_info[compno].cblkh = l_tccp->cblkh;
-		p_j2k->cstr_info->tile[p_j2k->m_current_tile_number].tccp_info[compno].cblkw = l_tccp->cblkw;
-		p_j2k->cstr_info->tile[p_j2k->m_current_tile_number].tccp_info[compno].numresolutions = l_tccp->numresolutions;
-		p_j2k->cstr_info->tile[p_j2k->m_current_tile_number].tccp_info[compno].cblksty = l_tccp->cblksty;
-		p_j2k->cstr_info->tile[p_j2k->m_current_tile_number].tccp_info[compno].qmfbid = l_tccp->qmfbid;
-
-
-		memcpy(p_j2k->cstr_info->tile[p_j2k->m_current_tile_number].pdx,l_tccp->prcw, l_data_size);
-		memcpy(p_j2k->cstr_info->tile[p_j2k->m_current_tile_number].pdy,l_tccp->prch, l_data_size);
-	}
-	/* << INDEX */
-#endif
-
-	return OPJ_TRUE;
-}
-
-/**
- * Copies the tile component parameters of all the component from the first tile component.
- *
- * @param		p_j2k		the J2k codec.
- */
-void j2k_copy_tile_component_parameters( opj_j2k_v2_t *p_j2k )
-{
-	// loop
-	OPJ_UINT32 i;
-	opj_cp_v2_t *l_cp = NULL;
-	opj_tcp_v2_t *l_tcp = NULL;
-	opj_tccp_t *l_ref_tccp = NULL, *l_copied_tccp = NULL;
-	OPJ_UINT32 l_prc_size;
-
-	/* preconditions */
-	assert(p_j2k != 00);
-
-	l_cp = &(p_j2k->m_cp);
-	l_tcp = (p_j2k->m_specific_param.m_decoder.m_state == J2K_STATE_TPH) ? /* FIXME J2K_DEC_STATE_TPH*/
-				&l_cp->tcps[p_j2k->m_current_tile_number] :
-				p_j2k->m_specific_param.m_decoder.m_default_tcp;
-
-	l_ref_tccp = &l_tcp->tccps[0];
-	l_copied_tccp = l_ref_tccp + 1;
-	l_prc_size = l_ref_tccp->numresolutions * sizeof(OPJ_UINT32);
-
-	for	(i=1; i<p_j2k->m_private_image->numcomps; ++i) {
-		l_copied_tccp->numresolutions = l_ref_tccp->numresolutions;
-		l_copied_tccp->cblkw = l_ref_tccp->cblkw;
-		l_copied_tccp->cblkh = l_ref_tccp->cblkh;
-		l_copied_tccp->cblksty = l_ref_tccp->cblksty;
-		l_copied_tccp->qmfbid = l_ref_tccp->qmfbid;
-		memcpy(l_copied_tccp->prcw,l_ref_tccp->prcw,l_prc_size);
-		memcpy(l_copied_tccp->prch,l_ref_tccp->prch,l_prc_size);
-		++l_copied_tccp;
-	}
-}
-
-/**
- * Reads a SQcd or SQcc element, i.e. the quantization values of a band.
- *
- * @param	p_comp_no		the component being targeted.
- * @param	p_header_data	the data contained in the COM box.
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_header_size	the size of the data contained in the COM marker.
- * @param	p_manager		the user event manager.
-*/
-opj_bool j2k_read_SQcd_SQcc(
-							opj_j2k_v2_t *p_j2k,
-							OPJ_UINT32 p_comp_no,
-							OPJ_BYTE* p_header_data,
-							OPJ_UINT32 * p_header_size,
-							struct opj_event_mgr * p_manager
-							)
-{
-	// loop
-	OPJ_UINT32 l_band_no;
-	opj_cp_v2_t *l_cp = 00;
-	opj_tcp_v2_t *l_tcp = 00;
-	opj_tccp_t *l_tccp = 00;
-	OPJ_BYTE * l_current_ptr = 00;
-	OPJ_UINT32 l_tmp, l_num_band;
-
-	// preconditions
-	assert(p_j2k != 00);
-	assert(p_manager != 00);
-	assert(p_header_data != 00);
-
-	l_cp = &(p_j2k->m_cp);
-	// come from tile part header or main header ?
-	l_tcp = (p_j2k->m_specific_param.m_decoder.m_state == J2K_STATE_TPH) ? /*FIXME J2K_DEC_STATE_TPH*/
-				&l_cp->tcps[p_j2k->m_current_tile_number] :
-				p_j2k->m_specific_param.m_decoder.m_default_tcp;
-
-	// precondition again
-	assert(p_comp_no <  p_j2k->m_private_image->numcomps);
-
-	l_tccp = &l_tcp->tccps[p_comp_no];
-	l_current_ptr = p_header_data;
-
-	if (*p_header_size < 1) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading SQcd or SQcc element\n");
-		return OPJ_FALSE;
-	}
-	*p_header_size -= 1;
-
-	opj_read_bytes(l_current_ptr, &l_tmp ,1);			/* Sqcx */
-	++l_current_ptr;
-
-	l_tccp->qntsty = l_tmp & 0x1f;
-	l_tccp->numgbits = l_tmp >> 5;
-	if (l_tccp->qntsty == J2K_CCP_QNTSTY_SIQNT) {
-        l_num_band = 1;
-	}
-	else {
-		l_num_band = (l_tccp->qntsty == J2K_CCP_QNTSTY_NOQNT) ?
-			(*p_header_size) :
-			(*p_header_size) / 2;
-
-		if( l_num_band > J2K_MAXBANDS ) {
-			opj_event_msg_v2(p_manager, EVT_WARNING, "While reading CCP_QNTSTY element inside QCD or QCC marker segment, "
-				"number of subbands (%d) is greater to J2K_MAXBANDS (%d). So we limiting the number of elements stored to "
-				"J2K_MAXBANDS (%d) and skip the other. \n", l_num_band, J2K_MAXBANDS, J2K_MAXBANDS);
-			//return OPJ_FALSE;
-		}
-	}
-
-#ifdef USE_JPWL
-	if (l_cp->correct) {
-
-		/* if JPWL is on, we check whether there are too many subbands */
-		if ((l_num_band < 0) || (l_num_band >= J2K_MAXBANDS)) {
-			opj_event_msg_v2(p_manager, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR,
-				"JPWL: bad number of subbands in Sqcx (%d)\n",
-				l_num_band);
-			if (!JPWL_ASSUME) {
-				opj_event_msg_v2(p_manager, EVT_ERROR, "JPWL: giving up\n");
-				return OPJ_FALSE;
-			}
-			/* we try to correct */
-			l_num_band = 1;
-			opj_event_msg_v2(p_manager, EVT_WARNING, "- trying to adjust them\n"
-				"- setting number of bands to %d => HYPOTHESIS!!!\n",
-				l_num_band);
-		};
-
-	};
-#endif /* USE_JPWL */
-
-	if (l_tccp->qntsty == J2K_CCP_QNTSTY_NOQNT) {
-		for	(l_band_no = 0; l_band_no < l_num_band; l_band_no++) {
-			opj_read_bytes(l_current_ptr, &l_tmp ,1);			/* SPqcx_i */
-			++l_current_ptr;
-			if (l_band_no < J2K_MAXBANDS){
-				l_tccp->stepsizes[l_band_no].expn = l_tmp>>3;
-				l_tccp->stepsizes[l_band_no].mant = 0;
-			}
-		}
-		*p_header_size = *p_header_size - l_num_band;
-	}
-	else {
-		for	(l_band_no = 0; l_band_no < l_num_band; l_band_no++) {
-			opj_read_bytes(l_current_ptr, &l_tmp ,2);			/* SPqcx_i */
-			l_current_ptr+=2;
-			if (l_band_no < J2K_MAXBANDS){
-				l_tccp->stepsizes[l_band_no].expn = l_tmp >> 11;
-				l_tccp->stepsizes[l_band_no].mant = l_tmp & 0x7ff;
-			}
-		}
-		*p_header_size = *p_header_size - 2*l_num_band;
-	}
-
-	/* Add Antonin : if scalar_derived -> compute other stepsizes */
-	if (l_tccp->qntsty == J2K_CCP_QNTSTY_SIQNT) {
-		for (l_band_no = 1; l_band_no < J2K_MAXBANDS; l_band_no++) {
-			l_tccp->stepsizes[l_band_no].expn =
-				((l_tccp->stepsizes[0].expn) - ((l_band_no - 1) / 3) > 0) ?
-					(l_tccp->stepsizes[0].expn) - ((l_band_no - 1) / 3) : 0;
-			l_tccp->stepsizes[l_band_no].mant = l_tccp->stepsizes[0].mant;
-		}
-	}
-
-	return OPJ_TRUE;
-}
-
-/**
- * Copies the tile component parameters of all the component from the first tile component.
- *
- * @param		p_j2k		the J2k codec.
- */
-void j2k_copy_tile_quantization_parameters( opj_j2k_v2_t *p_j2k )
-{
-	OPJ_UINT32 i;
-	opj_cp_v2_t *l_cp = NULL;
-	opj_tcp_v2_t *l_tcp = NULL;
-	opj_tccp_t *l_ref_tccp = NULL;
-	opj_tccp_t *l_copied_tccp = NULL;
-	OPJ_UINT32 l_size;
-
-	/* preconditions */
-	assert(p_j2k != 00);
-
-	l_cp = &(p_j2k->m_cp);
-	l_tcp = p_j2k->m_specific_param.m_decoder.m_state == J2K_STATE_TPH ?
-			&l_cp->tcps[p_j2k->m_current_tile_number] :
-			p_j2k->m_specific_param.m_decoder.m_default_tcp;
-
-	l_ref_tccp = &l_tcp->tccps[0];
-	l_copied_tccp = l_ref_tccp + 1;
-	l_size = J2K_MAXBANDS * sizeof(opj_stepsize_t);
-
-	for	(i=1;i<p_j2k->m_private_image->numcomps;++i) {
-		l_copied_tccp->qntsty = l_ref_tccp->qntsty;
-		l_copied_tccp->numgbits = l_ref_tccp->numgbits;
-		memcpy(l_copied_tccp->stepsizes,l_ref_tccp->stepsizes,l_size);
-		++l_copied_tccp;
-	}
-}
-
-/**
- * Dump some elements from the J2K decompression structure .
- *
- *@param p_j2k				the jpeg2000 codec.
- *@param flag				flag to describe what elments are dump.
- *@param out_stream			output stream where dump the elements.
- *
-*/
-void j2k_dump (opj_j2k_v2_t* p_j2k, OPJ_INT32 flag, FILE* out_stream)
-{
-	/* Check if the flag is compatible with j2k file*/
-	if ( (flag & OPJ_JP2_INFO) || (flag & OPJ_JP2_IND)){
-		fprintf(out_stream, "Wrong flag\n");
-		return;
-	}
-
-	/* Dump the image_header */
-	if (flag & OPJ_IMG_INFO){
-		if (p_j2k->m_private_image)
-			j2k_dump_image_header(p_j2k->m_private_image, 0, out_stream);
-	}
-
-	/* Dump the codestream info from main header */
-	if (flag & OPJ_J2K_MH_INFO){
-		j2k_dump_MH_info(p_j2k, out_stream);
-	}
-
-
-	/* Dump the codestream info of the current tile */
-	if (flag & OPJ_J2K_TH_INFO){
-
-	}
-
-	/* Dump the codestream index from main header */
-	if (flag & OPJ_J2K_MH_IND){
-		j2k_dump_MH_index(p_j2k, out_stream);
-	}
-
-	/* Dump the codestream index of the current tile */
-	if (flag & OPJ_J2K_TH_IND){
-
-	}
-
-}
-
-/**
- * Dump index elements of the codestream extract from the main header.
- *
- *@param p_j2k				the jpeg2000 codec.
- *@param out_stream			output stream where dump the elements.
- *
-*/
-void j2k_dump_MH_index(opj_j2k_v2_t* p_j2k, FILE* out_stream)
-{
-	opj_codestream_index_t* cstr_index = p_j2k->cstr_index;
-	OPJ_UINT32 it_marker, it_tile, it_tile_part;
-
-	fprintf(out_stream, "Codestream index from main header: {\n");
-
-	fprintf(out_stream, "\t Main header start position=%" OPJ_OFF_F "d\n"
-			            "\t Main header end position=%" OPJ_OFF_F "d\n",
-			cstr_index->main_head_start, cstr_index->main_head_end);
-
-	fprintf(out_stream, "\t Marker list: {\n");
-
-	if (cstr_index->marker){
-		for (it_marker=0; it_marker < cstr_index->marknum ; it_marker++){
-			fprintf(out_stream, "\t\t type=%#x, pos=%" OPJ_OFF_F "d, len=%d\n",
-					cstr_index->marker[it_marker].type,
-					cstr_index->marker[it_marker].pos,
-					cstr_index->marker[it_marker].len );
-		}
-	}
-
-	fprintf(out_stream, "\t }\n");
-
-
-	if (cstr_index->tile_index){
-		fprintf(out_stream, "\t Tile index: {\n");
-
-		for (it_tile=0; it_tile < cstr_index->nb_of_tiles ; it_tile++){
-			OPJ_UINT32 nb_of_tile_part = cstr_index->tile_index[it_tile].nb_tps;
-
-			fprintf(out_stream, "\t\t nb of tile-part in tile [%d]=%d\n", it_tile, nb_of_tile_part);
-
-			if (cstr_index->tile_index[it_tile].tp_index){
-				for (it_tile_part =0; it_tile_part < nb_of_tile_part; it_tile_part++){
-					fprintf(out_stream, "\t\t\t tile-part[%d]: star_pos=%" OPJ_OFF_F "d, end_header=%" OPJ_OFF_F "d, end_pos=%" OPJ_OFF_F "d.\n",
-							it_tile_part,
-							cstr_index->tile_index[it_tile].tp_index[it_tile_part].start_pos,
-							cstr_index->tile_index[it_tile].tp_index[it_tile_part].end_header,
-							cstr_index->tile_index[it_tile].tp_index[it_tile_part].end_pos);
-				}
-			}
-
-			if (cstr_index->tile_index[it_tile].marker){
-				for (it_marker=0; it_marker < cstr_index->tile_index[it_tile].marknum ; it_marker++){
-					fprintf(out_stream, "\t\t type=%#x, pos=%" OPJ_OFF_F "d, len=%d\n",
-							cstr_index->tile_index[it_tile].marker[it_marker].type,
-							cstr_index->tile_index[it_tile].marker[it_marker].pos,
-							cstr_index->tile_index[it_tile].marker[it_marker].len );
-				}
-			}
-		}
-		fprintf(out_stream,"\t }\n");
-	}
-
-	fprintf(out_stream,"}\n");
-
-}
-
-/**
- * Dump info elements of the codestream extract from the main header.
- *
- *@param p_j2k				the jpeg2000 codec.
- *@param out_stream			output stream where dump the elements.
- *
-*/
-void j2k_dump_MH_info(opj_j2k_v2_t* p_j2k, FILE* out_stream)
-{
-	opj_tcp_v2_t * l_default_tile=NULL;
-
-	fprintf(out_stream, "Codestream info from main header: {\n");
-
-	fprintf(out_stream, "\t tx0=%d, ty0=%d\n", p_j2k->m_cp.tx0, p_j2k->m_cp.ty0);
-	fprintf(out_stream, "\t tdx=%d, tdy=%d\n", p_j2k->m_cp.tdx, p_j2k->m_cp.tdy);
-	fprintf(out_stream, "\t tw=%d, th=%d\n", p_j2k->m_cp.tw, p_j2k->m_cp.th);
-
-	l_default_tile = p_j2k->m_specific_param.m_decoder.m_default_tcp;
-	if (l_default_tile)
-	{
-		OPJ_INT32 compno;
-		OPJ_INT32 numcomps = p_j2k->m_private_image->numcomps;
-
-		fprintf(out_stream, "\t default tile {\n");
-		fprintf(out_stream, "\t\t csty=%#x\n", l_default_tile->csty);
-		fprintf(out_stream, "\t\t prg=%#x\n", l_default_tile->prg);
-		fprintf(out_stream, "\t\t numlayers=%d\n", l_default_tile->numlayers);
-		fprintf(out_stream, "\t\t mct=%x\n", l_default_tile->mct);
-
-		for (compno = 0; compno < numcomps; compno++) {
-			opj_tccp_t *l_tccp = &(l_default_tile->tccps[compno]);
-			OPJ_INT32 resno, bandno, numbands;
-
-			/* coding style*/
-			fprintf(out_stream, "\t\t comp %d {\n", compno);
-			fprintf(out_stream, "\t\t\t csty=%#x\n", l_tccp->csty);
-			fprintf(out_stream, "\t\t\t numresolutions=%d\n", l_tccp->numresolutions);
-			fprintf(out_stream, "\t\t\t cblkw=2^%d\n", l_tccp->cblkw);
-			fprintf(out_stream, "\t\t\t cblkh=2^%d\n", l_tccp->cblkh);
-			fprintf(out_stream, "\t\t\t cblksty=%#x\n", l_tccp->cblksty);
-			fprintf(out_stream, "\t\t\t qmfbid=%d\n", l_tccp->qmfbid);
-
-			fprintf(out_stream, "\t\t\t preccintsize (w,h)=");
-			for (resno = 0; resno < l_tccp->numresolutions; resno++) {
-				fprintf(out_stream, "(%d,%d) ", l_tccp->prcw[resno], l_tccp->prch[resno]);
-			}
-			fprintf(out_stream, "\n");
-
-			/* quantization style*/
-			fprintf(out_stream, "\t\t\t qntsty=%d\n", l_tccp->qntsty);
-			fprintf(out_stream, "\t\t\t numgbits=%d\n", l_tccp->numgbits);
-			fprintf(out_stream, "\t\t\t stepsizes (m,e)=");
-			numbands = (l_tccp->qntsty == J2K_CCP_QNTSTY_SIQNT) ? 1 : l_tccp->numresolutions * 3 - 2;
-			for (bandno = 0; bandno < numbands; bandno++) {
-				fprintf(out_stream, "(%d,%d) ", l_tccp->stepsizes[bandno].mant,
-					l_tccp->stepsizes[bandno].expn);
-			}
-			fprintf(out_stream, "\n");
-
-			/* RGN value*/
-			fprintf(out_stream, "\t\t\t roishift=%d\n", l_tccp->roishift);
-
-			fprintf(out_stream, "\t\t }\n");
-		} /*end of component of default tile*/
-		fprintf(out_stream, "\t }\n"); /*end of default tile*/
-
-	}
-
-	fprintf(out_stream, "}\n");
-
-}
-
-/**
- * Dump an image header structure.
- *
- *@param img_header			the image header to dump.
- *@param dev_dump_flag		flag to describe if we are in the case of this function is use outside j2k_dump function
- *@param out_stream			output stream where dump the elements.
- */
-void j2k_dump_image_header(opj_image_t* img_header, opj_bool dev_dump_flag, FILE* out_stream)
-{
-	char tab[2];
-
-	if (dev_dump_flag){
-		fprintf(stdout, "[DEV] Dump a image_header struct {\n");
-		tab[0] = '\0';
-	}
-	else {
-		fprintf(out_stream, "Image info {\n");
-		tab[0] = '\t';tab[1] = '\0';
-	}
-
-	fprintf(out_stream, "%s x0=%d, y0=%d\n", tab, img_header->x0, img_header->y0);
-	fprintf(out_stream,	"%s x1=%d, y1=%d\n", tab, img_header->x1, img_header->y1);
-	fprintf(out_stream, "%s numcomps=%d\n", tab, img_header->numcomps);
-
-	if (img_header->comps){
-		int compno;
-		for (compno = 0; compno < img_header->numcomps; compno++) {
-			fprintf(out_stream, "%s\t component %d {\n", tab, compno);
-			j2k_dump_image_comp_header(&(img_header->comps[compno]), dev_dump_flag, out_stream);
-			fprintf(out_stream,"%s}\n",tab);
-		}
-	}
-
-	fprintf(out_stream, "}\n");
-}
-
-/**
- * Dump a component image header structure.
- *
- *@param comp_header		the component image header to dump.
- *@param dev_dump_flag		flag to describe if we are in the case of this function is use outside j2k_dump function
- *@param out_stream			output stream where dump the elements.
- */
-void j2k_dump_image_comp_header(opj_image_comp_t* comp_header, opj_bool dev_dump_flag, FILE* out_stream)
-{
-	char tab[3];
-
-	if (dev_dump_flag){
-		fprintf(stdout, "[DEV] Dump a image_comp_header struct {\n");
-		tab[0] = '\0';
-	}	else {
-		tab[0] = '\t';tab[1] = '\t';tab[2] = '\0';
-	}
-
-	fprintf(out_stream, "%s dx=%d, dy=%d\n", tab, comp_header->dx, comp_header->dy);
-	fprintf(out_stream, "%s prec=%d\n", tab, comp_header->prec);
-	fprintf(out_stream, "%s sgnd=%d\n", tab, comp_header->sgnd);
-
-	if (dev_dump_flag)
-		fprintf(out_stream, "}\n");
-}
-
-
-/**
- * Get the codestream info from a JPEG2000 codec.
- *
- *@param	p_j2k				the component image header to dump.
- *
- *@return	the codestream information extract from the jpg2000 codec
- */
-opj_codestream_info_v2_t* j2k_get_cstr_info(opj_j2k_v2_t* p_j2k)
-{
-	OPJ_UINT16 compno;
-	OPJ_UINT16 numcomps = p_j2k->m_private_image->numcomps;
-	opj_tcp_v2_t *l_default_tile;
-	opj_codestream_info_v2_t* cstr_info = (opj_codestream_info_v2_t*) opj_calloc(1,sizeof(opj_codestream_info_v2_t));
-
-	cstr_info->nbcomps = p_j2k->m_private_image->numcomps;
-
-	cstr_info->tx0 = p_j2k->m_cp.tx0;
-	cstr_info->ty0 = p_j2k->m_cp.ty0;
-	cstr_info->tdx = p_j2k->m_cp.tdx;
-	cstr_info->tdy = p_j2k->m_cp.tdy;
-	cstr_info->tw = p_j2k->m_cp.tw;
-	cstr_info->th = p_j2k->m_cp.th;
-
-	cstr_info->tile_info = NULL; /* Not fill from the main header*/
-
-	l_default_tile = p_j2k->m_specific_param.m_decoder.m_default_tcp;
-
-	cstr_info->m_default_tile_info.csty = l_default_tile->csty;
-	cstr_info->m_default_tile_info.prg = l_default_tile->prg;
-	cstr_info->m_default_tile_info.numlayers = l_default_tile->numlayers;
-	cstr_info->m_default_tile_info.mct = l_default_tile->mct;
-
-	cstr_info->m_default_tile_info.tccp_info = (opj_tccp_info_t*) opj_calloc(cstr_info->nbcomps, sizeof(opj_tccp_info_t));
-
-	for (compno = 0; compno < numcomps; compno++) {
-		opj_tccp_t *l_tccp = &(l_default_tile->tccps[compno]);
-		opj_tccp_info_t *l_tccp_info = &(cstr_info->m_default_tile_info.tccp_info[compno]);
-		OPJ_INT32 bandno, numbands;
-
-		/* coding style*/
-		l_tccp_info->csty = l_tccp->csty;
-		l_tccp_info->numresolutions = l_tccp->numresolutions;
-		l_tccp_info->cblkw = l_tccp->cblkw;
-		l_tccp_info->cblkh = l_tccp->cblkh;
-		l_tccp_info->cblksty = l_tccp->cblksty;
-		l_tccp_info->qmfbid = l_tccp->qmfbid;
-		if (l_tccp->numresolutions < J2K_MAXRLVLS)
-		{
-			memcpy(l_tccp_info->prch, l_tccp->prch, l_tccp->numresolutions);
-			memcpy(l_tccp_info->prcw, l_tccp->prcw, l_tccp->numresolutions);
-		}
-
-		/* quantization style*/
-		l_tccp_info->qntsty = l_tccp->qntsty;
-		l_tccp_info->numgbits = l_tccp->numgbits;
-
-		numbands = (l_tccp->qntsty == J2K_CCP_QNTSTY_SIQNT) ? 1 : l_tccp->numresolutions * 3 - 2;
-		if (numbands < J2K_MAXBANDS) {
-			for (bandno = 0; bandno < numbands; bandno++) {
-				l_tccp_info->stepsizes_mant[bandno] = l_tccp->stepsizes[bandno].mant;
-				l_tccp_info->stepsizes_expn[bandno] = l_tccp->stepsizes[bandno].expn;
-			}
-		}
-
-		/* RGN value*/
-		l_tccp_info->roishift = l_tccp->roishift;
-	}
-
-
-	return cstr_info;
-}
-
-/**
- * Get the codestream index from a JPEG2000 codec.
- *
- *@param	p_j2k				the component image header to dump.
- *
- *@return	the codestream index extract from the jpg2000 codec
- */
-opj_codestream_index_t* j2k_get_cstr_index(opj_j2k_v2_t* p_j2k)
-{
- 	opj_codestream_index_t* l_cstr_index = (opj_codestream_index_t*)
-			opj_calloc(1,sizeof(opj_codestream_index_t));
-	if (!l_cstr_index)
-		return NULL;
-
-	l_cstr_index->main_head_start = p_j2k->cstr_index->main_head_start;
-	l_cstr_index->main_head_end = p_j2k->cstr_index->main_head_end;
-	l_cstr_index->codestream_size = p_j2k->cstr_index->codestream_size;
-
-	l_cstr_index->marknum = p_j2k->cstr_index->marknum;
-	l_cstr_index->marker = (opj_marker_info_t*)opj_malloc(l_cstr_index->marknum*sizeof(opj_marker_info_t));
-	if (!l_cstr_index->marker){
-		opj_free( l_cstr_index);
-		return NULL;
-	}
-
-	if (p_j2k->cstr_index->marker)
-		memcpy(l_cstr_index->marker, p_j2k->cstr_index->marker, l_cstr_index->marknum * sizeof(opj_marker_info_t) );
-	else{
-		opj_free(l_cstr_index->marker);
-		l_cstr_index->marker = NULL;
-	}
-
-	l_cstr_index->nb_of_tiles = p_j2k->cstr_index->nb_of_tiles;
-	l_cstr_index->tile_index = (opj_tile_index_t*)opj_calloc(l_cstr_index->nb_of_tiles, sizeof(opj_tile_index_t) );
-	if (!l_cstr_index->tile_index){
-		opj_free( l_cstr_index->marker);
-		opj_free( l_cstr_index);
-		return NULL;
-	}
-
-	if (!p_j2k->cstr_index->tile_index){
-		opj_free(l_cstr_index->tile_index);
-		l_cstr_index->tile_index = NULL;
-	}
-	else {
-		OPJ_UINT32 it_tile = 0;
-		for (it_tile = 0; it_tile < l_cstr_index->nb_of_tiles; it_tile++ ){
-
-			/* Tile Marker*/
-			l_cstr_index->tile_index[it_tile].marknum = p_j2k->cstr_index->tile_index[it_tile].marknum;
-
-			l_cstr_index->tile_index[it_tile].marker =
-				(opj_marker_info_t*)opj_malloc(l_cstr_index->tile_index[it_tile].marknum*sizeof(opj_marker_info_t));
-
-			if (!l_cstr_index->tile_index[it_tile].marker) {
-				OPJ_UINT32 it_tile_free;
-
-				for (it_tile_free=0; it_tile_free < it_tile; it_tile_free++){
-					opj_free(l_cstr_index->tile_index[it_tile_free].marker);
-				}
-
-				opj_free( l_cstr_index->tile_index);
-				opj_free( l_cstr_index->marker);
-				opj_free( l_cstr_index);
-				return NULL;
-			}
-
-			if (p_j2k->cstr_index->tile_index[it_tile].marker)
-				memcpy(	l_cstr_index->tile_index[it_tile].marker,
-						p_j2k->cstr_index->tile_index[it_tile].marker,
-						l_cstr_index->tile_index[it_tile].marknum * sizeof(opj_marker_info_t) );
-			else{
-				opj_free(l_cstr_index->tile_index[it_tile].marker);
-				l_cstr_index->tile_index[it_tile].marker = NULL;
-			}
-
-			/* Tile part index*/
-			l_cstr_index->tile_index[it_tile].nb_tps = p_j2k->cstr_index->tile_index[it_tile].nb_tps;
-
-			l_cstr_index->tile_index[it_tile].tp_index =
-				(opj_tp_index_t*)opj_malloc(l_cstr_index->tile_index[it_tile].nb_tps*sizeof(opj_tp_index_t));
-
-			if(!l_cstr_index->tile_index[it_tile].tp_index){
-				OPJ_UINT32 it_tile_free;
-
-				for (it_tile_free=0; it_tile_free < it_tile; it_tile_free++){
-					opj_free(l_cstr_index->tile_index[it_tile_free].marker);
-					opj_free(l_cstr_index->tile_index[it_tile_free].tp_index);
-				}
-
-				opj_free( l_cstr_index->tile_index);
-				opj_free( l_cstr_index->marker);
-				opj_free( l_cstr_index);
-				return NULL;
-			}
-
-			if (p_j2k->cstr_index->tile_index[it_tile].tp_index){
-				memcpy(	l_cstr_index->tile_index[it_tile].tp_index,
-						p_j2k->cstr_index->tile_index[it_tile].tp_index,
-						l_cstr_index->tile_index[it_tile].nb_tps * sizeof(opj_tp_index_t) );
-			}
-			else{
-				opj_free(l_cstr_index->tile_index[it_tile].tp_index);
-				l_cstr_index->tile_index[it_tile].tp_index = NULL;
-			}
-
-			/* Packet index (NOT USED)*/
-			l_cstr_index->tile_index[it_tile].nb_packet = 0;
-			l_cstr_index->tile_index[it_tile].packet_index = NULL;
-
-		}
-	}
-
-	return l_cstr_index;
-}
-
-opj_bool j2k_allocate_tile_element_cstr_index(opj_j2k_v2_t *p_j2k)
-{
-	OPJ_UINT32 it_tile=0;
-
-	p_j2k->cstr_index->nb_of_tiles = p_j2k->m_cp.tw * p_j2k->m_cp.th;
-	p_j2k->cstr_index->tile_index = (opj_tile_index_t*)opj_calloc(p_j2k->cstr_index->nb_of_tiles, sizeof(opj_tile_index_t));
-	if (!p_j2k->cstr_index->tile_index)
-		return OPJ_FALSE;
-
-	for (it_tile=0; it_tile < p_j2k->cstr_index->nb_of_tiles; it_tile++){
-		p_j2k->cstr_index->tile_index[it_tile].maxmarknum = 100;
-		p_j2k->cstr_index->tile_index[it_tile].marknum = 0;
-		p_j2k->cstr_index->tile_index[it_tile].marker = (opj_marker_info_t*)
-				opj_calloc(p_j2k->cstr_index->tile_index[it_tile].maxmarknum, sizeof(opj_marker_info_t));
-		if (!p_j2k->cstr_index->tile_index[it_tile].marker)
-			return OPJ_FALSE;
-	}
-
-	return OPJ_TRUE;
-}
-
-/**
- * Reads the tiles.
- */
-opj_bool j2k_decode_tiles (	opj_j2k_v2_t *p_j2k,
-							opj_stream_private_t *p_stream,
-							opj_event_mgr_t * p_manager)
-{
-	opj_bool l_go_on = OPJ_TRUE;
-	OPJ_UINT32 l_current_tile_no;
-	OPJ_UINT32 l_data_size,l_max_data_size;
-	OPJ_INT32 l_tile_x0,l_tile_y0,l_tile_x1,l_tile_y1;
-	OPJ_UINT32 l_nb_comps;
-	OPJ_BYTE * l_current_data;
-
-	l_current_data = (OPJ_BYTE*)opj_malloc(1000);
-	if (! l_current_data) {
-		return OPJ_FALSE;
-	}
-	l_max_data_size = 1000;
-
-	/*Allocate and initialize some elements of codestrem index*/
-	if (!j2k_allocate_tile_element_cstr_index(p_j2k))
-		return OPJ_FALSE;
-
-	while (OPJ_TRUE) {
-		if (! j2k_read_tile_header(	p_j2k,
-									&l_current_tile_no,
-									&l_data_size,
-									&l_tile_x0, &l_tile_y0,
-									&l_tile_x1, &l_tile_y1,
-									&l_nb_comps,
-									&l_go_on,
-									p_stream,
-									p_manager)) {
-			opj_free(l_current_data);
-			return OPJ_FALSE;
-		}
-
-		if (! l_go_on) {
-			break;
-		}
-
-		if (l_data_size > l_max_data_size) {
-			l_current_data = (OPJ_BYTE*)opj_realloc(l_current_data,l_data_size);
-			if (! l_current_data) {
-				return OPJ_FALSE;
-			}
-
-			l_max_data_size = l_data_size;
-		}
-
-		if (! j2k_decode_tile(p_j2k,l_current_tile_no,l_current_data,l_data_size,p_stream,p_manager)) {
-			opj_free(l_current_data);
-			return OPJ_FALSE;
-		}
-		opj_event_msg_v2(p_manager, EVT_INFO, "Tile %d/%d has been decode.\n", l_current_tile_no +1, p_j2k->m_cp.th * p_j2k->m_cp.tw);
-
-		if (! j2k_update_image_data(p_j2k->m_tcd,l_current_data, p_j2k->m_output_image)) {
-			opj_free(l_current_data);
-			return OPJ_FALSE;
-		}
-		opj_event_msg_v2(p_manager, EVT_INFO, "Image data has been updated with tile %d.\n\n", l_current_tile_no + 1);
-
-	}
-
-	opj_free(l_current_data);
-
-	return OPJ_TRUE;
-}
-
-/**
- * Sets up the procedures to do on decoding data. Developpers wanting to extend the library can add their own reading procedures.
- */
-void j2k_setup_decoding (opj_j2k_v2_t *p_j2k)
-{
-	// preconditions
-	assert(p_j2k != 00);
-
-	opj_procedure_list_add_procedure(p_j2k->m_procedure_list,(void*)j2k_decode_tiles);
-	/* DEVELOPER CORNER, add your custom procedures */
-
-}
-
-/*
- * Read and decode one tile.
- */
-opj_bool j2k_decode_one_tile (	opj_j2k_v2_t *p_j2k,
-								opj_stream_private_t *p_stream,
-								opj_event_mgr_t * p_manager)
-{
-	opj_bool l_go_on = OPJ_TRUE;
-	OPJ_UINT32 l_current_tile_no;
-	OPJ_UINT32 l_tile_no_to_dec;
-	OPJ_UINT32 l_data_size,l_max_data_size;
-	OPJ_INT32 l_tile_x0,l_tile_y0,l_tile_x1,l_tile_y1;
-	OPJ_UINT32 l_nb_comps;
-	OPJ_BYTE * l_current_data;
-
-	l_current_data = (OPJ_BYTE*)opj_malloc(1000);
-	if (! l_current_data) {
-		return OPJ_FALSE;
-	}
-	l_max_data_size = 1000;
-
-	/*Allocate and initialize some elements of codestrem index if not already done*/
-	if( !p_j2k->cstr_index->tile_index)
-	{
-		if (!j2k_allocate_tile_element_cstr_index(p_j2k))
-			return OPJ_FALSE;
-	}
-	/* Move into the codestream to the first SOT used to decode the desired tile */
-	l_tile_no_to_dec = p_j2k->m_specific_param.m_decoder.m_tile_ind_to_dec;
-	if (p_j2k->cstr_index->tile_index)
-		if(p_j2k->cstr_index->tile_index->tp_index)
-		{
-			if ( ! p_j2k->cstr_index->tile_index[l_tile_no_to_dec].nb_tps) {
-				/* the index for this tile has not been built,
-				 *  so move to the last SOT read */
-				if ( opj_stream_read_seek(p_stream, p_j2k->m_specific_param.m_decoder.m_last_sot_read_pos+2, p_manager) ){
-					opj_event_msg_v2(p_manager, EVT_ERROR, "Problem with seek function\n");
-					return OPJ_FALSE;
-				}
-			}
-			else{
-				if (opj_stream_read_seek(p_stream, p_j2k->cstr_index->tile_index[l_tile_no_to_dec].tp_index[0].start_pos+2, p_manager)) {
-					opj_event_msg_v2(p_manager, EVT_ERROR, "Problem with seek function\n");
-					return OPJ_FALSE;
-				}
-			}
-			/* Special case if we have previously read the EOC marker (if the previous tile getted is the last ) */
-			if(p_j2k->m_specific_param.m_decoder.m_state == J2K_STATE_EOC)
-				p_j2k->m_specific_param.m_decoder.m_state = J2K_STATE_TPHSOT;
-		}
-
-	while (OPJ_TRUE) {
-		if (! j2k_read_tile_header(	p_j2k,
-									&l_current_tile_no,
-									&l_data_size,
-									&l_tile_x0, &l_tile_y0,
-									&l_tile_x1, &l_tile_y1,
-									&l_nb_comps,
-									&l_go_on,
-									p_stream,
-									p_manager)) {
-			opj_free(l_current_data);
-			return OPJ_FALSE;
-		}
-
-
-		if (! l_go_on) {
-			break;
-		}
-
-		if (l_data_size > l_max_data_size) {
-			l_current_data = (OPJ_BYTE*)opj_realloc(l_current_data,l_data_size);
-			if (! l_current_data) {
-				return OPJ_FALSE;
-			}
-
-			l_max_data_size = l_data_size;
-		}
-
-
-
-		if (! j2k_decode_tile(p_j2k,l_current_tile_no,l_current_data,l_data_size,p_stream,p_manager)) {
-			opj_free(l_current_data);
-			return OPJ_FALSE;
-		}
-		opj_event_msg_v2(p_manager, EVT_INFO, "Tile %d/%d has been decode.\n", l_current_tile_no, (p_j2k->m_cp.th * p_j2k->m_cp.tw) - 1);
-
-		if (! j2k_update_image_data(p_j2k->m_tcd,l_current_data, p_j2k->m_output_image)) {
-			opj_free(l_current_data);
-			return OPJ_FALSE;
-		}
-		opj_event_msg_v2(p_manager, EVT_INFO, "Image data has been updated with tile %d.\n\n", l_current_tile_no);
-
-		if(l_current_tile_no == l_tile_no_to_dec)
-		{
-			/* move into the codestream to the the first SOT (FIXME or not move?)*/
-			if (opj_stream_read_seek(p_stream, p_j2k->cstr_index->main_head_end + 2, p_manager) ) {
-				opj_event_msg_v2(p_manager, EVT_ERROR, "Problem with seek function\n");
-				return OPJ_FALSE;
-			}
-			break;
-		}
-		else {
-			opj_event_msg_v2(p_manager, EVT_WARNING, "Tile read, decode and updated is not the desired (%d vs %d).\n", l_current_tile_no, l_tile_no_to_dec);
-		}
-
-	}
-
-	opj_free(l_current_data);
-
-	return OPJ_TRUE;
-}
-
-
-/**
- * Sets up the procedures to do on decoding one tile. Developpers wanting to extend the library can add their own reading procedures.
- */
-void j2k_setup_decoding_tile (opj_j2k_v2_t *p_j2k)
-{
-	// preconditions
-	assert(p_j2k != 00);
-
-	opj_procedure_list_add_procedure(p_j2k->m_procedure_list,(void*)j2k_decode_one_tile);
-	/* DEVELOPER CORNER, add your custom procedures */
-
-}
-
-
-/**
- * Decodes the tiles of the stream.
- */
-opj_bool j2k_decode_v2(	opj_j2k_v2_t * p_j2k,
-						opj_stream_private_t * p_stream,
-						opj_image_t * p_image,
-						opj_event_mgr_t * p_manager)
-{
-	OPJ_UINT32 compno;
-
-	if (!p_image)
-		return OPJ_FALSE;
-
-	p_j2k->m_output_image = opj_image_create0();
-	if (! (p_j2k->m_output_image)) {
-		return OPJ_FALSE;
-	}
-	opj_copy_image_header(p_image, p_j2k->m_output_image);
-
-	/* customization of the decoding */
-	j2k_setup_decoding(p_j2k);
-
-	/* Decode the codestream */
-	if (! j2k_exec (p_j2k,p_j2k->m_procedure_list,p_stream,p_manager)) {
-		opj_image_destroy(p_j2k->m_private_image);
-		p_j2k->m_private_image = NULL;
-		return OPJ_FALSE;
-	}
-
-	/* Move data and copy one information from codec to output image*/
-	for (compno = 0; compno < p_image->numcomps; compno++) {
-		p_image->comps[compno].resno_decoded = p_j2k->m_output_image->comps[compno].resno_decoded;
-		p_image->comps[compno].data = p_j2k->m_output_image->comps[compno].data;
-		p_j2k->m_output_image->comps[compno].data = NULL;
-	}
-
-	return OPJ_TRUE;
-}
-
-
-/**
- * Get the decoded tile.
- *
- * @param	p_j2k			the jpeg2000 codestream codec.
- * @param	p_stream		input_stream
- * @param	p_image			output image.	.
- * @param	p_manager		the user event manager
- * @param	tile_index		index of the tile we want decode
- *
- * @return	true			if succeed.
- */
-opj_bool j2k_get_tile(	opj_j2k_v2_t *p_j2k,
-						opj_stream_private_t *p_stream,
-						opj_image_t* p_image,
-						struct opj_event_mgr * p_manager,
-						OPJ_UINT32 tile_index )
-{
-	OPJ_UINT32 compno;
-	OPJ_UINT32 l_tile_x, l_tile_y;
-	opj_image_comp_t* l_img_comp;
-
-	if (!p_image) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "We need a image previously created.\n");
-		return OPJ_FALSE;
-	}
-
-	if ( (tile_index < 0) && (tile_index >= p_j2k->m_cp.tw * p_j2k->m_cp.th) ){
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Tile index provided by the user is incorrect %d (max = %d) \n", tile_index, (p_j2k->m_cp.tw * p_j2k->m_cp.th) - 1);
-		return OPJ_FALSE;
-	}
-
-	/* Compute the dimension of the desired tile*/
-	l_tile_x = tile_index % p_j2k->m_cp.tw;
-	l_tile_y = tile_index / p_j2k->m_cp.tw;
-
-	p_image->x0 = l_tile_x * p_j2k->m_cp.tdx + p_j2k->m_cp.tx0;
-	if (p_image->x0 < p_j2k->m_private_image->x0)
-		p_image->x0 = p_j2k->m_private_image->x0;
-	p_image->x1 = (l_tile_x + 1) * p_j2k->m_cp.tdx + p_j2k->m_cp.tx0;
-	if (p_image->x1 > p_j2k->m_private_image->x1)
-		p_image->x1 = p_j2k->m_private_image->x1;
-
-	p_image->y0 = l_tile_y * p_j2k->m_cp.tdy + p_j2k->m_cp.ty0;
-	if (p_image->y0 < p_j2k->m_private_image->y0)
-		p_image->y0 = p_j2k->m_private_image->y0;
-	p_image->y1 = (l_tile_y + 1) * p_j2k->m_cp.tdy + p_j2k->m_cp.ty0;
-	if (p_image->y1 > p_j2k->m_private_image->y1)
-		p_image->y1 = p_j2k->m_private_image->y1;
-
-	l_img_comp = p_image->comps;
-	for (compno=0; compno < p_image->numcomps; ++compno)
-	{
-		OPJ_INT32 l_comp_x1, l_comp_y1;
-
-		l_img_comp->factor = p_j2k->m_private_image->comps[compno].factor;
-
-		l_img_comp->x0 = int_ceildiv(p_image->x0, l_img_comp->dx);
-		l_img_comp->y0 = int_ceildiv(p_image->y0, l_img_comp->dy);
-		l_comp_x1 = int_ceildiv(p_image->x1, l_img_comp->dx);
-		l_comp_y1 = int_ceildiv(p_image->y1, l_img_comp->dy);
-
-		l_img_comp->w = int_ceildivpow2(l_comp_x1, l_img_comp->factor) - int_ceildivpow2(l_img_comp->x0, l_img_comp->factor);
-		l_img_comp->h = int_ceildivpow2(l_comp_y1, l_img_comp->factor) - int_ceildivpow2(l_img_comp->y0, l_img_comp->factor);
-
-		l_img_comp++;
-	}
-
-	/* Destroy the previous output image*/
-	if (p_j2k->m_output_image)
-		opj_image_destroy(p_j2k->m_output_image);
-
-	/* Create the ouput image from the information previously computed*/
-	p_j2k->m_output_image = opj_image_create0();
-	if (! (p_j2k->m_output_image)) {
-		return OPJ_FALSE;
-	}
-	opj_copy_image_header(p_image, p_j2k->m_output_image);
-
-	p_j2k->m_specific_param.m_decoder.m_tile_ind_to_dec = tile_index;
-
-	/* customization of the decoding */
-	j2k_setup_decoding_tile(p_j2k);
-
-	/* Decode the codestream */
-	if (! j2k_exec (p_j2k,p_j2k->m_procedure_list,p_stream,p_manager)) {
-		opj_image_destroy(p_j2k->m_private_image);
-		p_j2k->m_private_image = NULL;
-		return OPJ_FALSE;
-	}
-
-	/* Move data and copy one information from codec to output image*/
-	for (compno = 0; compno < p_image->numcomps; compno++) {
-		p_image->comps[compno].resno_decoded = p_j2k->m_output_image->comps[compno].resno_decoded;
-
-		if (p_image->comps[compno].data)
-			opj_free(p_image->comps[compno].data);
-
-		p_image->comps[compno].data = p_j2k->m_output_image->comps[compno].data;
-
-		p_j2k->m_output_image->comps[compno].data = NULL;
-	}
-
-	return OPJ_TRUE;
-}
-
-opj_bool j2k_set_decoded_resolution_factor(opj_j2k_v2_t *p_j2k, OPJ_UINT32 res_factor, opj_event_mgr_t * p_manager)
-{
-	OPJ_UINT32 it_comp;
-
-	p_j2k->m_cp.m_specific_param.m_dec.m_reduce = res_factor;
-
-	if (p_j2k->m_private_image) {
-		if (p_j2k->m_private_image->comps) {
-			if (p_j2k->m_specific_param.m_decoder.m_default_tcp) {
-				if (p_j2k->m_specific_param.m_decoder.m_default_tcp->tccps) {
-					for (it_comp = 0 ; it_comp < p_j2k->m_private_image->numcomps; it_comp++) {
-						OPJ_UINT32 max_res = p_j2k->m_specific_param.m_decoder.m_default_tcp->tccps[it_comp].numresolutions;
-						if ( res_factor >= max_res){
-							opj_event_msg_v2(p_manager, EVT_ERROR, "Resolution factor is superior to the maximum resolution in the component.\n");
-							return OPJ_FALSE;
-						}
-						p_j2k->m_private_image->comps[it_comp].factor = res_factor;
-					}
-					return OPJ_TRUE;
-				}
-			}
-		}
-	}
-
-	return OPJ_FALSE;
-}
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/j2k.h b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/j2k.h
deleted file mode 100644
index 2ec8980d3d1b2e648a9be00678fa1a49b4570fc1..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/j2k.h
+++ /dev/null
@@ -1,1027 +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
- * Copyright (c) 2006-2007, Parvatha Elangovan
- * Copyright (c) 2008, Jerome Fimes, Communications & Systemes <jerome.fimes@c-s.fr>
- * Copyright (c) 2011, Mickael Savinaud, Communications & Systemes <mickael.savinaud@c-s.fr>
- *
- * 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_H
-#define __J2K_H
-/**
-@file j2k.h
-@brief The JPEG-2000 Codestream Reader/Writer (J2K)
-
-The functions in J2K.C have for goal to read/write the several parts of the codestream: markers and data.
-*/
-
-/** @defgroup J2K J2K - JPEG-2000 codestream reader/writer */
-/*@{*/
-
-#define J2K_CP_CSTY_PRT 0x01
-#define J2K_CP_CSTY_SOP 0x02
-#define J2K_CP_CSTY_EPH 0x04
-#define J2K_CCP_CSTY_PRT 0x01
-#define J2K_CCP_CBLKSTY_LAZY 0x01     /**< Selective arithmetic coding bypass */
-#define J2K_CCP_CBLKSTY_RESET 0x02    /**< Reset context probabilities on coding pass boundaries */
-#define J2K_CCP_CBLKSTY_TERMALL 0x04  /**< Termination on each coding pass */
-#define J2K_CCP_CBLKSTY_VSC 0x08      /**< Vertically stripe causal context */
-#define J2K_CCP_CBLKSTY_PTERM 0x10    /**< Predictable termination */
-#define J2K_CCP_CBLKSTY_SEGSYM 0x20   /**< Segmentation symbols are used */
-#define J2K_CCP_QNTSTY_NOQNT 0
-#define J2K_CCP_QNTSTY_SIQNT 1
-#define J2K_CCP_QNTSTY_SEQNT 2
-
-/* ----------------------------------------------------------------------- */
-
-#define J2K_MS_SOC 0xff4f	/**< SOC marker value */
-#define J2K_MS_SOT 0xff90	/**< SOT marker value */
-#define J2K_MS_SOD 0xff93	/**< SOD marker value */
-#define J2K_MS_EOC 0xffd9	/**< EOC marker value */
-#define J2K_MS_SIZ 0xff51	/**< SIZ marker value */
-#define J2K_MS_COD 0xff52	/**< COD marker value */
-#define J2K_MS_COC 0xff53	/**< COC marker value */
-#define J2K_MS_RGN 0xff5e	/**< RGN marker value */
-#define J2K_MS_QCD 0xff5c	/**< QCD marker value */
-#define J2K_MS_QCC 0xff5d	/**< QCC marker value */
-#define J2K_MS_POC 0xff5f	/**< POC marker value */
-#define J2K_MS_TLM 0xff55	/**< TLM marker value */
-#define J2K_MS_PLM 0xff57	/**< PLM marker value */
-#define J2K_MS_PLT 0xff58	/**< PLT marker value */
-#define J2K_MS_PPM 0xff60	/**< PPM marker value */
-#define J2K_MS_PPT 0xff61	/**< PPT marker value */
-#define J2K_MS_SOP 0xff91	/**< SOP marker value */
-#define J2K_MS_EPH 0xff92	/**< EPH marker value */
-#define J2K_MS_CRG 0xff63	/**< CRG marker value */
-#define J2K_MS_COM 0xff64	/**< COM marker value */
-#define J2K_MS_CBD 0xff78	/**< CBD marker value */
-#define J2K_MS_MCC 0xff75	/**< MCC marker value */
-#define J2K_MS_MCT 0xff74	/**< MCT marker value */
-#define J2K_MS_MCO 0xff77	/**< MCO marker value */
-
-#define J2K_MS_UNK 0		/**< UNKNOWN marker value */
-
-/* UniPG>> */
-#ifdef USE_JPWL
-#define J2K_MS_EPC 0xff68	/**< EPC marker value (Part 11: JPEG 2000 for Wireless) */
-#define J2K_MS_EPB 0xff66	/**< EPB marker value (Part 11: JPEG 2000 for Wireless) */ 
-#define J2K_MS_ESD 0xff67	/**< ESD marker value (Part 11: JPEG 2000 for Wireless) */ 
-#define J2K_MS_RED 0xff69	/**< RED marker value (Part 11: JPEG 2000 for Wireless) */
-#endif /* USE_JPWL */
-#ifdef USE_JPSEC
-#define J2K_MS_SEC 0xff65    /**< SEC marker value (Part 8: Secure JPEG 2000) */
-#define J2K_MS_INSEC 0xff94  /**< INSEC marker value (Part 8: Secure JPEG 2000) */
-#endif /* USE_JPSEC */
-/* <<UniPG */
-
-/* ----------------------------------------------------------------------- */
-
-/**
- * Values that specify the status of the decoding process when decoding the main header.
- * These values may be combined with a | operator.
- * */
-typedef enum J2K_STATUS {
-	J2K_STATE_MHSOC  = 0x0001, /**< a SOC marker is expected */
-	J2K_STATE_MHSIZ  = 0x0002, /**< a SIZ marker is expected */
-	J2K_STATE_MH     = 0x0004, /**< the decoding process is in the main header */
-	J2K_STATE_TPHSOT = 0x0008, /**< the decoding process is in a tile part header and expects a SOT marker */
-	J2K_STATE_TPH    = 0x0010, /**< the decoding process is in a tile part header */
-	J2K_STATE_MT     = 0x0020, /**< the EOC marker has just been read */
-	J2K_STATE_NEOC   = 0x0040, /**< the decoding process must not expect a EOC marker because the codestream is truncated */
-
-	J2K_STATE_EOC	 = 0x0100, /**< the decoding process has encountered the EOC marker */
-	J2K_STATE_ERR    = 0x8000  /**< the decoding process has encountered an error (FIXME warning V1 = 0x0080)*/
-} J2K_STATUS;
-
-/**
- * Type of elements storing in the MCT data
- */
-typedef enum MCT_ELEMENT_TYPE
-{
-	MCT_TYPE_INT16 = 0,		/** MCT data is stored as signed shorts*/
-	MCT_TYPE_INT32 = 1,		/** MCT data is stored as signed integers*/
-	MCT_TYPE_FLOAT = 2,		/** MCT data is stored as floats*/
-	MCT_TYPE_DOUBLE = 3		/** MCT data is stored as doubles*/
-} J2K_MCT_ELEMENT_TYPE;
-
-/**
- * Type of MCT array
- */
-typedef enum MCT_ARRAY_TYPE
-{
-	MCT_TYPE_DEPENDENCY = 0,
-	MCT_TYPE_DECORRELATION = 1,
-	MCT_TYPE_OFFSET = 2
-} J2K_MCT_ARRAY_TYPE;
-
-/* ----------------------------------------------------------------------- */
-
-/** 
-T2 encoding mode 
-*/
-typedef enum T2_MODE {
-	THRESH_CALC = 0,	/** Function called in Rate allocation process*/
-	FINAL_PASS = 1		/** Function called in Tier 2 process*/
-}J2K_T2_MODE;
-
-/**
- * Quantization stepsize
- */
-typedef struct opj_stepsize {
-	/** exponent */
-	int expn;
-	/** mantissa */
-	int mant;
-} opj_stepsize_t;
-
-/**
-Tile-component coding parameters
-*/
-typedef struct opj_tccp
-{
-	/** coding style */
-	OPJ_UINT32 csty;
-	/** number of resolutions */
-	OPJ_UINT32 numresolutions;
-	/** code-blocks width */
-	OPJ_UINT32 cblkw;
-	/** code-blocks height */
-	OPJ_UINT32 cblkh;
-	/** code-block coding style */
-	OPJ_UINT32 cblksty;
-	/** discrete wavelet transform identifier */
-	OPJ_UINT32 qmfbid;
-	/** quantisation style */
-	OPJ_UINT32 qntsty;
-	/** stepsizes used for quantization */
-	opj_stepsize_t stepsizes[J2K_MAXBANDS];
-	/** number of guard bits */
-	OPJ_UINT32 numgbits;
-	/** Region Of Interest shift */
-	OPJ_INT32 roishift;
-	/** precinct width */
-	OPJ_UINT32 prcw[J2K_MAXRLVLS];
-	/** precinct height */
-	OPJ_UINT32 prch[J2K_MAXRLVLS];
-	/** the dc_level_shift **/
-	OPJ_INT32 m_dc_level_shift;
-}
-opj_tccp_t;
-
-
-/** V1 STYLE
-Tile coding parameters : 
-this structure is used to store coding/decoding parameters common to all
-tiles (information like COD, COC in main header)
-*/
-typedef struct opj_tcp {
-	/** 1 : first part-tile of a tile */
-	int first;
-	/** coding style */
-	int csty;
-	/** progression order */
-	OPJ_PROG_ORDER prg;
-	/** number of layers */
-	int numlayers;
-	/** multi-component transform identifier */
-	int mct;
-	/** rates of layers */
-	float rates[100];
-	/** number of progression order changes */
-	int numpocs;
-	/** indicates if a POC marker has been used O:NO, 1:YES */
-	int POC;
-	/** progression order changes */
-	opj_poc_t pocs[32];
-	/** packet header store there for futur use in t2_decode_packet */
-	unsigned char *ppt_data;
-	/** pointer remaining on the first byte of the first header if ppt is used */
-	unsigned char *ppt_data_first;
-	/** If ppt == 1 --> there was a PPT marker for the present tile */
-	int ppt;
-	/** used in case of multiple marker PPT (number of info already stored) */
-	int ppt_store;
-	/** ppmbug1 */
-	int ppt_len;
-	/** add fixed_quality */
-	float distoratio[100];
-	/** tile-component coding parameters */
-	opj_tccp_t *tccps;
-} opj_tcp_t;
-
-/**
- * FIXME DOC
- */
-typedef struct opj_mct_data
-{
-	J2K_MCT_ELEMENT_TYPE m_element_type;
-	J2K_MCT_ARRAY_TYPE	 m_array_type;
-	OPJ_UINT32			 m_index;
-	OPJ_BYTE *			 m_data;
-	OPJ_UINT32			 m_data_size;
-}
-opj_mct_data_t;
-
-/**
- * FIXME DOC
- */
-typedef struct opj_simple_mcc_decorrelation_data
-{
-	OPJ_UINT32			 m_index;
-	OPJ_UINT32			 m_nb_comps;
-	opj_mct_data_t *	 m_decorrelation_array;
-	opj_mct_data_t *	 m_offset_array;
-	OPJ_UINT32			 m_is_irreversible : 1;
-}
-opj_simple_mcc_decorrelation_data_t;
-
-/**
-Tile coding parameters :
-this structure is used to store coding/decoding parameters common to all
-tiles (information like COD, COC in main header)
-*/
-typedef struct opj_tcp_v2
-{
-	/** coding style */
-	OPJ_UINT32 csty;
-	/** progression order */
-	OPJ_PROG_ORDER prg;
-	/** number of layers */
-	OPJ_UINT32 numlayers;
-	OPJ_UINT32 num_layers_to_decode;
-	/** multi-component transform identifier */
-	OPJ_UINT32 mct;
-	/** rates of layers */
-	OPJ_FLOAT32 rates[100];
-	/** number of progression order changes */
-	OPJ_UINT32 numpocs;
-	/** progression order changes */
-	opj_poc_t pocs[32];
-	/** packet header store there for futur use in t2_decode_packet */
-	OPJ_BYTE *ppt_data;
-	/** used to keep a track of the allocated memory */
-	OPJ_BYTE *ppt_buffer;
-	/** Number of bytes stored inside ppt_data*/
-	OPJ_UINT32 ppt_data_size;
-	/** size of ppt_data*/
-	OPJ_UINT32 ppt_len;
-	/** add fixed_quality */
-	OPJ_FLOAT32 distoratio[100];
-	/** tile-component coding parameters */
-	opj_tccp_t *tccps;
-	/** number of tile parts for the tile. */
-	OPJ_UINT32 m_nb_tile_parts;
-	/** data for the tile */
-	OPJ_BYTE *		m_data;
-	/** size of data */
-	OPJ_UINT32		m_data_size;
-	/** encoding norms */
-	OPJ_FLOAT64 *	mct_norms;
-	/** the mct decoding matrix */
-	OPJ_FLOAT32 *	m_mct_decoding_matrix;
-	/** the mct coding matrix */
-	OPJ_FLOAT32 *	m_mct_coding_matrix;
-	/** mct records */
-	opj_mct_data_t * m_mct_records;
-	/** the number of mct records. */
-	OPJ_UINT32 m_nb_mct_records;
-	/** the max number of mct records. */
-	OPJ_UINT32 m_nb_max_mct_records;
-	/** mcc records */
-	opj_simple_mcc_decorrelation_data_t * m_mcc_records;
-	/** the number of mct records. */
-	OPJ_UINT32 m_nb_mcc_records;
-	/** the max number of mct records. */
-	OPJ_UINT32 m_nb_max_mcc_records;
-
-
-	/***** FLAGS *******/
-	/** If ppt == 1 --> there was a PPT marker for the present tile */
-	OPJ_UINT32 ppt : 1;
-	/** indicates if a POC marker has been used O:NO, 1:YES */
-	OPJ_UINT32 POC : 1;
-} opj_tcp_v2_t;
-
-
-
-
-
-/** V1 STYLE
-Coding parameters
-*/
-typedef struct opj_cp {
-	/** Digital cinema profile*/
-	OPJ_CINEMA_MODE cinema;
-	/** Maximum rate for each component. If == 0, component size limitation is not considered */
-	int max_comp_size;
-	/** Size of the image in bits*/
-	int img_size;
-	/** Rsiz*/
-	OPJ_RSIZ_CAPABILITIES rsiz;
-	/** Enabling Tile part generation*/
-	char tp_on;
-	/** Flag determining tile part generation*/
-	char tp_flag;
-	/** Position of tile part flag in progression order*/
-	int tp_pos;
-	/** allocation by rate/distortion */
-	int disto_alloc;
-	/** allocation by fixed layer */
-	int fixed_alloc;
-	/** add fixed_quality */
-	int fixed_quality;
-	/** if != 0, then original dimension divided by 2^(reduce); if == 0 or not used, image is decoded to the full resolution */
-	int reduce;
-	/** if != 0, then only the first "layer" layers are decoded; if == 0 or not used, all the quality layers are decoded */
-	int layer;
-	/** if == NO_LIMITATION, decode entire codestream; if == LIMIT_TO_MAIN_HEADER then only decode the main header */
-	OPJ_LIMIT_DECODING limit_decoding;
-	/** XTOsiz */
-	int tx0;
-	/** YTOsiz */
-	int ty0;
-	/** XTsiz */
-	int tdx;
-	/** YTsiz */
-	int tdy;
-	/** comment for coding */
-	char *comment;
-	/** number of tiles in width */
-	int tw;
-	/** number of tiles in heigth */
-	int th;
-	/** ID number of the tiles present in the codestream */
-	int *tileno;
-	/** size of the vector tileno */
-	int tileno_size;
-	/** packet header store there for futur use in t2_decode_packet */
-	unsigned char *ppm_data;
-	/** pointer remaining on the first byte of the first header if ppm is used */
-	unsigned char *ppm_data_first;
-	/** if ppm == 1 --> there was a PPM marker for the present tile */
-	int ppm;
-	/** use in case of multiple marker PPM (number of info already store) */
-	int ppm_store;
-	/** use in case of multiple marker PPM (case on non-finished previous info) */
-	int ppm_previous;
-	/** ppmbug1 */
-	int ppm_len;
-	/** tile coding parameters */
-	opj_tcp_t *tcps;
-	/** fixed layer */
-	int *matrice;
-/* UniPG>> */
-#ifdef USE_JPWL
-	/** enables writing of EPC in MH, thus activating JPWL */
-	opj_bool epc_on;
-	/** enables writing of EPB, in case of activated JPWL */
-	opj_bool epb_on;
-	/** enables writing of ESD, in case of activated JPWL */
-	opj_bool esd_on;
-	/** enables writing of informative techniques of ESD, in case of activated JPWL */
-	opj_bool info_on;
-	/** enables writing of RED, in case of activated JPWL */
-	opj_bool red_on;
-	/** error protection method for MH (0,1,16,32,37-128) */
-	int hprot_MH;
-	/** tile number of header protection specification (>=0) */
-	int hprot_TPH_tileno[JPWL_MAX_NO_TILESPECS];
-	/** error protection methods for TPHs (0,1,16,32,37-128) */
-	int hprot_TPH[JPWL_MAX_NO_TILESPECS];
-	/** tile number of packet protection specification (>=0) */
-	int pprot_tileno[JPWL_MAX_NO_PACKSPECS];
-	/** packet number of packet protection specification (>=0) */
-	int pprot_packno[JPWL_MAX_NO_PACKSPECS];
-	/** error protection methods for packets (0,1,16,32,37-128) */
-	int pprot[JPWL_MAX_NO_PACKSPECS];
-	/** enables writing of ESD, (0/2/4 bytes) */
-	int sens_size;
-	/** sensitivity addressing size (0=auto/2/4 bytes) */
-	int sens_addr;
-	/** sensitivity range (0-3) */
-	int sens_range;
-	/** sensitivity method for MH (-1,0-7) */
-	int sens_MH;
-	/** tile number of sensitivity specification (>=0) */
-	int sens_TPH_tileno[JPWL_MAX_NO_TILESPECS];
-	/** sensitivity methods for TPHs (-1,0-7) */
-	int sens_TPH[JPWL_MAX_NO_TILESPECS];
-	/** enables JPWL correction at the decoder */
-	opj_bool correct;
-	/** expected number of components at the decoder */
-	int exp_comps;
-	/** maximum number of tiles at the decoder */
-	int max_tiles;
-#endif /* USE_JPWL */
-/* <<UniPG */
-} opj_cp_t;
-
-typedef struct opj_encoding_param
-{
-	/** Digital cinema profile*/
-	OPJ_CINEMA_MODE m_cinema;
-	/** Maximum rate for each component. If == 0, component size limitation is not considered */
-	OPJ_UINT32 m_max_comp_size;
-	/** Position of tile part flag in progression order*/
-	OPJ_INT32 m_tp_pos;
-	/** fixed layer */
-	OPJ_INT32 *m_matrice;
-	/** Flag determining tile part generation*/
-	OPJ_BYTE m_tp_flag;
-	/** allocation by rate/distortion */
-	OPJ_UINT32 m_disto_alloc : 1;
-	/** allocation by fixed layer */
-	OPJ_UINT32 m_fixed_alloc : 1;
-	/** add fixed_quality */
-	OPJ_UINT32 m_fixed_quality : 1;
-	/** Enabling Tile part generation*/
-	OPJ_UINT32 m_tp_on : 1;
-}
-opj_encoding_param_t;
-
-typedef struct opj_decoding_param
-{
-	/** if != 0, then original dimension divided by 2^(reduce); if == 0 or not used, image is decoded to the full resolution */
-	OPJ_UINT32 m_reduce;
-	/** if != 0, then only the first "layer" layers are decoded; if == 0 or not used, all the quality layers are decoded */
-	OPJ_UINT32 m_layer;
-}
-opj_decoding_param_t;
-
-
-/**
- * Coding parameters
- */
-typedef struct opj_cp_v2
-{
-	/** Size of the image in bits*/
-	/*int img_size;*/
-	/** Rsiz*/
-	OPJ_RSIZ_CAPABILITIES rsiz;
-	/** XTOsiz */
-	OPJ_UINT32 tx0; // MSD see norm
-	/** YTOsiz */
-	OPJ_UINT32 ty0; // MSD see norm
-	/** XTsiz */
-	OPJ_UINT32 tdx;
-	/** YTsiz */
-	OPJ_UINT32 tdy;
-	/** comment */
-	OPJ_CHAR *comment;
-	/** number of tiles in width */
-	OPJ_UINT32 tw;
-	/** number of tiles in heigth */
-	OPJ_UINT32 th;
-
-	/** packet header store there for futur use in t2_decode_packet */
-	OPJ_BYTE *ppm_data;
-	/** size of the ppm_data*/
-	OPJ_UINT32 ppm_len;
-	/** size of the ppm_data*/
-	OPJ_UINT32 ppm_data_read;
-
-	OPJ_BYTE *ppm_data_current;
-
-	/** packet header storage original buffer */
-	OPJ_BYTE *ppm_buffer;
-	/** pointer remaining on the first byte of the first header if ppm is used */
-	OPJ_BYTE *ppm_data_first;
-	/** Number of bytes actually stored inside the ppm_data */
-	OPJ_UINT32 ppm_data_size;
-	/** use in case of multiple marker PPM (number of info already store) */
-	OPJ_INT32 ppm_store;
-	/** use in case of multiple marker PPM (case on non-finished previous info) */
-	OPJ_INT32 ppm_previous;
-
-	/** tile coding parameters */
-	opj_tcp_v2_t *tcps;
-
-	union
-	{
-		opj_decoding_param_t m_dec;
-		opj_encoding_param_t m_enc;
-	}
-	m_specific_param;
-
-
-/* UniPG>> */
-#ifdef USE_JPWL
-	/** enables writing of EPC in MH, thus activating JPWL */
-	opj_bool epc_on;
-	/** enables writing of EPB, in case of activated JPWL */
-	opj_bool epb_on;
-	/** enables writing of ESD, in case of activated JPWL */
-	opj_bool esd_on;
-	/** enables writing of informative techniques of ESD, in case of activated JPWL */
-	opj_bool info_on;
-	/** enables writing of RED, in case of activated JPWL */
-	opj_bool red_on;
-	/** error protection method for MH (0,1,16,32,37-128) */
-	int hprot_MH;
-	/** tile number of header protection specification (>=0) */
-	int hprot_TPH_tileno[JPWL_MAX_NO_TILESPECS];
-	/** error protection methods for TPHs (0,1,16,32,37-128) */
-	int hprot_TPH[JPWL_MAX_NO_TILESPECS];
-	/** tile number of packet protection specification (>=0) */
-	int pprot_tileno[JPWL_MAX_NO_PACKSPECS];
-	/** packet number of packet protection specification (>=0) */
-	int pprot_packno[JPWL_MAX_NO_PACKSPECS];
-	/** error protection methods for packets (0,1,16,32,37-128) */
-	int pprot[JPWL_MAX_NO_PACKSPECS];
-	/** enables writing of ESD, (0/2/4 bytes) */
-	int sens_size;
-	/** sensitivity addressing size (0=auto/2/4 bytes) */
-	int sens_addr;
-	/** sensitivity range (0-3) */
-	int sens_range;
-	/** sensitivity method for MH (-1,0-7) */
-	int sens_MH;
-	/** tile number of sensitivity specification (>=0) */
-	int sens_TPH_tileno[JPWL_MAX_NO_TILESPECS];
-	/** sensitivity methods for TPHs (-1,0-7) */
-	int sens_TPH[JPWL_MAX_NO_TILESPECS];
-	/** enables JPWL correction at the decoder */
-	opj_bool correct;
-	/** expected number of components at the decoder */
-	int exp_comps;
-	/** maximum number of tiles at the decoder */
-	int max_tiles;
-#endif /* USE_JPWL */
-
-	/******** FLAGS *********/
-	/** if ppm == 1 --> there was a PPM marker*/
-	OPJ_UINT32 ppm : 1;
-	/** tells if the parameter is a coding or decoding one */
-	OPJ_UINT32 m_is_decoder : 1;
-/* <<UniPG */
-} opj_cp_v2_t;
-
-
-typedef struct opj_j2k_dec
-{
-	/** locate in which part of the codestream the decoder is (main header, tile header, end) */
-	OPJ_UINT32 m_state;
-	/**
-	 * store decoding parameters common to all tiles (information like COD, COC in main header)
-	 */
-	opj_tcp_v2_t *m_default_tcp;
-	OPJ_BYTE  *m_header_data;
-	OPJ_UINT32 m_header_data_size;
-	/** to tell the tile part length */
-	OPJ_UINT32 m_sot_length;
-	/** Only tiles index in the correct range will be decoded.*/
-	OPJ_UINT32 m_start_tile_x;
-	OPJ_UINT32 m_start_tile_y;
-	OPJ_UINT32 m_end_tile_x;
-	OPJ_UINT32 m_end_tile_y;
-	/**
-	 * Decoded area set by the user
-	 */
-	OPJ_UINT32 m_DA_x0;
-	OPJ_UINT32 m_DA_y0;
-	OPJ_UINT32 m_DA_x1;
-	OPJ_UINT32 m_DA_y1;
-
-	/** Index of the tile to decode (used in get_tile) */
-	OPJ_INT32 m_tile_ind_to_dec;
-	/** Position of the last SOT marker read */
-	OPJ_OFF_T m_last_sot_read_pos;
-
-	/**
-	 * Indicate that the current tile-part is assume as the last tile part of the codestream.
-	 * It is useful in the case of PSot is equal to zero. The sot length will be compute in the
-	 * SOD reader function. FIXME NOT USED for the moment
-	 */
-	opj_bool   m_last_tile_part;
-	/** to tell that a tile can be decoded. */
-	OPJ_UINT32 m_can_decode			: 1;
-	OPJ_UINT32 m_discard_tiles		: 1;
-	OPJ_UINT32 m_skip_data			: 1;
-
-} opj_j2k_dec_t;
-
-typedef struct opj_j2k_enc
-{
-	/** Tile part number, regardless of poc, for each new poc, tp is reset to 1*/
-	OPJ_UINT32 m_current_poc_tile_part_number; // tp_num
-
-	/** Tile part number currently coding, taking into account POC. m_current_tile_part_number holds the total number of tile parts while encoding the last tile part.*/
-	OPJ_UINT32 m_current_tile_part_number; //cur_tp_num
-
-	/**
-	locate the start position of the TLM marker
-	after encoding the tilepart, a jump (in j2k_write_sod) is done to the TLM marker to store the value of its length.
-	*/
-	OPJ_SIZE_T m_tlm_start;
-	/**
-	 * Stores the sizes of the tlm.
-	 */
-	OPJ_BYTE * m_tlm_sot_offsets_buffer;
-	/**
-	 * The current offset of the tlm buffer.
-	 */
-	OPJ_BYTE * m_tlm_sot_offsets_current;
-
-	/** Total num of tile parts in whole image = num tiles* num tileparts in each tile*/
-	/** used in TLMmarker*/
-	OPJ_UINT32 m_total_tile_parts;	 // totnum_tp
-
-	/* encoded data for a tile */
-	OPJ_BYTE * m_encoded_tile_data;
-
-	/* size of the encoded_data */
-	OPJ_UINT32 m_encoded_tile_size;
-
-	/* encoded data for a tile */
-	OPJ_BYTE * m_header_tile_data;
-
-	/* size of the encoded_data */
-	OPJ_UINT32 m_header_tile_data_size;
-
-
-} opj_j2k_enc_t;
-
-/**
-JPEG-2000 codestream reader/writer
-*/
-typedef struct opj_j2k {
-	/** codec context */
-	opj_common_ptr cinfo;
-
-	/** locate in which part of the codestream the decoder is (main header, tile header, end) */
-	int state;
-	/** number of the tile curently concern by coding/decoding */
-	int curtileno;
-	/** Tile part number*/
-	int tp_num;
-	/** Tilepart number currently coding*/
-	int cur_tp_num;
-	/** Total number of tileparts of the current tile*/
-	int *cur_totnum_tp;
-	/**
-	locate the start position of the TLM marker  
-	after encoding the tilepart, a jump (in j2k_write_sod) is done to the TLM marker to store the value of its length. 
-	*/
-	int tlm_start;
-	/** Total num of tile parts in whole image = num tiles* num tileparts in each tile*/
-	/** used in TLMmarker*/
-	int totnum_tp;	
-	/** 
-	locate the position of the end of the tile in the codestream, 
-	used to detect a truncated codestream (in j2k_read_sod)
-	*/
-	unsigned char *eot;
-	/**
-	locate the start position of the SOT marker of the current coded tile:  
-	after encoding the tile, a jump (in j2k_write_sod) is done to the SOT marker to store the value of its length. 
-	*/
-	int sot_start;
-	int sod_start;
-	/**
-	as the J2K-file is written in several parts during encoding, 
-	it enables to make the right correction in position return by cio_tell
-	*/
-	int pos_correction;
-	/** array used to store the data of each tile */
-	unsigned char **tile_data;
-	/** array used to store the length of each tile */
-	int *tile_len;
-	/** 
-	decompression only : 
-	store decoding parameters common to all tiles (information like COD, COC in main header)
-	*/
-	opj_tcp_t *default_tcp;
-	/** pointer to the encoded / decoded image */
-	opj_image_t *image;
-	/** pointer to the coding parameters */
-	opj_cp_t *cp;
-	/** helper used to write the index file */
-	opj_codestream_info_t *cstr_info;
-	/** pointer to the byte i/o stream */
-	opj_cio_t *cio;
-} opj_j2k_t;
-
-struct opj_tcd_v2;
-/**
-JPEG-2000 codestream reader/writer
-*/
-typedef struct opj_j2k_v2
-{
-	/* J2K codestream is decoded*/
-	opj_bool m_is_decoder;
-
-	/* FIXME DOC*/
-	union
-	{
-		opj_j2k_dec_t m_decoder;
-		opj_j2k_enc_t m_encoder;
-	}
-	m_specific_param;
-
-	/** pointer to the internal/private encoded / decoded image */
-	opj_image_t* m_private_image;
-
-	/* pointer to the output image (decoded)*/
-	opj_image_t* m_output_image;
-
-	/** Coding parameters */
-	opj_cp_v2_t m_cp;
-
-	/** the list of procedures to exec **/
-	struct opj_procedure_list *	m_procedure_list;
-
-	/** the list of validation procedures to follow to make sure the code is valid **/
-	struct opj_procedure_list *	m_validation_list;
-
-	/** helper used to write the index file */
-	opj_codestream_index_t *cstr_index;
-
-	/** number of the tile curently concern by coding/decoding */
-	OPJ_UINT32 m_current_tile_number;
-
-	/** the current tile coder/decoder **/
-	struct opj_tcd_v2 *	m_tcd;
-
-}
-opj_j2k_v2_t;
-
-
-
-
-/** @name Exported functions */
-/*@{*/
-/* ----------------------------------------------------------------------- */
-/**
-Creates a J2K decompression structure
-@param cinfo Codec context info
-@return Returns a handle to a J2K decompressor if successful, returns NULL otherwise
-*/
-opj_j2k_t* j2k_create_decompress(opj_common_ptr cinfo);
-/**
-Destroy a J2K decompressor handle
-@param j2k J2K decompressor handle to destroy
-*/
-void j2k_destroy_decompress(opj_j2k_t *j2k);
-/**
-Setup the decoder decoding parameters using user parameters.
-Decoding parameters are returned in j2k->cp. 
-@param j2k J2K decompressor handle
-@param parameters decompression parameters
-*/
-void j2k_setup_decoder(opj_j2k_t *j2k, opj_dparameters_t *parameters);
-
-void j2k_setup_decoder_v2(opj_j2k_v2_t *j2k, opj_dparameters_t *parameters);
-
-/**
-Decode an image from a JPEG-2000 codestream
-@param j2k J2K decompressor handle
-@param cio Input buffer stream
-@param cstr_info Codestream information structure if required, NULL otherwise
-@return Returns a decoded image if successful, returns NULL otherwise
-*/
-opj_image_t* j2k_decode(opj_j2k_t *j2k, opj_cio_t *cio, opj_codestream_info_t *cstr_info);
-/**
-Decode an image form a JPT-stream (JPEG 2000, JPIP)
-@param j2k J2K decompressor handle
-@param cio Input buffer stream
-@param cstr_info Codestream information structure if required, NULL otherwise
-@return Returns a decoded image if successful, returns NULL otherwise
-*/
-opj_image_t* j2k_decode_jpt_stream(opj_j2k_t *j2k, opj_cio_t *cio, opj_codestream_info_t *cstr_info);
-/**
-Creates a J2K compression structure
-@param cinfo Codec context info
-@return Returns a handle to a J2K compressor if successful, returns NULL otherwise
-*/
-opj_j2k_t* j2k_create_compress(opj_common_ptr cinfo);
-
-/**
-Creates a J2K compression structure
-@param cinfo Codec context info
-@return Returns a handle to a J2K compressor if successful, returns NULL otherwise
-*/
-opj_j2k_v2_t* j2k_create_compress_v2();
-
-/**
-Destroy a J2K compressor handle
-@param j2k J2K compressor handle to destroy
-*/
-void j2k_destroy_compress(opj_j2k_t *j2k);
-/**
-Setup the encoder parameters using the current image and using user parameters. 
-Coding parameters are returned in j2k->cp. 
-@param j2k J2K compressor handle
-@param parameters compression parameters
-@param image input filled image
-*/
-void j2k_setup_encoder(opj_j2k_t *j2k, opj_cparameters_t *parameters, opj_image_t *image);
-/**
-Converts an enum type progression order to string type
-*/
-char *j2k_convert_progression_order(OPJ_PROG_ORDER prg_order);
-/**
-Encode an image into a JPEG-2000 codestream
-@param j2k J2K compressor handle
-@param cio Output buffer stream
-@param image Image to encode
-@param cstr_info Codestream information structure if required, NULL otherwise
-@return Returns true if successful, returns false otherwise
-*/
-opj_bool j2k_encode(opj_j2k_t *j2k, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t *cstr_info);
-
-/* ----------------------------------------------------------------------- */
-/*@}*/
-
-/*@}*/
-
-/**
- * Ends the decompression procedures and possibiliy add data to be read after the
- * codestream.
- */
-opj_bool j2k_end_decompress(opj_j2k_v2_t *j2k, struct opj_stream_private *cio, struct opj_event_mgr * p_manager);
-
-/**
- * Reads a jpeg2000 codestream header structure.
- *
- * @param cio the stream to read data from.
- * @param p_j2k the jpeg2000 codec.
- * @param p_manager the user event manager.
- *
- * @return true if the box is valid.
- */
-opj_bool j2k_read_header(	struct opj_stream_private *p_stream,
-							opj_j2k_v2_t* p_j2k,
-							opj_image_t** p_image,
-							struct opj_event_mgr* p_manager );
-
-
-/**
- * Destroys a jpeg2000 codec.
- *
- * @param	p_j2k	the jpeg20000 structure to destroy.
- */
-void j2k_destroy (opj_j2k_v2_t *p_j2k);
-
-/**
- * Destroys a codestream index structure.
- *
- * @param	p_cstr_ind	the codestream index parameter to destroy.
- */
-void j2k_destroy_cstr_index (opj_codestream_index_t *p_cstr_ind);
-
-/**
- * Decode tile data.
- * @param	p_j2k		the jpeg2000 codec.
- * @param	p_stream			the stream to write data to.
- * @param	p_manager	the user event manager.
- */
-opj_bool j2k_decode_tile (
-					opj_j2k_v2_t * p_j2k,
-					OPJ_UINT32 p_tile_index,
-					OPJ_BYTE * p_data,
-					OPJ_UINT32 p_data_size,
-					struct opj_stream_private *p_stream,
-					struct opj_event_mgr * p_manager
-					);
-
-/**
- * Reads a tile header.
- * @param	p_j2k		the jpeg2000 codec.
- * @param	p_stream			the stream to write data to.
- * @param	p_manager	the user event manager.
- */
-opj_bool j2k_read_tile_header (
-					 opj_j2k_v2_t * p_j2k,
-					 OPJ_UINT32 * p_tile_index,
-					 OPJ_UINT32 * p_data_size,
-					 OPJ_INT32 * p_tile_x0,
-					 OPJ_INT32 * p_tile_y0,
-					 OPJ_INT32 * p_tile_x1,
-					 OPJ_INT32 * p_tile_y1,
-					 OPJ_UINT32 * p_nb_comps,
-					 opj_bool * p_go_on,
-					 struct opj_stream_private *p_stream,
-					 struct opj_event_mgr * p_manager
-					);
-
-
-/**
- * Sets the given area to be decoded. This function should be called right after opj_read_header and before any tile header reading.
- *
- * @param	p_j2k			the jpeg2000 codec.
- * @param	p_start_x		the left position of the rectangle to decode (in image coordinates).
- * @param	p_end_x			the right position of the rectangle to decode (in image coordinates).
- * @param	p_start_y		the up position of the rectangle to decode (in image coordinates).
- * @param	p_end_y			the bottom position of the rectangle to decode (in image coordinates).
- * @param	p_manager		the user event manager
- *
- * @return	true			if the area could be set.
- */
-opj_bool j2k_set_decode_area(	opj_j2k_v2_t *p_j2k,
-								opj_image_t* p_image,
-								OPJ_INT32 p_start_x, OPJ_INT32 p_start_y,
-								OPJ_INT32 p_end_x, OPJ_INT32 p_end_y,
-								struct opj_event_mgr * p_manager );
-
-/**
- * Creates a J2K decompression structure.
- *
- * @return a handle to a J2K decompressor if successful, NULL otherwise.
- */
-opj_j2k_v2_t* j2k_create_decompress_v2();
-
-
-/**
- * Dump some elements from the J2K decompression structure .
- *
- *@param p_j2k				the jpeg2000 codec.
- *@param flag				flag to describe what elments are dump.
- *@param out_stream			output stream where dump the elements.
- *
-*/
-void j2k_dump (opj_j2k_v2_t* p_j2k, OPJ_INT32 flag, FILE* out_stream);
-
-
-
-/**
- * Dump an image header structure.
- *
- *@param img_header			the image header to dump.
- *@param dev_dump_flag		flag to describe if we are in the case of this function is use outside j2k_dump function
- *@param out_stream			output stream where dump the elements.
- */
-void j2k_dump_image_header(opj_image_t* image, opj_bool dev_dump_flag, FILE* out_stream);
-
-/**
- * Dump a component image header structure.
- *
- *@param comp_header		the component image header to dump.
- *@param dev_dump_flag		flag to describe if we are in the case of this function is use outside j2k_dump function
- *@param out_stream			output stream where dump the elements.
- */
-void j2k_dump_image_comp_header(opj_image_comp_t* comp, opj_bool dev_dump_flag, FILE* out_stream);
-
-/**
- * Get the codestream info from a JPEG2000 codec.
- *
- *@param	p_j2k				the component image header to dump.
- *
- *@return	the codestream information extract from the jpg2000 codec
- */
-opj_codestream_info_v2_t* j2k_get_cstr_info(opj_j2k_v2_t* p_j2k);
-
-/**
- * Get the codestream index from a JPEG2000 codec.
- *
- *@param	p_j2k				the component image header to dump.
- *
- *@return	the codestream index extract from the jpg2000 codec
- */
-opj_codestream_index_t* j2k_get_cstr_index(opj_j2k_v2_t* p_j2k);
-
-/**
- * Decode an image from a JPEG-2000 codestream
- * @param j2k J2K decompressor handle
- * @param cio Input buffer stream
- * @param cstr_info Codestream information structure if required, NULL otherwise
- * @return Returns a decoded image if successful, returns NULL otherwise
-*/
-opj_bool j2k_decode_v2(opj_j2k_v2_t *j2k, struct opj_stream_private *cio, opj_image_t* p_image, opj_event_mgr_t * p_manager);
-
-
-opj_bool j2k_get_tile(	opj_j2k_v2_t *p_j2k,
-						opj_stream_private_t *p_stream,
-						opj_image_t* p_image,
-						struct opj_event_mgr * p_manager,
-						OPJ_UINT32 tile_index );
-
-opj_bool j2k_set_decoded_resolution_factor(opj_j2k_v2_t *p_j2k, OPJ_UINT32 res_factor, opj_event_mgr_t * p_manager);
-
-
-#endif /* __J2K_H */
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/j2k_lib.c b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/j2k_lib.c
deleted file mode 100644
index a66e31e9afb3150d5650714815957177193c8cdc..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/j2k_lib.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * 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.
- */
-
-#ifdef _WIN32
-#include <windows.h>
-#else
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <sys/times.h>
-#endif /* _WIN32 */
-#include "opj_includes.h"
-
-double opj_clock(void) {
-#ifdef _WIN32
-	/* _WIN32: use QueryPerformance (very accurate) */
-    LARGE_INTEGER freq , t ;
-    /* freq is the clock speed of the CPU */
-    QueryPerformanceFrequency(&freq) ;
-	/* cout << "freq = " << ((double) freq.QuadPart) << endl; */
-    /* t is the high resolution performance counter (see MSDN) */
-    QueryPerformanceCounter ( & t ) ;
-    return ( t.QuadPart /(double) freq.QuadPart ) ;
-#else
-	/* Unix or Linux: use resource usage */
-    struct rusage t;
-    double procTime;
-    /* (1) Get the rusage data structure at this moment (man getrusage) */
-    getrusage(0,&t);
-    /* (2) What is the elapsed time ? - CPU time = User time + System time */
-	/* (2a) Get the seconds */
-    procTime = t.ru_utime.tv_sec + t.ru_stime.tv_sec;
-    /* (2b) More precisely! Get the microseconds part ! */
-    return ( procTime + (t.ru_utime.tv_usec + t.ru_stime.tv_usec) * 1e-6 ) ;
-#endif
-}
-
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/j2k_lib.h b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/j2k_lib.h
deleted file mode 100644
index 5f3406e510650511618d8d99e43343d65e2ffaf2..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/j2k_lib.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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_LIB_H
-#define __J2K_LIB_H
-/**
-@file j2k_lib.h
-@brief Internal functions
-
-The functions in J2K_LIB.C are internal utilities mainly used for timing.
-*/
-
-/** @defgroup MISC MISC - Miscellaneous internal functions */
-/*@{*/
-
-/** @name Exported functions */
-/*@{*/
-/* ----------------------------------------------------------------------- */
-
-/**
-Difference in successive opj_clock() calls tells you the elapsed time
-@return Returns time in seconds
-*/
-double opj_clock(void);
-
-/* ----------------------------------------------------------------------- */
-/*@}*/
-
-/*@}*/
-
-#endif /* __J2K_LIB_H */
-
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/jp2.c b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/jp2.c
deleted file mode 100644
index ad5527bb19b117922c41c9c030ca1c885874a2d6..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/jp2.c
+++ /dev/null
@@ -1,2771 +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
- * 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"
-
-/** @defgroup JP2 JP2 - JPEG-2000 file format reader/writer */
-/*@{*/
-
-#define BOX_SIZE	1024
-
-/** @name Local static functions */
-/*@{*/
-
-/**
-Read box headers
-@param cinfo Codec context info
-@param cio Input stream
-@param box
-@return Returns true if successful, returns false otherwise
-*/
-static opj_bool jp2_read_boxhdr(opj_common_ptr cinfo, opj_cio_t *cio, opj_jp2_box_t *box);
-/*static void jp2_write_url(opj_cio_t *cio, char *Idx_file);*/
-/**
-Read the IHDR box - Image Header box
-@param jp2 JP2 handle
-@param cio Input buffer stream
-@return Returns true if successful, returns false otherwise
-*/
-static opj_bool jp2_read_ihdr(opj_jp2_t *jp2, opj_cio_t *cio);
-
-/**
- * Reads a IHDR box - Image Header box
- *
- * @param	p_image_header_data			pointer to actual data (already read from file)
- * @param	jp2							the jpeg2000 file codec.
- * @param	p_image_header_size			the size of the image header
- * @param	p_manager					the user event manager.
- *
- * @return	true if the image header is valid, fale else.
- */
-static opj_bool jp2_read_ihdr_v2(
-							opj_jp2_v2_t *jp2,
-							unsigned char * p_image_header_data,
-							unsigned int p_image_header_size,
-							struct opj_event_mgr * p_manager
-						  );
-
-static void jp2_write_ihdr(opj_jp2_t *jp2, opj_cio_t *cio);
-static void jp2_write_bpcc(opj_jp2_t *jp2, opj_cio_t *cio);
-static opj_bool jp2_read_bpcc(opj_jp2_t *jp2, opj_cio_t *cio);
-
-/**
- * Reads a Bit per Component box.
- *
- * @param	p_bpc_header_data			pointer to actual data (already read from file)
- * @param	jp2							the jpeg2000 file codec.
- * @param	p_bpc_header_size			the size of the bpc header
- * @param	p_manager					the user event manager.
- *
- * @return	true if the bpc header is valid, fale else.
- */
-static opj_bool jp2_read_bpcc_v2(
-							opj_jp2_v2_t *jp2,
-							unsigned char * p_bpc_header_data,
-							unsigned int p_bpc_header_size,
-							struct opj_event_mgr * p_manager
-						  );
-
-static opj_bool jp2_read_cdef_v2(	opj_jp2_v2_t * jp2,
-									unsigned char * p_cdef_header_data,
-									OPJ_UINT32 p_cdef_header_size,
-									opj_event_mgr_t * p_manager
-									);
-
-static void jp2_write_colr(opj_jp2_t *jp2, opj_cio_t *cio);
-/**
-Write the FTYP box - File type box
-@param jp2 JP2 handle
-@param cio Output buffer stream
-*/
-static void jp2_write_ftyp(opj_jp2_t *jp2, opj_cio_t *cio);
-/**
-Read the FTYP box - File type box
-@param jp2 JP2 handle
-@param cio Input buffer stream
-@return Returns true if successful, returns false otherwise
-*/
-static opj_bool jp2_read_ftyp(opj_jp2_t *jp2, opj_cio_t *cio);
-
-/**
- * Reads a a FTYP box - File type box
- *
- * @param	p_header_data	the data contained in the FTYP box.
- * @param	jp2				the jpeg2000 file codec.
- * @param	p_header_size	the size of the data contained in the FTYP box.
- * @param	p_manager		the user event manager.
- *
- * @return true if the FTYP box is valid.
- */
-static opj_bool jp2_read_ftyp_v2(
-							opj_jp2_v2_t *jp2,
-							unsigned char * p_header_data,
-							unsigned int p_header_size,
-							struct opj_event_mgr * p_manager
-						);
-
-/**
- * Reads the Jpeg2000 file Header box - JP2 Header box (warning, this is a super box).
- *
- * @param	p_header_data	the data contained in the file header box.
- * @param	jp2				the jpeg2000 file codec.
- * @param	p_header_size	the size of the data contained in the file header box.
- * @param	p_manager		the user event manager.
- *
- * @return true if the JP2 Header box was successfully reconized.
-*/
-static opj_bool jp2_read_jp2h_v2(
-						opj_jp2_v2_t *jp2,
-						unsigned char * p_header_data,
-						unsigned int p_header_size,
-						struct opj_event_mgr * p_manager
-					);
-
-static int jp2_write_jp2c(opj_jp2_t *jp2, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t *cstr_info);
-static opj_bool jp2_read_jp2c(opj_jp2_t *jp2, opj_cio_t *cio, unsigned int *j2k_codestream_length, unsigned int *j2k_codestream_offset);
-static void jp2_write_jp(opj_cio_t *cio);
-/**
-Read the JP box - JPEG 2000 signature
-@param jp2 JP2 handle
-@param cio Input buffer stream
-@return Returns true if successful, returns false otherwise
-*/
-static opj_bool jp2_read_jp(opj_jp2_t *jp2, opj_cio_t *cio);
-
-/**
- * Reads a jpeg2000 file signature box.
- *
- * @param	p_header_data	the data contained in the signature box.
- * @param	jp2				the jpeg2000 file codec.
- * @param	p_header_size	the size of the data contained in the signature box.
- * @param	p_manager		the user event manager.
- *
- * @return true if the file signature box is valid.
- */
-static opj_bool jp2_read_jp_v2(
-					opj_jp2_v2_t *jp2,
-					unsigned char * p_header_data,
-					unsigned int p_header_size,
-					struct opj_event_mgr * p_manager
-				 );
-
-/**
-Decode the structure of a JP2 file
-@param jp2 JP2 handle
-@param cio Input buffer stream
-@param color Collector for profile, cdef and pclr data
-@return Returns true if successful, returns false otherwise
-*/
-static opj_bool jp2_read_struct(opj_jp2_t *jp2, opj_cio_t *cio,
-	opj_jp2_color_t *color);
-/**
-Apply collected palette data
-@param color Collector for profile, cdef and pclr data
-@param image 
-*/
-static void jp2_apply_pclr(opj_image_t *image, opj_jp2_color_t *color);
-/**
-Collect palette data
-@param jp2 JP2 handle
-@param cio Input buffer stream
-@param box
-@param color Collector for profile, cdef and pclr data
-@return Returns true if successful, returns false otherwise
-*/
-static opj_bool jp2_read_pclr(opj_jp2_t *jp2, opj_cio_t *cio,
-    opj_jp2_box_t *box, opj_jp2_color_t *color);
-
-static opj_bool jp2_read_pclr_v2(	opj_jp2_v2_t *jp2,
-							unsigned char * p_pclr_header_data,
-							OPJ_UINT32 p_pclr_header_size,
-							opj_event_mgr_t * p_manager
-						  );
-
-/**
-Collect component mapping data
-@param jp2 JP2 handle
-@param cio Input buffer stream
-@param box
-@param color Collector for profile, cdef and pclr data
-@return Returns true if successful, returns false otherwise
-*/
-static opj_bool jp2_read_cmap(opj_jp2_t *jp2, opj_cio_t *cio,
-    opj_jp2_box_t *box, opj_jp2_color_t *color);
-
-
-static opj_bool jp2_read_cmap_v2(	opj_jp2_v2_t * jp2,
-							unsigned char * p_cmap_header_data,
-							OPJ_UINT32 p_cmap_header_size,
-							opj_event_mgr_t * p_manager
-						  );
-
-/**
-Collect colour specification data
-@param jp2 JP2 handle
-@param cio Input buffer stream
-@param box
-@param color Collector for profile, cdef and pclr data
-@return Returns true if successful, returns false otherwise
-*/
-static opj_bool jp2_read_colr(opj_jp2_t *jp2, opj_cio_t *cio,
-    opj_jp2_box_t *box, opj_jp2_color_t *color);
-
-/**
- * Reads the Color Specification box.
- *
- * @param	p_colr_header_data			pointer to actual data (already read from file)
- * @param	jp2							the jpeg2000 file codec.
- * @param	p_colr_header_size			the size of the color header
- * @param	p_manager					the user event manager.
- *
- * @return	true if the bpc header is valid, fale else.
-*/
-static opj_bool jp2_read_colr_v2(
-							opj_jp2_v2_t *jp2,
-							unsigned char * p_colr_header_data,
-							OPJ_UINT32 p_colr_header_size,
-							struct opj_event_mgr * p_manager
-						  );
-
-/**
-Write file Index (superbox)
-@param[in] offset_jp2c offset of jp2c box
-@param[in] length_jp2c length of jp2c box
-@param[in] offset_idx  offset of cidx box
-@param[in] length_idx  length of cidx box
-@param[in] cio         file output handle
-@return                length of fidx box
-*/
-static int write_fidx( int offset_jp2c, int length_jp2c, int offset_idx, int length_idx, opj_cio_t *cio);
-/**
-Write index Finder box
-@param[in] offset offset of fidx box
-@param[in] length length of fidx box
-@param[in] cio         file output handle
-*/
-static void write_iptr( int offset, int length, opj_cio_t *cio);
-/**
-
-Write proxy box
-@param[in] offset_jp2c offset of jp2c box
-@param[in] length_jp2c length of jp2c box
-@param[in] offset_idx  offset of cidx box
-@param[in] length_idx  length of cidx box
-@param[in] cio         file output handle
-*/
-static void write_prxy( int offset_jp2c, int length_jp2c, int offset_idx, int length_idx, opj_cio_t *cio);
-/*@}*/
-
-/*@}*/
-
-/**
- * Sets up the procedures to do on reading header after the codestream.
- * Developpers wanting to extend the library can add their own writting procedures.
- */
-static void jp2_setup_end_header_reading (opj_jp2_v2_t *jp2);
-
-/**
- * Reads a jpeg2000 file header structure.
- *
- * @param cio the stream to read data from.
- * @param jp2 the jpeg2000 file header structure.
- * @param p_manager the user event manager.
- *
- * @return true if the box is valid.
- */
-opj_bool jp2_read_header_procedure(
-								opj_jp2_v2_t *jp2,
-								struct opj_stream_private *cio,
-								struct opj_event_mgr * p_manager
-							);
-
-/**
- * Excutes the given procedures on the given codec.
- *
- * @param	p_procedure_list	the list of procedures to execute
- * @param	jp2					the jpeg2000 file codec to execute the procedures on.
- * @param	cio					the stream to execute the procedures on.
- * @param	p_manager			the user manager.
- *
- * @return	true				if all the procedures were successfully executed.
- */
-static opj_bool jp2_exec (
-					opj_jp2_v2_t * jp2,
-					struct opj_procedure_list * p_procedure_list,
-					struct opj_stream_private *cio,
-					struct opj_event_mgr * p_manager
-				  );
-
-/**
- * Reads a box header. The box is the way data is packed inside a jpeg2000 file structure.
- *
- * @param	cio						the input stream to read data from.
- * @param	box						the box structure to fill.
- * @param	p_number_bytes_read		pointer to an int that will store the number of bytes read from the stream (shoul usually be 2).
- * @param	p_manager				user event manager.
- *
- * @return	true if the box is reconized, false otherwise
-*/
-static opj_bool jp2_read_boxhdr_v2(
-								opj_jp2_box_t *box,
-								OPJ_UINT32 * p_number_bytes_read,
-								struct opj_stream_private *cio,
-								struct opj_event_mgr * p_manager
-							);
-
-/**
- * Finds the execution function related to the given box id.
- *
- * @param	p_id	the id of the handler to fetch.
- *
- * @return	the given handler or NULL if it could not be found.
- */
-static const opj_jp2_header_handler_t * jp2_find_handler (int p_id );
-
-/**
- * Finds the image execution function related to the given box id.
- *
- * @param	p_id	the id of the handler to fetch.
- *
- * @return	the given handler or NULL if it could not be found.
- */
-static const opj_jp2_header_handler_t * jp2_img_find_handler (int p_id);
-
-const opj_jp2_header_handler_t jp2_header [] =
-{
-	{JP2_JP,jp2_read_jp_v2},
-	{JP2_FTYP,jp2_read_ftyp_v2},
-	{JP2_JP2H,jp2_read_jp2h_v2}
-};
-
-const opj_jp2_header_handler_t jp2_img_header [] =
-{
-	{JP2_IHDR,jp2_read_ihdr_v2},
-	{JP2_COLR,jp2_read_colr_v2},
-	{JP2_BPCC,jp2_read_bpcc_v2},
-	{JP2_PCLR,jp2_read_pclr_v2},
-	{JP2_CMAP,jp2_read_cmap_v2},
-	{JP2_CDEF,jp2_read_cdef_v2}
-
-};
-
-/**
- * Reads a box header. The box is the way data is packed inside a jpeg2000 file structure. Data is read from a character string
- *
- * @param	p_data					the character string to read data from.
- * @param	box						the box structure to fill.
- * @param	p_number_bytes_read		pointer to an int that will store the number of bytes read from the stream (shoul usually be 2).
- * @param	p_box_max_size			the maximum number of bytes in the box.
- *
- * @return	true if the box is reconized, false otherwise
-*/
-static opj_bool jp2_read_boxhdr_char(
-								opj_jp2_box_t *box,
-								OPJ_BYTE * p_data,
-								OPJ_UINT32 * p_number_bytes_read,
-								OPJ_UINT32 p_box_max_size,
-								struct opj_event_mgr * p_manager
-							);
-
-/**
- * Sets up the validation ,i.e. adds the procedures to lauch to make sure the codec parameters
- * are valid. Developpers wanting to extend the library can add their own validation procedures.
- */
-static void jp2_setup_decoding_validation (opj_jp2_v2_t *jp2);
-
-/**
- * Sets up the procedures to do on reading header.
- * Developpers wanting to extend the library can add their own writting procedures.
- */
-static void jp2_setup_header_reading (opj_jp2_v2_t *jp2);
-
-
-
-/* ----------------------------------------------------------------------- */
-
-static opj_bool jp2_read_boxhdr(opj_common_ptr cinfo, opj_cio_t *cio, opj_jp2_box_t *box) {
-	box->init_pos = cio_tell(cio);
-	box->length = cio_read(cio, 4);
-	box->type = cio_read(cio, 4);
-	if (box->length == 1) {
-		if (cio_read(cio, 4) != 0) {
-			opj_event_msg(cinfo, EVT_ERROR, "Cannot handle box sizes higher than 2^32\n");
-			return OPJ_FALSE;
-		}
-		box->length = cio_read(cio, 4);
-		if (box->length == 0) 
-			box->length = cio_numbytesleft(cio) + 12;
-	}
-	else if (box->length == 0) {
-		box->length = cio_numbytesleft(cio) + 8;
-	}
-	
-	return OPJ_TRUE;
-}
-
-/**
- * Reads a box header. The box is the way data is packed inside a jpeg2000 file structure.
- *
- * @param	cio						the input stream to read data from.
- * @param	box						the box structure to fill.
- * @param	p_number_bytes_read		pointer to an int that will store the number of bytes read from the stream (should usually be 8).
- * @param	p_manager				user event manager.
- *
- * @return	true if the box is reconized, false otherwise
-*/
-opj_bool jp2_read_boxhdr_v2(opj_jp2_box_t *box, OPJ_UINT32 * p_number_bytes_read, opj_stream_private_t *cio, opj_event_mgr_t * p_manager)
-{
-	/* read header from file */
-	unsigned char l_data_header [8];
-
-	// preconditions
-	assert(cio != 00);
-	assert(box != 00);
-	assert(p_number_bytes_read != 00);
-	assert(p_manager != 00);
-
-	*p_number_bytes_read = opj_stream_read_data(cio,l_data_header,8,p_manager);
-	if (*p_number_bytes_read != 8) {
-		return OPJ_FALSE;
-	}
-
-	/* process read data */
-	opj_read_bytes(l_data_header,&(box->length), 4);
-	opj_read_bytes(l_data_header+4,&(box->type), 4);
-
-	// do we have a "special very large box ?"
-	// read then the XLBox
-	if (box->length == 1) {
-		OPJ_UINT32 l_xl_part_size;
-
-		OPJ_UINT32 l_nb_bytes_read = opj_stream_read_data(cio,l_data_header,8,p_manager);
-		if (l_nb_bytes_read != 8) {
-			if (l_nb_bytes_read > 0) {
-				*p_number_bytes_read += l_nb_bytes_read;
-			}
-
-			return OPJ_FALSE;
-		}
-
-		opj_read_bytes(l_data_header,&l_xl_part_size, 4);
-		if (l_xl_part_size != 0) {
-			opj_event_msg_v2(p_manager, EVT_ERROR, "Cannot handle box sizes higher than 2^32\n");
-			return OPJ_FALSE;
-		}
-		opj_read_bytes(l_data_header,&(box->length), 4);
-	}
-	return OPJ_TRUE;
-}
-
-#if 0
-static void jp2_write_url(opj_cio_t *cio, char *Idx_file) {
-	unsigned int i;
-	opj_jp2_box_t box;
-
-	box.init_pos = cio_tell(cio);
-	cio_skip(cio, 4);
-	cio_write(cio, JP2_URL, 4);	/* DBTL */
-	cio_write(cio, 0, 1);		/* VERS */
-	cio_write(cio, 0, 3);		/* FLAG */
-
-	if(Idx_file) {
-		for (i = 0; i < strlen(Idx_file); i++) {
-			cio_write(cio, Idx_file[i], 1);
-		}
-	}
-
-	box.length = cio_tell(cio) - box.init_pos;
-	cio_seek(cio, box.init_pos);
-	cio_write(cio, box.length, 4);	/* L */
-	cio_seek(cio, box.init_pos + box.length);
-}
-#endif
-
-static opj_bool jp2_read_ihdr(opj_jp2_t *jp2, opj_cio_t *cio) {
-	opj_jp2_box_t box;
-
-	opj_common_ptr cinfo = jp2->cinfo;
-
-	jp2_read_boxhdr(cinfo, cio, &box);
-	if (JP2_IHDR != box.type) {
-		opj_event_msg(cinfo, EVT_ERROR, "Expected IHDR Marker\n");
-		return OPJ_FALSE;
-	}
-
-	jp2->h = cio_read(cio, 4);			/* HEIGHT */
-	jp2->w = cio_read(cio, 4);			/* WIDTH */
-	jp2->numcomps = cio_read(cio, 2);	/* NC */
-	jp2->comps = (opj_jp2_comps_t*) opj_malloc(jp2->numcomps * sizeof(opj_jp2_comps_t));
-
-	jp2->bpc = cio_read(cio, 1);		/* BPC */
-
-	jp2->C = cio_read(cio, 1);			/* C */
-	jp2->UnkC = cio_read(cio, 1);		/* UnkC */
-	jp2->IPR = cio_read(cio, 1);		/* IPR */
-
-	if (cio_tell(cio) - box.init_pos != box.length) {
-		opj_event_msg(cinfo, EVT_ERROR, "Error with IHDR Box\n");
-		return OPJ_FALSE;
-	}
-
-	return OPJ_TRUE;
-}
-
-/**
- * Reads a IHDR box - Image Header box
- *
- * @param	p_image_header_data			pointer to actual data (already read from file)
- * @param	jp2							the jpeg2000 file codec.
- * @param	p_image_header_size			the size of the image header
- * @param	p_image_header_max_size		maximum size of the header, any size bigger than this value should result the function to output false.
- * @param	p_manager					the user event manager.
- *
- * @return	true if the image header is valid, fale else.
- */
-opj_bool jp2_read_ihdr_v2(
-							opj_jp2_v2_t *jp2,
-							unsigned char * p_image_header_data,
-							unsigned int p_image_header_size,
-							opj_event_mgr_t * p_manager
-						  )
-{
-	// preconditions
-	assert(p_image_header_data != 00);
-	assert(jp2 != 00);
-	assert(p_manager != 00);
-
-	if (p_image_header_size != 14) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Bad image header box (bad size)\n");
-		return OPJ_FALSE;
-	}
-
-	opj_read_bytes(p_image_header_data,&(jp2->h),4);			/* HEIGHT */
-	p_image_header_data += 4;
-	opj_read_bytes(p_image_header_data,&(jp2->w),4);			/* WIDTH */
-	p_image_header_data += 4;
-	opj_read_bytes(p_image_header_data,&(jp2->numcomps),2);			/* NC */
-	p_image_header_data += 2;
-
-	/* allocate memory for components */
-	jp2->comps = (opj_jp2_comps_t*) opj_malloc(jp2->numcomps * sizeof(opj_jp2_comps_t));
-	if (jp2->comps == 0) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory to handle image header (ihdr)\n");
-		return OPJ_FALSE;
-	}
-	memset(jp2->comps,0,jp2->numcomps * sizeof(opj_jp2_comps_t));
-
-	opj_read_bytes(p_image_header_data,&(jp2->bpc),1);			/* BPC */
-	++ p_image_header_data;
-
-	// if equal to 0 then need a BPC box (cf. chapter about image header box of the norm)
-	/*if (jp2->bpc == 0){
-			// indicate with a flag that we will wait a BPC box
-		}*/
-
-	opj_read_bytes(p_image_header_data,&(jp2->C),1);			/* C */
-	++ p_image_header_data;
-
-	// Should be equal to 7 cf. chapter about image header box of the norm
-	if (jp2->C != 7){
-		opj_event_msg_v2(p_manager, EVT_INFO, "JP2 IHDR box: compression type indicate that the file is not a conforming JP2 file (%d) \n", jp2->C);
-	}
-
-	opj_read_bytes(p_image_header_data,&(jp2->UnkC),1);			/* UnkC */
-	++ p_image_header_data;
-	opj_read_bytes(p_image_header_data,&(jp2->IPR),1);			/* IPR */
-	++ p_image_header_data;
-
-	return OPJ_TRUE;
-}
-
-static void jp2_write_ihdr(opj_jp2_t *jp2, opj_cio_t *cio) {
-	opj_jp2_box_t box;
-
-	box.init_pos = cio_tell(cio);
-	cio_skip(cio, 4);
-	cio_write(cio, JP2_IHDR, 4);		/* IHDR */
-
-	cio_write(cio, jp2->h, 4);			/* HEIGHT */
-	cio_write(cio, jp2->w, 4);			/* WIDTH */
-	cio_write(cio, jp2->numcomps, 2);	/* NC */
-
-	cio_write(cio, jp2->bpc, 1);		/* BPC */
-
-	cio_write(cio, jp2->C, 1);			/* C : Always 7 */
-	cio_write(cio, jp2->UnkC, 1);		/* UnkC, colorspace unknown */
-	cio_write(cio, jp2->IPR, 1);		/* IPR, no intellectual property */
-
-	box.length = cio_tell(cio) - box.init_pos;
-	cio_seek(cio, box.init_pos);
-	cio_write(cio, box.length, 4);	/* L */
-	cio_seek(cio, box.init_pos + box.length);
-}
-
-static void jp2_write_bpcc(opj_jp2_t *jp2, opj_cio_t *cio) {
-	unsigned int i;
-	opj_jp2_box_t box;
-
-	box.init_pos = cio_tell(cio);
-	cio_skip(cio, 4);
-	cio_write(cio, JP2_BPCC, 4);	/* BPCC */
-
-	for (i = 0; i < jp2->numcomps; i++) {
-		cio_write(cio, jp2->comps[i].bpcc, 1);
-	}
-
-	box.length = cio_tell(cio) - box.init_pos;
-	cio_seek(cio, box.init_pos);
-	cio_write(cio, box.length, 4);	/* L */
-	cio_seek(cio, box.init_pos + box.length);
-}
-
-
-static opj_bool jp2_read_bpcc(opj_jp2_t *jp2, opj_cio_t *cio) {
-	unsigned int i;
-	opj_jp2_box_t box;
-
-	opj_common_ptr cinfo = jp2->cinfo;
-
-	jp2_read_boxhdr(cinfo, cio, &box);
-	if (JP2_BPCC != box.type) {
-		opj_event_msg(cinfo, EVT_ERROR, "Expected BPCC Marker\n");
-		return OPJ_FALSE;
-	}
-
-	for (i = 0; i < jp2->numcomps; i++) {
-		jp2->comps[i].bpcc = cio_read(cio, 1);
-	}
-
-	if (cio_tell(cio) - box.init_pos != box.length) {
-		opj_event_msg(cinfo, EVT_ERROR, "Error with BPCC Box\n");
-		return OPJ_FALSE;
-	}
-
-	return OPJ_TRUE;
-}
-
-/**
- * Reads a Bit per Component box.
- *
- * @param	p_bpc_header_data			pointer to actual data (already read from file)
- * @param	jp2							the jpeg2000 file codec.
- * @param	p_bpc_header_size			pointer that will hold the size of the bpc header
- * @param	p_bpc_header_max_size		maximum size of the header, any size bigger than this value should result the function to output false.
- * @param	p_manager					the user event manager.
- *
- * @return	true if the bpc header is valid, fale else.
- */
-opj_bool jp2_read_bpcc_v2(	opj_jp2_v2_t *jp2,
-							unsigned char * p_bpc_header_data,
-							unsigned int p_bpc_header_size,
-							opj_event_mgr_t * p_manager
-						  )
-{
-	OPJ_UINT32 i;
-
-	// preconditions
-	assert(p_bpc_header_data != 00);
-	assert(jp2 != 00);
-	assert(p_manager != 00);
-
-	// TODO MSD
-	/*if (jp2->bpc != 0 ){
-		opj_event_msg_v2(p_manager, EVT_WARNING, "A BPCC header box is available although BPC is different to zero (%d)\n",jp2->bpc);
-	}*/
-
-	// and length is relevant
-	if (p_bpc_header_size != jp2->numcomps) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Bad BPCC header box (bad size)\n");
-		return OPJ_FALSE;
-	}
-
-	// read info for each component
-	for (i = 0; i < jp2->numcomps; ++i) {
-		opj_read_bytes(p_bpc_header_data,&jp2->comps[i].bpcc ,1);	/* read each BPCC component */
-		++p_bpc_header_data;
-	}
-
-	return OPJ_TRUE;
-}
-
-static void jp2_write_colr(opj_jp2_t *jp2, opj_cio_t *cio) {
-	opj_jp2_box_t box;
-
-	box.init_pos = cio_tell(cio);
-	cio_skip(cio, 4);
-	cio_write(cio, JP2_COLR, 4);		/* COLR */
-
-	cio_write(cio, jp2->meth, 1);		/* METH */
-	cio_write(cio, jp2->precedence, 1);	/* PRECEDENCE */
-	cio_write(cio, jp2->approx, 1);		/* APPROX */
-
-	if(jp2->meth == 2)
-	 jp2->enumcs = 0;
-
-	cio_write(cio, jp2->enumcs, 4);	/* EnumCS */
-
-	box.length = cio_tell(cio) - box.init_pos;
-	cio_seek(cio, box.init_pos);
-	cio_write(cio, box.length, 4);	/* L */
-	cio_seek(cio, box.init_pos + box.length);
-}
-
-static void jp2_free_pclr(opj_jp2_color_t *color)
-{
-    opj_free(color->jp2_pclr->channel_sign);
-    opj_free(color->jp2_pclr->channel_size);
-    opj_free(color->jp2_pclr->entries);
-
-	if(color->jp2_pclr->cmap) opj_free(color->jp2_pclr->cmap);
-
-    opj_free(color->jp2_pclr); color->jp2_pclr = NULL;
-}
-
-static void free_color_data(opj_jp2_color_t *color)
-{
-	if(color->jp2_pclr)
-   {
-	jp2_free_pclr(color);
-   }
-	if(color->jp2_cdef) 
-   {
-	if(color->jp2_cdef->info) opj_free(color->jp2_cdef->info);
-	opj_free(color->jp2_cdef);
-   }
-	if(color->icc_profile_buf) opj_free(color->icc_profile_buf);
-}
-
-
-static void jp2_apply_pclr(opj_image_t *image, opj_jp2_color_t *color)
-{
-	opj_image_comp_t *old_comps, *new_comps;
-	OPJ_BYTE *channel_size, *channel_sign;
-	OPJ_UINT32 *entries;
-	opj_jp2_cmap_comp_t *cmap;
-	OPJ_INT32 *src, *dst;
-	OPJ_UINT32 j, max;
-	OPJ_UINT16 i, nr_channels, cmp, pcol;
-	OPJ_INT32 k, top_k;
-
-	channel_size = color->jp2_pclr->channel_size;
-	channel_sign = color->jp2_pclr->channel_sign;
-	entries = color->jp2_pclr->entries;
-	cmap = color->jp2_pclr->cmap;
-	nr_channels = color->jp2_pclr->nr_channels;
-
-	old_comps = image->comps;
-	new_comps = (opj_image_comp_t*)
-			opj_malloc(nr_channels * sizeof(opj_image_comp_t));
-
-	for(i = 0; i < nr_channels; ++i) {
-		pcol = cmap[i].pcol; cmp = cmap[i].cmp;
-
-		new_comps[pcol] = old_comps[cmp];
-
-		/* Direct use */
-		if(cmap[i].mtyp == 0){
-			old_comps[cmp].data = NULL; continue;
-		}
-
-		/* Palette mapping: */
-		new_comps[pcol].data = (int*)
-				opj_malloc(old_comps[cmp].w * old_comps[cmp].h * sizeof(int));
-		new_comps[pcol].prec = channel_size[i];
-		new_comps[pcol].sgnd = channel_sign[i];
-	}
-
-	top_k = color->jp2_pclr->nr_entries - 1;
-
-	for(i = 0; i < nr_channels; ++i) {
-		/* Direct use: */
-		if(cmap[i].mtyp == 0) continue;
-
-		/* Palette mapping: */
-		cmp = cmap[i].cmp; pcol = cmap[i].pcol;
-		src = old_comps[cmp].data;
-		dst = new_comps[pcol].data;
-		max = new_comps[pcol].w * new_comps[pcol].h;
-
-		for(j = 0; j < max; ++j)
-		{
-			/* The index */
-			if((k = src[j]) < 0) k = 0; else if(k > top_k) k = top_k;
-
-			/* The colour */
-			dst[j] = entries[k * nr_channels + pcol];
-		}
-	}
-
-	max = image->numcomps;
-	for(i = 0; i < max; ++i) {
-		if(old_comps[i].data) opj_free(old_comps[i].data);
-	}
-
-	opj_free(old_comps);
-	image->comps = new_comps;
-	image->numcomps = nr_channels;
-
-	jp2_free_pclr(color);
-
-}/* apply_pclr() */
-
-
-static opj_bool jp2_read_pclr(opj_jp2_t *jp2, opj_cio_t *cio,
-	opj_jp2_box_t *box, opj_jp2_color_t *color)
-{
-	opj_jp2_pclr_t *jp2_pclr;
-	unsigned char *channel_size, *channel_sign;
-	unsigned int *entries;
-	unsigned short nr_entries, nr_channels;
-	unsigned short i, j;
-	unsigned char uc;
-
-	OPJ_ARG_NOT_USED(box);
-	OPJ_ARG_NOT_USED(jp2);
-
-/* Part 1, I.5.3.4: 'There shall be at most one Palette box inside
- * a JP2 Header box' :
-*/
-	if(color->jp2_pclr) return OPJ_FALSE;
-
-	nr_entries = (unsigned short)cio_read(cio, 2); /* NE */
-	nr_channels = (unsigned short)cio_read(cio, 1);/* NPC */
-
-	entries = (unsigned int*)
-	 opj_malloc(nr_channels * nr_entries * sizeof(unsigned int));
-	channel_size = (unsigned char*)opj_malloc(nr_channels);
-	channel_sign = (unsigned char*)opj_malloc(nr_channels);
-
-	jp2_pclr = (opj_jp2_pclr_t*)opj_malloc(sizeof(opj_jp2_pclr_t));
-	jp2_pclr->channel_sign = channel_sign;
-	jp2_pclr->channel_size = channel_size;
-	jp2_pclr->entries = entries;
-	jp2_pclr->nr_entries = nr_entries;
-	jp2_pclr->nr_channels = nr_channels;
-	jp2_pclr->cmap = NULL;
-
-	color->jp2_pclr = jp2_pclr;
-
-	for(i = 0; i < nr_channels; ++i)
-   {
-	uc = cio_read(cio, 1); /* Bi */
-	channel_size[i] = (uc & 0x7f) + 1;
-	channel_sign[i] = (uc & 0x80)?1:0;
-   }
-
-	for(j = 0; j < nr_entries; ++j)
-   {
-	for(i = 0; i < nr_channels; ++i)
-  {
-/* Cji */
-	*entries++ = cio_read(cio, channel_size[i]>>3);
-  }
-   }
-
-	return OPJ_TRUE;
-}/* jp2_read_pclr() */
-
-/**
- * Reads a palette box.
- *
- * @param	p_bpc_header_data			pointer to actual data (already read from file)
- * @param	jp2							the jpeg2000 file codec.
- * @param	p_bpc_header_size			pointer that will hold the size of the bpc header
- * @param	p_bpc_header_max_size		maximum size of the header, any size bigger than this value should result the function to output false.
- * @param	p_manager					the user event manager.
- *
- * @return	true if the bpc header is valid, fale else.
- */
-opj_bool jp2_read_pclr_v2(	opj_jp2_v2_t *jp2,
-							unsigned char * p_pclr_header_data,
-							OPJ_UINT32 p_pclr_header_size,
-							opj_event_mgr_t * p_manager
-						  ){
-	opj_jp2_pclr_t *jp2_pclr;
-	OPJ_BYTE *channel_size, *channel_sign;
-	OPJ_UINT32 *entries;
-	OPJ_UINT16 nr_entries,nr_channels;
-	OPJ_UINT16 i, j;
-	OPJ_UINT32 l_value;
-
-	// preconditions
-	assert(p_pclr_header_data != 00);
-	assert(jp2 != 00);
-	assert(p_manager != 00);
-
-	if(jp2->color.jp2_pclr)
-		return OPJ_FALSE;
-
-	opj_read_bytes(p_pclr_header_data, &l_value , 2);	/* NE */
-	p_pclr_header_data += 2;
-	nr_entries = (OPJ_UINT16) l_value;
-
-	opj_read_bytes(p_pclr_header_data, &l_value , 1);	/* NPC */
-	++p_pclr_header_data;
-	nr_channels = (OPJ_UINT16) l_value;
-
-	entries = (OPJ_UINT32*) opj_malloc(nr_channels * nr_entries * sizeof(OPJ_UINT32));
-	channel_size = (OPJ_BYTE*) opj_malloc(nr_channels);
-	channel_sign = (OPJ_BYTE*) opj_malloc(nr_channels);
-
-	jp2_pclr = (opj_jp2_pclr_t*)opj_malloc(sizeof(opj_jp2_pclr_t));
-	jp2_pclr->channel_sign = channel_sign;
-	jp2_pclr->channel_size = channel_size;
-	jp2_pclr->entries = entries;
-	jp2_pclr->nr_entries = nr_entries;
-	jp2_pclr->nr_channels = nr_channels;
-	jp2_pclr->cmap = NULL;
-
-	jp2->color.jp2_pclr = jp2_pclr;
-
-	for(i = 0; i < nr_channels; ++i) {
-		opj_read_bytes(p_pclr_header_data, &l_value , 1);	/* Bi */
-		++p_pclr_header_data;
-
-		channel_size[i] = (l_value & 0x7f) + 1;
-		channel_sign[i] = (l_value & 0x80)? 1 : 0;
-	}
-
-	for(j = 0; j < nr_entries; ++j) {
-		for(i = 0; i < nr_channels; ++i) {
-			//*entries++ = cio_read(cio, channel_size[i]>>3);
-			opj_read_bytes(p_pclr_header_data, &l_value , channel_size[i]>>3);	/* Cji */
-			p_pclr_header_data += channel_size[i]>>3;
-			*entries = (OPJ_UINT32) l_value;
-			entries++;
-		}
-	}
-
-	return OPJ_TRUE;
-}
-
-
-static opj_bool jp2_read_cmap(opj_jp2_t *jp2, opj_cio_t *cio,
-	opj_jp2_box_t *box, opj_jp2_color_t *color)
-{
-	opj_jp2_cmap_comp_t *cmap;
-	unsigned short i, nr_channels;
-
-	OPJ_ARG_NOT_USED(box);
-	OPJ_ARG_NOT_USED(jp2);
-
-/* Need nr_channels: */
-	if(color->jp2_pclr == NULL) return OPJ_FALSE;
-
-/* Part 1, I.5.3.5: 'There shall be at most one Component Mapping box
- * inside a JP2 Header box' :
-*/
-	if(color->jp2_pclr->cmap) return OPJ_FALSE;
-
-	nr_channels = color->jp2_pclr->nr_channels;
-	cmap = (opj_jp2_cmap_comp_t*)
-	 opj_malloc(nr_channels * sizeof(opj_jp2_cmap_comp_t));
-
-	for(i = 0; i < nr_channels; ++i)
-   {
-	cmap[i].cmp = (unsigned short)cio_read(cio, 2);
-	cmap[i].mtyp = cio_read(cio, 1);
-	cmap[i].pcol = cio_read(cio, 1);
-
-   }
-	color->jp2_pclr->cmap = cmap;
-
-	return OPJ_TRUE;
-
-}/* jp2_read_cmap() */
-
-/**
- * Reads the Component Mapping box.
- *
- * @param	p_cmap_header_data			pointer to actual data (already read from file)
- * @param	jp2							the jpeg2000 file codec.
- * @param	p_cmap_header_size			pointer that will hold the size of the color header
- * @param	p_manager					the user event manager.
- *
- * @return	true if the cdef header is valid, false else.
-*/
-static opj_bool jp2_read_cmap_v2(	opj_jp2_v2_t * jp2,
-							unsigned char * p_cmap_header_data,
-							OPJ_UINT32 p_cmap_header_size,
-							opj_event_mgr_t * p_manager
-						  )
-{
-	opj_jp2_cmap_comp_t *cmap;
-	OPJ_BYTE i, nr_channels;
-	OPJ_UINT32 l_value;
-
-	// preconditions
-	assert(jp2 != 00);
-	assert(p_cmap_header_data != 00);
-	assert(p_manager != 00);
-
-	/* Need nr_channels: */
-	if(jp2->color.jp2_pclr == NULL) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Need to read a PCLR box before the CMAP box.\n");
-		return OPJ_FALSE;
-	}
-
-	/* Part 1, I.5.3.5: 'There shall be at most one Component Mapping box
-	 * inside a JP2 Header box' :
-	*/
-	if(jp2->color.jp2_pclr->cmap) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Only one CMAP box is allowed.\n");
-		return OPJ_FALSE;
-	}
-
-	nr_channels = jp2->color.jp2_pclr->nr_channels;
-	cmap = (opj_jp2_cmap_comp_t*) opj_malloc(nr_channels * sizeof(opj_jp2_cmap_comp_t));
-
-	for(i = 0; i < nr_channels; ++i) {
-		opj_read_bytes(p_cmap_header_data, &l_value, 2);			/* CMP^i */
-		p_cmap_header_data +=2;
-		cmap[i].cmp = (OPJ_UINT16) l_value;
-
-		opj_read_bytes(p_cmap_header_data, &l_value, 1);			/* MTYP^i */
-		++p_cmap_header_data;
-		cmap[i].mtyp = (OPJ_BYTE) l_value;
-
-		opj_read_bytes(p_cmap_header_data, &l_value, 1);			/* PCOL^i */
-		++p_cmap_header_data;
-		cmap[i].pcol = (OPJ_BYTE) l_value;
-	}
-
-	jp2->color.jp2_pclr->cmap = cmap;
-
-	return OPJ_TRUE;
-}
-
-static void jp2_apply_cdef(opj_image_t *image, opj_jp2_color_t *color)
-{
-	opj_jp2_cdef_info_t *info;
-	OPJ_INT32 color_space;
-	OPJ_UINT16 i, n, cn, typ, asoc, acn;
-
-	color_space = image->color_space;
-	info = color->jp2_cdef->info;
-	n = color->jp2_cdef->n;
-
-	for(i = 0; i < n; ++i)
-	{
-		/* WATCH: acn = asoc - 1 ! */
-		if((asoc = info[i].asoc) == 0) continue;
-
-		cn = info[i].cn; typ = info[i].typ; acn = asoc - 1;
-
-		if(cn != acn)
-		{
-			opj_image_comp_t saved;
-
-			memcpy(&saved, &image->comps[cn], sizeof(opj_image_comp_t));
-			memcpy(&image->comps[cn], &image->comps[acn], sizeof(opj_image_comp_t));
-			memcpy(&image->comps[acn], &saved, sizeof(opj_image_comp_t));
-
-			info[i].asoc = cn + 1;
-			info[acn].asoc = info[acn].cn + 1;
-		}
-	}
-
-	if(color->jp2_cdef->info) opj_free(color->jp2_cdef->info);
-
-	opj_free(color->jp2_cdef); color->jp2_cdef = NULL;
-
-}/* jp2_apply_cdef() */
-
-static opj_bool jp2_read_cdef(opj_jp2_t *jp2, opj_cio_t *cio,
-	opj_jp2_box_t *box, opj_jp2_color_t *color)
-{
-	opj_jp2_cdef_info_t *info;
-	unsigned short i, n;
-
-	OPJ_ARG_NOT_USED(box);
-	OPJ_ARG_NOT_USED(jp2);
-
-/* Part 1, I.5.3.6: 'The shall be at most one Channel Definition box
- * inside a JP2 Header box.' 
-*/
-	if(color->jp2_cdef) return OPJ_FALSE;
-
-	if((n = (unsigned short)cio_read(cio, 2)) == 0) return OPJ_FALSE; /* szukw000: FIXME */
-
-	info = (opj_jp2_cdef_info_t*)
-	 opj_malloc(n * sizeof(opj_jp2_cdef_info_t));
-
-	color->jp2_cdef = (opj_jp2_cdef_t*)opj_malloc(sizeof(opj_jp2_cdef_t));
-	color->jp2_cdef->info = info;
-	color->jp2_cdef->n = n;
-
-	for(i = 0; i < n; ++i)
-   {
-	info[i].cn = (unsigned short)cio_read(cio, 2);
-	info[i].typ = (unsigned short)cio_read(cio, 2);
-	info[i].asoc = (unsigned short)cio_read(cio, 2);
-
-   }
-	return OPJ_TRUE;
-}/* jp2_read_cdef() */
-
-/**
- * Reads the Component Definition box.
- *
- * @param	p_cdef_header_data			pointer to actual data (already read from file)
- * @param	jp2							the jpeg2000 file codec.
- * @param	p_cdef_header_size			pointer that will hold the size of the color header
- * @param	p_manager					the user event manager.
- *
- * @return	true if the cdef header is valid, false else.
-*/
-static opj_bool jp2_read_cdef_v2(	opj_jp2_v2_t * jp2,
-							unsigned char * p_cdef_header_data,
-							OPJ_UINT32 p_cdef_header_size,
-							opj_event_mgr_t * p_manager
-						  )
-{
-	opj_jp2_cdef_info_t *cdef_info;
-	unsigned short i;
-	OPJ_UINT32 l_value;
-
-	// preconditions
-	assert(jp2 != 00);
-	assert(p_cdef_header_data != 00);
-	assert(p_manager != 00);
-
-	/* Part 1, I.5.3.6: 'The shall be at most one Channel Definition box
-	 * inside a JP2 Header box.'*/
-	if(jp2->color.jp2_cdef) return OPJ_FALSE;
-
-	opj_read_bytes(p_cdef_header_data,&l_value ,2);			/* N */
-	p_cdef_header_data+= 2;
-
-	if ( (OPJ_UINT16)l_value == 0){ /* szukw000: FIXME */
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Number of channel description is equal to zero in CDEF box.\n");
-		return OPJ_FALSE;
-	}
-
-	cdef_info = (opj_jp2_cdef_info_t*) opj_malloc(l_value * sizeof(opj_jp2_cdef_info_t));
-
-	jp2->color.jp2_cdef = (opj_jp2_cdef_t*)opj_malloc(sizeof(opj_jp2_cdef_t));
-	jp2->color.jp2_cdef->info = cdef_info;
-	jp2->color.jp2_cdef->n = (OPJ_UINT16) l_value;
-
-	for(i = 0; i < jp2->color.jp2_cdef->n; ++i) {
-		opj_read_bytes(p_cdef_header_data, &l_value, 2);			/* Cn^i */
-		p_cdef_header_data +=2;
-		cdef_info[i].cn = (OPJ_UINT16) l_value;
-
-		opj_read_bytes(p_cdef_header_data, &l_value, 2);			/* Typ^i */
-		p_cdef_header_data +=2;
-		cdef_info[i].typ = (OPJ_UINT16) l_value;
-
-		opj_read_bytes(p_cdef_header_data, &l_value, 2);			/* Asoc^i */
-		p_cdef_header_data +=2;
-		cdef_info[i].asoc = (OPJ_UINT16) l_value;
-   }
-
-	return OPJ_TRUE;
-}
-
-
-static opj_bool jp2_read_colr(opj_jp2_t *jp2, opj_cio_t *cio,
-	opj_jp2_box_t *box, opj_jp2_color_t *color) 
-{
-	int skip_len;
-    opj_common_ptr cinfo;
-
-/* Part 1, I.5.3.3 : 'A conforming JP2 reader shall ignore all Colour
- * Specification boxes after the first.' 
-*/
-	if(color->jp2_has_colr) return OPJ_FALSE;
-
-	cinfo = jp2->cinfo;
-
-	jp2->meth = cio_read(cio, 1);		/* METH */
-	jp2->precedence = cio_read(cio, 1);	/* PRECEDENCE */
-	jp2->approx = cio_read(cio, 1);		/* APPROX */
-
-	if (jp2->meth == 1) 
-   {
-	jp2->enumcs = cio_read(cio, 4);	/* EnumCS */
-   } 
-	else
-	if (jp2->meth == 2) 
-   {
-/* skip PROFILE */
-	skip_len = box->init_pos + box->length - cio_tell(cio);
-	if (skip_len < 0) 
-  {
-	opj_event_msg(cinfo, EVT_ERROR, "Error with COLR box size\n");
-	return OPJ_FALSE;
-  }
-	if(skip_len > 0)
-  {
-	unsigned char *start;
-
-	start = cio_getbp(cio);
-	color->icc_profile_buf = (unsigned char*)opj_malloc(skip_len);
-	color->icc_profile_len = skip_len;
-
-	cio_skip(cio, box->init_pos + box->length - cio_tell(cio));
-
-	memcpy(color->icc_profile_buf, start, skip_len);
-  }
-   }
-
-	if (cio_tell(cio) - box->init_pos != box->length) 
-   {
-	opj_event_msg(cinfo, EVT_ERROR, "Error with COLR Box\n");
-	return OPJ_FALSE;
-   }
-	color->jp2_has_colr = 1;
-
-	return OPJ_TRUE;
-}/* jp2_read_colr() */
-
-/**
- * Reads the Colour Specification box.
- *
- * @param	p_colr_header_data			pointer to actual data (already read from file)
- * @param	jp2							the jpeg2000 file codec.
- * @param	p_colr_header_size			pointer that will hold the size of the color header
- * @param	p_colr_header_max_size		maximum size of the header, any size bigger than this value should result the function to output false.
- * @param	p_manager					the user event manager.
- *
- * @return	true if the bpc header is valid, fale else.
-*/
-static opj_bool jp2_read_colr_v2(	opj_jp2_v2_t * jp2,
-							unsigned char * p_colr_header_data,
-							OPJ_UINT32 p_colr_header_size,
-							opj_event_mgr_t * p_manager
-						  )
-{
-	OPJ_UINT32 l_value;
-
-	// preconditions
-	assert(jp2 != 00);
-	assert(p_colr_header_data != 00);
-	assert(p_manager != 00);
-
-	if (p_colr_header_size < 3) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Bad COLR header box (bad size)\n");
-		return OPJ_FALSE;
-	}
-
-	/* Part 1, I.5.3.3 : 'A conforming JP2 reader shall ignore all Colour
-	 * Specification boxes after the first.'
-	*/
-	if(jp2->color.jp2_has_colr) {
-		opj_event_msg_v2(p_manager, EVT_INFO, "A conforming JP2 reader shall ignore all Colour Specification boxes after the first, so we ignore this one.\n");
-		p_colr_header_data += p_colr_header_size;
-		return OPJ_TRUE;
-	}
-
-	opj_read_bytes(p_colr_header_data,&jp2->meth ,1);			/* METH */
-	++p_colr_header_data;
-
-	opj_read_bytes(p_colr_header_data,&jp2->precedence ,1);		/* PRECEDENCE */
-	++p_colr_header_data;
-
-	opj_read_bytes(p_colr_header_data,&jp2->approx ,1);			/* APPROX */
-	++p_colr_header_data;
-
-	if (jp2->meth == 1) {
-		if (p_colr_header_size != 7) {
-			opj_event_msg_v2(p_manager, EVT_ERROR, "Bad BPCC header box (bad size)\n");
-			return OPJ_FALSE;
-		}
-
-		opj_read_bytes(p_colr_header_data,&jp2->enumcs ,4);			/* EnumCS */
-	}
-	else if (jp2->meth == 2) {
-		// ICC profile
-		int it_icc_value = 0;
-		int icc_len = p_colr_header_size - 3;
-
-		jp2->color.icc_profile_len = icc_len;
-		jp2->color.icc_profile_buf = (unsigned char*) opj_malloc(icc_len);
-
-		memset(jp2->color.icc_profile_buf, 0, icc_len * sizeof(unsigned char));
-
-		for (it_icc_value = 0; it_icc_value < icc_len; ++it_icc_value)
-		{
-			opj_read_bytes(p_colr_header_data,&l_value,1);		/* icc values */
-			++p_colr_header_data;
-			jp2->color.icc_profile_buf[it_icc_value] = (OPJ_BYTE) l_value;
-		}
-
-	}
-	else // TODO MSD
-		opj_event_msg_v2(p_manager, EVT_INFO, "COLR BOX meth value is not a regular value (%d), so we will skip the fields following the approx field.\n", jp2->meth);
-
-	jp2->color.jp2_has_colr = 1;
-
-	return OPJ_TRUE;
-}
-
-opj_bool jp2_read_jp2h(opj_jp2_t *jp2, opj_cio_t *cio, opj_jp2_color_t *color) 
-{
-	opj_jp2_box_t box;
-	int jp2h_end;
-
-	opj_common_ptr cinfo = jp2->cinfo;
-
-	jp2_read_boxhdr(cinfo, cio, &box);
-	do 
-   {
-	if (JP2_JP2H != box.type) 
-  {
-	if (box.type == JP2_JP2C) 
- {
-	opj_event_msg(cinfo, EVT_ERROR, "Expected JP2H Marker\n");
-	return OPJ_FALSE;
- }
-	cio_skip(cio, box.length - 8);
-
-	if(cio->bp >= cio->end) return OPJ_FALSE;
-
-	jp2_read_boxhdr(cinfo, cio, &box);
-  }
-   } while(JP2_JP2H != box.type);
-
-	if (!jp2_read_ihdr(jp2, cio))
-		return OPJ_FALSE;
-	jp2h_end = box.init_pos + box.length;
-
-	if (jp2->bpc == 255) 
-   {
-	if (!jp2_read_bpcc(jp2, cio))
-		return OPJ_FALSE;
-   }
-	jp2_read_boxhdr(cinfo, cio, &box);
-
-	while(cio_tell(cio) < jp2h_end)
-   {
-	if(box.type == JP2_COLR)
-  {
-	if( !jp2_read_colr(jp2, cio, &box, color))
- {
-    cio_seek(cio, box.init_pos + 8);
-    cio_skip(cio, box.length - 8);
- }
-    jp2_read_boxhdr(cinfo, cio, &box);
-    continue;
-  }
-    if(box.type == JP2_CDEF)
-  {
-    if( !jp2_read_cdef(jp2, cio, &box, color))
- {
-    cio_seek(cio, box.init_pos + 8);
-    cio_skip(cio, box.length - 8);
- }
-    jp2_read_boxhdr(cinfo, cio, &box);
-    continue;
-  }
-    if(box.type == JP2_PCLR)
-  {
-    if( !jp2_read_pclr(jp2, cio, &box, color))
- {
-    cio_seek(cio, box.init_pos + 8);
-    cio_skip(cio, box.length - 8);
- }
-    jp2_read_boxhdr(cinfo, cio, &box);
-    continue;
-  }
-    if(box.type == JP2_CMAP)
-  {
-    if( !jp2_read_cmap(jp2, cio, &box, color))
- {
-    cio_seek(cio, box.init_pos + 8);
-    cio_skip(cio, box.length - 8);
- }
-    jp2_read_boxhdr(cinfo, cio, &box);
-    continue;
-  }
-	cio_seek(cio, box.init_pos + 8);
-	cio_skip(cio, box.length - 8);
-	jp2_read_boxhdr(cinfo, cio, &box);
-
-   }/* while(cio_tell(cio) < box_end) */
-
-	cio_seek(cio, jp2h_end);
-
-/* Part 1, I.5.3.3 : 'must contain at least one' */
-	return (color->jp2_has_colr == 1);
-
-}/* jp2_read_jp2h() */
-
-opj_image_t* opj_jp2_decode(opj_jp2_t *jp2, opj_cio_t *cio, 
-	opj_codestream_info_t *cstr_info) 
-{
-	opj_common_ptr cinfo;
-	opj_image_t *image = NULL;
-	opj_jp2_color_t color;
-
-	if(!jp2 || !cio) 
-   {
-	return NULL;
-   }
-	memset(&color, 0, sizeof(opj_jp2_color_t));
-	cinfo = jp2->cinfo;
-
-/* JP2 decoding */
-	if(!jp2_read_struct(jp2, cio, &color)) 
-   {
-	free_color_data(&color);
-	opj_event_msg(cinfo, EVT_ERROR, "Failed to decode jp2 structure\n");
-	return NULL;
-   }
-
-/* J2K decoding */
-	image = j2k_decode(jp2->j2k, cio, cstr_info);
-
-	if(!image) 
-   {
-	free_color_data(&color);
-	opj_event_msg(cinfo, EVT_ERROR, "Failed to decode J2K image\n");
-	return NULL;
-   }
-
-/* Set Image Color Space */
-	if (jp2->enumcs == 16)
-		image->color_space = CLRSPC_SRGB;
-	else if (jp2->enumcs == 17)
-		image->color_space = CLRSPC_GRAY;
-	else if (jp2->enumcs == 18)
-		image->color_space = CLRSPC_SYCC;
-	else
-		image->color_space = CLRSPC_UNKNOWN;
-
-	if(color.jp2_cdef)
-   {
-	jp2_apply_cdef(image, &color);
-   }
-	if(color.jp2_pclr)
-   {
-/* Part 1, I.5.3.4: Either both or none : */
-	if( !color.jp2_pclr->cmap) 
-	 jp2_free_pclr(&color);
-	else
-	 jp2_apply_pclr(image, &color);
-   }
-	if(color.icc_profile_buf)
-   {
-	image->icc_profile_buf = color.icc_profile_buf;
-	color.icc_profile_buf = NULL;
-	image->icc_profile_len = color.icc_profile_len;
-   }
-	return image;
-
-}/* opj_jp2_decode() */
-
-opj_bool jp2_decode_v2(	opj_jp2_v2_t *jp2,
-						struct opj_stream_private *cio,
-						opj_image_t* p_image,
-						struct opj_event_mgr * p_manager)
-{
-	if (!p_image)
-		return OPJ_FALSE;
-
-	/* J2K decoding */
-	if( ! j2k_decode_v2(jp2->j2k, cio, p_image, p_manager) ) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Failed to decode the codestream in the JP2 file\n");
-		return OPJ_FALSE;
-	}
-
-	/* Set Image Color Space */
-	if (jp2->enumcs == 16)
-		p_image->color_space = CLRSPC_SRGB;
-	else if (jp2->enumcs == 17)
-		p_image->color_space = CLRSPC_GRAY;
-	else if (jp2->enumcs == 18)
-		p_image->color_space = CLRSPC_SYCC;
-	else
-		p_image->color_space = CLRSPC_UNKNOWN;
-
-	/* Apply the color space if needed */
-	if(jp2->color.jp2_cdef) {
-		jp2_apply_cdef(p_image, &(jp2->color));
-	}
-
-	if(jp2->color.jp2_pclr) {
-		/* Part 1, I.5.3.4: Either both or none : */
-		if( !jp2->color.jp2_pclr->cmap)
-			jp2_free_pclr(&(jp2->color));
-		else
-			jp2_apply_pclr(p_image, &(jp2->color));
-	}
-
-	if(jp2->color.icc_profile_buf) {
-		p_image->icc_profile_buf = jp2->color.icc_profile_buf;
-		p_image->icc_profile_len = jp2->color.icc_profile_len;
-		jp2->color.icc_profile_buf = NULL;
-	}
-
-	return OPJ_TRUE;
-}
-
-
-void jp2_write_jp2h(opj_jp2_t *jp2, opj_cio_t *cio) {
-	opj_jp2_box_t box;
-
-	box.init_pos = cio_tell(cio);
-	cio_skip(cio, 4);
-	cio_write(cio, JP2_JP2H, 4);	/* JP2H */
-
-	jp2_write_ihdr(jp2, cio);
-
-	if (jp2->bpc == 255) {
-		jp2_write_bpcc(jp2, cio);
-	}
-	jp2_write_colr(jp2, cio);
-
-	box.length = cio_tell(cio) - box.init_pos;
-	cio_seek(cio, box.init_pos);
-	cio_write(cio, box.length, 4);	/* L */
-	cio_seek(cio, box.init_pos + box.length);
-}
-
-static void jp2_write_ftyp(opj_jp2_t *jp2, opj_cio_t *cio) {
-	unsigned int i;
-	opj_jp2_box_t box;
-
-	box.init_pos = cio_tell(cio);
-	cio_skip(cio, 4);
-	cio_write(cio, JP2_FTYP, 4);		/* FTYP */
-
-	cio_write(cio, jp2->brand, 4);		/* BR */
-	cio_write(cio, jp2->minversion, 4);	/* MinV */
-
-	for (i = 0; i < jp2->numcl; i++) {
-		cio_write(cio, jp2->cl[i], 4);	/* CL */
-	}
-
-	box.length = cio_tell(cio) - box.init_pos;
-	cio_seek(cio, box.init_pos);
-	cio_write(cio, box.length, 4);	/* L */
-	cio_seek(cio, box.init_pos + box.length);
-}
-
-static opj_bool jp2_read_ftyp(opj_jp2_t *jp2, opj_cio_t *cio) {
-	int i;
-	opj_jp2_box_t box;
-
-	opj_common_ptr cinfo = jp2->cinfo;
-
-	jp2_read_boxhdr(cinfo, cio, &box);
-
-	if (JP2_FTYP != box.type) {
-		opj_event_msg(cinfo, EVT_ERROR, "Expected FTYP Marker\n");
-		return OPJ_FALSE;
-	}
-
-	jp2->brand = cio_read(cio, 4);		/* BR */
-	jp2->minversion = cio_read(cio, 4);	/* MinV */
-	jp2->numcl = (box.length - 16) / 4;
-	jp2->cl = (unsigned int *) opj_malloc(jp2->numcl * sizeof(unsigned int));
-
-	for (i = 0; i < (int)jp2->numcl; i++) {
-		jp2->cl[i] = cio_read(cio, 4);	/* CLi */
-	}
-
-	if (cio_tell(cio) - box.init_pos != box.length) {
-		opj_event_msg(cinfo, EVT_ERROR, "Error with FTYP Box\n");
-		return OPJ_FALSE;
-	}
-
-	return OPJ_TRUE;
-}
-
-static int jp2_write_jp2c(opj_jp2_t *jp2, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t *cstr_info) {
-	unsigned int j2k_codestream_offset, j2k_codestream_length;
-	opj_jp2_box_t box;
-
-	opj_j2k_t *j2k = jp2->j2k;
-
-	box.init_pos = cio_tell(cio);
-	cio_skip(cio, 4);
-	cio_write(cio, JP2_JP2C, 4);	/* JP2C */
-
-	/* J2K encoding */
-	j2k_codestream_offset = cio_tell(cio);
-	if(!j2k_encode(j2k, cio, image, cstr_info)) {
-		opj_event_msg(j2k->cinfo, EVT_ERROR, "Failed to encode image\n");
-		return 0;
-	}
-	j2k_codestream_length = cio_tell(cio) - j2k_codestream_offset;
-
-	jp2->j2k_codestream_offset = j2k_codestream_offset;
-	jp2->j2k_codestream_length = j2k_codestream_length;
-
-	box.length = 8 + jp2->j2k_codestream_length;
-	cio_seek(cio, box.init_pos);
-	cio_write(cio, box.length, 4);	/* L */
-	cio_seek(cio, box.init_pos + box.length);
-
-	return box.length;
-}
-
-static opj_bool jp2_read_jp2c(opj_jp2_t *jp2, opj_cio_t *cio, unsigned int *j2k_codestream_length, unsigned int *j2k_codestream_offset) {
-	opj_jp2_box_t box;
-
-	opj_common_ptr cinfo = jp2->cinfo;
-
-	jp2_read_boxhdr(cinfo, cio, &box);
-	do {
-		if(JP2_JP2C != box.type) {
-			cio_skip(cio, box.length - 8);
-			jp2_read_boxhdr(cinfo, cio, &box);
-		}
-	} while(JP2_JP2C != box.type);
-
-	*j2k_codestream_offset = cio_tell(cio);
-	*j2k_codestream_length = box.length - 8;
-
-	return OPJ_TRUE;
-}
-
-static void jp2_write_jp(opj_cio_t *cio) {
-	opj_jp2_box_t box;
-
-	box.init_pos = cio_tell(cio);
-	cio_skip(cio, 4);
-	cio_write(cio, JP2_JP, 4);		/* JP2 signature */
-	cio_write(cio, 0x0d0a870a, 4);
-
-	box.length = cio_tell(cio) - box.init_pos;
-	cio_seek(cio, box.init_pos);
-	cio_write(cio, box.length, 4);	/* L */
-	cio_seek(cio, box.init_pos + box.length);
-}
-
-static opj_bool jp2_read_jp(opj_jp2_t *jp2, opj_cio_t *cio) {
-	opj_jp2_box_t box;
-
-	opj_common_ptr cinfo = jp2->cinfo;
-
-	jp2_read_boxhdr(cinfo, cio, &box);
-	if (JP2_JP != box.type) {
-		opj_event_msg(cinfo, EVT_ERROR, "Expected JP Marker\n");
-		return OPJ_FALSE;
-	}
-	if (0x0d0a870a != cio_read(cio, 4)) {
-		opj_event_msg(cinfo, EVT_ERROR, "Error with JP Marker\n");
-		return OPJ_FALSE;
-	}
-	if (cio_tell(cio) - box.init_pos != box.length) {
-		opj_event_msg(cinfo, EVT_ERROR, "Error with JP Box size\n");
-		return OPJ_FALSE;
-	}
-
-	return OPJ_TRUE;
-}
-
-
-static opj_bool jp2_read_struct(opj_jp2_t *jp2, opj_cio_t *cio,
-	opj_jp2_color_t *color) {
-	if (!jp2_read_jp(jp2, cio))
-		return OPJ_FALSE;
-	if (!jp2_read_ftyp(jp2, cio))
-		return OPJ_FALSE;
-	if (!jp2_read_jp2h(jp2, cio, color))
-		return OPJ_FALSE;
-	if (!jp2_read_jp2c(jp2, cio, &jp2->j2k_codestream_length, &jp2->j2k_codestream_offset))
-		return OPJ_FALSE;
-	
-	return OPJ_TRUE;
-}
-
-
-static int write_fidx( int offset_jp2c, int length_jp2c, int offset_idx, int length_idx, opj_cio_t *cio)
-{  
-  int len, lenp;
-  
-  lenp = cio_tell( cio);
-  cio_skip( cio, 4);              /* L [at the end] */
-  cio_write( cio, JPIP_FIDX, 4);  /* IPTR           */
-  
-  write_prxy( offset_jp2c, length_jp2c, offset_idx, length_idx, cio);
-
-  len = cio_tell( cio)-lenp;
-  cio_seek( cio, lenp);
-  cio_write( cio, len, 4);        /* L              */
-  cio_seek( cio, lenp+len);  
-
-  return len;
-}
-
-static void write_prxy( int offset_jp2c, int length_jp2c, int offset_idx, int length_idx, opj_cio_t *cio)
-{
-  int len, lenp;
-
-  lenp = cio_tell( cio);
-  cio_skip( cio, 4);              /* L [at the end] */
-  cio_write( cio, JPIP_PRXY, 4);  /* IPTR           */
-  
-  cio_write( cio, offset_jp2c, 8); /* OOFF           */
-  cio_write( cio, length_jp2c, 4); /* OBH part 1     */
-  cio_write( cio, JP2_JP2C, 4);        /* OBH part 2     */
-  
-  cio_write( cio, 1,1);           /* NI             */
-
-  cio_write( cio, offset_idx, 8);  /* IOFF           */
-  cio_write( cio, length_idx, 4);  /* IBH part 1     */
-  cio_write( cio, JPIP_CIDX, 4);   /* IBH part 2     */
-
-  len = cio_tell( cio)-lenp;
-  cio_seek( cio, lenp);
-  cio_write( cio, len, 4);        /* L              */
-  cio_seek( cio, lenp+len);
-}
-
-static void write_iptr( int offset, int length, opj_cio_t *cio)
-{
-  int len, lenp;
-  
-  lenp = cio_tell( cio);
-  cio_skip( cio, 4);              /* L [at the end] */
-  cio_write( cio, JPIP_IPTR, 4);  /* IPTR           */
-  
-  cio_write( cio, offset, 8);
-  cio_write( cio, length, 8);
-
-  len = cio_tell( cio)-lenp;
-  cio_seek( cio, lenp);
-  cio_write( cio, len, 4);        /* L             */
-  cio_seek( cio, lenp+len);
-}
-
-
-/* ----------------------------------------------------------------------- */
-/* JP2 decoder interface                                             */
-/* ----------------------------------------------------------------------- */
-
-opj_jp2_t* jp2_create_decompress(opj_common_ptr cinfo) {
-	opj_jp2_t *jp2 = (opj_jp2_t*) opj_calloc(1, sizeof(opj_jp2_t));
-	if(jp2) {
-		jp2->cinfo = cinfo;
-		/* create the J2K codec */
-		jp2->j2k = j2k_create_decompress(cinfo);
-		if(jp2->j2k == NULL) {
-			jp2_destroy_decompress(jp2);
-			return NULL;
-		}
-	}
-	return jp2;
-}
-
-void jp2_destroy_decompress(opj_jp2_t *jp2) {
-	if(jp2) {
-		/* destroy the J2K codec */
-		j2k_destroy_decompress(jp2->j2k);
-
-		if(jp2->comps) {
-			opj_free(jp2->comps);
-		}
-		if(jp2->cl) {
-			opj_free(jp2->cl);
-		}
-		opj_free(jp2);
-	}
-}
-
-void jp2_setup_decoder(opj_jp2_t *jp2, opj_dparameters_t *parameters) {
-	/* setup the J2K codec */
-	j2k_setup_decoder(jp2->j2k, parameters);
-	/* further JP2 initializations go here */
-}
-
-void jp2_setup_decoder_v2(opj_jp2_v2_t *jp2, opj_dparameters_t *parameters)
-{
-	/* setup the J2K codec */
-	j2k_setup_decoder_v2(jp2->j2k, parameters);
-
-	/* further JP2 initializations go here */
-	jp2->color.jp2_has_colr = 0;
-}
-
-
-/* ----------------------------------------------------------------------- */
-/* JP2 encoder interface                                             */
-/* ----------------------------------------------------------------------- */
-
-opj_jp2_t* jp2_create_compress(opj_common_ptr cinfo) {
-	opj_jp2_t *jp2 = (opj_jp2_t*)opj_malloc(sizeof(opj_jp2_t));
-	if(jp2) {
-		jp2->cinfo = cinfo;
-		/* create the J2K codec */
-		jp2->j2k = j2k_create_compress(cinfo);
-		if(jp2->j2k == NULL) {
-			jp2_destroy_compress(jp2);
-			return NULL;
-		}
-	}
-	return jp2;
-}
-
-void jp2_destroy_compress(opj_jp2_t *jp2) {
-	if(jp2) {
-		/* destroy the J2K codec */
-		j2k_destroy_compress(jp2->j2k);
-
-		if(jp2->comps) {
-			opj_free(jp2->comps);
-		}
-		if(jp2->cl) {
-			opj_free(jp2->cl);
-		}
-		opj_free(jp2);
-	}
-}
-
-void jp2_setup_encoder(opj_jp2_t *jp2, opj_cparameters_t *parameters, opj_image_t *image) {
-	int i;
-	int depth_0, sign;
-
-	if(!jp2 || !parameters || !image)
-		return;
-
-	/* setup the J2K codec */
-	/* ------------------- */
-
-	/* Check if number of components respects standard */
-	if (image->numcomps < 1 || image->numcomps > 16384) {
-		opj_event_msg(jp2->cinfo, EVT_ERROR, "Invalid number of components specified while setting up JP2 encoder\n");
-		return;
-	}
-
-	j2k_setup_encoder(jp2->j2k, parameters, image);
-
-	/* setup the JP2 codec */
-	/* ------------------- */
-	
-	/* Profile box */
-
-	jp2->brand = JP2_JP2;	/* BR */
-	jp2->minversion = 0;	/* MinV */
-	jp2->numcl = 1;
-	jp2->cl = (unsigned int*) opj_malloc(jp2->numcl * sizeof(unsigned int));
-	jp2->cl[0] = JP2_JP2;	/* CL0 : JP2 */
-
-	/* Image Header box */
-
-	jp2->numcomps = image->numcomps;	/* NC */
-	jp2->comps = (opj_jp2_comps_t*) opj_malloc(jp2->numcomps * sizeof(opj_jp2_comps_t));
-	jp2->h = image->y1 - image->y0;		/* HEIGHT */
-	jp2->w = image->x1 - image->x0;		/* WIDTH */
-	/* BPC */
-	depth_0 = image->comps[0].prec - 1;
-	sign = image->comps[0].sgnd;
-	jp2->bpc = depth_0 + (sign << 7);
-	for (i = 1; i < image->numcomps; i++) {
-		int depth = image->comps[i].prec - 1;
-		sign = image->comps[i].sgnd;
-		if (depth_0 != depth)
-			jp2->bpc = 255;
-	}
-	jp2->C = 7;			/* C : Always 7 */
-	jp2->UnkC = 0;		/* UnkC, colorspace specified in colr box */
-	jp2->IPR = 0;		/* IPR, no intellectual property */
-	
-	/* BitsPerComponent box */
-
-	for (i = 0; i < image->numcomps; i++) {
-		jp2->comps[i].bpcc = image->comps[i].prec - 1 + (image->comps[i].sgnd << 7);
-	}
-	jp2->meth = 1;
-	if (image->color_space == 1)
-		jp2->enumcs = 16;	/* sRGB as defined by IEC 61966-2.1 */
-	else if (image->color_space == 2)
-		jp2->enumcs = 17;	/* greyscale */
-	else if (image->color_space == 3)
-		jp2->enumcs = 18;	/* YUV */
-	jp2->precedence = 0;	/* PRECEDENCE */
-	jp2->approx = 0;		/* APPROX */
-	
-	jp2->jpip_on = parameters->jpip_on;
-}
-
-opj_bool opj_jp2_encode(opj_jp2_t *jp2, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t *cstr_info) {
-
-	int pos_iptr, pos_cidx, pos_jp2c, len_jp2c, len_cidx, end_pos, pos_fidx, len_fidx;
-
-	/* JP2 encoding */
-
-	/* JPEG 2000 Signature box */
-	jp2_write_jp(cio);
-	/* File Type box */
-	jp2_write_ftyp(jp2, cio);
-	/* JP2 Header box */
-	jp2_write_jp2h(jp2, cio);
-
-	if( jp2->jpip_on){
-	  pos_iptr = cio_tell( cio);
-	  cio_skip( cio, 24); /* IPTR further ! */
-	  
-	  pos_jp2c = cio_tell( cio);
-	}
-
-	/* J2K encoding */
-	if(!(len_jp2c = jp2_write_jp2c( jp2, cio, image, cstr_info))){
-	    opj_event_msg(jp2->cinfo, EVT_ERROR, "Failed to encode image\n");
-	    return OPJ_FALSE;
-	}
-
-	if( jp2->jpip_on){
-	  pos_cidx = cio_tell( cio);
-	  
-	  len_cidx = write_cidx( pos_jp2c+8, cio, image, *cstr_info, len_jp2c-8);
-	  
-	  pos_fidx = cio_tell( cio);
-	  len_fidx = write_fidx( pos_jp2c, len_jp2c, pos_cidx, len_cidx, cio);
-	  
-	  end_pos = cio_tell( cio);
-	  
-	  cio_seek( cio, pos_iptr);
-	  write_iptr( pos_fidx, len_fidx, cio);
-	  	  cio_seek( cio, end_pos);
-	}
-
-	return OPJ_TRUE;
-}
-
-/**
- * Ends the decompression procedures and possibiliy add data to be read after the
- * codestream.
- */
-opj_bool jp2_end_decompress(opj_jp2_v2_t *jp2, opj_stream_private_t *cio, opj_event_mgr_t * p_manager)
-{
-	// preconditions
-	assert(jp2 != 00);
-	assert(cio != 00);
-	assert(p_manager != 00);
-
-	/* customization of the end encoding */
-	jp2_setup_end_header_reading(jp2);
-
-	/* write header */
-	if (! jp2_exec (jp2,jp2->m_procedure_list,cio,p_manager)) {
-		return OPJ_FALSE;
-	}
-
-	return j2k_end_decompress(jp2->j2k, cio, p_manager);
-}
-
-/**
- * Sets up the procedures to do on reading header after the codestream.
- * Developpers wanting to extend the library can add their own writting procedures.
- */
-void jp2_setup_end_header_reading (opj_jp2_v2_t *jp2)
-{
-	// preconditions
-	assert(jp2 != 00);
-	opj_procedure_list_add_procedure(jp2->m_procedure_list,(void*)jp2_read_header_procedure );
-	/* DEVELOPER CORNER, add your custom procedures */
-}
-
-
-/**
- * Reads a jpeg2000 file header structure.
- *
- * @param cio the stream to read data from.
- * @param jp2 the jpeg2000 file header structure.
- * @param p_manager the user event manager.
- *
- * @return true if the box is valid.
- */
-opj_bool jp2_read_header_procedure(
-					 opj_jp2_v2_t *jp2,
-					 opj_stream_private_t *cio,
-					 opj_event_mgr_t * p_manager)
-{
-	opj_jp2_box_t box;
-	OPJ_UINT32 l_nb_bytes_read;
-	const opj_jp2_header_handler_t * l_current_handler;
-	OPJ_UINT32 l_last_data_size = BOX_SIZE;
-	OPJ_UINT32 l_current_data_size;
-	unsigned char * l_current_data = 00;
-
-	// preconditions
-	assert(cio != 00);
-	assert(jp2 != 00);
-	assert(p_manager != 00);
-
-	l_current_data = (unsigned char*)opj_malloc(l_last_data_size);
-
-	if (l_current_data == 00) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory to handle jpeg2000 file header\n");
-		return OPJ_FALSE;
-	}
-	memset(l_current_data, 0 , l_last_data_size);
-
-	while (jp2_read_boxhdr_v2(&box,&l_nb_bytes_read,cio,p_manager)) {
-		// is it the codestream box ?
-		if (box.type == JP2_JP2C) {
-			if (jp2->jp2_state & JP2_STATE_HEADER) {
-				jp2->jp2_state |= JP2_STATE_CODESTREAM;
-                opj_free(l_current_data);
-				return OPJ_TRUE;
-			}
-			else {
-				opj_event_msg_v2(p_manager, EVT_ERROR, "bad placed jpeg codestream\n");
-				opj_free(l_current_data);
-				return OPJ_FALSE;
-			}
-		}
-		else if	(box.length == 0) {
-			opj_event_msg_v2(p_manager, EVT_ERROR, "Cannot handle box of undefined sizes\n");
-			opj_free(l_current_data);
-			return OPJ_FALSE;
-		}
-
-		l_current_handler = jp2_find_handler(box.type);
-		l_current_data_size = box.length - l_nb_bytes_read;
-
-		if (l_current_handler != 00) {
-			if (l_current_data_size > l_last_data_size) {
-				l_current_data = (unsigned char*)opj_realloc(l_current_data,l_current_data_size);
-				l_last_data_size = l_current_data_size;
-			}
-
-			l_nb_bytes_read = opj_stream_read_data(cio,l_current_data,l_current_data_size,p_manager);
-			if (l_nb_bytes_read != l_current_data_size) {
-				opj_event_msg_v2(p_manager, EVT_ERROR, "Problem with reading JPEG2000 box, stream error\n");
-				return OPJ_FALSE;
-			}
-
-			if (! l_current_handler->handler(jp2,l_current_data,l_current_data_size,p_manager)) {
-				opj_free(l_current_data);
-				return OPJ_FALSE;
-			}
-		}
-		else {
-			jp2->jp2_state |= JP2_STATE_UNKNOWN;
-			if (opj_stream_skip(cio,l_current_data_size,p_manager) != l_current_data_size) {
-				opj_event_msg_v2(p_manager, EVT_ERROR, "Problem with skipping JPEG2000 box, stream error\n");
-				opj_free(l_current_data);
-				return OPJ_FALSE;
-			}
-		}
-	}
-
-	opj_free(l_current_data);
-
-	return OPJ_TRUE;
-}
-
-/**
- * Excutes the given procedures on the given codec.
- *
- * @param	p_procedure_list	the list of procedures to execute
- * @param	jp2					the jpeg2000 file codec to execute the procedures on.
- * @param	cio					the stream to execute the procedures on.
- * @param	p_manager			the user manager.
- *
- * @return	true				if all the procedures were successfully executed.
- */
-opj_bool jp2_exec (
-					opj_jp2_v2_t * jp2,
-					opj_procedure_list_t * p_procedure_list,
-					opj_stream_private_t *cio,
-					opj_event_mgr_t * p_manager
-				  )
-{
-	opj_bool (** l_procedure) (opj_jp2_v2_t * jp2, opj_stream_private_t *, opj_event_mgr_t *) = 00;
-	opj_bool l_result = OPJ_TRUE;
-	OPJ_UINT32 l_nb_proc, i;
-
-	// preconditions
-	assert(p_procedure_list != 00);
-	assert(jp2 != 00);
-	assert(cio != 00);
-	assert(p_manager != 00);
-
-	l_nb_proc = opj_procedure_list_get_nb_procedures(p_procedure_list);
-	l_procedure = (opj_bool (**) (opj_jp2_v2_t * jp2, opj_stream_private_t *, opj_event_mgr_t *)) opj_procedure_list_get_first_procedure(p_procedure_list);
-
-	for	(i=0;i<l_nb_proc;++i) {
-		l_result = l_result && (*l_procedure) (jp2,cio,p_manager);
-		++l_procedure;
-	}
-
-	// and clear the procedure list at the end.
-	opj_procedure_list_clear(p_procedure_list);
-	return l_result;
-}
-
-
-/**
- * Finds the execution function related to the given box id.
- *
- * @param	p_id	the id of the handler to fetch.
- *
- * @return	the given handler or 00 if it could not be found.
- */
-const opj_jp2_header_handler_t * jp2_find_handler (int p_id)
-{
-	OPJ_UINT32 i, l_handler_size = sizeof(jp2_header) / sizeof(opj_jp2_header_handler_t);
-
-	for (i=0;i<l_handler_size;++i) {
-		if (jp2_header[i].id == p_id) {
-			return &jp2_header[i];
-		}
-	}
-	return NULL;
-}
-
-/**
- * Finds the image execution function related to the given box id.
- *
- * @param	p_id	the id of the handler to fetch.
- *
- * @return	the given handler or 00 if it could not be found.
- */
-static const opj_jp2_header_handler_t * jp2_img_find_handler (
-												int p_id
-												)
-{
-	OPJ_UINT32 i, l_handler_size = sizeof(jp2_img_header) / sizeof(opj_jp2_header_handler_t);
-	for (i=0;i<l_handler_size;++i)
-	{
-		if (jp2_img_header[i].id == p_id) {
-			return &jp2_img_header[i];
-		}
-	}
-
-	return NULL;
-}
-
-
-/**
- * Reads a jpeg2000 file signature box.
- *
- * @param	p_header_data	the data contained in the signature box.
- * @param	jp2				the jpeg2000 file codec.
- * @param	p_header_size	the size of the data contained in the signature box.
- * @param	p_manager		the user event manager.
- *
- * @return true if the file signature box is valid.
- */
-opj_bool jp2_read_jp_v2(
-					opj_jp2_v2_t *jp2,
-					unsigned char * p_header_data,
-					unsigned int p_header_size,
-					opj_event_mgr_t * p_manager
-				 )
-{
-	unsigned int l_magic_number;
-
-	// preconditions
-	assert(p_header_data != 00);
-	assert(jp2 != 00);
-	assert(p_manager != 00);
-
-	if (jp2->jp2_state != JP2_STATE_NONE) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "The signature box must be the first box in the file.\n");
-		return OPJ_FALSE;
-	}
-
-	/* assure length of data is correct (4 -> magic number) */
-	if (p_header_size != 4) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error with JP signature Box size\n");
-		return OPJ_FALSE;
-	}
-
-	// rearrange data
-	opj_read_bytes(p_header_data,&l_magic_number,4);
-	if (l_magic_number != 0x0d0a870a ) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error with JP Signature : bad magic number\n");
-		return OPJ_FALSE;
-	}
-
-	jp2->jp2_state |= JP2_STATE_SIGNATURE;
-
-	return OPJ_TRUE;
-}
-
-
-/**
- * Reads a a FTYP box - File type box
- *
- * @param	p_header_data	the data contained in the FTYP box.
- * @param	jp2				the jpeg2000 file codec.
- * @param	p_header_size	the size of the data contained in the FTYP box.
- * @param	p_manager		the user event manager.
- *
- * @return true if the FTYP box is valid.
- */
-opj_bool jp2_read_ftyp_v2(
-							opj_jp2_v2_t *jp2,
-							unsigned char * p_header_data,
-							unsigned int p_header_size,
-							opj_event_mgr_t * p_manager
-						)
-{
-	OPJ_UINT32 i, l_remaining_bytes;
-
-	// preconditions
-	assert(p_header_data != 00);
-	assert(jp2 != 00);
-	assert(p_manager != 00);
-
-	if (jp2->jp2_state != JP2_STATE_SIGNATURE) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "The ftyp box must be the second box in the file.\n");
-		return OPJ_FALSE;
-	}
-
-	/* assure length of data is correct */
-	if (p_header_size < 8) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error with FTYP signature Box size\n");
-		return OPJ_FALSE;
-	}
-
-	opj_read_bytes(p_header_data,&jp2->brand,4);		/* BR */
-	p_header_data += 4;
-
-	opj_read_bytes(p_header_data,&jp2->minversion,4);		/* MinV */
-	p_header_data += 4;
-
-	l_remaining_bytes = p_header_size - 8;
-
-	/* the number of remaining bytes should be a multiple of 4 */
-	if ((l_remaining_bytes & 0x3) != 0) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Error with FTYP signature Box size\n");
-		return OPJ_FALSE;
-	}
-
-	/* div by 4 */
-	jp2->numcl = l_remaining_bytes >> 2;
-	if (jp2->numcl) {
-		jp2->cl = (unsigned int *) opj_malloc(jp2->numcl * sizeof(unsigned int));
-		if (jp2->cl == 00) {
-			opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory with FTYP Box\n");
-			return OPJ_FALSE;
-		}
-		memset(jp2->cl,0,jp2->numcl * sizeof(unsigned int));
-	}
-
-	for (i = 0; i < jp2->numcl; ++i)
-	{
-		opj_read_bytes(p_header_data,&jp2->cl[i],4);		/* CLi */
-		p_header_data += 4;
-	}
-
-	jp2->jp2_state |= JP2_STATE_FILE_TYPE;
-
-	return OPJ_TRUE;
-}
-
-
-/**
- * Reads the Jpeg2000 file Header box - JP2 Header box (warning, this is a super box).
- *
- * @param	p_header_data	the data contained in the file header box.
- * @param	jp2				the jpeg2000 file codec.
- * @param	p_header_size	the size of the data contained in the file header box.
- * @param	p_manager		the user event manager.
- *
- * @return true if the JP2 Header box was successfully reconized.
-*/
-opj_bool jp2_read_jp2h_v2(
-						opj_jp2_v2_t *jp2,
-						unsigned char * p_header_data,
-						unsigned int p_header_size,
-						opj_event_mgr_t * p_manager
-					)
-{
-	OPJ_UINT32 l_box_size=0, l_current_data_size = 0;
-	opj_jp2_box_t box;
-	const opj_jp2_header_handler_t * l_current_handler;
-
-	// preconditions
-	assert(p_header_data != 00);
-	assert(jp2 != 00);
-	assert(p_manager != 00);
-
-	/* make sure the box is well placed */
-	if ((jp2->jp2_state & JP2_STATE_FILE_TYPE) != JP2_STATE_FILE_TYPE ) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "The  box must be the first box in the file.\n");
-		return OPJ_FALSE;
-	}
-
-	jp2->jp2_img_state = JP2_IMG_STATE_NONE;
-
-	/* iterate while remaining data */
-	while (p_header_size > 0) {
-
-		if (! jp2_read_boxhdr_char(&box,p_header_data,&l_box_size,p_header_size, p_manager)) {
-			opj_event_msg_v2(p_manager, EVT_ERROR, "Stream error while reading JP2 Header box\n");
-			return OPJ_FALSE;
-		}
-
-		if (box.length > p_header_size) {
-			opj_event_msg_v2(p_manager, EVT_ERROR, "Stream error while reading JP2 Header box: box length is inconsistent.\n");
-			return OPJ_FALSE;
-		}
-
-		l_current_handler = jp2_img_find_handler(box.type);
-		l_current_data_size = box.length - l_box_size;
-		p_header_data += l_box_size;
-
-		if (l_current_handler != 00) {
-			if (! l_current_handler->handler(jp2,p_header_data,l_current_data_size,p_manager)) {
-				return OPJ_FALSE;
-			}
-		}
-		else {
-			jp2->jp2_img_state |= JP2_IMG_STATE_UNKNOWN;
-		}
-
-		p_header_data += l_current_data_size;
-		p_header_size -= box.length;
-	}
-
-	jp2->jp2_state |= JP2_STATE_HEADER;
-
-	return OPJ_TRUE;
-}
-
-/**
- * Reads a box header. The box is the way data is packed inside a jpeg2000 file structure. Data is read from a character string
- *
- * @param	p_data					the character string to read data from.
- * @param	box						the box structure to fill.
- * @param	p_number_bytes_read		pointer to an int that will store the number of bytes read from the stream (shoul usually be 2).
- * @param	p_box_max_size			the maximum number of bytes in the box.
- *
- * @return	true if the box is reconized, false otherwise
-*/
-static opj_bool jp2_read_boxhdr_char(
-								opj_jp2_box_t *box,
-								OPJ_BYTE * p_data,
-								OPJ_UINT32 * p_number_bytes_read,
-								OPJ_UINT32 p_box_max_size,
-								opj_event_mgr_t * p_manager
-							)
-{
-	OPJ_UINT32 l_value;
-
-	// preconditions
-	assert(p_data != 00);
-	assert(box != 00);
-	assert(p_number_bytes_read != 00);
-	assert(p_manager != 00);
-
-	if (p_box_max_size < 8) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Cannot handle box of less than 8 bytes\n");
-		return OPJ_FALSE;
-	}
-
-	/* process read data */
-	opj_read_bytes(p_data, &l_value, 4);
-	p_data += 4;
-	box->length = (OPJ_INT32)(l_value);
-
-	opj_read_bytes(p_data, &l_value, 4);
-	p_data += 4;
-	box->type = (OPJ_INT32)(l_value);
-
-	*p_number_bytes_read = 8;
-
-	// do we have a "special very large box ?"
-	// read then the XLBox
-	if (box->length == 1) {
-		unsigned int l_xl_part_size;
-
-		if (p_box_max_size < 16) {
-			opj_event_msg_v2(p_manager, EVT_ERROR, "Cannot handle XL box of less than 16 bytes\n");
-			return OPJ_FALSE;
-		}
-
-		opj_read_bytes(p_data,&l_xl_part_size, 4);
-		p_data += 4;
-		*p_number_bytes_read += 4;
-
-		if (l_xl_part_size != 0) {
-			opj_event_msg_v2(p_manager, EVT_ERROR, "Cannot handle box sizes higher than 2^32\n");
-			return OPJ_FALSE;
-		}
-
-		opj_read_bytes(p_data, &l_value, 4);
-		*p_number_bytes_read += 4;
-		box->length = (OPJ_INT32)(l_value);
-
-		if (box->length == 0) {
-			opj_event_msg_v2(p_manager, EVT_ERROR, "Cannot handle box of undefined sizes\n");
-			return OPJ_FALSE;
-		}
-	}
-	else if (box->length == 0) {
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Cannot handle box of undefined sizes\n");
-		return OPJ_FALSE;
-	}
-
-	return OPJ_TRUE;
-}
-
-
-/**
- * Reads a jpeg2000 file header structure.
- *
- * @param cio the stream to read data from.
- * @param jp2 the jpeg2000 file header structure.
- * @param p_manager the user event manager.
- *
- * @return true if the box is valid.
- */
-opj_bool jp2_read_header(	struct opj_stream_private *p_stream,
-							opj_jp2_v2_t *jp2,
-							opj_image_t** p_image,
-							struct opj_event_mgr * p_manager
-							)
-{
-	/* preconditions */
-	assert(jp2 != 00);
-	assert(p_stream != 00);
-	assert(p_manager != 00);
-
-	/* customization of the validation */
-	jp2_setup_decoding_validation (jp2);
-
-	/* customization of the encoding */
-	jp2_setup_header_reading(jp2);
-
-	/* validation of the parameters codec */
-	if (! jp2_exec(jp2,jp2->m_validation_list,p_stream,p_manager)) {
-		return OPJ_FALSE;
-	}
-
-	/* read header */
-	if (! jp2_exec (jp2,jp2->m_procedure_list,p_stream,p_manager)) {
-		return OPJ_FALSE;
-	}
-
-	return j2k_read_header(	p_stream,
-							jp2->j2k,
-							p_image,
-							p_manager);
-}
-
-/**
- * Sets up the validation ,i.e. adds the procedures to lauch to make sure the codec parameters
- * are valid. Developpers wanting to extend the library can add their own validation procedures.
- */
-void jp2_setup_decoding_validation (opj_jp2_v2_t *jp2)
-{
-	// preconditions
-	assert(jp2 != 00);
-	/* DEVELOPER CORNER, add your custom validation procedure */
-}
-
-/**
- * Sets up the procedures to do on reading header.
- * Developpers wanting to extend the library can add their own writting procedures.
- */
-void jp2_setup_header_reading (opj_jp2_v2_t *jp2)
-{
-	// preconditions
-	assert(jp2 != 00);
-
-	opj_procedure_list_add_procedure(jp2->m_procedure_list,(void*)jp2_read_header_procedure );
-	/* DEVELOPER CORNER, add your custom procedures */
-}
-
-
-/**
- * Reads a tile header.
- * @param	p_j2k		the jpeg2000 codec.
- * @param	p_stream			the stream to write data to.
- * @param	p_manager	the user event manager.
- */
-opj_bool jp2_read_tile_header(	opj_jp2_v2_t * p_jp2,
-					 	 		OPJ_UINT32 * p_tile_index,
-					 	 		OPJ_UINT32 * p_data_size,
-					 	 		OPJ_INT32 * p_tile_x0, OPJ_INT32 * p_tile_y0,
-					 	 		OPJ_INT32 * p_tile_x1, OPJ_INT32 * p_tile_y1,
-					 	 		OPJ_UINT32 * p_nb_comps,
-					 	 		opj_bool * p_go_on,
-					 	 		opj_stream_private_t *p_stream,
-					 	 		opj_event_mgr_t * p_manager )
-{
-	return j2k_read_tile_header(p_jp2->j2k,
-								p_tile_index,
-								p_data_size,
-								p_tile_x0, p_tile_y0,
-								p_tile_x1, p_tile_y1,
-								p_nb_comps,
-								p_go_on,
-								p_stream,
-								p_manager);
-}
-
-/**
- * Decode tile data.
- * @param	p_j2k		the jpeg2000 codec.
- * @param	p_stream			the stream to write data to.
- * @param	p_manager	the user event manager.
- */
-opj_bool jp2_decode_tile (
-					opj_jp2_v2_t * p_jp2,
-					OPJ_UINT32 p_tile_index,
-					OPJ_BYTE * p_data,
-					OPJ_UINT32 p_data_size,
-					opj_stream_private_t *p_stream,
-					opj_event_mgr_t * p_manager
-					)
-{
-	return j2k_decode_tile (p_jp2->j2k,p_tile_index,p_data,p_data_size,p_stream,p_manager);
-}
-
-/**
- * Destroys a jpeg2000 file decompressor.
- *
- * @param	jp2		a jpeg2000 file decompressor.
- */
-void jp2_destroy(opj_jp2_v2_t *jp2)
-{
-	if (jp2) {
-		/* destroy the J2K codec */
-		j2k_destroy(jp2->j2k);
-		jp2->j2k = 00;
-
-		if (jp2->comps) {
-			opj_free(jp2->comps);
-			jp2->comps = 00;
-		}
-
-		if (jp2->cl) {
-			opj_free(jp2->cl);
-			jp2->cl = 00;
-		}
-
-		if (jp2->color.icc_profile_buf) {
-			opj_free(jp2->color.icc_profile_buf);
-			jp2->color.icc_profile_buf = 00;
-		}
-
-		if (jp2->color.jp2_cdef) {
-			if (jp2->color.jp2_cdef->info) {
-				opj_free(jp2->color.jp2_cdef->info);
-				jp2->color.jp2_cdef->info = NULL;
-			}
-
-			opj_free(jp2->color.jp2_cdef);
-			jp2->color.jp2_cdef = 00;
-		}
-
-		if (jp2->color.jp2_pclr) {
-			if (jp2->color.jp2_pclr->cmap) {
-				opj_free(jp2->color.jp2_pclr->cmap);
-				jp2->color.jp2_pclr->cmap = NULL;
-			}
-			if (jp2->color.jp2_pclr->channel_sign) {
-				opj_free(jp2->color.jp2_pclr->channel_sign);
-				jp2->color.jp2_pclr->channel_sign = NULL;
-			}
-			if (jp2->color.jp2_pclr->channel_size) {
-				opj_free(jp2->color.jp2_pclr->channel_size);
-				jp2->color.jp2_pclr->channel_size = NULL;
-			}
-			if (jp2->color.jp2_pclr->entries) {
-				opj_free(jp2->color.jp2_pclr->entries);
-				jp2->color.jp2_pclr->entries = NULL;
-			}
-
-			opj_free(jp2->color.jp2_pclr);
-			jp2->color.jp2_pclr = 00;
-		}
-
-		if (jp2->m_validation_list) {
-			opj_procedure_list_destroy(jp2->m_validation_list);
-			jp2->m_validation_list = 00;
-		}
-
-		if (jp2->m_procedure_list) {
-			opj_procedure_list_destroy(jp2->m_procedure_list);
-			jp2->m_procedure_list = 00;
-		}
-
-		opj_free(jp2);
-	}
-}
-
-/**
- * Sets the given area to be decoded. This function should be called right after opj_read_header and before any tile header reading.
- *
- * @param	p_jp2			the jpeg2000 codec.
- * @param	p_end_x			the right position of the rectangle to decode (in image coordinates).
- * @param	p_start_y		the up position of the rectangle to decode (in image coordinates).
- * @param	p_end_y			the bottom position of the rectangle to decode (in image coordinates).
- * @param	p_manager		the user event manager
- *
- * @return	true			if the area could be set.
- */
-opj_bool jp2_set_decode_area(	opj_jp2_v2_t *p_jp2,
-								opj_image_t* p_image,
-								OPJ_INT32 p_start_x, OPJ_INT32 p_start_y,
-								OPJ_INT32 p_end_x, OPJ_INT32 p_end_y,
-								struct opj_event_mgr * p_manager )
-{
-	return j2k_set_decode_area(p_jp2->j2k, p_image, p_start_x, p_start_y, p_end_x, p_end_y, p_manager);
-}
-
-/**
- * Get the decoded tile.
- *
- * @param	p_jp2			the jpeg2000 codec.
- * @param	p_stream		input_stream
- * @param	p_image			output image.	.
- * @param	p_manager		the user event manager
- * @param	tile_index		index of the tile we want decode
- *
- * @return	true			if succeed.
- */
-opj_bool jp2_get_tile(	opj_jp2_v2_t *jp2,
-						opj_stream_private_t *p_stream,
-						opj_image_t* p_image,
-						struct opj_event_mgr * p_manager,
-						OPJ_UINT32 tile_index )
-{
-	if (!p_image)
-		return OPJ_FALSE;
-
-	opj_event_msg_v2(p_manager, EVT_WARNING, "JP2 box which are after the codestream will not be read by this function.\n");
-
-	if (! j2k_get_tile(jp2->j2k, p_stream, p_image, p_manager, tile_index) ){
-		opj_event_msg_v2(p_manager, EVT_ERROR, "Failed to decode the codestream in the JP2 file\n");
-		return OPJ_FALSE;
-	}
-
-	/* Set Image Color Space */
-	if (jp2->enumcs == 16)
-		p_image->color_space = CLRSPC_SRGB;
-	else if (jp2->enumcs == 17)
-		p_image->color_space = CLRSPC_GRAY;
-	else if (jp2->enumcs == 18)
-		p_image->color_space = CLRSPC_SYCC;
-	else
-		p_image->color_space = CLRSPC_UNKNOWN;
-
-	/* Apply the color space if needed */
-	if(jp2->color.jp2_cdef) {
-		jp2_apply_cdef(p_image, &(jp2->color));
-	}
-
-	if(jp2->color.jp2_pclr) {
-		/* Part 1, I.5.3.4: Either both or none : */
-		if( !jp2->color.jp2_pclr->cmap)
-			jp2_free_pclr(&(jp2->color));
-		else
-			jp2_apply_pclr(p_image, &(jp2->color));
-	}
-
-	if(jp2->color.icc_profile_buf) {
-		p_image->icc_profile_buf = jp2->color.icc_profile_buf;
-		p_image->icc_profile_len = jp2->color.icc_profile_len;
-		jp2->color.icc_profile_buf = NULL;
-	}
-
-	return OPJ_TRUE;
-}
-
-
-
-/* ----------------------------------------------------------------------- */
-/* JP2 encoder interface                                             */
-/* ----------------------------------------------------------------------- */
-
-opj_jp2_v2_t* jp2_create(opj_bool p_is_decoder)
-{
-	opj_jp2_v2_t *jp2 = (opj_jp2_v2_t*)opj_malloc(sizeof(opj_jp2_v2_t));
-	if (jp2) {
-		memset(jp2,0,sizeof(opj_jp2_t));
-
-		/* create the J2K codec */
-		if (! p_is_decoder) {
-			jp2->j2k = j2k_create_compress_v2();
-		}
-		else {
-			jp2->j2k = j2k_create_decompress_v2();
-		}
-
-		if (jp2->j2k == 00) {
-			jp2_destroy(jp2);
-			return 00;
-		}
-
-		/* Color structure */
-		jp2->color.icc_profile_buf = NULL;
-		jp2->color.icc_profile_len = 0;
-		jp2->color.jp2_cdef = NULL;
-		jp2->color.jp2_pclr = NULL;
-		jp2->color.jp2_has_colr = 0;
-
-		// validation list creation
-		jp2->m_validation_list = opj_procedure_list_create();
-		if (! jp2->m_validation_list) {
-			jp2_destroy(jp2);
-			return 00;
-		}
-
-		// execution list creation
-		jp2->m_procedure_list = opj_procedure_list_create();
-		if (! jp2->m_procedure_list) {
-			jp2_destroy(jp2);
-			return 00;
-		}
-	}
-
-	return jp2;
-}
-
-void jp2_dump(opj_jp2_v2_t* p_jp2, OPJ_INT32 flag, FILE* out_stream)
-{
-	/* preconditions */
-	assert(p_jp2 != 00);
-
-	j2k_dump(p_jp2->j2k,
-					flag,
-					out_stream);
-}
-
-opj_codestream_index_t* jp2_get_cstr_index(opj_jp2_v2_t* p_jp2)
-{
-	return j2k_get_cstr_index(p_jp2->j2k);
-}
-
-opj_codestream_info_v2_t* jp2_get_cstr_info(opj_jp2_v2_t* p_jp2)
-{
-	return j2k_get_cstr_info(p_jp2->j2k);
-}
-
-opj_bool jp2_set_decoded_resolution_factor(opj_jp2_v2_t *p_jp2, OPJ_UINT32 res_factor, opj_event_mgr_t * p_manager)
-{
-	return j2k_set_decoded_resolution_factor(p_jp2->j2k, res_factor, p_manager);
-}
-
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/jp2.h b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/jp2.h
deleted file mode 100644
index 40aaf813236a224b52c0cb14c567401155d571f7..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/jp2.h
+++ /dev/null
@@ -1,463 +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) 2002-2003, Yannick Verschueren
- * 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 __JP2_H
-#define __JP2_H
-/**
-@file jp2.h
-@brief The JPEG-2000 file format Reader/Writer (JP2)
-
-*/
-
-/** @defgroup JP2 JP2 - JPEG-2000 file format reader/writer */
-/*@{*/
-
-#define JPIP_JPIP 0x6a706970
-
-#define JP2_JP   0x6a502020		/**< JPEG 2000 signature box */
-#define JP2_FTYP 0x66747970		/**< File type box */
-
-#define JP2_JP2H 0x6a703268		/**< JP2 header box (super-box) */
-#define 	JP2_IHDR 0x69686472		/**< Image header box */
-#define 	JP2_BPCC 0x62706363		/**< Bits per component box */
-#define 	JP2_COLR 0x636f6c72		/**< Colour specification box */
-#define 	JP2_PCLR 0x70636c72		/**< Palette box */
-#define 	JP2_CMAP 0x636d6170		/**< Component Mapping box */
-#define 	JP2_CDEF 0x63646566		/**< Channel Definition box */
-// For the future MSD
-// #define JP2_RES 0x72657320	/**< Resolution box (super-box) */
-
-#define JP2_JP2C 0x6a703263		/**< Contiguous codestream box */
-
-// For the future MSD
-// #define JP2_JP2I 0x6a703269	/**< Intellectual property box */
-// #define JP2_XML 0x786d6c20	/**< XML box */
-// #define JP2_UUID 0x75756994	/**< UUID box */
-// #define JP2_UINF 0x75696e66	/**< UUID info box (super-box) */
-// #define		JP2_ULST 0x756c7374	/**< UUID list box */
-#define 	JP2_URL  0x75726c20		/**< Data entry URL box */
-
-#define JP2_DTBL 0x6474626c		/**< Data Reference box */
-
-#define JP2_JP2  0x6a703220		/**< File type fields */
-
-
-/* ----------------------------------------------------------------------- */
-
-typedef enum
-{
-	JP2_STATE_NONE			= 0x0,
-	JP2_STATE_SIGNATURE		= 0x1,
-	JP2_STATE_FILE_TYPE		= 0x2,
-	JP2_STATE_HEADER		= 0x4,
-	JP2_STATE_CODESTREAM	= 0x8,
-	JP2_STATE_END_CODESTREAM	= 0x10,
-	JP2_STATE_UNKNOWN		= 0x80000000
-}
-JP2_STATE;
-
-typedef enum
-{
-	JP2_IMG_STATE_NONE			= 0x0,
-	JP2_IMG_STATE_UNKNOWN		= 0x80000000
-}
-JP2_IMG_STATE;
-
-/** 
-Channel description: channel index, type, assocation
-*/
-typedef struct opj_jp2_cdef_info
-{
-    unsigned short cn, typ, asoc;
-} opj_jp2_cdef_info_t;
-
-/** 
-Channel descriptions and number of descriptions
-*/
-typedef struct opj_jp2_cdef
-{
-    opj_jp2_cdef_info_t *info;
-    unsigned short n;
-} opj_jp2_cdef_t;
-
-/** 
-Component mappings: channel index, mapping type, palette index
-*/
-typedef struct opj_jp2_cmap_comp
-{
-    unsigned short cmp;
-    unsigned char mtyp, pcol;
-} opj_jp2_cmap_comp_t;
-
-/** 
-Palette data: table entries, palette columns
-*/
-typedef struct opj_jp2_pclr
-{
-    unsigned int *entries;
-    unsigned char *channel_sign;
-    unsigned char *channel_size;
-    opj_jp2_cmap_comp_t *cmap;
-    unsigned short nr_entries, nr_channels;
-} opj_jp2_pclr_t;
-
-/** 
-Collector for ICC profile, palette, component mapping, channel description 
-*/
-typedef struct opj_jp2_color
-{
-    unsigned char *icc_profile_buf;
-    int icc_profile_len;
-
-    opj_jp2_cdef_t *jp2_cdef;
-    opj_jp2_pclr_t *jp2_pclr;
-    unsigned char jp2_has_colr;
-} opj_jp2_color_t;
-
-/** 
-JP2 component
-*/
-typedef struct opj_jp2_comps {
-  int depth;		  
-  int sgnd;		   
-  OPJ_UINT32 bpcc;
-} opj_jp2_comps_t;
-
-/**
-JPEG-2000 file format reader/writer
-*/
-typedef struct opj_jp2 {
-	/** codec context */
-	opj_common_ptr cinfo;
-	/** handle to the J2K codec  */
-	opj_j2k_t *j2k;
-	unsigned int w;
-	unsigned int h;
-	unsigned int numcomps;
-	unsigned int bpc;
-	unsigned int C;
-	unsigned int UnkC;
-	unsigned int IPR;
-	unsigned int meth;
-	unsigned int approx;
-	unsigned int enumcs;
-	unsigned int precedence;
-	unsigned int brand;
-	unsigned int minversion;
-	unsigned int numcl;
-	unsigned int *cl;
-	opj_jp2_comps_t *comps;
-	unsigned int j2k_codestream_offset;
-	unsigned int j2k_codestream_length;
-	opj_bool jpip_on;
-} opj_jp2_t;
-
-/**
-JPEG-2000 file format reader/writer
-*/
-typedef struct opj_jp2_v2
-{
-	/** handle to the J2K codec  */
-	struct opj_j2k_v2 *j2k;
-	/** list of validation procedures */
-	struct opj_procedure_list * m_validation_list;
-	/** list of execution procedures */
-	struct opj_procedure_list * m_procedure_list;
-
-	/* width of image */
-	OPJ_UINT32 w;
-	/* height of image */
-	OPJ_UINT32 h;
-	/* number of components in the image */
-	OPJ_UINT32 numcomps;
-	OPJ_UINT32 bpc;
-	OPJ_UINT32 C;
-	OPJ_UINT32 UnkC;
-	OPJ_UINT32 IPR;
-	OPJ_UINT32 meth;
-	OPJ_UINT32 approx;
-	OPJ_UINT32 enumcs;
-	OPJ_UINT32 precedence;
-	OPJ_UINT32 brand;
-	OPJ_UINT32 minversion;
-	OPJ_UINT32 numcl;
-	OPJ_UINT32 *cl;
-	opj_jp2_comps_t *comps;
-	OPJ_UINT32 j2k_codestream_offset;
-	OPJ_UINT32 jp2_state;
-	OPJ_UINT32 jp2_img_state;
-
-	opj_jp2_color_t color;
-
-}
-opj_jp2_v2_t;
-
-/**
-JP2 Box
-*/
-typedef struct opj_jp2_box {
-  OPJ_UINT32 length;
-  OPJ_UINT32 type;
-  OPJ_INT32 init_pos;
-} opj_jp2_box_t;
-
-typedef struct opj_jp2_header_handler
-{
-	/* marker value */
-	int id;
-	/* action linked to the marker */
-	opj_bool (*handler) (opj_jp2_v2_t *jp2, unsigned char * p_header_data, OPJ_UINT32 p_header_size, struct opj_event_mgr * p_manager);
-}
-opj_jp2_header_handler_t;
-
-/** @name Exported functions */
-/*@{*/
-/* ----------------------------------------------------------------------- */
-/**
-Write the JP2H box - JP2 Header box (used in MJ2)
-@param jp2 JP2 handle
-@param cio Output buffer stream
-*/
-void jp2_write_jp2h(opj_jp2_t *jp2, opj_cio_t *cio);
-/**
-Read the JP2H box - JP2 Header box (used in MJ2)
-@param jp2 JP2 handle
-@param cio Input buffer stream
-@param ext Collector for profile, cdef and pclr data
-@return Returns true if successful, returns false otherwise
-*/
-opj_bool jp2_read_jp2h(opj_jp2_t *jp2, opj_cio_t *cio, opj_jp2_color_t *color);
-/**
-Creates a JP2 decompression structure
-@param cinfo Codec context info
-@return Returns a handle to a JP2 decompressor if successful, returns NULL otherwise
-*/
-opj_jp2_t* jp2_create_decompress(opj_common_ptr cinfo);
-/**
-Destroy a JP2 decompressor handle
-@param jp2 JP2 decompressor handle to destroy
-*/
-void jp2_destroy_decompress(opj_jp2_t *jp2);
-/**
-Setup the decoder decoding parameters using user parameters.
-Decoding parameters are returned in jp2->j2k->cp. 
-@param jp2 JP2 decompressor handle
-@param parameters decompression parameters
-*/
-void jp2_setup_decoder(opj_jp2_t *jp2, opj_dparameters_t *parameters);
-/**
-Setup the decoder decoding parameters using user parameters.
-Decoding parameters are returned in jp2->j2k->cp.
-@param jp2 JP2 decompressor handle
-@param parameters decompression parameters
-*/
-void jp2_setup_decoder_v2(opj_jp2_v2_t *jp2, opj_dparameters_t *parameters);
-/**
-Decode an image from a JPEG-2000 file stream
-@param jp2 JP2 decompressor handle
-@param cio Input buffer stream
-@param cstr_info Codestream information structure if required, NULL otherwise
-@return Returns a decoded image if successful, returns NULL otherwise
-*/
-opj_image_t* opj_jp2_decode(opj_jp2_t *jp2, opj_cio_t *cio, opj_codestream_info_t *cstr_info);
-
-/**
- * Decode an image from a JPEG-2000 file stream
- * @param jp2 JP2 decompressor handle
- * @param cio Input buffer stream
- * @param cstr_info Codestream information structure if required, NULL otherwise
- * @return Returns a decoded image if successful, returns NULL otherwise
-*/
-opj_bool jp2_decode_v2(	opj_jp2_v2_t *jp2,
-						struct opj_stream_private *cio,
-						opj_image_t* p_image,
-						struct opj_event_mgr * p_manager);
-
-
-/**
-Creates a JP2 compression structure
-@param cinfo Codec context info
-@return Returns a handle to a JP2 compressor if successful, returns NULL otherwise
-*/
-opj_jp2_t* jp2_create_compress(opj_common_ptr cinfo);
-/**
-Destroy a JP2 compressor handle
-@param jp2 JP2 compressor handle to destroy
-*/
-void jp2_destroy_compress(opj_jp2_t *jp2);
-/**
-Setup the encoder parameters using the current image and using user parameters. 
-Coding parameters are returned in jp2->j2k->cp. 
-@param jp2 JP2 compressor handle
-@param parameters compression parameters
-@param image input filled image
-*/
-void jp2_setup_encoder(opj_jp2_t *jp2, opj_cparameters_t *parameters, opj_image_t *image);
-/**
-Encode an image into a JPEG-2000 file stream
-@param jp2 JP2 compressor handle
-@param cio Output buffer stream
-@param image Image to encode
-@param cstr_info Codestream information structure if required, NULL otherwise
-@return Returns true if successful, returns false otherwise
-*/
-opj_bool opj_jp2_encode(opj_jp2_t *jp2, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t *cstr_info);
-
-
-/* ----------------------------------------------------------------------- */
-
-/**
- * Ends the decompression procedures and possibiliy add data to be read after the
- * codestream.
- */
-opj_bool jp2_end_decompress(opj_jp2_v2_t *jp2, struct opj_stream_private *cio, struct opj_event_mgr * p_manager);
-
-/**
- * Reads a jpeg2000 file header structure.
- *
- * @param cio the stream to read data from.
- * @param jp2 the jpeg2000 file header structure.
- * @param p_manager the user event manager.
- *
- * @return true if the box is valid.
- */
-opj_bool jp2_read_header(	struct opj_stream_private *p_stream,
-							opj_jp2_v2_t *jp2,
-							opj_image_t ** p_img_header,
-							struct opj_event_mgr * p_manager
-							);
-
-/**
- * Reads a tile header.
- * @param	p_j2k		the jpeg2000 codec.
- * @param	p_stream			the stream to write data to.
- * @param	p_manager	the user event manager.
- */
-opj_bool jp2_read_tile_header (
-					 opj_jp2_v2_t * p_j2k,
-					 OPJ_UINT32 * p_tile_index,
-					 OPJ_UINT32 * p_data_size,
-					 OPJ_INT32 * p_tile_x0,
-					 OPJ_INT32 * p_tile_y0,
-					 OPJ_INT32 * p_tile_x1,
-					 OPJ_INT32 * p_tile_y1,
-					 OPJ_UINT32 * p_nb_comps,
-					 opj_bool * p_go_on,
-					 struct opj_stream_private *p_stream,
-					 struct opj_event_mgr * p_manager
-					);
-
-/**
- * Decode tile data.
- * @param	p_j2k		the jpeg2000 codec.
- * @param	p_stream			the stream to write data to.
- * @param	p_manager	the user event manager.
- */
-opj_bool jp2_decode_tile (
-					opj_jp2_v2_t * p_jp2,
-					OPJ_UINT32 p_tile_index,
-					OPJ_BYTE * p_data,
-					OPJ_UINT32 p_data_size,
-					struct opj_stream_private *p_stream,
-					struct opj_event_mgr * p_manager
-					);
-
-/**
- * Creates a jpeg2000 file decompressor.
- *
- * @return	an empty jpeg2000 file codec.
- */
-opj_jp2_v2_t* jp2_create (opj_bool p_is_decoder);
-
-/**
-Destroy a JP2 decompressor handle
-@param jp2 JP2 decompressor handle to destroy
-*/
-void jp2_destroy(opj_jp2_v2_t *jp2);
-
-
-/**
- * Sets the given area to be decoded. This function should be called right after opj_read_header and before any tile header reading.
- *
- * @param	p_jp2			the jpeg2000 codec.
- * @param	p_end_x			the right position of the rectangle to decode (in image coordinates).
- * @param	p_start_y		the up position of the rectangle to decode (in image coordinates).
- * @param	p_end_y			the bottom position of the rectangle to decode (in image coordinates).
- * @param	p_manager		the user event manager
- *
- * @return	true			if the area could be set.
- */
-opj_bool jp2_set_decode_area(	opj_jp2_v2_t *p_jp2,
-								opj_image_t* p_image,
-								OPJ_INT32 p_start_x, OPJ_INT32 p_start_y,
-								OPJ_INT32 p_end_x, OPJ_INT32 p_end_y,
-								struct opj_event_mgr * p_manager );
-
-opj_bool jp2_get_tile(	opj_jp2_v2_t *p_jp2,
-						opj_stream_private_t *p_stream,
-						opj_image_t* p_image,
-						struct opj_event_mgr * p_manager,
-						OPJ_UINT32 tile_index );
-
-
-/**
- * Dump some elements from the JP2 decompression structure .
- *
- *@param p_jp2				the jp2 codec.
- *@param flag				flag to describe what elments are dump.
- *@param out_stream			output stream where dump the elements.
- *
-*/
-void jp2_dump (opj_jp2_v2_t* p_jp2, OPJ_INT32 flag, FILE* out_stream);
-
-/**
- * Get the codestream info from a JPEG2000 codec.
- *
- *@param	p_jp2				jp2 codec.
- *
- *@return	the codestream information extract from the jpg2000 codec
- */
-opj_codestream_info_v2_t* jp2_get_cstr_info(opj_jp2_v2_t* p_jp2);
-
-/**
- * Get the codestream index from a JPEG2000 codec.
- *
- *@param	p_jp2				jp2 codec.
- *
- *@return	the codestream index extract from the jpg2000 codec
- */
-opj_codestream_index_t* jp2_get_cstr_index(opj_jp2_v2_t* p_jp2);
-
-opj_bool jp2_set_decoded_resolution_factor(opj_jp2_v2_t *p_jp2, OPJ_UINT32 res_factor, opj_event_mgr_t * p_manager);
-
-/*@}*/
-
-/*@}*/
-
-#endif /* __JP2_H */
-
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/jpt.c b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/jpt.c
deleted file mode 100644
index a2566ea887252c6f707a3a854ab122168eee85e2..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/jpt.c
+++ /dev/null
@@ -1,155 +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) 2002-2003, Yannick Verschueren
- * 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 "opj_includes.h"
-
-/*
- * Read the information contains in VBAS [JPP/JPT stream message header]
- * Store information (7 bits) in value
- *
- */
-unsigned int jpt_read_VBAS_info(opj_cio_t *cio, unsigned int value) {
-	unsigned char elmt;
-
-	elmt = cio_read(cio, 1);
-	while ((elmt >> 7) == 1) {
-		value = (value << 7);
-		value |= (elmt & 0x7f);
-		elmt = cio_read(cio, 1);
-	}
-	value = (value << 7);
-	value |= (elmt & 0x7f);
-
-	return value;
-}
-
-/*
- * Initialize the value of the message header structure 
- *
- */
-void jpt_init_msg_header(opj_jpt_msg_header_t * header) {
-	header->Id = 0;		/* In-class Identifier    */
-	header->last_byte = 0;	/* Last byte information  */
-	header->Class_Id = 0;		/* Class Identifier       */
-	header->CSn_Id = 0;		/* CSn : index identifier */
-	header->Msg_offset = 0;	/* Message offset         */
-	header->Msg_length = 0;	/* Message length         */
-	header->Layer_nb = 0;		/* Auxiliary for JPP case */
-}
-
-/*
- * Re-initialize the value of the message header structure
- *
- * Only parameters always present in message header
- *
- */
-void jpt_reinit_msg_header(opj_jpt_msg_header_t * header) {
-	header->Id = 0;		/* In-class Identifier    */
-	header->last_byte = 0;	/* Last byte information  */
-	header->Msg_offset = 0;	/* Message offset         */
-	header->Msg_length = 0;	/* Message length         */
-}
-
-/*
- * Read the message header for a JPP/JPT - stream
- *
- */
-void jpt_read_msg_header(opj_common_ptr cinfo, opj_cio_t *cio, opj_jpt_msg_header_t *header) {
-	unsigned char elmt, Class = 0, CSn = 0;
-	jpt_reinit_msg_header(header);
-
-	/* ------------- */
-	/* VBAS : Bin-ID */
-	/* ------------- */
-	elmt = cio_read(cio, 1);
-
-	/* See for Class and CSn */
-	switch ((elmt >> 5) & 0x03) {
-		case 0:
-			opj_event_msg(cinfo, EVT_ERROR, "Forbidden value encounter in message header !!\n");
-			break;
-		case 1:
-			Class = 0;
-			CSn = 0;
-			break;
-		case 2:
-			Class = 1;
-			CSn = 0;
-			break;
-		case 3:
-			Class = 1;
-			CSn = 1;
-			break;
-		default:
-			break;
-	}
-
-	/* see information on bits 'c' [p 10 : A.2.1 general, ISO/IEC FCD 15444-9] */
-	if (((elmt >> 4) & 0x01) == 1)
-		header->last_byte = 1;
-
-	/* In-class identifier */
-	header->Id |= (elmt & 0x0f);
-	if ((elmt >> 7) == 1)
-		header->Id = jpt_read_VBAS_info(cio, header->Id);
-
-	/* ------------ */
-	/* VBAS : Class */
-	/* ------------ */
-	if (Class == 1) {
-		header->Class_Id = 0;
-		header->Class_Id = jpt_read_VBAS_info(cio, header->Class_Id);
-	}
-
-	/* ---------- */
-	/* VBAS : CSn */
-	/* ---------- */
-	if (CSn == 1) {
-		header->CSn_Id = 0;
-		header->CSn_Id = jpt_read_VBAS_info(cio, header->CSn_Id);
-	}
-
-	/* ----------------- */
-	/* VBAS : Msg_offset */
-	/* ----------------- */
-	header->Msg_offset = jpt_read_VBAS_info(cio, header->Msg_offset);
-
-	/* ----------------- */
-	/* VBAS : Msg_length */
-	/* ----------------- */
-	header->Msg_length = jpt_read_VBAS_info(cio, header->Msg_length);
-
-	/* ---------- */
-	/* VBAS : Aux */
-	/* ---------- */
-	if ((header->Class_Id & 0x01) == 1) {
-		header->Layer_nb = 0;
-		header->Layer_nb = jpt_read_VBAS_info(cio, header->Layer_nb);
-	}
-}
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/jpt.h b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/jpt.h
deleted file mode 100644
index eb01f98eb858730e66601e4cf95c502bac30f7ff..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/jpt.h
+++ /dev/null
@@ -1,75 +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) 2002-2003, Yannick Verschueren
- * 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 __JPT_H
-#define __JPT_H
-/**
-@file jpt.h
-@brief JPT-stream reader (JPEG 2000, JPIP)
-
-JPT-stream functions are implemented in J2K.C. 
-*/
-
-/**
-Message Header JPT stream structure
-*/
-typedef struct opj_jpt_msg_header {
-	/** In-class Identifier */
-	unsigned int Id;
-	/** Last byte information */
-	unsigned int last_byte;	
-	/** Class Identifier */
-	unsigned int Class_Id;	
-	/** CSn : index identifier */
-	unsigned int CSn_Id;
-	/** Message offset */
-	unsigned int Msg_offset;
-	/** Message length */
-	unsigned int Msg_length;
-	/** Auxiliary for JPP case */
-	unsigned int Layer_nb;
-} opj_jpt_msg_header_t;
-
-/* ----------------------------------------------------------------------- */
-
-/**
-Initialize the value of the message header structure 
-@param header Message header structure
-*/
-void jpt_init_msg_header(opj_jpt_msg_header_t * header);
-
-/**
-Read the message header for a JPP/JPT - stream
-@param cinfo Codec context info
-@param cio CIO handle
-@param header Message header structure
-*/
-void jpt_read_msg_header(opj_common_ptr cinfo, opj_cio_t *cio, opj_jpt_msg_header_t *header);
-
-#endif
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/mct.c b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/mct.c
deleted file mode 100644
index 828b42d1f257e70da3c0120f3ab9192c5f5601b9..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/mct.c
+++ /dev/null
@@ -1,245 +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.
- */
-
-#ifdef __SSE__
-#include <xmmintrin.h>
-#endif
-
-#include "opj_includes.h"
-
-/* <summary> */
-/* This table contains the norms of the basis function of the reversible MCT. */
-/* </summary> */
-static const double mct_norms[3] = { 1.732, .8292, .8292 };
-
-/* <summary> */
-/* This table contains the norms of the basis function of the irreversible MCT. */
-/* </summary> */
-static const double mct_norms_real[3] = { 1.732, 1.805, 1.573 };
-
-/* <summary> */
-/* Foward reversible MCT. */
-/* </summary> */
-void mct_encode(
-		int* restrict c0,
-		int* restrict c1,
-		int* restrict c2,
-		int n)
-{
-	int i;
-	for(i = 0; i < n; ++i) {
-		int r = c0[i];
-		int g = c1[i];
-		int b = c2[i];
-		int y = (r + (g * 2) + b) >> 2;
-		int u = b - g;
-		int v = r - g;
-		c0[i] = y;
-		c1[i] = u;
-		c2[i] = v;
-	}
-}
-
-/* <summary> */
-/* Inverse reversible MCT. */
-/* </summary> */
-void mct_decode(
-		int* restrict c0,
-		int* restrict c1, 
-		int* restrict c2, 
-		int n)
-{
-	int i;
-	for (i = 0; i < n; ++i) {
-		int y = c0[i];
-		int u = c1[i];
-		int v = c2[i];
-		int g = y - ((u + v) >> 2);
-		int r = v + g;
-		int b = u + g;
-		c0[i] = r;
-		c1[i] = g;
-		c2[i] = b;
-	}
-}
-
-/* <summary> */
-/* Get norm of basis function of reversible MCT. */
-/* </summary> */
-double mct_getnorm(int compno) {
-	return mct_norms[compno];
-}
-
-/* <summary> */
-/* Foward irreversible MCT. */
-/* </summary> */
-void mct_encode_real(
-		int* restrict c0,
-		int* restrict c1,
-		int* restrict c2,
-		int n)
-{
-	int i;
-	for(i = 0; i < n; ++i) {
-		int r = c0[i];
-		int g = c1[i];
-		int b = c2[i];
-		int y =  fix_mul(r, 2449) + fix_mul(g, 4809) + fix_mul(b, 934);
-		int u = -fix_mul(r, 1382) - fix_mul(g, 2714) + fix_mul(b, 4096);
-		int v =  fix_mul(r, 4096) - fix_mul(g, 3430) - fix_mul(b, 666);
-		c0[i] = y;
-		c1[i] = u;
-		c2[i] = v;
-	}
-}
-
-/* <summary> */
-/* Inverse irreversible MCT. */
-/* </summary> */
-void mct_decode_real(
-		float* restrict c0,
-		float* restrict c1,
-		float* restrict c2,
-		int n)
-{
-	int i;
-#ifdef __SSE__
-	__m128 vrv, vgu, vgv, vbu;
-	vrv = _mm_set1_ps(1.402f);
-	vgu = _mm_set1_ps(0.34413f);
-	vgv = _mm_set1_ps(0.71414f);
-	vbu = _mm_set1_ps(1.772f);
-	for (i = 0; i < (n >> 3); ++i) {
-		__m128 vy, vu, vv;
-		__m128 vr, vg, vb;
-
-		vy = _mm_load_ps(c0);
-		vu = _mm_load_ps(c1);
-		vv = _mm_load_ps(c2);
-		vr = _mm_add_ps(vy, _mm_mul_ps(vv, vrv));
-		vg = _mm_sub_ps(_mm_sub_ps(vy, _mm_mul_ps(vu, vgu)), _mm_mul_ps(vv, vgv));
-		vb = _mm_add_ps(vy, _mm_mul_ps(vu, vbu));
-		_mm_store_ps(c0, vr);
-		_mm_store_ps(c1, vg);
-		_mm_store_ps(c2, vb);
-		c0 += 4;
-		c1 += 4;
-		c2 += 4;
-
-		vy = _mm_load_ps(c0);
-		vu = _mm_load_ps(c1);
-		vv = _mm_load_ps(c2);
-		vr = _mm_add_ps(vy, _mm_mul_ps(vv, vrv));
-		vg = _mm_sub_ps(_mm_sub_ps(vy, _mm_mul_ps(vu, vgu)), _mm_mul_ps(vv, vgv));
-		vb = _mm_add_ps(vy, _mm_mul_ps(vu, vbu));
-		_mm_store_ps(c0, vr);
-		_mm_store_ps(c1, vg);
-		_mm_store_ps(c2, vb);
-		c0 += 4;
-		c1 += 4;
-		c2 += 4;
-	}
-	n &= 7;
-#endif
-	for(i = 0; i < n; ++i) {
-		float y = c0[i];
-		float u = c1[i];
-		float v = c2[i];
-		float r = y + (v * 1.402f);
-		float g = y - (u * 0.34413f) - (v * (0.71414f));
-		float b = y + (u * 1.772f);
-		c0[i] = r;
-		c1[i] = g;
-		c2[i] = b;
-	}
-}
-
-/* <summary> */
-/* Get norm of basis function of irreversible MCT. */
-/* </summary> */
-double mct_getnorm_real(int compno) {
-	return mct_norms_real[compno];
-}
-
-
-opj_bool mct_decode_custom(
-					   // MCT data
-					   OPJ_BYTE * pDecodingData,
-					   // size of components
-					   OPJ_UINT32 n,
-					   // components
-					   OPJ_BYTE ** pData,
-					   // nb of components (i.e. size of pData)
-					   OPJ_UINT32 pNbComp,
-					   // tells if the data is signed
-					   OPJ_UINT32 isSigned)
-{
-	OPJ_FLOAT32 * lMct;
-	OPJ_UINT32 i;
-	OPJ_UINT32 j;
-	OPJ_UINT32 k;
-
-	OPJ_FLOAT32 * lCurrentData = 00;
-	OPJ_FLOAT32 * lCurrentResult = 00;
-	OPJ_FLOAT32 ** lData = (OPJ_FLOAT32 **) pData;
-
-	lCurrentData = (OPJ_FLOAT32 *) opj_malloc (2 * pNbComp * sizeof(OPJ_FLOAT32));
-	if
-		(! lCurrentData)
-	{
-		return OPJ_FALSE;
-	}
-	lCurrentResult = lCurrentData + pNbComp;
-
-	for
-		(i = 0; i < n; ++i)
-	{
-		lMct = (OPJ_FLOAT32 *) pDecodingData;
-		for
-			(j=0;j<pNbComp;++j)
-		{
-			lCurrentData[j] = (OPJ_FLOAT32) (*(lData[j]));
-		}
-		for
-			(j=0;j<pNbComp;++j)
-		{
-			lCurrentResult[j] = 0;
-			for
-				(k=0;k<pNbComp;++k)
-			{
-				lCurrentResult[j] += *(lMct++) * lCurrentData[k];
-			}
-			*(lData[j]++) = (OPJ_FLOAT32) (lCurrentResult[j]);
-		}
-	}
-	opj_free(lCurrentData);
-	return OPJ_TRUE;
-}
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/mct.h b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/mct.h
deleted file mode 100644
index 16baaa4114074d55b7d47dbcdbb7df44c24ca71d..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/mct.h
+++ /dev/null
@@ -1,110 +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.
- */
-
-#ifndef __MCT_H
-#define __MCT_H
-/**
-@file mct.h
-@brief Implementation of a multi-component transforms (MCT)
-
-The functions in MCT.C have for goal to realize reversible and irreversible multicomponent
-transform. The functions in MCT.C are used by some function in TCD.C.
-*/
-
-/** @defgroup MCT MCT - Implementation of a multi-component transform */
-/*@{*/
-
-/** @name Exported functions */
-/*@{*/
-/* ----------------------------------------------------------------------- */
-/**
-Apply a reversible multi-component transform to an image
-@param c0 Samples for red component
-@param c1 Samples for green component
-@param c2 Samples blue component
-@param n Number of samples for each component
-*/
-void mct_encode(int *c0, int *c1, int *c2, int n);
-/**
-Apply a reversible multi-component inverse transform to an image
-@param c0 Samples for luminance component
-@param c1 Samples for red chrominance component
-@param c2 Samples for blue chrominance component
-@param n Number of samples for each component
-*/
-void mct_decode(int *c0, int *c1, int *c2, int n);
-/**
-Get norm of the basis function used for the reversible multi-component transform
-@param compno Number of the component (0->Y, 1->U, 2->V)
-@return 
-*/
-double mct_getnorm(int compno);
-
-/**
-Apply an irreversible multi-component transform to an image
-@param c0 Samples for red component
-@param c1 Samples for green component
-@param c2 Samples blue component
-@param n Number of samples for each component
-*/
-void mct_encode_real(int *c0, int *c1, int *c2, int n);
-/**
-Apply an irreversible multi-component inverse transform to an image
-@param c0 Samples for luminance component
-@param c1 Samples for red chrominance component
-@param c2 Samples for blue chrominance component
-@param n Number of samples for each component
-*/
-void mct_decode_real(float* c0, float* c1, float* c2, int n);
-/**
-Get norm of the basis function used for the irreversible multi-component transform
-@param compno Number of the component (0->Y, 1->U, 2->V)
-@return 
-*/
-double mct_getnorm_real(int compno);
-
-opj_bool mct_decode_custom(
-					   // MCT data
-					   OPJ_BYTE * pDecodingData,
-					   // size of components
-					   OPJ_UINT32 n,
-					   // components
-					   OPJ_BYTE ** pData,
-					   // nb of components (i.e. size of pData)
-					   OPJ_UINT32 pNbComp,
-					   // tells if the data is signed
-					   OPJ_UINT32 isSigned);
-/* ----------------------------------------------------------------------- */
-/*@}*/
-
-/*@}*/
-
-#endif /* __MCT_H */
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/mqc.c b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/mqc.c
deleted file mode 100644
index 14129fbf4e5970bfb3b9d3dbf2594aadeb59eac7..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/mqc.c
+++ /dev/null
@@ -1,592 +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 "opj_includes.h"
-
-/** @defgroup MQC MQC - Implementation of an MQ-Coder */
-/*@{*/
-
-/** @name Local static functions */
-/*@{*/
-
-/**
-Output a byte, doing bit-stuffing if necessary.
-After a 0xff byte, the next byte must be smaller than 0x90.
-@param mqc MQC handle
-*/
-static void mqc_byteout(opj_mqc_t *mqc);
-/**
-Renormalize mqc->a and mqc->c while encoding, so that mqc->a stays between 0x8000 and 0x10000
-@param mqc MQC handle
-*/
-static void mqc_renorme(opj_mqc_t *mqc);
-/**
-Encode the most probable symbol
-@param mqc MQC handle
-*/
-static void mqc_codemps(opj_mqc_t *mqc);
-/**
-Encode the most least symbol
-@param mqc MQC handle
-*/
-static void mqc_codelps(opj_mqc_t *mqc);
-/**
-Fill mqc->c with 1's for flushing
-@param mqc MQC handle
-*/
-static void mqc_setbits(opj_mqc_t *mqc);
-/**
-FIXME: documentation ???
-@param mqc MQC handle
-@return 
-*/
-static INLINE int mqc_mpsexchange(opj_mqc_t *const mqc);
-/**
-FIXME: documentation ???
-@param mqc MQC handle
-@return 
-*/
-static INLINE int mqc_lpsexchange(opj_mqc_t *const mqc);
-/**
-Input a byte
-@param mqc MQC handle
-*/
-static INLINE void mqc_bytein(opj_mqc_t *const mqc);
-/**
-Renormalize mqc->a and mqc->c while decoding
-@param mqc MQC handle
-*/
-static INLINE void mqc_renormd(opj_mqc_t *const mqc);
-/*@}*/
-
-/*@}*/
-
-/* <summary> */
-/* This array defines all the possible states for a context. */
-/* </summary> */
-static opj_mqc_state_t mqc_states[47 * 2] = {
-	{0x5601, 0, &mqc_states[2], &mqc_states[3]},
-	{0x5601, 1, &mqc_states[3], &mqc_states[2]},
-	{0x3401, 0, &mqc_states[4], &mqc_states[12]},
-	{0x3401, 1, &mqc_states[5], &mqc_states[13]},
-	{0x1801, 0, &mqc_states[6], &mqc_states[18]},
-	{0x1801, 1, &mqc_states[7], &mqc_states[19]},
-	{0x0ac1, 0, &mqc_states[8], &mqc_states[24]},
-	{0x0ac1, 1, &mqc_states[9], &mqc_states[25]},
-	{0x0521, 0, &mqc_states[10], &mqc_states[58]},
-	{0x0521, 1, &mqc_states[11], &mqc_states[59]},
-	{0x0221, 0, &mqc_states[76], &mqc_states[66]},
-	{0x0221, 1, &mqc_states[77], &mqc_states[67]},
-	{0x5601, 0, &mqc_states[14], &mqc_states[13]},
-	{0x5601, 1, &mqc_states[15], &mqc_states[12]},
-	{0x5401, 0, &mqc_states[16], &mqc_states[28]},
-	{0x5401, 1, &mqc_states[17], &mqc_states[29]},
-	{0x4801, 0, &mqc_states[18], &mqc_states[28]},
-	{0x4801, 1, &mqc_states[19], &mqc_states[29]},
-	{0x3801, 0, &mqc_states[20], &mqc_states[28]},
-	{0x3801, 1, &mqc_states[21], &mqc_states[29]},
-	{0x3001, 0, &mqc_states[22], &mqc_states[34]},
-	{0x3001, 1, &mqc_states[23], &mqc_states[35]},
-	{0x2401, 0, &mqc_states[24], &mqc_states[36]},
-	{0x2401, 1, &mqc_states[25], &mqc_states[37]},
-	{0x1c01, 0, &mqc_states[26], &mqc_states[40]},
-	{0x1c01, 1, &mqc_states[27], &mqc_states[41]},
-	{0x1601, 0, &mqc_states[58], &mqc_states[42]},
-	{0x1601, 1, &mqc_states[59], &mqc_states[43]},
-	{0x5601, 0, &mqc_states[30], &mqc_states[29]},
-	{0x5601, 1, &mqc_states[31], &mqc_states[28]},
-	{0x5401, 0, &mqc_states[32], &mqc_states[28]},
-	{0x5401, 1, &mqc_states[33], &mqc_states[29]},
-	{0x5101, 0, &mqc_states[34], &mqc_states[30]},
-	{0x5101, 1, &mqc_states[35], &mqc_states[31]},
-	{0x4801, 0, &mqc_states[36], &mqc_states[32]},
-	{0x4801, 1, &mqc_states[37], &mqc_states[33]},
-	{0x3801, 0, &mqc_states[38], &mqc_states[34]},
-	{0x3801, 1, &mqc_states[39], &mqc_states[35]},
-	{0x3401, 0, &mqc_states[40], &mqc_states[36]},
-	{0x3401, 1, &mqc_states[41], &mqc_states[37]},
-	{0x3001, 0, &mqc_states[42], &mqc_states[38]},
-	{0x3001, 1, &mqc_states[43], &mqc_states[39]},
-	{0x2801, 0, &mqc_states[44], &mqc_states[38]},
-	{0x2801, 1, &mqc_states[45], &mqc_states[39]},
-	{0x2401, 0, &mqc_states[46], &mqc_states[40]},
-	{0x2401, 1, &mqc_states[47], &mqc_states[41]},
-	{0x2201, 0, &mqc_states[48], &mqc_states[42]},
-	{0x2201, 1, &mqc_states[49], &mqc_states[43]},
-	{0x1c01, 0, &mqc_states[50], &mqc_states[44]},
-	{0x1c01, 1, &mqc_states[51], &mqc_states[45]},
-	{0x1801, 0, &mqc_states[52], &mqc_states[46]},
-	{0x1801, 1, &mqc_states[53], &mqc_states[47]},
-	{0x1601, 0, &mqc_states[54], &mqc_states[48]},
-	{0x1601, 1, &mqc_states[55], &mqc_states[49]},
-	{0x1401, 0, &mqc_states[56], &mqc_states[50]},
-	{0x1401, 1, &mqc_states[57], &mqc_states[51]},
-	{0x1201, 0, &mqc_states[58], &mqc_states[52]},
-	{0x1201, 1, &mqc_states[59], &mqc_states[53]},
-	{0x1101, 0, &mqc_states[60], &mqc_states[54]},
-	{0x1101, 1, &mqc_states[61], &mqc_states[55]},
-	{0x0ac1, 0, &mqc_states[62], &mqc_states[56]},
-	{0x0ac1, 1, &mqc_states[63], &mqc_states[57]},
-	{0x09c1, 0, &mqc_states[64], &mqc_states[58]},
-	{0x09c1, 1, &mqc_states[65], &mqc_states[59]},
-	{0x08a1, 0, &mqc_states[66], &mqc_states[60]},
-	{0x08a1, 1, &mqc_states[67], &mqc_states[61]},
-	{0x0521, 0, &mqc_states[68], &mqc_states[62]},
-	{0x0521, 1, &mqc_states[69], &mqc_states[63]},
-	{0x0441, 0, &mqc_states[70], &mqc_states[64]},
-	{0x0441, 1, &mqc_states[71], &mqc_states[65]},
-	{0x02a1, 0, &mqc_states[72], &mqc_states[66]},
-	{0x02a1, 1, &mqc_states[73], &mqc_states[67]},
-	{0x0221, 0, &mqc_states[74], &mqc_states[68]},
-	{0x0221, 1, &mqc_states[75], &mqc_states[69]},
-	{0x0141, 0, &mqc_states[76], &mqc_states[70]},
-	{0x0141, 1, &mqc_states[77], &mqc_states[71]},
-	{0x0111, 0, &mqc_states[78], &mqc_states[72]},
-	{0x0111, 1, &mqc_states[79], &mqc_states[73]},
-	{0x0085, 0, &mqc_states[80], &mqc_states[74]},
-	{0x0085, 1, &mqc_states[81], &mqc_states[75]},
-	{0x0049, 0, &mqc_states[82], &mqc_states[76]},
-	{0x0049, 1, &mqc_states[83], &mqc_states[77]},
-	{0x0025, 0, &mqc_states[84], &mqc_states[78]},
-	{0x0025, 1, &mqc_states[85], &mqc_states[79]},
-	{0x0015, 0, &mqc_states[86], &mqc_states[80]},
-	{0x0015, 1, &mqc_states[87], &mqc_states[81]},
-	{0x0009, 0, &mqc_states[88], &mqc_states[82]},
-	{0x0009, 1, &mqc_states[89], &mqc_states[83]},
-	{0x0005, 0, &mqc_states[90], &mqc_states[84]},
-	{0x0005, 1, &mqc_states[91], &mqc_states[85]},
-	{0x0001, 0, &mqc_states[90], &mqc_states[86]},
-	{0x0001, 1, &mqc_states[91], &mqc_states[87]},
-	{0x5601, 0, &mqc_states[92], &mqc_states[92]},
-	{0x5601, 1, &mqc_states[93], &mqc_states[93]},
-};
-
-/* 
-==========================================================
-   local functions
-==========================================================
-*/
-
-static void mqc_byteout(opj_mqc_t *mqc) {
-	if (*mqc->bp == 0xff) {
-		mqc->bp++;
-		*mqc->bp = mqc->c >> 20;
-		mqc->c &= 0xfffff;
-		mqc->ct = 7;
-	} else {
-		if ((mqc->c & 0x8000000) == 0) {	/* ((mqc->c&0x8000000)==0) CHANGE */
-			mqc->bp++;
-			*mqc->bp = mqc->c >> 19;
-			mqc->c &= 0x7ffff;
-			mqc->ct = 8;
-		} else {
-			(*mqc->bp)++;
-			if (*mqc->bp == 0xff) {
-				mqc->c &= 0x7ffffff;
-				mqc->bp++;
-				*mqc->bp = mqc->c >> 20;
-				mqc->c &= 0xfffff;
-				mqc->ct = 7;
-			} else {
-				mqc->bp++;
-				*mqc->bp = mqc->c >> 19;
-				mqc->c &= 0x7ffff;
-				mqc->ct = 8;
-			}
-		}
-	}
-}
-
-static void mqc_renorme(opj_mqc_t *mqc) {
-	do {
-		mqc->a <<= 1;
-		mqc->c <<= 1;
-		mqc->ct--;
-		if (mqc->ct == 0) {
-			mqc_byteout(mqc);
-		}
-	} while ((mqc->a & 0x8000) == 0);
-}
-
-static void mqc_codemps(opj_mqc_t *mqc) {
-	mqc->a -= (*mqc->curctx)->qeval;
-	if ((mqc->a & 0x8000) == 0) {
-		if (mqc->a < (*mqc->curctx)->qeval) {
-			mqc->a = (*mqc->curctx)->qeval;
-		} else {
-			mqc->c += (*mqc->curctx)->qeval;
-		}
-		*mqc->curctx = (*mqc->curctx)->nmps;
-		mqc_renorme(mqc);
-	} else {
-		mqc->c += (*mqc->curctx)->qeval;
-	}
-}
-
-static void mqc_codelps(opj_mqc_t *mqc) {
-	mqc->a -= (*mqc->curctx)->qeval;
-	if (mqc->a < (*mqc->curctx)->qeval) {
-		mqc->c += (*mqc->curctx)->qeval;
-	} else {
-		mqc->a = (*mqc->curctx)->qeval;
-	}
-	*mqc->curctx = (*mqc->curctx)->nlps;
-	mqc_renorme(mqc);
-}
-
-static void mqc_setbits(opj_mqc_t *mqc) {
-	unsigned int tempc = mqc->c + mqc->a;
-	mqc->c |= 0xffff;
-	if (mqc->c >= tempc) {
-		mqc->c -= 0x8000;
-	}
-}
-
-static INLINE int mqc_mpsexchange(opj_mqc_t *const mqc) {
-	int d;
-	if (mqc->a < (*mqc->curctx)->qeval) {
-		d = 1 - (*mqc->curctx)->mps;
-		*mqc->curctx = (*mqc->curctx)->nlps;
-	} else {
-		d = (*mqc->curctx)->mps;
-		*mqc->curctx = (*mqc->curctx)->nmps;
-	}
-	
-	return d;
-}
-
-static INLINE int mqc_lpsexchange(opj_mqc_t *const mqc) {
-	int d;
-	if (mqc->a < (*mqc->curctx)->qeval) {
-		mqc->a = (*mqc->curctx)->qeval;
-		d = (*mqc->curctx)->mps;
-		*mqc->curctx = (*mqc->curctx)->nmps;
-	} else {
-		mqc->a = (*mqc->curctx)->qeval;
-		d = 1 - (*mqc->curctx)->mps;
-		*mqc->curctx = (*mqc->curctx)->nlps;
-	}
-	
-	return d;
-}
-
-#ifdef MQC_PERF_OPT
-static INLINE void mqc_bytein(opj_mqc_t *const mqc) {
-	unsigned int i = *((unsigned int *) mqc->bp);
-	mqc->c += i & 0xffff00;
-	mqc->ct = i & 0x0f;
-	mqc->bp += (i >> 2) & 0x04;
-}
-#else
-static void mqc_bytein(opj_mqc_t *const mqc) {
-	if (mqc->bp != mqc->end) {
-		unsigned int c;
-		if (mqc->bp + 1 != mqc->end) {
-			c = *(mqc->bp + 1);
-		} else {
-			c = 0xff;
-		}
-		if (*mqc->bp == 0xff) {
-			if (c > 0x8f) {
-				mqc->c += 0xff00;
-				mqc->ct = 8;
-			} else {
-				mqc->bp++;
-				mqc->c += c << 9;
-				mqc->ct = 7;
-			}
-		} else {
-			mqc->bp++;
-			mqc->c += c << 8;
-			mqc->ct = 8;
-		}
-	} else {
-		mqc->c += 0xff00;
-		mqc->ct = 8;
-	}
-}
-#endif
-
-static INLINE void mqc_renormd(opj_mqc_t *const mqc) {
-	do {
-		if (mqc->ct == 0) {
-			mqc_bytein(mqc);
-		}
-		mqc->a <<= 1;
-		mqc->c <<= 1;
-		mqc->ct--;
-	} while (mqc->a < 0x8000);
-}
-
-/* 
-==========================================================
-   MQ-Coder interface
-==========================================================
-*/
-
-opj_mqc_t* mqc_create(void) {
-	opj_mqc_t *mqc = (opj_mqc_t*)opj_malloc(sizeof(opj_mqc_t));
-#ifdef MQC_PERF_OPT
-	mqc->buffer = NULL;
-#endif
-	return mqc;
-}
-
-void mqc_destroy(opj_mqc_t *mqc) {
-	if(mqc) {
-#ifdef MQC_PERF_OPT
-		if (mqc->buffer) {
-			opj_free(mqc->buffer);
-		}
-#endif
-		opj_free(mqc);
-	}
-}
-
-int mqc_numbytes(opj_mqc_t *mqc) {
-	return mqc->bp - mqc->start;
-}
-
-void mqc_init_enc(opj_mqc_t *mqc, unsigned char *bp) {
-	mqc_setcurctx(mqc, 0);
-	mqc->a = 0x8000;
-	mqc->c = 0;
-	mqc->bp = bp - 1;
-	mqc->ct = 12;
-	if (*mqc->bp == 0xff) {
-		mqc->ct = 13;
-	}
-	mqc->start = bp;
-}
-
-void mqc_encode(opj_mqc_t *mqc, int d) {
-	if ((*mqc->curctx)->mps == d) {
-		mqc_codemps(mqc);
-	} else {
-		mqc_codelps(mqc);
-	}
-}
-
-void mqc_flush(opj_mqc_t *mqc) {
-	mqc_setbits(mqc);
-	mqc->c <<= mqc->ct;
-	mqc_byteout(mqc);
-	mqc->c <<= mqc->ct;
-	mqc_byteout(mqc);
-	
-	if (*mqc->bp != 0xff) {
-		mqc->bp++;
-	}
-}
-
-void mqc_bypass_init_enc(opj_mqc_t *mqc) {
-	mqc->c = 0;
-	mqc->ct = 8;
-	/*if (*mqc->bp == 0xff) {
-	mqc->ct = 7;
-     } */
-}
-
-void mqc_bypass_enc(opj_mqc_t *mqc, int d) {
-	mqc->ct--;
-	mqc->c = mqc->c + (d << mqc->ct);
-	if (mqc->ct == 0) {
-		mqc->bp++;
-		*mqc->bp = mqc->c;
-		mqc->ct = 8;
-		if (*mqc->bp == 0xff) {
-			mqc->ct = 7;
-		}
-		mqc->c = 0;
-	}
-}
-
-int mqc_bypass_flush_enc(opj_mqc_t *mqc) {
-	unsigned char bit_padding;
-	
-	bit_padding = 0;
-	
-	if (mqc->ct != 0) {
-		while (mqc->ct > 0) {
-			mqc->ct--;
-			mqc->c += bit_padding << mqc->ct;
-			bit_padding = (bit_padding + 1) & 0x01;
-		}
-		mqc->bp++;
-		*mqc->bp = mqc->c;
-		mqc->ct = 8;
-		mqc->c = 0;
-	}
-	
-	return 1;
-}
-
-void mqc_reset_enc(opj_mqc_t *mqc) {
-	mqc_resetstates(mqc);
-	mqc_setstate(mqc, T1_CTXNO_UNI, 0, 46);
-	mqc_setstate(mqc, T1_CTXNO_AGG, 0, 3);
-	mqc_setstate(mqc, T1_CTXNO_ZC, 0, 4);
-}
-
-int mqc_restart_enc(opj_mqc_t *mqc) {
-	int correction = 1;
-	
-	/* <flush part> */
-	int n = 27 - 15 - mqc->ct;
-	mqc->c <<= mqc->ct;
-	while (n > 0) {
-		mqc_byteout(mqc);
-		n -= mqc->ct;
-		mqc->c <<= mqc->ct;
-	}
-	mqc_byteout(mqc);
-	
-	return correction;
-}
-
-void mqc_restart_init_enc(opj_mqc_t *mqc) {
-	/* <Re-init part> */
-	mqc_setcurctx(mqc, 0);
-	mqc->a = 0x8000;
-	mqc->c = 0;
-	mqc->ct = 12;
-	mqc->bp--;
-	if (*mqc->bp == 0xff) {
-		mqc->ct = 13;
-	}
-}
-
-void mqc_erterm_enc(opj_mqc_t *mqc) {
-	int k = 11 - mqc->ct + 1;
-	
-	while (k > 0) {
-		mqc->c <<= mqc->ct;
-		mqc->ct = 0;
-		mqc_byteout(mqc);
-		k -= mqc->ct;
-	}
-	
-	if (*mqc->bp != 0xff) {
-		mqc_byteout(mqc);
-	}
-}
-
-void mqc_segmark_enc(opj_mqc_t *mqc) {
-	int i;
-	mqc_setcurctx(mqc, 18);
-	
-	for (i = 1; i < 5; i++) {
-		mqc_encode(mqc, i % 2);
-	}
-}
-
-void mqc_init_dec(opj_mqc_t *mqc, unsigned char *bp, int len) {
-	mqc_setcurctx(mqc, 0);
-	mqc->start = bp;
-	mqc->end = bp + len;
-	mqc->bp = bp;
-	if (len==0) mqc->c = 0xff << 16;
-	else mqc->c = *mqc->bp << 16;
-
-#ifdef MQC_PERF_OPT
-	{
-		unsigned int c;
-		unsigned int *ip;
-		unsigned char *end = mqc->end - 1;
-		mqc->buffer = opj_realloc(mqc->buffer, (len + 1) * sizeof(unsigned int));
-		ip = (unsigned int *) mqc->buffer;
-
-		while (bp < end) {
-			c = *(bp + 1);
-			if (*bp == 0xff) {
-				if (c > 0x8f) {
-					break;
-				} else {
-					*ip = 0x00000017 | (c << 9);
-				}
-			} else {
-				*ip = 0x00000018 | (c << 8);
-			}
-			bp++;
-			ip++;
-		}
-
-		/* Handle last byte of data */
-		c = 0xff;
-		if (*bp == 0xff) {
-			*ip = 0x0000ff18;
-		} else {
-			bp++;
-			*ip = 0x00000018 | (c << 8);
-		}
-		ip++;
-
-		*ip = 0x0000ff08;
-		mqc->bp = mqc->buffer;
-	}
-#endif
-	mqc_bytein(mqc);
-	mqc->c <<= 7;
-	mqc->ct -= 7;
-	mqc->a = 0x8000;
-}
-
-int mqc_decode(opj_mqc_t *const mqc) {
-	int d;
-	mqc->a -= (*mqc->curctx)->qeval;
-	if ((mqc->c >> 16) < (*mqc->curctx)->qeval) {
-		d = mqc_lpsexchange(mqc);
-		mqc_renormd(mqc);
-	} else {
-		mqc->c -= (*mqc->curctx)->qeval << 16;
-		if ((mqc->a & 0x8000) == 0) {
-			d = mqc_mpsexchange(mqc);
-			mqc_renormd(mqc);
-		} else {
-			d = (*mqc->curctx)->mps;
-		}
-	}
-
-	return d;
-}
-
-void mqc_resetstates(opj_mqc_t *mqc) {
-	int i;
-	for (i = 0; i < MQC_NUMCTXS; i++) {
-		mqc->ctxs[i] = mqc_states;
-	}
-}
-
-void mqc_setstate(opj_mqc_t *mqc, int ctxno, int msb, int prob) {
-	mqc->ctxs[ctxno] = &mqc_states[msb + (prob << 1)];
-}
-
-
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/mqc.h b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/mqc.h
deleted file mode 100644
index d00cd1067d88d28c7e2f0c28e49c1f0b39dd156b..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/mqc.h
+++ /dev/null
@@ -1,200 +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.
- */
-
-#ifndef __MQC_H
-#define __MQC_H
-/**
-@file mqc.h
-@brief Implementation of an MQ-Coder (MQC)
-
-The functions in MQC.C have for goal to realize the MQ-coder operations. The functions
-in MQC.C are used by some function in T1.C.
-*/
-
-/** @defgroup MQC MQC - Implementation of an MQ-Coder */
-/*@{*/
-
-/**
-This struct defines the state of a context.
-*/
-typedef struct opj_mqc_state {
-	/** the probability of the Least Probable Symbol (0.75->0x8000, 1.5->0xffff) */
-	unsigned int qeval;
-	/** the Most Probable Symbol (0 or 1) */
-	int mps;
-	/** next state if the next encoded symbol is the MPS */
-	struct opj_mqc_state *nmps;
-	/** next state if the next encoded symbol is the LPS */
-	struct opj_mqc_state *nlps;
-} opj_mqc_state_t;
-
-#define MQC_NUMCTXS 19
-
-/**
-MQ coder
-*/
-typedef struct opj_mqc {
-	unsigned int c;
-	unsigned int a;
-	unsigned int ct;
-	unsigned char *bp;
-	unsigned char *start;
-	unsigned char *end;
-	opj_mqc_state_t *ctxs[MQC_NUMCTXS];
-	opj_mqc_state_t **curctx;
-#ifdef MQC_PERF_OPT
-	unsigned char *buffer;
-#endif
-} opj_mqc_t;
-
-/** @name Exported functions */
-/*@{*/
-/* ----------------------------------------------------------------------- */
-/**
-Create a new MQC handle 
-@return Returns a new MQC handle if successful, returns NULL otherwise
-*/
-opj_mqc_t* mqc_create(void);
-/**
-Destroy a previously created MQC handle
-@param mqc MQC handle to destroy
-*/
-void mqc_destroy(opj_mqc_t *mqc);
-/**
-Return the number of bytes written/read since initialisation
-@param mqc MQC handle
-@return Returns the number of bytes already encoded
-*/
-int mqc_numbytes(opj_mqc_t *mqc);
-/**
-Reset the states of all the context of the coder/decoder 
-(each context is set to a state where 0 and 1 are more or less equiprobable)
-@param mqc MQC handle
-*/
-void mqc_resetstates(opj_mqc_t *mqc);
-/**
-Set the state of a particular context
-@param mqc MQC handle
-@param ctxno Number that identifies the context
-@param msb The MSB of the new state of the context
-@param prob Number that identifies the probability of the symbols for the new state of the context
-*/
-void mqc_setstate(opj_mqc_t *mqc, int ctxno, int msb, int prob);
-/**
-Initialize the encoder
-@param mqc MQC handle
-@param bp Pointer to the start of the buffer where the bytes will be written
-*/
-void mqc_init_enc(opj_mqc_t *mqc, unsigned char *bp);
-/**
-Set the current context used for coding/decoding
-@param mqc MQC handle
-@param ctxno Number that identifies the context
-*/
-#define mqc_setcurctx(mqc, ctxno)	(mqc)->curctx = &(mqc)->ctxs[(int)(ctxno)]
-/**
-Encode a symbol using the MQ-coder
-@param mqc MQC handle
-@param d The symbol to be encoded (0 or 1)
-*/
-void mqc_encode(opj_mqc_t *mqc, int d);
-/**
-Flush the encoder, so that all remaining data is written
-@param mqc MQC handle
-*/
-void mqc_flush(opj_mqc_t *mqc);
-/**
-BYPASS mode switch, initialization operation. 
-JPEG 2000 p 505. 
-<h2>Not fully implemented and tested !!</h2>
-@param mqc MQC handle
-*/
-void mqc_bypass_init_enc(opj_mqc_t *mqc);
-/**
-BYPASS mode switch, coding operation. 
-JPEG 2000 p 505. 
-<h2>Not fully implemented and tested !!</h2>
-@param mqc MQC handle
-@param d The symbol to be encoded (0 or 1)
-*/
-void mqc_bypass_enc(opj_mqc_t *mqc, int d);
-/**
-BYPASS mode switch, flush operation
-<h2>Not fully implemented and tested !!</h2>
-@param mqc MQC handle
-@return Returns 1 (always)
-*/
-int mqc_bypass_flush_enc(opj_mqc_t *mqc);
-/**
-RESET mode switch
-@param mqc MQC handle
-*/
-void mqc_reset_enc(opj_mqc_t *mqc);
-/**
-RESTART mode switch (TERMALL)
-@param mqc MQC handle
-@return Returns 1 (always)
-*/
-int mqc_restart_enc(opj_mqc_t *mqc);
-/**
-RESTART mode switch (TERMALL) reinitialisation
-@param mqc MQC handle
-*/
-void mqc_restart_init_enc(opj_mqc_t *mqc);
-/**
-ERTERM mode switch (PTERM)
-@param mqc MQC handle
-*/
-void mqc_erterm_enc(opj_mqc_t *mqc);
-/**
-SEGMARK mode switch (SEGSYM)
-@param mqc MQC handle
-*/
-void mqc_segmark_enc(opj_mqc_t *mqc);
-/**
-Initialize the decoder
-@param mqc MQC handle
-@param bp Pointer to the start of the buffer from which the bytes will be read
-@param len Length of the input buffer
-*/
-void mqc_init_dec(opj_mqc_t *mqc, unsigned char *bp, int len);
-/**
-Decode a symbol
-@param mqc MQC handle
-@return Returns the decoded symbol (0 or 1)
-*/
-int mqc_decode(opj_mqc_t *const mqc);
-/* ----------------------------------------------------------------------- */
-/*@}*/
-
-/*@}*/
-
-#endif /* __MQC_H */
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/openjpeg.c b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/openjpeg.c
deleted file mode 100644
index 1038c9b31aa5ab7aa95f1f81a3815195f35a7efb..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/openjpeg.c
+++ /dev/null
@@ -1,1035 +0,0 @@
-/*
- * 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.
- */
-
-#ifdef _WIN32
-#include <windows.h>
-#endif /* _WIN32 */
-
-#include "opj_config.h"
-#include "opj_includes.h"
-
-
-/**
- * Decompression handler.
- */
-typedef struct opj_decompression
-{
-	/** Main header reading function handler*/
-	opj_bool (*opj_read_header) (	struct opj_stream_private * cio,
-									void * p_codec,
-									opj_image_t **p_image,
-									struct opj_event_mgr * p_manager);
-	/** Decoding function */
-	opj_bool (*opj_decode) (	void * p_codec,
-								struct opj_stream_private *p_cio,
-								opj_image_t *p_image,
-								struct opj_event_mgr * p_manager);
-	/** FIXME DOC */
-	opj_bool (*opj_read_tile_header)(	void * p_codec,
-										OPJ_UINT32 * p_tile_index,
-										OPJ_UINT32* p_data_size,
-										OPJ_INT32 * p_tile_x0, OPJ_INT32 * p_tile_y0,
-										OPJ_INT32 * p_tile_x1, OPJ_INT32 * p_tile_y1,
-										OPJ_UINT32 * p_nb_comps,
-										opj_bool * p_should_go_on,
-										struct opj_stream_private *p_cio,
-										struct opj_event_mgr * p_manager);
-	/** FIXME DOC */
-	opj_bool (*opj_decode_tile_data)(	void * p_codec,
-										OPJ_UINT32 p_tile_index,
-										OPJ_BYTE * p_data,
-										OPJ_UINT32 p_data_size,
-										struct opj_stream_private *p_cio,
-										struct opj_event_mgr * p_manager);
-	/** Reading function used after codestream if necessary */
-	opj_bool (* opj_end_decompress) (	void *p_codec,
-										struct opj_stream_private *cio,
-										struct opj_event_mgr * p_manager);
-	/** Codec destroy function handler*/
-	void (*opj_destroy) (void * p_codec);
-	/** Setup decoder function handler */
-	void (*opj_setup_decoder) (void * p_codec, opj_dparameters_t * p_param);
-	/** Set decode area function handler */
-	opj_bool (*opj_set_decode_area) (	void * p_codec,
-										opj_image_t* p_image,
-										OPJ_INT32 p_start_x, OPJ_INT32 p_end_x,
-										OPJ_INT32 p_start_y, OPJ_INT32 p_end_y,
-										struct opj_event_mgr * p_manager);
-
-	/** Get tile function */
-	opj_bool (*opj_get_decoded_tile) (	void *p_codec,
-										opj_stream_private_t *p_cio,
-										opj_image_t *p_image,
-										struct opj_event_mgr * p_manager,
-										OPJ_UINT32 tile_index);
-
-	/** Set the decoded resolution factor */
-	opj_bool (*opj_set_decoded_resolution_factor) (void * p_codec, OPJ_UINT32 res_factor, struct opj_event_mgr * p_manager);
-
-}opj_decompression_t;
-
-/**
- * Compression handler. FIXME DOC
- */
-typedef struct opj_compression
-{
-	opj_bool (* opj_start_compress) (void *p_codec,struct opj_stream_private *cio,struct opj_image * p_image,	struct opj_event_mgr * p_manager);
-	opj_bool (* opj_encode) (void * p_codec, struct opj_stream_private *p_cio, struct opj_event_mgr * p_manager);
-	opj_bool (* opj_write_tile) (void * p_codec,OPJ_UINT32 p_tile_index,OPJ_BYTE * p_data,OPJ_UINT32 p_data_size,struct opj_stream_private * p_cio,struct opj_event_mgr * p_manager);
-	opj_bool (* opj_end_compress) (void * p_codec, struct opj_stream_private *p_cio, struct opj_event_mgr * p_manager);
-	void (* opj_destroy) (void * p_codec);
-	void (*opj_setup_encoder) (void * p_codec,opj_cparameters_t * p_param,struct opj_image * p_image, struct opj_event_mgr * p_manager);
-
-}opj_compression_t;
-
-/**
- * Main codec handler used for compression or decompression.
- */
-typedef struct opj_codec_private
-{
-	/** FIXME DOC */
-	union {
-		opj_decompression_t m_decompression;
-		opj_compression_t m_compression;
-    } m_codec_data;
-    /** FIXME DOC*/
-	void * m_codec;
-	/** Event handler */
-	opj_event_mgr_t* m_event_mgr;
-	/** Flag to indicate if the codec is used to decode or encode*/
-	opj_bool is_decompressor;
-	void (*opj_dump_codec) (void * p_codec, OPJ_INT32 info_flag, FILE* output_stream);
-	opj_codestream_info_v2_t* (*opj_get_codec_info)(void* p_codec);
-	opj_codestream_index_t* (*opj_get_codec_index)(void* p_codec);
-}
-opj_codec_private_t;
-
-
-
-/* ---------------------------------------------------------------------- */
-
-
-OPJ_SIZE_T opj_read_from_file (void * p_buffer, OPJ_SIZE_T p_nb_bytes, FILE * p_file)
-{
-	OPJ_SIZE_T l_nb_read = fread(p_buffer,1,p_nb_bytes,p_file);
-	return l_nb_read ? l_nb_read : -1;
-}
-
-OPJ_UINT64 opj_get_data_length_from_file (FILE * p_file)
-{
-	OPJ_OFF_T file_length = 0;
-
-	OPJ_FSEEK(p_file, 0, SEEK_END);
-	file_length = (OPJ_UINT64)OPJ_FTELL(p_file);
-	OPJ_FSEEK(p_file, 0, SEEK_SET);
-
-	return file_length;
-}
-
-OPJ_SIZE_T opj_write_from_file (void * p_buffer, OPJ_SIZE_T p_nb_bytes, FILE * p_file)
-{
-	return fwrite(p_buffer,1,p_nb_bytes,p_file);
-}
-
-OPJ_OFF_T opj_skip_from_file (OPJ_OFF_T p_nb_bytes, FILE * p_user_data)
-{
-	if (OPJ_FSEEK(p_user_data,p_nb_bytes,SEEK_CUR)) {
-		return -1;
-	}
-
-	return p_nb_bytes;
-}
-
-opj_bool opj_seek_from_file (OPJ_OFF_T p_nb_bytes, FILE * p_user_data)
-{
-	if (OPJ_FSEEK(p_user_data,p_nb_bytes,SEEK_SET)) {
-		return EXIT_FAILURE;
-	}
-
-	return EXIT_SUCCESS;
-}
-
-/* ---------------------------------------------------------------------- */
-#ifdef _WIN32
-#if !defined(OPJ_STATIC) && !defined(__MINGW32__)
-BOOL APIENTRY
-DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
-
-	OPJ_ARG_NOT_USED(lpReserved);
-	OPJ_ARG_NOT_USED(hModule);
-
-	switch (ul_reason_for_call) {
-		case DLL_PROCESS_ATTACH :
-			break;
-		case DLL_PROCESS_DETACH :
-			break;
-		case DLL_THREAD_ATTACH :
-		case DLL_THREAD_DETACH :
-			break;
-    }
-
-    return TRUE;
-}
-#endif /* OPJ_STATIC */
-#endif /* _WIN32 */
-
-/* ---------------------------------------------------------------------- */
-
-
-const char* OPJ_CALLCONV opj_version(void) {
-    return PACKAGE_VERSION;
-}
-
-
-/* DEPRECATED */
-opj_dinfo_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT format) {
-	opj_dinfo_t *dinfo = (opj_dinfo_t*)opj_calloc(1, sizeof(opj_dinfo_t));
-	if(!dinfo) return NULL;
-	dinfo->is_decompressor = OPJ_TRUE;
-	switch(format) {
-		case CODEC_J2K:
-		case CODEC_JPT:
-			/* get a J2K decoder handle */
-			dinfo->j2k_handle = (void*)j2k_create_decompress((opj_common_ptr)dinfo);
-			if(!dinfo->j2k_handle) {
-				opj_free(dinfo);
-				return NULL;
-			}
-			break;
-		case CODEC_JP2:
-			/* get a JP2 decoder handle */
-			dinfo->jp2_handle = (void*)jp2_create_decompress((opj_common_ptr)dinfo);
-			if(!dinfo->jp2_handle) {
-				opj_free(dinfo);
-				return NULL;
-			}
-			break;
-		case CODEC_UNKNOWN:
-		default:
-			opj_free(dinfo);
-			return NULL;
-	}
-
-	dinfo->codec_format = format;
-
-	return dinfo;
-}
-
-opj_codec_t* OPJ_CALLCONV opj_create_decompress_v2(OPJ_CODEC_FORMAT p_format)
-{
-	opj_codec_private_t *l_info = 00;
-
-	l_info = (opj_codec_private_t*) opj_calloc(1, sizeof(opj_codec_private_t));
-	if (!l_info){
-		return 00;
-	}
-	memset(l_info, 0, sizeof(opj_codec_private_t));
-
-	l_info->is_decompressor = 1;
-
-	switch (p_format) {
-		case CODEC_J2K:
-			l_info->opj_dump_codec = (void (*) (void*, OPJ_INT32, FILE*)) j2k_dump;
-
-			l_info->opj_get_codec_info = (opj_codestream_info_v2_t* (*) (void*) ) j2k_get_cstr_info;
-
-			l_info->opj_get_codec_index = (opj_codestream_index_t* (*) (void*) ) j2k_get_cstr_index;
-
-			l_info->m_codec_data.m_decompression.opj_decode =
-					(opj_bool (*) (	void *,
-									struct opj_stream_private *,
-									opj_image_t*, struct opj_event_mgr * )) j2k_decode_v2;
-
-			l_info->m_codec_data.m_decompression.opj_end_decompress =
-					(opj_bool (*) (	void *,
-									struct opj_stream_private *,
-									struct opj_event_mgr *)) j2k_end_decompress;
-
-			l_info->m_codec_data.m_decompression.opj_read_header =
-					(opj_bool (*) (	struct opj_stream_private *,
-									void *,
-									opj_image_t **,
-									struct opj_event_mgr * )) j2k_read_header;
-
-			l_info->m_codec_data.m_decompression.opj_destroy =
-					(void (*) (void *))j2k_destroy;
-
-			l_info->m_codec_data.m_decompression.opj_setup_decoder =
-					(void (*) (void * , opj_dparameters_t * )) j2k_setup_decoder_v2;
-
-			l_info->m_codec_data.m_decompression.opj_read_tile_header =
-					(opj_bool (*) (	void *,
-									OPJ_UINT32*,
-									OPJ_UINT32*,
-									OPJ_INT32*, OPJ_INT32*,
-									OPJ_INT32*, OPJ_INT32*,
-									OPJ_UINT32*,
-									opj_bool*,
-									struct opj_stream_private *,
-									struct opj_event_mgr * )) j2k_read_tile_header;
-
-			l_info->m_codec_data.m_decompression.opj_decode_tile_data =
-					(opj_bool (*) (void *, OPJ_UINT32, OPJ_BYTE*, OPJ_UINT32, struct opj_stream_private *, struct opj_event_mgr *)) j2k_decode_tile;
-
-			l_info->m_codec_data.m_decompression.opj_set_decode_area =
-					(opj_bool (*) (void *, opj_image_t*, OPJ_INT32, OPJ_INT32, OPJ_INT32, OPJ_INT32, struct opj_event_mgr *)) j2k_set_decode_area;
-
-			l_info->m_codec_data.m_decompression.opj_get_decoded_tile = (opj_bool (*) (	void *p_codec,
-																						opj_stream_private_t *p_cio,
-																						opj_image_t *p_image,
-																						struct opj_event_mgr * p_manager,
-																						OPJ_UINT32 tile_index)) j2k_get_tile;
-
-			l_info->m_codec_data.m_decompression.opj_set_decoded_resolution_factor = (opj_bool (*) (void * p_codec,
-																									OPJ_UINT32 res_factor,
-																									struct opj_event_mgr * p_manager)) j2k_set_decoded_resolution_factor;
-
-			l_info->m_codec = j2k_create_decompress_v2();
-
-			if (! l_info->m_codec) {
-				opj_free(l_info);
-				return NULL;
-			}
-
-			break;
-
-		case CODEC_JP2:
-			/* get a JP2 decoder handle */
-			l_info->opj_dump_codec = (void (*) (void*, OPJ_INT32, FILE*)) jp2_dump;
-
-			l_info->opj_get_codec_info = (opj_codestream_info_v2_t* (*) (void*) ) jp2_get_cstr_info;
-
-			l_info->opj_get_codec_index = (opj_codestream_index_t* (*) (void*) ) jp2_get_cstr_index;
-
-			l_info->m_codec_data.m_decompression.opj_decode =
-					(opj_bool (*) (	void *,
-									struct opj_stream_private *,
-									opj_image_t*,
-									struct opj_event_mgr * )) jp2_decode_v2;
-
-			l_info->m_codec_data.m_decompression.opj_end_decompress =  (opj_bool (*) (void *,struct opj_stream_private *,struct opj_event_mgr *)) jp2_end_decompress;
-
-			l_info->m_codec_data.m_decompression.opj_read_header =  (opj_bool (*) (
-					struct opj_stream_private *,
-					void *,
-					opj_image_t **,
-					struct opj_event_mgr * )) jp2_read_header;
-
-			l_info->m_codec_data.m_decompression.opj_read_tile_header = ( opj_bool (*) (
-					void *,
-					OPJ_UINT32*,
-					OPJ_UINT32*,
-					OPJ_INT32*,
-					OPJ_INT32*,
-					OPJ_INT32 * ,
-					OPJ_INT32 * ,
-					OPJ_UINT32 * ,
-					opj_bool *,
-					struct opj_stream_private *,
-					struct opj_event_mgr * )) jp2_read_tile_header;
-
-			l_info->m_codec_data.m_decompression.opj_decode_tile_data = (opj_bool (*) (void *,OPJ_UINT32,OPJ_BYTE*,OPJ_UINT32,struct opj_stream_private *,	struct opj_event_mgr * )) jp2_decode_tile;
-
-			l_info->m_codec_data.m_decompression.opj_destroy = (void (*) (void *))jp2_destroy;
-
-			l_info->m_codec_data.m_decompression.opj_setup_decoder = (void (*) (void * ,opj_dparameters_t * )) jp2_setup_decoder_v2;
-
-			l_info->m_codec_data.m_decompression.opj_set_decode_area = (opj_bool (*) (void *,opj_image_t*, OPJ_INT32,OPJ_INT32,OPJ_INT32,OPJ_INT32, struct opj_event_mgr * )) jp2_set_decode_area;
-
-			l_info->m_codec_data.m_decompression.opj_get_decoded_tile = (opj_bool (*) (	void *p_codec,
-																						opj_stream_private_t *p_cio,
-																						opj_image_t *p_image,
-																						struct opj_event_mgr * p_manager,
-																						OPJ_UINT32 tile_index)) jp2_get_tile;
-
-			l_info->m_codec_data.m_decompression.opj_set_decoded_resolution_factor = (opj_bool (*) (void * p_codec,
-																									OPJ_UINT32 res_factor,
-																									opj_event_mgr_t * p_manager)) jp2_set_decoded_resolution_factor;
-
-			l_info->m_codec = jp2_create(OPJ_TRUE);
-
-			if (! l_info->m_codec) {
-				opj_free(l_info);
-				return 00;
-			}
-
-			break;
-		case CODEC_UNKNOWN:
-		case CODEC_JPT:
-		default:
-			opj_free(l_info);
-			return 00;
-	}
-
-	return (opj_codec_t*) l_info;
-}
-
-/* DEPRECATED */
-void OPJ_CALLCONV opj_destroy_decompress(opj_dinfo_t *dinfo) {
-	if(dinfo) {
-		/* destroy the codec */
-		switch(dinfo->codec_format) {
-			case CODEC_J2K:
-			case CODEC_JPT:
-				j2k_destroy_decompress((opj_j2k_t*)dinfo->j2k_handle);
-				break;
-			case CODEC_JP2:
-				jp2_destroy_decompress((opj_jp2_t*)dinfo->jp2_handle);
-				break;
-			case CODEC_UNKNOWN:
-			default:
-				break;
-		}
-		/* destroy the decompressor */
-		opj_free(dinfo);
-	}
-}
-
-void OPJ_CALLCONV opj_set_default_decoder_parameters(opj_dparameters_t *parameters) {
-	if(parameters) {
-		memset(parameters, 0, sizeof(opj_dparameters_t));
-		/* default decoding parameters */
-		parameters->cp_layer = 0;
-		parameters->cp_reduce = 0;
-		parameters->cp_limit_decoding = NO_LIMITATION;
-
-		parameters->decod_format = -1;
-		parameters->cod_format = -1;
-/* UniPG>> */
-#ifdef USE_JPWL
-		parameters->jpwl_correct = OPJ_FALSE;
-		parameters->jpwl_exp_comps = JPWL_EXPECTED_COMPONENTS;
-		parameters->jpwl_max_tiles = JPWL_MAXIMUM_TILES;
-#endif /* USE_JPWL */
-/* <<UniPG */
-	}
-}
-
-/* DEPRECATED */
-void OPJ_CALLCONV opj_setup_decoder(opj_dinfo_t *dinfo, opj_dparameters_t *parameters) {
-	if(dinfo && parameters) {
-		switch(dinfo->codec_format) {
-			case CODEC_J2K:
-			case CODEC_JPT:
-				j2k_setup_decoder((opj_j2k_t*)dinfo->j2k_handle, parameters);
-				break;
-			case CODEC_JP2:
-				jp2_setup_decoder((opj_jp2_t*)dinfo->jp2_handle, parameters);
-				break;
-			case CODEC_UNKNOWN:
-			default:
-				break;
-		}
-	}
-}
-
-opj_bool OPJ_CALLCONV opj_setup_decoder_v2(opj_codec_t *p_info, opj_dparameters_t *parameters, opj_event_mgr_t* event_mgr)
-{
-	opj_codec_private_t * l_info = (opj_codec_private_t *) p_info;
-
-	if ( !p_info || !parameters || !event_mgr ){
-		fprintf(stderr, "[ERROR] Input parameters of the setup_decoder function are incorrect.\n");
-		return OPJ_FALSE;
-	}
-
-	if ( !event_mgr->error_handler || !event_mgr->warning_handler || !event_mgr->error_handler){
-		fprintf(stderr, "[ERROR] Event handler provided to the setup_decoder function is not valid.\n");
-		return OPJ_FALSE;
-	}
-
-	if (! l_info->is_decompressor) {
-		opj_event_msg_v2(event_mgr, EVT_ERROR, "Codec provided to the setup_decoder function is not a decompressor handler.\n");
-		return OPJ_FALSE;
-	}
-
-	l_info->m_codec_data.m_decompression.opj_setup_decoder(l_info->m_codec, parameters);
-
-	l_info->m_event_mgr = event_mgr;
-
-	return OPJ_TRUE;
-}
-
-/* DEPRECATED */
-opj_image_t* OPJ_CALLCONV opj_decode(opj_dinfo_t *dinfo, opj_cio_t *cio) {
-	return opj_decode_with_info(dinfo, cio, NULL);
-}
-
-/* DEPRECATED */
-opj_image_t* OPJ_CALLCONV opj_decode_with_info(opj_dinfo_t *dinfo, opj_cio_t *cio, opj_codestream_info_t *cstr_info) {
-	if(dinfo && cio) {
-		switch(dinfo->codec_format) {
-			case CODEC_J2K:
-				return j2k_decode((opj_j2k_t*)dinfo->j2k_handle, cio, cstr_info);
-			case CODEC_JPT:
-				return j2k_decode_jpt_stream((opj_j2k_t*)dinfo->j2k_handle, cio, cstr_info);
-			case CODEC_JP2:
-				return opj_jp2_decode((opj_jp2_t*)dinfo->jp2_handle, cio, cstr_info);
-			case CODEC_UNKNOWN:
-			default:
-				break;
-		}
-	}
-	return NULL;
-}
-
-opj_cinfo_t* OPJ_CALLCONV opj_create_compress(OPJ_CODEC_FORMAT format) {
-	opj_cinfo_t *cinfo = (opj_cinfo_t*)opj_calloc(1, sizeof(opj_cinfo_t));
-	if(!cinfo) return NULL;
-	cinfo->is_decompressor = OPJ_FALSE;
-	switch(format) {
-		case CODEC_J2K:
-			/* get a J2K coder handle */
-			cinfo->j2k_handle = (void*)j2k_create_compress((opj_common_ptr)cinfo);
-			if(!cinfo->j2k_handle) {
-				opj_free(cinfo);
-				return NULL;
-			}
-			break;
-		case CODEC_JP2:
-			/* get a JP2 coder handle */
-			cinfo->jp2_handle = (void*)jp2_create_compress((opj_common_ptr)cinfo);
-			if(!cinfo->jp2_handle) {
-				opj_free(cinfo);
-				return NULL;
-			}
-			break;
-		case CODEC_JPT:
-		case CODEC_UNKNOWN:
-		default:
-			opj_free(cinfo);
-			return NULL;
-	}
-
-	cinfo->codec_format = format;
-
-	return cinfo;
-}
-
-void OPJ_CALLCONV opj_destroy_compress(opj_cinfo_t *cinfo) {
-	if(cinfo) {
-		/* destroy the codec */
-		switch(cinfo->codec_format) {
-			case CODEC_J2K:
-				j2k_destroy_compress((opj_j2k_t*)cinfo->j2k_handle);
-				break;
-			case CODEC_JP2:
-				jp2_destroy_compress((opj_jp2_t*)cinfo->jp2_handle);
-				break;
-			case CODEC_JPT:
-			case CODEC_UNKNOWN:
-			default:
-				break;
-		}
-		/* destroy the decompressor */
-		opj_free(cinfo);
-	}
-}
-
-void OPJ_CALLCONV opj_set_default_encoder_parameters(opj_cparameters_t *parameters) {
-	if(parameters) {
-		memset(parameters, 0, sizeof(opj_cparameters_t));
-		/* default coding parameters */
-		parameters->cp_cinema = OFF; 
-		parameters->max_comp_size = 0;
-		parameters->numresolution = 6;
-		parameters->cp_rsiz = STD_RSIZ;
-		parameters->cblockw_init = 64;
-		parameters->cblockh_init = 64;
-		parameters->prog_order = LRCP;
-		parameters->roi_compno = -1;		/* no ROI */
-		parameters->subsampling_dx = 1;
-		parameters->subsampling_dy = 1;
-		parameters->tp_on = 0;
-		parameters->decod_format = -1;
-		parameters->cod_format = -1;
-		parameters->tcp_rates[0] = 0;   
-		parameters->tcp_numlayers = 0;
-		parameters->cp_disto_alloc = 0;
-		parameters->cp_fixed_alloc = 0;
-		parameters->cp_fixed_quality = 0;
-		parameters->jpip_on = OPJ_FALSE;
-/* UniPG>> */
-#ifdef USE_JPWL
-		parameters->jpwl_epc_on = OPJ_FALSE;
-		parameters->jpwl_hprot_MH = -1; /* -1 means unassigned */
-		{
-			int i;
-			for (i = 0; i < JPWL_MAX_NO_TILESPECS; i++) {
-				parameters->jpwl_hprot_TPH_tileno[i] = -1; /* unassigned */
-				parameters->jpwl_hprot_TPH[i] = 0; /* absent */
-			}
-		};
-		{
-			int i;
-			for (i = 0; i < JPWL_MAX_NO_PACKSPECS; i++) {
-				parameters->jpwl_pprot_tileno[i] = -1; /* unassigned */
-				parameters->jpwl_pprot_packno[i] = -1; /* unassigned */
-				parameters->jpwl_pprot[i] = 0; /* absent */
-			}
-		};
-		parameters->jpwl_sens_size = 0; /* 0 means no ESD */
-		parameters->jpwl_sens_addr = 0; /* 0 means auto */
-		parameters->jpwl_sens_range = 0; /* 0 means packet */
-		parameters->jpwl_sens_MH = -1; /* -1 means unassigned */
-		{
-			int i;
-			for (i = 0; i < JPWL_MAX_NO_TILESPECS; i++) {
-				parameters->jpwl_sens_TPH_tileno[i] = -1; /* unassigned */
-				parameters->jpwl_sens_TPH[i] = -1; /* absent */
-			}
-		};
-#endif /* USE_JPWL */
-/* <<UniPG */
-	}
-}
-
-/**
- * Helper function.
- * Sets the stream to be a file stream. The FILE must have been open previously.
- * @param		p_stream	the stream to modify
- * @param		p_file		handler to an already open file.
-*/
-opj_stream_t* OPJ_CALLCONV opj_stream_create_default_file_stream (FILE * p_file, opj_bool p_is_read_stream)
-{
-	return opj_stream_create_file_stream(p_file,J2K_STREAM_CHUNK_SIZE,p_is_read_stream);
-}
-
-opj_stream_t* OPJ_CALLCONV opj_stream_create_file_stream (FILE * p_file, OPJ_SIZE_T p_size, opj_bool p_is_read_stream)
-{
-	opj_stream_t* l_stream = 00;
-
-	if (! p_file) {
-		return NULL;
-	}
-
-	l_stream = opj_stream_create(p_size,p_is_read_stream);
-	if (! l_stream) {
-		return NULL;
-	}
-
-	opj_stream_set_user_data(l_stream, p_file);
-	opj_stream_set_user_data_length(l_stream, opj_get_data_length_from_file(p_file));
-	opj_stream_set_read_function(l_stream, (opj_stream_read_fn) opj_read_from_file);
-	opj_stream_set_write_function(l_stream, (opj_stream_write_fn) opj_write_from_file);
-	opj_stream_set_skip_function(l_stream, (opj_stream_skip_fn) opj_skip_from_file);
-	opj_stream_set_seek_function(l_stream, (opj_stream_seek_fn) opj_seek_from_file);
-
-	return l_stream;
-}
-
-void OPJ_CALLCONV opj_setup_encoder(opj_cinfo_t *cinfo, opj_cparameters_t *parameters, opj_image_t *image) {
-	if(cinfo && parameters && image) {
-		switch(cinfo->codec_format) {
-			case CODEC_J2K:
-				j2k_setup_encoder((opj_j2k_t*)cinfo->j2k_handle, parameters, image);
-				break;
-			case CODEC_JP2:
-				jp2_setup_encoder((opj_jp2_t*)cinfo->jp2_handle, parameters, image);
-				break;
-			case CODEC_JPT:
-			case CODEC_UNKNOWN:
-			default:
-				break;
-		}
-	}
-}
-
-opj_bool OPJ_CALLCONV opj_encode(opj_cinfo_t *cinfo, opj_cio_t *cio, opj_image_t *image, char *index) {
-	if (index != NULL)
-		opj_event_msg((opj_common_ptr)cinfo, EVT_WARNING, "Set index to NULL when calling the opj_encode function.\n"
-		"To extract the index, use the opj_encode_with_info() function.\n"
-		"No index will be generated during this encoding\n");
-	return opj_encode_with_info(cinfo, cio, image, NULL);
-}
-
-opj_bool OPJ_CALLCONV opj_encode_with_info(opj_cinfo_t *cinfo, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t *cstr_info) {
-	if(cinfo && cio && image) {
-		switch(cinfo->codec_format) {
-			case CODEC_J2K:
-				return j2k_encode((opj_j2k_t*)cinfo->j2k_handle, cio, image, cstr_info);
-			case CODEC_JP2:
-				return opj_jp2_encode((opj_jp2_t*)cinfo->jp2_handle, cio, image, cstr_info);	    
-			case CODEC_JPT:
-			case CODEC_UNKNOWN:
-			default:
-				break;
-		}
-	}
-	return OPJ_FALSE;
-}
-
-void OPJ_CALLCONV opj_destroy_cstr_info(opj_codestream_info_t *cstr_info) {
-	if (cstr_info) {
-		int tileno;
-		for (tileno = 0; tileno < cstr_info->tw * cstr_info->th; tileno++) {
-			opj_tile_info_t *tile_info = &cstr_info->tile[tileno];
-			opj_free(tile_info->thresh);
-			opj_free(tile_info->packet);
-			opj_free(tile_info->tp);
-			opj_free(tile_info->marker);
-		}
-		opj_free(cstr_info->tile);
-		opj_free(cstr_info->marker);
-		opj_free(cstr_info->numdecompos);
-	}
-}
-
-
-opj_bool OPJ_CALLCONV opj_read_header (	opj_stream_t *p_cio,
-										opj_codec_t *p_codec,
-										opj_image_t **p_image )
-{
-	if (p_codec && p_cio) {
-		opj_codec_private_t* l_info = (opj_codec_private_t*) p_codec;
-		opj_stream_private_t* l_cio = (opj_stream_private_t*) p_cio;
-
-		if(! l_info->is_decompressor) {
-			opj_event_msg_v2(l_info->m_event_mgr, EVT_ERROR, "Codec provided to the read_header function is not a decompressor handler.\n");
-			return OPJ_FALSE;
-		}
-
-		return l_info->m_codec_data.m_decompression.opj_read_header(
-					l_cio,
-					l_info->m_codec,
-					p_image,
-					l_info->m_event_mgr);
-	}
-
-	fprintf(stderr, "[ERROR] Input parameters of the read_header function are incorrect.\n");
-	return OPJ_FALSE;
-}
-
-
-void OPJ_CALLCONV opj_destroy_codec(opj_codec_t *p_info)
-{
-	if (p_info) {
-		opj_codec_private_t * l_info = (opj_codec_private_t *) p_info;
-
-		if (l_info->is_decompressor) {
-			l_info->m_codec_data.m_decompression.opj_destroy(l_info->m_codec);
-		}
-		else {
-			l_info->m_codec_data.m_compression.opj_destroy(l_info->m_codec);
-		}
-
-		l_info->m_codec = 00;
-		opj_free(l_info);
-	}
-}
-
-/**
- * Sets the given area to be decoded. This function should be called right after opj_read_header and before any tile header reading.
- *
- * @param	p_codec			the jpeg2000 codec.
- * @param	p_start_x		the left position of the rectangle to decode (in image coordinates).
- * @param	p_end_x			the right position of the rectangle to decode (in image coordinates).
- * @param	p_start_y		the up position of the rectangle to decode (in image coordinates).
- * @param	p_end_y			the bottom position of the rectangle to decode (in image coordinates).
- *
- * @return	true			if the area could be set.
- */
-opj_bool OPJ_CALLCONV opj_set_decode_area(	opj_codec_t *p_codec,
-											opj_image_t* p_image,
-											OPJ_INT32 p_start_x, OPJ_INT32 p_start_y,
-											OPJ_INT32 p_end_x, OPJ_INT32 p_end_y
-											)
-{
-	if (p_codec) {
-		opj_codec_private_t * l_info = (opj_codec_private_t *) p_codec;
-		if (! l_info->is_decompressor) {
-			return OPJ_FALSE;
-		}
-
-		return  l_info->m_codec_data.m_decompression.opj_set_decode_area(	l_info->m_codec,
-																			p_image,
-																			p_start_x, p_start_y,
-																			p_end_x, p_end_y,
-																			l_info->m_event_mgr);
-
-	}
-	return OPJ_FALSE;
-}
-
-/**
- * Reads a tile header. This function is compulsory and allows one to know the size of the tile thta will be decoded.
- * The user may need to refer to the image got by opj_read_header to understand the size being taken by the tile.
- *
- * @param	p_codec			the jpeg2000 codec.
- * @param	p_tile_index	pointer to a value that will hold the index of the tile being decoded, in case of success.
- * @param	p_data_size		pointer to a value that will hold the maximum size of the decoded data, in case of success. In case
- *							of truncated codestreams, the actual number of bytes decoded may be lower. The computation of the size is the same
- *							as depicted in opj_write_tile.
- * @param	p_tile_x0		pointer to a value that will hold the x0 pos of the tile (in the image).
- * @param	p_tile_y0		pointer to a value that will hold the y0 pos of the tile (in the image).
- * @param	p_tile_x1		pointer to a value that will hold the x1 pos of the tile (in the image).
- * @param	p_tile_y1		pointer to a value that will hold the y1 pos of the tile (in the image).
- * @param	p_nb_comps		pointer to a value that will hold the number of components in the tile.
- * @param	p_should_go_on	pointer to a boolean that will hold the fact that the decoding should go on. In case the
- *							codestream is over at the time of the call, the value will be set to false. The user should then stop
- *							the decoding.
- * @param	p_stream		the stream to decode.
- * @return	true			if the tile header could be decoded. In case the decoding should end, the returned value is still true.
- *							returning false may be the result of a shortage of memory or an internal error.
- */
-opj_bool OPJ_CALLCONV opj_read_tile_header(
-					opj_codec_t *p_codec,
-					opj_stream_t * p_stream,
-					OPJ_UINT32 * p_tile_index,
-					OPJ_UINT32 * p_data_size,
-					OPJ_INT32 * p_tile_x0, OPJ_INT32 * p_tile_y0,
-					OPJ_INT32 * p_tile_x1, OPJ_INT32 * p_tile_y1,
-					OPJ_UINT32 * p_nb_comps,
-					opj_bool * p_should_go_on)
-{
-	if (p_codec && p_stream && p_data_size && p_tile_index) {
-		opj_codec_private_t * l_info = (opj_codec_private_t *) p_codec;
-		opj_stream_private_t * l_cio = (opj_stream_private_t *) p_stream;
-
-		if (! l_info->is_decompressor) {
-			return OPJ_FALSE;
-		}
-
-		return l_info->m_codec_data.m_decompression.opj_read_tile_header(
-			l_info->m_codec,
-			p_tile_index,
-			p_data_size,
-			p_tile_x0, p_tile_y0,
-			p_tile_x1, p_tile_y1,
-			p_nb_comps,
-			p_should_go_on,
-			l_cio,
-			l_info->m_event_mgr);
-	}
-	return OPJ_FALSE;
-}
-
-/**
- * Reads a tile data. This function is compulsory and allows one to decode tile data. opj_read_tile_header should be called before.
- * The user may need to refer to the image got by opj_read_header to understand the size being taken by the tile.
- *
- * @param	p_codec			the jpeg2000 codec.
- * @param	p_tile_index	the index of the tile being decoded, this should be the value set by opj_read_tile_header.
- * @param	p_data			pointer to a memory block that will hold the decoded data.
- * @param	p_data_size		size of p_data. p_data_size should be bigger or equal to the value set by opj_read_tile_header.
- * @param	p_stream		the stream to decode.
- *
- * @return	true			if the data could be decoded.
- */
-opj_bool OPJ_CALLCONV opj_decode_tile_data(
-					opj_codec_t *p_codec,
-					OPJ_UINT32 p_tile_index,
-					OPJ_BYTE * p_data,
-					OPJ_UINT32 p_data_size,
-					opj_stream_t *p_stream
-					)
-{
-	if (p_codec && p_data && p_stream) {
-		opj_codec_private_t * l_info = (opj_codec_private_t *) p_codec;
-		opj_stream_private_t * l_cio = (opj_stream_private_t *) p_stream;
-
-		if (! l_info->is_decompressor) {
-			return OPJ_FALSE;
-		}
-
-		return l_info->m_codec_data.m_decompression.opj_decode_tile_data(	l_info->m_codec,
-																			p_tile_index,
-																			p_data,
-																			p_data_size,
-																			l_cio,
-																			l_info->m_event_mgr);
-	}
-	return OPJ_FALSE;
-}
-
-/*
- *
- *
- */
-void OPJ_CALLCONV opj_dump_codec(	opj_codec_t *p_codec,
-									OPJ_INT32 info_flag,
-									FILE* output_stream)
-{
-	if (p_codec) {
-		opj_codec_private_t* l_codec = (opj_codec_private_t*) p_codec;
-
-		l_codec->opj_dump_codec(l_codec->m_codec, info_flag, output_stream);
-		return;
-	}
-
-	fprintf(stderr, "[ERROR] Input parameter of the dump_codec function are incorrect.\n");
-	return;
-}
-
-/*
- *
- *
- */
-opj_codestream_info_v2_t* OPJ_CALLCONV opj_get_cstr_info(opj_codec_t *p_codec)
-{
-	if (p_codec) {
-		opj_codec_private_t* l_codec = (opj_codec_private_t*) p_codec;
-
-		return l_codec->opj_get_codec_info(l_codec->m_codec);
-	}
-
-	return NULL;
-}
-
-/*
- *
- *
- */
-void OPJ_CALLCONV opj_destroy_cstr_info_v2(opj_codestream_info_v2_t **cstr_info) {
-	if (cstr_info) {
-
-		if ((*cstr_info)->m_default_tile_info.tccp_info){
-			opj_free((*cstr_info)->m_default_tile_info.tccp_info);
-		}
-
-		if ((*cstr_info)->tile_info){
-			/* FIXME not used for the moment*/
-		}
-
-		opj_free((*cstr_info));
-		(*cstr_info) = NULL;
-	}
-}
-
-/*
- *
- *
- */
-opj_codestream_index_t * OPJ_CALLCONV opj_get_cstr_index(opj_codec_t *p_codec)
-{
-	if (p_codec) {
-		opj_codec_private_t* l_codec = (opj_codec_private_t*) p_codec;
-
-		return l_codec->opj_get_codec_index(l_codec->m_codec);
-	}
-
-	return NULL;
-}
-
-/*
- *
- *
- */
-void OPJ_CALLCONV opj_destroy_cstr_index(opj_codestream_index_t **p_cstr_index)
-{
-	if (*p_cstr_index){
-
-		j2k_destroy_cstr_index(*p_cstr_index);
-		(*p_cstr_index) = NULL;
-	}
-}
-
-
-opj_bool OPJ_CALLCONV opj_decode_v2(opj_codec_t *p_info,
-									opj_stream_t *cio,
-									opj_image_t* p_image)
-{
-	if (p_info && cio) {
-		opj_codec_private_t * l_info = (opj_codec_private_t *) p_info;
-		opj_stream_private_t * l_cio = (opj_stream_private_t *) cio;
-
-		if (! l_info->is_decompressor) {
-			return OPJ_FALSE;
-		}
-
-		return l_info->m_codec_data.m_decompression.opj_decode(	l_info->m_codec,
-																l_cio,
-																p_image,
-																l_info->m_event_mgr);
-	}
-
-	return OPJ_FALSE;
-}
-
-/*
- *
- *
- */
-opj_bool OPJ_CALLCONV opj_end_decompress (opj_codec_t *p_codec,opj_stream_t *p_cio)
-{
-	if (p_codec && p_cio) {
-		opj_codec_private_t * l_info = (opj_codec_private_t *) p_codec;
-		opj_stream_private_t * l_cio = (opj_stream_private_t *) p_cio;
-
-		if (! l_info->is_decompressor) {
-			return OPJ_FALSE;
-		}
-		return l_info->m_codec_data.m_decompression.opj_end_decompress(	l_info->m_codec,
-																		l_cio,
-																		l_info->m_event_mgr);
-	}
-
-	return OPJ_FALSE;
-}
-
-/*
- *
- *
- */
-opj_bool OPJ_CALLCONV opj_get_decoded_tile(	opj_codec_t *p_codec,
-											opj_stream_t *p_cio,
-											opj_image_t *p_image,
-											OPJ_UINT32 tile_index)
-{
-	if (p_codec && p_cio) {
-		opj_codec_private_t * l_codec = (opj_codec_private_t *) p_codec;
-		opj_stream_private_t * l_stream = (opj_stream_private_t *) p_cio;
-
-	if (! l_codec->is_decompressor) {
-		return OPJ_FALSE;
-		}
-		return l_codec->m_codec_data.m_decompression.opj_get_decoded_tile(	l_codec->m_codec,
-																			l_stream,
-																			p_image,
-																			l_codec->m_event_mgr,
-																			tile_index);
-	}
-
-	return OPJ_FALSE;
-}
-
-/*
- *
- *
- */
-opj_bool OPJ_CALLCONV opj_set_decoded_resolution_factor(opj_codec_t *p_codec, OPJ_UINT32 res_factor)
-{
-	opj_codec_private_t * l_codec = (opj_codec_private_t *) p_codec;
-
-	if ( !l_codec ){
-		fprintf(stderr, "[ERROR] Input parameters of the setup_decoder function are incorrect.\n");
-		return OPJ_FALSE;
-	}
-
-
-	l_codec->m_codec_data.m_decompression.opj_set_decoded_resolution_factor(l_codec->m_codec, res_factor, l_codec->m_event_mgr);
-
-	return OPJ_TRUE;
-}
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/openjpeg.h b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/openjpeg.h
deleted file mode 100644
index 82263d8d0dbd28521519bf4c2abc503e72df4599..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/openjpeg.h
+++ /dev/null
@@ -1,1539 +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
- * Copyright (c) 2006-2007, Parvatha Elangovan
- * Copyright (c) 2008, Jerome Fimes, Communications & Systemes <jerome.fimes@c-s.fr>
- * Copyright (c) 2010-2011, Kaori Hagihara
- * Copyright (c) 2011, Mickael Savinaud, Communications & Systemes <mickael.savinaud@c-s.fr>
- * 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 OPENJPEG_H
-#define OPENJPEG_H
-
-#include "openjpeg_mangle.h"
-
-/* 
-==========================================================
-   Compiler directives
-==========================================================
-*/
-
-/* deprecated attribute */
-#ifdef __GNUC__
-	#define DEPRECATED(func) func __attribute__ ((deprecated))
-#elif defined(_MSC_VER)
-	#define DEPRECATED(func) __declspec(deprecated) func
-#else
-	#pragma message("WARNING: You need to implement DEPRECATED for this compiler")
-	#define DEPRECATED(func) func
-#endif
-
-#if defined(OPJ_STATIC) || !defined(_WIN32)
-#define OPJ_API
-#define OPJ_CALLCONV
-#else
-#define OPJ_CALLCONV __stdcall
-/*
-The following ifdef block is the standard way of creating macros which make exporting 
-from a DLL simpler. All files within this DLL are compiled with the OPJ_EXPORTS
-symbol defined on the command line. this symbol should not be defined on any project
-that uses this DLL. This way any other project whose source files include this file see 
-OPJ_API functions as being imported from a DLL, wheras this DLL sees symbols
-defined with this macro as being exported.
-*/
-#if defined(OPJ_EXPORTS) || defined(DLL_EXPORT)
-#define OPJ_API __declspec(dllexport)
-#else
-#define OPJ_API __declspec(dllimport)
-#endif /* OPJ_EXPORTS */
-#endif /* !OPJ_STATIC || !_WIN32 */
-
-typedef int opj_bool; /*FIXME it should be to follow the name of others OPJ_TYPE -> OPJ_BOOL*/
-#define OPJ_TRUE 1
-#define OPJ_FALSE 0
-
-/* FIXME : should be better defined by configure/CMake test */
-typedef unsigned int	OPJ_UINT32;
-typedef int				OPJ_INT32;
-typedef unsigned short	OPJ_UINT16;
-typedef short			OPJ_INT16;
-typedef char			OPJ_CHAR;
-typedef unsigned char	OPJ_BYTE;
-typedef unsigned int	OPJ_SIZE_T;
-typedef double			OPJ_FLOAT64;
-typedef float			OPJ_FLOAT32;
-
-#if (defined(WIN32) || defined(WIN64)) && !defined(__MINGW32__)
-
-typedef signed __int64     OPJ_INT64;
-#define OPJ_INT64_F "I64"
-typedef unsigned __int64   OPJ_UINT64;
-#define OPJ_UINT64_F "I64"
-
-#else
-
-typedef long long          OPJ_INT64;
-#define OPJ_INT64_F "ll"
-
-typedef unsigned long long OPJ_UINT64;
-#define OPJ_UINT64_F "ll"
-
-#endif
-
-/* 64-bit file offset type */
-typedef OPJ_INT64 OPJ_OFF_T;
-#define OPJ_OFF_F OPJ_INT64_F
-
-/* Avoid compile-time warning because parameter is not used */
-#define OPJ_ARG_NOT_USED(x) (void)(x)
-
-/* 
-==========================================================
-   Useful constant definitions
-==========================================================
-*/
-
-#define OPJ_PATH_LEN 4096 /**< Maximum allowed size for filenames */
-
-#define J2K_MAXRLVLS 33					/**< Number of maximum resolution level authorized */
-#define J2K_MAXBANDS (3*J2K_MAXRLVLS-2)	/**< Number of maximum sub-band linked to number of resolution level */
-
-#define J2K_DEFAULT_NB_SEGS				10
-#define J2K_STREAM_CHUNK_SIZE			0x100000 /** 1 mega by default */
-#define J2K_DEFAULT_HEADER_SIZE			1000
-#define J2K_MCC_DEFAULT_NB_RECORDS		10
-#define J2K_MCT_DEFAULT_NB_RECORDS		10
-
-/* UniPG>> */
-#define JPWL_MAX_NO_TILESPECS	16 /**< Maximum number of tile parts expected by JPWL: increase at your will */
-#define JPWL_MAX_NO_PACKSPECS	16 /**< Maximum number of packet parts expected by JPWL: increase at your will */
-#define JPWL_MAX_NO_MARKERS	512 /**< Maximum number of JPWL markers: increase at your will */
-#define JPWL_PRIVATEINDEX_NAME "jpwl_index_privatefilename" /**< index file name used when JPWL is on */
-#define JPWL_EXPECTED_COMPONENTS 3 /**< Expect this number of components, so you'll find better the first EPB */
-#define JPWL_MAXIMUM_TILES 8192 /**< Expect this maximum number of tiles, to avoid some crashes */
-#define JPWL_MAXIMUM_HAMMING 2 /**< Expect this maximum number of bit errors in marker id's */
-#define JPWL_MAXIMUM_EPB_ROOM 65450 /**< Expect this maximum number of bytes for composition of EPBs */
-/* <<UniPG */
-
-/**
- * FIXME EXPERIMENTAL FOR THE MOMENT
- * Supported options about file information
-*/
-#define OPJ_IMG_INFO		1	/**< Basic image information provided to the user */
-#define OPJ_J2K_MH_INFO		2	/**< Codestream information based only on the main header */
-#define OPJ_J2K_TH_INFO		4	/**< Tile information based on the current tile header */
-/*FIXME #define OPJ_J2K_CSTR_INFO	6*/	/**<  */
-#define OPJ_J2K_MH_IND		16	/**< Codestream index based only on the main header */
-#define OPJ_J2K_TH_IND		32	/**< Tile index based on the current tile */
-/*FIXME #define OPJ_J2K_CSTR_IND	48*/	/**<  */
-#define OPJ_JP2_INFO		128	/**< JP2 file information */
-#define OPJ_JP2_IND			256	/**< JP2 file index */
-
-
-/* 
-==========================================================
-   enum definitions
-==========================================================
-*/
-/** 
- * Rsiz Capabilities
- * */
-typedef enum RSIZ_CAPABILITIES {
-	STD_RSIZ = 0,		/** Standard JPEG2000 profile*/
-	CINEMA2K = 3,		/** Profile name for a 2K image*/
-	CINEMA4K = 4		/** Profile name for a 4K image*/
-} OPJ_RSIZ_CAPABILITIES;
-
-/** 
- * Digital cinema operation mode
- * */
-typedef enum CINEMA_MODE {
-	OFF = 0,			/** Not Digital Cinema*/
-	CINEMA2K_24 = 1,	/** 2K Digital Cinema at 24 fps*/
-	CINEMA2K_48 = 2,	/** 2K Digital Cinema at 48 fps*/
-	CINEMA4K_24 = 3		/** 4K Digital Cinema at 24 fps*/
-}OPJ_CINEMA_MODE;
-
-/** 
- * Progression order
- * */
-typedef enum PROG_ORDER {
-	PROG_UNKNOWN = -1,	/**< place-holder */
-	LRCP = 0,			/**< layer-resolution-component-precinct order */
-	RLCP = 1,			/**< resolution-layer-component-precinct order */
-	RPCL = 2,			/**< resolution-precinct-component-layer order */
-	PCRL = 3,			/**< precinct-component-resolution-layer order */
-	CPRL = 4			/**< component-precinct-resolution-layer order */
-} OPJ_PROG_ORDER;
-
-/**
- * Supported image color spaces
-*/
-typedef enum COLOR_SPACE {
-	CLRSPC_UNKNOWN = -1,	/**< not supported by the library */
-	CLRSPC_UNSPECIFIED = 0, /**< not specified in the codestream */ 
-	CLRSPC_SRGB = 1,		/**< sRGB */
-	CLRSPC_GRAY = 2,		/**< grayscale */
-	CLRSPC_SYCC = 3			/**< YUV */
-} OPJ_COLOR_SPACE;
-
-/**
- * Supported codec
-*/
-typedef enum CODEC_FORMAT {
-	CODEC_UNKNOWN = -1,	/**< place-holder */
-	CODEC_J2K  = 0,		/**< JPEG-2000 codestream : read/write */
-	CODEC_JPT  = 1,		/**< JPT-stream (JPEG 2000, JPIP) : read only */
-	CODEC_JP2  = 2,		/**< JPEG-2000 file format : read/write */
-} OPJ_CODEC_FORMAT;
-
-/** 
- * Limit decoding to certain portions of the codestream.
-*/
-typedef enum LIMIT_DECODING {
-	NO_LIMITATION = 0,				/**< No limitation for the decoding. The entire codestream will de decoded */
-	LIMIT_TO_MAIN_HEADER = 1,		/**< The decoding is limited to the Main Header */
-	DECODE_ALL_BUT_PACKETS = 2		/**< Decode everything except the JPEG 2000 packets */
-} OPJ_LIMIT_DECODING;
-
-
-/* 
-==========================================================
-   event manager typedef definitions
-==========================================================
-*/
-
-/**
- * Callback function prototype for events
- * @param msg Event message
- * @param client_data
- * */
-typedef void (*opj_msg_callback) (const char *msg, void *client_data);
-
-/**
- * Message handler object used for
- * <ul>
- * <li>Error messages
- * <li>Warning messages
- * <li>Debugging messages
- * </ul>
- * */
-typedef struct opj_event_mgr {
-	/** FIXME DOC */
-	void* client_data;
-	/** Error message callback if available, NULL otherwise */
-	opj_msg_callback error_handler;
-	/** Warning message callback if available, NULL otherwise */
-	opj_msg_callback warning_handler;
-	/** Debug message callback if available, NULL otherwise */
-	opj_msg_callback info_handler;
-} opj_event_mgr_t;
-
-
-/* 
-==========================================================
-   codec typedef definitions
-==========================================================
-*/
-
-/**
- * Progression order changes
- * */
-typedef struct opj_poc {
-	/** Resolution num start, Component num start, given by POC */
-	OPJ_UINT32 resno0, compno0;
-	/** Layer num end,Resolution num end, Component num end, given by POC */
-	OPJ_UINT32 layno1, resno1, compno1;
-	/** Layer num start,Precinct num start, Precinct num end */
-	int layno0, precno0, precno1;
-	/** Progression order enum*/
-	OPJ_PROG_ORDER prg1,prg;
-	/** Progression order string*/
-	char progorder[5];
-	/** Tile number */
-	int tile;
-	/** Start and end values for Tile width and height*/
-	int tx0,tx1,ty0,ty1;
-	/** Start value, initialised in pi_initialise_encode*/
-	int layS, resS, compS, prcS;
-	/** End value, initialised in pi_initialise_encode */
-	int layE, resE, compE, prcE;
-	/** Start and end values of Tile width and height, initialised in pi_initialise_encode*/
-	int txS,txE,tyS,tyE,dx,dy;
-	/** Temporary values for Tile parts, initialised in pi_create_encode */
-	int lay_t, res_t, comp_t, prc_t,tx0_t,ty0_t;
-} opj_poc_t;
-
-/**
- * Compression parameters
- * */
-typedef struct opj_cparameters {
-	/** size of tile: tile_size_on = false (not in argument) or = true (in argument) */
-	opj_bool tile_size_on;
-	/** XTOsiz */
-	int cp_tx0;
-	/** YTOsiz */
-	int cp_ty0;
-	/** XTsiz */
-	int cp_tdx;
-	/** YTsiz */
-	int cp_tdy;
-	/** allocation by rate/distortion */
-	int cp_disto_alloc;
-	/** allocation by fixed layer */
-	int cp_fixed_alloc;
-	/** add fixed_quality */
-	int cp_fixed_quality;
-	/** fixed layer */
-	int *cp_matrice;
-	/** comment for coding */
-	char *cp_comment;
-	/** csty : coding style */
-	int csty;
-	/** progression order (default LRCP) */
-	OPJ_PROG_ORDER prog_order;
-	/** progression order changes */
-	opj_poc_t POC[32];
-	/** number of progression order changes (POC), default to 0 */
-	int numpocs;
-	/** number of layers */
-	int tcp_numlayers;
-	/** rates of layers */
-	float tcp_rates[100];
-	/** different psnr for successive layers */
-	float tcp_distoratio[100];
-	/** number of resolutions */
-	int numresolution;
-	/** initial code block width, default to 64 */
- 	int cblockw_init;
-	/** initial code block height, default to 64 */
-	int cblockh_init;
-	/** mode switch (cblk_style) */
-	int mode;
-	/** 1 : use the irreversible DWT 9-7, 0 : use lossless compression (default) */
-	int irreversible;
-	/** region of interest: affected component in [0..3], -1 means no ROI */
-	int roi_compno;
-	/** region of interest: upshift value */
-	int roi_shift;
-	/* number of precinct size specifications */
-	int res_spec;
-	/** initial precinct width */
-	int prcw_init[J2K_MAXRLVLS];
-	/** initial precinct height */
-	int prch_init[J2K_MAXRLVLS];
-
-	/**@name command line encoder parameters (not used inside the library) */
-	/*@{*/
-	/** input file name */
-	char infile[OPJ_PATH_LEN];
-	/** output file name */
-	char outfile[OPJ_PATH_LEN];
-	/** DEPRECATED. Index generation is now handeld with the opj_encode_with_info() function. Set to NULL */
-	int index_on;
-	/** DEPRECATED. Index generation is now handeld with the opj_encode_with_info() function. Set to NULL */
-	char index[OPJ_PATH_LEN];
-	/** subimage encoding: origin image offset in x direction */
-	int image_offset_x0;
-	/** subimage encoding: origin image offset in y direction */
-	int image_offset_y0;
-	/** subsampling value for dx */
-	int subsampling_dx;
-	/** subsampling value for dy */
-	int subsampling_dy;
-	/** input file format 0: PGX, 1: PxM, 2: BMP 3:TIF*/
-	int decod_format;
-	/** output file format 0: J2K, 1: JP2, 2: JPT */
-	int cod_format;
-	/*@}*/
-
-/* UniPG>> */
-	/**@name JPWL encoding parameters */
-	/*@{*/
-	/** enables writing of EPC in MH, thus activating JPWL */
-	opj_bool jpwl_epc_on;
-	/** error protection method for MH (0,1,16,32,37-128) */
-	int jpwl_hprot_MH;
-	/** tile number of header protection specification (>=0) */
-	int jpwl_hprot_TPH_tileno[JPWL_MAX_NO_TILESPECS];
-	/** error protection methods for TPHs (0,1,16,32,37-128) */
-	int jpwl_hprot_TPH[JPWL_MAX_NO_TILESPECS];
-	/** tile number of packet protection specification (>=0) */
-	int jpwl_pprot_tileno[JPWL_MAX_NO_PACKSPECS];
-	/** packet number of packet protection specification (>=0) */
-	int jpwl_pprot_packno[JPWL_MAX_NO_PACKSPECS];
-	/** error protection methods for packets (0,1,16,32,37-128) */
-	int jpwl_pprot[JPWL_MAX_NO_PACKSPECS];
-	/** enables writing of ESD, (0=no/1/2 bytes) */
-	int jpwl_sens_size;
-	/** sensitivity addressing size (0=auto/2/4 bytes) */
-	int jpwl_sens_addr;
-	/** sensitivity range (0-3) */
-	int jpwl_sens_range;
-	/** sensitivity method for MH (-1=no,0-7) */
-	int jpwl_sens_MH;
-	/** tile number of sensitivity specification (>=0) */
-	int jpwl_sens_TPH_tileno[JPWL_MAX_NO_TILESPECS];
-	/** sensitivity methods for TPHs (-1=no,0-7) */
-	int jpwl_sens_TPH[JPWL_MAX_NO_TILESPECS];
-	/*@}*/
-/* <<UniPG */
-
-	/** Digital Cinema compliance 0-not compliant, 1-compliant*/
-	OPJ_CINEMA_MODE cp_cinema;
-	/** Maximum rate for each component. If == 0, component size limitation is not considered */
-	int max_comp_size;
-	/** Profile name*/
-	OPJ_RSIZ_CAPABILITIES cp_rsiz;
-	/** Tile part generation*/
-	char tp_on;
-	/** Flag for Tile part generation*/
-	char tp_flag;
-	/** MCT (multiple component transform) */
-	char tcp_mct;
-	/** Enable JPIP indexing*/
-	opj_bool jpip_on;
-} opj_cparameters_t;
-
-/**
- * Decompression parameters
- * */
-typedef struct opj_dparameters {
-	/** 
-	Set the number of highest resolution levels to be discarded. 
-	The image resolution is effectively divided by 2 to the power of the number of discarded levels. 
-	The reduce factor is limited by the smallest total number of decomposition levels among tiles.
-	if != 0, then original dimension divided by 2^(reduce); 
-	if == 0 or not used, image is decoded to the full resolution 
-	*/
-	int cp_reduce;
-	/** 
-	Set the maximum number of quality layers to decode. 
-	If there are less quality layers than the specified number, all the quality layers are decoded.
-	if != 0, then only the first "layer" layers are decoded; 
-	if == 0 or not used, all the quality layers are decoded 
-	*/
-	int cp_layer;
-
-	/**@name command line decoder parameters (not used inside the library) */
-	/*@{*/
-	/** input file name */
-	char infile[OPJ_PATH_LEN];
-	/** output file name */
-	char outfile[OPJ_PATH_LEN];
-	/** input file format 0: J2K, 1: JP2, 2: JPT */
-	int decod_format;
-	/** output file format 0: PGX, 1: PxM, 2: BMP */
-	int cod_format;
-
-	/** Decoding area left boundary */
-	OPJ_UINT32 DA_x0;
-	/** Decoding area right boundary */
-	OPJ_UINT32 DA_x1;
-	/** Decoding area up boundary */
-	OPJ_UINT32 DA_y0;
-	/** Decoding area bottom boundary */
-	OPJ_UINT32 DA_y1;
-	/** Verbose mode */
-	opj_bool m_verbose;
-
-	/** tile number ot the decoded tile*/
-	OPJ_UINT32 tile_index;
-	/** Nb of tile to decode */
-	OPJ_UINT32 nb_tile_to_decode;
-
-	/*@}*/
-
-/* UniPG>> */
-	/**@name JPWL decoding parameters */
-	/*@{*/
-	/** activates the JPWL correction capabilities */
-	opj_bool jpwl_correct;
-	/** expected number of components */
-	int jpwl_exp_comps;
-	/** maximum number of tiles */
-	int jpwl_max_tiles;
-	/*@}*/
-/* <<UniPG */
-
-	/** 
-	Specify whether the decoding should be done on the entire codestream, or be limited to the main header
-	Limiting the decoding to the main header makes it possible to extract the characteristics of the codestream
-	if == NO_LIMITATION, the entire codestream is decoded; 
-	if == LIMIT_TO_MAIN_HEADER, only the main header is decoded; 
-	*/
-	OPJ_LIMIT_DECODING cp_limit_decoding;
-
-} opj_dparameters_t;
-
-
-/* ---> FIXME V1 style */
-/** Common fields between JPEG-2000 compression and decompression master structs. */
-
-#define opj_common_fields \
-	opj_event_mgr_t *event_mgr;	/**< pointer to the event manager */\
-	void * client_data;			/**< Available for use by application */\
-	opj_bool is_decompressor;	/**< So common code can tell which is which */\
-	OPJ_CODEC_FORMAT codec_format;	/**< selected codec */\
-	void *j2k_handle;			/**< pointer to the J2K codec */\
-	void *jp2_handle;			/**< pointer to the JP2 codec */\
-	void *mj2_handle			/**< pointer to the MJ2 codec */
-	
-/* Routines that are to be used by both halves of the library are declared
- * to receive a pointer to this structure.  There are no actual instances of
- * opj_common_struct_t, only of opj_cinfo_t and opj_dinfo_t.
- */
-typedef struct opj_common_struct {
-  opj_common_fields;		/* Fields common to both master struct types */
-  /* Additional fields follow in an actual opj_cinfo_t or
-   * opj_dinfo_t.  All three structs must agree on these
-   * initial fields!  (This would be a lot cleaner in C++.)
-   */
-} opj_common_struct_t;
-
-typedef opj_common_struct_t * opj_common_ptr;
-
-/**
- * Compression context info
- * */
-typedef struct opj_cinfo {
-	/** Fields shared with opj_dinfo_t */
-	opj_common_fields;	
-	/* other specific fields go here */
-} opj_cinfo_t;
-
-/**
- * Decompression context info
- * */
-typedef struct opj_dinfo {
-	/** Fields shared with opj_cinfo_t */
-	opj_common_fields;	
-	/* other specific fields go here */
-} opj_dinfo_t;
-
-/* <--- V1 style */
-
-/**
- * JPEG2000 codec V2.
- * */
-typedef void * opj_codec_t;
-
-/* 
-==========================================================
-   I/O stream typedef definitions
-==========================================================
-*/
-
-/*
- * Stream open flags.
- */
-/** The stream was opened for reading. */
-#define OPJ_STREAM_READ	0x0001
-/** The stream was opened for writing. */
-#define OPJ_STREAM_WRITE 0x0002
-
-/**
-Byte input-output stream (CIO)
-*/
-typedef struct opj_cio {
-	/** codec context */
-	opj_common_ptr cinfo;
-
-	/** open mode (read/write) either OPJ_STREAM_READ or OPJ_STREAM_WRITE */
-	int openmode;
-	/** pointer to the start of the buffer */
-	unsigned char *buffer;
-	/** buffer size in bytes */
-	int length;
-
-	/** pointer to the start of the stream */
-	unsigned char *start;
-	/** pointer to the end of the stream */
-	unsigned char *end;
-	/** pointer to the current position */
-	unsigned char *bp;
-} opj_cio_t;
-
-
-/*
- * FIXME DOC
- */
-typedef OPJ_SIZE_T (* opj_stream_read_fn) (void * p_buffer, OPJ_SIZE_T p_nb_bytes, void * p_user_data) ;
-typedef OPJ_SIZE_T (* opj_stream_write_fn) (void * p_buffer, OPJ_SIZE_T p_nb_bytes, void * p_user_data) ;
-typedef OPJ_OFF_T (* opj_stream_skip_fn) (OPJ_OFF_T p_nb_bytes, void * p_user_data) ;
-typedef opj_bool (* opj_stream_seek_fn) (OPJ_OFF_T p_nb_bytes, void * p_user_data) ;
-
-/*
- * JPEG2000 Stream.
- */
-typedef void * opj_stream_t;
-
-/* 
-==========================================================
-   image typedef definitions
-==========================================================
-*/
-
-/**
- * Defines a single image component
- * */
-typedef struct opj_image_comp {
-	/** XRsiz: horizontal separation of a sample of ith component with respect to the reference grid */
-	OPJ_UINT32 dx;
-	/** YRsiz: vertical separation of a sample of ith component with respect to the reference grid */
-	OPJ_UINT32 dy;
-	/** data width */
-	OPJ_UINT32 w;
-	/** data height */
-	OPJ_UINT32 h;
-	/** x component offset compared to the whole image */
-	OPJ_UINT32 x0;
-	/** y component offset compared to the whole image */
-	OPJ_UINT32 y0;
-	/** precision */
-	OPJ_UINT32 prec;
-	/** image depth in bits */
-	OPJ_UINT32 bpp;
-	/** signed (1) / unsigned (0) */
-	OPJ_UINT32 sgnd;
-	/** number of decoded resolution */
-	OPJ_UINT32 resno_decoded;
-	/** number of division by 2 of the out image compared to the original size of image */
-	OPJ_UINT32 factor;
-	/** image component data */
-	OPJ_INT32 *data;
-} opj_image_comp_t;
-
-/** 
- * Defines image data and characteristics
- * */
-typedef struct opj_image {
-	/** XOsiz: horizontal offset from the origin of the reference grid to the left side of the image area */
-	OPJ_UINT32 x0;
-	/** YOsiz: vertical offset from the origin of the reference grid to the top side of the image area */
-	OPJ_UINT32 y0;
-	/** Xsiz: width of the reference grid */
-	OPJ_UINT32 x1;
-	/** Ysiz: height of the reference grid */
-	OPJ_UINT32 y1;
-	/** number of components in the image */
-	OPJ_UINT32 numcomps;
-	/** color space: sRGB, Greyscale or YUV */
-	OPJ_COLOR_SPACE color_space;
-	/** image components */
-	opj_image_comp_t *comps;
-	/** 'restricted' ICC profile */
-	OPJ_BYTE *icc_profile_buf;
-	/** size of ICC profile */
-	OPJ_INT32 icc_profile_len;
-} opj_image_t;
-
-
-/**
- * Component parameters structure used by the opj_image_create function
- * */
-typedef struct opj_image_comptparm {
-	/** XRsiz: horizontal separation of a sample of ith component with respect to the reference grid */
-	int dx;
-	/** YRsiz: vertical separation of a sample of ith component with respect to the reference grid */
-	int dy;
-	/** data width */
-	int w;
-	/** data height */
-	int h;
-	/** x component offset compared to the whole image */
-	int x0;
-	/** y component offset compared to the whole image */
-	int y0;
-	/** precision */
-	int prec;
-	/** image depth in bits */
-	int bpp;
-	/** signed (1) / unsigned (0) */
-	int sgnd;
-} opj_image_cmptparm_t;
-
-
-/* 
-==========================================================
-   Information on the JPEG 2000 codestream
-==========================================================
-*/
-
-/**
- * Index structure : Information concerning a packet inside tile
- * */
-typedef struct opj_packet_info {
-	/** packet start position (including SOP marker if it exists) */
-	OPJ_OFF_T start_pos;
-	/** end of packet header position (including EPH marker if it exists)*/
-	OPJ_OFF_T end_ph_pos;
-	/** packet end position */
-	OPJ_OFF_T end_pos;
-	/** packet distorsion */
-	double disto;
-} opj_packet_info_t;
-
-
-/* UniPG>> */
-/**
- * Marker structure
- * */
-typedef struct opj_marker_info_t {
-	/** marker type */
-	unsigned short int type;
-	/** position in codestream */
-	OPJ_OFF_T pos;
-	/** length, marker val included */
-	int len;
-} opj_marker_info_t;
-/* <<UniPG */
-
-/**
- * Index structure : Information concerning tile-parts
-*/
-typedef struct opj_tp_info {
-	/** start position of tile part */
-	int tp_start_pos;
-	/** end position of tile part header */
-	int tp_end_header;
-	/** end position of tile part */
-	int tp_end_pos;
-	/** start packet of tile part */
-	int tp_start_pack;
-	/** number of packets of tile part */
-	int tp_numpacks;
-} opj_tp_info_t;
-
-/**
- * Index structure : information regarding tiles
-*/
-typedef struct opj_tile_info {
-	/** value of thresh for each layer by tile cfr. Marcela   */
-	double *thresh;
-	/** number of tile */
-	int tileno;
-	/** start position */
-	int start_pos;
-	/** end position of the header */
-	int end_header;
-	/** end position */
-	int end_pos;
-	/** precinct number for each resolution level (width) */
-	int pw[33];
-	/** precinct number for each resolution level (height) */
-	int ph[33];
-	/** precinct size (in power of 2), in X for each resolution level */
-	int pdx[33];
-	/** precinct size (in power of 2), in Y for each resolution level */
-	int pdy[33];
-	/** information concerning packets inside tile */
-	opj_packet_info_t *packet;
-	/** add fixed_quality */
-	int numpix;
-	/** add fixed_quality */
-	double distotile;
-  	/** number of markers */
-	int marknum;
-	/** list of markers */
-	opj_marker_info_t *marker;
-	/** actual size of markers array */
-	int maxmarknum;
-	/** number of tile parts */
-	int num_tps;
-	/** information concerning tile parts */
-	opj_tp_info_t *tp;
-} opj_tile_info_t;
-
-/**
- * Index structure of the codestream
-*/
-typedef struct opj_codestream_info {
-	/** maximum distortion reduction on the whole image (add for Marcela) */
-	double D_max;
-	/** packet number */
-	int packno;
-	/** writing the packet in the index with t2_encode_packets */
-	int index_write;
-	/** image width */
-	int image_w;
-	/** image height */
-	int image_h;
-	/** progression order */
-	OPJ_PROG_ORDER prog;
-	/** tile size in x */
-	int tile_x;
-	/** tile size in y */
-	int tile_y;
-	/** */
-	int tile_Ox;
-	/** */
-	int tile_Oy;
-	/** number of tiles in X */
-	int tw;
-	/** number of tiles in Y */
-	int th;
-	/** component numbers */
-	int numcomps;
-	/** number of layer */
-	int numlayers;
-	/** number of decomposition for each component */
-	int *numdecompos;
-/* UniPG>> */
-	/** number of markers */
-	int marknum;
-	/** list of markers */
-	opj_marker_info_t *marker;
-	/** actual size of markers array */
-	int maxmarknum;
-/* <<UniPG */
-	/** main header position */
-	int main_head_start;
-	/** main header position */
-	int main_head_end;
-	/** codestream's size */
-	int codestream_size;
-	/** information regarding tiles inside image */
-	opj_tile_info_t *tile;
-} opj_codestream_info_t;
-
-/* <----------------------------------------------------------- */
-/* new output managment of the codestream information and index */
-
-/**
- * Tile-component coding parameters information
- */
-typedef struct opj_tccp_info
-{
-	/** component index */
-	OPJ_UINT32 compno;
-	/** coding style */
-	OPJ_UINT32 csty;
-	/** number of resolutions */
-	OPJ_UINT32 numresolutions;
-	/** code-blocks width */
-	OPJ_UINT32 cblkw;
-	/** code-blocks height */
-	OPJ_UINT32 cblkh;
-	/** code-block coding style */
-	OPJ_UINT32 cblksty;
-	/** discrete wavelet transform identifier */
-	OPJ_UINT32 qmfbid;
-	/** quantisation style */
-	OPJ_UINT32 qntsty;
-	/** stepsizes used for quantization */
-	OPJ_UINT32 stepsizes_mant[J2K_MAXBANDS];
-	/** stepsizes used for quantization */
-	OPJ_UINT32 stepsizes_expn[J2K_MAXBANDS];
-	/** number of guard bits */
-	OPJ_UINT32 numgbits;
-	/** Region Of Interest shift */
-	OPJ_INT32 roishift;
-	/** precinct width */
-	OPJ_UINT32 prcw[J2K_MAXRLVLS];
-	/** precinct height */
-	OPJ_UINT32 prch[J2K_MAXRLVLS];
-}
-opj_tccp_info_t;
-
-/**
- * Tile coding parameters information
- */
-typedef struct opj_tile_v2_info {
-
-	/** number (index) of tile */
-	int tileno;
-	/** coding style */
-	OPJ_UINT32 csty;
-	/** progression order */
-	OPJ_PROG_ORDER prg;
-	/** number of layers */
-	OPJ_UINT32 numlayers;
-	/** multi-component transform identifier */
-	OPJ_UINT32 mct;
-
-	/** information concerning tile component parameters*/
-	opj_tccp_info_t *tccp_info;
-
-} opj_tile_info_v2_t;
-
-/**
- * Information structure about the codestream (FIXME should be expand and enhance)
- */
-typedef struct opj_codestream_info_v2 {
-	/* Tile info */
-	/** tile origin in x = XTOsiz */
-	OPJ_UINT32 tx0;
-	/** tile origin in y = YTOsiz */
-	OPJ_UINT32 ty0;
-	/** tile size in x = XTsiz */
-	OPJ_UINT32 tdx;
-	/** tile size in y = YTsiz */
-	OPJ_UINT32 tdy;
-	/** number of tiles in X */
-	OPJ_UINT32 tw;
-	/** number of tiles in Y */
-	OPJ_UINT32 th;
-
-	/** number of components*/
-	OPJ_UINT32 nbcomps;
-
-	/** Default information regarding tiles inside image */
-	opj_tile_info_v2_t m_default_tile_info;
-
-	/** information regarding tiles inside image */
-	opj_tile_info_v2_t *tile_info; /* FIXME not used for the moment */
-
-} opj_codestream_info_v2_t;
-
-
-/**
- * Index structure about a tile part
- */
-typedef struct opj_tp_index {
-	/** start position */
-	OPJ_OFF_T start_pos;
-	/** end position of the header */
-	OPJ_OFF_T end_header;
-	/** end position */
-	OPJ_OFF_T end_pos;
-
-} opj_tp_index_t;
-
-/**
- * Index structure about a tile
- */
-typedef struct opj_tile_index {
-	/** tile index */
-	OPJ_UINT32 tileno;
-
-	/** number of tile parts */
-	OPJ_UINT32 nb_tps;
-	/** current nb of tile part (allocated)*/
-	OPJ_UINT32 current_nb_tps;
-	/** current tile-part index */
-	OPJ_UINT32 current_tpsno;
-	/** information concerning tile parts */
-	opj_tp_index_t *tp_index;
-
-	/* UniPG>> */
-		/** number of markers */
-		OPJ_UINT32 marknum;
-		/** list of markers */
-		opj_marker_info_t *marker;
-		/** actual size of markers array */
-		OPJ_UINT32 maxmarknum;
-	/* <<UniPG */
-
-	/** packet number */
-	OPJ_UINT32 nb_packet;
-	/** information concerning packets inside tile */
-	opj_packet_info_t *packet_index;
-
-} opj_tile_index_t;
-
-/**
- * Index structure of the codestream (FIXME should be expand and enhance)
- */
-typedef struct opj_codestream_index_ {
-	/** main header start position (SOC position) */
-	OPJ_OFF_T main_head_start;
-	/** main header end position (first SOT position) */
-	OPJ_OFF_T main_head_end;
-
-	/** codestream's size */
-	OPJ_UINT64 codestream_size;
-
-/* UniPG>> */
-	/** number of markers */
-	OPJ_UINT32 marknum;
-	/** list of markers */
-	opj_marker_info_t *marker;
-	/** actual size of markers array */
-	OPJ_UINT32 maxmarknum;
-/* <<UniPG */
-
-	/** */
-	OPJ_UINT32 nb_of_tiles;
-	/** */
-	opj_tile_index_t *tile_index; /* FIXME not used for the moment */
-
-}opj_codestream_index_t;
-/* -----------------------------------------------------------> */
-
-/*
-==========================================================
-   Metadata from the JP2file
-==========================================================
-*/
-
-/**
- * Info structure of the JP2 file
- * FIXME
- */
-typedef struct opj_jp2_metadata {
-	/** */
-	OPJ_INT32	not_used;
-
-} opj_jp2_metadata_t;
-
-/**
- * Index structure of the JP2 file
- * FIXME
- */
-typedef struct opj_jp2_index {
-	/** */
-	OPJ_INT32	not_used;
-
-} opj_jp2_index_t;
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* 
-==========================================================
-   openjpeg version
-==========================================================
-*/
-
-OPJ_API const char * OPJ_CALLCONV opj_version(void);
-
-/* 
-==========================================================
-   image functions definitions
-==========================================================
-*/
-
-/**
- * Create an image
- * @param numcmpts number of components
- * @param cmptparms components parameters
- * @param clrspc image color space
- * @return returns a new image structure if successful, returns NULL otherwise
- * */
-OPJ_API opj_image_t* OPJ_CALLCONV opj_image_create(int numcmpts, opj_image_cmptparm_t *cmptparms, OPJ_COLOR_SPACE clrspc);
-
-/**
- * Deallocate any resources associated with an image
- * @param image image to be destroyed
- */
-OPJ_API void OPJ_CALLCONV opj_image_destroy(opj_image_t *image);
-
-
-/* 
-==========================================================
-   stream functions definitions
-==========================================================
-*/
-
-/**
-Open and allocate a memory stream for read / write. 
-On reading, the user must provide a buffer containing encoded data. The buffer will be 
-wrapped by the returned CIO handle. 
-On writing, buffer parameters must be set to 0: a buffer will be allocated by the library 
-to contain encoded data. 
-@param cinfo Codec context info
-@param buffer Reading: buffer address. Writing: NULL
-@param length Reading: buffer length. Writing: 0
-@return Returns a CIO handle if successful, returns NULL otherwise
-*/
-OPJ_API opj_cio_t* OPJ_CALLCONV opj_cio_open(opj_common_ptr cinfo, unsigned char *buffer, int length);
-
-/**
-Close and free a CIO handle
-@param cio CIO handle to free
-*/
-OPJ_API void OPJ_CALLCONV opj_cio_close(opj_cio_t *cio);
-
-/**
-Get position in byte stream
-@param cio CIO handle
-@return Returns the position in bytes
-*/
-OPJ_API int OPJ_CALLCONV cio_tell(opj_cio_t *cio);
-/**
-Set position in byte stream
-@param cio CIO handle
-@param pos Position, in number of bytes, from the beginning of the stream
-*/
-OPJ_API void OPJ_CALLCONV cio_seek(opj_cio_t *cio, int pos);
-
-/* <----------- */
-/* V2 framework */
-
-/**
- * Creates an abstract stream. This function does nothing except allocating memory and initializing the abstract stream.
- *
- * @param	l_is_reader		if set to true then the stream will be an input stream, an output stream else.
- *
- * @return	a stream object.
-*/
-OPJ_API opj_stream_t* OPJ_CALLCONV opj_stream_default_create(opj_bool p_is_input);
-OPJ_API opj_stream_t* OPJ_CALLCONV opj_stream_create(OPJ_SIZE_T p_buffer_size, opj_bool p_is_input);
-
-/**
- * Destroys a stream created by opj_create_stream. This function does NOT close the abstract stream. If needed the user must
- * close its own implementation of the stream.
- *
- * @param	p_stream	the stream to destroy.
- */
-OPJ_API void OPJ_CALLCONV opj_stream_destroy(opj_stream_t* p_stream);
-
-/**
- * Sets the given function to be used as a read function.
- * @param		p_stream	the stream to modify
- * @param		p_function	the function to use a read function.
-*/
-OPJ_API void OPJ_CALLCONV opj_stream_set_read_function(opj_stream_t* p_stream, opj_stream_read_fn p_function);
-
-/**
- * Sets the given function to be used as a write function.
- * @param		p_stream	the stream to modify
- * @param		p_function	the function to use a write function.
-*/
-OPJ_API void OPJ_CALLCONV opj_stream_set_write_function(opj_stream_t* p_stream, opj_stream_write_fn p_function);
-
-/**
- * Sets the given function to be used as a skip function.
- * @param		p_stream	the stream to modify
- * @param		p_function	the function to use a skip function.
-*/
-OPJ_API void OPJ_CALLCONV opj_stream_set_skip_function(opj_stream_t* p_stream, opj_stream_skip_fn p_function);
-
-/**
- * Sets the given function to be used as a seek function, the stream is then seekable.
- * @param		p_stream	the stream to modify
- * @param		p_function	the function to use a skip function.
-*/
-OPJ_API void OPJ_CALLCONV opj_stream_set_seek_function(opj_stream_t* p_stream, opj_stream_seek_fn p_function);
-
-
-/**
- * Sets the given data to be used as a user data for the stream.
- * @param		p_stream	the stream to modify
- * @param		p_data		the data to set.
-*/
-OPJ_API void OPJ_CALLCONV opj_stream_set_user_data (opj_stream_t* p_stream, void * p_data);
-
-/**
- * Sets the length of the user data for the stream.
- * @param		p_stream		the stream to modify
- * @param		data_length		length of the user_data.
-*/
-OPJ_API void OPJ_CALLCONV opj_stream_set_user_data_length(opj_stream_t* p_stream, OPJ_UINT64 data_length);
-
-
-/**
- * Helper function.
- * Sets the stream to be a file stream. The FILE must have been open previously.
- * @param		p_stream	the stream to modify
- * @param		p_file		handler to an already open file.
-*/
-OPJ_API opj_stream_t* OPJ_CALLCONV opj_stream_create_default_file_stream (FILE * p_file, opj_bool p_is_read_stream);
-OPJ_API opj_stream_t* OPJ_CALLCONV opj_stream_create_file_stream (FILE * p_file, OPJ_UINT32 p_buffer_size, opj_bool p_is_read_stream);
-
-/* -----------> */
-
-/* 
-==========================================================
-   event manager functions definitions
-==========================================================
-*/
-
-/**
- */
-DEPRECATED( OPJ_API opj_event_mgr_t* OPJ_CALLCONV opj_set_event_mgr(opj_common_ptr cinfo, opj_event_mgr_t *event_mgr, void *context));
-
-/**
- * Initialize a default event handler. This function set the output of message event to be stderr for warning and error output
- * and stdout for info output in the verbose mode. In the case of the non-verbose mode only the error message are displayed.
- * You can initialize your own event handler struct when you fill the field of the event structure. If you provide a null
- * structure to the opj_setup_decoder function, no output will be displayed.
- *
- * @param	p_manager		a opj_event_mgr structure which will be pass to the codec.
- *
- */
-OPJ_API void OPJ_CALLCONV opj_initialize_default_event_handler(opj_event_mgr_t * p_manager, opj_bool verbose);
-
-
-/* 
-==========================================================
-   codec functions definitions
-==========================================================
-*/
-
-/**
-Creates a J2K/JPT/JP2 decompression structure
-@param format Decoder to select
-@return Returns a handle to a decompressor if successful, returns NULL otherwise
-*/
-DEPRECATED( OPJ_API opj_dinfo_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT format) );
-
-/**
- * Creates a J2K/JP2 decompression structure
- * @param format 		Decoder to select
- *
- * @return Returns a handle to a decompressor if successful, returns NULL otherwise
- * */
-OPJ_API opj_codec_t* OPJ_CALLCONV opj_create_decompress_v2(OPJ_CODEC_FORMAT format);
-
-/**
-Destroy a decompressor handle
-@param dinfo decompressor handle to destroy
-*/
-DEPRECATED( OPJ_API void OPJ_CALLCONV opj_destroy_decompress(opj_dinfo_t *dinfo) );
-
-/**
- * Read after the codestream if necessary
- */
-OPJ_API opj_bool OPJ_CALLCONV opj_end_decompress (	opj_codec_t *p_codec,
-													opj_stream_t *p_cio);
-
-
-/**
-Set decoding parameters to default values
-@param parameters Decompression parameters
-*/
-OPJ_API void OPJ_CALLCONV opj_set_default_decoder_parameters(opj_dparameters_t *parameters);
-
-/**
-Setup the decoder decoding parameters using user parameters.
-Decoding parameters are returned in j2k->cp. 
-@param dinfo decompressor handle
-@param parameters decompression parameters
-*/
-DEPRECATED( OPJ_API void OPJ_CALLCONV opj_setup_decoder(opj_dinfo_t *dinfo, opj_dparameters_t *parameters) );
-
-
-/**
- * Setup the decoder with decompression parameters provided by the user and with the message handler
- * provided by the user.
- *
- * @param dinfo 		decompressor handlers
- * @param parameters 	decompression parameters
- * @param event_mgr		message handler
- *
- * @return true			if the decoder is correctly set
- */
-OPJ_API opj_bool OPJ_CALLCONV opj_setup_decoder_v2(	opj_codec_t *p_info,
-													opj_dparameters_t *parameters,
-													opj_event_mgr_t* event_mgr);
-
-/**
- * Decodes an image header.
- *
- * @param	p_cio			the jpeg2000 stream.
- * @param	p_codec			the jpeg2000 codec to read.
- * @param	p_image			the image structure initialized with the characteristics of encoded image.
- *
- * @return true				if the main header of the codestream and the JP2 header is correctly read.
- */
-OPJ_API opj_bool OPJ_CALLCONV opj_read_header (	opj_stream_t *p_cio,
-												opj_codec_t *p_codec,
-												opj_image_t **p_image);
-
-/**
- * Sets the given area to be decoded. This function should be called right after opj_read_header and before any tile header reading.
- *
- * @param	p_codec			the jpeg2000 codec.
- * @param	p_start_x		the left position of the rectangle to decode (in image coordinates).
- * @param	p_end_x			the right position of the rectangle to decode (in image coordinates).
- * @param	p_start_y		the up position of the rectangle to decode (in image coordinates).
- * @param	p_end_y			the bottom position of the rectangle to decode (in image coordinates).
- *
- * @return	true			if the area could be set.
- */
-OPJ_API opj_bool OPJ_CALLCONV opj_set_decode_area(	opj_codec_t *p_codec,
-													opj_image_t* p_image,
-													OPJ_INT32 p_start_x, OPJ_INT32 p_start_y,
-													OPJ_INT32 p_end_x, OPJ_INT32 p_end_y );
-
-/**
-Decode an image from a JPEG-2000 codestream 
-@param dinfo decompressor handle
-@param cio Input buffer stream
-@return Returns a decoded image if successful, returns NULL otherwise
-*/
-DEPRECATED( OPJ_API opj_image_t* OPJ_CALLCONV opj_decode(opj_dinfo_t *dinfo, opj_cio_t *cio) );
-
-/**
- * Decode an image from a JPEG-2000 codestream
- * @param dinfo decompressor handle
- * @param cio Input buffer stream
- * @return Returns a decoded image if successful, returns NULL otherwise
- * */
-OPJ_API opj_bool OPJ_CALLCONV opj_decode_v2(opj_codec_t *p_decompressor,
-											opj_stream_t * cio,
-											opj_image_t *p_image);
-
-
-/**
- * Get the decoded tile from the codec
- * @param	p_codec			the jpeg2000 codec.
- * @param	p_cio			input streamm
- * @param	p_image			output image
- * @param	tile_index		index of the tile which will be decode
- *
- * @return					opj_true if all is ok.
- */
-OPJ_API opj_bool OPJ_CALLCONV opj_get_decoded_tile(	opj_codec_t *p_codec,
-													opj_stream_t *p_cio,
-													opj_image_t *p_image,
-													OPJ_UINT32 tile_index);
-
-
-/**
- * Set the resolution factor of the decoded image
- * @param	p_codec			the jpeg2000 codec.
- * @param	res_factor		resolution factor to set
- *
- * @return					opj_true if all is ok.
- */
-OPJ_API opj_bool OPJ_CALLCONV opj_set_decoded_resolution_factor(opj_codec_t *p_codec, OPJ_UINT32 res_factor);
-
-
-
-/**
- * Reads a tile header. This function is compulsory and allows one to know the size of the tile thta will be decoded.
- * The user may need to refer to the image got by opj_read_header to understand the size being taken by the tile.
- *
- * @param	p_codec			the jpeg2000 codec.
- * @param	p_tile_index	pointer to a value that will hold the index of the tile being decoded, in case of success.
- * @param	p_data_size		pointer to a value that will hold the maximum size of the decoded data, in case of success. In case
- *							of truncated codestreams, the actual number of bytes decoded may be lower. The computation of the size is the same
- *							as depicted in opj_write_tile.
- * @param	p_tile_x0		pointer to a value that will hold the x0 pos of the tile (in the image).
- * @param	p_tile_y0		pointer to a value that will hold the y0 pos of the tile (in the image).
- * @param	p_tile_x1		pointer to a value that will hold the x1 pos of the tile (in the image).
- * @param	p_tile_y1		pointer to a value that will hold the y1 pos of the tile (in the image).
- * @param	p_nb_comps		pointer to a value that will hold the number of components in the tile.
- * @param	p_should_go_on	pointer to a boolean that will hold the fact that the decoding should go on. In case the
- *							codestream is over at the time of the call, the value will be set to false. The user should then stop
- *							the decoding.
- * @param	p_stream		the stream to decode.
- * @return	true			if the tile header could be decoded. In case the decoding should end, the returned value is still true.
- *							returning false may be the result of a shortage of memory or an internal error.
- */
-OPJ_API opj_bool OPJ_CALLCONV opj_read_tile_header(	opj_codec_t *p_codec,
-												opj_stream_t * p_stream,
-												OPJ_UINT32 * p_tile_index,
-												OPJ_UINT32 * p_data_size,
-												OPJ_INT32 * p_tile_x0, OPJ_INT32 * p_tile_y0,
-												OPJ_INT32 * p_tile_x1, OPJ_INT32 * p_tile_y1,
-												OPJ_UINT32 * p_nb_comps,
-												opj_bool * p_should_go_on );
-
-
-/**
- * Reads a tile data. This function is compulsory and allows one to decode tile data. opj_read_tile_header should be called before.
- * The user may need to refer to the image got by opj_read_header to understand the size being taken by the tile.
- *
- * @param	p_codec			the jpeg2000 codec.
- * @param	p_tile_index	the index of the tile being decoded, this should be the value set by opj_read_tile_header.
- * @param	p_data			pointer to a memory block that will hold the decoded data.
- * @param	p_data_size		size of p_data. p_data_size should be bigger or equal to the value set by opj_read_tile_header.
- * @param	p_stream		the stream to decode.
- *
- * @return	true			if the data could be decoded.
- */
-OPJ_API opj_bool OPJ_CALLCONV opj_decode_tile_data(	opj_codec_t *p_codec,
-													OPJ_UINT32 p_tile_index,
-													OPJ_BYTE * p_data,
-													OPJ_UINT32 p_data_size,
-													opj_stream_t *p_stream );
-
-
-/**
-Decode an image from a JPEG-2000 codestream and extract the codestream information
-@param dinfo decompressor handle
-@param cio Input buffer stream
-@param cstr_info Codestream information structure if needed afterwards, NULL otherwise
-@return Returns a decoded image if successful, returns NULL otherwise
-*/
-DEPRECATED( OPJ_API opj_image_t* OPJ_CALLCONV opj_decode_with_info(opj_dinfo_t *dinfo, opj_cio_t *cio, opj_codestream_info_t *cstr_info) );
-
-/* COMPRESSION FUNCTIONS*/
-
-/**
-Creates a J2K/JP2 compression structure
-@param format Coder to select
-@return Returns a handle to a compressor if successful, returns NULL otherwise
-*/
-OPJ_API opj_cinfo_t* OPJ_CALLCONV opj_create_compress(OPJ_CODEC_FORMAT format);
-/**
-Destroy a compressor handle
-@param cinfo compressor handle to destroy
-*/
-OPJ_API void OPJ_CALLCONV opj_destroy_compress(opj_cinfo_t *cinfo);
-/**
-Set encoding parameters to default values, that means : 
-<ul>
-<li>Lossless
-<li>1 tile
-<li>Size of precinct : 2^15 x 2^15 (means 1 precinct)
-<li>Size of code-block : 64 x 64
-<li>Number of resolutions: 6
-<li>No SOP marker in the codestream
-<li>No EPH marker in the codestream
-<li>No sub-sampling in x or y direction
-<li>No mode switch activated
-<li>Progression order: LRCP
-<li>No index file
-<li>No ROI upshifted
-<li>No offset of the origin of the image
-<li>No offset of the origin of the tiles
-<li>Reversible DWT 5-3
-</ul>
-@param parameters Compression parameters
-*/
-OPJ_API void OPJ_CALLCONV opj_set_default_encoder_parameters(opj_cparameters_t *parameters);
-/**
-Setup the encoder parameters using the current image and using user parameters. 
-@param cinfo Compressor handle
-@param parameters Compression parameters
-@param image Input filled image
-*/
-OPJ_API void OPJ_CALLCONV opj_setup_encoder(opj_cinfo_t *cinfo, opj_cparameters_t *parameters, opj_image_t *image);
-/**
-Encode an image into a JPEG-2000 codestream
-3@param cinfo compressor handle
-@param cio Output buffer stream
-@param image Image to encode
-@param index Depreacted -> Set to NULL. To extract index, used opj_encode_wci()
-@return Returns true if successful, returns false otherwise
-*/
-OPJ_API opj_bool OPJ_CALLCONV opj_encode(opj_cinfo_t *cinfo, opj_cio_t *cio, opj_image_t *image, char *index);
-/**
-Encode an image into a JPEG-2000 codestream and extract the codestream information
-@param cinfo compressor handle
-@param cio Output buffer stream
-@param image Image to encode
-@param cstr_info Codestream information structure if needed afterwards, NULL otherwise
-@return Returns true if successful, returns false otherwise
-*/
-OPJ_API opj_bool OPJ_CALLCONV opj_encode_with_info(opj_cinfo_t *cinfo, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t *cstr_info);
-
-
-
-
-/**
-Destroy Codestream information after compression or decompression
-@param cstr_info Codestream information structure
-*/
-OPJ_API void OPJ_CALLCONV opj_destroy_cstr_info(opj_codestream_info_t *cstr_info);
-
-OPJ_API void OPJ_CALLCONV opj_destroy_cstr_info_v2(opj_codestream_info_v2_t **cstr_info);
-
-
-
-/**
- * Destroy a decompressor handle
- *
- * @param	dinfo 			decompressor handle to destroy
- */
-OPJ_API void OPJ_CALLCONV opj_destroy_codec(opj_codec_t * p_codec);
-
-
-
-
-/*
-==========================================================
-   codec output functions definitions
-==========================================================
-*/
-
-/**
- * Dump the codec information into the output stream
- *
- * @param	p_codec			the jpeg2000 codec.
- * @param	info_flag		type of information dump.
- * @param	output_stream	output stream where dump the informations get from the codec.
- *
- */
-OPJ_API void OPJ_CALLCONV opj_dump_codec(	opj_codec_t *p_codec,
-											OPJ_INT32 info_flag,
-											FILE* output_stream);
-
-/**
- * Get the codestream information from the codec
- *
- * @param	p_codec			the jpeg2000 codec.
- *
- * @return					a pointer to a codestream information structure.
- *
- */
-OPJ_API opj_codestream_info_v2_t* OPJ_CALLCONV opj_get_cstr_info(opj_codec_t *p_codec);
-
-/**
- * Get the codestream index from the codec
- *
- * @param	p_codec			the jpeg2000 codec.
- *
- * @return					a pointer to a codestream index structure.
- *
- */
-OPJ_API opj_codestream_index_t * OPJ_CALLCONV opj_get_cstr_index(opj_codec_t *p_codec);
-
-OPJ_API void OPJ_CALLCONV opj_destroy_cstr_index(opj_codestream_index_t **p_cstr_index);
-
-
-/**
- * Get the JP2 file information from the codec FIXME
- *
- * @param	p_codec			the jpeg2000 codec.
- *
- * @return					a pointer to a JP2 metadata structure.
- *
- */
-OPJ_API opj_jp2_metadata_t* OPJ_CALLCONV opj_get_jp2_metadata(opj_codec_t *p_codec);
-
-/**
- * Get the JP2 file index from the codec FIXME
- *
- * @param	p_codec			the jpeg2000 codec.
- *
- * @return					a pointer to a JP2 index structure.
- *
- */
-OPJ_API opj_jp2_index_t* OPJ_CALLCONV opj_get_jp2_index(opj_codec_t *p_codec);
-
-/* >>OTB */
-//OPJ_API opj_image_t* OPJ_CALLCONV opj_image_create0();
-OPJ_API void opj_copy_image_header(const opj_image_t* p_image_src, opj_image_t* p_image_dest);
-/* <<OTB */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* OPENJPEG_H */
-
-
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/opj_includes.h b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/opj_includes.h
deleted file mode 100644
index 1b8a3e2ae67fd8449b414038a204d2809db8d7b8..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/opj_includes.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * 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 OPJ_INCLUDES_H
-#define OPJ_INCLUDES_H
-
-/*
- * This must be included before any system headers,
- * since they can react to macro defined there
- */
-#include "opj_config.h"
-
-/*
- ==========================================================
-   Standard includes used by the library
- ==========================================================
-*/
-#include <memory.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-#include <float.h>
-#include <time.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <ctype.h>
-#include <assert.h>
-
-/*
-  Use fseeko() and ftello() if they are available since they use
-  'off_t' rather than 'long'.  It is wrong to use fseeko() and
-  ftello() only on systems with special LFS support since some systems
-  (e.g. FreeBSD) support a 64-bit off_t by default.
-*/
-#if defined(HAVE_FSEEKO)
-#  define fseek  fseeko
-#  define ftell  ftello
-#endif
-
-
-#if defined(WIN32) && !defined(Windows95) && !defined(__BORLANDC__) && \
-  !(defined(_MSC_VER) && _MSC_VER < 1400) && \
-  !(defined(__MINGW32__) && __MSVCRT_VERSION__ < 0x800)
-  /*
-    Windows '95 and Borland C do not support _lseeki64
-    Visual Studio does not support _fseeki64 and _ftelli64 until the 2005 release.
-    Without these interfaces, files over 2GB in size are not supported for Windows.
-  */
-#  define OPJ_FSEEK(stream,offset,whence) _fseeki64(stream,/* __int64 */ offset,whence)
-#  define OPJ_FSTAT(fildes,stat_buff) _fstati64(fildes,/* struct _stati64 */ stat_buff)
-#  define OPJ_FTELL(stream) /* __int64 */ _ftelli64(stream)
-#  define OPJ_STAT_STRUCT_T struct _stati64
-#  define OPJ_STAT(path,stat_buff) _stati64(path,/* struct _stati64 */ stat_buff)
-#else
-#  define OPJ_FSEEK(stream,offset,whence) fseek(stream,offset,whence)
-#  define OPJ_FSTAT(fildes,stat_buff) fstat(fildes,stat_buff)
-#  define OPJ_FTELL(stream) ftell(stream)
-#  define OPJ_STAT_STRUCT_T struct stat
-#  define OPJ_STAT(path,stat_buff) stat(path,stat_buff)
-#endif
-
-
-/*
- ==========================================================
-   OpenJPEG interface
- ==========================================================
- */
-#include "openjpeg_mangle.h"
-#include "openjpeg.h"
-
-/*
- ==========================================================
-   OpenJPEG modules
- ==========================================================
-*/
-
-/* Ignore GCC attributes if this is not GCC */
-#ifndef __GNUC__
-	#define __attribute__(x) /* __attribute__(x) */
-#endif
-
-/*
-The inline keyword is supported by C99 but not by C90. 
-Most compilers implement their own version of this keyword ... 
-*/
-#ifndef INLINE
-	#if defined(_MSC_VER)
-		#define INLINE __forceinline
-	#elif defined(__GNUC__)
-		#define INLINE __inline__
-	#elif defined(__MWERKS__)
-		#define INLINE inline
-	#else 
-		/* add other compilers here ... */
-		#define INLINE 
-	#endif /* defined(<Compiler>) */
-#endif /* INLINE */
-
-/* Are restricted pointers available? (C99) */
-#if (__STDC_VERSION__ != 199901L)
-	/* Not a C99 compiler */
-	#ifdef __GNUC__
-		#define restrict __restrict__
-	#else
-		#define restrict /* restrict */
-	#endif
-#endif
-
-/* MSVC and Borland C do not have lrintf */
-#if defined(_MSC_VER) || defined(__BORLANDC__)
-static INLINE long lrintf(float f){
-#ifdef _M_X64
-    return (long)((f>0.0f) ? (f + 0.5f):(f -0.5f));
-#else
-    int i;
- 
-    _asm{
-        fld f
-        fistp i
-    };
- 
-    return i;
-#endif
-}
-#endif
-
-#include "j2k_lib.h"
-#include "opj_malloc.h"
-#include "event.h"
-#include "bio.h"
-#include "cio.h"
-
-#include "image.h"
-#include "j2k.h"
-#include "jp2.h"
-#include "jpt.h"
-
-#include "mqc.h"
-#include "raw.h"
-#include "bio.h"
-#include "tgt.h"
-#include "pi.h"
-#include "tcd.h"
-#include "t1.h"
-#include "dwt.h"
-#include "t2.h"
-#include "mct.h"
-#include "int.h"
-#include "fix.h"
-
-#include "cidx_manager.h"
-#include "indexbox_manager.h"
-
-/* JPWL>> */
-#ifdef USE_JPWL
-#include "./jpwl/jpwl.h"
-#endif /* USE_JPWL */
-/* <<JPWL */
-
-// V2
-#include "function_list.h"
-
-#endif /* OPJ_INCLUDES_H */
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/opj_malloc.h b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/opj_malloc.h
deleted file mode 100644
index 0b1d4fc17fc774c99c71e3861f42980a957758c6..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/opj_malloc.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (c) 2005, Herve Drolon, FreeImage Team
- * Copyright (c) 2007, Callum Lerwick <seg@haxxed.com>
- * 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 __OPJ_MALLOC_H
-#define __OPJ_MALLOC_H
-/**
-@file opj_malloc.h
-@brief Internal functions
-
-The functions in opj_malloc.h are internal utilities used for memory management.
-*/
-
-/** @defgroup MISC MISC - Miscellaneous internal functions */
-/*@{*/
-
-/** @name Exported functions */
-/*@{*/
-/* ----------------------------------------------------------------------- */
-
-/**
-Allocate an uninitialized memory block
-@param size Bytes to allocate
-@return Returns a void pointer to the allocated space, or NULL if there is insufficient memory available
-*/
-#ifdef ALLOC_PERF_OPT
-void * OPJ_CALLCONV opj_malloc(size_t size);
-#else
-#define opj_malloc(size) malloc(size)
-#endif
-
-/**
-Allocate a memory block with elements initialized to 0
-@param num Blocks to allocate
-@param size Bytes per block to allocate
-@return Returns a void pointer to the allocated space, or NULL if there is insufficient memory available
-*/
-#ifdef ALLOC_PERF_OPT
-void * OPJ_CALLCONV opj_calloc(size_t _NumOfElements, size_t _SizeOfElements);
-#else
-#define opj_calloc(num, size) calloc(num, size)
-#endif
-
-/**
-Allocate memory aligned to a 16 byte boundry
-@param size Bytes to allocate
-@return Returns a void pointer to the allocated space, or NULL if there is insufficient memory available
-*/
-/* FIXME: These should be set with cmake tests, but we're currently not requiring use of cmake */
-#ifdef _WIN32
-	/* Someone should tell the mingw people that their malloc.h ought to provide _mm_malloc() */
-	#ifdef __GNUC__
-		#include <mm_malloc.h>
-		#define HAVE_MM_MALLOC
-	#else /* MSVC, Intel C++ */
-		#include <malloc.h>
-		#ifdef _mm_malloc
-			#define HAVE_MM_MALLOC
-		#endif
-	#endif
-#else /* Not _WIN32 */
-	#if defined(__sun)
-		#define HAVE_MEMALIGN
-	/* Linux x86_64 and OSX always align allocations to 16 bytes */
-	#elif !defined(__amd64__) && !defined(__APPLE__)	
-		#define HAVE_MEMALIGN
-		#include <malloc.h>			
-	#endif
-#endif
-
-#define opj_aligned_malloc(size) malloc(size)
-#define opj_aligned_free(m) free(m)
-
-#ifdef HAVE_MM_MALLOC
-	#undef opj_aligned_malloc
-	#define opj_aligned_malloc(size) _mm_malloc(size, 16)
-	#undef opj_aligned_free
-	#define opj_aligned_free(m) _mm_free(m)
-#endif
-
-#ifdef HAVE_MEMALIGN
-	extern void* memalign(size_t, size_t);
-	#undef opj_aligned_malloc
-	#define opj_aligned_malloc(size) memalign(16, (size))
-	#undef opj_aligned_free
-	#define opj_aligned_free(m) free(m)
-#endif
-
-#ifdef HAVE_POSIX_MEMALIGN
-	#undef opj_aligned_malloc
-	extern int posix_memalign(void**, size_t, size_t);
-
-	static INLINE void* __attribute__ ((malloc)) opj_aligned_malloc(size_t size){
-		void* mem = NULL;
-		posix_memalign(&mem, 16, size);
-		return mem;
-	}
-	#undef opj_aligned_free
-	#define opj_aligned_free(m) free(m)
-#endif
-
-#ifdef ALLOC_PERF_OPT
-	#undef opj_aligned_malloc
-	#define opj_aligned_malloc(size) opj_malloc(size)
-	#undef opj_aligned_free
-	#define opj_aligned_free(m) opj_free(m)
-#endif
-
-/**
-Reallocate memory blocks.
-@param m Pointer to previously allocated memory block
-@param s New size in bytes
-@return Returns a void pointer to the reallocated (and possibly moved) memory block
-*/
-#ifdef ALLOC_PERF_OPT
-void * OPJ_CALLCONV opj_realloc(void * m, size_t s);
-#else
-#define opj_realloc(m, s) realloc(m, s)
-#endif
-
-/**
-Deallocates or frees a memory block.
-@param m Previously allocated memory block to be freed
-*/
-#ifdef ALLOC_PERF_OPT
-void OPJ_CALLCONV opj_free(void * m);
-#else
-#define opj_free(m) free(m)
-#endif
-
-#ifdef __GNUC__
-#pragma GCC poison malloc calloc realloc free
-#endif
-
-/* ----------------------------------------------------------------------- */
-/*@}*/
-
-/*@}*/
-
-#endif /* __OPJ_MALLOC_H */
-
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/phix_manager.c b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/phix_manager.c
deleted file mode 100644
index 3b1d64eb23bc55c07aeb909ca546e0d9104393ef..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/phix_manager.c
+++ /dev/null
@@ -1,167 +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 "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;
-
-  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;
-}
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/pi.c b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/pi.c
deleted file mode 100644
index f601c7697bd9d05f75453b4c98594088739744ee..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/pi.c
+++ /dev/null
@@ -1,1563 +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
- * 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_includes.h"
-
-/** @defgroup PI PI - Implementation of a packet iterator */
-/*@{*/
-
-/** @name Local static functions */
-/*@{*/
-
-/**
-Get next packet in layer-resolution-component-precinct order.
-@param pi packet iterator to modify
-@return returns false if pi pointed to the last packet or else returns true 
-*/
-static opj_bool pi_next_lrcp(opj_pi_iterator_t * pi);
-/**
-Get next packet in resolution-layer-component-precinct order.
-@param pi packet iterator to modify
-@return returns false if pi pointed to the last packet or else returns true 
-*/
-static opj_bool pi_next_rlcp(opj_pi_iterator_t * pi);
-/**
-Get next packet in resolution-precinct-component-layer order.
-@param pi packet iterator to modify
-@return returns false if pi pointed to the last packet or else returns true 
-*/
-static opj_bool pi_next_rpcl(opj_pi_iterator_t * pi);
-/**
-Get next packet in precinct-component-resolution-layer order.
-@param pi packet iterator to modify
-@return returns false if pi pointed to the last packet or else returns true 
-*/
-static opj_bool pi_next_pcrl(opj_pi_iterator_t * pi);
-/**
-Get next packet in component-precinct-resolution-layer order.
-@param pi packet iterator to modify
-@return returns false if pi pointed to the last packet or else returns true 
-*/
-static opj_bool pi_next_cprl(opj_pi_iterator_t * pi);
-
-
-
-/**
- * Gets the encoding parameters needed to update the coding parameters and all the pocs.
- * The precinct widths, heights, dx and dy for each component at each resolution will be stored as well.
- * the last parameter of the function should be an array of pointers of size nb components, each pointer leading
- * to an area of size 4 * max_res. The data is stored inside this area with the following pattern :
- * dx_compi_res0 , dy_compi_res0 , w_compi_res0, h_compi_res0 , dx_compi_res1 , dy_compi_res1 , w_compi_res1, h_compi_res1 , ...
- *
- * @param	p_image			the image being encoded.
- * @param	p_cp			the coding parameters.
- * @param	tileno			the tile index of the tile being encoded.
- * @param	p_tx0			pointer that will hold the X0 parameter for the tile
- * @param	p_tx1			pointer that will hold the X1 parameter for the tile
- * @param	p_ty0			pointer that will hold the Y0 parameter for the tile
- * @param	p_ty1			pointer that will hold the Y1 parameter for the tile
- * @param	p_max_prec		pointer that will hold the the maximum precision for all the bands of the tile
- * @param	p_max_res		pointer that will hold the the maximum number of resolutions for all the poc inside the tile.
- * @param	dx_min			pointer that will hold the the minimum dx of all the components of all the resolutions for the tile.
- * @param	dy_min			pointer that will hold the the minimum dy of all the components of all the resolutions for the tile.
- * @param	p_resolutions	pointer to an area corresponding to the one described above.
- */
-void get_all_encoding_parameters(
-								const opj_image_t *p_image,
-								const opj_cp_v2_t *p_cp,
-								OPJ_UINT32 tileno,
-								OPJ_INT32 * p_tx0,
-								OPJ_INT32 * p_tx1,
-								OPJ_INT32 * p_ty0,
-								OPJ_INT32 * p_ty1,
-								OPJ_UINT32 * p_dx_min,
-								OPJ_UINT32 * p_dy_min,
-								OPJ_UINT32 * p_max_prec,
-								OPJ_UINT32 * p_max_res,
-								OPJ_UINT32 ** p_resolutions
-							);
-
-
-/**
- * Allocates memory for a packet iterator. Data and data sizes are set by this operation.
- * No other data is set. The include section of the packet  iterator is not allocated.
- *
- * @param	p_image		the image used to initialize the packet iterator (in fact only the number of components is relevant.
- * @param	p_cp		the coding parameters.
- * @param	p_tile_no	the index of the tile from which creating the packet iterator.
- */
-opj_pi_iterator_t * pi_create(	const opj_image_t *image,
-								const opj_cp_v2_t *cp,
-								OPJ_UINT32 tileno );
-
-void pi_update_decode_not_poc (opj_pi_iterator_t * p_pi,opj_tcp_v2_t * p_tcp,OPJ_UINT32 p_max_precision,OPJ_UINT32 p_max_res);
-void pi_update_decode_poc (opj_pi_iterator_t * p_pi,opj_tcp_v2_t * p_tcp,OPJ_UINT32 p_max_precision,OPJ_UINT32 p_max_res);
-
-
-/*@}*/
-
-/*@}*/
-
-/* 
-==========================================================
-   local functions
-==========================================================
-*/
-
-static opj_bool pi_next_lrcp(opj_pi_iterator_t * pi) {
-	opj_pi_comp_t *comp = NULL;
-	opj_pi_resolution_t *res = NULL;
-	long index = 0;
-	
-	if (!pi->first) {
-		comp = &pi->comps[pi->compno];
-		res = &comp->resolutions[pi->resno];
-		goto LABEL_SKIP;
-	} else {
-		pi->first = 0;
-	}
-
-	for (pi->layno = pi->poc.layno0; pi->layno < pi->poc.layno1; pi->layno++) {
-		for (pi->resno = pi->poc.resno0; pi->resno < pi->poc.resno1;
-		pi->resno++) {
-			for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1; pi->compno++) {
-				comp = &pi->comps[pi->compno];
-				if (pi->resno >= comp->numresolutions) {
-					continue;
-				}
-				res = &comp->resolutions[pi->resno];
-				if (!pi->tp_on){
-					pi->poc.precno1 = res->pw * res->ph;
-				}
-				for (pi->precno = pi->poc.precno0; pi->precno < pi->poc.precno1; pi->precno++) {
-					index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p;
-					if (!pi->include[index]) {
-						pi->include[index] = 1;
-						return OPJ_TRUE;
-					}
-LABEL_SKIP:;
-				}
-			}
-		}
-	}
-	
-	return OPJ_FALSE;
-}
-
-static opj_bool pi_next_rlcp(opj_pi_iterator_t * pi) {
-	opj_pi_comp_t *comp = NULL;
-	opj_pi_resolution_t *res = NULL;
-	long index = 0;
-
-	if (!pi->first) {
-		comp = &pi->comps[pi->compno];
-		res = &comp->resolutions[pi->resno];
-		goto LABEL_SKIP;
-	} else {
-		pi->first = 0;
-	}
-
-	for (pi->resno = pi->poc.resno0; pi->resno < pi->poc.resno1; pi->resno++) {
-		for (pi->layno = pi->poc.layno0; pi->layno < pi->poc.layno1; pi->layno++) {
-			for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1; pi->compno++) {
-				comp = &pi->comps[pi->compno];
-				if (pi->resno >= comp->numresolutions) {
-					continue;
-				}
-				res = &comp->resolutions[pi->resno];
-				if(!pi->tp_on){
-					pi->poc.precno1 = res->pw * res->ph;
-				}
-				for (pi->precno = pi->poc.precno0; pi->precno < pi->poc.precno1; pi->precno++) {
-					index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p;
-					if (!pi->include[index]) {
-						pi->include[index] = 1;
-						return OPJ_TRUE;
-					}
-LABEL_SKIP:;
-				}
-			}
-		}
-	}
-	
-	return OPJ_FALSE;
-}
-
-static opj_bool pi_next_rpcl(opj_pi_iterator_t * pi) {
-	opj_pi_comp_t *comp = NULL;
-	opj_pi_resolution_t *res = NULL;
-	long index = 0;
-
-	if (!pi->first) {
-		goto LABEL_SKIP;
-	} else {
-		int compno, resno;
-		pi->first = 0;
-		pi->dx = 0;
-		pi->dy = 0;
-		for (compno = 0; compno < pi->numcomps; compno++) {
-			comp = &pi->comps[compno];
-			for (resno = 0; resno < comp->numresolutions; resno++) {
-				int dx, dy;
-				res = &comp->resolutions[resno];
-				dx = comp->dx * (1 << (res->pdx + comp->numresolutions - 1 - resno));
-				dy = comp->dy * (1 << (res->pdy + comp->numresolutions - 1 - resno));
-				pi->dx = !pi->dx ? dx : int_min(pi->dx, dx);
-				pi->dy = !pi->dy ? dy : int_min(pi->dy, dy);
-			}
-		}
-	}
-if (!pi->tp_on){
-			pi->poc.ty0 = pi->ty0;
-			pi->poc.tx0 = pi->tx0;
-			pi->poc.ty1 = pi->ty1;
-			pi->poc.tx1 = pi->tx1;
-		}
-	for (pi->resno = pi->poc.resno0; pi->resno < pi->poc.resno1; pi->resno++) {
-		for (pi->y = pi->poc.ty0; pi->y < pi->poc.ty1; pi->y += pi->dy - (pi->y % pi->dy)) {
-			for (pi->x = pi->poc.tx0; pi->x < pi->poc.tx1; pi->x += pi->dx - (pi->x % pi->dx)) {
-				for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1; pi->compno++) {
-					int levelno;
-					int trx0, try0;
-					int trx1, try1;
-					int rpx, rpy;
-					int prci, prcj;
-					comp = &pi->comps[pi->compno];
-					if (pi->resno >= comp->numresolutions) {
-						continue;
-					}
-					res = &comp->resolutions[pi->resno];
-					levelno = comp->numresolutions - 1 - pi->resno;
-					trx0 = int_ceildiv(pi->tx0, comp->dx << levelno);
-					try0 = int_ceildiv(pi->ty0, comp->dy << levelno);
-					trx1 = int_ceildiv(pi->tx1, comp->dx << levelno);
-					try1 = int_ceildiv(pi->ty1, comp->dy << levelno);
-					rpx = res->pdx + levelno;
-					rpy = res->pdy + levelno;
-					if (!((pi->y % (comp->dy << rpy) == 0) || ((pi->y == pi->ty0) && ((try0 << levelno) % (1 << rpy))))){
-						continue;	
-					}
-					if (!((pi->x % (comp->dx << rpx) == 0) || ((pi->x == pi->tx0) && ((trx0 << levelno) % (1 << rpx))))){
-						continue; 
-					}
-					
-					if ((res->pw==0)||(res->ph==0)) continue;
-					
-					if ((trx0==trx1)||(try0==try1)) continue;
-					
-					prci = int_floordivpow2(int_ceildiv(pi->x, comp->dx << levelno), res->pdx) 
-						 - int_floordivpow2(trx0, res->pdx);
-					prcj = int_floordivpow2(int_ceildiv(pi->y, comp->dy << levelno), res->pdy) 
-						 - int_floordivpow2(try0, res->pdy);
-					pi->precno = prci + prcj * res->pw;
-					for (pi->layno = pi->poc.layno0; pi->layno < pi->poc.layno1; pi->layno++) {
-						index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p;
-						if (!pi->include[index]) {
-							pi->include[index] = 1;
-							return OPJ_TRUE;
-						}
-LABEL_SKIP:;
-					}
-				}
-			}
-		}
-	}
-	
-	return OPJ_FALSE;
-}
-
-static opj_bool pi_next_pcrl(opj_pi_iterator_t * pi) {
-	opj_pi_comp_t *comp = NULL;
-	opj_pi_resolution_t *res = NULL;
-	long index = 0;
-
-	if (!pi->first) {
-		comp = &pi->comps[pi->compno];
-		goto LABEL_SKIP;
-	} else {
-		int compno, resno;
-		pi->first = 0;
-		pi->dx = 0;
-		pi->dy = 0;
-		for (compno = 0; compno < pi->numcomps; compno++) {
-			comp = &pi->comps[compno];
-			for (resno = 0; resno < comp->numresolutions; resno++) {
-				int dx, dy;
-				res = &comp->resolutions[resno];
-				dx = comp->dx * (1 << (res->pdx + comp->numresolutions - 1 - resno));
-				dy = comp->dy * (1 << (res->pdy + comp->numresolutions - 1 - resno));
-				pi->dx = !pi->dx ? dx : int_min(pi->dx, dx);
-				pi->dy = !pi->dy ? dy : int_min(pi->dy, dy);
-			}
-		}
-	}
-	if (!pi->tp_on){
-			pi->poc.ty0 = pi->ty0;
-			pi->poc.tx0 = pi->tx0;
-			pi->poc.ty1 = pi->ty1;
-			pi->poc.tx1 = pi->tx1;
-		}
-	for (pi->y = pi->poc.ty0; pi->y < pi->poc.ty1; pi->y += pi->dy - (pi->y % pi->dy)) {
-		for (pi->x = pi->poc.tx0; pi->x < pi->poc.tx1; pi->x += pi->dx - (pi->x % pi->dx)) {
-			for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1; pi->compno++) {
-				comp = &pi->comps[pi->compno];
-				for (pi->resno = pi->poc.resno0; pi->resno < int_min(pi->poc.resno1, comp->numresolutions); pi->resno++) {
-					int levelno;
-					int trx0, try0;
-					int trx1, try1;
-					int rpx, rpy;
-					int prci, prcj;
-					res = &comp->resolutions[pi->resno];
-					levelno = comp->numresolutions - 1 - pi->resno;
-					trx0 = int_ceildiv(pi->tx0, comp->dx << levelno);
-					try0 = int_ceildiv(pi->ty0, comp->dy << levelno);
-					trx1 = int_ceildiv(pi->tx1, comp->dx << levelno);
-					try1 = int_ceildiv(pi->ty1, comp->dy << levelno);
-					rpx = res->pdx + levelno;
-					rpy = res->pdy + levelno;
-					if (!((pi->y % (comp->dy << rpy) == 0) || ((pi->y == pi->ty0) && ((try0 << levelno) % (1 << rpy))))){
-						continue;	
-					}
-					if (!((pi->x % (comp->dx << rpx) == 0) || ((pi->x == pi->tx0) && ((trx0 << levelno) % (1 << rpx))))){
-						continue; 
-					}
-					
-					if ((res->pw==0)||(res->ph==0)) continue;
-					
-					if ((trx0==trx1)||(try0==try1)) continue;
-					
-					prci = int_floordivpow2(int_ceildiv(pi->x, comp->dx << levelno), res->pdx) 
-						 - int_floordivpow2(trx0, res->pdx);
-					prcj = int_floordivpow2(int_ceildiv(pi->y, comp->dy << levelno), res->pdy) 
-						 - int_floordivpow2(try0, res->pdy);
-					pi->precno = prci + prcj * res->pw;
-					for (pi->layno = pi->poc.layno0; pi->layno < pi->poc.layno1; pi->layno++) {
-						index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p;
-						if (!pi->include[index]) {
-							pi->include[index] = 1;
-							return OPJ_TRUE;
-						}	
-LABEL_SKIP:;
-					}
-				}
-			}
-		}
-	}
-	
-	return OPJ_FALSE;
-}
-
-static opj_bool pi_next_cprl(opj_pi_iterator_t * pi) {
-	opj_pi_comp_t *comp = NULL;
-	opj_pi_resolution_t *res = NULL;
-	long index = 0;
-
-	if (!pi->first) {
-		comp = &pi->comps[pi->compno];
-		goto LABEL_SKIP;
-	} else {
-		pi->first = 0;
-	}
-
-	for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1; pi->compno++) {
-		int resno;
-		comp = &pi->comps[pi->compno];
-		pi->dx = 0;
-		pi->dy = 0;
-		for (resno = 0; resno < comp->numresolutions; resno++) {
-			int dx, dy;
-			res = &comp->resolutions[resno];
-			dx = comp->dx * (1 << (res->pdx + comp->numresolutions - 1 - resno));
-			dy = comp->dy * (1 << (res->pdy + comp->numresolutions - 1 - resno));
-			pi->dx = !pi->dx ? dx : int_min(pi->dx, dx);
-			pi->dy = !pi->dy ? dy : int_min(pi->dy, dy);
-		}
-		if (!pi->tp_on){
-			pi->poc.ty0 = pi->ty0;
-			pi->poc.tx0 = pi->tx0;
-			pi->poc.ty1 = pi->ty1;
-			pi->poc.tx1 = pi->tx1;
-		}
-		for (pi->y = pi->poc.ty0; pi->y < pi->poc.ty1; pi->y += pi->dy - (pi->y % pi->dy)) {
-			for (pi->x = pi->poc.tx0; pi->x < pi->poc.tx1; pi->x += pi->dx - (pi->x % pi->dx)) {
-				for (pi->resno = pi->poc.resno0; pi->resno < int_min(pi->poc.resno1, comp->numresolutions); pi->resno++) {
-					int levelno;
-					int trx0, try0;
-					int trx1, try1;
-					int rpx, rpy;
-					int prci, prcj;
-					res = &comp->resolutions[pi->resno];
-					levelno = comp->numresolutions - 1 - pi->resno;
-					trx0 = int_ceildiv(pi->tx0, comp->dx << levelno);
-					try0 = int_ceildiv(pi->ty0, comp->dy << levelno);
-					trx1 = int_ceildiv(pi->tx1, comp->dx << levelno);
-					try1 = int_ceildiv(pi->ty1, comp->dy << levelno);
-					rpx = res->pdx + levelno;
-					rpy = res->pdy + levelno;
-					if (!((pi->y % (comp->dy << rpy) == 0) || ((pi->y == pi->ty0) && ((try0 << levelno) % (1 << rpy))))){
-						continue;	
-					}
-					if (!((pi->x % (comp->dx << rpx) == 0) || ((pi->x == pi->tx0) && ((trx0 << levelno) % (1 << rpx))))){
-						continue; 
-					}
-					
-					if ((res->pw==0)||(res->ph==0)) continue;
-					
-					if ((trx0==trx1)||(try0==try1)) continue;
-					
-					prci = int_floordivpow2(int_ceildiv(pi->x, comp->dx << levelno), res->pdx) 
-						 - int_floordivpow2(trx0, res->pdx);
-					prcj = int_floordivpow2(int_ceildiv(pi->y, comp->dy << levelno), res->pdy) 
-						 - int_floordivpow2(try0, res->pdy);
-					pi->precno = prci + prcj * res->pw;
-					for (pi->layno = pi->poc.layno0; pi->layno < pi->poc.layno1; pi->layno++) {
-						index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p;
-						if (!pi->include[index]) {
-							pi->include[index] = 1;
-							return OPJ_TRUE;
-						}
-LABEL_SKIP:;
-					}
-				}
-			}
-		}
-	}
-	
-	return OPJ_FALSE;
-}
-
-/* 
-==========================================================
-   Packet iterator interface
-==========================================================
-*/
-
-opj_pi_iterator_t *pi_create_decode(opj_image_t *image, opj_cp_t *cp, int tileno) {
-	int p, q;
-	int compno, resno, pino;
-	opj_pi_iterator_t *pi = NULL;
-	opj_tcp_t *tcp = NULL;
-	opj_tccp_t *tccp = NULL;
-
-	tcp = &cp->tcps[tileno];
-
-	pi = (opj_pi_iterator_t*) opj_calloc((tcp->numpocs + 1), sizeof(opj_pi_iterator_t));
-	if(!pi) {
-		/* TODO: throw an error */
-		return NULL;
-	}
-
-	for (pino = 0; pino < tcp->numpocs + 1; pino++) {	/* change */
-		int maxres = 0;
-		int maxprec = 0;
-		p = tileno % cp->tw;
-		q = tileno / cp->tw;
-
-		pi[pino].tx0 = int_max(cp->tx0 + p * cp->tdx, image->x0);
-		pi[pino].ty0 = int_max(cp->ty0 + q * cp->tdy, image->y0);
-		pi[pino].tx1 = int_min(cp->tx0 + (p + 1) * cp->tdx, image->x1);
-		pi[pino].ty1 = int_min(cp->ty0 + (q + 1) * cp->tdy, image->y1);
-		pi[pino].numcomps = image->numcomps;
-
-		pi[pino].comps = (opj_pi_comp_t*) opj_calloc(image->numcomps, sizeof(opj_pi_comp_t));
-		if(!pi[pino].comps) {
-			/* TODO: throw an error */
-			pi_destroy(pi, cp, tileno);
-			return NULL;
-		}
-		
-		for (compno = 0; compno < pi->numcomps; compno++) {
-			int tcx0, tcy0, tcx1, tcy1;
-			opj_pi_comp_t *comp = &pi[pino].comps[compno];
-			tccp = &tcp->tccps[compno];
-			comp->dx = image->comps[compno].dx;
-			comp->dy = image->comps[compno].dy;
-			comp->numresolutions = tccp->numresolutions;
-
-			comp->resolutions = (opj_pi_resolution_t*) opj_calloc(comp->numresolutions, sizeof(opj_pi_resolution_t));
-			if(!comp->resolutions) {
-				/* TODO: throw an error */
-				pi_destroy(pi, cp, tileno);
-				return NULL;
-			}
-
-			tcx0 = int_ceildiv(pi->tx0, comp->dx);
-			tcy0 = int_ceildiv(pi->ty0, comp->dy);
-			tcx1 = int_ceildiv(pi->tx1, comp->dx);
-			tcy1 = int_ceildiv(pi->ty1, comp->dy);
-			if (comp->numresolutions > maxres) {
-				maxres = comp->numresolutions;
-			}
-
-			for (resno = 0; resno < comp->numresolutions; resno++) {
-				int levelno;
-				int rx0, ry0, rx1, ry1;
-				int px0, py0, px1, py1;
-				opj_pi_resolution_t *res = &comp->resolutions[resno];
-				if (tccp->csty & J2K_CCP_CSTY_PRT) {
-					res->pdx = tccp->prcw[resno];
-					res->pdy = tccp->prch[resno];
-				} else {
-					res->pdx = 15;
-					res->pdy = 15;
-				}
-				levelno = comp->numresolutions - 1 - resno;
-				rx0 = int_ceildivpow2(tcx0, levelno);
-				ry0 = int_ceildivpow2(tcy0, levelno);
-				rx1 = int_ceildivpow2(tcx1, levelno);
-				ry1 = int_ceildivpow2(tcy1, levelno);
-				px0 = int_floordivpow2(rx0, res->pdx) << res->pdx;
-				py0 = int_floordivpow2(ry0, res->pdy) << res->pdy;
-				px1 = int_ceildivpow2(rx1, res->pdx) << res->pdx;
-				py1 = int_ceildivpow2(ry1, res->pdy) << res->pdy;
-				res->pw = (rx0==rx1)?0:((px1 - px0) >> res->pdx);
-				res->ph = (ry0==ry1)?0:((py1 - py0) >> res->pdy);
-				
-				if (res->pw*res->ph > maxprec) {
-					maxprec = res->pw*res->ph;
-				}
-				
-			}
-		}
-		
-		tccp = &tcp->tccps[0];
-		pi[pino].step_p = 1;
-		pi[pino].step_c = maxprec * pi[pino].step_p;
-		pi[pino].step_r = image->numcomps * pi[pino].step_c;
-		pi[pino].step_l = maxres * pi[pino].step_r;
-		
-		if (pino == 0) {
-			pi[pino].include = (short int*) opj_calloc(image->numcomps * maxres * tcp->numlayers * maxprec, sizeof(short int));
-			if(!pi[pino].include) {
-				/* TODO: throw an error */
-				pi_destroy(pi, cp, tileno);
-				return NULL;
-			}
-		}
-		else {
-			pi[pino].include = pi[pino - 1].include;
-		}
-		
-		if (tcp->POC == 0) {
-			pi[pino].first = 1;
-			pi[pino].poc.resno0 = 0;
-			pi[pino].poc.compno0 = 0;
-			pi[pino].poc.layno1 = tcp->numlayers;
-			pi[pino].poc.resno1 = maxres;
-			pi[pino].poc.compno1 = image->numcomps;
-			pi[pino].poc.prg = tcp->prg;
-		} else {
-			pi[pino].first = 1;
-			pi[pino].poc.resno0 = tcp->pocs[pino].resno0;
-			pi[pino].poc.compno0 = tcp->pocs[pino].compno0;
-			pi[pino].poc.layno1 = tcp->pocs[pino].layno1;
-			pi[pino].poc.resno1 = tcp->pocs[pino].resno1;
-			pi[pino].poc.compno1 = tcp->pocs[pino].compno1;
-			pi[pino].poc.prg = tcp->pocs[pino].prg;
-		}
-		pi[pino].poc.layno0  = 0;
-		pi[pino].poc.precno0 = 0; 
-		pi[pino].poc.precno1 = maxprec;
-			
-	}
-	
-	return pi;
-}
-
-
-opj_pi_iterator_t *pi_create_decode_v2(	opj_image_t *p_image,
-										opj_cp_v2_t *p_cp,
-										OPJ_UINT32 p_tile_no
-										)
-{
-	// loop
-	OPJ_UINT32 pino;
-	OPJ_UINT32 compno, resno;
-
-	// to store w, h, dx and dy fro all components and resolutions
-	OPJ_UINT32 * l_tmp_data;
-	OPJ_UINT32 ** l_tmp_ptr;
-
-	// encoding prameters to set
-	OPJ_UINT32 l_max_res;
-	OPJ_UINT32 l_max_prec;
-	OPJ_INT32 l_tx0,l_tx1,l_ty0,l_ty1;
-	OPJ_UINT32 l_dx_min,l_dy_min;
-	OPJ_UINT32 l_bound;
-	OPJ_UINT32 l_step_p , l_step_c , l_step_r , l_step_l ;
-	OPJ_UINT32 l_data_stride;
-
-	// pointers
-	opj_pi_iterator_t *l_pi = 00;
-	opj_tcp_v2_t *l_tcp = 00;
-	const opj_tccp_t *l_tccp = 00;
-	opj_pi_comp_t *l_current_comp = 00;
-	opj_image_comp_t * l_img_comp = 00;
-	opj_pi_iterator_t * l_current_pi = 00;
-	OPJ_UINT32 * l_encoding_value_ptr = 00;
-
-	// preconditions in debug
-	assert(p_cp != 00);
-	assert(p_image != 00);
-	assert(p_tile_no < p_cp->tw * p_cp->th);
-
-	// initializations
-	l_tcp = &p_cp->tcps[p_tile_no];
-	l_bound = l_tcp->numpocs+1;
-
-	l_data_stride = 4 * J2K_MAXRLVLS;
-	l_tmp_data = (OPJ_UINT32*)opj_malloc(
-		l_data_stride * p_image->numcomps * sizeof(OPJ_UINT32));
-	if
-		(! l_tmp_data)
-	{
-		return 00;
-	}
-	l_tmp_ptr = (OPJ_UINT32**)opj_malloc(
-		p_image->numcomps * sizeof(OPJ_UINT32 *));
-	if
-		(! l_tmp_ptr)
-	{
-		opj_free(l_tmp_data);
-		return 00;
-	}
-
-	// memory allocation for pi
-	l_pi = pi_create(p_image, p_cp, p_tile_no);
-	if (!l_pi) {
-		opj_free(l_tmp_data);
-		opj_free(l_tmp_ptr);
-		return 00;
-	}
-
-	l_encoding_value_ptr = l_tmp_data;
-	// update pointer array
-	for
-		(compno = 0; compno < p_image->numcomps; ++compno)
-	{
-		l_tmp_ptr[compno] = l_encoding_value_ptr;
-		l_encoding_value_ptr += l_data_stride;
-	}
-	// get encoding parameters
-	get_all_encoding_parameters(p_image,p_cp,p_tile_no,&l_tx0,&l_tx1,&l_ty0,&l_ty1,&l_dx_min,&l_dy_min,&l_max_prec,&l_max_res,l_tmp_ptr);
-
-	// step calculations
-	l_step_p = 1;
-	l_step_c = l_max_prec * l_step_p;
-	l_step_r = p_image->numcomps * l_step_c;
-	l_step_l = l_max_res * l_step_r;
-
-	// set values for first packet iterator
-	l_current_pi = l_pi;
-
-	// memory allocation for include
-	l_current_pi->include = (OPJ_INT16*) opj_calloc((l_tcp->numlayers +1) * l_step_l, sizeof(OPJ_INT16));
-	if
-		(!l_current_pi->include)
-	{
-		opj_free(l_tmp_data);
-		opj_free(l_tmp_ptr);
-		pi_destroy_v2(l_pi, l_bound);
-		return 00;
-	}
-	memset(l_current_pi->include,0, (l_tcp->numlayers + 1) * l_step_l* sizeof(OPJ_INT16));
-
-	// special treatment for the first packet iterator
-	l_current_comp = l_current_pi->comps;
-	l_img_comp = p_image->comps;
-	l_tccp = l_tcp->tccps;
-
-	l_current_pi->tx0 = l_tx0;
-	l_current_pi->ty0 = l_ty0;
-	l_current_pi->tx1 = l_tx1;
-	l_current_pi->ty1 = l_ty1;
-
-	//l_current_pi->dx = l_img_comp->dx;
-	//l_current_pi->dy = l_img_comp->dy;
-
-	l_current_pi->step_p = l_step_p;
-	l_current_pi->step_c = l_step_c;
-	l_current_pi->step_r = l_step_r;
-	l_current_pi->step_l = l_step_l;
-
-	/* allocation for components and number of components has already been calculated by pi_create */
-	for
-		(compno = 0; compno < l_current_pi->numcomps; ++compno)
-	{
-		opj_pi_resolution_t *l_res = l_current_comp->resolutions;
-		l_encoding_value_ptr = l_tmp_ptr[compno];
-
-		l_current_comp->dx = l_img_comp->dx;
-		l_current_comp->dy = l_img_comp->dy;
-		/* resolutions have already been initialized */
-		for
-			(resno = 0; resno < l_current_comp->numresolutions; resno++)
-		{
-			l_res->pdx = *(l_encoding_value_ptr++);
-			l_res->pdy = *(l_encoding_value_ptr++);
-			l_res->pw =  *(l_encoding_value_ptr++);
-			l_res->ph =  *(l_encoding_value_ptr++);
-			++l_res;
-		}
-		++l_current_comp;
-		++l_img_comp;
-		++l_tccp;
-	}
-	++l_current_pi;
-
-	for
-		(pino = 1 ; pino<l_bound ; ++pino )
-	{
-		opj_pi_comp_t *l_current_comp = l_current_pi->comps;
-		opj_image_comp_t * l_img_comp = p_image->comps;
-		l_tccp = l_tcp->tccps;
-
-		l_current_pi->tx0 = l_tx0;
-		l_current_pi->ty0 = l_ty0;
-		l_current_pi->tx1 = l_tx1;
-		l_current_pi->ty1 = l_ty1;
-		//l_current_pi->dx = l_dx_min;
-		//l_current_pi->dy = l_dy_min;
-		l_current_pi->step_p = l_step_p;
-		l_current_pi->step_c = l_step_c;
-		l_current_pi->step_r = l_step_r;
-		l_current_pi->step_l = l_step_l;
-
-		/* allocation for components and number of components has already been calculated by pi_create */
-		for
-			(compno = 0; compno < l_current_pi->numcomps; ++compno)
-		{
-			opj_pi_resolution_t *l_res = l_current_comp->resolutions;
-			l_encoding_value_ptr = l_tmp_ptr[compno];
-
-			l_current_comp->dx = l_img_comp->dx;
-			l_current_comp->dy = l_img_comp->dy;
-			/* resolutions have already been initialized */
-			for
-				(resno = 0; resno < l_current_comp->numresolutions; resno++)
-			{
-				l_res->pdx = *(l_encoding_value_ptr++);
-				l_res->pdy = *(l_encoding_value_ptr++);
-				l_res->pw =  *(l_encoding_value_ptr++);
-				l_res->ph =  *(l_encoding_value_ptr++);
-				++l_res;
-			}
-			++l_current_comp;
-			++l_img_comp;
-			++l_tccp;
-		}
-		// special treatment
-		l_current_pi->include = (l_current_pi-1)->include;
-		++l_current_pi;
-	}
-	opj_free(l_tmp_data);
-	l_tmp_data = 00;
-	opj_free(l_tmp_ptr);
-	l_tmp_ptr = 00;
-	if
-		(l_tcp->POC)
-	{
-		pi_update_decode_poc (l_pi,l_tcp,l_max_prec,l_max_res);
-	}
-	else
-	{
-		pi_update_decode_not_poc(l_pi,l_tcp,l_max_prec,l_max_res);
-	}
-	return l_pi;
-}
-
-opj_pi_iterator_t *pi_initialise_encode(opj_image_t *image, opj_cp_t *cp, int tileno, J2K_T2_MODE t2_mode){ 
-	int p, q, pino;
-	int compno, resno;
-	int maxres = 0;
-	int maxprec = 0;
-	opj_pi_iterator_t *pi = NULL;
-	opj_tcp_t *tcp = NULL;
-	opj_tccp_t *tccp = NULL;
-	
-	tcp = &cp->tcps[tileno];
-
-	pi = (opj_pi_iterator_t*) opj_calloc((tcp->numpocs + 1), sizeof(opj_pi_iterator_t));
-	if(!pi) {	return NULL;}
-	pi->tp_on = cp->tp_on;
-
-	for(pino = 0;pino < tcp->numpocs+1 ; pino ++){
-		p = tileno % cp->tw;
-		q = tileno / cp->tw;
-
-		pi[pino].tx0 = int_max(cp->tx0 + p * cp->tdx, image->x0);
-		pi[pino].ty0 = int_max(cp->ty0 + q * cp->tdy, image->y0);
-		pi[pino].tx1 = int_min(cp->tx0 + (p + 1) * cp->tdx, image->x1);
-		pi[pino].ty1 = int_min(cp->ty0 + (q + 1) * cp->tdy, image->y1);
-		pi[pino].numcomps = image->numcomps;
-		
-		pi[pino].comps = (opj_pi_comp_t*) opj_calloc(image->numcomps, sizeof(opj_pi_comp_t));
-		if(!pi[pino].comps) {
-			pi_destroy(pi, cp, tileno);
-			return NULL;
-		}
-		
-		for (compno = 0; compno < pi[pino].numcomps; compno++) {
-			int tcx0, tcy0, tcx1, tcy1;
-			opj_pi_comp_t *comp = &pi[pino].comps[compno];
-			tccp = &tcp->tccps[compno];
-			comp->dx = image->comps[compno].dx;
-			comp->dy = image->comps[compno].dy;
-			comp->numresolutions = tccp->numresolutions;
-
-			comp->resolutions = (opj_pi_resolution_t*) opj_malloc(comp->numresolutions * sizeof(opj_pi_resolution_t));
-			if(!comp->resolutions) {
-				pi_destroy(pi, cp, tileno);
-				return NULL;
-			}
-
-			tcx0 = int_ceildiv(pi[pino].tx0, comp->dx);
-			tcy0 = int_ceildiv(pi[pino].ty0, comp->dy);
-			tcx1 = int_ceildiv(pi[pino].tx1, comp->dx);
-			tcy1 = int_ceildiv(pi[pino].ty1, comp->dy);
-			if (comp->numresolutions > maxres) {
-				maxres = comp->numresolutions;
-			}
-
-			for (resno = 0; resno < comp->numresolutions; resno++) {
-				int levelno;
-				int rx0, ry0, rx1, ry1;
-				int px0, py0, px1, py1;
-				opj_pi_resolution_t *res = &comp->resolutions[resno];
-				if (tccp->csty & J2K_CCP_CSTY_PRT) {
-					res->pdx = tccp->prcw[resno];
-					res->pdy = tccp->prch[resno];
-				} else {
-					res->pdx = 15;
-					res->pdy = 15;
-				}
-				levelno = comp->numresolutions - 1 - resno;
-				rx0 = int_ceildivpow2(tcx0, levelno);
-				ry0 = int_ceildivpow2(tcy0, levelno);
-				rx1 = int_ceildivpow2(tcx1, levelno);
-				ry1 = int_ceildivpow2(tcy1, levelno);
-				px0 = int_floordivpow2(rx0, res->pdx) << res->pdx;
-				py0 = int_floordivpow2(ry0, res->pdy) << res->pdy;
-				px1 = int_ceildivpow2(rx1, res->pdx) << res->pdx;
-				py1 = int_ceildivpow2(ry1, res->pdy) << res->pdy;
-				res->pw = (rx0==rx1)?0:((px1 - px0) >> res->pdx);
-				res->ph = (ry0==ry1)?0:((py1 - py0) >> res->pdy);
-
-				if (res->pw*res->ph > maxprec) {
-					maxprec = res->pw * res->ph;
-				}
-			}
-		}
-		
-		tccp = &tcp->tccps[0];
-		pi[pino].step_p = 1;
-		pi[pino].step_c = maxprec * pi[pino].step_p;
-		pi[pino].step_r = image->numcomps * pi[pino].step_c;
-		pi[pino].step_l = maxres * pi[pino].step_r;
-		
-		for (compno = 0; compno < pi->numcomps; compno++) {
-			opj_pi_comp_t *comp = &pi->comps[compno];
-			for (resno = 0; resno < comp->numresolutions; resno++) {
-				int dx, dy;
-				opj_pi_resolution_t *res = &comp->resolutions[resno];
-				dx = comp->dx * (1 << (res->pdx + comp->numresolutions - 1 - resno));
-				dy = comp->dy * (1 << (res->pdy + comp->numresolutions - 1 - resno));
-				pi[pino].dx = !pi->dx ? dx : int_min(pi->dx, dx);
-				pi[pino].dy = !pi->dy ? dy : int_min(pi->dy, dy);
-			}
-		}
-
-		if (pino == 0) {
-			pi[pino].include = (short int*) opj_calloc(tcp->numlayers * pi[pino].step_l, sizeof(short int));
-			if(!pi[pino].include) {
-				pi_destroy(pi, cp, tileno);
-				return NULL;
-			}
-		}
-		else {
-			pi[pino].include = pi[pino - 1].include;
-		}
-		
-		/* Generation of boundaries for each prog flag*/
-			if(tcp->POC && ( cp->cinema || ((!cp->cinema) && (t2_mode == FINAL_PASS)))){
-				tcp->pocs[pino].compS= tcp->pocs[pino].compno0;
-				tcp->pocs[pino].compE= tcp->pocs[pino].compno1;
-				tcp->pocs[pino].resS = tcp->pocs[pino].resno0;
-				tcp->pocs[pino].resE = tcp->pocs[pino].resno1;
-				tcp->pocs[pino].layE = tcp->pocs[pino].layno1;
-				tcp->pocs[pino].prg  = tcp->pocs[pino].prg1;
-				if (pino > 0)
-					tcp->pocs[pino].layS = (tcp->pocs[pino].layE > tcp->pocs[pino - 1].layE) ? tcp->pocs[pino - 1].layE : 0;
-			}else {
-				tcp->pocs[pino].compS= 0;
-				tcp->pocs[pino].compE= image->numcomps;
-				tcp->pocs[pino].resS = 0;
-				tcp->pocs[pino].resE = maxres;
-				tcp->pocs[pino].layS = 0;
-				tcp->pocs[pino].layE = tcp->numlayers;
-				tcp->pocs[pino].prg  = tcp->prg;
-			}
-			tcp->pocs[pino].prcS = 0;
-			tcp->pocs[pino].prcE = maxprec;;
-			tcp->pocs[pino].txS = pi[pino].tx0;
-			tcp->pocs[pino].txE = pi[pino].tx1;
-			tcp->pocs[pino].tyS = pi[pino].ty0;
-			tcp->pocs[pino].tyE = pi[pino].ty1;
-			tcp->pocs[pino].dx = pi[pino].dx;
-			tcp->pocs[pino].dy = pi[pino].dy;
-		}
-			return pi;
-	}
-
-
-
-void pi_destroy(opj_pi_iterator_t *pi, opj_cp_t *cp, int tileno) {
-	int compno, pino;
-	opj_tcp_t *tcp = &cp->tcps[tileno];
-	if(pi) {
-		for (pino = 0; pino < tcp->numpocs + 1; pino++) {	
-			if(pi[pino].comps) {
-				for (compno = 0; compno < pi->numcomps; compno++) {
-					opj_pi_comp_t *comp = &pi[pino].comps[compno];
-					if(comp->resolutions) {
-						opj_free(comp->resolutions);
-					}
-				}
-				opj_free(pi[pino].comps);
-			}
-		}
-		if(pi->include) {
-			opj_free(pi->include);
-		}
-		opj_free(pi);
-	}
-}
-
-opj_bool pi_next(opj_pi_iterator_t * pi) {
-	switch (pi->poc.prg) {
-		case LRCP:
-			return pi_next_lrcp(pi);
-		case RLCP:
-			return pi_next_rlcp(pi);
-		case RPCL:
-			return pi_next_rpcl(pi);
-		case PCRL:
-			return pi_next_pcrl(pi);
-		case CPRL:
-			return pi_next_cprl(pi);
-		case PROG_UNKNOWN:
-			return OPJ_FALSE;
-	}
-	
-	return OPJ_FALSE;
-}
-
-opj_bool pi_create_encode( opj_pi_iterator_t *pi, opj_cp_t *cp,int tileno, int pino,int tpnum, int tppos, J2K_T2_MODE t2_mode,int cur_totnum_tp){
-	char prog[4];
-	int i;
-	int incr_top=1,resetX=0;
-	opj_tcp_t *tcps =&cp->tcps[tileno];
-	opj_poc_t *tcp= &tcps->pocs[pino];
-
-	pi[pino].first = 1;
-	pi[pino].poc.prg = tcp->prg;
-
-	switch(tcp->prg){
-		case CPRL: strncpy(prog, "CPRL",4);
-			break;
-		case LRCP: strncpy(prog, "LRCP",4);
-			break;
-		case PCRL: strncpy(prog, "PCRL",4);
-			break;
-		case RLCP: strncpy(prog, "RLCP",4);
-			break;
-		case RPCL: strncpy(prog, "RPCL",4);
-			break;
-		case PROG_UNKNOWN: 
-			return OPJ_TRUE;
-	}
-
-	if(!(cp->tp_on && ((!cp->cinema && (t2_mode == FINAL_PASS)) || cp->cinema))){
-		pi[pino].poc.resno0 = tcp->resS;
-		pi[pino].poc.resno1 = tcp->resE;
-		pi[pino].poc.compno0 = tcp->compS;
-		pi[pino].poc.compno1 = tcp->compE;
-		pi[pino].poc.layno0 = tcp->layS;
-		pi[pino].poc.layno1 = tcp->layE;
-		pi[pino].poc.precno0 = tcp->prcS;
-		pi[pino].poc.precno1 = tcp->prcE;
-		pi[pino].poc.tx0 = tcp->txS;
-		pi[pino].poc.ty0 = tcp->tyS;
-		pi[pino].poc.tx1 = tcp->txE;
-		pi[pino].poc.ty1 = tcp->tyE;
-	}else {
-		if( tpnum < cur_totnum_tp){
-			for(i=3;i>=0;i--){
-				switch(prog[i]){
-				case 'C':
-					if (i > tppos){
-						pi[pino].poc.compno0 = tcp->compS;
-						pi[pino].poc.compno1 = tcp->compE;
-					}else{
-						if (tpnum == 0){
-							tcp->comp_t = tcp->compS;
-							pi[pino].poc.compno0 = tcp->comp_t;
-							pi[pino].poc.compno1 = tcp->comp_t+1;
-							tcp->comp_t+=1;
-						}else{
-							if (incr_top == 1){
-								if(tcp->comp_t ==tcp->compE){
-									tcp->comp_t = tcp->compS;
-									pi[pino].poc.compno0 = tcp->comp_t;
-									pi[pino].poc.compno1 = tcp->comp_t+1;
-									tcp->comp_t+=1;
-									incr_top=1;
-								}else{
-									pi[pino].poc.compno0 = tcp->comp_t;
-									pi[pino].poc.compno1 = tcp->comp_t+1;
-									tcp->comp_t+=1;
-									incr_top=0;
-								}
-							}else{
-								pi[pino].poc.compno0 = tcp->comp_t-1;
-								pi[pino].poc.compno1 = tcp->comp_t;
-							}
-						}
-					}
-					break;
-
-				case 'R':
-					if (i > tppos){
-						pi[pino].poc.resno0 = tcp->resS;
-						pi[pino].poc.resno1 = tcp->resE;
-					}else{
-						if (tpnum == 0){
-							tcp->res_t = tcp->resS;
-							pi[pino].poc.resno0 = tcp->res_t;
-							pi[pino].poc.resno1 = tcp->res_t+1;
-							tcp->res_t+=1;
-						}else{
-							if (incr_top == 1){
-								if(tcp->res_t==tcp->resE){
-									tcp->res_t = tcp->resS;
-									pi[pino].poc.resno0 = tcp->res_t;
-									pi[pino].poc.resno1 = tcp->res_t+1;
-									tcp->res_t+=1;
-									incr_top=1;
-								}else{
-									pi[pino].poc.resno0 = tcp->res_t;
-									pi[pino].poc.resno1 = tcp->res_t+1;
-									tcp->res_t+=1;
-									incr_top=0;
-								}
-							}else{
-								pi[pino].poc.resno0 = tcp->res_t - 1;
-								pi[pino].poc.resno1 = tcp->res_t;
-							}
-						}
-					}
-					break;
-
-				case 'L':
-					if (i > tppos){
-						pi[pino].poc.layno0 = tcp->layS;
-						pi[pino].poc.layno1 = tcp->layE;
-					}else{
-						if (tpnum == 0){
-							tcp->lay_t = tcp->layS;
-							pi[pino].poc.layno0 = tcp->lay_t;
-							pi[pino].poc.layno1 = tcp->lay_t+1;
-							tcp->lay_t+=1;
-						}else{
-							if (incr_top == 1){
-								if(tcp->lay_t == tcp->layE){
-									tcp->lay_t = tcp->layS;
-									pi[pino].poc.layno0 = tcp->lay_t;
-									pi[pino].poc.layno1 = tcp->lay_t+1;
-									tcp->lay_t+=1;
-									incr_top=1;
-								}else{
-									pi[pino].poc.layno0 = tcp->lay_t;
-									pi[pino].poc.layno1 = tcp->lay_t+1;
-									tcp->lay_t+=1;
-									incr_top=0;
-								}
-							}else{
-								pi[pino].poc.layno0 = tcp->lay_t - 1;
-								pi[pino].poc.layno1 = tcp->lay_t;
-							}
-						}
-					}
-					break;
-
-				case 'P':
-					switch(tcp->prg){
-						case LRCP:
-						case RLCP:
-							if (i > tppos){
-								pi[pino].poc.precno0 = tcp->prcS;
-								pi[pino].poc.precno1 = tcp->prcE;
-							}else{
-								if (tpnum == 0){
-									tcp->prc_t = tcp->prcS;
-									pi[pino].poc.precno0 = tcp->prc_t;
-									pi[pino].poc.precno1 = tcp->prc_t+1;
-									tcp->prc_t+=1; 
-								}else{
-									if (incr_top == 1){
-										if(tcp->prc_t == tcp->prcE){
-											tcp->prc_t = tcp->prcS;
-											pi[pino].poc.precno0 = tcp->prc_t;
-											pi[pino].poc.precno1 = tcp->prc_t+1;
-											tcp->prc_t+=1;
-											incr_top=1;
-										}else{
-											pi[pino].poc.precno0 = tcp->prc_t;
-											pi[pino].poc.precno1 = tcp->prc_t+1;
-											tcp->prc_t+=1;
-											incr_top=0;
-										}
-									}else{
-										pi[pino].poc.precno0 = tcp->prc_t - 1;
-										pi[pino].poc.precno1 = tcp->prc_t;
-									}
-								}
-							}
-						break;
-						default:
-							if (i > tppos){
-								pi[pino].poc.tx0 = tcp->txS;
-								pi[pino].poc.ty0 = tcp->tyS;
-								pi[pino].poc.tx1 = tcp->txE;
-								pi[pino].poc.ty1 = tcp->tyE;
-							}else{
-								if (tpnum == 0){
-									tcp->tx0_t = tcp->txS;
-									tcp->ty0_t = tcp->tyS;
-									pi[pino].poc.tx0 = tcp->tx0_t;
-									pi[pino].poc.tx1 = tcp->tx0_t + tcp->dx - (tcp->tx0_t % tcp->dx);
-									pi[pino].poc.ty0 = tcp->ty0_t;
-									pi[pino].poc.ty1 = tcp->ty0_t + tcp->dy - (tcp->ty0_t % tcp->dy);
-									tcp->tx0_t = pi[pino].poc.tx1;
-									tcp->ty0_t = pi[pino].poc.ty1;
-								}else{
-									if (incr_top == 1){
-										if(tcp->tx0_t >= tcp->txE){
-											if(tcp->ty0_t >= tcp->tyE){
-												tcp->ty0_t = tcp->tyS;
-												pi[pino].poc.ty0 = tcp->ty0_t;
-												pi[pino].poc.ty1 = tcp->ty0_t + tcp->dy - (tcp->ty0_t % tcp->dy);
-												tcp->ty0_t = pi[pino].poc.ty1;
-												incr_top=1;resetX=1;
-											}else{
-												pi[pino].poc.ty0 = tcp->ty0_t;
-												pi[pino].poc.ty1 = tcp->ty0_t + tcp->dy - (tcp->ty0_t % tcp->dy);
-												tcp->ty0_t = pi[pino].poc.ty1;
-												incr_top=0;resetX=1;
-											}
-											if(resetX==1){
-												tcp->tx0_t = tcp->txS;
-												pi[pino].poc.tx0 = tcp->tx0_t;
-												pi[pino].poc.tx1 = tcp->tx0_t + tcp->dx- (tcp->tx0_t % tcp->dx);
-												tcp->tx0_t = pi[pino].poc.tx1;
-											}
-										}else{
-											pi[pino].poc.tx0 = tcp->tx0_t;
-											pi[pino].poc.tx1 = tcp->tx0_t + tcp->dx- (tcp->tx0_t % tcp->dx);
-											tcp->tx0_t = pi[pino].poc.tx1;
-											pi[pino].poc.ty0 = tcp->ty0_t - tcp->dy - (tcp->ty0_t % tcp->dy);
-											pi[pino].poc.ty1 = tcp->ty0_t ;
-											incr_top=0;
-										}
-									}else{
-										pi[pino].poc.tx0 = tcp->tx0_t - tcp->dx - (tcp->tx0_t % tcp->dx);
-										pi[pino].poc.tx1 = tcp->tx0_t ;
-										pi[pino].poc.ty0 = tcp->ty0_t - tcp->dy - (tcp->ty0_t % tcp->dy);
-										pi[pino].poc.ty1 = tcp->ty0_t ;
-									}
-								}
-							}
-						break;
-						}
-						break;
-				}		
-			} 
-		}
-	}	
-	return OPJ_FALSE;
-}
-
-
-
-/**
- * Gets the encoding parameters needed to update the coding parameters and all the pocs.
- * The precinct widths, heights, dx and dy for each component at each resolution will be stored as well.
- * the last parameter of the function should be an array of pointers of size nb components, each pointer leading
- * to an area of size 4 * max_res. The data is stored inside this area with the following pattern :
- * dx_compi_res0 , dy_compi_res0 , w_compi_res0, h_compi_res0 , dx_compi_res1 , dy_compi_res1 , w_compi_res1, h_compi_res1 , ...
- *
- * @param	p_image			the image being encoded.
- * @param	p_cp			the coding parameters.
- * @param	tileno			the tile index of the tile being encoded.
- * @param	p_tx0			pointer that will hold the X0 parameter for the tile
- * @param	p_tx1			pointer that will hold the X1 parameter for the tile
- * @param	p_ty0			pointer that will hold the Y0 parameter for the tile
- * @param	p_ty1			pointer that will hold the Y1 parameter for the tile
- * @param	p_max_prec		pointer that will hold the the maximum precision for all the bands of the tile
- * @param	p_max_res		pointer that will hold the the maximum number of resolutions for all the poc inside the tile.
- * @param	dx_min			pointer that will hold the the minimum dx of all the components of all the resolutions for the tile.
- * @param	dy_min			pointer that will hold the the minimum dy of all the components of all the resolutions for the tile.
- * @param	p_resolutions	pointer to an area corresponding to the one described above.
- */
-void get_all_encoding_parameters(
-								const opj_image_t *p_image,
-								const opj_cp_v2_t *p_cp,
-								OPJ_UINT32 tileno,
-								OPJ_INT32 * p_tx0,
-								OPJ_INT32 * p_tx1,
-								OPJ_INT32 * p_ty0,
-								OPJ_INT32 * p_ty1,
-								OPJ_UINT32 * p_dx_min,
-								OPJ_UINT32 * p_dy_min,
-								OPJ_UINT32 * p_max_prec,
-								OPJ_UINT32 * p_max_res,
-								OPJ_UINT32 ** p_resolutions
-							)
-{
-	// loop
-	OPJ_UINT32 compno, resno;
-
-	// pointers
-	const opj_tcp_v2_t *tcp = 00;
-	const opj_tccp_t * l_tccp = 00;
-	const opj_image_comp_t * l_img_comp = 00;
-
-	// to store l_dx, l_dy, w and h for each resolution and component.
-	OPJ_UINT32 * lResolutionPtr;
-
-	// position in x and y of tile
-	OPJ_UINT32 p, q;
-
-	// preconditions in debug
-	assert(p_cp != 00);
-	assert(p_image != 00);
-	assert(tileno < p_cp->tw * p_cp->th);
-
-	// initializations
-	tcp = &p_cp->tcps [tileno];
-	l_tccp = tcp->tccps;
-	l_img_comp = p_image->comps;
-
-	// position in x and y of tile
-
-	p = tileno % p_cp->tw;
-	q = tileno / p_cp->tw;
-
-	/* here calculation of tx0, tx1, ty0, ty1, maxprec, l_dx and l_dy */
-	*p_tx0 = int_max(p_cp->tx0 + p * p_cp->tdx, p_image->x0);
-	*p_tx1 = int_min(p_cp->tx0 + (p + 1) * p_cp->tdx, p_image->x1);
-	*p_ty0 = int_max(p_cp->ty0 + q * p_cp->tdy, p_image->y0);
-	*p_ty1 = int_min(p_cp->ty0 + (q + 1) * p_cp->tdy, p_image->y1);
-
-	// max precision and resolution is 0 (can only grow)
-	*p_max_prec = 0;
-	*p_max_res = 0;
-
-	// take the largest value for dx_min and dy_min
-	*p_dx_min = 0x7fffffff;
-	*p_dy_min  = 0x7fffffff;
-
-	for
-		(compno = 0; compno < p_image->numcomps; ++compno)
-	{
-		// aritmetic variables to calculate
-		OPJ_UINT32 l_level_no;
-		OPJ_INT32 l_rx0, l_ry0, l_rx1, l_ry1;
-		OPJ_INT32 l_px0, l_py0, l_px1, py1;
-		OPJ_UINT32 l_product;
-		OPJ_INT32 l_tcx0, l_tcy0, l_tcx1, l_tcy1;
-		OPJ_UINT32 l_pdx, l_pdy , l_pw , l_ph;
-
-		lResolutionPtr = p_resolutions[compno];
-
-		l_tcx0 = int_ceildiv(*p_tx0, l_img_comp->dx);
-		l_tcy0 = int_ceildiv(*p_ty0, l_img_comp->dy);
-		l_tcx1 = int_ceildiv(*p_tx1, l_img_comp->dx);
-		l_tcy1 = int_ceildiv(*p_ty1, l_img_comp->dy);
-		if
-			(l_tccp->numresolutions > *p_max_res)
-		{
-			*p_max_res = l_tccp->numresolutions;
-		}
-
-		// use custom size for precincts
-		l_level_no = l_tccp->numresolutions - 1;
-		for
-			(resno = 0; resno < l_tccp->numresolutions; ++resno)
-		{
-			OPJ_UINT32 l_dx, l_dy;
-			// precinct width and height
-			l_pdx = l_tccp->prcw[resno];
-			l_pdy = l_tccp->prch[resno];
-			*lResolutionPtr++ = l_pdx;
-			*lResolutionPtr++ = l_pdy;
-			l_dx = l_img_comp->dx * (1 << (l_pdx + l_level_no));
-			l_dy = l_img_comp->dy * (1 << (l_pdy + l_level_no));
-			// take the minimum size for l_dx for each comp and resolution
-			*p_dx_min = int_min(*p_dx_min, l_dx);
-			*p_dy_min = int_min(*p_dy_min, l_dy);
-			// various calculations of extents
-
-			l_rx0 = int_ceildivpow2(l_tcx0, l_level_no);
-			l_ry0 = int_ceildivpow2(l_tcy0, l_level_no);
-			l_rx1 = int_ceildivpow2(l_tcx1, l_level_no);
-			l_ry1 = int_ceildivpow2(l_tcy1, l_level_no);
-			l_px0 = int_floordivpow2(l_rx0, l_pdx) << l_pdx;
-			l_py0 = int_floordivpow2(l_ry0, l_pdy) << l_pdy;
-			l_px1 = int_ceildivpow2(l_rx1, l_pdx) << l_pdx;
-			py1 = int_ceildivpow2(l_ry1, l_pdy) << l_pdy;
-			l_pw = (l_rx0==l_rx1)?0:((l_px1 - l_px0) >> l_pdx);
-			l_ph = (l_ry0==l_ry1)?0:((py1 - l_py0) >> l_pdy);
-			*lResolutionPtr++ = l_pw;
-			*lResolutionPtr++ = l_ph;
-			l_product = l_pw * l_ph;
-			// update precision
-			if
-				(l_product > *p_max_prec)
-			{
-				*p_max_prec = l_product;
-			}
-			--l_level_no;
-		}
-		++l_tccp;
-		++l_img_comp;
-	}
-}
-
-/**
- * Allocates memory for a packet iterator. Data and data sizes are set by this operation.
- * No other data is set. The include section of the packet  iterator is not allocated.
- *
- * @param	p_image		the image used to initialize the packet iterator (in fact only the number of components is relevant.
- * @param	p_cp		the coding parameters.
- * @param	p_tile_no	the index of the tile from which creating the packet iterator.
- */
-opj_pi_iterator_t * pi_create(	const opj_image_t *image,
-								const opj_cp_v2_t *cp,
-								OPJ_UINT32 tileno )
-{
-	// loop
-	OPJ_UINT32 pino, compno;
-	// number of poc in the p_pi
-	OPJ_UINT32 l_poc_bound;
-
-	// pointers to tile coding parameters and components.
-	opj_pi_iterator_t *l_pi = 00;
-	opj_tcp_v2_t *tcp = 00;
-	const opj_tccp_t *tccp = 00;
-
-	// current packet iterator being allocated
-	opj_pi_iterator_t *l_current_pi = 00;
-
-	// preconditions in debug
-	assert(cp != 00);
-	assert(image != 00);
-	assert(tileno < cp->tw * cp->th);
-
-	// initializations
-	tcp = &cp->tcps[tileno];
-	l_poc_bound = tcp->numpocs+1;
-
-	// memory allocations
-	l_pi = (opj_pi_iterator_t*) opj_calloc((l_poc_bound), sizeof(opj_pi_iterator_t));
-	if (!l_pi) {
-		return NULL;
-	}
-	memset(l_pi,0,l_poc_bound * sizeof(opj_pi_iterator_t));
-
-	l_current_pi = l_pi;
-	for (pino = 0; pino < l_poc_bound ; ++pino) {
-
-		l_current_pi->comps = (opj_pi_comp_t*) opj_calloc(image->numcomps, sizeof(opj_pi_comp_t));
-		if (! l_current_pi->comps) {
-			pi_destroy_v2(l_pi, l_poc_bound);
-			return NULL;
-		}
-
-		l_current_pi->numcomps = image->numcomps;
-		memset(l_current_pi->comps,0,image->numcomps * sizeof(opj_pi_comp_t));
-
-		for (compno = 0; compno < image->numcomps; ++compno) {
-			opj_pi_comp_t *comp = &l_current_pi->comps[compno];
-
-			tccp = &tcp->tccps[compno];
-
-			comp->resolutions = (opj_pi_resolution_t*) opj_malloc(tccp->numresolutions * sizeof(opj_pi_resolution_t));
-			if (!comp->resolutions) {
-				pi_destroy_v2(l_pi, l_poc_bound);
-				return 00;
-			}
-
-			comp->numresolutions = tccp->numresolutions;
-			memset(comp->resolutions,0,tccp->numresolutions * sizeof(opj_pi_resolution_t));
-		}
-		++l_current_pi;
-	}
-	return l_pi;
-}
-
-
-
-/**
- * Destroys a packet iterator array.
- *
- * @param	p_pi			the packet iterator array to destroy.
- * @param	p_nb_elements	the number of elements in the array.
- */
-void pi_destroy_v2(
-				opj_pi_iterator_t *p_pi,
-				OPJ_UINT32 p_nb_elements)
-{
-	OPJ_UINT32 compno, pino;
-	opj_pi_iterator_t *l_current_pi = p_pi;
-	if
-		(p_pi)
-	{
-		if
-			(p_pi->include)
-		{
-			opj_free(p_pi->include);
-			p_pi->include = 00;
-		}
-		// TODO
-		for
-			(pino = 0; pino < p_nb_elements; ++pino)
-		{
-			if
-				(l_current_pi->comps)
-			{
-				opj_pi_comp_t *l_current_component = l_current_pi->comps;
-				for
-					(compno = 0; compno < l_current_pi->numcomps; compno++)
-				{
-					if
-						(l_current_component->resolutions)
-					{
-						opj_free(l_current_component->resolutions);
-						l_current_component->resolutions = 00;
-					}
-					++l_current_component;
-				}
-				opj_free(l_current_pi->comps);
-				l_current_pi->comps = 0;
-			}
-			++l_current_pi;
-		}
-		opj_free(p_pi);
-	}
-}
-
-
-
-void pi_update_decode_poc (opj_pi_iterator_t * p_pi,opj_tcp_v2_t * p_tcp,OPJ_UINT32 p_max_precision,OPJ_UINT32 p_max_res)
-{
-	// loop
-	OPJ_UINT32 pino;
-
-	// encoding prameters to set
-	OPJ_UINT32 l_bound;
-
-	opj_pi_iterator_t * l_current_pi = 00;
-	opj_poc_t* l_current_poc = 0;
-
-	// preconditions in debug
-	assert(p_pi != 00);
-	assert(p_tcp != 00);
-
-	// initializations
-	l_bound = p_tcp->numpocs+1;
-	l_current_pi = p_pi;
-	l_current_poc = p_tcp->pocs;
-
-	for
-		(pino = 0;pino<l_bound;++pino)
-	{
-		l_current_pi->poc.prg = l_current_poc->prg;
-		l_current_pi->first = 1;
-
-		l_current_pi->poc.resno0 = l_current_poc->resno0;
-		l_current_pi->poc.compno0 = l_current_poc->compno0;
-		l_current_pi->poc.layno0 = 0;
-		l_current_pi->poc.precno0 = 0;
-		l_current_pi->poc.resno1 = l_current_poc->resno1;
-		l_current_pi->poc.compno1 = l_current_poc->compno1;
-		l_current_pi->poc.layno1 = l_current_poc->layno1;
-		l_current_pi->poc.precno1 = p_max_precision;
-		++l_current_pi;
-		++l_current_poc;
-	}
-}
-
-
-void pi_update_decode_not_poc (opj_pi_iterator_t * p_pi,opj_tcp_v2_t * p_tcp,OPJ_UINT32 p_max_precision,OPJ_UINT32 p_max_res)
-{
-	// loop
-	OPJ_UINT32 pino;
-
-	// encoding prameters to set
-	OPJ_UINT32 l_bound;
-
-	opj_pi_iterator_t * l_current_pi = 00;
-	// preconditions in debug
-	assert(p_tcp != 00);
-	assert(p_pi != 00);
-
-	// initializations
-	l_bound = p_tcp->numpocs+1;
-	l_current_pi = p_pi;
-
-	for
-		(pino = 0;pino<l_bound;++pino)
-	{
-		l_current_pi->poc.prg = p_tcp->prg;
-		l_current_pi->first = 1;
-		l_current_pi->poc.resno0 = 0;
-		l_current_pi->poc.compno0 = 0;
-		l_current_pi->poc.layno0 = 0;
-		l_current_pi->poc.precno0 = 0;
-		l_current_pi->poc.resno1 = p_max_res;
-		l_current_pi->poc.compno1 = l_current_pi->numcomps;
-		l_current_pi->poc.layno1 = p_tcp->numlayers;
-		l_current_pi->poc.precno1 = p_max_precision;
-		++l_current_pi;
-	}
-}
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/pi.h b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/pi.h
deleted file mode 100644
index 5c7b99813d3498607f05084d42c5fdbad7379c60..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/pi.h
+++ /dev/null
@@ -1,179 +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.
- */
-
-#ifndef __PI_H
-#define __PI_H
-/**
-@file pi.h
-@brief Implementation of a packet iterator (PI)
-
-The functions in PI.C have for goal to realize a packet iterator that permits to get the next
-packet following the progression order and change of it. The functions in PI.C are used
-by some function in T2.C.
-*/
-
-/** @defgroup PI PI - Implementation of a packet iterator */
-/*@{*/
-
-/**
-FIXME: documentation
-*/
-typedef struct opj_pi_resolution {
-  int pdx, pdy;
-  int pw, ph;
-} opj_pi_resolution_t;
-
-/**
-FIXME: documentation
-*/
-typedef struct opj_pi_comp {
-  int dx, dy;
-  /** number of resolution levels */
-  int numresolutions;
-  opj_pi_resolution_t *resolutions;
-} opj_pi_comp_t;
-
-/** 
-Packet iterator 
-*/
-typedef struct opj_pi_iterator {
-	/** Enabling Tile part generation*/
-	char tp_on;
-	/** precise if the packet has been already used (usefull for progression order change) */
-	short int *include;
-	/** layer step used to localize the packet in the include vector */
-	int step_l;
-	/** resolution step used to localize the packet in the include vector */
-	int step_r;	
-	/** component step used to localize the packet in the include vector */
-	int step_c;	
-	/** precinct step used to localize the packet in the include vector */
-	int step_p;	
-	/** component that identify the packet */
-	int compno;
-	/** resolution that identify the packet */
-	int resno;
-	/** precinct that identify the packet */
-	int precno;
-	/** layer that identify the packet */
-	int layno;   
-	/** 0 if the first packet */
-	int first;
-	/** progression order change information */
-	opj_poc_t poc;
-	/** number of components in the image */
-	int numcomps;
-	/** Components*/
-	opj_pi_comp_t *comps;
-	int tx0, ty0, tx1, ty1;
-	int x, y, dx, dy;
-} opj_pi_iterator_t;
-
-/** @name Exported functions */
-/*@{*/
-/* ----------------------------------------------------------------------- */
-/**
-Create a packet iterator for Encoder
-@param image Raw image for which the packets will be listed
-@param cp Coding parameters
-@param tileno Number that identifies the tile for which to list the packets
-@param t2_mode If == 0 In Threshold calculation ,If == 1 Final pass
-@return Returns a packet iterator that points to the first packet of the tile
-@see pi_destroy
-*/
-opj_pi_iterator_t *pi_initialise_encode(opj_image_t *image, opj_cp_t *cp, int tileno,J2K_T2_MODE t2_mode);
-/**
-Modify the packet iterator for enabling tile part generation
-@param pi Handle to the packet iterator generated in pi_initialise_encode  
-@param cp Coding parameters
-@param tileno Number that identifies the tile for which to list the packets
-@param pino Iterator index for pi
-@param tpnum Tile part number of the current tile
-@param tppos The position of the tile part flag in the progression order
-@param t2_mode If == 0 In Threshold calculation ,If == 1 Final pass
-@param cur_totnum_tp The total number of tile parts in the current tile
-@return Returns true if an error is detected 
-*/
-opj_bool pi_create_encode(opj_pi_iterator_t *pi, opj_cp_t *cp,int tileno, int pino,int tpnum, int tppos, J2K_T2_MODE t2_mode,int cur_totnum_tp);
-/**
-Create a packet iterator for Decoder
-@param image Raw image for which the packets will be listed
-@param cp Coding parameters
-@param tileno Number that identifies the tile for which to list the packets
-@return Returns a packet iterator that points to the first packet of the tile
-@see pi_destroy
-*/
-opj_pi_iterator_t *pi_create_decode(opj_image_t * image, opj_cp_t * cp, int tileno);
-
-
-/**
-Create a packet iterator for Decoder
-@param image Raw image for which the packets will be listed
-@param cp Coding parameters
-@param tileno Number that identifies the tile for which to list the packets
-@return Returns a packet iterator that points to the first packet of the tile
-@see pi_destroy
-*/
-opj_pi_iterator_t *pi_create_decode_v2(struct opj_image * image, struct opj_cp_v2 * cp, OPJ_UINT32 tileno);
-
-
-/**
-Destroy a packet iterator
-@param pi Previously created packet iterator
-@param cp Coding parameters
-@param tileno Number that identifies the tile for which the packets were listed
-@see pi_create
-*/
-void pi_destroy(opj_pi_iterator_t *pi, opj_cp_t *cp, int tileno);
-
-
-/**
- * Destroys a packet iterator array.
- *
- * @param	p_pi			the packet iterator array to destroy.
- * @param	p_nb_elements	the number of elements in the array.
- */
-void pi_destroy_v2(
-				opj_pi_iterator_t *p_pi,
-				OPJ_UINT32 p_nb_elements);
-
-/**
-Modify the packet iterator to point to the next packet
-@param pi Packet iterator to modify
-@return Returns false if pi pointed to the last packet or else returns true 
-*/
-opj_bool pi_next(opj_pi_iterator_t * pi);
-/* ----------------------------------------------------------------------- */
-/*@}*/
-
-/*@}*/
-
-#endif /* __PI_H */
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/ppix_manager.c b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/ppix_manager.c
deleted file mode 100644
index f4c077aa1e338d63718e240744953a861ac57d4e..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/ppix_manager.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * $Id: ppix_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 "opj_includes.h"
-
-/* 
- * Write faix box of ppix
- *
- * @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_ppixfaix( int coff, int compno, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_cio_t *cio);
-
-int write_ppix( int coff, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_cio_t *cio)
-{
-  int len, lenp, compno, i;
-  opj_jp2_box_t *box;
-
-  //  printf("cstr_info.packno %d\n", cstr_info.packno); //NMAX?
-
-  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_PPIX, 4);  /* PPIX           */
-
-    write_manf( i, cstr_info.numcomps, box, cio);
-    
-    for (compno=0; compno<cstr_info.numcomps; compno++){
-      box[compno].length = write_ppixfaix( 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_ppixfaix( 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;
-
-  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_pos-packet.start_pos+1, size_of_coding); /* length         */
-	  
-	  num_packet++;
-	}
-      }
-    }
-  
-    while( num_packet < nmax){     /* PADDING */
-      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;
-}
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/raw.c b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/raw.c
deleted file mode 100644
index 3d231bfdc6b3151ea1ca8acf47535dad6818f7b6..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/raw.c
+++ /dev/null
@@ -1,87 +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) 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 "opj_includes.h"
-
-/* 
-==========================================================
-   local functions
-==========================================================
-*/
-
-
-/* 
-==========================================================
-   RAW encoding interface
-==========================================================
-*/
-
-opj_raw_t* raw_create(void) {
-	opj_raw_t *raw = (opj_raw_t*)opj_malloc(sizeof(opj_raw_t));
-	return raw;
-}
-
-void raw_destroy(opj_raw_t *raw) {
-	if(raw) {
-		opj_free(raw);
-	}
-}
-
-int raw_numbytes(opj_raw_t *raw) {
-	return raw->bp - raw->start;
-}
-
-void raw_init_dec(opj_raw_t *raw, unsigned char *bp, int len) {
-	raw->start = bp;
-	raw->lenmax = len;
-	raw->len = 0;
-	raw->c = 0;
-	raw->ct = 0;
-}
-
-int raw_decode(opj_raw_t *raw) {
-	int d;
-	if (raw->ct == 0) {
-		raw->ct = 8;
-		if (raw->len == raw->lenmax) {
-			raw->c = 0xff;
-		} else {
-			if (raw->c == 0xff) {
-				raw->ct = 7;
-			}
-			raw->c = *(raw->start + raw->len);
-			raw->len++;
-		}
-	}
-	raw->ct--;
-	d = (raw->c >> raw->ct) & 0x01;
-	
-	return d;
-}
-
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/raw.h b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/raw.h
deleted file mode 100644
index 3c4b372f3f6182fbcc2cea57203144db4d2d848b..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/raw.h
+++ /dev/null
@@ -1,100 +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) 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.
- */
-
-#ifndef __RAW_H
-#define __RAW_H
-/**
-@file raw.h
-@brief Implementation of operations for raw encoding (RAW)
-
-The functions in RAW.C have for goal to realize the operation of raw encoding linked
-with the corresponding mode switch.
-*/
-
-/** @defgroup RAW RAW - Implementation of operations for raw encoding */
-/*@{*/
-
-/**
-RAW encoding operations
-*/
-typedef struct opj_raw {
-	/** temporary buffer where bits are coded or decoded */
-	unsigned char c;
-	/** number of bits already read or free to write */
-	unsigned int ct;
-	/** maximum length to decode */
-	unsigned int lenmax;
-	/** length decoded */
-	unsigned int len;
-	/** pointer to the current position in the buffer */
-	unsigned char *bp;
-	/** pointer to the start of the buffer */
-	unsigned char *start;
-	/** pointer to the end of the buffer */
-	unsigned char *end;
-} opj_raw_t;
-
-/** @name Exported functions */
-/*@{*/
-/* ----------------------------------------------------------------------- */
-/**
-Create a new RAW handle 
-@return Returns a new RAW handle if successful, returns NULL otherwise
-*/
-opj_raw_t* raw_create(void);
-/**
-Destroy a previously created RAW handle
-@param raw RAW handle to destroy
-*/
-void raw_destroy(opj_raw_t *raw);
-/**
-Return the number of bytes written/read since initialisation
-@param raw RAW handle to destroy
-@return Returns the number of bytes already encoded
-*/
-int raw_numbytes(opj_raw_t *raw);
-/**
-Initialize the decoder
-@param raw RAW handle
-@param bp Pointer to the start of the buffer from which the bytes will be read
-@param len Length of the input buffer
-*/
-void raw_init_dec(opj_raw_t *raw, unsigned char *bp, int len);
-/**
-Decode a symbol using raw-decoder. Cfr p.506 TAUBMAN
-@param raw RAW handle
-@return Returns the decoded symbol (0 or 1)
-*/
-int raw_decode(opj_raw_t *raw);
-/* ----------------------------------------------------------------------- */
-/*@}*/
-
-/*@}*/
-
-#endif /* __RAW_H */
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/t1.c b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/t1.c
deleted file mode 100644
index 92da1d7b58dad3c22fc7fd23b408d34b1fc30dd3..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/t1.c
+++ /dev/null
@@ -1,1998 +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
- * Copyright (c) 2007, Callum Lerwick <seg@haxxed.com>
- * 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"
-#include "t1_luts.h"
-
-/** @defgroup T1 T1 - Implementation of the tier-1 coding */
-/*@{*/
-
-/** @name Local static functions */
-/*@{*/
-
-static INLINE char t1_getctxno_zc(int f, int orient);
-static char t1_getctxno_sc(int f);
-static INLINE int t1_getctxno_mag(int f);
-static char t1_getspb(int f);
-static short t1_getnmsedec_sig(int x, int bitpos);
-static short t1_getnmsedec_ref(int x, int bitpos);
-static void t1_updateflags(flag_t *flagsp, int s, int stride);
-/**
-Encode significant pass
-*/
-static void t1_enc_sigpass_step(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int orient,
-		int bpno,
-		int one,
-		int *nmsedec,
-		char type,
-		int vsc);
-
-/**
-Decode significant pass
-*/
-static void t1_dec_sigpass_step(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		OPJ_INT32 *datap,
-		OPJ_UINT32 orient,
-		OPJ_INT32 oneplushalf,
-		OPJ_BYTE type,
-		OPJ_UINT32 vsc);
-/**
-Decode significant pass
-*/
-static INLINE void t1_dec_sigpass_step_raw(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int orient,
-		int oneplushalf,
-		int vsc);
-static INLINE void t1_dec_sigpass_step_mqc(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int orient,
-		int oneplushalf);
-static INLINE void t1_dec_sigpass_step_mqc_vsc(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int orient,
-		int oneplushalf,
-		int vsc);
-/**
-Encode significant pass
-*/
-static void t1_enc_sigpass(
-		opj_t1_t *t1,
-		int bpno,
-		int orient,
-		int *nmsedec,
-		char type,
-		int cblksty);
-
-/**
-Decode significant pass
-*/
-static void t1_dec_sigpass(
-		opj_t1_t *t1,
-		OPJ_INT32 bpno,
-		OPJ_UINT32 orient,
-		OPJ_BYTE type,
-		OPJ_UINT32 cblksty);
-
-/**
-Decode significant pass
-*/
-static void t1_dec_sigpass_raw(
-		opj_t1_t *t1,
-		int bpno,
-		int orient,
-		int cblksty);
-static void t1_dec_sigpass_mqc(
-		opj_t1_t *t1,
-		int bpno,
-		int orient);
-static void t1_dec_sigpass_mqc_vsc(
-		opj_t1_t *t1,
-		int bpno,
-		int orient);
-/**
-Encode refinement pass
-*/
-static void t1_enc_refpass_step(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int bpno,
-		int one,
-		int *nmsedec,
-		char type,
-		int vsc);
-/**
-Decode refinement pass
-*/
-static void INLINE t1_dec_refpass_step_raw(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int poshalf,
-		int neghalf,
-		int vsc);
-static void INLINE t1_dec_refpass_step_mqc(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int poshalf,
-		int neghalf);
-static void INLINE t1_dec_refpass_step_mqc_vsc(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int poshalf,
-		int neghalf,
-		int vsc);
-
-/**
-Encode refinement pass
-*/
-static void t1_enc_refpass(
-		opj_t1_t *t1,
-		int bpno,
-		int *nmsedec,
-		char type,
-		int cblksty);
-
-/**
-Decode refinement pass
-*/
-static void t1_dec_refpass(
-		opj_t1_t *t1,
-		OPJ_INT32 bpno,
-		OPJ_BYTE type,
-		OPJ_UINT32 cblksty);
-
-/**
-Decode refinement pass
-*/
-static void t1_dec_refpass_step(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		OPJ_INT32 *datap,
-		OPJ_INT32 poshalf,
-		OPJ_INT32 neghalf,
-		OPJ_BYTE type,
-		OPJ_UINT32 vsc);
-
-/**
-Decode refinement pass
-*/
-static void t1_dec_refpass_raw(
-		opj_t1_t *t1,
-		int bpno,
-		int cblksty);
-static void t1_dec_refpass_mqc(
-		opj_t1_t *t1,
-		int bpno);
-static void t1_dec_refpass_mqc_vsc(
-		opj_t1_t *t1,
-		int bpno);
-/**
-Encode clean-up pass
-*/
-static void t1_enc_clnpass_step(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int orient,
-		int bpno,
-		int one,
-		int *nmsedec,
-		int partial,
-		int vsc);
-/**
-Decode clean-up pass
-*/
-static void t1_dec_clnpass_step_partial(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int orient,
-		int oneplushalf);
-static void t1_dec_clnpass_step(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int orient,
-		int oneplushalf);
-static void t1_dec_clnpass_step_vsc(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int orient,
-		int oneplushalf,
-		int partial,
-		int vsc);
-/**
-Encode clean-up pass
-*/
-static void t1_enc_clnpass(
-		opj_t1_t *t1,
-		int bpno,
-		int orient,
-		int *nmsedec,
-		int cblksty);
-/**
-Decode clean-up pass
-*/
-static void t1_dec_clnpass(
-		opj_t1_t *t1,
-		int bpno,
-		int orient,
-		int cblksty);
-static double t1_getwmsedec(
-		int nmsedec,
-		int compno,
-		int level,
-		int orient,
-		int bpno,
-		int qmfbid,
-		double stepsize,
-		int numcomps,
-		int mct);
-/**
-Encode 1 code-block
-@param t1 T1 handle
-@param cblk Code-block coding parameters
-@param orient
-@param compno Component number
-@param level
-@param qmfbid
-@param stepsize
-@param cblksty Code-block style
-@param numcomps
-@param mct
-@param tile
-*/
-static void t1_encode_cblk(
-		opj_t1_t *t1,
-		opj_tcd_cblk_enc_t* cblk,
-		int orient,
-		int compno,
-		int level,
-		int qmfbid,
-		double stepsize,
-		int cblksty,
-		int numcomps,
-		int mct,
-		opj_tcd_tile_t * tile);
-/**
-Decode 1 code-block
-@param t1 T1 handle
-@param cblk Code-block coding parameters
-@param orient
-@param roishift Region of interest shifting value
-@param cblksty Code-block style
-*/
-static void t1_decode_cblk(
-		opj_t1_t *t1,
-		opj_tcd_cblk_dec_t* cblk,
-		int orient,
-		int roishift,
-		int cblksty);
-
-/**
-Decode 1 code-block
-@param t1 T1 handle
-@param cblk Code-block coding parameters
-@param orient
-@param roishift Region of interest shifting value
-@param cblksty Code-block style
-*/
-static void t1_decode_cblk_v2(
-		opj_t1_t *t1,
-		opj_tcd_cblk_dec_v2_t* cblk,
-		OPJ_UINT32 orient,
-		OPJ_UINT32 roishift,
-		OPJ_UINT32 cblksty);
-
-/*@}*/
-
-/*@}*/
-
-/* ----------------------------------------------------------------------- */
-
-static char t1_getctxno_zc(int f, int orient) {
-	return lut_ctxno_zc[(orient << 8) | (f & T1_SIG_OTH)];
-}
-
-static char t1_getctxno_sc(int f) {
-	return lut_ctxno_sc[(f & (T1_SIG_PRIM | T1_SGN)) >> 4];
-}
-
-static int t1_getctxno_mag(int f) {
-	int tmp1 = (f & T1_SIG_OTH) ? T1_CTXNO_MAG + 1 : T1_CTXNO_MAG;
-	int tmp2 = (f & T1_REFINE) ? T1_CTXNO_MAG + 2 : tmp1;
-	return (tmp2);
-}
-
-static char t1_getspb(int f) {
-	return lut_spb[(f & (T1_SIG_PRIM | T1_SGN)) >> 4];
-}
-
-static short t1_getnmsedec_sig(int x, int bitpos) {
-	if (bitpos > T1_NMSEDEC_FRACBITS) {
-		return lut_nmsedec_sig[(x >> (bitpos - T1_NMSEDEC_FRACBITS)) & ((1 << T1_NMSEDEC_BITS) - 1)];
-	}
-	
-	return lut_nmsedec_sig0[x & ((1 << T1_NMSEDEC_BITS) - 1)];
-}
-
-static short t1_getnmsedec_ref(int x, int bitpos) {
-	if (bitpos > T1_NMSEDEC_FRACBITS) {
-		return lut_nmsedec_ref[(x >> (bitpos - T1_NMSEDEC_FRACBITS)) & ((1 << T1_NMSEDEC_BITS) - 1)];
-	}
-
-    return lut_nmsedec_ref0[x & ((1 << T1_NMSEDEC_BITS) - 1)];
-}
-
-static void t1_updateflags(flag_t *flagsp, int s, int stride) {
-	flag_t *np = flagsp - stride;
-	flag_t *sp = flagsp + stride;
-
-	static const flag_t mod[] = {
-		T1_SIG_S, T1_SIG_S|T1_SGN_S,
-		T1_SIG_E, T1_SIG_E|T1_SGN_E,
-		T1_SIG_W, T1_SIG_W|T1_SGN_W,
-		T1_SIG_N, T1_SIG_N|T1_SGN_N
-	};
-
-	np[-1] |= T1_SIG_SE;
-	np[0]  |= mod[s];
-	np[1]  |= T1_SIG_SW;
-
-	flagsp[-1] |= mod[s+2];
-	flagsp[0]  |= T1_SIG;
-	flagsp[1]  |= mod[s+4];
-
-	sp[-1] |= T1_SIG_NE;
-	sp[0]  |= mod[s+6];
-	sp[1]  |= T1_SIG_NW;
-}
-
-static void t1_enc_sigpass_step(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int orient,
-		int bpno,
-		int one,
-		int *nmsedec,
-		char type,
-		int vsc)
-{
-	int v, flag;
-	
-	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
-	
-	flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
-	if ((flag & T1_SIG_OTH) && !(flag & (T1_SIG | T1_VISIT))) {
-		v = int_abs(*datap) & one ? 1 : 0;
-		mqc_setcurctx(mqc, t1_getctxno_zc(flag, orient));	/* ESSAI */
-		if (type == T1_TYPE_RAW) {	/* BYPASS/LAZY MODE */
-			mqc_bypass_enc(mqc, v);
-		} else {
-			mqc_encode(mqc, v);
-		}
-		if (v) {
-			v = *datap < 0 ? 1 : 0;
-			*nmsedec +=	t1_getnmsedec_sig(int_abs(*datap), bpno + T1_NMSEDEC_FRACBITS);
-			mqc_setcurctx(mqc, t1_getctxno_sc(flag));	/* ESSAI */
-			if (type == T1_TYPE_RAW) {	/* BYPASS/LAZY MODE */
-				mqc_bypass_enc(mqc, v);
-			} else {
-				mqc_encode(mqc, v ^ t1_getspb(flag));
-			}
-			t1_updateflags(flagsp, v, t1->flags_stride);
-		}
-		*flagsp |= T1_VISIT;
-	}
-}
-
-static INLINE void t1_dec_sigpass_step_raw(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int orient,
-		int oneplushalf,
-		int vsc)
-{
-	int v, flag;
-	opj_raw_t *raw = t1->raw;	/* RAW component */
-	
-	OPJ_ARG_NOT_USED(orient);
-	
-	flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
-	if ((flag & T1_SIG_OTH) && !(flag & (T1_SIG | T1_VISIT))) {
-			if (raw_decode(raw)) {
-				v = raw_decode(raw);	/* ESSAI */
-				*datap = v ? -oneplushalf : oneplushalf;
-				t1_updateflags(flagsp, v, t1->flags_stride);
-			}
-		*flagsp |= T1_VISIT;
-	}
-}				/* VSC and  BYPASS by Antonin */
-
-static INLINE void t1_dec_sigpass_step_mqc(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int orient,
-		int oneplushalf)
-{
-	int v, flag;
-	
-	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
-	
-	flag = *flagsp;
-	if ((flag & T1_SIG_OTH) && !(flag & (T1_SIG | T1_VISIT))) {
-			mqc_setcurctx(mqc, t1_getctxno_zc(flag, orient));
-			if (mqc_decode(mqc)) {
-				mqc_setcurctx(mqc, t1_getctxno_sc(flag));
-				v = mqc_decode(mqc) ^ t1_getspb(flag);
-				*datap = v ? -oneplushalf : oneplushalf;
-				t1_updateflags(flagsp, v, t1->flags_stride);
-			}
-		*flagsp |= T1_VISIT;
-	}
-}				/* VSC and  BYPASS by Antonin */
-
-static INLINE void t1_dec_sigpass_step_mqc_vsc(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int orient,
-		int oneplushalf,
-		int vsc)
-{
-	int v, flag;
-	
-	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
-	
-	flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
-	if ((flag & T1_SIG_OTH) && !(flag & (T1_SIG | T1_VISIT))) {
-		mqc_setcurctx(mqc, t1_getctxno_zc(flag, orient));
-		if (mqc_decode(mqc)) {
-			mqc_setcurctx(mqc, t1_getctxno_sc(flag));
-			v = mqc_decode(mqc) ^ t1_getspb(flag);
-			*datap = v ? -oneplushalf : oneplushalf;
-			t1_updateflags(flagsp, v, t1->flags_stride);
-		}
-		*flagsp |= T1_VISIT;
-	}
-}				/* VSC and  BYPASS by Antonin */
-
-static void t1_enc_sigpass(
-		opj_t1_t *t1,
-		int bpno,
-		int orient,
-		int *nmsedec,
-		char type,
-		int cblksty)
-{
-	int i, j, k, one, vsc;
-	*nmsedec = 0;
-	one = 1 << (bpno + T1_NMSEDEC_FRACBITS);
-	for (k = 0; k < t1->h; k += 4) {
-		for (i = 0; i < t1->w; ++i) {
-			for (j = k; j < k + 4 && j < t1->h; ++j) {
-				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
-				t1_enc_sigpass_step(
-						t1,
-						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
-						&t1->data[(j * t1->w) + i],
-						orient,
-						bpno,
-						one,
-						nmsedec,
-						type,
-						vsc);
-			}
-		}
-	}
-}
-
-static void t1_dec_sigpass_raw(
-		opj_t1_t *t1,
-		int bpno,
-		int orient,
-		int cblksty)
-{
-	int i, j, k, one, half, oneplushalf, vsc;
-	one = 1 << bpno;
-	half = one >> 1;
-	oneplushalf = one | half;
-	for (k = 0; k < t1->h; k += 4) {
-		for (i = 0; i < t1->w; ++i) {
-			for (j = k; j < k + 4 && j < t1->h; ++j) {
-				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
-				t1_dec_sigpass_step_raw(
-						t1,
-						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
-						&t1->data[(j * t1->w) + i],
-						orient,
-						oneplushalf,
-						vsc);
-			}
-		}
-	}
-}				/* VSC and  BYPASS by Antonin */
-
-static void t1_dec_sigpass_mqc(
-		opj_t1_t *t1,
-		int bpno,
-		int orient)
-{
-	int i, j, k, one, half, oneplushalf;
-	int *data1 = t1->data;
-	flag_t *flags1 = &t1->flags[1];
-	one = 1 << bpno;
-	half = one >> 1;
-	oneplushalf = one | half;
-	for (k = 0; k < (t1->h & ~3); k += 4) {
-		for (i = 0; i < t1->w; ++i) {
-			int *data2 = data1 + i;
-			flag_t *flags2 = flags1 + i;
-			flags2 += t1->flags_stride;
-			t1_dec_sigpass_step_mqc(t1, flags2, data2, orient, oneplushalf);
-			data2 += t1->w;
-			flags2 += t1->flags_stride;
-			t1_dec_sigpass_step_mqc(t1, flags2, data2, orient, oneplushalf);
-			data2 += t1->w;
-			flags2 += t1->flags_stride;
-			t1_dec_sigpass_step_mqc(t1, flags2, data2, orient, oneplushalf);
-			data2 += t1->w;
-			flags2 += t1->flags_stride;
-			t1_dec_sigpass_step_mqc(t1, flags2, data2, orient, oneplushalf);
-			data2 += t1->w;
-		}
-		data1 += t1->w << 2;
-		flags1 += t1->flags_stride << 2;
-	}
-	for (i = 0; i < t1->w; ++i) {
-		int *data2 = data1 + i;
-		flag_t *flags2 = flags1 + i;
-		for (j = k; j < t1->h; ++j) {
-			flags2 += t1->flags_stride;
-			t1_dec_sigpass_step_mqc(t1, flags2, data2, orient, oneplushalf);
-			data2 += t1->w;
-		}
-	}
-}				/* VSC and  BYPASS by Antonin */
-
-static void t1_dec_sigpass_mqc_vsc(
-		opj_t1_t *t1,
-		int bpno,
-		int orient)
-{
-	int i, j, k, one, half, oneplushalf, vsc;
-	one = 1 << bpno;
-	half = one >> 1;
-	oneplushalf = one | half;
-	for (k = 0; k < t1->h; k += 4) {
-		for (i = 0; i < t1->w; ++i) {
-			for (j = k; j < k + 4 && j < t1->h; ++j) {
-				vsc = (j == k + 3 || j == t1->h - 1) ? 1 : 0;
-				t1_dec_sigpass_step_mqc_vsc(
-						t1,
-						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
-						&t1->data[(j * t1->w) + i],
-						orient,
-						oneplushalf,
-						vsc);
-			}
-		}
-	}
-}				/* VSC and  BYPASS by Antonin */
-
-static void t1_enc_refpass_step(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int bpno,
-		int one,
-		int *nmsedec,
-		char type,
-		int vsc)
-{
-	int v, flag;
-	
-	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
-	
-	flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
-	if ((flag & (T1_SIG | T1_VISIT)) == T1_SIG) {
-		*nmsedec += t1_getnmsedec_ref(int_abs(*datap), bpno + T1_NMSEDEC_FRACBITS);
-		v = int_abs(*datap) & one ? 1 : 0;
-		mqc_setcurctx(mqc, t1_getctxno_mag(flag));	/* ESSAI */
-		if (type == T1_TYPE_RAW) {	/* BYPASS/LAZY MODE */
-			mqc_bypass_enc(mqc, v);
-		} else {
-			mqc_encode(mqc, v);
-		}
-		*flagsp |= T1_REFINE;
-	}
-}
-
-static INLINE void t1_dec_refpass_step_raw(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int poshalf,
-		int neghalf,
-		int vsc)
-{
-	int v, t, flag;
-	
-	opj_raw_t *raw = t1->raw;	/* RAW component */
-	
-	flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
-	if ((flag & (T1_SIG | T1_VISIT)) == T1_SIG) {
-			v = raw_decode(raw);
-		t = v ? poshalf : neghalf;
-		*datap += *datap < 0 ? -t : t;
-		*flagsp |= T1_REFINE;
-	}
-}				/* VSC and  BYPASS by Antonin  */
-
-static INLINE void t1_dec_refpass_step_mqc(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int poshalf,
-		int neghalf)
-{
-	int v, t, flag;
-	
-	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
-	
-	flag = *flagsp;
-	if ((flag & (T1_SIG | T1_VISIT)) == T1_SIG) {
-		mqc_setcurctx(mqc, t1_getctxno_mag(flag));	/* ESSAI */
-			v = mqc_decode(mqc);
-		t = v ? poshalf : neghalf;
-		*datap += *datap < 0 ? -t : t;
-		*flagsp |= T1_REFINE;
-		}
-}				/* VSC and  BYPASS by Antonin  */
-
-static INLINE void t1_dec_refpass_step_mqc_vsc(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int poshalf,
-		int neghalf,
-		int vsc)
-{
-	int v, t, flag;
-	
-	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
-	
-	flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
-	if ((flag & (T1_SIG | T1_VISIT)) == T1_SIG) {
-		mqc_setcurctx(mqc, t1_getctxno_mag(flag));	/* ESSAI */
-		v = mqc_decode(mqc);
-		t = v ? poshalf : neghalf;
-		*datap += *datap < 0 ? -t : t;
-		*flagsp |= T1_REFINE;
-	}
-}				/* VSC and  BYPASS by Antonin  */
-
-static void t1_enc_refpass(
-		opj_t1_t *t1,
-		int bpno,
-		int *nmsedec,
-		char type,
-		int cblksty)
-{
-	int i, j, k, one, vsc;
-	*nmsedec = 0;
-	one = 1 << (bpno + T1_NMSEDEC_FRACBITS);
-	for (k = 0; k < t1->h; k += 4) {
-		for (i = 0; i < t1->w; ++i) {
-			for (j = k; j < k + 4 && j < t1->h; ++j) {
-				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
-				t1_enc_refpass_step(
-						t1,
-						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
-						&t1->data[(j * t1->w) + i],
-						bpno,
-						one,
-						nmsedec,
-						type,
-						vsc);
-			}
-		}
-	}
-}
-
-static void t1_dec_refpass_raw(
-		opj_t1_t *t1,
-		int bpno,
-		int cblksty)
-{
-	int i, j, k, one, poshalf, neghalf;
-	int vsc;
-	one = 1 << bpno;
-	poshalf = one >> 1;
-	neghalf = bpno > 0 ? -poshalf : -1;
-	for (k = 0; k < t1->h; k += 4) {
-		for (i = 0; i < t1->w; ++i) {
-			for (j = k; j < k + 4 && j < t1->h; ++j) {
-				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
-				t1_dec_refpass_step_raw(
-						t1,
-						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
-						&t1->data[(j * t1->w) + i],
-						poshalf,
-						neghalf,
-						vsc);
-			}
-		}
-	}
-}				/* VSC and  BYPASS by Antonin */
-
-static void t1_dec_refpass_mqc(
-		opj_t1_t *t1,
-		int bpno)
-{
-	int i, j, k, one, poshalf, neghalf;
-	int *data1 = t1->data;
-	flag_t *flags1 = &t1->flags[1];
-	one = 1 << bpno;
-	poshalf = one >> 1;
-	neghalf = bpno > 0 ? -poshalf : -1;
-	for (k = 0; k < (t1->h & ~3); k += 4) {
-		for (i = 0; i < t1->w; ++i) {
-			int *data2 = data1 + i;
-			flag_t *flags2 = flags1 + i;
-			flags2 += t1->flags_stride;
-			t1_dec_refpass_step_mqc(t1, flags2, data2, poshalf, neghalf);
-			data2 += t1->w;
-			flags2 += t1->flags_stride;
-			t1_dec_refpass_step_mqc(t1, flags2, data2, poshalf, neghalf);
-			data2 += t1->w;
-			flags2 += t1->flags_stride;
-			t1_dec_refpass_step_mqc(t1, flags2, data2, poshalf, neghalf);
-			data2 += t1->w;
-			flags2 += t1->flags_stride;
-			t1_dec_refpass_step_mqc(t1, flags2, data2, poshalf, neghalf);
-			data2 += t1->w;
-		}
-		data1 += t1->w << 2;
-		flags1 += t1->flags_stride << 2;
-	}
-	for (i = 0; i < t1->w; ++i) {
-		int *data2 = data1 + i;
-		flag_t *flags2 = flags1 + i;
-		for (j = k; j < t1->h; ++j) {
-			flags2 += t1->flags_stride;
-			t1_dec_refpass_step_mqc(t1, flags2, data2, poshalf, neghalf);
-			data2 += t1->w;
-		}
-	}
-}				/* VSC and  BYPASS by Antonin */
-
-static void t1_dec_refpass_mqc_vsc(
-		opj_t1_t *t1,
-		int bpno)
-{
-	int i, j, k, one, poshalf, neghalf;
-	int vsc;
-	one = 1 << bpno;
-	poshalf = one >> 1;
-	neghalf = bpno > 0 ? -poshalf : -1;
-	for (k = 0; k < t1->h; k += 4) {
-		for (i = 0; i < t1->w; ++i) {
-			for (j = k; j < k + 4 && j < t1->h; ++j) {
-				vsc = ((j == k + 3 || j == t1->h - 1)) ? 1 : 0;
-				t1_dec_refpass_step_mqc_vsc(
-						t1,
-						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
-						&t1->data[(j * t1->w) + i],
-						poshalf,
-						neghalf,
-						vsc);
-			}
-		}
-	}
-}				/* VSC and  BYPASS by Antonin */
-
-static void t1_enc_clnpass_step(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int orient,
-		int bpno,
-		int one,
-		int *nmsedec,
-		int partial,
-		int vsc)
-{
-	int v, flag;
-	
-	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
-	
-	flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
-	if (partial) {
-		goto LABEL_PARTIAL;
-	}
-	if (!(*flagsp & (T1_SIG | T1_VISIT))) {
-		mqc_setcurctx(mqc, t1_getctxno_zc(flag, orient));
-		v = int_abs(*datap) & one ? 1 : 0;
-		mqc_encode(mqc, v);
-		if (v) {
-LABEL_PARTIAL:
-			*nmsedec += t1_getnmsedec_sig(int_abs(*datap), bpno + T1_NMSEDEC_FRACBITS);
-			mqc_setcurctx(mqc, t1_getctxno_sc(flag));
-			v = *datap < 0 ? 1 : 0;
-			mqc_encode(mqc, v ^ t1_getspb(flag));
-			t1_updateflags(flagsp, v, t1->flags_stride);
-		}
-	}
-	*flagsp &= ~T1_VISIT;
-}
-
-static void t1_dec_clnpass_step_partial(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int orient,
-		int oneplushalf)
-{
-	int v, flag;
-	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
-	
-	OPJ_ARG_NOT_USED(orient);
-	
-	flag = *flagsp;
-	mqc_setcurctx(mqc, t1_getctxno_sc(flag));
-	v = mqc_decode(mqc) ^ t1_getspb(flag);
-	*datap = v ? -oneplushalf : oneplushalf;
-	t1_updateflags(flagsp, v, t1->flags_stride);
-	*flagsp &= ~T1_VISIT;
-}				/* VSC and  BYPASS by Antonin */
-
-static void t1_dec_clnpass_step(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int orient,
-		int oneplushalf)
-{
-	int v, flag;
-	
-	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
-	
-	flag = *flagsp;
-	if (!(flag & (T1_SIG | T1_VISIT))) {
-		mqc_setcurctx(mqc, t1_getctxno_zc(flag, orient));
-		if (mqc_decode(mqc)) {
-			mqc_setcurctx(mqc, t1_getctxno_sc(flag));
-			v = mqc_decode(mqc) ^ t1_getspb(flag);
-			*datap = v ? -oneplushalf : oneplushalf;
-			t1_updateflags(flagsp, v, t1->flags_stride);
-		}
-	}
-	*flagsp &= ~T1_VISIT;
-}				/* VSC and  BYPASS by Antonin */
-
-static void t1_dec_clnpass_step_vsc(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		int *datap,
-		int orient,
-		int oneplushalf,
-		int partial,
-		int vsc)
-{
-	int v, flag;
-	
-	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
-	
-	flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
-	if (partial) {
-		goto LABEL_PARTIAL;
-	}
-	if (!(flag & (T1_SIG | T1_VISIT))) {
-		mqc_setcurctx(mqc, t1_getctxno_zc(flag, orient));
-		if (mqc_decode(mqc)) {
-LABEL_PARTIAL:
-			mqc_setcurctx(mqc, t1_getctxno_sc(flag));
-			v = mqc_decode(mqc) ^ t1_getspb(flag);
-			*datap = v ? -oneplushalf : oneplushalf;
-			t1_updateflags(flagsp, v, t1->flags_stride);
-		}
-	}
-	*flagsp &= ~T1_VISIT;
-}
-
-static void t1_enc_clnpass(
-		opj_t1_t *t1,
-		int bpno,
-		int orient,
-		int *nmsedec,
-		int cblksty)
-{
-	int i, j, k, one, agg, runlen, vsc;
-	
-	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
-	
-	*nmsedec = 0;
-	one = 1 << (bpno + T1_NMSEDEC_FRACBITS);
-	for (k = 0; k < t1->h; k += 4) {
-		for (i = 0; i < t1->w; ++i) {
-			if (k + 3 < t1->h) {
-				if (cblksty & J2K_CCP_CBLKSTY_VSC) {
-					agg = !(MACRO_t1_flags(1 + k,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 1,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 2,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| (MACRO_t1_flags(1 + k + 3,1 + i) 
-						& (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW |	T1_SGN_S))) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
-				} else {
-					agg = !(MACRO_t1_flags(1 + k,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 1,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 2,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 3,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
-				}
-			} else {
-				agg = 0;
-			}
-			if (agg) {
-				for (runlen = 0; runlen < 4; ++runlen) {
-					if (int_abs(t1->data[((k + runlen)*t1->w) + i]) & one)
-						break;
-				}
-				mqc_setcurctx(mqc, T1_CTXNO_AGG);
-				mqc_encode(mqc, runlen != 4);
-				if (runlen == 4) {
-					continue;
-				}
-				mqc_setcurctx(mqc, T1_CTXNO_UNI);
-				mqc_encode(mqc, runlen >> 1);
-				mqc_encode(mqc, runlen & 1);
-			} else {
-				runlen = 0;
-			}
-			for (j = k + runlen; j < k + 4 && j < t1->h; ++j) {
-				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
-				t1_enc_clnpass_step(
-						t1,
-						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
-						&t1->data[(j * t1->w) + i],
-						orient,
-						bpno,
-						one,
-						nmsedec,
-						agg && (j == k + runlen),
-						vsc);
-			}
-		}
-	}
-}
-
-static void t1_dec_clnpass(
-		opj_t1_t *t1,
-		int bpno,
-		int orient,
-		int cblksty)
-{
-	int i, j, k, one, half, oneplushalf, agg, runlen, vsc;
-	int segsym = cblksty & J2K_CCP_CBLKSTY_SEGSYM;
-	
-	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
-	
-	one = 1 << bpno;
-	half = one >> 1;
-	oneplushalf = one | half;
-	if (cblksty & J2K_CCP_CBLKSTY_VSC) {
-	for (k = 0; k < t1->h; k += 4) {
-		for (i = 0; i < t1->w; ++i) {
-			if (k + 3 < t1->h) {
-					agg = !(MACRO_t1_flags(1 + k,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 1,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| MACRO_t1_flags(1 + k + 2,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-						|| (MACRO_t1_flags(1 + k + 3,1 + i) 
-						& (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW |	T1_SGN_S))) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
-				} else {
-				agg = 0;
-			}
-			if (agg) {
-				mqc_setcurctx(mqc, T1_CTXNO_AGG);
-				if (!mqc_decode(mqc)) {
-					continue;
-				}
-				mqc_setcurctx(mqc, T1_CTXNO_UNI);
-				runlen = mqc_decode(mqc);
-				runlen = (runlen << 1) | mqc_decode(mqc);
-			} else {
-				runlen = 0;
-			}
-			for (j = k + runlen; j < k + 4 && j < t1->h; ++j) {
-					vsc = (j == k + 3 || j == t1->h - 1) ? 1 : 0;
-					t1_dec_clnpass_step_vsc(
-						t1,
-						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
-						&t1->data[(j * t1->w) + i],
-						orient,
-						oneplushalf,
-						agg && (j == k + runlen),
-						vsc);
-			}
-		}
-	}
-	} else {
-		int *data1 = t1->data;
-		flag_t *flags1 = &t1->flags[1];
-		for (k = 0; k < (t1->h & ~3); k += 4) {
-			for (i = 0; i < t1->w; ++i) {
-				int *data2 = data1 + i;
-				flag_t *flags2 = flags1 + i;
-				agg = !(MACRO_t1_flags(1 + k,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					|| MACRO_t1_flags(1 + k + 1,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					|| MACRO_t1_flags(1 + k + 2,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
-					|| MACRO_t1_flags(1 + k + 3,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
-				if (agg) {
-					mqc_setcurctx(mqc, T1_CTXNO_AGG);
-					if (!mqc_decode(mqc)) {
-						continue;
-					}
-					mqc_setcurctx(mqc, T1_CTXNO_UNI);
-					runlen = mqc_decode(mqc);
-					runlen = (runlen << 1) | mqc_decode(mqc);
-					flags2 += runlen * t1->flags_stride;
-					data2 += runlen * t1->w;
-					for (j = k + runlen; j < k + 4 && j < t1->h; ++j) {
-						flags2 += t1->flags_stride;
-						if (agg && (j == k + runlen)) {
-							t1_dec_clnpass_step_partial(t1, flags2, data2, orient, oneplushalf);
-						} else {
-							t1_dec_clnpass_step(t1, flags2, data2, orient, oneplushalf);
-						}
-						data2 += t1->w;
-					}
-				} else {
-					flags2 += t1->flags_stride;
-					t1_dec_clnpass_step(t1, flags2, data2, orient, oneplushalf);
-					data2 += t1->w;
-					flags2 += t1->flags_stride;
-					t1_dec_clnpass_step(t1, flags2, data2, orient, oneplushalf);
-					data2 += t1->w;
-					flags2 += t1->flags_stride;
-					t1_dec_clnpass_step(t1, flags2, data2, orient, oneplushalf);
-					data2 += t1->w;
-					flags2 += t1->flags_stride;
-					t1_dec_clnpass_step(t1, flags2, data2, orient, oneplushalf);
-					data2 += t1->w;
-				}
-			}
-			data1 += t1->w << 2;
-			flags1 += t1->flags_stride << 2;
-		}
-		for (i = 0; i < t1->w; ++i) {
-			int *data2 = data1 + i;
-			flag_t *flags2 = flags1 + i;
-			for (j = k; j < t1->h; ++j) {
-				flags2 += t1->flags_stride;
-				t1_dec_clnpass_step(t1, flags2, data2, orient, oneplushalf);
-				data2 += t1->w;
-			}
-		}
-	}
-
-	if (segsym) {
-		int v = 0;
-		mqc_setcurctx(mqc, T1_CTXNO_UNI);
-		v = mqc_decode(mqc);
-		v = (v << 1) | mqc_decode(mqc);
-		v = (v << 1) | mqc_decode(mqc);
-		v = (v << 1) | mqc_decode(mqc);
-		/*
-		if (v!=0xa) {
-			opj_event_msg(t1->cinfo, EVT_WARNING, "Bad segmentation symbol %x\n", v);
-		} 
-		*/
-	}
-}				/* VSC and  BYPASS by Antonin */
-
-
-/** mod fixed_quality */
-static double t1_getwmsedec(
-		int nmsedec,
-		int compno,
-		int level,
-		int orient,
-		int bpno,
-		int qmfbid,
-		double stepsize,
-		int numcomps,
-		int mct)
-{
-	double w1, w2, wmsedec;
-	if (qmfbid == 1) {
-		w1 = (mct && numcomps==3) ? mct_getnorm(compno) : 1.0;
-		w2 = dwt_getnorm(level, orient);
-	} else {			/* if (qmfbid == 0) */
-		w1 = (mct && numcomps==3) ? mct_getnorm_real(compno) : 1.0;
-		w2 = dwt_getnorm_real(level, orient);
-	}
-	wmsedec = w1 * w2 * stepsize * (1 << bpno);
-	wmsedec *= wmsedec * nmsedec / 8192.0;
-	
-	return wmsedec;
-}
-
-static opj_bool allocate_buffers(
-		opj_t1_t *t1,
-		int w,
-		int h)
-{
-	int datasize=w * h;
-	int flagssize;
-
-	if(datasize > t1->datasize){
-		opj_aligned_free(t1->data);
-		t1->data = (int*) opj_aligned_malloc(datasize * sizeof(int));
-		if(!t1->data){
-			return OPJ_FALSE;
-		}
-		t1->datasize=datasize;
-	}
-	memset(t1->data,0,datasize * sizeof(int));
-
-	t1->flags_stride=w+2;
-	flagssize=t1->flags_stride * (h+2);
-
-	if(flagssize > t1->flagssize){
-		opj_aligned_free(t1->flags);
-		t1->flags = (flag_t*) opj_aligned_malloc(flagssize * sizeof(flag_t));
-		if(!t1->flags){
-			return OPJ_FALSE;
-		}
-		t1->flagssize=flagssize;
-	}
-	memset(t1->flags,0,flagssize * sizeof(flag_t));
-
-	t1->w=w;
-	t1->h=h;
-
-	return OPJ_TRUE;
-}
-
-/** mod fixed_quality */
-static void t1_encode_cblk(
-		opj_t1_t *t1,
-		opj_tcd_cblk_enc_t* cblk,
-		int orient,
-		int compno,
-		int level,
-		int qmfbid,
-		double stepsize,
-		int cblksty,
-		int numcomps,
-		int mct,
-		opj_tcd_tile_t * tile)
-{
-	double cumwmsedec = 0.0;
-
-	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
-
-	int passno, bpno, passtype;
-	int nmsedec = 0;
-	int i, max;
-	char type = T1_TYPE_MQ;
-	double tempwmsedec;
-
-	max = 0;
-	for (i = 0; i < t1->w * t1->h; ++i) {
-		int tmp = abs(t1->data[i]);
-		max = int_max(max, tmp);
-	}
-
-	cblk->numbps = max ? (int_floorlog2(max) + 1) - T1_NMSEDEC_FRACBITS : 0;
-	
-	bpno = cblk->numbps - 1;
-	passtype = 2;
-	
-	mqc_resetstates(mqc);
-	mqc_setstate(mqc, T1_CTXNO_UNI, 0, 46);
-	mqc_setstate(mqc, T1_CTXNO_AGG, 0, 3);
-	mqc_setstate(mqc, T1_CTXNO_ZC, 0, 4);
-	mqc_init_enc(mqc, cblk->data);
-	
-	for (passno = 0; bpno >= 0; ++passno) {
-		opj_tcd_pass_t *pass = &cblk->passes[passno];
-		int correction = 3;
-		type = ((bpno < (cblk->numbps - 4)) && (passtype < 2) && (cblksty & J2K_CCP_CBLKSTY_LAZY)) ? T1_TYPE_RAW : T1_TYPE_MQ;
-		
-		switch (passtype) {
-			case 0:
-				t1_enc_sigpass(t1, bpno, orient, &nmsedec, type, cblksty);
-				break;
-			case 1:
-				t1_enc_refpass(t1, bpno, &nmsedec, type, cblksty);
-				break;
-			case 2:
-				t1_enc_clnpass(t1, bpno, orient, &nmsedec, cblksty);
-				/* code switch SEGMARK (i.e. SEGSYM) */
-				if (cblksty & J2K_CCP_CBLKSTY_SEGSYM)
-					mqc_segmark_enc(mqc);
-				break;
-		}
-		
-		/* fixed_quality */
-		tempwmsedec = t1_getwmsedec(nmsedec, compno, level, orient, bpno, qmfbid, stepsize, numcomps, mct);
-		cumwmsedec += tempwmsedec;
-		tile->distotile += tempwmsedec;
-		
-		/* Code switch "RESTART" (i.e. TERMALL) */
-		if ((cblksty & J2K_CCP_CBLKSTY_TERMALL)	&& !((passtype == 2) && (bpno - 1 < 0))) {
-			if (type == T1_TYPE_RAW) {
-				mqc_flush(mqc);
-				correction = 1;
-				/* correction = mqc_bypass_flush_enc(); */
-			} else {			/* correction = mqc_restart_enc(); */
-				mqc_flush(mqc);
-				correction = 1;
-			}
-			pass->term = 1;
-		} else {
-			if (((bpno < (cblk->numbps - 4) && (passtype > 0)) 
-				|| ((bpno == (cblk->numbps - 4)) && (passtype == 2))) && (cblksty & J2K_CCP_CBLKSTY_LAZY)) {
-				if (type == T1_TYPE_RAW) {
-					mqc_flush(mqc);
-					correction = 1;
-					/* correction = mqc_bypass_flush_enc(); */
-				} else {		/* correction = mqc_restart_enc(); */
-					mqc_flush(mqc);
-					correction = 1;
-				}
-				pass->term = 1;
-			} else {
-				pass->term = 0;
-			}
-		}
-		
-		if (++passtype == 3) {
-			passtype = 0;
-			bpno--;
-		}
-		
-		if (pass->term && bpno > 0) {
-			type = ((bpno < (cblk->numbps - 4)) && (passtype < 2) && (cblksty & J2K_CCP_CBLKSTY_LAZY)) ? T1_TYPE_RAW : T1_TYPE_MQ;
-			if (type == T1_TYPE_RAW)
-				mqc_bypass_init_enc(mqc);
-			else
-				mqc_restart_init_enc(mqc);
-		}
-		
-		pass->distortiondec = cumwmsedec;
-		pass->rate = mqc_numbytes(mqc) + correction;	/* FIXME */
-		
-		/* Code-switch "RESET" */
-		if (cblksty & J2K_CCP_CBLKSTY_RESET)
-			mqc_reset_enc(mqc);
-	}
-	
-	/* Code switch "ERTERM" (i.e. PTERM) */
-	if (cblksty & J2K_CCP_CBLKSTY_PTERM)
-		mqc_erterm_enc(mqc);
-	else /* Default coding */ if (!(cblksty & J2K_CCP_CBLKSTY_LAZY))
-		mqc_flush(mqc);
-	
-	cblk->totalpasses = passno;
-
-	for (passno = 0; passno<cblk->totalpasses; passno++) {
-		opj_tcd_pass_t *pass = &cblk->passes[passno];
-		if (pass->rate > mqc_numbytes(mqc))
-			pass->rate = mqc_numbytes(mqc);
-		/*Preventing generation of FF as last data byte of a pass*/
-		if((pass->rate>1) && (cblk->data[pass->rate - 1] == 0xFF)){
-			pass->rate--;
-		}
-		pass->len = pass->rate - (passno == 0 ? 0 : cblk->passes[passno - 1].rate);		
-	}
-}
-
-static void t1_decode_cblk(
-		opj_t1_t *t1,
-		opj_tcd_cblk_dec_t* cblk,
-		int orient,
-		int roishift,
-		int cblksty)
-{
-	opj_raw_t *raw = t1->raw;	/* RAW component */
-	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
-
-	int bpno, passtype;
-	int segno, passno;
-	char type = T1_TYPE_MQ; /* BYPASS mode */
-
-	if(!allocate_buffers(
-				t1,
-				cblk->x1 - cblk->x0,
-				cblk->y1 - cblk->y0))
-	{
-		return;
-	}
-
-	bpno = roishift + cblk->numbps - 1;
-	passtype = 2;
-	
-	mqc_resetstates(mqc);
-	mqc_setstate(mqc, T1_CTXNO_UNI, 0, 46);
-	mqc_setstate(mqc, T1_CTXNO_AGG, 0, 3);
-	mqc_setstate(mqc, T1_CTXNO_ZC, 0, 4);
-	
-	for (segno = 0; segno < cblk->numsegs; ++segno) {
-		opj_tcd_seg_t *seg = &cblk->segs[segno];
-		
-		/* BYPASS mode */
-		type = ((bpno <= (cblk->numbps - 1) - 4) && (passtype < 2) && (cblksty & J2K_CCP_CBLKSTY_LAZY)) ? T1_TYPE_RAW : T1_TYPE_MQ;
-		/* FIXME: slviewer gets here with a null pointer. Why? Partially downloaded and/or corrupt textures? */
-		if(seg->data == NULL){
-			continue;
-		}
-		if (type == T1_TYPE_RAW) {
-			raw_init_dec(raw, (*seg->data) + seg->dataindex, seg->len);
-		} else {
-			mqc_init_dec(mqc, (*seg->data) + seg->dataindex, seg->len);
-		}
-		
-		for (passno = 0; passno < seg->numpasses; ++passno) {
-			switch (passtype) {
-				case 0:
-					if (type == T1_TYPE_RAW) {
-						t1_dec_sigpass_raw(t1, bpno+1, orient, cblksty);
-					} else {
-						if (cblksty & J2K_CCP_CBLKSTY_VSC) {
-							t1_dec_sigpass_mqc_vsc(t1, bpno+1, orient);
-						} else {
-							t1_dec_sigpass_mqc(t1, bpno+1, orient);
-						}
-					}
-					break;
-				case 1:
-					if (type == T1_TYPE_RAW) {
-						t1_dec_refpass_raw(t1, bpno+1, cblksty);
-					} else {
-						if (cblksty & J2K_CCP_CBLKSTY_VSC) {
-							t1_dec_refpass_mqc_vsc(t1, bpno+1);
-						} else {
-							t1_dec_refpass_mqc(t1, bpno+1);
-						}
-					}
-					break;
-				case 2:
-					t1_dec_clnpass(t1, bpno+1, orient, cblksty);
-					break;
-			}
-			
-			if ((cblksty & J2K_CCP_CBLKSTY_RESET) && type == T1_TYPE_MQ) {
-				mqc_resetstates(mqc);
-				mqc_setstate(mqc, T1_CTXNO_UNI, 0, 46);				
-				mqc_setstate(mqc, T1_CTXNO_AGG, 0, 3);
-				mqc_setstate(mqc, T1_CTXNO_ZC, 0, 4);
-			}
-			if (++passtype == 3) {
-				passtype = 0;
-				bpno--;
-			}
-		}
-	}
-}
-
-/* ----------------------------------------------------------------------- */
-
-opj_t1_t* t1_create(opj_common_ptr cinfo) {
-	opj_t1_t *t1 = (opj_t1_t*) opj_malloc(sizeof(opj_t1_t));
-	if(!t1)
-		return NULL;
-
-	t1->cinfo = cinfo;
-	/* create MQC and RAW handles */
-	t1->mqc = mqc_create();
-	t1->raw = raw_create();
-
-	t1->data=NULL;
-	t1->flags=NULL;
-	t1->datasize=0;
-	t1->flagssize=0;
-
-	return t1;
-}
-
-void t1_destroy(opj_t1_t *t1) {
-	if(t1) {
-		/* destroy MQC and RAW handles */
-		mqc_destroy(t1->mqc);
-		raw_destroy(t1->raw);
-		opj_aligned_free(t1->data);
-		opj_aligned_free(t1->flags);
-		opj_free(t1);
-	}
-}
-
-void t1_encode_cblks(
-		opj_t1_t *t1,
-		opj_tcd_tile_t *tile,
-		opj_tcp_t *tcp)
-{
-	int compno, resno, bandno, precno, cblkno;
-
-	tile->distotile = 0;		/* fixed_quality */
-
-	for (compno = 0; compno < tile->numcomps; ++compno) {
-		opj_tcd_tilecomp_t* tilec = &tile->comps[compno];
-		opj_tccp_t* tccp = &tcp->tccps[compno];
-		int tile_w = tilec->x1 - tilec->x0;
-
-		for (resno = 0; resno < tilec->numresolutions; ++resno) {
-			opj_tcd_resolution_t *res = &tilec->resolutions[resno];
-
-			for (bandno = 0; bandno < res->numbands; ++bandno) {
-				opj_tcd_band_t* restrict band = &res->bands[bandno];
-        int bandconst = 8192 * 8192 / ((int) floor(band->stepsize * 8192));
-
-				for (precno = 0; precno < res->pw * res->ph; ++precno) {
-					opj_tcd_precinct_t *prc = &band->precincts[precno];
-
-					for (cblkno = 0; cblkno < prc->cw * prc->ch; ++cblkno) {
-						opj_tcd_cblk_enc_t* cblk = &prc->cblks.enc[cblkno];
-						int* restrict datap;
-						int* restrict tiledp;
-						int cblk_w;
-						int cblk_h;
-						int i, j;
-
-						int x = cblk->x0 - band->x0;
-						int y = cblk->y0 - band->y0;
-						if (band->bandno & 1) {
-							opj_tcd_resolution_t *pres = &tilec->resolutions[resno - 1];
-							x += pres->x1 - pres->x0;
-						}
-						if (band->bandno & 2) {
-							opj_tcd_resolution_t *pres = &tilec->resolutions[resno - 1];
-							y += pres->y1 - pres->y0;
-						}
-
-						if(!allocate_buffers(
-									t1,
-									cblk->x1 - cblk->x0,
-									cblk->y1 - cblk->y0))
-						{
-							return;
-						}
-
-						datap=t1->data;
-						cblk_w = t1->w;
-						cblk_h = t1->h;
-
-						tiledp=&tilec->data[(y * tile_w) + x];
-						if (tccp->qmfbid == 1) {
-							for (j = 0; j < cblk_h; ++j) {
-								for (i = 0; i < cblk_w; ++i) {
-									int tmp = tiledp[(j * tile_w) + i];
-									datap[(j * cblk_w) + i] = tmp << T1_NMSEDEC_FRACBITS;
-								}
-							}
-						} else {		/* if (tccp->qmfbid == 0) */
-							for (j = 0; j < cblk_h; ++j) {
-								for (i = 0; i < cblk_w; ++i) {
-									int tmp = tiledp[(j * tile_w) + i];
-									datap[(j * cblk_w) + i] =
-										fix_mul(
-										tmp,
-										bandconst) >> (11 - T1_NMSEDEC_FRACBITS);
-								}
-							}
-						}
-
-						t1_encode_cblk(
-								t1,
-								cblk,
-								band->bandno,
-								compno,
-								tilec->numresolutions - 1 - resno,
-								tccp->qmfbid,
-								band->stepsize,
-								tccp->cblksty,
-								tile->numcomps,
-								tcp->mct,
-								tile);
-
-					} /* cblkno */
-				} /* precno */
-			} /* bandno */
-		} /* resno  */
-	} /* compno  */
-}
-
-void t1_decode_cblks(
-		opj_t1_t* t1,
-		opj_tcd_tilecomp_t* tilec,
-		opj_tccp_t* tccp)
-{
-	int resno, bandno, precno, cblkno;
-
-	int tile_w = tilec->x1 - tilec->x0;
-
-	for (resno = 0; resno < tilec->numresolutions; ++resno) {
-		opj_tcd_resolution_t* res = &tilec->resolutions[resno];
-
-		for (bandno = 0; bandno < res->numbands; ++bandno) {
-			opj_tcd_band_t* restrict band = &res->bands[bandno];
-
-			for (precno = 0; precno < res->pw * res->ph; ++precno) {
-				opj_tcd_precinct_t* precinct = &band->precincts[precno];
-
-				for (cblkno = 0; cblkno < precinct->cw * precinct->ch; ++cblkno) {
-					opj_tcd_cblk_dec_t* cblk = &precinct->cblks.dec[cblkno];
-					int* restrict datap;
-					int cblk_w, cblk_h;
-					int x, y;
-					int i, j;
-
-					t1_decode_cblk(
-							t1,
-							cblk,
-							band->bandno,
-							tccp->roishift,
-							tccp->cblksty);
-
-					x = cblk->x0 - band->x0;
-					y = cblk->y0 - band->y0;
-					if (band->bandno & 1) {
-						opj_tcd_resolution_t* pres = &tilec->resolutions[resno - 1];
-						x += pres->x1 - pres->x0;
-					}
-					if (band->bandno & 2) {
-						opj_tcd_resolution_t* pres = &tilec->resolutions[resno - 1];
-						y += pres->y1 - pres->y0;
-					}
-
-					datap=t1->data;
-					cblk_w = t1->w;
-					cblk_h = t1->h;
-
-					if (tccp->roishift) {
-						int thresh = 1 << tccp->roishift;
-						for (j = 0; j < cblk_h; ++j) {
-							for (i = 0; i < cblk_w; ++i) {
-								int val = datap[(j * cblk_w) + i];
-								int mag = abs(val);
-								if (mag >= thresh) {
-									mag >>= tccp->roishift;
-									datap[(j * cblk_w) + i] = val < 0 ? -mag : mag;
-								}
-							}
-						}
-					}
-
-					if (tccp->qmfbid == 1) {
-						int* restrict tiledp = &tilec->data[(y * tile_w) + x];
-						for (j = 0; j < cblk_h; ++j) {
-							for (i = 0; i < cblk_w; ++i) {
-								int tmp = datap[(j * cblk_w) + i];
-								((int*)tiledp)[(j * tile_w) + i] = tmp / 2;
-							}
-						}
-					} else {		/* if (tccp->qmfbid == 0) */
-						float* restrict tiledp = (float*) &tilec->data[(y * tile_w) + x];
-						for (j = 0; j < cblk_h; ++j) {
-							float* restrict tiledp2 = tiledp;
-							for (i = 0; i < cblk_w; ++i) {
-								float tmp = *datap * band->stepsize;
-								*tiledp2 = tmp;
-								datap++;
-								tiledp2++;
-							}
-							tiledp += tile_w;
-						}
-					}
-					opj_free(cblk->data);
-					opj_free(cblk->segs);
-				} /* cblkno */
-				opj_free(precinct->cblks.dec);
-			} /* precno */
-		} /* bandno */
-	} /* resno */
-}
-
-
-
-/* ----------------------------------------------------------------------- */
-/**
- * Creates a new Tier 1 handle
- * and initializes the look-up tables of the Tier-1 coder/decoder
- * @return a new T1 handle if successful, returns NULL otherwise
-*/
-opj_t1_t* t1_create_v2()
-{
-	opj_t1_t *l_t1 = 00;
-
-	l_t1 = (opj_t1_t*) opj_malloc(sizeof(opj_t1_t));
-	if
-		(!l_t1)
-	{
-		return 00;
-	}
-	memset(l_t1,0,sizeof(opj_t1_t));
-
-	/* create MQC and RAW handles */
-	l_t1->mqc = mqc_create();
-	if
-		(! l_t1->mqc)
-	{
-		t1_destroy(l_t1);
-		return 00;
-	}
-	l_t1->raw = raw_create();
-	if
-		(! l_t1->raw)
-	{
-		t1_destroy(l_t1);
-		return 00;
-	}
-	return l_t1;
-}
-
-
-/**
- * Destroys a previously created T1 handle
- *
- * @param p_t1 Tier 1 handle to destroy
-*/
-void t1_destroy_v2(opj_t1_t *p_t1)
-{
-	if
-		(! p_t1)
-	{
-		return;
-	}
-
-	/* destroy MQC and RAW handles */
-	mqc_destroy(p_t1->mqc);
-	p_t1->mqc = 00;
-	raw_destroy(p_t1->raw);
-	p_t1->raw = 00;
-	if
-		(p_t1->data)
-	{
-		opj_aligned_free(p_t1->data);
-		p_t1->data = 00;
-	}
-	if
-		(p_t1->flags)
-	{
-		opj_aligned_free(p_t1->flags);
-		p_t1->flags = 00;
-	}
-	opj_free(p_t1);
-}
-
-void t1_decode_cblks_v2(
-		opj_t1_t* t1,
-		opj_tcd_tilecomp_v2_t* tilec,
-		opj_tccp_t* tccp)
-{
-	OPJ_UINT32 resno, bandno, precno, cblkno;
-	OPJ_UINT32 tile_w = tilec->x1 - tilec->x0;
-
-	for (resno = 0; resno < tilec->minimum_num_resolutions; ++resno) {
-		opj_tcd_resolution_v2_t* res = &tilec->resolutions[resno];
-
-		for (bandno = 0; bandno < res->numbands; ++bandno) {
-			opj_tcd_band_v2_t* restrict band = &res->bands[bandno];
-
-			for (precno = 0; precno < res->pw * res->ph; ++precno) {
-				opj_tcd_precinct_v2_t* precinct = &band->precincts[precno];
-
-				for (cblkno = 0; cblkno < precinct->cw * precinct->ch; ++cblkno) {
-					opj_tcd_cblk_dec_v2_t* cblk = &precinct->cblks.dec[cblkno];
-					OPJ_INT32* restrict datap;
-					void* restrict tiledp;
-					OPJ_UINT32 cblk_w, cblk_h;
-					OPJ_INT32 x, y;
-					OPJ_UINT32 i, j;
-
-					t1_decode_cblk_v2(
-							t1,
-							cblk,
-							band->bandno,
-							tccp->roishift,
-							tccp->cblksty);
-
-					x = cblk->x0 - band->x0;
-					y = cblk->y0 - band->y0;
-					if (band->bandno & 1) {
-						opj_tcd_resolution_v2_t* pres = &tilec->resolutions[resno - 1];
-						x += pres->x1 - pres->x0;
-					}
-					if (band->bandno & 2) {
-						opj_tcd_resolution_v2_t* pres = &tilec->resolutions[resno - 1];
-						y += pres->y1 - pres->y0;
-					}
-
-					datap=t1->data;
-					cblk_w = t1->w;
-					cblk_h = t1->h;
-
-					if (tccp->roishift) {
-						OPJ_INT32 thresh = 1 << tccp->roishift;
-						for (j = 0; j < cblk_h; ++j) {
-							for (i = 0; i < cblk_w; ++i) {
-								OPJ_INT32 val = datap[(j * cblk_w) + i];
-								OPJ_INT32 mag = abs(val);
-								if (mag >= thresh) {
-									mag >>= tccp->roishift;
-									datap[(j * cblk_w) + i] = val < 0 ? -mag : mag;
-								}
-							}
-						}
-					}
-
-					tiledp=(void*)&tilec->data[(y * tile_w) + x];
-					if (tccp->qmfbid == 1) {
-						for (j = 0; j < cblk_h; ++j) {
-							for (i = 0; i < cblk_w; ++i) {
-								OPJ_INT32 tmp = datap[(j * cblk_w) + i];
-								((OPJ_INT32*)tiledp)[(j * tile_w) + i] = tmp / 2;
-							}
-						}
-					} else {		/* if (tccp->qmfbid == 0) */
-						for (j = 0; j < cblk_h; ++j) {
-							for (i = 0; i < cblk_w; ++i) {
-								float tmp = datap[(j * cblk_w) + i] * band->stepsize;
-								((float*)tiledp)[(j * tile_w) + i] = tmp;
-							}
-						}
-					}
-					//opj_free(cblk->segs);
-					//cblk->segs = 00;
-				} /* cblkno */
-			} /* precno */
-		} /* bandno */
-	} /* resno */
-}
-
-
-static void t1_decode_cblk_v2(
-		opj_t1_t *t1,
-		opj_tcd_cblk_dec_v2_t* cblk,
-		OPJ_UINT32 orient,
-		OPJ_UINT32 roishift,
-		OPJ_UINT32 cblksty)
-{
-	opj_raw_t *raw = t1->raw;	/* RAW component */
-	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
-
-	OPJ_INT32 bpno;
-	OPJ_UINT32 passtype;
-	OPJ_UINT32 segno, passno;
-	OPJ_BYTE type = T1_TYPE_MQ; /* BYPASS mode */
-
-	if(!allocate_buffers(
-				t1,
-				cblk->x1 - cblk->x0,
-				cblk->y1 - cblk->y0))
-	{
-		return;
-	}
-
-	bpno = roishift + cblk->numbps - 1;
-	passtype = 2;
-
-	mqc_resetstates(mqc);
-	mqc_setstate(mqc, T1_CTXNO_UNI, 0, 46);
-	mqc_setstate(mqc, T1_CTXNO_AGG, 0, 3);
-	mqc_setstate(mqc, T1_CTXNO_ZC, 0, 4);
-
-	for (segno = 0; segno < cblk->real_num_segs; ++segno) {
-		opj_tcd_seg_t *seg = &cblk->segs[segno];
-
-		/* BYPASS mode */
-		type = ((bpno <= ((OPJ_INT32) (cblk->numbps) - 1) - 4) && (passtype < 2) && (cblksty & J2K_CCP_CBLKSTY_LAZY)) ? T1_TYPE_RAW : T1_TYPE_MQ;
-		/* FIXME: slviewer gets here with a null pointer. Why? Partially downloaded and/or corrupt textures? */
-		if(seg->data == 00){
-			continue;
-		}
-		if (type == T1_TYPE_RAW) {
-			raw_init_dec(raw, (*seg->data) + seg->dataindex, seg->len);
-		} else {
-			mqc_init_dec(mqc, (*seg->data) + seg->dataindex, seg->len);
-		}
-
-		for (passno = 0; passno < seg->real_num_passes; ++passno) {
-			switch (passtype) {
-				case 0:
-					t1_dec_sigpass(t1, bpno+1, orient, type, cblksty);
-					break;
-				case 1:
-					t1_dec_refpass(t1, bpno+1, type, cblksty);
-					break;
-				case 2:
-					t1_dec_clnpass(t1, bpno+1, orient, cblksty);
-					break;
-			}
-
-			if ((cblksty & J2K_CCP_CBLKSTY_RESET) && type == T1_TYPE_MQ) {
-				mqc_resetstates(mqc);
-				mqc_setstate(mqc, T1_CTXNO_UNI, 0, 46);
-				mqc_setstate(mqc, T1_CTXNO_AGG, 0, 3);
-				mqc_setstate(mqc, T1_CTXNO_ZC, 0, 4);
-			}
-			if (++passtype == 3) {
-				passtype = 0;
-				bpno--;
-			}
-		}
-	}
-}
-
-static void t1_dec_refpass(
-		opj_t1_t *t1,
-		OPJ_INT32 bpno,
-		OPJ_BYTE type,
-		OPJ_UINT32 cblksty)
-{
-	OPJ_UINT32 i, j, k;
-	OPJ_INT32 one, poshalf, neghalf;
-	OPJ_UINT32 vsc;
-	one = 1 << bpno;
-	poshalf = one >> 1;
-	neghalf = bpno > 0 ? -poshalf : -1;
-	for (k = 0; k < t1->h; k += 4) {
-		for (i = 0; i < t1->w; ++i) {
-			for (j = k; j < k + 4 && j < t1->h; ++j) {
-				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
-				t1_dec_refpass_step(
-						t1,
-						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
-						&t1->data[(j * t1->w) + i],
-						poshalf,
-						neghalf,
-						type,
-						vsc);
-			}
-		}
-	}
-}				/* VSC and  BYPASS by Antonin */
-
-
-static void t1_dec_refpass_step(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		OPJ_INT32 *datap,
-		OPJ_INT32 poshalf,
-		OPJ_INT32 neghalf,
-		OPJ_BYTE type,
-		OPJ_UINT32 vsc)
-{
-	OPJ_INT32  t;
-	OPJ_UINT32 v,flag;
-
-	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
-	opj_raw_t *raw = t1->raw;	/* RAW component */
-
-	flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
-	if ((flag & (T1_SIG | T1_VISIT)) == T1_SIG) {
-		mqc_setcurctx(mqc, t1_getctxno_mag(flag));	/* ESSAI */
-		if (type == T1_TYPE_RAW) {
-			v = raw_decode(raw);
-		} else {
-			v = mqc_decode(mqc);
-		}
-		t = v ? poshalf : neghalf;
-		*datap += *datap < 0 ? -t : t;
-		*flagsp |= T1_REFINE;
-	}
-}				/* VSC and  BYPASS by Antonin  */
-
-static void t1_dec_sigpass(
-		opj_t1_t *t1,
-		OPJ_INT32 bpno,
-		OPJ_UINT32 orient,
-		OPJ_BYTE type,
-		OPJ_UINT32 cblksty)
-{
-	OPJ_UINT32 i, j, k, vsc;
-	OPJ_INT32 one, half, oneplushalf;
-	one = 1 << bpno;
-	half = one >> 1;
-	oneplushalf = one | half;
-	for (k = 0; k < t1->h; k += 4) {
-		for (i = 0; i < t1->w; ++i) {
-			for (j = k; j < k + 4 && j < t1->h; ++j) {
-				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
-				t1_dec_sigpass_step(
-						t1,
-						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
-						&t1->data[(j * t1->w) + i],
-						orient,
-						oneplushalf,
-						type,
-						vsc);
-			}
-		}
-	}
-}				/* VSC and  BYPASS by Antonin */
-
-static void t1_dec_sigpass_step(
-		opj_t1_t *t1,
-		flag_t *flagsp,
-		OPJ_INT32 *datap,
-		OPJ_UINT32 orient,
-		OPJ_INT32 oneplushalf,
-		OPJ_BYTE type,
-		OPJ_UINT32 vsc)
-{
-	OPJ_UINT32 v, flag;
-
-	opj_raw_t *raw = t1->raw;	/* RAW component */
-	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
-
-	flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
-	if ((flag & T1_SIG_OTH) && !(flag & (T1_SIG | T1_VISIT))) {
-		if (type == T1_TYPE_RAW) {
-			if (raw_decode(raw)) {
-				v = raw_decode(raw);	/* ESSAI */
-				*datap = v ? -oneplushalf : oneplushalf;
-				t1_updateflags(flagsp, v, t1->flags_stride);
-			}
-		} else {
-			mqc_setcurctx(mqc, t1_getctxno_zc(flag, orient));
-			if (mqc_decode(mqc)) {
-				mqc_setcurctx(mqc, t1_getctxno_sc(flag));
-				v = mqc_decode(mqc) ^ t1_getspb(flag);
-				*datap = v ? -oneplushalf : oneplushalf;
-				t1_updateflags(flagsp, v, t1->flags_stride);
-			}
-		}
-		*flagsp |= T1_VISIT;
-	}
-}				/* VSC and  BYPASS by Antonin */
-
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/t1.h b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/t1.h
deleted file mode 100644
index bebf47ca99ef1042f68b2b020158fcd66e74f40e..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/t1.h
+++ /dev/null
@@ -1,169 +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.
- */
-#ifndef __T1_H
-#define __T1_H
-/**
-@file t1.h
-@brief Implementation of the tier-1 coding (coding of code-block coefficients) (T1)
-
-The functions in T1.C have for goal to realize the tier-1 coding operation. The functions
-in T1.C are used by some function in TCD.C.
-*/
-
-/** @defgroup T1 T1 - Implementation of the tier-1 coding */
-/*@{*/
-
-/* ----------------------------------------------------------------------- */
-#define T1_NMSEDEC_BITS 7
-
-#define T1_SIG_NE 0x0001	/**< Context orientation : North-East direction */
-#define T1_SIG_SE 0x0002	/**< Context orientation : South-East direction */
-#define T1_SIG_SW 0x0004	/**< Context orientation : South-West direction */
-#define T1_SIG_NW 0x0008	/**< Context orientation : North-West direction */
-#define T1_SIG_N 0x0010		/**< Context orientation : North direction */
-#define T1_SIG_E 0x0020		/**< Context orientation : East direction */
-#define T1_SIG_S 0x0040		/**< Context orientation : South direction */
-#define T1_SIG_W 0x0080		/**< Context orientation : West direction */
-#define T1_SIG_OTH (T1_SIG_N|T1_SIG_NE|T1_SIG_E|T1_SIG_SE|T1_SIG_S|T1_SIG_SW|T1_SIG_W|T1_SIG_NW)
-#define T1_SIG_PRIM (T1_SIG_N|T1_SIG_E|T1_SIG_S|T1_SIG_W)
-
-#define T1_SGN_N 0x0100
-#define T1_SGN_E 0x0200
-#define T1_SGN_S 0x0400
-#define T1_SGN_W 0x0800
-#define T1_SGN (T1_SGN_N|T1_SGN_E|T1_SGN_S|T1_SGN_W)
-
-#define T1_SIG 0x1000
-#define T1_REFINE 0x2000
-#define T1_VISIT 0x4000
-
-#define T1_NUMCTXS_ZC 9
-#define T1_NUMCTXS_SC 5
-#define T1_NUMCTXS_MAG 3
-#define T1_NUMCTXS_AGG 1
-#define T1_NUMCTXS_UNI 1
-
-#define T1_CTXNO_ZC 0
-#define T1_CTXNO_SC (T1_CTXNO_ZC+T1_NUMCTXS_ZC)
-#define T1_CTXNO_MAG (T1_CTXNO_SC+T1_NUMCTXS_SC)
-#define T1_CTXNO_AGG (T1_CTXNO_MAG+T1_NUMCTXS_MAG)
-#define T1_CTXNO_UNI (T1_CTXNO_AGG+T1_NUMCTXS_AGG)
-#define T1_NUMCTXS (T1_CTXNO_UNI+T1_NUMCTXS_UNI)
-
-#define T1_NMSEDEC_FRACBITS (T1_NMSEDEC_BITS-1)
-
-#define T1_TYPE_MQ 0	/**< Normal coding using entropy coder */
-#define T1_TYPE_RAW 1	/**< No encoding the information is store under raw format in codestream (mode switch RAW)*/
-
-/* ----------------------------------------------------------------------- */
-
-typedef short flag_t;
-
-/**
-Tier-1 coding (coding of code-block coefficients)
-*/
-typedef struct opj_t1 {
-	/** codec context */
-	opj_common_ptr cinfo;
-
-	/** MQC component */
-	opj_mqc_t *mqc;
-	/** RAW component */
-	opj_raw_t *raw;
-
-	int *data;
-	flag_t *flags;
-	int w;
-	int h;
-	int datasize;
-	int flagssize;
-	int flags_stride;
-} opj_t1_t;
-
-#define MACRO_t1_flags(x,y) t1->flags[((x)*(t1->flags_stride))+(y)]
-
-/** @name Exported functions */
-/*@{*/
-/* ----------------------------------------------------------------------- */
-/**
-Create a new T1 handle 
-and initialize the look-up tables of the Tier-1 coder/decoder
-@return Returns a new T1 handle if successful, returns NULL otherwise
-@see t1_init_luts
-*/
-opj_t1_t* t1_create(opj_common_ptr cinfo);
-/**
-Destroy a previously created T1 handle
-@param t1 T1 handle to destroy
-*/
-void t1_destroy(opj_t1_t *t1);
-/**
-Encode the code-blocks of a tile
-@param t1 T1 handle
-@param tile The tile to encode
-@param tcp Tile coding parameters
-*/
-void t1_encode_cblks(opj_t1_t *t1, opj_tcd_tile_t *tile, opj_tcp_t *tcp);
-/**
-Decode the code-blocks of a tile
-@param t1 T1 handle
-@param tilec The tile to decode
-@param tccp Tile coding parameters
-*/
-void t1_decode_cblks(opj_t1_t* t1, opj_tcd_tilecomp_t* tilec, opj_tccp_t* tccp);
-
-
-void t1_decode_cblks_v2(
-		opj_t1_t* t1,
-		opj_tcd_tilecomp_v2_t* tilec,
-		opj_tccp_t* tccp);
-
-
-
-/**
- * Creates a new Tier 1 handle
- * and initializes the look-up tables of the Tier-1 coder/decoder
- * @return a new T1 handle if successful, returns NULL otherwise
-*/
-opj_t1_t* t1_create_v2();
-
-/**
- * Destroys a previously created T1 handle
- *
- * @param p_t1 Tier 1 handle to destroy
-*/
-void t1_destroy_v2(opj_t1_t *p_t1);
-/* ----------------------------------------------------------------------- */
-/*@}*/
-
-/*@}*/
-
-#endif /* __T1_H */
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/t1_generate_luts.c b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/t1_generate_luts.c
deleted file mode 100644
index ffeff03e1b332ce566ea03676d8752d7d67ceb66..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/t1_generate_luts.c
+++ /dev/null
@@ -1,274 +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
- * Copyright (c) 2007, Callum Lerwick <seg@haxxed.com>
- * 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"
-
-static int t1_init_ctxno_zc(int f, int orient) {
-	int h, v, d, n, t, hv;
-	n = 0;
-	h = ((f & T1_SIG_W) != 0) + ((f & T1_SIG_E) != 0);
-	v = ((f & T1_SIG_N) != 0) + ((f & T1_SIG_S) != 0);
-	d = ((f & T1_SIG_NW) != 0) + ((f & T1_SIG_NE) != 0) + ((f & T1_SIG_SE) != 0) + ((f & T1_SIG_SW) != 0);
-
-	switch (orient) {
-		case 2:
-			t = h;
-			h = v;
-			v = t;
-		case 0:
-		case 1:
-			if (!h) {
-				if (!v) {
-					if (!d)
-						n = 0;
-					else if (d == 1)
-						n = 1;
-					else
-						n = 2;
-				} else if (v == 1) {
-					n = 3;
-				} else {
-					n = 4;
-				}
-			} else if (h == 1) {
-				if (!v) {
-					if (!d)
-						n = 5;
-					else
-						n = 6;
-				} else {
-					n = 7;
-				}
-			} else
-				n = 8;
-			break;
-		case 3:
-			hv = h + v;
-			if (!d) {
-				if (!hv) {
-					n = 0;
-				} else if (hv == 1) {
-					n = 1;
-				} else {
-					n = 2;
-				}
-			} else if (d == 1) {
-				if (!hv) {
-					n = 3;
-				} else if (hv == 1) {
-					n = 4;
-				} else {
-					n = 5;
-				}
-			} else if (d == 2) {
-				if (!hv) {
-					n = 6;
-				} else {
-					n = 7;
-				}
-			} else {
-				n = 8;
-			}
-			break;
-	}
-
-	return (T1_CTXNO_ZC + n);
-}
-
-static int t1_init_ctxno_sc(int f) {
-	int hc, vc, n;
-	n = 0;
-
-	hc = int_min(((f & (T1_SIG_E | T1_SGN_E)) ==
-				T1_SIG_E) + ((f & (T1_SIG_W | T1_SGN_W)) == T1_SIG_W),
-			1) - int_min(((f & (T1_SIG_E | T1_SGN_E)) ==
-					(T1_SIG_E | T1_SGN_E)) +
-				((f & (T1_SIG_W | T1_SGN_W)) ==
-				 (T1_SIG_W | T1_SGN_W)), 1);
-
-	vc = int_min(((f & (T1_SIG_N | T1_SGN_N)) ==
-				T1_SIG_N) + ((f & (T1_SIG_S | T1_SGN_S)) == T1_SIG_S),
-			1) - int_min(((f & (T1_SIG_N | T1_SGN_N)) ==
-					(T1_SIG_N | T1_SGN_N)) +
-				((f & (T1_SIG_S | T1_SGN_S)) ==
-				 (T1_SIG_S | T1_SGN_S)), 1);
-
-	if (hc < 0) {
-		hc = -hc;
-		vc = -vc;
-	}
-	if (!hc) {
-		if (vc == -1)
-			n = 1;
-		else if (!vc)
-			n = 0;
-		else
-			n = 1;
-	} else if (hc == 1) {
-		if (vc == -1)
-			n = 2;
-		else if (!vc)
-			n = 3;
-		else
-			n = 4;
-	}
-
-	return (T1_CTXNO_SC + n);
-}
-
-static int t1_init_spb(int f) {
-	int hc, vc, n;
-
-	hc = int_min(((f & (T1_SIG_E | T1_SGN_E)) ==
-				T1_SIG_E) + ((f & (T1_SIG_W | T1_SGN_W)) == T1_SIG_W),
-			1) - int_min(((f & (T1_SIG_E | T1_SGN_E)) ==
-					(T1_SIG_E | T1_SGN_E)) +
-				((f & (T1_SIG_W | T1_SGN_W)) ==
-				 (T1_SIG_W | T1_SGN_W)), 1);
-
-	vc = int_min(((f & (T1_SIG_N | T1_SGN_N)) ==
-				T1_SIG_N) + ((f & (T1_SIG_S | T1_SGN_S)) == T1_SIG_S),
-			1) - int_min(((f & (T1_SIG_N | T1_SGN_N)) ==
-					(T1_SIG_N | T1_SGN_N)) +
-				((f & (T1_SIG_S | T1_SGN_S)) ==
-				 (T1_SIG_S | T1_SGN_S)), 1);
-
-	if (!hc && !vc)
-		n = 0;
-	else
-		n = (!(hc > 0 || (!hc && vc > 0)));
-
-	return n;
-}
-
-void dump_array16(int array[],int size){
-	int i;
-	--size;
-	for (i = 0; i < size; ++i) {
-		printf("0x%04x, ", array[i]);
-		if(!((i+1)&0x7))
-			printf("\n  ");
-	}
-	printf("0x%04x\n};\n\n", array[size]);
-}
-
-int main(){
-	int i, j;
-	double u, v, t;
-
-	int lut_ctxno_zc[1024];
-	int lut_nmsedec_sig[1 << T1_NMSEDEC_BITS];
-	int lut_nmsedec_sig0[1 << T1_NMSEDEC_BITS];
-	int lut_nmsedec_ref[1 << T1_NMSEDEC_BITS];
-	int lut_nmsedec_ref0[1 << T1_NMSEDEC_BITS];
-
-	printf("/* This file was automatically generated by t1_generate_luts.c */\n\n");
-
-	// lut_ctxno_zc
-	for (j = 0; j < 4; ++j) {
-		for (i = 0; i < 256; ++i) {
-			int orient = j;
-			if (orient == 2) {
-				orient = 1;
-			} else if (orient == 1) {
-				orient = 2;
-			}
-			lut_ctxno_zc[(orient << 8) | i] = t1_init_ctxno_zc(i, j);
-		}
-	}
-
-	printf("static char lut_ctxno_zc[1024] = {\n  ");
-	for (i = 0; i < 1023; ++i) {
-		printf("%i, ", lut_ctxno_zc[i]);
-		if(!((i+1)&0x1f))
-			printf("\n  ");
-	}
-	printf("%i\n};\n\n", lut_ctxno_zc[1023]);
-
-	// lut_ctxno_sc
-	printf("static char lut_ctxno_sc[256] = {\n  ");
-	for (i = 0; i < 255; ++i) {
-		printf("0x%x, ", t1_init_ctxno_sc(i << 4));
-		if(!((i+1)&0xf))
-			printf("\n  ");
-	}
-	printf("0x%x\n};\n\n", t1_init_ctxno_sc(255 << 4));
-
-	// lut_spb
-	printf("static char lut_spb[256] = {\n  ");
-	for (i = 0; i < 255; ++i) {
-		printf("%i, ", t1_init_spb(i << 4));
-		if(!((i+1)&0x1f))
-			printf("\n  ");
-	}
-	printf("%i\n};\n\n", t1_init_spb(255 << 4));
-
-	/* FIXME FIXME FIXME */
-	/* fprintf(stdout,"nmsedec luts:\n"); */
-	for (i = 0; i < (1 << T1_NMSEDEC_BITS); ++i) {
-		t = i / pow(2, T1_NMSEDEC_FRACBITS);
-		u = t;
-		v = t - 1.5;
-		lut_nmsedec_sig[i] = 
-			int_max(0, 
-					(int) (floor((u * u - v * v) * pow(2, T1_NMSEDEC_FRACBITS) + 0.5) / pow(2, T1_NMSEDEC_FRACBITS) * 8192.0));
-		lut_nmsedec_sig0[i] =
-			int_max(0,
-					(int) (floor((u * u) * pow(2, T1_NMSEDEC_FRACBITS) + 0.5) / pow(2, T1_NMSEDEC_FRACBITS) * 8192.0));
-		u = t - 1.0;
-		if (i & (1 << (T1_NMSEDEC_BITS - 1))) {
-			v = t - 1.5;
-		} else {
-			v = t - 0.5;
-		}
-		lut_nmsedec_ref[i] =
-			int_max(0,
-					(int) (floor((u * u - v * v) * pow(2, T1_NMSEDEC_FRACBITS) + 0.5) / pow(2, T1_NMSEDEC_FRACBITS) * 8192.0));
-		lut_nmsedec_ref0[i] =
-			int_max(0,
-					(int) (floor((u * u) * pow(2, T1_NMSEDEC_FRACBITS) + 0.5) / pow(2, T1_NMSEDEC_FRACBITS) * 8192.0));
-	}
-
-	printf("static short lut_nmsedec_sig[1 << T1_NMSEDEC_BITS] = {\n  ");
-	dump_array16(lut_nmsedec_sig, 1 << T1_NMSEDEC_BITS);
-
-	printf("static short lut_nmsedec_sig0[1 << T1_NMSEDEC_BITS] = {\n  ");
-	dump_array16(lut_nmsedec_sig0, 1 << T1_NMSEDEC_BITS);
-
-	printf("static short lut_nmsedec_ref[1 << T1_NMSEDEC_BITS] = {\n  ");
-	dump_array16(lut_nmsedec_ref, 1 << T1_NMSEDEC_BITS);
-
-	printf("static short lut_nmsedec_ref0[1 << T1_NMSEDEC_BITS] = {\n  ");
-	dump_array16(lut_nmsedec_ref0, 1 << T1_NMSEDEC_BITS);
-
-	return 0;
-}
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/t1_luts.h b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/t1_luts.h
deleted file mode 100644
index e5e33f6656ad9bd3d6e773568cbc49ecc97c73d4..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/t1_luts.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/* This file was automatically generated by t1_generate_luts.c */
-
-static char lut_ctxno_zc[1024] = {
-  0, 1, 1, 2, 1, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
-  5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
-  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-  5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-  8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
-  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-  8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
-  0, 1, 1, 2, 1, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
-  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-  5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
-  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
-  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
-  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
-  0, 1, 1, 2, 1, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
-  5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
-  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-  5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-  8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
-  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-  8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
-  0, 3, 3, 6, 3, 6, 6, 8, 3, 6, 6, 8, 6, 8, 8, 8, 1, 4, 4, 7, 4, 7, 7, 8, 4, 7, 7, 8, 7, 8, 8, 8, 
-  1, 4, 4, 7, 4, 7, 7, 8, 4, 7, 7, 8, 7, 8, 8, 8, 2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 
-  1, 4, 4, 7, 4, 7, 7, 8, 4, 7, 7, 8, 7, 8, 8, 8, 2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 
-  2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 
-  1, 4, 4, 7, 4, 7, 7, 8, 4, 7, 7, 8, 7, 8, 8, 8, 2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 
-  2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 
-  2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 
-  2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8
-};
-
-static char lut_ctxno_sc[256] = {
-  0x9, 0xa, 0xc, 0xd, 0xa, 0xa, 0xd, 0xd, 0xc, 0xd, 0xc, 0xd, 0xd, 0xd, 0xd, 0xd, 
-  0x9, 0xa, 0xc, 0xb, 0xa, 0x9, 0xd, 0xc, 0xc, 0xb, 0xc, 0xb, 0xd, 0xc, 0xd, 0xc, 
-  0x9, 0xa, 0xc, 0xb, 0xa, 0xa, 0xb, 0xb, 0xc, 0xd, 0x9, 0xa, 0xd, 0xd, 0xa, 0xa, 
-  0x9, 0xa, 0xc, 0xd, 0xa, 0x9, 0xb, 0xc, 0xc, 0xb, 0x9, 0xa, 0xd, 0xc, 0xa, 0x9, 
-  0x9, 0xa, 0xc, 0xd, 0xa, 0x9, 0xb, 0xc, 0xc, 0xd, 0xc, 0xd, 0xb, 0xc, 0xb, 0xc, 
-  0x9, 0xa, 0xc, 0xb, 0xa, 0xa, 0xb, 0xb, 0xc, 0xb, 0xc, 0xb, 0xb, 0xb, 0xb, 0xb, 
-  0x9, 0xa, 0xc, 0xb, 0xa, 0x9, 0xd, 0xc, 0xc, 0xd, 0x9, 0xa, 0xb, 0xc, 0xa, 0x9, 
-  0x9, 0xa, 0xc, 0xd, 0xa, 0xa, 0xd, 0xd, 0xc, 0xb, 0x9, 0xa, 0xb, 0xb, 0xa, 0xa, 
-  0x9, 0xa, 0xc, 0xd, 0xa, 0xa, 0xd, 0xd, 0xc, 0xb, 0x9, 0xa, 0xb, 0xb, 0xa, 0xa, 
-  0x9, 0xa, 0xc, 0xb, 0xa, 0x9, 0xd, 0xc, 0xc, 0xd, 0x9, 0xa, 0xb, 0xc, 0xa, 0x9, 
-  0x9, 0xa, 0xc, 0xb, 0xa, 0xa, 0xb, 0xb, 0xc, 0xb, 0xc, 0xb, 0xb, 0xb, 0xb, 0xb, 
-  0x9, 0xa, 0xc, 0xd, 0xa, 0x9, 0xb, 0xc, 0xc, 0xd, 0xc, 0xd, 0xb, 0xc, 0xb, 0xc, 
-  0x9, 0xa, 0xc, 0xd, 0xa, 0x9, 0xb, 0xc, 0xc, 0xb, 0x9, 0xa, 0xd, 0xc, 0xa, 0x9, 
-  0x9, 0xa, 0xc, 0xb, 0xa, 0xa, 0xb, 0xb, 0xc, 0xd, 0x9, 0xa, 0xd, 0xd, 0xa, 0xa, 
-  0x9, 0xa, 0xc, 0xb, 0xa, 0x9, 0xd, 0xc, 0xc, 0xb, 0xc, 0xb, 0xd, 0xc, 0xd, 0xc, 
-  0x9, 0xa, 0xc, 0xd, 0xa, 0xa, 0xd, 0xd, 0xc, 0xd, 0xc, 0xd, 0xd, 0xd, 0xd, 0xd
-};
-
-static char lut_spb[256] = {
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 
-  0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 
-  0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 
-  0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-  0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 
-  0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
-};
-
-static short lut_nmsedec_sig[1 << T1_NMSEDEC_BITS] = {
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-  0x0000, 0x0180, 0x0300, 0x0480, 0x0600, 0x0780, 0x0900, 0x0a80, 
-  0x0c00, 0x0d80, 0x0f00, 0x1080, 0x1200, 0x1380, 0x1500, 0x1680, 
-  0x1800, 0x1980, 0x1b00, 0x1c80, 0x1e00, 0x1f80, 0x2100, 0x2280, 
-  0x2400, 0x2580, 0x2700, 0x2880, 0x2a00, 0x2b80, 0x2d00, 0x2e80, 
-  0x3000, 0x3180, 0x3300, 0x3480, 0x3600, 0x3780, 0x3900, 0x3a80, 
-  0x3c00, 0x3d80, 0x3f00, 0x4080, 0x4200, 0x4380, 0x4500, 0x4680, 
-  0x4800, 0x4980, 0x4b00, 0x4c80, 0x4e00, 0x4f80, 0x5100, 0x5280, 
-  0x5400, 0x5580, 0x5700, 0x5880, 0x5a00, 0x5b80, 0x5d00, 0x5e80, 
-  0x6000, 0x6180, 0x6300, 0x6480, 0x6600, 0x6780, 0x6900, 0x6a80, 
-  0x6c00, 0x6d80, 0x6f00, 0x7080, 0x7200, 0x7380, 0x7500, 0x7680
-};
-
-static short lut_nmsedec_sig0[1 << T1_NMSEDEC_BITS] = {
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0080, 0x0080, 
-  0x0080, 0x0080, 0x0100, 0x0100, 0x0100, 0x0180, 0x0180, 0x0200, 
-  0x0200, 0x0280, 0x0280, 0x0300, 0x0300, 0x0380, 0x0400, 0x0400, 
-  0x0480, 0x0500, 0x0580, 0x0580, 0x0600, 0x0680, 0x0700, 0x0780, 
-  0x0800, 0x0880, 0x0900, 0x0980, 0x0a00, 0x0a80, 0x0b80, 0x0c00, 
-  0x0c80, 0x0d00, 0x0e00, 0x0e80, 0x0f00, 0x1000, 0x1080, 0x1180, 
-  0x1200, 0x1300, 0x1380, 0x1480, 0x1500, 0x1600, 0x1700, 0x1780, 
-  0x1880, 0x1980, 0x1a80, 0x1b00, 0x1c00, 0x1d00, 0x1e00, 0x1f00, 
-  0x2000, 0x2100, 0x2200, 0x2300, 0x2400, 0x2500, 0x2680, 0x2780, 
-  0x2880, 0x2980, 0x2b00, 0x2c00, 0x2d00, 0x2e80, 0x2f80, 0x3100, 
-  0x3200, 0x3380, 0x3480, 0x3600, 0x3700, 0x3880, 0x3a00, 0x3b00, 
-  0x3c80, 0x3e00, 0x3f80, 0x4080, 0x4200, 0x4380, 0x4500, 0x4680, 
-  0x4800, 0x4980, 0x4b00, 0x4c80, 0x4e00, 0x4f80, 0x5180, 0x5300, 
-  0x5480, 0x5600, 0x5800, 0x5980, 0x5b00, 0x5d00, 0x5e80, 0x6080, 
-  0x6200, 0x6400, 0x6580, 0x6780, 0x6900, 0x6b00, 0x6d00, 0x6e80, 
-  0x7080, 0x7280, 0x7480, 0x7600, 0x7800, 0x7a00, 0x7c00, 0x7e00
-};
-
-static short lut_nmsedec_ref[1 << T1_NMSEDEC_BITS] = {
-  0x1800, 0x1780, 0x1700, 0x1680, 0x1600, 0x1580, 0x1500, 0x1480, 
-  0x1400, 0x1380, 0x1300, 0x1280, 0x1200, 0x1180, 0x1100, 0x1080, 
-  0x1000, 0x0f80, 0x0f00, 0x0e80, 0x0e00, 0x0d80, 0x0d00, 0x0c80, 
-  0x0c00, 0x0b80, 0x0b00, 0x0a80, 0x0a00, 0x0980, 0x0900, 0x0880, 
-  0x0800, 0x0780, 0x0700, 0x0680, 0x0600, 0x0580, 0x0500, 0x0480, 
-  0x0400, 0x0380, 0x0300, 0x0280, 0x0200, 0x0180, 0x0100, 0x0080, 
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-  0x0000, 0x0080, 0x0100, 0x0180, 0x0200, 0x0280, 0x0300, 0x0380, 
-  0x0400, 0x0480, 0x0500, 0x0580, 0x0600, 0x0680, 0x0700, 0x0780, 
-  0x0800, 0x0880, 0x0900, 0x0980, 0x0a00, 0x0a80, 0x0b00, 0x0b80, 
-  0x0c00, 0x0c80, 0x0d00, 0x0d80, 0x0e00, 0x0e80, 0x0f00, 0x0f80, 
-  0x1000, 0x1080, 0x1100, 0x1180, 0x1200, 0x1280, 0x1300, 0x1380, 
-  0x1400, 0x1480, 0x1500, 0x1580, 0x1600, 0x1680, 0x1700, 0x1780
-};
-
-static short lut_nmsedec_ref0[1 << T1_NMSEDEC_BITS] = {
-  0x2000, 0x1f00, 0x1e00, 0x1d00, 0x1c00, 0x1b00, 0x1a80, 0x1980, 
-  0x1880, 0x1780, 0x1700, 0x1600, 0x1500, 0x1480, 0x1380, 0x1300, 
-  0x1200, 0x1180, 0x1080, 0x1000, 0x0f00, 0x0e80, 0x0e00, 0x0d00, 
-  0x0c80, 0x0c00, 0x0b80, 0x0a80, 0x0a00, 0x0980, 0x0900, 0x0880, 
-  0x0800, 0x0780, 0x0700, 0x0680, 0x0600, 0x0580, 0x0580, 0x0500, 
-  0x0480, 0x0400, 0x0400, 0x0380, 0x0300, 0x0300, 0x0280, 0x0280, 
-  0x0200, 0x0200, 0x0180, 0x0180, 0x0100, 0x0100, 0x0100, 0x0080, 
-  0x0080, 0x0080, 0x0080, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0080, 0x0080, 
-  0x0080, 0x0080, 0x0100, 0x0100, 0x0100, 0x0180, 0x0180, 0x0200, 
-  0x0200, 0x0280, 0x0280, 0x0300, 0x0300, 0x0380, 0x0400, 0x0400, 
-  0x0480, 0x0500, 0x0580, 0x0580, 0x0600, 0x0680, 0x0700, 0x0780, 
-  0x0800, 0x0880, 0x0900, 0x0980, 0x0a00, 0x0a80, 0x0b80, 0x0c00, 
-  0x0c80, 0x0d00, 0x0e00, 0x0e80, 0x0f00, 0x1000, 0x1080, 0x1180, 
-  0x1200, 0x1300, 0x1380, 0x1480, 0x1500, 0x1600, 0x1700, 0x1780, 
-  0x1880, 0x1980, 0x1a80, 0x1b00, 0x1c00, 0x1d00, 0x1e00, 0x1f00
-};
-
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/t2.c b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/t2.c
deleted file mode 100644
index f4af6eb72027e9d0a68c79961a8c45c9385aec18..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/t2.c
+++ /dev/null
@@ -1,1584 +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 "opj_includes.h"
-
-/** @defgroup T2 T2 - Implementation of a tier-2 coding */
-/*@{*/
-
-/** @name Local static functions */
-/*@{*/
-
-static void t2_putcommacode(opj_bio_t *bio, int n);
-static int t2_getcommacode(opj_bio_t *bio);
-/**
-Variable length code for signalling delta Zil (truncation point)
-@param bio Bit Input/Output component
-@param n delta Zil
-*/
-static void t2_putnumpasses(opj_bio_t *bio, int n);
-static int t2_getnumpasses(opj_bio_t *bio);
-/**
-Encode a packet of a tile to a destination buffer
-@param tile Tile for which to write the packets
-@param tcp Tile coding parameters
-@param pi Packet identity
-@param dest Destination buffer
-@param len Length of the destination buffer
-@param cstr_info Codestream information structure 
-@param tileno Number of the tile encoded
-@return 
-*/
-static int t2_encode_packet(opj_tcd_tile_t *tile, opj_tcp_t *tcp, opj_pi_iterator_t *pi, unsigned char *dest, int len, opj_codestream_info_t *cstr_info, int tileno);
-/**
-@param cblk
-@param index
-@param cblksty
-@param first
-*/
-static void t2_init_seg(opj_tcd_cblk_dec_t* cblk, int index, int cblksty, int first);
-/**
-Decode a packet of a tile from a source buffer
-@param t2 T2 handle
-@param src Source buffer
-@param len Length of the source buffer
-@param tile Tile for which to write the packets
-@param tcp Tile coding parameters
-@param pi Packet identity
-@param pack_info Packet information
-@return 
-*/
-static int t2_decode_packet(opj_t2_t* t2, unsigned char *src, int len, opj_tcd_tile_t *tile, 
-														opj_tcp_t *tcp, opj_pi_iterator_t *pi, opj_packet_info_t *pack_info);
-
-
-/**
-Decode a packet of a tile from a source buffer
-@param t2 T2 handle
-@param src Source buffer
-@param len Length of the source buffer
-@param tile Tile for which to write the packets
-@param tcp Tile coding parameters
-@param pi Packet identity
-@return
-*/
-static opj_bool t2_decode_packet_v2(
-							 opj_t2_v2_t* p_t2,
-							 opj_tcd_tile_v2_t *p_tile,
-                             opj_tcp_v2_t *p_tcp,
-							 opj_pi_iterator_t *p_pi,
-							 OPJ_BYTE *p_src,
-							 OPJ_UINT32 * p_data_read,
-							 OPJ_UINT32 p_max_length,
-							 opj_packet_info_t *p_pack_info);
-
-static opj_bool t2_skip_packet(
-							 opj_t2_v2_t* p_t2,
-							 opj_tcd_tile_v2_t *p_tile,
-                             opj_tcp_v2_t *p_tcp,
-							 opj_pi_iterator_t *p_pi,
-							 OPJ_BYTE *p_src,
-							 OPJ_UINT32 * p_data_read,
-							 OPJ_UINT32 p_max_length,
-							 opj_packet_info_t *p_pack_info);
-
-static opj_bool t2_read_packet_header(
-							 opj_t2_v2_t* p_t2,
-							 opj_tcd_tile_v2_t *p_tile,
-                             opj_tcp_v2_t *p_tcp,
-							 opj_pi_iterator_t *p_pi,
-							 opj_bool * p_is_data_present,
-							 OPJ_BYTE *p_src_data,
-							 OPJ_UINT32 * p_data_read,
-							 OPJ_UINT32 p_max_length,
-							 opj_packet_info_t *p_pack_info);
-
-static opj_bool t2_read_packet_data(
-							 opj_t2_v2_t* p_t2,
-							 opj_tcd_tile_v2_t *p_tile,
-							 opj_pi_iterator_t *p_pi,
-							 OPJ_BYTE *p_src_data,
-							 OPJ_UINT32 * p_data_read,
-							 OPJ_UINT32 p_max_length,
-							 opj_packet_info_t *pack_info);
-
-static opj_bool t2_skip_packet_data(
-							 opj_t2_v2_t* p_t2,
-							 opj_tcd_tile_v2_t *p_tile,
-							 opj_pi_iterator_t *p_pi,
-							 OPJ_UINT32 * p_data_read,
-							 OPJ_UINT32 p_max_length,
-							 opj_packet_info_t *pack_info);
-
-/**
-@param seg
-@param cblksty
-@param first
-*/
-static opj_bool t2_init_seg_v2(	opj_tcd_cblk_dec_v2_t* cblk,
-								OPJ_UINT32 index,
-								OPJ_UINT32 cblksty,
-								OPJ_UINT32 first);
-
-/*@}*/
-
-/*@}*/
-
-/* ----------------------------------------------------------------------- */
-
-/* #define RESTART 0x04 */
-
-static void t2_putcommacode(opj_bio_t *bio, int n) {
-	while (--n >= 0) {
-		bio_write(bio, 1, 1);
-	}
-	bio_write(bio, 0, 1);
-}
-
-static int t2_getcommacode(opj_bio_t *bio) {
-	int n;
-	for (n = 0; bio_read(bio, 1); n++) {
-		;
-	}
-	return n;
-}
-
-static void t2_putnumpasses(opj_bio_t *bio, int n) {
-	if (n == 1) {
-		bio_write(bio, 0, 1);
-	} else if (n == 2) {
-		bio_write(bio, 2, 2);
-	} else if (n <= 5) {
-		bio_write(bio, 0xc | (n - 3), 4);
-	} else if (n <= 36) {
-		bio_write(bio, 0x1e0 | (n - 6), 9);
-	} else if (n <= 164) {
-		bio_write(bio, 0xff80 | (n - 37), 16);
-	}
-}
-
-static int t2_getnumpasses(opj_bio_t *bio) {
-	int n;
-	if (!bio_read(bio, 1))
-		return 1;
-	if (!bio_read(bio, 1))
-		return 2;
-	if ((n = bio_read(bio, 2)) != 3)
-		return (3 + n);
-	if ((n = bio_read(bio, 5)) != 31)
-		return (6 + n);
-	return (37 + bio_read(bio, 7));
-}
-
-static int t2_encode_packet(opj_tcd_tile_t * tile, opj_tcp_t * tcp, opj_pi_iterator_t *pi, unsigned char *dest, int length, opj_codestream_info_t *cstr_info, int tileno) {
-	int bandno, cblkno;
-	unsigned char *c = dest;
-
-	int compno = pi->compno;	/* component value */
-	int resno  = pi->resno;		/* resolution level value */
-	int precno = pi->precno;	/* precinct value */
-	int layno  = pi->layno;		/* quality layer value */
-
-	opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
-	opj_tcd_resolution_t *res = &tilec->resolutions[resno];
-	
-	opj_bio_t *bio = NULL;	/* BIO component */
-	
-	/* <SOP 0xff91> */
-	if (tcp->csty & J2K_CP_CSTY_SOP) {
-		c[0] = 255;
-		c[1] = 145;
-		c[2] = 0;
-		c[3] = 4;
-		c[4] = (unsigned char)((tile->packno % 65536) / 256);
-		c[5] = (unsigned char)((tile->packno % 65536) % 256);
-		c += 6;
-	}
-	/* </SOP> */
-	
-	if (!layno) {
-		for (bandno = 0; bandno < res->numbands; bandno++) {
-			opj_tcd_band_t *band = &res->bands[bandno];
-			opj_tcd_precinct_t *prc = &band->precincts[precno];
-			tgt_reset(prc->incltree);
-			tgt_reset(prc->imsbtree);
-			for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-				opj_tcd_cblk_enc_t* cblk = &prc->cblks.enc[cblkno];
-				cblk->numpasses = 0;
-				tgt_setvalue(prc->imsbtree, cblkno, band->numbps - cblk->numbps);
-			}
-		}
-	}
-	
-	bio = bio_create();
-	bio_init_enc(bio, c, length);
-	bio_write(bio, 1, 1);		/* Empty header bit */
-	
-	/* Writing Packet header */
-	for (bandno = 0; bandno < res->numbands; bandno++) {
-		opj_tcd_band_t *band = &res->bands[bandno];
-		opj_tcd_precinct_t *prc = &band->precincts[precno];
-		for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-			opj_tcd_cblk_enc_t* cblk = &prc->cblks.enc[cblkno];
-			opj_tcd_layer_t *layer = &cblk->layers[layno];
-			if (!cblk->numpasses && layer->numpasses) {
-				tgt_setvalue(prc->incltree, cblkno, layno);
-			}
-		}
-		for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-			opj_tcd_cblk_enc_t* cblk = &prc->cblks.enc[cblkno];
-			opj_tcd_layer_t *layer = &cblk->layers[layno];
-			int increment = 0;
-			int nump = 0;
-			int len = 0, passno;
-			/* cblk inclusion bits */
-			if (!cblk->numpasses) {
-				tgt_encode(bio, prc->incltree, cblkno, layno + 1);
-			} else {
-				bio_write(bio, layer->numpasses != 0, 1);
-			}
-			/* if cblk not included, go to the next cblk  */
-			if (!layer->numpasses) {
-				continue;
-			}
-			/* if first instance of cblk --> zero bit-planes information */
-			if (!cblk->numpasses) {
-				cblk->numlenbits = 3;
-				tgt_encode(bio, prc->imsbtree, cblkno, 999);
-			}
-			/* number of coding passes included */
-			t2_putnumpasses(bio, layer->numpasses);
-			
-			/* computation of the increase of the length indicator and insertion in the header     */
-			for (passno = cblk->numpasses; passno < cblk->numpasses + layer->numpasses; passno++) {
-				opj_tcd_pass_t *pass = &cblk->passes[passno];
-				nump++;
-				len += pass->len;
-				if (pass->term || passno == (cblk->numpasses + layer->numpasses) - 1) {
-					increment = int_max(increment, int_floorlog2(len) + 1 - (cblk->numlenbits + int_floorlog2(nump)));
-					len = 0;
-					nump = 0;
-				}
-			}
-			t2_putcommacode(bio, increment);
-
-			/* computation of the new Length indicator */
-			cblk->numlenbits += increment;
-
-			/* insertion of the codeword segment length */
-			for (passno = cblk->numpasses; passno < cblk->numpasses + layer->numpasses; passno++) {
-				opj_tcd_pass_t *pass = &cblk->passes[passno];
-				nump++;
-				len += pass->len;
-				if (pass->term || passno == (cblk->numpasses + layer->numpasses) - 1) {
-					bio_write(bio, len, cblk->numlenbits + int_floorlog2(nump));
-					len = 0;
-					nump = 0;
-				}
-			}
-		}
-	}
-
-	if (bio_flush(bio)) {
-		bio_destroy(bio);
-		return -999;		/* modified to eliminate longjmp !! */
-	}
-
-	c += bio_numbytes(bio);
-	bio_destroy(bio);
-	
-	/* <EPH 0xff92> */
-	if (tcp->csty & J2K_CP_CSTY_EPH) {
-		c[0] = 255;
-		c[1] = 146;
-		c += 2;
-	}
-	/* </EPH> */
-
-	/* << INDEX */
-	// End of packet header position. Currently only represents the distance to start of packet
-	// Will be updated later by incrementing with packet start value
-	if(cstr_info && cstr_info->index_write) {
-		opj_packet_info_t *info_PK = &cstr_info->tile[tileno].packet[cstr_info->packno];
-		info_PK->end_ph_pos = (int)(c - dest);
-	}
-	/* INDEX >> */
-	
-	/* Writing the packet body */
-	
-	for (bandno = 0; bandno < res->numbands; bandno++) {
-		opj_tcd_band_t *band = &res->bands[bandno];
-		opj_tcd_precinct_t *prc = &band->precincts[precno];
-		for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-			opj_tcd_cblk_enc_t* cblk = &prc->cblks.enc[cblkno];
-			opj_tcd_layer_t *layer = &cblk->layers[layno];
-			if (!layer->numpasses) {
-				continue;
-			}
-			if (c + layer->len > dest + length) {
-				return -999;
-			}
-			
-			memcpy(c, layer->data, layer->len);
-			cblk->numpasses += layer->numpasses;
-			c += layer->len;
-			/* << INDEX */ 
-			if(cstr_info && cstr_info->index_write) {
-				opj_packet_info_t *info_PK = &cstr_info->tile[tileno].packet[cstr_info->packno];
-				info_PK->disto += layer->disto;
-				if (cstr_info->D_max < info_PK->disto) {
-					cstr_info->D_max = info_PK->disto;
-				}
-			}
-			/* INDEX >> */
-		}
-	}
-	
-	return (c - dest);
-}
-
-static void t2_init_seg(opj_tcd_cblk_dec_t* cblk, int index, int cblksty, int first) {
-	opj_tcd_seg_t* seg;
-	cblk->segs = (opj_tcd_seg_t*) opj_realloc(cblk->segs, (index + 1) * sizeof(opj_tcd_seg_t));
-	seg = &cblk->segs[index];
-	seg->data = NULL;
-	seg->dataindex = 0;
-	seg->numpasses = 0;
-	seg->len = 0;
-	if (cblksty & J2K_CCP_CBLKSTY_TERMALL) {
-		seg->maxpasses = 1;
-	}
-	else if (cblksty & J2K_CCP_CBLKSTY_LAZY) {
-		if (first) {
-			seg->maxpasses = 10;
-		} else {
-			seg->maxpasses = (((seg - 1)->maxpasses == 1) || ((seg - 1)->maxpasses == 10)) ? 2 : 1;
-		}
-	} else {
-		seg->maxpasses = 109;
-	}
-}
-
-static int t2_decode_packet(opj_t2_t* t2, unsigned char *src, int len, opj_tcd_tile_t *tile, 
-														opj_tcp_t *tcp, opj_pi_iterator_t *pi, opj_packet_info_t *pack_info) {
-	int bandno, cblkno;
-	unsigned char *c = src;
-
-	opj_cp_t *cp = t2->cp;
-
-	int compno = pi->compno;	/* component value */
-	int resno  = pi->resno;		/* resolution level value */
-	int precno = pi->precno;	/* precinct value */
-	int layno  = pi->layno;		/* quality layer value */
-
-	opj_tcd_resolution_t* res = &tile->comps[compno].resolutions[resno];
-
-	unsigned char *hd = NULL;
-	int present;
-	
-	opj_bio_t *bio = NULL;	/* BIO component */
-	
-	if (layno == 0) {
-		for (bandno = 0; bandno < res->numbands; bandno++) {
-			opj_tcd_band_t *band = &res->bands[bandno];
-			opj_tcd_precinct_t *prc = &band->precincts[precno];
-			
-			if ((band->x1-band->x0 == 0)||(band->y1-band->y0 == 0)) continue;
-			
-			tgt_reset(prc->incltree);
-			tgt_reset(prc->imsbtree);
-			for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-				opj_tcd_cblk_dec_t* cblk = &prc->cblks.dec[cblkno];
-				cblk->numsegs = 0;
-			}
-		}
-	}
-	
-	/* SOP markers */
-	
-	if (tcp->csty & J2K_CP_CSTY_SOP) {
-		if ((*c) != 0xff || (*(c + 1) != 0x91)) {
-			opj_event_msg(t2->cinfo, EVT_WARNING, "Expected SOP marker\n");
-		} else {
-			c += 6;
-		}
-		
-		/** TODO : check the Nsop value */
-	}
-	
-	/* 
-	When the marker PPT/PPM is used the packet header are store in PPT/PPM marker
-	This part deal with this caracteristic
-	step 1: Read packet header in the saved structure
-	step 2: Return to codestream for decoding 
-	*/
-
-	bio = bio_create();
-	
-	if (cp->ppm == 1) {		/* PPM */
-		hd = cp->ppm_data;
-		bio_init_dec(bio, hd, cp->ppm_len);
-	} else if (tcp->ppt == 1) {	/* PPT */
-		hd = tcp->ppt_data;
-		bio_init_dec(bio, hd, tcp->ppt_len);
-	} else {			/* Normal Case */
-		hd = c;
-		bio_init_dec(bio, hd, src+len-hd);
-	}
-	
-	present = bio_read(bio, 1);
-	
-	if (!present) {
-		bio_inalign(bio);
-		hd += bio_numbytes(bio);
-		bio_destroy(bio);
-		
-		/* EPH markers */
-		
-		if (tcp->csty & J2K_CP_CSTY_EPH) {
-			if ((*hd) != 0xff || (*(hd + 1) != 0x92)) {
-				printf("Error : expected EPH marker\n");
-			} else {
-				hd += 2;
-			}
-		}
-
-		/* << INDEX */
-		// End of packet header position. Currently only represents the distance to start of packet
-		// Will be updated later by incrementing with packet start value
-		if(pack_info) {
-			pack_info->end_ph_pos = (int)(c - src);
-		}
-		/* INDEX >> */
-		
-		if (cp->ppm == 1) {		/* PPM case */
-			cp->ppm_len += cp->ppm_data-hd;
-			cp->ppm_data = hd;
-			return (c - src);
-		}
-		if (tcp->ppt == 1) {	/* PPT case */
-			tcp->ppt_len+=tcp->ppt_data-hd;
-			tcp->ppt_data = hd;
-			return (c - src);
-		}
-		
-		return (hd - src);
-	}
-	
-	for (bandno = 0; bandno < res->numbands; bandno++) {
-		opj_tcd_band_t *band = &res->bands[bandno];
-		opj_tcd_precinct_t *prc = &band->precincts[precno];
-		
-		if ((band->x1-band->x0 == 0)||(band->y1-band->y0 == 0)) continue;
-		
-		for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-			int included, increment, n, segno;
-			opj_tcd_cblk_dec_t* cblk = &prc->cblks.dec[cblkno];
-			/* if cblk not yet included before --> inclusion tagtree */
-			if (!cblk->numsegs) {
-				included = tgt_decode(bio, prc->incltree, cblkno, layno + 1);
-				/* else one bit */
-			} else {
-				included = bio_read(bio, 1);
-			}
-			/* if cblk not included */
-			if (!included) {
-				cblk->numnewpasses = 0;
-				continue;
-			}
-			/* if cblk not yet included --> zero-bitplane tagtree */
-			if (!cblk->numsegs) {
-				int i, numimsbs;
-				for (i = 0; !tgt_decode(bio, prc->imsbtree, cblkno, i); i++) {
-					;
-				}
-				numimsbs = i - 1;
-				cblk->numbps = band->numbps - numimsbs;
-				cblk->numlenbits = 3;
-			}
-			/* number of coding passes */
-			cblk->numnewpasses = t2_getnumpasses(bio);
-			increment = t2_getcommacode(bio);
-			/* length indicator increment */
-			cblk->numlenbits += increment;
-			segno = 0;
-			if (!cblk->numsegs) {
-				t2_init_seg(cblk, segno, tcp->tccps[compno].cblksty, 1);
-			} else {
-				segno = cblk->numsegs - 1;
-				if (cblk->segs[segno].numpasses == cblk->segs[segno].maxpasses) {
-					++segno;
-					t2_init_seg(cblk, segno, tcp->tccps[compno].cblksty, 0);
-				}
-			}
-			n = cblk->numnewpasses;
-			
-			do {
-				cblk->segs[segno].numnewpasses = int_min(cblk->segs[segno].maxpasses - cblk->segs[segno].numpasses, n);
-				cblk->segs[segno].newlen = bio_read(bio, cblk->numlenbits + int_floorlog2(cblk->segs[segno].numnewpasses));
-				n -= cblk->segs[segno].numnewpasses;
-				if (n > 0) {
-					++segno;
-					t2_init_seg(cblk, segno, tcp->tccps[compno].cblksty, 0);
-				}
-			} while (n > 0);
-		}
-	}
-	
-	if (bio_inalign(bio)) {
-		bio_destroy(bio);
-		return -999;
-	}
-	
-	hd += bio_numbytes(bio);
-	bio_destroy(bio);
-	
-	/* EPH markers */
-	if (tcp->csty & J2K_CP_CSTY_EPH) {
-		if ((*hd) != 0xff || (*(hd + 1) != 0x92)) {
-			opj_event_msg(t2->cinfo, EVT_ERROR, "Expected EPH marker\n");
-			return -999;
-		} else {
-			hd += 2;
-		}
-	}
-
-	/* << INDEX */
-	// End of packet header position. Currently only represents the distance to start of packet
-	// Will be updated later by incrementing with packet start value
-	if(pack_info) {
-		pack_info->end_ph_pos = (int)(hd - src);
-	}
-	/* INDEX >> */
-	
-	if (cp->ppm==1) {
-		cp->ppm_len+=cp->ppm_data-hd;
-		cp->ppm_data = hd;
-	} else if (tcp->ppt == 1) {
-		tcp->ppt_len+=tcp->ppt_data-hd;
-		tcp->ppt_data = hd;
-	} else {
-		c=hd;
-	}
-	
-	for (bandno = 0; bandno < res->numbands; bandno++) {
-		opj_tcd_band_t *band = &res->bands[bandno];
-		opj_tcd_precinct_t *prc = &band->precincts[precno];
-		
-		if ((band->x1-band->x0 == 0)||(band->y1-band->y0 == 0)) continue;
-		
-		for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-			opj_tcd_cblk_dec_t* cblk = &prc->cblks.dec[cblkno];
-			opj_tcd_seg_t *seg = NULL;
-			if (!cblk->numnewpasses)
-				continue;
-			if (!cblk->numsegs) {
-				seg = &cblk->segs[0];
-				cblk->numsegs++;
-				cblk->len = 0;
-			} else {
-				seg = &cblk->segs[cblk->numsegs - 1];
-				if (seg->numpasses == seg->maxpasses) {
-					seg++;
-					cblk->numsegs++;
-				}
-			}
-			
-			do {
-				if (c + seg->newlen > src + len) {
-					return -999;
-				}
-
-#ifdef USE_JPWL
-			/* we need here a j2k handle to verify if making a check to
-			the validity of cblocks parameters is selected from user (-W) */
-
-				/* let's check that we are not exceeding */
-				if ((cblk->len + seg->newlen) > 8192) {
-					opj_event_msg(t2->cinfo, EVT_WARNING,
-						"JPWL: segment too long (%d) for codeblock %d (p=%d, b=%d, r=%d, c=%d)\n",
-						seg->newlen, cblkno, precno, bandno, resno, compno);
-					if (!JPWL_ASSUME) {
-						opj_event_msg(t2->cinfo, EVT_ERROR, "JPWL: giving up\n");
-						return -999;
-					}
-					seg->newlen = 8192 - cblk->len;
-					opj_event_msg(t2->cinfo, EVT_WARNING, "      - truncating segment to %d\n", seg->newlen);
-					break;
-				};
-
-#endif /* USE_JPWL */
-				
-				cblk->data = (unsigned char*) opj_realloc(cblk->data, (cblk->len + seg->newlen) * sizeof(unsigned char*));
-				memcpy(cblk->data + cblk->len, c, seg->newlen);
-				if (seg->numpasses == 0) {
-					seg->data = &cblk->data;
-					seg->dataindex = cblk->len;
-				}
-				c += seg->newlen;
-				cblk->len += seg->newlen;
-				seg->len += seg->newlen;
-				seg->numpasses += seg->numnewpasses;
-				cblk->numnewpasses -= seg->numnewpasses;
-				if (cblk->numnewpasses > 0) {
-					seg++;
-					cblk->numsegs++;
-				}
-			} while (cblk->numnewpasses > 0);
-		}
-	}
-	
-	return (c - src);
-}
-
-/* ----------------------------------------------------------------------- */
-
-int t2_encode_packets(opj_t2_t* t2,int tileno, opj_tcd_tile_t *tile, int maxlayers, unsigned char *dest, int len, opj_codestream_info_t *cstr_info,int tpnum, int tppos,int pino, J2K_T2_MODE t2_mode, int cur_totnum_tp){
-	unsigned char *c = dest;
-	int e = 0;
-	int compno;
-	opj_pi_iterator_t *pi = NULL;
-	int poc;
-	opj_image_t *image = t2->image;
-	opj_cp_t *cp = t2->cp;
-	opj_tcp_t *tcp = &cp->tcps[tileno];
-	int pocno = cp->cinema == CINEMA4K_24? 2: 1;
-	int maxcomp = cp->max_comp_size > 0 ? image->numcomps : 1;
-	
-	pi = pi_initialise_encode(image, cp, tileno, t2_mode);
-	if(!pi) {
-		/* TODO: throw an error */
-		return -999;
-	}
-	
-	if(t2_mode == THRESH_CALC ){ /* Calculating threshold */
-		for(compno = 0; compno < maxcomp; compno++ ){
-			for(poc = 0; poc < pocno ; poc++){
-				int comp_len = 0;
-				int tpnum = compno;
-				if (pi_create_encode(pi, cp,tileno,poc,tpnum,tppos,t2_mode,cur_totnum_tp)) {
-					opj_event_msg(t2->cinfo, EVT_ERROR, "Error initializing Packet Iterator\n");
-					pi_destroy(pi, cp, tileno);
-					return -999;
-				}
-				while (pi_next(&pi[poc])) {
-					if (pi[poc].layno < maxlayers) {
-						e = t2_encode_packet(tile, &cp->tcps[tileno], &pi[poc], c, dest + len - c, cstr_info, tileno);
-						comp_len = comp_len + e;
-						if (e == -999) {
-							break;
-						} else {
-							c += e;
-						}
-					}
-				}
-				if (e == -999) break;
-				if (cp->max_comp_size){
-					if (comp_len > cp->max_comp_size){
-						e = -999;
-						break;
-					}
-				}
-			}
-			if (e == -999)  break;
-		}
-	}else{  /* t2_mode == FINAL_PASS  */
-		pi_create_encode(pi, cp,tileno,pino,tpnum,tppos,t2_mode,cur_totnum_tp);
-		while (pi_next(&pi[pino])) {
-			if (pi[pino].layno < maxlayers) {
-				e = t2_encode_packet(tile, &cp->tcps[tileno], &pi[pino], c, dest + len - c, cstr_info, tileno);
-				if (e == -999) {
-					break;
-				} else {
-					c += e;
-				}
-				/* INDEX >> */
-				if(cstr_info) {
-					if(cstr_info->index_write) {
-						opj_tile_info_t *info_TL = &cstr_info->tile[tileno];
-						opj_packet_info_t *info_PK = &info_TL->packet[cstr_info->packno];
-						if (!cstr_info->packno) {
-							info_PK->start_pos = info_TL->end_header + 1;
-						} else {
-							info_PK->start_pos = ((cp->tp_on | tcp->POC)&& info_PK->start_pos) ? info_PK->start_pos : info_TL->packet[cstr_info->packno - 1].end_pos + 1;
-						}
-						info_PK->end_pos = info_PK->start_pos + e - 1;
-						info_PK->end_ph_pos += info_PK->start_pos - 1;	// End of packet header which now only represents the distance 
-																														// to start of packet is incremented by value of start of packet
-					}
-					
-					cstr_info->packno++;
-				}
-				/* << INDEX */
-				tile->packno++;
-			}
-		}
-	}
-	
-	pi_destroy(pi, cp, tileno);
-	
-	if (e == -999) {
-		return e;
-	}
-	
-  return (c - dest);
-}
-
-int t2_decode_packets(opj_t2_t *t2, unsigned char *src, int len, int tileno, opj_tcd_tile_t *tile, opj_codestream_info_t *cstr_info) {
-	unsigned char *c = src;
-	opj_pi_iterator_t *pi;
-	int pino, e = 0;
-	int n = 0, curtp = 0;
-	int tp_start_packno;
-
-	opj_image_t *image = t2->image;
-	opj_cp_t *cp = t2->cp;
-	
-	/* create a packet iterator */
-	pi = pi_create_decode(image, cp, tileno);
-	if(!pi) {
-		/* TODO: throw an error */
-		return -999;
-	}
-
-	tp_start_packno = 0;
-	
-	for (pino = 0; pino <= cp->tcps[tileno].numpocs; pino++) {
-		while (pi_next(&pi[pino])) {
-			if ((cp->layer==0) || (cp->layer>=((pi[pino].layno)+1))) {
-				opj_packet_info_t *pack_info;
-				if (cstr_info)
-					pack_info = &cstr_info->tile[tileno].packet[cstr_info->packno];
-				else
-					pack_info = NULL;
-				e = t2_decode_packet(t2, c, src + len - c, tile, &cp->tcps[tileno], &pi[pino], pack_info);
-			} else {
-				e = 0;
-			}
-			if(e == -999) return -999;
-			/* progression in resolution */
-			image->comps[pi[pino].compno].resno_decoded =	
-				(e > 0) ? 
-				int_max(pi[pino].resno, image->comps[pi[pino].compno].resno_decoded) 
-				: image->comps[pi[pino].compno].resno_decoded;
-			n++;
-
-			/* INDEX >> */
-			if(cstr_info) {
-				opj_tile_info_t *info_TL = &cstr_info->tile[tileno];
-				opj_packet_info_t *info_PK = &info_TL->packet[cstr_info->packno];
-				if (!cstr_info->packno) {
-					info_PK->start_pos = info_TL->end_header + 1;
-				} else if (info_TL->packet[cstr_info->packno-1].end_pos >= (int)cstr_info->tile[tileno].tp[curtp].tp_end_pos){ // New tile part
-					info_TL->tp[curtp].tp_numpacks = cstr_info->packno - tp_start_packno; // Number of packets in previous tile-part
-          info_TL->tp[curtp].tp_start_pack = tp_start_packno;
-					tp_start_packno = cstr_info->packno;
-					curtp++;
-					info_PK->start_pos = cstr_info->tile[tileno].tp[curtp].tp_end_header+1;
-				} else {
-					info_PK->start_pos = (cp->tp_on && info_PK->start_pos) ? info_PK->start_pos : info_TL->packet[cstr_info->packno - 1].end_pos + 1;
-				}
-				info_PK->end_pos = info_PK->start_pos + e - 1;
-				info_PK->end_ph_pos += info_PK->start_pos - 1;	// End of packet header which now only represents the distance 
-																												// to start of packet is incremented by value of start of packet
-				cstr_info->packno++;
-			}
-			/* << INDEX */
-			
-			if (e == -999) {		/* ADD */
-				break;
-			} else {
-				c += e;
-			}			
-		}
-	}
-	/* INDEX >> */
-	if(cstr_info) {
-		cstr_info->tile[tileno].tp[curtp].tp_numpacks = cstr_info->packno - tp_start_packno; // Number of packets in last tile-part
-    cstr_info->tile[tileno].tp[curtp].tp_start_pack = tp_start_packno;
-	}
-	/* << INDEX */
-
-	/* don't forget to release pi */
-	pi_destroy(pi, cp, tileno);
-	
-	if (e == -999) {
-		return e;
-	}
-	
-	return (c - src);
-}
-
-opj_bool t2_decode_packets_v2(
-						opj_t2_v2_t *p_t2,
-						OPJ_UINT32 p_tile_no,
-						struct opj_tcd_tile_v2 *p_tile,
-						OPJ_BYTE *p_src,
-						OPJ_UINT32 * p_data_read,
-						OPJ_UINT32 p_max_len,
-						opj_codestream_index_t *p_cstr_index)
-{
-	OPJ_BYTE *l_current_data = p_src;
-	opj_pi_iterator_t *l_pi = 00;
-	OPJ_UINT32 pino;
-	opj_image_t *l_image = p_t2->image;
-	opj_cp_v2_t *l_cp = p_t2->cp;
-	opj_cp_v2_t *cp = p_t2->cp;
-	opj_tcp_v2_t *l_tcp = &(p_t2->cp->tcps[p_tile_no]);
-	OPJ_UINT32 l_nb_bytes_read;
-	OPJ_UINT32 l_nb_pocs = l_tcp->numpocs + 1;
-	opj_pi_iterator_t *l_current_pi = 00;
-	OPJ_UINT32 curtp = 0;
-	OPJ_UINT32 tp_start_packno;
-	opj_packet_info_t *l_pack_info = 00;
-	opj_image_comp_t* l_img_comp = 00;
-
-#ifdef TODO_MSD
-	if (p_cstr_index) {
-		l_pack_info = p_cstr_index->tile_index[p_tile_no].packet;
-	}
-#endif
-
-	/* create a packet iterator */
-	l_pi = pi_create_decode_v2(l_image, l_cp, p_tile_no);
-	if (!l_pi) {
-		return OPJ_FALSE;
-	}
-
-	tp_start_packno = 0;
-	l_current_pi = l_pi;
-
-	for	(pino = 0; pino <= l_tcp->numpocs; ++pino) {
-
-		/* if the resolution needed is to low, one dim of the tilec could be equal to zero
-		 * and no packets are used to encode this resolution and
-		 * l_current_pi->resno is always >= p_tile->comps[l_current_pi->compno].minimum_num_resolutions
-		 * and no l_img_comp->resno_decoded are computed
-		 */
-		opj_bool* first_pass_failed = (opj_bool*)opj_malloc(l_image->numcomps * sizeof(opj_bool));
-		memset(first_pass_failed, OPJ_TRUE, l_image->numcomps * sizeof(opj_bool));
-
-		while (pi_next(l_current_pi)) {
-
-
-			if (l_tcp->num_layers_to_decode > l_current_pi->layno
-					&& l_current_pi->resno < p_tile->comps[l_current_pi->compno].minimum_num_resolutions) {
-				l_nb_bytes_read = 0;
-
-				first_pass_failed[l_current_pi->compno] = OPJ_FALSE;
-
-				if (! t2_decode_packet_v2(p_t2,p_tile,l_tcp,l_current_pi,l_current_data,&l_nb_bytes_read,p_max_len,l_pack_info)) {
-					pi_destroy_v2(l_pi,l_nb_pocs);
-					return OPJ_FALSE;
-				}
-
-				l_img_comp = &(l_image->comps[l_current_pi->compno]);
-				l_img_comp->resno_decoded = uint_max(l_current_pi->resno, l_img_comp->resno_decoded);
-			}
-			else {
-				l_nb_bytes_read = 0;
-				if (! t2_skip_packet(p_t2,p_tile,l_tcp,l_current_pi,l_current_data,&l_nb_bytes_read,p_max_len,l_pack_info)) {
-					pi_destroy_v2(l_pi,l_nb_pocs);
-					return OPJ_FALSE;
-				}
-			}
-
-			if (first_pass_failed[l_current_pi->compno]) {
-				l_img_comp = &(l_image->comps[l_current_pi->compno]);
-				if (l_img_comp->resno_decoded == 0)
-					l_img_comp->resno_decoded = p_tile->comps[l_current_pi->compno].minimum_num_resolutions - 1;
-			}
-
-			l_current_data += l_nb_bytes_read;
-			p_max_len -= l_nb_bytes_read;
-
-			/* INDEX >> */
-#ifdef TODO_MSD
-			if(p_cstr_info) {
-				opj_tile_info_v2_t *info_TL = &p_cstr_info->tile[p_tile_no];
-				opj_packet_info_t *info_PK = &info_TL->packet[p_cstr_info->packno];
-				if (!p_cstr_info->packno) {
-					info_PK->start_pos = info_TL->end_header + 1;
-				} else if (info_TL->packet[p_cstr_info->packno-1].end_pos >= (OPJ_INT32)p_cstr_info->tile[p_tile_no].tp[curtp].tp_end_pos){ // New tile part
-					info_TL->tp[curtp].tp_numpacks = p_cstr_info->packno - tp_start_packno; // Number of packets in previous tile-part
-					tp_start_packno = p_cstr_info->packno;
-					curtp++;
-					info_PK->start_pos = p_cstr_info->tile[p_tile_no].tp[curtp].tp_end_header+1;
-				} else {
-					info_PK->start_pos = (cp->m_specific_param.m_enc.m_tp_on && info_PK->start_pos) ? info_PK->start_pos : info_TL->packet[p_cstr_info->packno - 1].end_pos + 1;
-				}
-				info_PK->end_pos = info_PK->start_pos + l_nb_bytes_read - 1;
-				info_PK->end_ph_pos += info_PK->start_pos - 1;	// End of packet header which now only represents the distance
-				++p_cstr_info->packno;
-			}
-#endif
-			/* << INDEX */
-		}
-		++l_current_pi;
-
-		opj_free(first_pass_failed);
-	}
-	/* INDEX >> */
-#ifdef TODO_MSD
-	if
-		(p_cstr_info) {
-		p_cstr_info->tile[p_tile_no].tp[curtp].tp_numpacks = p_cstr_info->packno - tp_start_packno; // Number of packets in last tile-part
-	}
-#endif
-	/* << INDEX */
-
-	/* don't forget to release pi */
-	pi_destroy_v2(l_pi,l_nb_pocs);
-	*p_data_read = l_current_data - p_src;
-	return OPJ_TRUE;
-}
-
-/* ----------------------------------------------------------------------- */
-
-opj_t2_t* t2_create(opj_common_ptr cinfo, opj_image_t *image, opj_cp_t *cp) {
-	/* create the tcd structure */
-	opj_t2_t *t2 = (opj_t2_t*)opj_malloc(sizeof(opj_t2_t));
-	if(!t2) return NULL;
-	t2->cinfo = cinfo;
-	t2->image = image;
-	t2->cp = cp;
-
-	return t2;
-}
-
-/**
- * Creates a Tier 2 handle
- *
- * @param	p_image		Source or destination image
- * @param	p_cp		Image coding parameters.
- * @return		a new T2 handle if successful, NULL otherwise.
-*/
-opj_t2_v2_t* t2_create_v2(	opj_image_t *p_image,
-							opj_cp_v2_t *p_cp)
-{
-	/* create the tcd structure */
-	opj_t2_v2_t *l_t2 = (opj_t2_v2_t*)opj_malloc(sizeof(opj_t2_v2_t));
-	if (!l_t2) {
-		return NULL;
-	}
-	memset(l_t2,0,sizeof(opj_t2_v2_t));
-
-	l_t2->image = p_image;
-	l_t2->cp = p_cp;
-
-	return l_t2;
-}
-
-void t2_destroy(opj_t2_t *t2) {
-	if(t2) {
-		opj_free(t2);
-	}
-}
-
-void t2_destroy_v2(opj_t2_v2_t *t2) {
-	if(t2) {
-		opj_free(t2);
-	}
-}
-
-
-static opj_bool t2_decode_packet_v2(
-							 opj_t2_v2_t* p_t2,
-							 opj_tcd_tile_v2_t *p_tile,
-                             opj_tcp_v2_t *p_tcp,
-							 opj_pi_iterator_t *p_pi,
-							 OPJ_BYTE *p_src,
-							 OPJ_UINT32 * p_data_read,
-							 OPJ_UINT32 p_max_length,
-							 opj_packet_info_t *p_pack_info)
-{
-	opj_bool l_read_data;
-	OPJ_UINT32 l_nb_bytes_read = 0;
-	OPJ_UINT32 l_nb_total_bytes_read = 0;
-
-	*p_data_read = 0;
-
-	if (! t2_read_packet_header(p_t2,p_tile,p_tcp,p_pi,&l_read_data,p_src,&l_nb_bytes_read,p_max_length,p_pack_info)) {
-		return OPJ_FALSE;
-	}
-
-	p_src += l_nb_bytes_read;
-	l_nb_total_bytes_read += l_nb_bytes_read;
-	p_max_length -= l_nb_bytes_read;
-
-	/* we should read data for the packet */
-	if (l_read_data) {
-		l_nb_bytes_read = 0;
-
-		if (! t2_read_packet_data(p_t2,p_tile,p_pi,p_src,&l_nb_bytes_read,p_max_length,p_pack_info)) {
-			return OPJ_FALSE;
-		}
-
-		l_nb_total_bytes_read += l_nb_bytes_read;
-	}
-
-	*p_data_read = l_nb_total_bytes_read;
-
-	return OPJ_TRUE;
-}
-
-static opj_bool t2_skip_packet(
-							 opj_t2_v2_t* p_t2,
-							 opj_tcd_tile_v2_t *p_tile,
-                             opj_tcp_v2_t *p_tcp,
-							 opj_pi_iterator_t *p_pi,
-							 OPJ_BYTE *p_src,
-							 OPJ_UINT32 * p_data_read,
-							 OPJ_UINT32 p_max_length,
-							 opj_packet_info_t *p_pack_info)
-{
-	opj_bool l_read_data;
-	OPJ_UINT32 l_nb_bytes_read = 0;
-	OPJ_UINT32 l_nb_total_bytes_read = 0;
-
-	*p_data_read = 0;
-
-	if (! t2_read_packet_header(p_t2,p_tile,p_tcp,p_pi,&l_read_data,p_src,&l_nb_bytes_read,p_max_length,p_pack_info)) {
-		return OPJ_FALSE;
-	}
-
-	p_src += l_nb_bytes_read;
-	l_nb_total_bytes_read += l_nb_bytes_read;
-	p_max_length -= l_nb_bytes_read;
-
-	/* we should read data for the packet */
-	if (l_read_data) {
-		l_nb_bytes_read = 0;
-
-		if (! t2_skip_packet_data(p_t2,p_tile,p_pi,&l_nb_bytes_read,p_max_length,p_pack_info)) {
-			return OPJ_FALSE;
-		}
-
-		l_nb_total_bytes_read += l_nb_bytes_read;
-	}
-	*p_data_read = l_nb_total_bytes_read;
-
-	return OPJ_TRUE;
-}
-
-
-
-static opj_bool t2_read_packet_header(
-							 opj_t2_v2_t* p_t2,
-							 opj_tcd_tile_v2_t *p_tile,
-                             opj_tcp_v2_t *p_tcp,
-							 opj_pi_iterator_t *p_pi,
-							 opj_bool * p_is_data_present,
-							 OPJ_BYTE *p_src_data,
-							 OPJ_UINT32 * p_data_read,
-							 OPJ_UINT32 p_max_length,
-							 opj_packet_info_t *p_pack_info)
-{
-	/* loop */
-	OPJ_UINT32 bandno, cblkno;
-	OPJ_UINT32 l_nb_code_blocks;
-	OPJ_UINT32 l_remaining_length;
-	OPJ_UINT32 l_header_length;
-	OPJ_UINT32 * l_modified_length_ptr = 00;
-	OPJ_BYTE *l_current_data = p_src_data;
-	opj_cp_v2_t *l_cp = p_t2->cp;
-	opj_bio_t *l_bio = 00;	/* BIO component */
-	opj_tcd_band_v2_t *l_band = 00;
-	opj_tcd_cblk_dec_v2_t* l_cblk = 00;
-	opj_tcd_resolution_v2_t* l_res = &p_tile->comps[p_pi->compno].resolutions[p_pi->resno];
-
-	OPJ_BYTE *l_header_data = 00;
-	OPJ_BYTE **l_header_data_start = 00;
-
-	OPJ_UINT32 l_present;
-
-	if (p_pi->layno == 0) {
-		l_band = l_res->bands;
-
-		/* reset tagtrees */
-		for (bandno = 0; bandno < l_res->numbands; ++bandno) {
-			opj_tcd_precinct_v2_t *l_prc = &l_band->precincts[p_pi->precno];
-
-			if ( ! ((l_band->x1-l_band->x0 == 0)||(l_band->y1-l_band->y0 == 0)) ) {
-				tgt_reset(l_prc->incltree);
-				tgt_reset(l_prc->imsbtree);
-				l_cblk = l_prc->cblks.dec;
-
-				l_nb_code_blocks = l_prc->cw * l_prc->ch;
-				for (cblkno = 0; cblkno < l_nb_code_blocks; ++cblkno) {
-					l_cblk->numsegs = 0;
-					l_cblk->real_num_segs = 0;
-					++l_cblk;
-				}
-			}
-
-			++l_band;
-		}
-	}
-
-	/* SOP markers */
-
-	if (p_tcp->csty & J2K_CP_CSTY_SOP) {
-		if ((*l_current_data) != 0xff || (*(l_current_data + 1) != 0x91)) {
-			// TODO opj_event_msg(t2->cinfo->event_mgr, EVT_WARNING, "Expected SOP marker\n");
-		} else {
-			l_current_data += 6;
-		}
-
-		/** TODO : check the Nsop value */
-	}
-
-	/*
-	When the marker PPT/PPM is used the packet header are store in PPT/PPM marker
-	This part deal with this caracteristic
-	step 1: Read packet header in the saved structure
-	step 2: Return to codestream for decoding
-	*/
-
-	l_bio = bio_create();
-	if (! l_bio) {
-		return OPJ_FALSE;
-	}
-
-	if (l_cp->ppm == 1) { /* PPM */
-		l_header_data_start = &l_cp->ppm_data;
-		l_header_data = *l_header_data_start;
-		l_modified_length_ptr = &(l_cp->ppm_len);
-
-	}
-	else if (p_tcp->ppt == 1) { /* PPT */
-		l_header_data_start = &(p_tcp->ppt_data);
-		l_header_data = *l_header_data_start;
-		l_modified_length_ptr = &(p_tcp->ppt_len);
-	}
-	else {	/* Normal Case */
-		l_header_data_start = &(l_current_data);
-		l_header_data = *l_header_data_start;
-		l_remaining_length = p_src_data+p_max_length-l_header_data;
-		l_modified_length_ptr = &(l_remaining_length);
-	}
-
-	bio_init_dec(l_bio, l_header_data,*l_modified_length_ptr);
-
-	l_present = bio_read(l_bio, 1);
-	if (!l_present) {
-		bio_inalign(l_bio);
-		l_header_data += bio_numbytes(l_bio);
-		bio_destroy(l_bio);
-
-		/* EPH markers */
-		if (p_tcp->csty & J2K_CP_CSTY_EPH) {
-			if ((*l_header_data) != 0xff || (*(l_header_data + 1) != 0x92)) {
-				printf("Error : expected EPH marker\n");
-			} else {
-				l_header_data += 2;
-			}
-		}
-
-		l_header_length = (l_header_data - *l_header_data_start);
-		*l_modified_length_ptr -= l_header_length;
-		*l_header_data_start += l_header_length;
-
-		/* << INDEX */
-		// End of packet header position. Currently only represents the distance to start of packet
-		// Will be updated later by incrementing with packet start value
-		if (p_pack_info) {
-			p_pack_info->end_ph_pos = (OPJ_INT32)(l_current_data - p_src_data);
-		}
-		/* INDEX >> */
-
-		* p_is_data_present = OPJ_FALSE;
-		*p_data_read = l_current_data - p_src_data;
-		return OPJ_TRUE;
-	}
-
-	l_band = l_res->bands;
-	for (bandno = 0; bandno < l_res->numbands; ++bandno) {
-		opj_tcd_precinct_v2_t *l_prc = &(l_band->precincts[p_pi->precno]);
-
-		if ((l_band->x1-l_band->x0 == 0)||(l_band->y1-l_band->y0 == 0)) {
-			++l_band;
-			continue;
-		}
-
-		l_nb_code_blocks = l_prc->cw * l_prc->ch;
-		l_cblk = l_prc->cblks.dec;
-		for (cblkno = 0; cblkno < l_nb_code_blocks; cblkno++) {
-			OPJ_UINT32 l_included,l_increment, l_segno;
-			OPJ_INT32 n;
-
-			/* if cblk not yet included before --> inclusion tagtree */
-			if (!l_cblk->numsegs) {
-				l_included = tgt_decode(l_bio, l_prc->incltree, cblkno, p_pi->layno + 1);
-				/* else one bit */
-			}
-			else {
-				l_included = bio_read(l_bio, 1);
-			}
-
-			/* if cblk not included */
-			if (!l_included) {
-				l_cblk->numnewpasses = 0;
-				++l_cblk;
-				continue;
-			}
-
-			/* if cblk not yet included --> zero-bitplane tagtree */
-			if (!l_cblk->numsegs) {
-				OPJ_UINT32 i = 0;
-
-				while (!tgt_decode(l_bio, l_prc->imsbtree, cblkno, i)) {
-					++i;
-				}
-
-				l_cblk->numbps = l_band->numbps + 1 - i;
-				l_cblk->numlenbits = 3;
-			}
-
-			/* number of coding passes */
-			l_cblk->numnewpasses = t2_getnumpasses(l_bio);
-			l_increment = t2_getcommacode(l_bio);
-
-			/* length indicator increment */
-			l_cblk->numlenbits += l_increment;
-			l_segno = 0;
-
-			if (!l_cblk->numsegs) {
-				if (! t2_init_seg_v2(l_cblk, l_segno, p_tcp->tccps[p_pi->compno].cblksty, 1)) {
-					bio_destroy(l_bio);
-					return OPJ_FALSE;
-				}
-			}
-			else {
-				l_segno = l_cblk->numsegs - 1;
-				if (l_cblk->segs[l_segno].numpasses == l_cblk->segs[l_segno].maxpasses) {
-					++l_segno;
-					if (! t2_init_seg_v2(l_cblk, l_segno, p_tcp->tccps[p_pi->compno].cblksty, 0)) {
-						bio_destroy(l_bio);
-						return OPJ_FALSE;
-					}
-				}
-			}
-			n = l_cblk->numnewpasses;
-
-			do {
-				l_cblk->segs[l_segno].numnewpasses = int_min(l_cblk->segs[l_segno].maxpasses - l_cblk->segs[l_segno].numpasses, n);
-				l_cblk->segs[l_segno].newlen = bio_read(l_bio, l_cblk->numlenbits + uint_floorlog2(l_cblk->segs[l_segno].numnewpasses));
-
-				n -= l_cblk->segs[l_segno].numnewpasses;
-				if (n > 0) {
-					++l_segno;
-
-					if (! t2_init_seg_v2(l_cblk, l_segno, p_tcp->tccps[p_pi->compno].cblksty, 0)) {
-						bio_destroy(l_bio);
-						return OPJ_FALSE;
-					}
-				}
-			} while (n > 0);
-
-			++l_cblk;
-		}
-
-		++l_band;
-	}
-
-	if (bio_inalign(l_bio)) {
-		bio_destroy(l_bio);
-		return OPJ_FALSE;
-	}
-
-	l_header_data += bio_numbytes(l_bio);
-	bio_destroy(l_bio);
-
-	/* EPH markers */
-	if (p_tcp->csty & J2K_CP_CSTY_EPH) {
-		if ((*l_header_data) != 0xff || (*(l_header_data + 1) != 0x92)) {
-			// TODO opj_event_msg(t2->cinfo->event_mgr, EVT_ERROR, "Expected EPH marker\n");
-		} else {
-			l_header_data += 2;
-		}
-	}
-
-	l_header_length = (l_header_data - *l_header_data_start);
-	*l_modified_length_ptr -= l_header_length;
-	*l_header_data_start += l_header_length;
-
-	/* << INDEX */
-	// End of packet header position. Currently only represents the distance to start of packet
-	// Will be updated later by incrementing with packet start value
-	if (p_pack_info) {
-		p_pack_info->end_ph_pos = (OPJ_INT32)(l_current_data - p_src_data);
-	}
-	/* INDEX >> */
-
-	*p_is_data_present = OPJ_TRUE;
-	*p_data_read = l_current_data - p_src_data;
-
-	return OPJ_TRUE;
-}
-
-static opj_bool t2_read_packet_data(
-							 opj_t2_v2_t* p_t2,
-							 opj_tcd_tile_v2_t *p_tile,
-							 opj_pi_iterator_t *p_pi,
-							 OPJ_BYTE *p_src_data,
-							 OPJ_UINT32 * p_data_read,
-							 OPJ_UINT32 p_max_length,
-							 opj_packet_info_t *pack_info)
-{
-	OPJ_UINT32 bandno, cblkno;
-	OPJ_UINT32 l_nb_code_blocks;
-	OPJ_BYTE *l_current_data = p_src_data;
-	opj_tcd_band_v2_t *l_band = 00;
-	opj_tcd_cblk_dec_v2_t* l_cblk = 00;
-	opj_tcd_resolution_v2_t* l_res = &p_tile->comps[p_pi->compno].resolutions[p_pi->resno];
-
-	l_band = l_res->bands;
-	for (bandno = 0; bandno < l_res->numbands; ++bandno) {
-		opj_tcd_precinct_v2_t *l_prc = &l_band->precincts[p_pi->precno];
-
-		if ((l_band->x1-l_band->x0 == 0)||(l_band->y1-l_band->y0 == 0)) {
-			++l_band;
-			continue;
-		}
-
-		l_nb_code_blocks = l_prc->cw * l_prc->ch;
-		l_cblk = l_prc->cblks.dec;
-
-		for (cblkno = 0; cblkno < l_nb_code_blocks; ++cblkno) {
-			opj_tcd_seg_t *l_seg = 00;
-
-			if (!l_cblk->numnewpasses) {
-				/* nothing to do */
-				++l_cblk;
-				continue;
-			}
-
-			if (!l_cblk->numsegs) {
-				l_seg = l_cblk->segs;
-				++l_cblk->numsegs;
-				l_cblk->len = 0;
-			}
-			else {
-				l_seg = &l_cblk->segs[l_cblk->numsegs - 1];
-
-				if (l_seg->numpasses == l_seg->maxpasses) {
-					++l_seg;
-					++l_cblk->numsegs;
-				}
-			}
-
-			do {
-				if (l_current_data + l_seg->newlen > p_src_data + p_max_length) {
-					return OPJ_FALSE;
-				}
-
-#ifdef USE_JPWL
-			/* we need here a j2k handle to verify if making a check to
-			the validity of cblocks parameters is selected from user (-W) */
-
-				/* let's check that we are not exceeding */
-				if ((l_cblk->len + l_seg->newlen) > 8192) {
-					opj_event_msg(p_t2->cinfo, EVT_WARNING,
-						"JPWL: segment too long (%d) for codeblock %d (p=%d, b=%d, r=%d, c=%d)\n",
-						l_seg->newlen, cblkno, p_pi->precno, bandno, p_pi->resno, p_pi->compno);
-					if (!JPWL_ASSUME) {
-						opj_event_msg(p_t2->cinfo, EVT_ERROR, "JPWL: giving up\n");
-						return OPJ_FALSE;
-					}
-					l_seg->newlen = 8192 - l_cblk->len;
-					opj_event_msg(p_t2->cinfo, EVT_WARNING, "      - truncating segment to %d\n", l_seg->newlen);
-					break;
-				};
-
-#endif /* USE_JPWL */
-
-				memcpy(l_cblk->data + l_cblk->len, l_current_data, l_seg->newlen);
-
-				if (l_seg->numpasses == 0) {
-					l_seg->data = &l_cblk->data;
-					l_seg->dataindex = l_cblk->len;
-				}
-
-				l_current_data += l_seg->newlen;
-				l_seg->numpasses += l_seg->numnewpasses;
-				l_cblk->numnewpasses -= l_seg->numnewpasses;
-
-				l_seg->real_num_passes = l_seg->numpasses;
-				l_cblk->len += l_seg->newlen;
-				l_seg->len += l_seg->newlen;
-
-				if (l_cblk->numnewpasses > 0) {
-					++l_seg;
-					++l_cblk->numsegs;
-				}
-			} while (l_cblk->numnewpasses > 0);
-
-			l_cblk->real_num_segs = l_cblk->numsegs;
-			++l_cblk;
-		}
-
-		++l_band;
-	}
-
-	*(p_data_read) = l_current_data - p_src_data;
-
-	return OPJ_TRUE;
-}
-
-static opj_bool t2_skip_packet_data(
-							 opj_t2_v2_t* p_t2,
-							 opj_tcd_tile_v2_t *p_tile,
-							 opj_pi_iterator_t *p_pi,
-							 OPJ_UINT32 * p_data_read,
-							 OPJ_UINT32 p_max_length,
-							 opj_packet_info_t *pack_info)
-{
-	OPJ_UINT32 bandno, cblkno;
-	OPJ_UINT32 l_nb_code_blocks;
-	opj_tcd_band_v2_t *l_band = 00;
-	opj_tcd_cblk_dec_v2_t* l_cblk = 00;
-	opj_tcd_resolution_v2_t* l_res = &p_tile->comps[p_pi->compno].resolutions[p_pi->resno];
-
-	*p_data_read = 0;
-	l_band = l_res->bands;
-
-	for (bandno = 0; bandno < l_res->numbands; ++bandno) {
-		opj_tcd_precinct_v2_t *l_prc = &l_band->precincts[p_pi->precno];
-
-		if ((l_band->x1-l_band->x0 == 0)||(l_band->y1-l_band->y0 == 0)) {
-			++l_band;
-			continue;
-		}
-
-		l_nb_code_blocks = l_prc->cw * l_prc->ch;
-		l_cblk = l_prc->cblks.dec;
-
-		for (cblkno = 0; cblkno < l_nb_code_blocks; ++cblkno) {
-			opj_tcd_seg_t *l_seg = 00;
-
-			if (!l_cblk->numnewpasses) {
-				/* nothing to do */
-				++l_cblk;
-				continue;
-			}
-
-			if (!l_cblk->numsegs) {
-				l_seg = l_cblk->segs;
-				++l_cblk->numsegs;
-				l_cblk->len = 0;
-			}
-			else {
-				l_seg = &l_cblk->segs[l_cblk->numsegs - 1];
-
-				if (l_seg->numpasses == l_seg->maxpasses) {
-					++l_seg;
-					++l_cblk->numsegs;
-				}
-			}
-
-			do {
-				if (* p_data_read + l_seg->newlen > p_max_length) {
-					return OPJ_FALSE;
-				}
-
-#ifdef USE_JPWL
-			/* we need here a j2k handle to verify if making a check to
-			the validity of cblocks parameters is selected from user (-W) */
-
-				/* let's check that we are not exceeding */
-				if ((l_cblk->len + l_seg->newlen) > 8192) {
-					opj_event_msg(p_t2->cinfo, EVT_WARNING,
-						"JPWL: segment too long (%d) for codeblock %d (p=%d, b=%d, r=%d, c=%d)\n",
-						l_seg->newlen, cblkno, p_pi->precno, bandno, p_pi->resno, p_pi->compno);
-					if (!JPWL_ASSUME) {
-						opj_event_msg(p_t2->cinfo, EVT_ERROR, "JPWL: giving up\n");
-						return -999;
-					}
-					l_seg->newlen = 8192 - l_cblk->len;
-					opj_event_msg(p_t2->cinfo, EVT_WARNING, "      - truncating segment to %d\n", l_seg->newlen);
-					break;
-				};
-
-#endif /* USE_JPWL */
-				*(p_data_read) += l_seg->newlen;
-
-				l_seg->numpasses += l_seg->numnewpasses;
-				l_cblk->numnewpasses -= l_seg->numnewpasses;
-				if (l_cblk->numnewpasses > 0)
-				{
-					++l_seg;
-					++l_cblk->numsegs;
-				}
-			} while (l_cblk->numnewpasses > 0);
-
-			++l_cblk;
-		}
-
-		++l_band;
-	}
-
-	return OPJ_TRUE;
-}
-
-
-static opj_bool t2_init_seg_v2(opj_tcd_cblk_dec_v2_t* cblk, OPJ_UINT32 index, OPJ_UINT32 cblksty, OPJ_UINT32 first)
-{
-	opj_tcd_seg_t* seg = 00;
-	OPJ_UINT32 l_nb_segs = index + 1;
-
-	if (l_nb_segs > cblk->m_current_max_segs) {
-		cblk->m_current_max_segs += J2K_DEFAULT_NB_SEGS;
-
-		cblk->segs = (opj_tcd_seg_t*) opj_realloc(cblk->segs, cblk->m_current_max_segs * sizeof(opj_tcd_seg_t));
-		if(! cblk->segs) {
-			return OPJ_FALSE;
-		}
-	}
-
-	seg = &cblk->segs[index];
-	memset(seg,0,sizeof(opj_tcd_seg_t));
-
-	if (cblksty & J2K_CCP_CBLKSTY_TERMALL) {
-		seg->maxpasses = 1;
-	}
-	else if (cblksty & J2K_CCP_CBLKSTY_LAZY) {
-		if (first) {
-			seg->maxpasses = 10;
-		} else {
-			seg->maxpasses = (((seg - 1)->maxpasses == 1) || ((seg - 1)->maxpasses == 10)) ? 2 : 1;
-		}
-	} else {
-		seg->maxpasses = 109;
-	}
-
-	return OPJ_TRUE;
-}
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/t2.h b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/t2.h
deleted file mode 100644
index f1637fba4ad8cd3e81a5690d8d00e5ca0f632c51..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/t2.h
+++ /dev/null
@@ -1,148 +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.
- */
-#ifndef __T2_H
-#define __T2_H
-/**
-@file t2.h
-@brief Implementation of a tier-2 coding (packetization of code-block data) (T2)
-
-*/
-
-/** @defgroup T2 T2 - Implementation of a tier-2 coding */
-/*@{*/
-
-/**
-Tier-2 coding
-*/
-typedef struct opj_t2 {
-	/** codec context */
-	opj_common_ptr cinfo;
-
-	/** Encoding: pointer to the src image. Decoding: pointer to the dst image. */
-	opj_image_t *image;
-	/** pointer to the image coding parameters */
-	opj_cp_t *cp;
-} opj_t2_t;
-
-/**
-Tier-2 coding
-*/
-typedef struct opj_t2_v2 {
-	/** codec context */
-	opj_common_ptr cinfo;
-
-	/** Encoding: pointer to the src image. Decoding: pointer to the dst image. */
-	opj_image_t *image;
-	/** pointer to the image coding parameters */
-	opj_cp_v2_t *cp;
-} opj_t2_v2_t;
-
-/** @name Exported functions */
-/*@{*/
-/* ----------------------------------------------------------------------- */
-
-/**
-Encode the packets of a tile to a destination buffer
-@param t2 T2 handle
-@param tileno number of the tile encoded
-@param tile the tile for which to write the packets
-@param maxlayers maximum number of layers
-@param dest the destination buffer
-@param len the length of the destination buffer
-@param cstr_info Codestream information structure 
-@param tpnum Tile part number of the current tile
-@param tppos The position of the tile part flag in the progression order
-@param pino 
-@param t2_mode If == 0 In Threshold calculation ,If == 1 Final pass
-@param cur_totnum_tp The total number of tile parts in the current tile
-*/
-int t2_encode_packets(opj_t2_t* t2,int tileno, opj_tcd_tile_t *tile, int maxlayers, unsigned char *dest, int len, opj_codestream_info_t *cstr_info,int tpnum, int tppos,int pino,J2K_T2_MODE t2_mode,int cur_totnum_tp);
-/**
-Decode the packets of a tile from a source buffer
-@param t2 T2 handle
-@param src the source buffer
-@param len length of the source buffer
-@param tileno number that identifies the tile for which to decode the packets
-@param tile tile for which to decode the packets
-@param cstr_info Codestream information structure
- */
-int t2_decode_packets(opj_t2_t *t2, unsigned char *src, int len, int tileno, opj_tcd_tile_t *tile, opj_codestream_info_t *cstr_info);
-
-/**
-Decode the packets of a tile from a source buffer
-@param t2 T2 handle
-@param src the source buffer
-@param len length of the source buffer
-@param tileno number that identifies the tile for which to decode the packets
-@param tile tile for which to decode the packets
- */
-opj_bool t2_decode_packets_v2(	opj_t2_v2_t *t2,
-								OPJ_UINT32 tileno,
-								struct opj_tcd_tile_v2 *tile,
-								OPJ_BYTE *src, OPJ_UINT32 * p_data_read,
-								OPJ_UINT32 len,
-								opj_codestream_index_t *cstr_info);
-
-/**
- * Creates a Tier 2 handle
- *
- * @param	p_image		Source or destination image
- * @param	p_cp		Image coding parameters.
- * @return		a new T2 handle if successful, NULL otherwise.
-*/
-opj_t2_v2_t* t2_create_v2(opj_image_t *p_image, opj_cp_v2_t *p_cp);
-
-/**
-Create a T2 handle
-@param cinfo Codec context info
-@param image Source or destination image
-@param cp Image coding parameters
-@return Returns a new T2 handle if successful, returns NULL otherwise
-*/
-opj_t2_t* t2_create(opj_common_ptr cinfo, opj_image_t *image, opj_cp_t *cp);
-/**
-Destroy a T2 handle
-@param t2 T2 handle to destroy
-*/
-void t2_destroy(opj_t2_t *t2);
-
-/**
-Destroy a T2 handle
-@param t2 T2 handle to destroy
-*/
-void t2_destroy_v2(opj_t2_v2_t *t2);
-
-/* ----------------------------------------------------------------------- */
-/*@}*/
-
-/*@}*/
-
-#endif /* __T2_H */
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/tcd.c b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/tcd.c
deleted file mode 100644
index 06724c842399e91c99c8b9b7812d7fad6f9576a5..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/tcd.c
+++ /dev/null
@@ -1,2625 +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
- * 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_includes.h"
-
-void tcd_dump(FILE *fd, opj_tcd_t *tcd, opj_tcd_image_t * img) {
-	int tileno, compno, resno, bandno, precno;//, cblkno;
-
-	fprintf(fd, "image {\n");
-	fprintf(fd, "  tw=%d, th=%d x0=%d x1=%d y0=%d y1=%d\n", 
-		img->tw, img->th, tcd->image->x0, tcd->image->x1, tcd->image->y0, tcd->image->y1);
-
-	for (tileno = 0; tileno < img->th * img->tw; tileno++) {
-		opj_tcd_tile_t *tile = &tcd->tcd_image->tiles[tileno];
-		fprintf(fd, "  tile {\n");
-		fprintf(fd, "    x0=%d, y0=%d, x1=%d, y1=%d, numcomps=%d\n",
-			tile->x0, tile->y0, tile->x1, tile->y1, tile->numcomps);
-		for (compno = 0; compno < tile->numcomps; compno++) {
-			opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
-			fprintf(fd, "    tilec {\n");
-			fprintf(fd,
-				"      x0=%d, y0=%d, x1=%d, y1=%d, numresolutions=%d\n",
-				tilec->x0, tilec->y0, tilec->x1, tilec->y1, tilec->numresolutions);
-			for (resno = 0; resno < tilec->numresolutions; resno++) {
-				opj_tcd_resolution_t *res = &tilec->resolutions[resno];
-				fprintf(fd, "\n   res {\n");
-				fprintf(fd,
-					"          x0=%d, y0=%d, x1=%d, y1=%d, pw=%d, ph=%d, numbands=%d\n",
-					res->x0, res->y0, res->x1, res->y1, res->pw, res->ph, res->numbands);
-				for (bandno = 0; bandno < res->numbands; bandno++) {
-					opj_tcd_band_t *band = &res->bands[bandno];
-					fprintf(fd, "        band {\n");
-					fprintf(fd,
-						"          x0=%d, y0=%d, x1=%d, y1=%d, stepsize=%f, numbps=%d\n",
-						band->x0, band->y0, band->x1, band->y1, band->stepsize, band->numbps);
-					for (precno = 0; precno < res->pw * res->ph; precno++) {
-						opj_tcd_precinct_t *prec = &band->precincts[precno];
-						fprintf(fd, "          prec {\n");
-						fprintf(fd,
-							"            x0=%d, y0=%d, x1=%d, y1=%d, cw=%d, ch=%d\n",
-							prec->x0, prec->y0, prec->x1, prec->y1, prec->cw, prec->ch);
-						/*
-						for (cblkno = 0; cblkno < prec->cw * prec->ch; cblkno++) {
-							opj_tcd_cblk_t *cblk = &prec->cblks[cblkno];
-							fprintf(fd, "            cblk {\n");
-							fprintf(fd,
-								"              x0=%d, y0=%d, x1=%d, y1=%d\n",
-								cblk->x0, cblk->y0, cblk->x1, cblk->y1);
-							fprintf(fd, "            }\n");
-						}
-						*/
-						fprintf(fd, "          }\n");
-					}
-					fprintf(fd, "        }\n");
-				}
-				fprintf(fd, "      }\n");
-			}
-			fprintf(fd, "    }\n");
-		}
-		fprintf(fd, "  }\n");
-	}
-	fprintf(fd, "}\n");
-}
-/**
-* Allocates memory for a decoding code block.
-*/
-static opj_bool tcd_code_block_dec_allocate (opj_tcd_cblk_dec_v2_t * p_code_block);
-
-/**
-Free the memory allocated for encoding
-@param tcd TCD handle
-*/
-static void tcd_free_tile(opj_tcd_v2_t *tcd);
-
-
-opj_bool tcd_t2_decode (
-					opj_tcd_v2_t *p_tcd,
-					OPJ_BYTE * p_src_data,
-					OPJ_UINT32 * p_data_read,
-					OPJ_UINT32 p_max_src_size,
-					opj_codestream_index_t *p_cstr_index
-					);
-
-opj_bool tcd_t1_decode (
-					  opj_tcd_v2_t *p_tcd
-					 );
-
-opj_bool tcd_dwt_decode (
-					  opj_tcd_v2_t *p_tcd
-					 );
-
-opj_bool tcd_mct_decode (
-					  opj_tcd_v2_t *p_tcd
-					 );
-
-opj_bool tcd_dc_level_shift_decode (
-						 opj_tcd_v2_t *p_tcd
-						 );
-
-void tcd_code_block_dec_deallocate (opj_tcd_precinct_v2_t * p_precinct);
-/* ----------------------------------------------------------------------- */
-
-/**
-Create a new TCD handle
-*/
-opj_tcd_t* tcd_create(opj_common_ptr cinfo) {
-	/* create the tcd structure */
-	opj_tcd_t *tcd = (opj_tcd_t*)opj_malloc(sizeof(opj_tcd_t));
-	if(!tcd) return NULL;
-	tcd->cinfo = cinfo;
-	tcd->tcd_image = (opj_tcd_image_t*)opj_malloc(sizeof(opj_tcd_image_t));
-	if(!tcd->tcd_image) {
-		opj_free(tcd);
-		return NULL;
-	}
-
-	return tcd;
-}
-
-/**
-Create a new TCD handle
-*/
-opj_tcd_v2_t* tcd_create_v2(opj_bool p_is_decoder)
-{
-	opj_tcd_v2_t *l_tcd = 00;
-
-	/* create the tcd structure */
-	l_tcd = (opj_tcd_v2_t*)	opj_malloc(sizeof(opj_tcd_v2_t));
-	if (!l_tcd) {
-		return 00;
-	}
-	memset(l_tcd,0,sizeof(opj_tcd_v2_t));
-
-	l_tcd->m_is_decoder = p_is_decoder ? 1 : 0;
-
-	l_tcd->tcd_image = (opj_tcd_image_v2_t*)opj_malloc(sizeof(opj_tcd_image_v2_t));
-	if (!l_tcd->tcd_image) {
-		opj_free(l_tcd);
-		return 00;
-	}
-	memset(l_tcd->tcd_image,0,sizeof(opj_tcd_image_v2_t));
-
-	return l_tcd;
-}
-
-/**
-Destroy a previously created TCD handle
-*/
-void tcd_destroy(opj_tcd_t *tcd) {
-	if(tcd) {
-		opj_free(tcd->tcd_image);
-		opj_free(tcd);
-	}
-}
-
-/* ----------------------------------------------------------------------- */
-
-void tcd_malloc_encode(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp, int curtileno) {
-	int tileno, compno, resno, bandno, precno, cblkno;
-
-	tcd->image = image;
-	tcd->cp = cp;
-	tcd->tcd_image->tw = cp->tw;
-	tcd->tcd_image->th = cp->th;
-	tcd->tcd_image->tiles = (opj_tcd_tile_t *) opj_malloc(sizeof(opj_tcd_tile_t));
-	
-	for (tileno = 0; tileno < 1; tileno++) {
-		opj_tcp_t *tcp = &cp->tcps[curtileno];
-		int j;
-
-		/* cfr p59 ISO/IEC FDIS15444-1 : 2000 (18 august 2000) */
-		int p = curtileno % cp->tw;	/* si numerotation matricielle .. */
-		int q = curtileno / cp->tw;	/* .. coordonnees de la tile (q,p) q pour ligne et p pour colonne */
-
-		/* opj_tcd_tile_t *tile=&tcd->tcd_image->tiles[tileno]; */
-		opj_tcd_tile_t *tile = tcd->tcd_image->tiles;
-
-		/* 4 borders of the tile rescale on the image if necessary */
-		tile->x0 = int_max(cp->tx0 + p * cp->tdx, image->x0);
-		tile->y0 = int_max(cp->ty0 + q * cp->tdy, image->y0);
-		tile->x1 = int_min(cp->tx0 + (p + 1) * cp->tdx, image->x1);
-		tile->y1 = int_min(cp->ty0 + (q + 1) * cp->tdy, image->y1);
-		tile->numcomps = image->numcomps;
-		/* tile->PPT=image->PPT;  */
-
-		/* Modification of the RATE >> */
-		for (j = 0; j < tcp->numlayers; j++) {
-			tcp->rates[j] = tcp->rates[j] ? 
-				cp->tp_on ? 
-					(((float) (tile->numcomps 
-					* (tile->x1 - tile->x0) 
-					* (tile->y1 - tile->y0)
-					* image->comps[0].prec))
-					/(tcp->rates[j] * 8 * image->comps[0].dx * image->comps[0].dy)) - (((tcd->cur_totnum_tp - 1) * 14 )/ tcp->numlayers)
-					:
-				((float) (tile->numcomps 
-					* (tile->x1 - tile->x0) 
-					* (tile->y1 - tile->y0) 
-					* image->comps[0].prec))/ 
-					(tcp->rates[j] * 8 * image->comps[0].dx * image->comps[0].dy)
-					: 0;
-
-			if (tcp->rates[j]) {
-				if (j && tcp->rates[j] < tcp->rates[j - 1] + 10) {
-					tcp->rates[j] = tcp->rates[j - 1] + 20;
-				} else {
-					if (!j && tcp->rates[j] < 30)
-						tcp->rates[j] = 30;
-				}
-				
-				if(j == (tcp->numlayers-1)){
-					tcp->rates[j] = tcp->rates[j]- 2;
-				}
-			}
-		}
-		/* << Modification of the RATE */
-		
-		tile->comps = (opj_tcd_tilecomp_t *) opj_malloc(image->numcomps * sizeof(opj_tcd_tilecomp_t));
-		for (compno = 0; compno < tile->numcomps; compno++) {
-			opj_tccp_t *tccp = &tcp->tccps[compno];
-
-			opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
-
-			/* border of each tile component (global) */
-			tilec->x0 = int_ceildiv(tile->x0, image->comps[compno].dx);
-			tilec->y0 = int_ceildiv(tile->y0, image->comps[compno].dy);
-			tilec->x1 = int_ceildiv(tile->x1, image->comps[compno].dx);
-			tilec->y1 = int_ceildiv(tile->y1, image->comps[compno].dy);
-			
-			tilec->data = (int *) opj_aligned_malloc((tilec->x1 - tilec->x0) * (tilec->y1 - tilec->y0) * sizeof(int));
-			tilec->numresolutions = tccp->numresolutions;
-
-			tilec->resolutions = (opj_tcd_resolution_t *) opj_malloc(tilec->numresolutions * sizeof(opj_tcd_resolution_t));
-			
-			for (resno = 0; resno < tilec->numresolutions; resno++) {
-				int pdx, pdy;
-				int levelno = tilec->numresolutions - 1 - resno;
-				int tlprcxstart, tlprcystart, brprcxend, brprcyend;
-				int tlcbgxstart, tlcbgystart, brcbgxend, brcbgyend;
-				int cbgwidthexpn, cbgheightexpn;
-				int cblkwidthexpn, cblkheightexpn;
-
-				opj_tcd_resolution_t *res = &tilec->resolutions[resno];
-				
-				/* border for each resolution level (global) */
-				res->x0 = int_ceildivpow2(tilec->x0, levelno);
-				res->y0 = int_ceildivpow2(tilec->y0, levelno);
-				res->x1 = int_ceildivpow2(tilec->x1, levelno);
-				res->y1 = int_ceildivpow2(tilec->y1, levelno);
-				
-				res->numbands = resno == 0 ? 1 : 3;
-				/* p. 35, table A-23, ISO/IEC FDIS154444-1 : 2000 (18 august 2000) */
-				if (tccp->csty & J2K_CCP_CSTY_PRT) {
-					pdx = tccp->prcw[resno];
-					pdy = tccp->prch[resno];
-				} else {
-					pdx = 15;
-					pdy = 15;
-				}
-				/* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000)  */
-				tlprcxstart = int_floordivpow2(res->x0, pdx) << pdx;
-				tlprcystart = int_floordivpow2(res->y0, pdy) << pdy;
-				
-				brprcxend = int_ceildivpow2(res->x1, pdx) << pdx;
-				brprcyend = int_ceildivpow2(res->y1, pdy) << pdy;
-				
-				res->pw = (brprcxend - tlprcxstart) >> pdx;
-				res->ph = (brprcyend - tlprcystart) >> pdy;
-				
-				if (resno == 0) {
-					tlcbgxstart = tlprcxstart;
-					tlcbgystart = tlprcystart;
-					brcbgxend = brprcxend;
-					brcbgyend = brprcyend;
-					cbgwidthexpn = pdx;
-					cbgheightexpn = pdy;
-				} else {
-					tlcbgxstart = int_ceildivpow2(tlprcxstart, 1);
-					tlcbgystart = int_ceildivpow2(tlprcystart, 1);
-					brcbgxend = int_ceildivpow2(brprcxend, 1);
-					brcbgyend = int_ceildivpow2(brprcyend, 1);
-					cbgwidthexpn = pdx - 1;
-					cbgheightexpn = pdy - 1;
-				}
-				
-				cblkwidthexpn = int_min(tccp->cblkw, cbgwidthexpn);
-				cblkheightexpn = int_min(tccp->cblkh, cbgheightexpn);
-				
-				for (bandno = 0; bandno < res->numbands; bandno++) {
-					int x0b, y0b, i;
-					int gain, numbps;
-					opj_stepsize_t *ss = NULL;
-
-					opj_tcd_band_t *band = &res->bands[bandno];
-
-					band->bandno = resno == 0 ? 0 : bandno + 1;
-					x0b = (band->bandno == 1) || (band->bandno == 3) ? 1 : 0;
-					y0b = (band->bandno == 2) || (band->bandno == 3) ? 1 : 0;
-					
-					if (band->bandno == 0) {
-						/* band border (global) */
-						band->x0 = int_ceildivpow2(tilec->x0, levelno);
-						band->y0 = int_ceildivpow2(tilec->y0, levelno);
-						band->x1 = int_ceildivpow2(tilec->x1, levelno);
-						band->y1 = int_ceildivpow2(tilec->y1, levelno);
-					} else {
-						/* band border (global) */
-						band->x0 = int_ceildivpow2(tilec->x0 - (1 << levelno) * x0b, levelno + 1);
-						band->y0 = int_ceildivpow2(tilec->y0 - (1 << levelno) * y0b, levelno + 1);
-						band->x1 = int_ceildivpow2(tilec->x1 - (1 << levelno) * x0b, levelno + 1);
-						band->y1 = int_ceildivpow2(tilec->y1 - (1 << levelno) * y0b, levelno + 1);
-					}
-					
-					ss = &tccp->stepsizes[resno == 0 ? 0 : 3 * (resno - 1) + bandno + 1];
-					gain = tccp->qmfbid == 0 ? dwt_getgain_real(band->bandno) : dwt_getgain(band->bandno);					
-					numbps = image->comps[compno].prec + gain;
-					
-					band->stepsize = (float)((1.0 + ss->mant / 2048.0) * pow(2.0, numbps - ss->expn));
-					band->numbps = ss->expn + tccp->numgbits - 1;	/* WHY -1 ? */
-					
-					band->precincts = (opj_tcd_precinct_t *) opj_malloc(3 * res->pw * res->ph * sizeof(opj_tcd_precinct_t));
-					
-					for (i = 0; i < res->pw * res->ph * 3; i++) {
-						band->precincts[i].imsbtree = NULL;
-						band->precincts[i].incltree = NULL;
-					}
-					
-					for (precno = 0; precno < res->pw * res->ph; precno++) {
-						int tlcblkxstart, tlcblkystart, brcblkxend, brcblkyend;
-
-						int cbgxstart = tlcbgxstart + (precno % res->pw) * (1 << cbgwidthexpn);
-						int cbgystart = tlcbgystart + (precno / res->pw) * (1 << cbgheightexpn);
-						int cbgxend = cbgxstart + (1 << cbgwidthexpn);
-						int cbgyend = cbgystart + (1 << cbgheightexpn);
-
-						opj_tcd_precinct_t *prc = &band->precincts[precno];
-
-						/* precinct size (global) */
-						prc->x0 = int_max(cbgxstart, band->x0);
-						prc->y0 = int_max(cbgystart, band->y0);
-						prc->x1 = int_min(cbgxend, band->x1);
-						prc->y1 = int_min(cbgyend, band->y1);
-
-						tlcblkxstart = int_floordivpow2(prc->x0, cblkwidthexpn) << cblkwidthexpn;
-						tlcblkystart = int_floordivpow2(prc->y0, cblkheightexpn) << cblkheightexpn;
-						brcblkxend = int_ceildivpow2(prc->x1, cblkwidthexpn) << cblkwidthexpn;
-						brcblkyend = int_ceildivpow2(prc->y1, cblkheightexpn) << cblkheightexpn;
-						prc->cw = (brcblkxend - tlcblkxstart) >> cblkwidthexpn;
-						prc->ch = (brcblkyend - tlcblkystart) >> cblkheightexpn;
-
-						prc->cblks.enc = (opj_tcd_cblk_enc_t*) opj_calloc((prc->cw * prc->ch), sizeof(opj_tcd_cblk_enc_t));
-						prc->incltree = tgt_create(prc->cw, prc->ch);
-						prc->imsbtree = tgt_create(prc->cw, prc->ch);
-						
-						for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-							int cblkxstart = tlcblkxstart + (cblkno % prc->cw) * (1 << cblkwidthexpn);
-							int cblkystart = tlcblkystart + (cblkno / prc->cw) * (1 << cblkheightexpn);
-							int cblkxend = cblkxstart + (1 << cblkwidthexpn);
-							int cblkyend = cblkystart + (1 << cblkheightexpn);
-							
-							opj_tcd_cblk_enc_t* cblk = &prc->cblks.enc[cblkno];
-
-							/* code-block size (global) */
-							cblk->x0 = int_max(cblkxstart, prc->x0);
-							cblk->y0 = int_max(cblkystart, prc->y0);
-							cblk->x1 = int_min(cblkxend, prc->x1);
-							cblk->y1 = int_min(cblkyend, prc->y1);
-							cblk->data = (unsigned char*) opj_calloc(8192+2, sizeof(unsigned char));
-							/* FIXME: mqc_init_enc and mqc_byteout underrun the buffer if we don't do this. Why? */
-							cblk->data += 2;
-							cblk->layers = (opj_tcd_layer_t*) opj_calloc(100, sizeof(opj_tcd_layer_t));
-							cblk->passes = (opj_tcd_pass_t*) opj_calloc(100, sizeof(opj_tcd_pass_t));
-						}
-					}
-				}
-			}
-		}
-	}
-	
-	/* tcd_dump(stdout, tcd, &tcd->tcd_image); */
-}
-
-void tcd_free_encode(opj_tcd_t *tcd) {
-	int tileno, compno, resno, bandno, precno, cblkno;
-
-	for (tileno = 0; tileno < 1; tileno++) {
-		opj_tcd_tile_t *tile = tcd->tcd_image->tiles;
-
-		for (compno = 0; compno < tile->numcomps; compno++) {
-			opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
-
-			for (resno = 0; resno < tilec->numresolutions; resno++) {
-				opj_tcd_resolution_t *res = &tilec->resolutions[resno];
-
-				for (bandno = 0; bandno < res->numbands; bandno++) {
-					opj_tcd_band_t *band = &res->bands[bandno];
-
-					for (precno = 0; precno < res->pw * res->ph; precno++) {
-						opj_tcd_precinct_t *prc = &band->precincts[precno];
-
-						if (prc->incltree != NULL) {
-							tgt_destroy(prc->incltree);
-							prc->incltree = NULL;
-						}
-						if (prc->imsbtree != NULL) {
-							tgt_destroy(prc->imsbtree);	
-							prc->imsbtree = NULL;
-						}
-						for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-							opj_free(prc->cblks.enc[cblkno].data - 2);
-							opj_free(prc->cblks.enc[cblkno].layers);
-							opj_free(prc->cblks.enc[cblkno].passes);
-						}
-						opj_free(prc->cblks.enc);
-					} /* for (precno */
-					opj_free(band->precincts);
-					band->precincts = NULL;
-				} /* for (bandno */
-			} /* for (resno */
-			opj_free(tilec->resolutions);
-			tilec->resolutions = NULL;
-		} /* for (compno */
-		opj_free(tile->comps);
-		tile->comps = NULL;
-	} /* for (tileno */
-	opj_free(tcd->tcd_image->tiles);
-	tcd->tcd_image->tiles = NULL;
-}
-
-void tcd_init_encode(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp, int curtileno) {
-	int tileno, compno, resno, bandno, precno, cblkno;
-
-	for (tileno = 0; tileno < 1; tileno++) {
-		opj_tcp_t *tcp = &cp->tcps[curtileno];
-		int j;
-		/* cfr p59 ISO/IEC FDIS15444-1 : 2000 (18 august 2000) */
-		int p = curtileno % cp->tw;
-		int q = curtileno / cp->tw;
-
-		opj_tcd_tile_t *tile = tcd->tcd_image->tiles;
-		
-		/* 4 borders of the tile rescale on the image if necessary */
-		tile->x0 = int_max(cp->tx0 + p * cp->tdx, image->x0);
-		tile->y0 = int_max(cp->ty0 + q * cp->tdy, image->y0);
-		tile->x1 = int_min(cp->tx0 + (p + 1) * cp->tdx, image->x1);
-		tile->y1 = int_min(cp->ty0 + (q + 1) * cp->tdy, image->y1);
-		
-		tile->numcomps = image->numcomps;
-		/* tile->PPT=image->PPT; */
-
-		/* Modification of the RATE >> */
-		for (j = 0; j < tcp->numlayers; j++) {
-			tcp->rates[j] = tcp->rates[j] ? 
-				cp->tp_on ? 
-					(((float) (tile->numcomps 
-					* (tile->x1 - tile->x0) 
-					* (tile->y1 - tile->y0)
-					* image->comps[0].prec))
-					/(tcp->rates[j] * 8 * image->comps[0].dx * image->comps[0].dy)) - (((tcd->cur_totnum_tp - 1) * 14 )/ tcp->numlayers)
-					:
-				((float) (tile->numcomps 
-					* (tile->x1 - tile->x0) 
-					* (tile->y1 - tile->y0) 
-					* image->comps[0].prec))/ 
-					(tcp->rates[j] * 8 * image->comps[0].dx * image->comps[0].dy)
-					: 0;
-
-			if (tcp->rates[j]) {
-				if (j && tcp->rates[j] < tcp->rates[j - 1] + 10) {
-					tcp->rates[j] = tcp->rates[j - 1] + 20;
-				} else {
-					if (!j && tcp->rates[j] < 30)
-						tcp->rates[j] = 30;
-				}
-			}
-		}
-		/* << Modification of the RATE */
-
-		/* tile->comps=(opj_tcd_tilecomp_t*)opj_realloc(tile->comps,image->numcomps*sizeof(opj_tcd_tilecomp_t)); */
-		for (compno = 0; compno < tile->numcomps; compno++) {
-			opj_tccp_t *tccp = &tcp->tccps[compno];
-			
-			opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
-
-			/* border of each tile component (global) */
-			tilec->x0 = int_ceildiv(tile->x0, image->comps[compno].dx);
-			tilec->y0 = int_ceildiv(tile->y0, image->comps[compno].dy);
-			tilec->x1 = int_ceildiv(tile->x1, image->comps[compno].dx);
-			tilec->y1 = int_ceildiv(tile->y1, image->comps[compno].dy);
-			
-			tilec->data = (int *) opj_aligned_malloc((tilec->x1 - tilec->x0) * (tilec->y1 - tilec->y0) * sizeof(int));
-			tilec->numresolutions = tccp->numresolutions;
-			/* tilec->resolutions=(opj_tcd_resolution_t*)opj_realloc(tilec->resolutions,tilec->numresolutions*sizeof(opj_tcd_resolution_t)); */
-			for (resno = 0; resno < tilec->numresolutions; resno++) {
-				int pdx, pdy;
-
-				int levelno = tilec->numresolutions - 1 - resno;
-				int tlprcxstart, tlprcystart, brprcxend, brprcyend;
-				int tlcbgxstart, tlcbgystart, brcbgxend, brcbgyend;
-				int cbgwidthexpn, cbgheightexpn;
-				int cblkwidthexpn, cblkheightexpn;
-				
-				opj_tcd_resolution_t *res = &tilec->resolutions[resno];
-
-				/* border for each resolution level (global) */
-				res->x0 = int_ceildivpow2(tilec->x0, levelno);
-				res->y0 = int_ceildivpow2(tilec->y0, levelno);
-				res->x1 = int_ceildivpow2(tilec->x1, levelno);
-				res->y1 = int_ceildivpow2(tilec->y1, levelno);	
-				res->numbands = resno == 0 ? 1 : 3;
-
-				/* p. 35, table A-23, ISO/IEC FDIS154444-1 : 2000 (18 august 2000) */
-				if (tccp->csty & J2K_CCP_CSTY_PRT) {
-					pdx = tccp->prcw[resno];
-					pdy = tccp->prch[resno];
-				} else {
-					pdx = 15;
-					pdy = 15;
-				}
-				/* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000)  */
-				tlprcxstart = int_floordivpow2(res->x0, pdx) << pdx;
-				tlprcystart = int_floordivpow2(res->y0, pdy) << pdy;
-				brprcxend = int_ceildivpow2(res->x1, pdx) << pdx;
-				brprcyend = int_ceildivpow2(res->y1, pdy) << pdy;
-				
-				res->pw = (brprcxend - tlprcxstart) >> pdx;
-				res->ph = (brprcyend - tlprcystart) >> pdy;
-				
-				if (resno == 0) {
-					tlcbgxstart = tlprcxstart;
-					tlcbgystart = tlprcystart;
-					brcbgxend = brprcxend;
-					brcbgyend = brprcyend;
-					cbgwidthexpn = pdx;
-					cbgheightexpn = pdy;
-				} else {
-					tlcbgxstart = int_ceildivpow2(tlprcxstart, 1);
-					tlcbgystart = int_ceildivpow2(tlprcystart, 1);
-					brcbgxend = int_ceildivpow2(brprcxend, 1);
-					brcbgyend = int_ceildivpow2(brprcyend, 1);
-					cbgwidthexpn = pdx - 1;
-					cbgheightexpn = pdy - 1;
-				}
-				
-				cblkwidthexpn = int_min(tccp->cblkw, cbgwidthexpn);
-				cblkheightexpn = int_min(tccp->cblkh, cbgheightexpn);
-				
-				for (bandno = 0; bandno < res->numbands; bandno++) {
-					int x0b, y0b;
-					int gain, numbps;
-					opj_stepsize_t *ss = NULL;
-
-					opj_tcd_band_t *band = &res->bands[bandno];
-
-					band->bandno = resno == 0 ? 0 : bandno + 1;
-					x0b = (band->bandno == 1) || (band->bandno == 3) ? 1 : 0;
-					y0b = (band->bandno == 2) || (band->bandno == 3) ? 1 : 0;
-					
-					if (band->bandno == 0) {
-						/* band border */
-						band->x0 = int_ceildivpow2(tilec->x0, levelno);
-						band->y0 = int_ceildivpow2(tilec->y0, levelno);
-						band->x1 = int_ceildivpow2(tilec->x1, levelno);
-						band->y1 = int_ceildivpow2(tilec->y1, levelno);
-					} else {
-						band->x0 = int_ceildivpow2(tilec->x0 - (1 << levelno) * x0b, levelno + 1);
-						band->y0 = int_ceildivpow2(tilec->y0 - (1 << levelno) * y0b, levelno + 1);
-						band->x1 = int_ceildivpow2(tilec->x1 - (1 << levelno) * x0b, levelno + 1);
-						band->y1 = int_ceildivpow2(tilec->y1 - (1 << levelno) * y0b, levelno + 1);
-					}
-					
-					ss = &tccp->stepsizes[resno == 0 ? 0 : 3 * (resno - 1) + bandno + 1];
-					gain = tccp->qmfbid == 0 ? dwt_getgain_real(band->bandno) : dwt_getgain(band->bandno);
-					numbps = image->comps[compno].prec + gain;
-					band->stepsize = (float)((1.0 + ss->mant / 2048.0) * pow(2.0, numbps - ss->expn));
-					band->numbps = ss->expn + tccp->numgbits - 1;	/* WHY -1 ? */
-					
-					for (precno = 0; precno < res->pw * res->ph; precno++) {
-						int tlcblkxstart, tlcblkystart, brcblkxend, brcblkyend;
-
-						int cbgxstart = tlcbgxstart + (precno % res->pw) * (1 << cbgwidthexpn);
-						int cbgystart = tlcbgystart + (precno / res->pw) * (1 << cbgheightexpn);
-						int cbgxend = cbgxstart + (1 << cbgwidthexpn);
-						int cbgyend = cbgystart + (1 << cbgheightexpn);
-						
-						opj_tcd_precinct_t *prc = &band->precincts[precno];
-
-						/* precinct size (global) */
-						prc->x0 = int_max(cbgxstart, band->x0);
-						prc->y0 = int_max(cbgystart, band->y0);
-						prc->x1 = int_min(cbgxend, band->x1);
-						prc->y1 = int_min(cbgyend, band->y1);
-
-						tlcblkxstart = int_floordivpow2(prc->x0, cblkwidthexpn) << cblkwidthexpn;
-						tlcblkystart = int_floordivpow2(prc->y0, cblkheightexpn) << cblkheightexpn;
-						brcblkxend = int_ceildivpow2(prc->x1, cblkwidthexpn) << cblkwidthexpn;
-						brcblkyend = int_ceildivpow2(prc->y1, cblkheightexpn) << cblkheightexpn;
-						prc->cw = (brcblkxend - tlcblkxstart) >> cblkwidthexpn;
-						prc->ch = (brcblkyend - tlcblkystart) >> cblkheightexpn;
-
-						opj_free(prc->cblks.enc);
-						prc->cblks.enc = (opj_tcd_cblk_enc_t*) opj_calloc(prc->cw * prc->ch, sizeof(opj_tcd_cblk_enc_t));
-
-						if (prc->incltree != NULL) {
-							tgt_destroy(prc->incltree);
-						}
-						if (prc->imsbtree != NULL) {
-							tgt_destroy(prc->imsbtree);
-						}
-						
-						prc->incltree = tgt_create(prc->cw, prc->ch);
-						prc->imsbtree = tgt_create(prc->cw, prc->ch);
-
-						for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-							int cblkxstart = tlcblkxstart + (cblkno % prc->cw) * (1 << cblkwidthexpn);
-							int cblkystart = tlcblkystart + (cblkno / prc->cw) * (1 << cblkheightexpn);
-							int cblkxend = cblkxstart + (1 << cblkwidthexpn);
-							int cblkyend = cblkystart + (1 << cblkheightexpn);
-
-							opj_tcd_cblk_enc_t* cblk = &prc->cblks.enc[cblkno];
-
-							/* code-block size (global) */
-							cblk->x0 = int_max(cblkxstart, prc->x0);
-							cblk->y0 = int_max(cblkystart, prc->y0);
-							cblk->x1 = int_min(cblkxend, prc->x1);
-							cblk->y1 = int_min(cblkyend, prc->y1);
-							cblk->data = (unsigned char*) opj_calloc(8192+2, sizeof(unsigned char));
-							/* FIXME: mqc_init_enc and mqc_byteout underrun the buffer if we don't do this. Why? */
-							cblk->data += 2;
-							cblk->layers = (opj_tcd_layer_t*) opj_calloc(100, sizeof(opj_tcd_layer_t));
-							cblk->passes = (opj_tcd_pass_t*) opj_calloc(100, sizeof(opj_tcd_pass_t));
-						}
-					} /* precno */
-				} /* bandno */
-			} /* resno */
-		} /* compno */
-	} /* tileno */
-
-	/* tcd_dump(stdout, tcd, &tcd->tcd_image); */
-}
-
-void tcd_malloc_decode(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp) {
-	int i, j, tileno, p, q;
-	unsigned int x0 = 0, y0 = 0, x1 = 0, y1 = 0, w, h;
-
-	tcd->image = image;
-	tcd->tcd_image->tw = cp->tw;
-	tcd->tcd_image->th = cp->th;
-	tcd->tcd_image->tiles = (opj_tcd_tile_t *) opj_malloc(cp->tw * cp->th * sizeof(opj_tcd_tile_t));
-
-	/* 
-	Allocate place to store the decoded data = final image
-	Place limited by the tile really present in the codestream 
-	*/
-
-	for (j = 0; j < cp->tileno_size; j++) {
-		opj_tcd_tile_t *tile;
-		
-		tileno = cp->tileno[j];		
-		tile = &(tcd->tcd_image->tiles[cp->tileno[tileno]]);		
-		tile->numcomps = image->numcomps;
-		tile->comps = (opj_tcd_tilecomp_t*) opj_calloc(image->numcomps, sizeof(opj_tcd_tilecomp_t));
-	}
-
-	for (i = 0; i < image->numcomps; i++) {
-		for (j = 0; j < cp->tileno_size; j++) {
-			opj_tcd_tile_t *tile;
-			opj_tcd_tilecomp_t *tilec;
-			
-			/* cfr p59 ISO/IEC FDIS15444-1 : 2000 (18 august 2000) */
-			
-			tileno = cp->tileno[j];
-			
-			tile = &(tcd->tcd_image->tiles[cp->tileno[tileno]]);
-			tilec = &tile->comps[i];
-			
-			p = tileno % cp->tw;	/* si numerotation matricielle .. */
-			q = tileno / cp->tw;	/* .. coordonnees de la tile (q,p) q pour ligne et p pour colonne */
-			
-			/* 4 borders of the tile rescale on the image if necessary */
-			tile->x0 = int_max(cp->tx0 + p * cp->tdx, image->x0);
-			tile->y0 = int_max(cp->ty0 + q * cp->tdy, image->y0);
-			tile->x1 = int_min(cp->tx0 + (p + 1) * cp->tdx, image->x1);
-			tile->y1 = int_min(cp->ty0 + (q + 1) * cp->tdy, image->y1);
-
-			tilec->x0 = int_ceildiv(tile->x0, image->comps[i].dx);
-			tilec->y0 = int_ceildiv(tile->y0, image->comps[i].dy);
-			tilec->x1 = int_ceildiv(tile->x1, image->comps[i].dx);
-			tilec->y1 = int_ceildiv(tile->y1, image->comps[i].dy);
-
-			x0 = j == 0 ? tilec->x0 : int_min(x0, (unsigned int) tilec->x0);
-			y0 = j == 0 ? tilec->y0 : int_min(y0,	(unsigned int) tilec->x0);
-			x1 = j == 0 ? tilec->x1 : int_max(x1,	(unsigned int) tilec->x1);
-			y1 = j == 0 ? tilec->y1 : int_max(y1,	(unsigned int) tilec->y1);
-		}
-
-		w = int_ceildivpow2(x1 - x0, image->comps[i].factor);
-		h = int_ceildivpow2(y1 - y0, image->comps[i].factor);
-
-		image->comps[i].w = w;
-		image->comps[i].h = h;
-		image->comps[i].x0 = x0;
-		image->comps[i].y0 = y0;
-	}
-}
-
-void tcd_malloc_decode_tile(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp, int tileno, opj_codestream_info_t *cstr_info) {
-	int compno, resno, bandno, precno, cblkno;
-	opj_tcp_t *tcp;
-	opj_tcd_tile_t *tile;
-
-	OPJ_ARG_NOT_USED(cstr_info);
-
-	tcd->cp = cp;
-	
-	tcp = &(cp->tcps[cp->tileno[tileno]]);
-	tile = &(tcd->tcd_image->tiles[cp->tileno[tileno]]);
-	
-	tileno = cp->tileno[tileno];
-	
-	for (compno = 0; compno < tile->numcomps; compno++) {
-		opj_tccp_t *tccp = &tcp->tccps[compno];
-		opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
-		
-		/* border of each tile component (global) */
-		tilec->x0 = int_ceildiv(tile->x0, image->comps[compno].dx);
-		tilec->y0 = int_ceildiv(tile->y0, image->comps[compno].dy);
-		tilec->x1 = int_ceildiv(tile->x1, image->comps[compno].dx);
-		tilec->y1 = int_ceildiv(tile->y1, image->comps[compno].dy);
-
-		tilec->numresolutions = tccp->numresolutions;
-		tilec->resolutions = (opj_tcd_resolution_t *) opj_malloc(tilec->numresolutions * sizeof(opj_tcd_resolution_t));
-		
-		for (resno = 0; resno < tilec->numresolutions; resno++) {
-			int pdx, pdy;
-			int levelno = tilec->numresolutions - 1 - resno;
-			int tlprcxstart, tlprcystart, brprcxend, brprcyend;
-			int tlcbgxstart, tlcbgystart, brcbgxend, brcbgyend;
-			int cbgwidthexpn, cbgheightexpn;
-			int cblkwidthexpn, cblkheightexpn;
-			
-			opj_tcd_resolution_t *res = &tilec->resolutions[resno];
-			
-			/* border for each resolution level (global) */
-			res->x0 = int_ceildivpow2(tilec->x0, levelno);
-			res->y0 = int_ceildivpow2(tilec->y0, levelno);
-			res->x1 = int_ceildivpow2(tilec->x1, levelno);
-			res->y1 = int_ceildivpow2(tilec->y1, levelno);
-			res->numbands = resno == 0 ? 1 : 3;
-			
-			/* p. 35, table A-23, ISO/IEC FDIS154444-1 : 2000 (18 august 2000) */
-			if (tccp->csty & J2K_CCP_CSTY_PRT) {
-				pdx = tccp->prcw[resno];
-				pdy = tccp->prch[resno];
-			} else {
-				pdx = 15;
-				pdy = 15;
-			}			
-			
-			/* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000)  */
-			tlprcxstart = int_floordivpow2(res->x0, pdx) << pdx;
-			tlprcystart = int_floordivpow2(res->y0, pdy) << pdy;
-			brprcxend = int_ceildivpow2(res->x1, pdx) << pdx;
-			brprcyend = int_ceildivpow2(res->y1, pdy) << pdy;
-			
-			res->pw = (res->x0 == res->x1) ? 0 : ((brprcxend - tlprcxstart) >> pdx);
-			res->ph = (res->y0 == res->y1) ? 0 : ((brprcyend - tlprcystart) >> pdy);
-			
-			if (resno == 0) {
-				tlcbgxstart = tlprcxstart;
-				tlcbgystart = tlprcystart;
-				brcbgxend = brprcxend;
-				brcbgyend = brprcyend;
-				cbgwidthexpn = pdx;
-				cbgheightexpn = pdy;
-			} else {
-				tlcbgxstart = int_ceildivpow2(tlprcxstart, 1);
-				tlcbgystart = int_ceildivpow2(tlprcystart, 1);
-				brcbgxend = int_ceildivpow2(brprcxend, 1);
-				brcbgyend = int_ceildivpow2(brprcyend, 1);
-				cbgwidthexpn = pdx - 1;
-				cbgheightexpn = pdy - 1;
-			}
-			
-			cblkwidthexpn = int_min(tccp->cblkw, cbgwidthexpn);
-			cblkheightexpn = int_min(tccp->cblkh, cbgheightexpn);
-			
-			for (bandno = 0; bandno < res->numbands; bandno++) {
-				int x0b, y0b;
-				int gain, numbps;
-				opj_stepsize_t *ss = NULL;
-				
-				opj_tcd_band_t *band = &res->bands[bandno];
-				band->bandno = resno == 0 ? 0 : bandno + 1;
-				x0b = (band->bandno == 1) || (band->bandno == 3) ? 1 : 0;
-				y0b = (band->bandno == 2) || (band->bandno == 3) ? 1 : 0;
-				
-				if (band->bandno == 0) {
-					/* band border (global) */
-					band->x0 = int_ceildivpow2(tilec->x0, levelno);
-					band->y0 = int_ceildivpow2(tilec->y0, levelno);
-					band->x1 = int_ceildivpow2(tilec->x1, levelno);
-					band->y1 = int_ceildivpow2(tilec->y1, levelno);
-				} else {
-					/* band border (global) */
-					band->x0 = int_ceildivpow2(tilec->x0 - (1 << levelno) * x0b, levelno + 1);
-					band->y0 = int_ceildivpow2(tilec->y0 - (1 << levelno) * y0b, levelno + 1);
-					band->x1 = int_ceildivpow2(tilec->x1 - (1 << levelno) * x0b, levelno + 1);
-					band->y1 = int_ceildivpow2(tilec->y1 - (1 << levelno) * y0b, levelno + 1);
-				}
-				
-				ss = &tccp->stepsizes[resno == 0 ? 0 : 3 * (resno - 1) + bandno + 1];
-				gain = tccp->qmfbid == 0 ? dwt_getgain_real(band->bandno) : dwt_getgain(band->bandno);
-				numbps = image->comps[compno].prec + gain;
-				band->stepsize = (float)(((1.0 + ss->mant / 2048.0) * pow(2.0, numbps - ss->expn)) * 0.5);
-				band->numbps = ss->expn + tccp->numgbits - 1;	/* WHY -1 ? */
-				
-				band->precincts = (opj_tcd_precinct_t *) opj_malloc(res->pw * res->ph * sizeof(opj_tcd_precinct_t));
-				
-				for (precno = 0; precno < res->pw * res->ph; precno++) {
-					int tlcblkxstart, tlcblkystart, brcblkxend, brcblkyend;
-					int cbgxstart = tlcbgxstart + (precno % res->pw) * (1 << cbgwidthexpn);
-					int cbgystart = tlcbgystart + (precno / res->pw) * (1 << cbgheightexpn);
-					int cbgxend = cbgxstart + (1 << cbgwidthexpn);
-					int cbgyend = cbgystart + (1 << cbgheightexpn);
-					
-					opj_tcd_precinct_t *prc = &band->precincts[precno];
-					/* precinct size (global) */
-					prc->x0 = int_max(cbgxstart, band->x0);
-					prc->y0 = int_max(cbgystart, band->y0);
-					prc->x1 = int_min(cbgxend, band->x1);
-					prc->y1 = int_min(cbgyend, band->y1);
-					
-					tlcblkxstart = int_floordivpow2(prc->x0, cblkwidthexpn) << cblkwidthexpn;
-					tlcblkystart = int_floordivpow2(prc->y0, cblkheightexpn) << cblkheightexpn;
-					brcblkxend = int_ceildivpow2(prc->x1, cblkwidthexpn) << cblkwidthexpn;
-					brcblkyend = int_ceildivpow2(prc->y1, cblkheightexpn) << cblkheightexpn;
-					prc->cw = (brcblkxend - tlcblkxstart) >> cblkwidthexpn;
-					prc->ch = (brcblkyend - tlcblkystart) >> cblkheightexpn;
-
-					prc->cblks.dec = (opj_tcd_cblk_dec_t*) opj_malloc(prc->cw * prc->ch * sizeof(opj_tcd_cblk_dec_t));
-
-					prc->incltree = tgt_create(prc->cw, prc->ch);
-					prc->imsbtree = tgt_create(prc->cw, prc->ch);
-					
-					for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-						int cblkxstart = tlcblkxstart + (cblkno % prc->cw) * (1 << cblkwidthexpn);
-						int cblkystart = tlcblkystart + (cblkno / prc->cw) * (1 << cblkheightexpn);
-						int cblkxend = cblkxstart + (1 << cblkwidthexpn);
-						int cblkyend = cblkystart + (1 << cblkheightexpn);					
-
-						opj_tcd_cblk_dec_t* cblk = &prc->cblks.dec[cblkno];
-						cblk->data = NULL;
-						cblk->segs = NULL;
-						/* code-block size (global) */
-						cblk->x0 = int_max(cblkxstart, prc->x0);
-						cblk->y0 = int_max(cblkystart, prc->y0);
-						cblk->x1 = int_min(cblkxend, prc->x1);
-						cblk->y1 = int_min(cblkyend, prc->y1);
-						cblk->numsegs = 0;
-					}
-				} /* precno */
-			} /* bandno */
-		} /* resno */
-	} /* compno */
-	/* tcd_dump(stdout, tcd, &tcd->tcd_image); */
-}
-
-void tcd_makelayer_fixed(opj_tcd_t *tcd, int layno, int final) {
-	int compno, resno, bandno, precno, cblkno;
-	int value;			/*, matrice[tcd_tcp->numlayers][tcd_tile->comps[0].numresolutions][3]; */
-	int matrice[10][10][3];
-	int i, j, k;
-
-	opj_cp_t *cp = tcd->cp;
-	opj_tcd_tile_t *tcd_tile = tcd->tcd_tile;
-	opj_tcp_t *tcd_tcp = tcd->tcp;
-
-	/*matrice=(int*)opj_malloc(tcd_tcp->numlayers*tcd_tile->comps[0].numresolutions*3*sizeof(int)); */
-	
-	for (compno = 0; compno < tcd_tile->numcomps; compno++) {
-		opj_tcd_tilecomp_t *tilec = &tcd_tile->comps[compno];
-		for (i = 0; i < tcd_tcp->numlayers; i++) {
-			for (j = 0; j < tilec->numresolutions; j++) {
-				for (k = 0; k < 3; k++) {
-					matrice[i][j][k] =
-						(int) (cp->matrice[i * tilec->numresolutions * 3 + j * 3 + k] 
-						* (float) (tcd->image->comps[compno].prec / 16.0));
-				}
-			}
-		}
-        
-		for (resno = 0; resno < tilec->numresolutions; resno++) {
-			opj_tcd_resolution_t *res = &tilec->resolutions[resno];
-			for (bandno = 0; bandno < res->numbands; bandno++) {
-				opj_tcd_band_t *band = &res->bands[bandno];
-				for (precno = 0; precno < res->pw * res->ph; precno++) {
-					opj_tcd_precinct_t *prc = &band->precincts[precno];
-					for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-						opj_tcd_cblk_enc_t *cblk = &prc->cblks.enc[cblkno];
-						opj_tcd_layer_t *layer = &cblk->layers[layno];
-						int n;
-						int imsb = tcd->image->comps[compno].prec - cblk->numbps;	/* number of bit-plan equal to zero */
-						/* Correction of the matrix of coefficient to include the IMSB information */
-						if (layno == 0) {
-							value = matrice[layno][resno][bandno];
-							if (imsb >= value) {
-								value = 0;
-							} else {
-								value -= imsb;
-							}
-						} else {
-							value =	matrice[layno][resno][bandno] -	matrice[layno - 1][resno][bandno];
-							if (imsb >= matrice[layno - 1][resno][bandno]) {
-								value -= (imsb - matrice[layno - 1][resno][bandno]);
-								if (value < 0) {
-									value = 0;
-								}
-							}
-						}
-						
-						if (layno == 0) {
-							cblk->numpassesinlayers = 0;
-						}
-						
-						n = cblk->numpassesinlayers;
-						if (cblk->numpassesinlayers == 0) {
-							if (value != 0) {
-								n = 3 * value - 2 + cblk->numpassesinlayers;
-							} else {
-								n = cblk->numpassesinlayers;
-							}
-						} else {
-							n = 3 * value + cblk->numpassesinlayers;
-						}
-						
-						layer->numpasses = n - cblk->numpassesinlayers;
-						
-						if (!layer->numpasses)
-							continue;
-						
-						if (cblk->numpassesinlayers == 0) {
-							layer->len = cblk->passes[n - 1].rate;
-							layer->data = cblk->data;
-						} else {
-							layer->len = cblk->passes[n - 1].rate - cblk->passes[cblk->numpassesinlayers - 1].rate;
-							layer->data = cblk->data + cblk->passes[cblk->numpassesinlayers - 1].rate;
-						}
-						if (final)
-							cblk->numpassesinlayers = n;
-					}
-				}
-			}
-		}
-	}
-}
-
-void tcd_rateallocate_fixed(opj_tcd_t *tcd) {
-	int layno;
-	for (layno = 0; layno < tcd->tcp->numlayers; layno++) {
-		tcd_makelayer_fixed(tcd, layno, 1);
-	}
-}
-
-void tcd_makelayer(opj_tcd_t *tcd, int layno, double thresh, int final) {
-	int compno, resno, bandno, precno, cblkno, passno;
-	
-	opj_tcd_tile_t *tcd_tile = tcd->tcd_tile;
-
-	tcd_tile->distolayer[layno] = 0;	/* fixed_quality */
-	
-	for (compno = 0; compno < tcd_tile->numcomps; compno++) {
-		opj_tcd_tilecomp_t *tilec = &tcd_tile->comps[compno];
-		for (resno = 0; resno < tilec->numresolutions; resno++) {
-			opj_tcd_resolution_t *res = &tilec->resolutions[resno];
-			for (bandno = 0; bandno < res->numbands; bandno++) {
-				opj_tcd_band_t *band = &res->bands[bandno];
-				for (precno = 0; precno < res->pw * res->ph; precno++) {
-					opj_tcd_precinct_t *prc = &band->precincts[precno];
-					for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-						opj_tcd_cblk_enc_t *cblk = &prc->cblks.enc[cblkno];
-						opj_tcd_layer_t *layer = &cblk->layers[layno];
-						
-						int n;
-						if (layno == 0) {
-							cblk->numpassesinlayers = 0;
-						}
-						n = cblk->numpassesinlayers;
-						for (passno = cblk->numpassesinlayers; passno < cblk->totalpasses; passno++) {
-							int dr;
-							double dd;
-							opj_tcd_pass_t *pass = &cblk->passes[passno];
-							if (n == 0) {
-								dr = pass->rate;
-								dd = pass->distortiondec;
-							} else {
-								dr = pass->rate - cblk->passes[n - 1].rate;
-								dd = pass->distortiondec - cblk->passes[n - 1].distortiondec;
-							}
-							if (!dr) {
-								if (dd != 0)
-									n = passno + 1;
-								continue;
-							}
-							if (dd / dr >= thresh)
-								n = passno + 1;
-						}
-						layer->numpasses = n - cblk->numpassesinlayers;
-						
-						if (!layer->numpasses) {
-							layer->disto = 0;
-							continue;
-						}
-						if (cblk->numpassesinlayers == 0) {
-							layer->len = cblk->passes[n - 1].rate;
-							layer->data = cblk->data;
-							layer->disto = cblk->passes[n - 1].distortiondec;
-						} else {
-							layer->len = cblk->passes[n - 1].rate -	cblk->passes[cblk->numpassesinlayers - 1].rate;
-							layer->data = cblk->data + cblk->passes[cblk->numpassesinlayers - 1].rate;
-							layer->disto = cblk->passes[n - 1].distortiondec - cblk->passes[cblk->numpassesinlayers - 1].distortiondec;
-						}
-						
-						tcd_tile->distolayer[layno] += layer->disto;	/* fixed_quality */
-						
-						if (final)
-							cblk->numpassesinlayers = n;
-					}
-				}
-			}
-		}
-	}
-}
-
-opj_bool tcd_rateallocate(opj_tcd_t *tcd, unsigned char *dest, int len, opj_codestream_info_t *cstr_info) {
-	int compno, resno, bandno, precno, cblkno, passno, layno;
-	double min, max;
-	double cumdisto[100];	/* fixed_quality */
-	const double K = 1;		/* 1.1; fixed_quality */
-	double maxSE = 0;
-
-	opj_cp_t *cp = tcd->cp;
-	opj_tcd_tile_t *tcd_tile = tcd->tcd_tile;
-	opj_tcp_t *tcd_tcp = tcd->tcp;
-
-	min = DBL_MAX;
-	max = 0;
-	
-	tcd_tile->numpix = 0;		/* fixed_quality */
-	
-	for (compno = 0; compno < tcd_tile->numcomps; compno++) {
-		opj_tcd_tilecomp_t *tilec = &tcd_tile->comps[compno];
-		tilec->numpix = 0;
-
-		for (resno = 0; resno < tilec->numresolutions; resno++) {
-			opj_tcd_resolution_t *res = &tilec->resolutions[resno];
-
-			for (bandno = 0; bandno < res->numbands; bandno++) {
-				opj_tcd_band_t *band = &res->bands[bandno];
-
-				for (precno = 0; precno < res->pw * res->ph; precno++) {
-					opj_tcd_precinct_t *prc = &band->precincts[precno];
-
-					for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-						opj_tcd_cblk_enc_t *cblk = &prc->cblks.enc[cblkno];
-
-						for (passno = 0; passno < cblk->totalpasses; passno++) {
-							opj_tcd_pass_t *pass = &cblk->passes[passno];
-							int dr;
-							double dd, rdslope;
-							if (passno == 0) {
-								dr = pass->rate;
-								dd = pass->distortiondec;
-							} else {
-								dr = pass->rate - cblk->passes[passno - 1].rate;
-								dd = pass->distortiondec - cblk->passes[passno - 1].distortiondec;
-							}
-							if (dr == 0) {
-								continue;
-							}
-							rdslope = dd / dr;
-							if (rdslope < min) {
-								min = rdslope;
-							}
-							if (rdslope > max) {
-								max = rdslope;
-							}
-						} /* passno */
-						
-						/* fixed_quality */
-						tcd_tile->numpix += ((cblk->x1 - cblk->x0) * (cblk->y1 - cblk->y0));
-						tilec->numpix += ((cblk->x1 - cblk->x0) * (cblk->y1 - cblk->y0));
-					} /* cbklno */
-				} /* precno */
-			} /* bandno */
-		} /* resno */
-		
-		maxSE += (((double)(1 << tcd->image->comps[compno].prec) - 1.0) 
-			* ((double)(1 << tcd->image->comps[compno].prec) -1.0)) 
-			* ((double)(tilec->numpix));
-	} /* compno */
-	
-	/* index file */
-	if(cstr_info) {
-		opj_tile_info_t *tile_info = &cstr_info->tile[tcd->tcd_tileno];
-		tile_info->numpix = tcd_tile->numpix;
-		tile_info->distotile = tcd_tile->distotile;
-		tile_info->thresh = (double *) opj_malloc(tcd_tcp->numlayers * sizeof(double));
-	}
-	
-	for (layno = 0; layno < tcd_tcp->numlayers; layno++) {
-		double lo = min;
-		double hi = max;
-		int success = 0;
-		int maxlen = tcd_tcp->rates[layno] ? int_min(((int) ceil(tcd_tcp->rates[layno])), len) : len;
-		double goodthresh = 0;
-		double stable_thresh = 0;
-		int i;
-		double distotarget;		/* fixed_quality */
-		
-		/* fixed_quality */
-		distotarget = tcd_tile->distotile - ((K * maxSE) / pow((float)10, tcd_tcp->distoratio[layno] / 10));
-        
-		/* Don't try to find an optimal threshold but rather take everything not included yet, if
-		  -r xx,yy,zz,0   (disto_alloc == 1 and rates == 0)
-		  -q xx,yy,zz,0	  (fixed_quality == 1 and distoratio == 0)
-		  ==> possible to have some lossy layers and the last layer for sure lossless */
-		if ( ((cp->disto_alloc==1) && (tcd_tcp->rates[layno]>0)) || ((cp->fixed_quality==1) && (tcd_tcp->distoratio[layno]>0))) {
-			opj_t2_t *t2 = t2_create(tcd->cinfo, tcd->image, cp);
-			double thresh = 0;
-
-			for (i = 0; i < 128; i++) {
-				int l = 0;
-				double distoachieved = 0;	/* fixed_quality */
-				thresh = (lo + hi) / 2;
-				
-				tcd_makelayer(tcd, layno, thresh, 0);
-				
-				if (cp->fixed_quality) {	/* fixed_quality */
-					if(cp->cinema){
-						l = t2_encode_packets(t2,tcd->tcd_tileno, tcd_tile, layno + 1, dest, maxlen, cstr_info,tcd->cur_tp_num,tcd->tp_pos,tcd->cur_pino,THRESH_CALC, tcd->cur_totnum_tp);
-						if (l == -999) {
-							lo = thresh;
-							continue;
-						}else{
-           		distoachieved =	layno == 0 ? 
-							tcd_tile->distolayer[0]	: cumdisto[layno - 1] + tcd_tile->distolayer[layno];
-							if (distoachieved < distotarget) {
-								hi=thresh; 
-								stable_thresh = thresh;
-								continue;
-							}else{
-								lo=thresh;
-							}
-						}
-					}else{
-						distoachieved =	(layno == 0) ? 
-							tcd_tile->distolayer[0]	: (cumdisto[layno - 1] + tcd_tile->distolayer[layno]);
-						if (distoachieved < distotarget) {
-							hi = thresh;
-							stable_thresh = thresh;
-							continue;
-						}
-						lo = thresh;
-					}
-				} else {
-					l = t2_encode_packets(t2, tcd->tcd_tileno, tcd_tile, layno + 1, dest, maxlen, cstr_info,tcd->cur_tp_num,tcd->tp_pos,tcd->cur_pino,THRESH_CALC, tcd->cur_totnum_tp);
-					/* TODO: what to do with l ??? seek / tell ??? */
-					/* opj_event_msg(tcd->cinfo, EVT_INFO, "rate alloc: len=%d, max=%d\n", l, maxlen); */
-					if (l == -999) {
-						lo = thresh;
-						continue;
-					}
-					hi = thresh;
-					stable_thresh = thresh;
-				}
-			}
-			success = 1;
-			goodthresh = stable_thresh == 0? thresh : stable_thresh;
-			t2_destroy(t2);
-		} else {
-			success = 1;
-			goodthresh = min;
-		}
-		
-		if (!success) {
-			return OPJ_FALSE;
-		}
-		
-		if(cstr_info) {	/* Threshold for Marcela Index */
-			cstr_info->tile[tcd->tcd_tileno].thresh[layno] = goodthresh;
-		}
-		tcd_makelayer(tcd, layno, goodthresh, 1);
-        
-		/* fixed_quality */
-		cumdisto[layno] = (layno == 0) ? tcd_tile->distolayer[0] : (cumdisto[layno - 1] + tcd_tile->distolayer[layno]);	
-	}
-
-	return OPJ_TRUE;
-}
-
-int tcd_encode_tile(opj_tcd_t *tcd, int tileno, unsigned char *dest, int len, opj_codestream_info_t *cstr_info) {
-	int compno;
-	int l, i, numpacks = 0;
-	opj_tcd_tile_t *tile = NULL;
-	opj_tcp_t *tcd_tcp = NULL;
-	opj_cp_t *cp = NULL;
-
-	opj_tcp_t *tcp = &tcd->cp->tcps[0];
-	opj_tccp_t *tccp = &tcp->tccps[0];
-	opj_image_t *image = tcd->image;
-	
-	opj_t1_t *t1 = NULL;		/* T1 component */
-	opj_t2_t *t2 = NULL;		/* T2 component */
-
-	tcd->tcd_tileno = tileno;
-	tcd->tcd_tile = tcd->tcd_image->tiles;
-	tcd->tcp = &tcd->cp->tcps[tileno];
-
-	tile = tcd->tcd_tile;
-	tcd_tcp = tcd->tcp;
-	cp = tcd->cp;
-
-	if(tcd->cur_tp_num == 0){
-		tcd->encoding_time = opj_clock();	/* time needed to encode a tile */
-		/* INDEX >> "Precinct_nb_X et Precinct_nb_Y" */
-		if(cstr_info) {
-			opj_tcd_tilecomp_t *tilec_idx = &tile->comps[0];	/* based on component 0 */
-			for (i = 0; i < tilec_idx->numresolutions; i++) {
-				opj_tcd_resolution_t *res_idx = &tilec_idx->resolutions[i];
-				
-				cstr_info->tile[tileno].pw[i] = res_idx->pw;
-				cstr_info->tile[tileno].ph[i] = res_idx->ph;
-				
-				numpacks += res_idx->pw * res_idx->ph;
-				
-				cstr_info->tile[tileno].pdx[i] = tccp->prcw[i];
-				cstr_info->tile[tileno].pdy[i] = tccp->prch[i];
-			}
-			cstr_info->tile[tileno].packet = (opj_packet_info_t*) opj_calloc(cstr_info->numcomps * cstr_info->numlayers * numpacks, sizeof(opj_packet_info_t));
-		}
-		/* << INDEX */
-		
-		/*---------------TILE-------------------*/
-		
-		for (compno = 0; compno < tile->numcomps; compno++) {
-			int x, y;
-			
-			int adjust = image->comps[compno].sgnd ? 0 : 1 << (image->comps[compno].prec - 1);
-			int offset_x = int_ceildiv(image->x0, image->comps[compno].dx);
-			int offset_y = int_ceildiv(image->y0, image->comps[compno].dy);
-			
-			opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
-			int tw = tilec->x1 - tilec->x0;
-			int w = int_ceildiv(image->x1 - image->x0, image->comps[compno].dx);
-			
-			/* extract tile data */
-			
-			if (tcd_tcp->tccps[compno].qmfbid == 1) {
-				for (y = tilec->y0; y < tilec->y1; y++) {
-					/* start of the src tile scanline */
-					int *data = &image->comps[compno].data[(tilec->x0 - offset_x) + (y - offset_y) * w];
-					/* start of the dst tile scanline */
-					int *tile_data = &tilec->data[(y - tilec->y0) * tw];
-					for (x = tilec->x0; x < tilec->x1; x++) {
-						*tile_data++ = *data++ - adjust;
-					}
-				}
-			} else if (tcd_tcp->tccps[compno].qmfbid == 0) {
-				for (y = tilec->y0; y < tilec->y1; y++) {
-					/* start of the src tile scanline */
-					int *data = &image->comps[compno].data[(tilec->x0 - offset_x) + (y - offset_y) * w];
-					/* start of the dst tile scanline */
-					int *tile_data = &tilec->data[(y - tilec->y0) * tw];
-					for (x = tilec->x0; x < tilec->x1; x++) {
-						*tile_data++ = (*data++ - adjust) << 11;
-					}
-					
-				}
-			}
-		}
-		
-		/*----------------MCT-------------------*/
-		if (tcd_tcp->mct) {
-			int samples = (tile->comps[0].x1 - tile->comps[0].x0) * (tile->comps[0].y1 - tile->comps[0].y0);
-			if (tcd_tcp->tccps[0].qmfbid == 0) {
-				mct_encode_real(tile->comps[0].data, tile->comps[1].data, tile->comps[2].data, samples);
-			} else {
-				mct_encode(tile->comps[0].data, tile->comps[1].data, tile->comps[2].data, samples);
-			}
-		}
-		
-		/*----------------DWT---------------------*/
-		
-		for (compno = 0; compno < tile->numcomps; compno++) {
-			opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
-			if (tcd_tcp->tccps[compno].qmfbid == 1) {
-				dwt_encode(tilec);
-			} else if (tcd_tcp->tccps[compno].qmfbid == 0) {
-				dwt_encode_real(tilec);
-			}
-		}
-		
-		/*------------------TIER1-----------------*/
-		t1 = t1_create(tcd->cinfo);
-		t1_encode_cblks(t1, tile, tcd_tcp);
-		t1_destroy(t1);
-		
-		/*-----------RATE-ALLOCATE------------------*/
-		
-		/* INDEX */
-		if(cstr_info) {
-			cstr_info->index_write = 0;
-		}
-		if (cp->disto_alloc || cp->fixed_quality) {	/* fixed_quality */
-			/* Normal Rate/distortion allocation */
-			tcd_rateallocate(tcd, dest, len, cstr_info);
-		} else {
-			/* Fixed layer allocation */
-			tcd_rateallocate_fixed(tcd);
-		}
-	}
-	/*--------------TIER2------------------*/
-
-	/* INDEX */
-	if(cstr_info) {
-		cstr_info->index_write = 1;
-	}
-
-	t2 = t2_create(tcd->cinfo, image, cp);
-	l = t2_encode_packets(t2,tileno, tile, tcd_tcp->numlayers, dest, len, cstr_info,tcd->tp_num,tcd->tp_pos,tcd->cur_pino,FINAL_PASS,tcd->cur_totnum_tp);
-	t2_destroy(t2);
-	
-	/*---------------CLEAN-------------------*/
-
-	
-	if(tcd->cur_tp_num == tcd->cur_totnum_tp - 1){
-		tcd->encoding_time = opj_clock() - tcd->encoding_time;
-		opj_event_msg(tcd->cinfo, EVT_INFO, "- tile encoded in %f s\n", tcd->encoding_time);
-
-		/* cleaning memory */
-		for (compno = 0; compno < tile->numcomps; compno++) {
-			opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
-			opj_aligned_free(tilec->data);
-		}
-	}
-
-	return l;
-}
-
-opj_bool tcd_decode_tile(opj_tcd_t *tcd, unsigned char *src, int len, int tileno, opj_codestream_info_t *cstr_info) {
-	int l;
-	int compno;
-	int eof = 0;
-	double tile_time, t1_time, dwt_time;
-	opj_tcd_tile_t *tile = NULL;
-
-	opj_t1_t *t1 = NULL;		/* T1 component */
-	opj_t2_t *t2 = NULL;		/* T2 component */
-	
-	tcd->tcd_tileno = tileno;
-	tcd->tcd_tile = &(tcd->tcd_image->tiles[tileno]);
-	tcd->tcp = &(tcd->cp->tcps[tileno]);
-	tile = tcd->tcd_tile;
-	
-	tile_time = opj_clock();	/* time needed to decode a tile */
-	opj_event_msg(tcd->cinfo, EVT_INFO, "tile %d of %d\n", tileno + 1, tcd->cp->tw * tcd->cp->th);
-
-	/* INDEX >>  */
-	if(cstr_info) {
-		int resno, compno, numprec = 0;
-		for (compno = 0; compno < cstr_info->numcomps; compno++) {
-			opj_tcp_t *tcp = &tcd->cp->tcps[0];
-			opj_tccp_t *tccp = &tcp->tccps[compno];
-			opj_tcd_tilecomp_t *tilec_idx = &tile->comps[compno];	
-			for (resno = 0; resno < tilec_idx->numresolutions; resno++) {
-				opj_tcd_resolution_t *res_idx = &tilec_idx->resolutions[resno];
-				cstr_info->tile[tileno].pw[resno] = res_idx->pw;
-				cstr_info->tile[tileno].ph[resno] = res_idx->ph;
-				numprec += res_idx->pw * res_idx->ph;
-				if (tccp->csty & J2K_CP_CSTY_PRT) {
-					cstr_info->tile[tileno].pdx[resno] = tccp->prcw[resno];
-					cstr_info->tile[tileno].pdy[resno] = tccp->prch[resno];
-				}
-				else {
-					cstr_info->tile[tileno].pdx[resno] = 15;
-					cstr_info->tile[tileno].pdx[resno] = 15;
-				}
-			}
-		}
-		cstr_info->tile[tileno].packet = (opj_packet_info_t *) opj_malloc(cstr_info->numlayers * numprec * sizeof(opj_packet_info_t));
-		cstr_info->packno = 0;
-	}
-	/* << INDEX */
-	
-	/*--------------TIER2------------------*/
-	
-	t2 = t2_create(tcd->cinfo, tcd->image, tcd->cp);
-	l = t2_decode_packets(t2, src, len, tileno, tile, cstr_info);
-	t2_destroy(t2);
-
-	if (l == -999) {
-		eof = 1;
-		opj_event_msg(tcd->cinfo, EVT_ERROR, "tcd_decode: incomplete bistream\n");
-	}
-	
-	/*------------------TIER1-----------------*/
-	
-	t1_time = opj_clock();	/* time needed to decode a tile */
-	t1 = t1_create(tcd->cinfo);
-	for (compno = 0; compno < tile->numcomps; ++compno) {
-		opj_tcd_tilecomp_t* tilec = &tile->comps[compno];
-		/* The +3 is headroom required by the vectorized DWT */
-		tilec->data = (int*) opj_aligned_malloc((((tilec->x1 - tilec->x0) * (tilec->y1 - tilec->y0))+3) * sizeof(int));
-		t1_decode_cblks(t1, tilec, &tcd->tcp->tccps[compno]);
-	}
-	t1_destroy(t1);
-	t1_time = opj_clock() - t1_time;
-	opj_event_msg(tcd->cinfo, EVT_INFO, "- tiers-1 took %f s\n", t1_time);
-	
-	/*----------------DWT---------------------*/
-
-	dwt_time = opj_clock();	/* time needed to decode a tile */
-	for (compno = 0; compno < tile->numcomps; compno++) {
-		opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
-		int numres2decode;
-
-		if (tcd->cp->reduce != 0) {
-			tcd->image->comps[compno].resno_decoded =
-				tile->comps[compno].numresolutions - tcd->cp->reduce - 1;
-			if (tcd->image->comps[compno].resno_decoded < 0) {				
-				opj_event_msg(tcd->cinfo, EVT_ERROR, "Error decoding tile. The number of resolutions to remove [%d+1] is higher than the number "
-					" of resolutions in the original codestream [%d]\nModify the cp_reduce parameter.\n", tcd->cp->reduce, tile->comps[compno].numresolutions);
-				return OPJ_FALSE;
-			}
-		}
-
-		numres2decode = tcd->image->comps[compno].resno_decoded + 1;
-		if(numres2decode > 0){
-			if (tcd->tcp->tccps[compno].qmfbid == 1) {
-				dwt_decode(tilec, numres2decode);
-			} else {
-				dwt_decode_real(tilec, numres2decode);
-			}
-		}
-	}
-	dwt_time = opj_clock() - dwt_time;
-	opj_event_msg(tcd->cinfo, EVT_INFO, "- dwt took %f s\n", dwt_time);
-
-	/*----------------MCT-------------------*/
-
-	if (tcd->tcp->mct) {
-		int n = (tile->comps[0].x1 - tile->comps[0].x0) * (tile->comps[0].y1 - tile->comps[0].y0);
-
-		if (tile->numcomps >= 3 ){
-			if (tcd->tcp->tccps[0].qmfbid == 1) {
-				mct_decode(
-						tile->comps[0].data,
-						tile->comps[1].data,
-						tile->comps[2].data,
-						n);
-			} else {
-				mct_decode_real(
-						(float*)tile->comps[0].data,
-						(float*)tile->comps[1].data,
-						(float*)tile->comps[2].data,
-						n);
-			}
-		} else{
-			opj_event_msg(tcd->cinfo, EVT_WARNING,"Number of components (%d) is inconsistent with a MCT. Skip the MCT step.\n",tile->numcomps);
-		}
-	}
-
-	/*---------------TILE-------------------*/
-
-	for (compno = 0; compno < tile->numcomps; ++compno) {
-		opj_tcd_tilecomp_t* tilec = &tile->comps[compno];
-		opj_image_comp_t* imagec = &tcd->image->comps[compno];
-		opj_tcd_resolution_t* res = &tilec->resolutions[imagec->resno_decoded];
-		int adjust = imagec->sgnd ? 0 : 1 << (imagec->prec - 1);
-		int min = imagec->sgnd ? -(1 << (imagec->prec - 1)) : 0;
-		int max = imagec->sgnd ?  (1 << (imagec->prec - 1)) - 1 : (1 << imagec->prec) - 1;
-
-		int tw = tilec->x1 - tilec->x0;
-		int w = imagec->w;
-
-		int offset_x = int_ceildivpow2(imagec->x0, imagec->factor);
-		int offset_y = int_ceildivpow2(imagec->y0, imagec->factor);
-
-		int i, j;
-		if(!imagec->data){
-			imagec->data = (int*) opj_malloc(imagec->w * imagec->h * sizeof(int));
-		}
-		if(tcd->tcp->tccps[compno].qmfbid == 1) {
-			for(j = res->y0; j < res->y1; ++j) {
-				for(i = res->x0; i < res->x1; ++i) {
-					int v = tilec->data[i - res->x0 + (j - res->y0) * tw];
-					v += adjust;
-					imagec->data[(i - offset_x) + (j - offset_y) * w] = int_clamp(v, min, max);
-				}
-			}
-		}else{
-			for(j = res->y0; j < res->y1; ++j) {
-				for(i = res->x0; i < res->x1; ++i) {
-					float tmp = ((float*)tilec->data)[i - res->x0 + (j - res->y0) * tw];
-					int v = lrintf(tmp);
-					v += adjust;
-					imagec->data[(i - offset_x) + (j - offset_y) * w] = int_clamp(v, min, max);
-				}
-			}
-		}
-		opj_aligned_free(tilec->data);
-	}
-
-	tile_time = opj_clock() - tile_time;	/* time needed to decode a tile */
-	opj_event_msg(tcd->cinfo, EVT_INFO, "- tile decoded in %f s\n", tile_time);
-
-	if (eof) {
-		return OPJ_FALSE;
-	}
-	
-	return OPJ_TRUE;
-}
-
-void tcd_free_decode(opj_tcd_t *tcd) {
-	opj_tcd_image_t *tcd_image = tcd->tcd_image;	
-	opj_free(tcd_image->tiles);
-}
-
-void tcd_free_decode_tile(opj_tcd_t *tcd, int tileno) {
-	int compno,resno,bandno,precno;
-
-	opj_tcd_image_t *tcd_image = tcd->tcd_image;
-
-	opj_tcd_tile_t *tile = &tcd_image->tiles[tileno];
-	for (compno = 0; compno < tile->numcomps; compno++) {
-		opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
-		for (resno = 0; resno < tilec->numresolutions; resno++) {
-			opj_tcd_resolution_t *res = &tilec->resolutions[resno];
-			for (bandno = 0; bandno < res->numbands; bandno++) {
-				opj_tcd_band_t *band = &res->bands[bandno];
-				for (precno = 0; precno < res->ph * res->pw; precno++) {
-					opj_tcd_precinct_t *prec = &band->precincts[precno];
-					if (prec->imsbtree != NULL) tgt_destroy(prec->imsbtree);
-					if (prec->incltree != NULL) tgt_destroy(prec->incltree);
-				}
-				opj_free(band->precincts);
-			}
-		}
-		opj_free(tilec->resolutions);
-	}
-	opj_free(tile->comps);
-}
-
-
-opj_bool tcd_init_v2(  opj_tcd_v2_t *p_tcd,
-					   opj_image_t * p_image,
-					   opj_cp_v2_t * p_cp )
-{
-	OPJ_UINT32 l_tile_comp_size;
-
-	p_tcd->image = p_image;
-	p_tcd->cp = p_cp;
-
-	p_tcd->tcd_image->tiles = (opj_tcd_tile_v2_t *) opj_malloc(sizeof(opj_tcd_tile_v2_t));
-	if (! p_tcd->tcd_image->tiles) {
-		return OPJ_FALSE;
-	}
-	memset(p_tcd->tcd_image->tiles,0, sizeof(opj_tcd_tile_v2_t));
-
-	l_tile_comp_size = p_image->numcomps * sizeof(opj_tcd_tilecomp_v2_t);
-	p_tcd->tcd_image->tiles->comps = (opj_tcd_tilecomp_v2_t *) opj_malloc(l_tile_comp_size);
-	if (! p_tcd->tcd_image->tiles->comps ) {
-		return OPJ_FALSE;
-	}
-	memset( p_tcd->tcd_image->tiles->comps , 0 , l_tile_comp_size);
-
-	p_tcd->tcd_image->tiles->numcomps = p_image->numcomps;
-	p_tcd->tp_pos = p_cp->m_specific_param.m_enc.m_tp_pos;
-
-	return OPJ_TRUE;
-}
-
-/**
-Destroy a previously created TCD handle
-*/
-void tcd_destroy_v2(opj_tcd_v2_t *tcd) {
-	if (tcd) {
-		tcd_free_tile(tcd);
-
-		if (tcd->tcd_image) {
-			opj_free(tcd->tcd_image);
-			tcd->tcd_image = 00;
-		}
-		opj_free(tcd);
-	}
-}
-
-/* ----------------------------------------------------------------------- */
-/**
- * Initialize the tile coder and may reuse some meory.
- * @param	p_tcd		TCD handle.
- * @param	p_image		raw image.
- * @param	p_cp		coding parameters.
- * @param	p_tile_no	current tile index to encode.
- *
- * @return true if the encoding values could be set (false otherwise).
-*/
-#define MACRO_TCD_ALLOCATE(FUNCTION,TYPE,FRACTION,ELEMENT,FUNCTION_ELEMENT)		\
-opj_bool FUNCTION (	opj_tcd_v2_t *p_tcd,										\
-					OPJ_UINT32 p_tile_no										\
-			)																	\
-{																				\
-	OPJ_UINT32 (*l_gain_ptr)(OPJ_UINT32) = 00;									\
-	OPJ_UINT32 compno, resno, bandno, precno, cblkno;							\
-	opj_tcp_v2_t * l_tcp = 00;													\
-	opj_cp_v2_t * l_cp = 00;													\
-	opj_tcd_tile_v2_t * l_tile = 00;											\
-	opj_tccp_t *l_tccp = 00;													\
-	opj_tcd_tilecomp_v2_t *l_tilec = 00;										\
-	opj_image_comp_t * l_image_comp = 00;										\
-	opj_tcd_resolution_v2_t *l_res = 00;										\
-	opj_tcd_band_v2_t *l_band = 00;												\
-	opj_stepsize_t * l_step_size = 00;											\
-	opj_tcd_precinct_v2_t *l_current_precinct = 00;								\
-	TYPE* l_code_block = 00;													\
-	opj_image_t *l_image = 00;													\
-	OPJ_UINT32 p,q;																\
-	OPJ_UINT32 l_level_no;														\
-	OPJ_UINT32 l_pdx, l_pdy;													\
-	OPJ_UINT32 l_gain;															\
-	OPJ_INT32 l_x0b, l_y0b;														\
-	/* extent of precincts , top left, bottom right**/							\
-	OPJ_INT32 l_tl_prc_x_start, l_tl_prc_y_start, l_br_prc_x_end, l_br_prc_y_end;	\
-	/* number of precinct for a resolution */									\
-	OPJ_UINT32 l_nb_precincts;													\
-	/* room needed to store l_nb_precinct precinct for a resolution */			\
-	OPJ_UINT32 l_nb_precinct_size;												\
-	/* number of code blocks for a precinct*/									\
-	OPJ_UINT32 l_nb_code_blocks;												\
-	/* room needed to store l_nb_code_blocks code blocks for a precinct*/		\
-	OPJ_UINT32 l_nb_code_blocks_size;											\
-	/* size of data for a tile */												\
-	OPJ_UINT32 l_data_size;														\
-																				\
-	l_cp = p_tcd->cp;															\
-	l_tcp = &(l_cp->tcps[p_tile_no]);											\
-	l_tile = p_tcd->tcd_image->tiles;											\
-	l_tccp = l_tcp->tccps;														\
-	l_tilec = l_tile->comps;													\
-	l_image = p_tcd->image;														\
-	l_image_comp = p_tcd->image->comps;											\
-																				\
-	p = p_tile_no % l_cp->tw;	/* tile coordinates */							\
-	q = p_tile_no / l_cp->tw;													\
-	/*fprintf(stderr, "Tile coordinate = %d,%d\n", p, q);*/						\
-																				\
-	/* 4 borders of the tile rescale on the image if necessary */				\
-	l_tile->x0 = int_max(l_cp->tx0 + p * l_cp->tdx, l_image->x0);				\
-	l_tile->y0 = int_max(l_cp->ty0 + q * l_cp->tdy, l_image->y0);				\
-	l_tile->x1 = int_min(l_cp->tx0 + (p + 1) * l_cp->tdx, l_image->x1);			\
-	l_tile->y1 = int_min(l_cp->ty0 + (q + 1) * l_cp->tdy, l_image->y1);			\
-	/*fprintf(stderr, "Tile border = %d,%d,%d,%d\n", l_tile->x0, l_tile->y0,l_tile->x1,l_tile->y1);*/\
-																				\
-	/*tile->numcomps = image->numcomps; */										\
-	for(compno = 0; compno < l_tile->numcomps; ++compno) {						\
-		/*fprintf(stderr, "compno = %d/%d\n", compno, l_tile->numcomps);*/		\
-																				\
-		/* border of each l_tile component (global) */							\
-		l_tilec->x0 = int_ceildiv(l_tile->x0, l_image_comp->dx);				\
-		l_tilec->y0 = int_ceildiv(l_tile->y0, l_image_comp->dy);				\
-		l_tilec->x1 = int_ceildiv(l_tile->x1, l_image_comp->dx);				\
-		l_tilec->y1 = int_ceildiv(l_tile->y1, l_image_comp->dy);				\
-		/*fprintf(stderr, "\tTile compo border = %d,%d,%d,%d\n", l_tilec->x0, l_tilec->y0,l_tilec->x1,l_tilec->y1);*/\
-																				\
-		l_data_size = (l_tilec->x1 - l_tilec->x0)								\
-					* (l_tilec->y1 - l_tilec->y0) * sizeof(OPJ_UINT32 );		\
-		l_tilec->numresolutions = l_tccp->numresolutions;						\
-		if (l_tccp->numresolutions < l_cp->m_specific_param.m_dec.m_reduce) {	\
-			l_tilec->minimum_num_resolutions = 1;								\
-		}																		\
-		else {																	\
-			l_tilec->minimum_num_resolutions = l_tccp->numresolutions			\
-				- l_cp->m_specific_param.m_dec.m_reduce;						\
-		}																		\
-																				\
-		if (l_tilec->data == 00) {												\
-            l_tilec->data = (OPJ_INT32 *) opj_malloc(l_data_size);		\
-			if (! l_tilec->data ) {												\
-				return OPJ_FALSE;												\
-			}																	\
-            /*fprintf(stderr, "\tAllocate data of tilec (int): %d x OPJ_UINT32\n",l_data_size);*/	\
-																				\
-			l_tilec->data_size = l_data_size;									\
-		}																		\
-		else if (l_data_size > l_tilec->data_size) {							\
-			l_tilec->data = (OPJ_INT32 *) opj_realloc(l_tilec->data, l_data_size);	\
-			if (! l_tilec->data) {												\
-				return OPJ_FALSE;												\
-			}																	\
-			/*fprintf(stderr, "\tReallocate data of tilec (int): from %d to %d x OPJ_UINT32\n", l_tilec->data_size, l_data_size);*/		\
-			l_tilec->data_size = l_data_size;									\
-		}																		\
-																			\
-		l_data_size = l_tilec->numresolutions * sizeof(opj_tcd_resolution_v2_t);	\
-																				\
-		if (l_tilec->resolutions == 00) {										\
-            l_tilec->resolutions = (opj_tcd_resolution_v2_t *) opj_malloc(l_data_size);	\
-			if (! l_tilec->resolutions ) {										\
-				return OPJ_FALSE;												\
-			}																	\
-			/*fprintf(stderr, "\tAllocate resolutions of tilec (opj_tcd_resolution_v2_t): %d\n",l_data_size);*/		\
-			l_tilec->resolutions_size = l_data_size;							\
-			memset(l_tilec->resolutions,0,l_data_size);							\
-		}																		\
-		else if (l_data_size > l_tilec->resolutions_size) {						\
-			l_tilec->resolutions = (opj_tcd_resolution_v2_t *) opj_realloc(l_tilec->resolutions, l_data_size);	\
-			if (! l_tilec->resolutions) {										\
-				return OPJ_FALSE;												\
-			}																	\
-			/*fprintf(stderr, "\tReallocate data of tilec (int): from %d to %d x OPJ_UINT32\n", l_tilec->resolutions_size, l_data_size);*/	\
-			memset(((OPJ_BYTE*) l_tilec->resolutions)+l_tilec->resolutions_size,0,l_data_size - l_tilec->resolutions_size);	\
-			l_tilec->resolutions_size = l_data_size;							\
-		}																		\
-																				\
-		l_level_no = l_tilec->numresolutions - 1;								\
-		l_res = l_tilec->resolutions;											\
-		l_step_size = l_tccp->stepsizes;										\
-		if (l_tccp->qmfbid == 0) {												\
-			l_gain_ptr = &dwt_getgain_real_v2;									\
-		}																		\
-		else {																	\
-			l_gain_ptr  = &dwt_getgain_v2;										\
-		}																		\
-		/*fprintf(stderr, "\tlevel_no=%d\n",l_level_no);*/						\
-																				\
-		for(resno = 0; resno < l_tilec->numresolutions; ++resno) {				\
-			/*fprintf(stderr, "\t\tresno = %d/%d\n", resno, l_tilec->numresolutions);*/	\
-			OPJ_INT32 tlcbgxstart, tlcbgystart, brcbgxend, brcbgyend;			\
-			OPJ_UINT32 cbgwidthexpn, cbgheightexpn;								\
-			OPJ_UINT32 cblkwidthexpn, cblkheightexpn;							\
-																				\
-			/* border for each resolution level (global) */						\
-			l_res->x0 = int_ceildivpow2(l_tilec->x0, l_level_no);				\
-			l_res->y0 = int_ceildivpow2(l_tilec->y0, l_level_no);				\
-			l_res->x1 = int_ceildivpow2(l_tilec->x1, l_level_no);				\
-			l_res->y1 = int_ceildivpow2(l_tilec->y1, l_level_no);				\
-			/*fprintf(stderr, "\t\t\tres_x0= %d, res_y0 =%d, res_x1=%d, res_y1=%d\n", l_res->x0, l_res->y0, l_res->x1, l_res->y1);*/	\
-			/* p. 35, table A-23, ISO/IEC FDIS154444-1 : 2000 (18 august 2000) */	\
-			l_pdx = l_tccp->prcw[resno];										\
-			l_pdy = l_tccp->prch[resno];										\
-			/*fprintf(stderr, "\t\t\tpdx=%d, pdy=%d\n", l_pdx, l_pdy);*/		\
-			/* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000)  */		\
-			l_tl_prc_x_start = int_floordivpow2(l_res->x0, l_pdx) << l_pdx;		\
-			l_tl_prc_y_start = int_floordivpow2(l_res->y0, l_pdy) << l_pdy;		\
-			l_br_prc_x_end = int_ceildivpow2(l_res->x1, l_pdx) << l_pdx;		\
-			l_br_prc_y_end = int_ceildivpow2(l_res->y1, l_pdy) << l_pdy;		\
-			/*fprintf(stderr, "\t\t\tprc_x_start=%d, prc_y_start=%d, br_prc_x_end=%d, br_prc_y_end=%d \n", l_tl_prc_x_start, l_tl_prc_y_start, l_br_prc_x_end ,l_br_prc_y_end );*/	\
-																				\
-			l_res->pw = (l_res->x0 == l_res->x1) ? 0 : ((l_br_prc_x_end - l_tl_prc_x_start) >> l_pdx);	\
-			l_res->ph = (l_res->y0 == l_res->y1) ? 0 : ((l_br_prc_y_end - l_tl_prc_y_start) >> l_pdy);	\
-			/*fprintf(stderr, "\t\t\tres_pw=%d, res_ph=%d\n", l_res->pw, l_res->ph );*/	\
-																				\
-			l_nb_precincts = l_res->pw * l_res->ph;								\
-			l_nb_precinct_size = l_nb_precincts * sizeof(opj_tcd_precinct_v2_t);	\
-			if (resno == 0) {													\
-				tlcbgxstart = l_tl_prc_x_start;									\
-				tlcbgystart = l_tl_prc_y_start;									\
-				brcbgxend = l_br_prc_x_end;										\
-				brcbgyend = l_br_prc_y_end;										\
-				cbgwidthexpn = l_pdx;											\
-				cbgheightexpn = l_pdy;											\
-				l_res->numbands = 1;											\
-			}																	\
-			else {																\
-				tlcbgxstart = int_ceildivpow2(l_tl_prc_x_start, 1);				\
-				tlcbgystart = int_ceildivpow2(l_tl_prc_y_start, 1);				\
-				brcbgxend = int_ceildivpow2(l_br_prc_x_end, 1);					\
-				brcbgyend = int_ceildivpow2(l_br_prc_y_end, 1);					\
-				cbgwidthexpn = l_pdx - 1;										\
-				cbgheightexpn = l_pdy - 1;										\
-				l_res->numbands = 3;											\
-			}																	\
-																				\
-			cblkwidthexpn = uint_min(l_tccp->cblkw, cbgwidthexpn);				\
-			cblkheightexpn = uint_min(l_tccp->cblkh, cbgheightexpn);			\
-			l_band = l_res->bands;												\
-																				\
-			for (bandno = 0; bandno < l_res->numbands; ++bandno) {				\
-				OPJ_INT32 numbps;\
-				/*fprintf(stderr, "\t\t\tband_no=%d/%d\n", bandno, l_res->numbands );*/	\
-																				\
-				if (resno == 0) {												\
-					l_band->bandno = 0 ;										\
-					l_band->x0 = int_ceildivpow2(l_tilec->x0, l_level_no);		\
-					l_band->y0 = int_ceildivpow2(l_tilec->y0, l_level_no);		\
-					l_band->x1 = int_ceildivpow2(l_tilec->x1, l_level_no);		\
-					l_band->y1 = int_ceildivpow2(l_tilec->y1, l_level_no);		\
-				}																\
-				else {															\
-					l_band->bandno = bandno + 1;								\
-					/* x0b = 1 if bandno = 1 or 3 */							\
-					l_x0b = l_band->bandno&1;									\
-					/* y0b = 1 if bandno = 2 or 3 */							\
-					l_y0b = (l_band->bandno)>>1;								\
-					/* l_band border (global) */								\
-					l_band->x0 = int_ceildivpow2(l_tilec->x0 - (1 << l_level_no) * l_x0b, l_level_no + 1);	\
-					l_band->y0 = int_ceildivpow2(l_tilec->y0 - (1 << l_level_no) * l_y0b, l_level_no + 1);	\
-					l_band->x1 = int_ceildivpow2(l_tilec->x1 - (1 << l_level_no) * l_x0b, l_level_no + 1);	\
-					l_band->y1 = int_ceildivpow2(l_tilec->y1 - (1 << l_level_no) * l_y0b, l_level_no + 1);	\
-				}																\
-																				\
-				/** avoid an if with storing function pointer */				\
-				l_gain = (*l_gain_ptr) (l_band->bandno);						\
-				numbps = l_image_comp->prec + l_gain;							\
-				l_band->stepsize = (OPJ_FLOAT32)(((1.0 + l_step_size->mant / 2048.0) * pow(2.0, (OPJ_INT32) (numbps - l_step_size->expn)))) * FRACTION;\
-				l_band->numbps = l_step_size->expn + l_tccp->numgbits - 1;	/* WHY -1 ? */\
-																				\
-				if (! l_band->precincts) {										\
-					l_band->precincts = (opj_tcd_precinct_v2_t *) opj_malloc( /*3 * */ l_nb_precinct_size);\
-					if (! l_band->precincts) {									\
-						return OPJ_FALSE;										\
-					}															\
-					/*fprintf(stderr, "\t\t\t\tAllocate precincts of a band (opj_tcd_precinct_v2_t): %d\n",l_nb_precinct_size);	*/	\
-					memset(l_band->precincts,0,l_nb_precinct_size);				\
-					l_band->precincts_data_size = l_nb_precinct_size;			\
-				}																\
-				else if (l_band->precincts_data_size < l_nb_precinct_size) {	\
-																				\
-					l_band->precincts = (opj_tcd_precinct_v2_t *) opj_realloc(l_band->precincts,/*3 * */ l_nb_precinct_size);\
-					if (! l_band->precincts) {									\
-						return OPJ_FALSE;										\
-					}															\
-					/*fprintf(stderr, "\t\t\t\tReallocate precincts of a band (opj_tcd_precinct_v2_t): from %d to %d\n",l_band->precincts_data_size, l_nb_precinct_size);*/\
-					memset(((OPJ_BYTE *) l_band->precincts) + l_band->precincts_data_size,0,l_nb_precinct_size - l_band->precincts_data_size);\
-					l_band->precincts_data_size = l_nb_precinct_size;			\
-				}																\
-																				\
-				l_current_precinct = l_band->precincts;							\
-				for	(precno = 0; precno < l_nb_precincts; ++precno) {			\
-					OPJ_INT32 tlcblkxstart, tlcblkystart, brcblkxend, brcblkyend;	\
-					OPJ_INT32 cbgxstart = tlcbgxstart + (precno % l_res->pw) * (1 << cbgwidthexpn);	\
-					OPJ_INT32 cbgystart = tlcbgystart + (precno / l_res->pw) * (1 << cbgheightexpn);	\
-					OPJ_INT32 cbgxend = cbgxstart + (1 << cbgwidthexpn);		\
-					OPJ_INT32 cbgyend = cbgystart + (1 << cbgheightexpn);		\
-					/*fprintf(stderr, "\t precno=%d; bandno=%d, resno=%d; compno=%d\n", precno, bandno , resno, compno);*/\
-					/*fprintf(stderr, "\t tlcbgxstart(=%d) + (precno(=%d) percent res->pw(=%d)) * (1 << cbgwidthexpn(=%d)) \n",tlcbgxstart,precno,l_res->pw,cbgwidthexpn);*/\
-																				\
-					/* precinct size (global) */								\
-					/*fprintf(stderr, "\t cbgxstart=%d, l_band->x0 = %d \n",cbgxstart, l_band->x0);*/ \
-																				\
-					l_current_precinct->x0 = int_max(cbgxstart, l_band->x0);	\
-					l_current_precinct->y0 = int_max(cbgystart, l_band->y0);	\
-					l_current_precinct->x1 = int_min(cbgxend, l_band->x1);		\
-					l_current_precinct->y1 = int_min(cbgyend, l_band->y1);		\
-					/*fprintf(stderr, "\t prc_x0=%d; prc_y0=%d, prc_x1=%d; prc_y1=%d\n",l_current_precinct->x0, l_current_precinct->y0 ,l_current_precinct->x1, l_current_precinct->y1);*/ \
-																				\
-					tlcblkxstart = int_floordivpow2(l_current_precinct->x0, cblkwidthexpn) << cblkwidthexpn;	\
-					/*fprintf(stderr, "\t tlcblkxstart =%d\n",tlcblkxstart );*/ \
-					tlcblkystart = int_floordivpow2(l_current_precinct->y0, cblkheightexpn) << cblkheightexpn;	\
-					/*fprintf(stderr, "\t tlcblkystart =%d\n",tlcblkystart );*/ \
-					brcblkxend = int_ceildivpow2(l_current_precinct->x1, cblkwidthexpn) << cblkwidthexpn;	\
-					/*fprintf(stderr, "\t brcblkxend =%d\n",brcblkxend );*/ 	\
-					brcblkyend = int_ceildivpow2(l_current_precinct->y1, cblkheightexpn) << cblkheightexpn;	\
-					/*fprintf(stderr, "\t brcblkyend =%d\n",brcblkyend );*/	 	\
-					l_current_precinct->cw = (brcblkxend - tlcblkxstart) >> cblkwidthexpn;	\
-					l_current_precinct->ch = (brcblkyend - tlcblkystart) >> cblkheightexpn;	\
-																				\
-					l_nb_code_blocks = l_current_precinct->cw * l_current_precinct->ch;	\
-					/*fprintf(stderr, "\t\t\t\t precinct_cw = %d x recinct_ch = %d\n",l_current_precinct->cw, l_current_precinct->ch);	*/	\
-					l_nb_code_blocks_size = l_nb_code_blocks * sizeof(TYPE);	\
-																				\
-					if (! l_current_precinct->cblks.ELEMENT) {					\
-						l_current_precinct->cblks.ELEMENT = (TYPE*) opj_malloc(l_nb_code_blocks_size);\
-						if (! l_current_precinct->cblks.ELEMENT ) {				\
-							return OPJ_FALSE;									\
-						}														\
-						/*fprintf(stderr, "\t\t\t\tAllocate cblks of a precinct (opj_tcd_cblk_dec_v2_t): %d\n",l_nb_code_blocks_size);*/		\
-																				\
-						memset(l_current_precinct->cblks.ELEMENT,0,l_nb_code_blocks_size);\
-																				\
-						l_current_precinct->block_size = l_nb_code_blocks_size;	\
-					}															\
-					else if (l_nb_code_blocks_size > l_current_precinct->block_size) {	\
-						l_current_precinct->cblks.ELEMENT = (TYPE*)									\
-							opj_realloc(l_current_precinct->cblks.ELEMENT, l_nb_code_blocks_size);	\
-						if (! l_current_precinct->cblks.ELEMENT ) {				\
-							return OPJ_FALSE;									\
-						}														\
-						/*fprintf(stderr, "\t\t\t\tReallocate cblks of a precinct (opj_tcd_cblk_dec_v2_t): from %d to %d\n",l_current_precinct->block_size, l_nb_code_blocks_size);	*/	\
-																				\
-						memset(((OPJ_BYTE *) l_current_precinct->cblks.ELEMENT) + l_current_precinct->block_size	\
-										,0																			\
-										,l_nb_code_blocks_size - l_current_precinct->block_size);					\
-																				\
-						l_current_precinct->block_size = l_nb_code_blocks_size;	\
-					}															\
-																				\
-					if (! l_current_precinct->incltree) {						\
-                        l_current_precinct->incltree = tgt_create_v2(l_current_precinct->cw,	\
-																  l_current_precinct->ch);	\
-					}															\
-					else{														\
-						l_current_precinct->incltree = tgt_init(l_current_precinct->incltree,	\
-																l_current_precinct->cw, 		\
-																l_current_precinct->ch);		\
-					}															\
-																				\
-					if (! l_current_precinct->incltree)	{						\
-						fprintf(stderr, "WARNING: No incltree created.\n");\
-						/*return OPJ_FALSE;*/										\
-					}															\
-																				\
-					if (! l_current_precinct->imsbtree) {						\
-                        l_current_precinct->imsbtree = tgt_create_v2(				\
-														l_current_precinct->cw,	\
-														l_current_precinct->ch);\
-					}															\
-					else {														\
-						l_current_precinct->imsbtree = tgt_init(							\
-															l_current_precinct->imsbtree,	\
-															l_current_precinct->cw,			\
-															l_current_precinct->ch);		\
-					}															\
-																				\
-					if (! l_current_precinct->imsbtree) {						\
-						fprintf(stderr, "WARNING: No imsbtree created.\n");\
-						/*return OPJ_FALSE;*/										\
-					}															\
-																				\
-					l_code_block = l_current_precinct->cblks.ELEMENT;			\
-																				\
-					for (cblkno = 0; cblkno < l_nb_code_blocks; ++cblkno) {		\
-						OPJ_INT32 cblkxstart = tlcblkxstart + (cblkno % l_current_precinct->cw) * (1 << cblkwidthexpn);		\
-						OPJ_INT32 cblkystart = tlcblkystart + (cblkno / l_current_precinct->cw) * (1 << cblkheightexpn);	\
-						OPJ_INT32 cblkxend = cblkxstart + (1 << cblkwidthexpn);	\
-						OPJ_INT32 cblkyend = cblkystart + (1 << cblkheightexpn);\
-																				\
-						/* code-block size (global) */							\
-						l_code_block->x0 = int_max(cblkxstart, l_current_precinct->x0);	\
-						l_code_block->y0 = int_max(cblkystart, l_current_precinct->y0);	\
-						l_code_block->x1 = int_min(cblkxend, l_current_precinct->x1);	\
-						l_code_block->y1 = int_min(cblkyend, l_current_precinct->y1);	\
-																				\
-						if (! FUNCTION_ELEMENT(l_code_block)) {					\
-							return OPJ_FALSE;									\
-						}														\
-						++l_code_block;											\
-					}															\
-					++l_current_precinct;										\
-				} /* precno */													\
-				++l_band;														\
-				++l_step_size;													\
-			} /* bandno */														\
-			++l_res;															\
-			--l_level_no;														\
-		} /* resno */															\
-		++l_tccp;																\
-		++l_tilec;																\
-		++l_image_comp;															\
-	} /* compno */																\
-	return OPJ_TRUE;															\
-}																				\
-
-
-// V2 ENCODE MACRO_TCD_ALLOCATE(tcd_init_encode_tile,opj_tcd_cblk_enc_t,1.f,enc,tcd_code_block_enc_allocate)
-MACRO_TCD_ALLOCATE(tcd_init_decode_tile, opj_tcd_cblk_dec_v2_t, 0.5f, dec, tcd_code_block_dec_allocate)
-
-#undef MACRO_TCD_ALLOCATE
-
-
-OPJ_UINT32 tcd_get_decoded_tile_size ( opj_tcd_v2_t *p_tcd )
-{
-	OPJ_UINT32 i;
-	OPJ_UINT32 l_data_size = 0;
-	opj_image_comp_t * l_img_comp = 00;
-	opj_tcd_tilecomp_v2_t * l_tile_comp = 00;
-	opj_tcd_resolution_v2_t * l_res = 00;
-	OPJ_UINT32 l_size_comp, l_remaining;
-
-	l_tile_comp = p_tcd->tcd_image->tiles->comps;
-	l_img_comp = p_tcd->image->comps;
-
-	for (i=0;i<p_tcd->image->numcomps;++i) {
-		l_size_comp = l_img_comp->prec >> 3; /*(/ 8)*/
-		l_remaining = l_img_comp->prec & 7;  /* (%8) */
-
-		if(l_remaining) {
-			++l_size_comp;
-		}
-
-		if (l_size_comp == 3) {
-			l_size_comp = 4;
-		}
-
-		l_res = l_tile_comp->resolutions + l_tile_comp->minimum_num_resolutions - 1;
-		l_data_size += l_size_comp * (l_res->x1 - l_res->x0) * (l_res->y1 - l_res->y0);
-		++l_img_comp;
-		++l_tile_comp;
-	}
-
-	return l_data_size;
-}
-
-
-opj_bool tcd_decode_tile_v2(
-					 opj_tcd_v2_t *p_tcd,
-					 OPJ_BYTE *p_src,
-					 OPJ_UINT32 p_max_length,
-					 OPJ_UINT32 p_tile_no,
-					 opj_codestream_index_t *p_cstr_index)
-{
-	OPJ_UINT32 l_data_read;
-	p_tcd->tcd_tileno = p_tile_no;
-	p_tcd->tcp = &(p_tcd->cp->tcps[p_tile_no]);
-
-#ifdef TODO_MSD /* FIXME */
-	/* INDEX >>  */
-	if(p_cstr_info) {
-		OPJ_UINT32 resno, compno, numprec = 0;
-		for (compno = 0; compno < (OPJ_UINT32) p_cstr_info->numcomps; compno++) {
-			opj_tcp_v2_t *tcp = &p_tcd->cp->tcps[0];
-			opj_tccp_t *tccp = &tcp->tccps[compno];
-			opj_tcd_tilecomp_v2_t *tilec_idx = &p_tcd->tcd_image->tiles->comps[compno];
-			for (resno = 0; resno < tilec_idx->numresolutions; resno++) {
-				opj_tcd_resolution_v2_t *res_idx = &tilec_idx->resolutions[resno];
-				p_cstr_info->tile[p_tile_no].pw[resno] = res_idx->pw;
-				p_cstr_info->tile[p_tile_no].ph[resno] = res_idx->ph;
-				numprec += res_idx->pw * res_idx->ph;
-				p_cstr_info->tile[p_tile_no].pdx[resno] = tccp->prcw[resno];
-				p_cstr_info->tile[p_tile_no].pdy[resno] = tccp->prch[resno];
-			}
-		}
-		p_cstr_info->tile[p_tile_no].packet = (opj_packet_info_t *) opj_malloc(p_cstr_info->numlayers * numprec * sizeof(opj_packet_info_t));
-		p_cstr_info->packno = 0;
-	}
-	/* << INDEX */
-#endif
-
-	/*--------------TIER2------------------*/
-	// FIXME _ProfStart(PGROUP_T2);
-	l_data_read = 0;
-	if
-		(! tcd_t2_decode(p_tcd, p_src, &l_data_read, p_max_length, p_cstr_index))
-	{
-		return OPJ_FALSE;
-	}
-	// FIXME _ProfStop(PGROUP_T2);
-
-	/*------------------TIER1-----------------*/
-
-	// FIXME _ProfStart(PGROUP_T1);
-	if
-		(! tcd_t1_decode(p_tcd))
-	{
-		return OPJ_FALSE;
-	}
-	// FIXME _ProfStop(PGROUP_T1);
-
-	/*----------------DWT---------------------*/
-
-	// FIXME _ProfStart(PGROUP_DWT);
-	if
-		(! tcd_dwt_decode(p_tcd))
-	{
-		return OPJ_FALSE;
-	}
-	// FIXME _ProfStop(PGROUP_DWT);
-
-	/*----------------MCT-------------------*/
-	// FIXME _ProfStart(PGROUP_MCT);
-	if
-		(! tcd_mct_decode(p_tcd))
-	{
-		return OPJ_FALSE;
-	}
-	// FIXME _ProfStop(PGROUP_MCT);
-
-	// FIXME _ProfStart(PGROUP_DC_SHIFT);
-	if
-		(! tcd_dc_level_shift_decode(p_tcd))
-	{
-		return OPJ_FALSE;
-	}
-	// FIXME _ProfStop(PGROUP_DC_SHIFT);
-
-
-	/*---------------TILE-------------------*/
-	return OPJ_TRUE;
-}
-
-opj_bool tcd_update_tile_data (
-						 opj_tcd_v2_t *p_tcd,
-						 OPJ_BYTE * p_dest,
-						 OPJ_UINT32 p_dest_length
-						 )
-{
-	OPJ_UINT32 i,j,k,l_data_size = 0;
-	opj_image_comp_t * l_img_comp = 00;
-	opj_tcd_tilecomp_v2_t * l_tilec = 00;
-	opj_tcd_resolution_v2_t * l_res;
-	OPJ_UINT32 l_size_comp, l_remaining;
-	OPJ_UINT32 l_stride, l_width,l_height;
-
-	l_data_size = tcd_get_decoded_tile_size(p_tcd);
-	if (l_data_size > p_dest_length) {
-		return OPJ_FALSE;
-	}
-
-	l_tilec = p_tcd->tcd_image->tiles->comps;
-	l_img_comp = p_tcd->image->comps;
-
-	for (i=0;i<p_tcd->image->numcomps;++i) {
-		l_size_comp = l_img_comp->prec >> 3; /*(/ 8)*/
-		l_remaining = l_img_comp->prec & 7;  /* (%8) */
-		l_res = l_tilec->resolutions + l_img_comp->resno_decoded;
-		l_width = (l_res->x1 - l_res->x0);
-		l_height = (l_res->y1 - l_res->y0);
-		l_stride = (l_tilec->x1 - l_tilec->x0) - l_width;
-
-		if (l_remaining) {
-			++l_size_comp;
-		}
-
-		if (l_size_comp == 3) {
-			l_size_comp = 4;
-		}
-
-		switch (l_size_comp)
-			{
-			case 1:
-				{
-					OPJ_CHAR * l_dest_ptr = (OPJ_CHAR *) p_dest;
-					const OPJ_INT32 * l_src_ptr = l_tilec->data;
-
-					if (l_img_comp->sgnd) {
-						for (j=0;j<l_height;++j) {
-							for (k=0;k<l_width;++k) {
-								*(l_dest_ptr++) = (OPJ_CHAR) (*(l_src_ptr++));
-							}
-							l_src_ptr += l_stride;
-						}
-					}
-					else {
-						for (j=0;j<l_height;++j) {
-							for	(k=0;k<l_width;++k) {
-								*(l_dest_ptr++) = (OPJ_BYTE) ((*(l_src_ptr++))&0xff);
-							}
-							l_src_ptr += l_stride;
-						}
-					}
-
-					p_dest = (OPJ_BYTE *)l_dest_ptr;
-				}
-				break;
-			case 2:
-				{
-					const OPJ_INT32 * l_src_ptr = l_tilec->data;
-					OPJ_INT16 * l_dest_ptr = (OPJ_INT16 *) p_dest;
-
-					if (l_img_comp->sgnd) {
-						for (j=0;j<l_height;++j) {
-							for (k=0;k<l_width;++k) {
-								*(l_dest_ptr++) = (OPJ_INT16) (*(l_src_ptr++));
-							}
-							l_src_ptr += l_stride;
-						}
-					}
-					else {
-						for (j=0;j<l_height;++j) {
-							for (k=0;k<l_width;++k) {
-								*(l_dest_ptr++) = (OPJ_UINT16) ((*(l_src_ptr++))&0xffff);
-							}
-							l_src_ptr += l_stride;
-						}
-					}
-
-					p_dest = (OPJ_BYTE*) l_dest_ptr;
-				}
-				break;
-			case 4:
-				{
-					OPJ_INT32 * l_dest_ptr = (OPJ_INT32 *) p_dest;
-					OPJ_INT32 * l_src_ptr = l_tilec->data;
-
-					for (j=0;j<l_height;++j) {
-						for (k=0;k<l_width;++k) {
-							*(l_dest_ptr++) = (*(l_src_ptr++));
-						}
-						l_src_ptr += l_stride;
-					}
-
-					p_dest = (OPJ_BYTE*) l_dest_ptr;
-				}
-				break;
-		}
-
-		++l_img_comp;
-		++l_tilec;
-	}
-
-	return OPJ_TRUE;
-}
-
-
-
-
-void tcd_free_tile(opj_tcd_v2_t *p_tcd)
-{
-	OPJ_UINT32 compno, resno, bandno, precno;
-	opj_tcd_tile_v2_t *l_tile = 00;
-	opj_tcd_tilecomp_v2_t *l_tile_comp = 00;
-	opj_tcd_resolution_v2_t *l_res = 00;
-	opj_tcd_band_v2_t *l_band = 00;
-	opj_tcd_precinct_v2_t *l_precinct = 00;
-	OPJ_UINT32 l_nb_resolutions, l_nb_precincts;
-	void (* l_tcd_code_block_deallocate) (opj_tcd_precinct_v2_t *) = 00;
-
-	if (! p_tcd) {
-		return;
-	}
-
-	if (! p_tcd->tcd_image) {
-		return;
-	}
-
-	if (p_tcd->m_is_decoder) {
-		l_tcd_code_block_deallocate = tcd_code_block_dec_deallocate;
-	}
-	else {
-		// FIXME l_tcd_code_block_deallocate = tcd_code_block_enc_deallocate;
-	}
-
-	l_tile = p_tcd->tcd_image->tiles;
-	if (! l_tile) {
-		return;
-	}
-
-	l_tile_comp = l_tile->comps;
-
-	for (compno = 0; compno < l_tile->numcomps; ++compno) {
-		l_res = l_tile_comp->resolutions;
-		if (l_res) {
-
-			l_nb_resolutions = l_tile_comp->resolutions_size / sizeof(opj_tcd_resolution_v2_t);
-			for (resno = 0; resno < l_nb_resolutions; ++resno) {
-				l_band = l_res->bands;
-				for	(bandno = 0; bandno < 3; ++bandno) {
-					l_precinct = l_band->precincts;
-					if (l_precinct) {
-
-						l_nb_precincts = l_band->precincts_data_size / sizeof(opj_tcd_precinct_v2_t);
-						for (precno = 0; precno < l_nb_precincts; ++precno) {
-							tgt_destroy(l_precinct->incltree);
-							l_precinct->incltree = 00;
-							tgt_destroy(l_precinct->imsbtree);
-							l_precinct->imsbtree = 00;
-							(*l_tcd_code_block_deallocate) (l_precinct);
-							++l_precinct;
-						}
-
-						opj_free(l_band->precincts);
-						l_band->precincts = 00;
-					}
-					++l_band;
-				} /* for (resno */
-				++l_res;
-			}
-
-			opj_free(l_tile_comp->resolutions);
-			l_tile_comp->resolutions = 00;
-		}
-
-		if (l_tile_comp->data) {
-			opj_free(l_tile_comp->data);
-			l_tile_comp->data = 00;
-		}
-		++l_tile_comp;
-	}
-
-	opj_free(l_tile->comps);
-	l_tile->comps = 00;
-	opj_free(p_tcd->tcd_image->tiles);
-	p_tcd->tcd_image->tiles = 00;
-}
-
-
-/**
- * Allocates memory for a decoding code block.
- */
-opj_bool tcd_code_block_dec_allocate (opj_tcd_cblk_dec_v2_t * p_code_block)
-{
-	OPJ_UINT32 l_seg_size;
-
-	if (! p_code_block->data) {
-
-		p_code_block->data = (OPJ_BYTE*) opj_malloc(8192);
-		if (! p_code_block->data) {
-			return OPJ_FALSE;
-		}
-		/*fprintf(stderr, "Allocate 8192 elements of code_block->data\n");*/
-
-		l_seg_size = J2K_DEFAULT_NB_SEGS * sizeof(opj_tcd_seg_t);
-		p_code_block->segs = (opj_tcd_seg_t *) opj_malloc(l_seg_size);
-		if (! p_code_block->segs) {
-			return OPJ_FALSE;
-		}
-		memset(p_code_block->segs,0,l_seg_size);
-		/*fprintf(stderr, "Allocate %d elements of code_block->data\n", J2K_DEFAULT_NB_SEGS * sizeof(opj_tcd_seg_t));*/
-
-		p_code_block->m_current_max_segs = J2K_DEFAULT_NB_SEGS;
-		/*fprintf(stderr, "m_current_max_segs of code_block->data = %d\n", p_code_block->m_current_max_segs);*/
-	}
-	// TODO
-	//p_code_block->numsegs = 0;
-
-	return OPJ_TRUE;
-}
-
-opj_bool tcd_t2_decode (
-					opj_tcd_v2_t *p_tcd,
-					OPJ_BYTE * p_src_data,
-					OPJ_UINT32 * p_data_read,
-					OPJ_UINT32 p_max_src_size,
-					opj_codestream_index_t *p_cstr_index
-					)
-{
-	opj_t2_v2_t * l_t2;
-
-	l_t2 = t2_create_v2(p_tcd->image, p_tcd->cp);
-	if (l_t2 == 00) {
-		return OPJ_FALSE;
-	}
-
-	if (! t2_decode_packets_v2(
-					l_t2,
-					p_tcd->tcd_tileno,
-					p_tcd->tcd_image->tiles,
-					p_src_data,
-					p_data_read,
-					p_max_src_size,
-					p_cstr_index)) {
-		t2_destroy_v2(l_t2);
-		return OPJ_FALSE;
-	}
-
-	t2_destroy_v2(l_t2);
-
-	/*---------------CLEAN-------------------*/
-	return OPJ_TRUE;
-}
-
-opj_bool tcd_t1_decode ( opj_tcd_v2_t *p_tcd )
-{
-	OPJ_UINT32 compno;
-	opj_t1_t * l_t1;
-	opj_tcd_tile_v2_t * l_tile = p_tcd->tcd_image->tiles;
-	opj_tcd_tilecomp_v2_t* l_tile_comp = l_tile->comps;
-	opj_tccp_t * l_tccp = p_tcd->tcp->tccps;
-
-
-	l_t1 = t1_create_v2();
-	if (l_t1 == 00) {
-		return OPJ_FALSE;
-	}
-
-	for (compno = 0; compno < l_tile->numcomps; ++compno) {
-		/* The +3 is headroom required by the vectorized DWT */
-		t1_decode_cblks_v2(l_t1, l_tile_comp, l_tccp);
-		++l_tile_comp;
-		++l_tccp;
-	}
-
-	t1_destroy_v2(l_t1);
-
-	return OPJ_TRUE;
-}
-
-
-opj_bool tcd_dwt_decode ( opj_tcd_v2_t *p_tcd )
-{
-	OPJ_UINT32 compno;
-	opj_tcd_tile_v2_t * l_tile = p_tcd->tcd_image->tiles;
-	opj_tcd_tilecomp_v2_t * l_tile_comp = l_tile->comps;
-	opj_tccp_t * l_tccp = p_tcd->tcp->tccps;
-	opj_image_comp_t * l_img_comp = p_tcd->image->comps;
-
-	for (compno = 0; compno < l_tile->numcomps; compno++) {
-		/*
-		if (tcd->cp->reduce != 0) {
-			tcd->image->comps[compno].resno_decoded =
-				tile->comps[compno].numresolutions - tcd->cp->reduce - 1;
-			if (tcd->image->comps[compno].resno_decoded < 0)
-			{
-				return false;
-			}
-		}
-		numres2decode = tcd->image->comps[compno].resno_decoded + 1;
-		if(numres2decode > 0){
-		*/
-
-		if (l_tccp->qmfbid == 1) {
-			if (! dwt_decode_v2(l_tile_comp, l_img_comp->resno_decoded+1)) {
-				return OPJ_FALSE;
-			}
-		}
-		else {
-			if (! dwt_decode_real_v2(l_tile_comp, l_img_comp->resno_decoded+1)) {
-				return OPJ_FALSE;
-			}
-		}
-
-		++l_tile_comp;
-		++l_img_comp;
-		++l_tccp;
-	}
-
-	return OPJ_TRUE;
-}
-opj_bool tcd_mct_decode ( opj_tcd_v2_t *p_tcd )
-{
-	opj_tcd_tile_v2_t * l_tile = p_tcd->tcd_image->tiles;
-	opj_tcp_v2_t * l_tcp = p_tcd->tcp;
-	opj_tcd_tilecomp_v2_t * l_tile_comp = l_tile->comps;
-	OPJ_UINT32 l_samples,i;
-
-	if (! l_tcp->mct) {
-		return OPJ_TRUE;
-	}
-
-	l_samples = (l_tile_comp->x1 - l_tile_comp->x0) * (l_tile_comp->y1 - l_tile_comp->y0);
-
-	if (l_tile->numcomps >= 3 ){
-		if (l_tcp->mct == 2) {
-			OPJ_BYTE ** l_data;
-
-			if (! l_tcp->m_mct_decoding_matrix) {
-				return OPJ_TRUE;
-			}
-
-			l_data = (OPJ_BYTE **) opj_malloc(l_tile->numcomps*sizeof(OPJ_BYTE*));
-			if (! l_data) {
-				return OPJ_FALSE;
-			}
-
-			for (i=0;i<l_tile->numcomps;++i) {
-				l_data[i] = (OPJ_BYTE*) l_tile_comp->data;
-				++l_tile_comp;
-			}
-
-			if (! mct_decode_custom(// MCT data
-									(OPJ_BYTE*) l_tcp->m_mct_decoding_matrix,
-									// size of components
-									l_samples,
-									// components
-									l_data,
-									// nb of components (i.e. size of pData)
-									l_tile->numcomps,
-									// tells if the data is signed
-									p_tcd->image->comps->sgnd)) {
-				opj_free(l_data);
-				return OPJ_FALSE;
-			}
-
-			opj_free(l_data);
-		}
-		else {
-			if (l_tcp->tccps->qmfbid == 1) {
-				mct_decode(	l_tile->comps[0].data,
-							l_tile->comps[1].data,
-							l_tile->comps[2].data,
-							l_samples);
-			}
-			else {
-				mct_decode_real(	(float*)l_tile->comps[0].data,
-									(float*)l_tile->comps[1].data,
-									(float*)l_tile->comps[2].data,
-									l_samples);
-			}
-		}
-	}
-	else {
-		/* FIXME need to use opj_event_msg_v2 function */
-		fprintf(stderr,"Number of components (%d) is inconsistent with a MCT. Skip the MCT step.\n",l_tile->numcomps);
-	}
-
-	return OPJ_TRUE;
-}
-
-
-opj_bool tcd_dc_level_shift_decode ( opj_tcd_v2_t *p_tcd )
-{
-	OPJ_UINT32 compno;
-	opj_tcd_tilecomp_v2_t * l_tile_comp = 00;
-	opj_tccp_t * l_tccp = 00;
-	opj_image_comp_t * l_img_comp = 00;
-	opj_tcd_resolution_v2_t* l_res = 00;
-	opj_tcp_v2_t * l_tcp = 00;
-	opj_tcd_tile_v2_t * l_tile;
-	OPJ_UINT32 l_width,l_height,i,j;
-	OPJ_INT32 * l_current_ptr;
-	OPJ_INT32 l_min, l_max;
-	OPJ_UINT32 l_stride;
-
-	l_tile = p_tcd->tcd_image->tiles;
-	l_tile_comp = l_tile->comps;
-	l_tcp = p_tcd->tcp;
-	l_tccp = p_tcd->tcp->tccps;
-	l_img_comp = p_tcd->image->comps;
-
-	for (compno = 0; compno < l_tile->numcomps; compno++) {
-		l_res = l_tile_comp->resolutions + l_img_comp->resno_decoded;
-		l_width = (l_res->x1 - l_res->x0);
-		l_height = (l_res->y1 - l_res->y0);
-		l_stride = (l_tile_comp->x1 - l_tile_comp->x0) - l_width;
-
-		if (l_img_comp->sgnd) {
-			l_min = -(1 << (l_img_comp->prec - 1));
-			l_max = (1 << (l_img_comp->prec - 1)) - 1;
-		}
-		else {
-            l_min = 0;
-			l_max = (1 << l_img_comp->prec) - 1;
-		}
-
-		l_current_ptr = l_tile_comp->data;
-
-		if (l_tccp->qmfbid == 1) {
-			for (j=0;j<l_height;++j) {
-				for (i = 0; i < l_width; ++i) {
-					*l_current_ptr = int_clamp(*l_current_ptr + l_tccp->m_dc_level_shift, l_min, l_max);
-					++l_current_ptr;
-				}
-				l_current_ptr += l_stride;
-			}
-		}
-		else {
-			for (j=0;j<l_height;++j) {
-				for (i = 0; i < l_width; ++i) {
-					OPJ_FLOAT32 l_value = *((OPJ_FLOAT32 *) l_current_ptr);
-					*l_current_ptr = int_clamp(lrintf(l_value) + l_tccp->m_dc_level_shift, l_min, l_max); ;
-					++l_current_ptr;
-				}
-				l_current_ptr += l_stride;
-			}
-		}
-
-		++l_img_comp;
-		++l_tccp;
-		++l_tile_comp;
-	}
-
-	return OPJ_TRUE;
-}
-
-
-
-/**
- * Deallocates the encoding data of the given precinct.
- */
-void tcd_code_block_dec_deallocate (opj_tcd_precinct_v2_t * p_precinct)
-{
-	OPJ_UINT32 cblkno , l_nb_code_blocks;
-
-	opj_tcd_cblk_dec_v2_t * l_code_block = p_precinct->cblks.dec;
-	if (l_code_block) {
-		/*fprintf(stderr,"deallocate codeblock:{\n");*/
-		/*fprintf(stderr,"\t x0=%d, y0=%d, x1=%d, y1=%d\n",l_code_block->x0, l_code_block->y0, l_code_block->x1, l_code_block->y1);*/
-		/*fprintf(stderr,"\t numbps=%d, numlenbits=%d, len=%d, numnewpasses=%d, real_num_segs=%d, m_current_max_segs=%d\n ",
-				l_code_block->numbps, l_code_block->numlenbits, l_code_block->len, l_code_block->numnewpasses, l_code_block->real_num_segs, l_code_block->m_current_max_segs );*/
-
-
-		l_nb_code_blocks = p_precinct->block_size / sizeof(opj_tcd_cblk_dec_v2_t);
-		/*fprintf(stderr,"nb_code_blocks =%d\t}\n", l_nb_code_blocks);*/
-
-		for (cblkno = 0; cblkno < l_nb_code_blocks; ++cblkno) {
-
-			if (l_code_block->data) {
-				opj_free(l_code_block->data);
-				l_code_block->data = 00;
-			}
-
-			if (l_code_block->segs) {
-				opj_free(l_code_block->segs );
-				l_code_block->segs = 00;
-			}
-
-			++l_code_block;
-		}
-
-		opj_free(p_precinct->cblks.dec);
-		p_precinct->cblks.dec = 00;
-	}
-}
-
-
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/tcd.h b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/tcd.h
deleted file mode 100644
index 5e65a0371507b459c3a503ff2e88ac57f670eb01..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/tcd.h
+++ /dev/null
@@ -1,504 +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.
- */
-#ifndef __TCD_H
-#define __TCD_H
-/**
-@file tcd.h
-@brief Implementation of a tile coder/decoder (TCD)
-
-The functions in TCD.C have for goal to encode or decode each tile independently from
-each other. The functions in TCD.C are used by some function in J2K.C.
-*/
-
-/** @defgroup TCD TCD - Implementation of a tile coder/decoder */
-/*@{*/
-
-/**
-FIXME: documentation
-*/
-//typedef struct opj_tcd_seg {
-//  unsigned char** data;
-//  int dataindex;
-//  int numpasses;
-//  int len;
-//  int maxpasses;
-//  int numnewpasses;
-//  int newlen;
-//} opj_tcd_seg_t;
-
-/**
-FIXME: documentation
-*/
-typedef struct opj_tcd_seg {
-	OPJ_BYTE ** data;
-	OPJ_UINT32 dataindex;
-	OPJ_UINT32 numpasses;
-	OPJ_UINT32 real_num_passes;
-	OPJ_UINT32 len;
-	OPJ_UINT32 maxpasses;
-	OPJ_UINT32 numnewpasses;
-	OPJ_UINT32 newlen;
-} opj_tcd_seg_t;
-
-/**
-FIXME: documentation
-*/
-typedef struct opj_tcd_pass {
-  int rate;
-  double distortiondec;
-  int term, len;
-} opj_tcd_pass_t;
-
-typedef struct opj_tcd_pass_v2 {
-	OPJ_UINT32 rate;
-	OPJ_FLOAT64 distortiondec;
-	OPJ_UINT32 len;
-	OPJ_UINT32 term : 1;
-} opj_tcd_pass_v2_t;
-
-/**
-FIXME: documentation
-*/
-typedef struct opj_tcd_layer {
-	OPJ_UINT32 numpasses;		/* Number of passes in the layer */
-	OPJ_UINT32 len;				/* len of information */
-	OPJ_FLOAT64 disto;			/* add for index (Cfr. Marcela) */
-	OPJ_BYTE *data;				/* data */
-} opj_tcd_layer_t;
-
-/**
-FIXME: documentation
-*/
-typedef struct opj_tcd_cblk_enc {
-  unsigned char* data;	/* Data */
-  opj_tcd_layer_t* layers;	/* layer information */
-  opj_tcd_pass_t* passes;	/* information about the passes */
-  int x0, y0, x1, y1;		/* dimension of the code-blocks : left upper corner (x0, y0) right low corner (x1,y1) */
-  int numbps;
-  int numlenbits;
-  int numpasses;		/* number of pass already done for the code-blocks */
-  int numpassesinlayers;	/* number of passes in the layer */
-  int totalpasses;		/* total number of passes */
-} opj_tcd_cblk_enc_t;
-
-/**
-FIXME: documentation
-*/
-typedef struct opj_tcd_cblk_enc_v2 {
-	OPJ_BYTE* data;					/* Data */
-	opj_tcd_layer_t* layers;		/* layer information */
-	opj_tcd_pass_v2_t* passes;		/* information about the passes */
-	OPJ_INT32 x0, y0, x1, y1;		/* dimension of the code-blocks : left upper corner (x0, y0) right low corner (x1,y1) */
-	OPJ_UINT32 numbps;
-	OPJ_UINT32 numlenbits;
-	OPJ_UINT32 numpasses;			/* number of pass already done for the code-blocks */
-	OPJ_UINT32 numpassesinlayers;	/* number of passes in the layer */
-	OPJ_UINT32 totalpasses;			/* total number of passes */
-} opj_tcd_cblk_enc_v2_t;
-
-typedef struct opj_tcd_cblk_dec {
-  unsigned char* data;	/* Data */
-  opj_tcd_seg_t* segs;		/* segments informations */
-	int x0, y0, x1, y1;		/* dimension of the code-blocks : left upper corner (x0, y0) right low corner (x1,y1) */
-  int numbps;
-  int numlenbits;
-  int len;			/* length */
-  int numnewpasses;		/* number of pass added to the code-blocks */
-  int numsegs;			/* number of segments */
-} opj_tcd_cblk_dec_t;
-
-
-typedef struct opj_tcd_cblk_dec_v2 {
-	OPJ_BYTE * data;				/* Data */
-	opj_tcd_seg_t* segs;			/* segments informations */
-	OPJ_INT32 x0, y0, x1, y1;		/* dimension of the code-blocks : left upper corner (x0, y0) right low corner (x1,y1) */
-	OPJ_UINT32 numbps;
-	OPJ_UINT32 numlenbits;
-	OPJ_UINT32 len;					/* length */
-	OPJ_UINT32 numnewpasses;		/* number of pass added to the code-blocks */
-	OPJ_UINT32 numsegs;				/* number of segments */
-	OPJ_UINT32 real_num_segs;
-	OPJ_UINT32 m_current_max_segs;
-} opj_tcd_cblk_dec_v2_t;
-
-/**
-FIXME: documentation
-*/
-typedef struct opj_tcd_precinct {
-  int x0, y0, x1, y1;		/* dimension of the precinct : left upper corner (x0, y0) right low corner (x1,y1) */
-  int cw, ch;			/* number of precinct in width and heigth */
-  union{		/* code-blocks informations */
-	  opj_tcd_cblk_enc_t* enc;
-	  opj_tcd_cblk_dec_t* dec;
-  } cblks;
-  opj_tgt_tree_t *incltree;		/* inclusion tree */
-  opj_tgt_tree_t *imsbtree;		/* IMSB tree */
-} opj_tcd_precinct_t;
-
-
-typedef struct opj_tcd_precinct_v2 {
-	OPJ_INT32 x0, y0, x1, y1;		/* dimension of the precinct : left upper corner (x0, y0) right low corner (x1,y1) */
-	OPJ_UINT32 cw, ch;				/* number of precinct in width and heigth */
-	union{							/* code-blocks informations */
-		opj_tcd_cblk_enc_v2_t* enc;
-		opj_tcd_cblk_dec_v2_t* dec;
-	} cblks;
-	OPJ_UINT32 block_size;			/* size taken by cblks (in bytes) */
-	opj_tgt_tree_t *incltree;	/* inclusion tree */
-	opj_tgt_tree_t *imsbtree;	/* IMSB tree */
-} opj_tcd_precinct_v2_t;
-
-/**
-FIXME: documentation
-*/
-typedef struct opj_tcd_band {
-  int x0, y0, x1, y1;		/* dimension of the subband : left upper corner (x0, y0) right low corner (x1,y1) */
-  int bandno;
-  opj_tcd_precinct_t *precincts;	/* precinct information */
-  int numbps;
-  float stepsize;
-} opj_tcd_band_t;
-
-typedef struct opj_tcd_band_v2 {
-	OPJ_INT32 x0, y0, x1, y1;		/* dimension of the subband : left upper corner (x0, y0) right low corner (x1,y1) */
-	OPJ_UINT32 bandno;
-	opj_tcd_precinct_v2_t *precincts;	/* precinct information */
-	OPJ_UINT32 precincts_data_size;	/* size of data taken by precincts */
-	OPJ_INT32 numbps;
-	OPJ_FLOAT32 stepsize;
-} opj_tcd_band_v2_t;
-
-/**
-FIXME: documentation
-*/
-typedef struct opj_tcd_resolution {
-  int x0, y0, x1, y1;		/* dimension of the resolution level : left upper corner (x0, y0) right low corner (x1,y1) */
-  int pw, ph;
-  int numbands;			/* number sub-band for the resolution level */
-  opj_tcd_band_t bands[3];		/* subband information */
-} opj_tcd_resolution_t;
-
-typedef struct opj_tcd_resolution_v2 {
-	OPJ_INT32 x0, y0, x1, y1;		/* dimension of the resolution level : left upper corner (x0, y0) right low corner (x1,y1) */
-	OPJ_UINT32 pw, ph;
-	OPJ_UINT32 numbands;			/* number sub-band for the resolution level */
-	opj_tcd_band_v2_t bands[3];		/* subband information */
-} opj_tcd_resolution_v2_t;
-
-/**
-FIXME: documentation
-*/
-typedef struct opj_tcd_tilecomp {
-  int x0, y0, x1, y1;		/* dimension of component : left upper corner (x0, y0) right low corner (x1,y1) */
-  int numresolutions;		/* number of resolutions level */
-  opj_tcd_resolution_t *resolutions;	/* resolutions information */
-  int *data;			/* data of the component */
-  int numpix;			/* add fixed_quality */
-} opj_tcd_tilecomp_t;
-
-typedef struct opj_tcd_tilecomp_v2
-{
-	OPJ_INT32 x0, y0, x1, y1;				/* dimension of component : left upper corner (x0, y0) right low corner (x1,y1) */
-	OPJ_UINT32 numresolutions;				/* number of resolutions level */
-	OPJ_UINT32 minimum_num_resolutions;		/* number of resolutions level to decode (at max)*/
-	opj_tcd_resolution_v2_t *resolutions;	/* resolutions information */
-	OPJ_UINT32 resolutions_size;			/* size of data for resolutions (in bytes) */
-	OPJ_INT32 *data;						/* data of the component */
-	OPJ_UINT32 data_size;					/* size of the data of the component */
-	OPJ_INT32 numpix;						/* add fixed_quality */
-} opj_tcd_tilecomp_v2_t;
-
-
-/**
-FIXME: documentation
-*/
-typedef struct opj_tcd_tile {
-  int x0, y0, x1, y1;		/* dimension of the tile : left upper corner (x0, y0) right low corner (x1,y1) */
-  int numcomps;			/* number of components in tile */
-  opj_tcd_tilecomp_t *comps;	/* Components information */
-  int numpix;			/* add fixed_quality */
-  double distotile;		/* add fixed_quality */
-  double distolayer[100];	/* add fixed_quality */
-  /** packet number */
-  int packno;
-} opj_tcd_tile_t;
-
-typedef struct opj_tcd_tile_v2 {
-	OPJ_INT32 x0, y0, x1, y1;		/* dimension of the tile : left upper corner (x0, y0) right low corner (x1,y1) */
-	OPJ_UINT32 numcomps;			/* number of components in tile */
-	opj_tcd_tilecomp_v2_t *comps;	/* Components information */
-	OPJ_INT32 numpix;				/* add fixed_quality */
-	OPJ_FLOAT64 distotile;			/* add fixed_quality */
-	OPJ_FLOAT64 distolayer[100];	/* add fixed_quality */
-	/** packet number */
-	OPJ_UINT32 packno;
-} opj_tcd_tile_v2_t;
-
-/**
-FIXME: documentation
-*/
-typedef struct opj_tcd_image {
-  int tw, th;			/* number of tiles in width and heigth */
-  opj_tcd_tile_t *tiles;		/* Tiles information */
-} opj_tcd_image_t;
-
-typedef struct opj_tcd_image_v2
-{
-	opj_tcd_tile_v2_t *tiles;		/* Tiles information */
-}
-opj_tcd_image_v2_t;
-
-/**
-Tile coder/decoder
-*/
-typedef struct opj_tcd {
-	/** Position of the tilepart flag in Progression order*/
-	int tp_pos;
-	/** Tile part number*/
-	int tp_num;
-	/** Current tile part number*/
-	int cur_tp_num;
-	/** Total number of tileparts of the current tile*/
-	int cur_totnum_tp;
-	/** Current Packet iterator number */
-	int cur_pino;
-	/** codec context */
-	opj_common_ptr cinfo;
-
-	/** info on each image tile */
-	opj_tcd_image_t *tcd_image;
-	/** image */
-	opj_image_t *image;
-	/** coding parameters */
-	opj_cp_t *cp;
-	/** pointer to the current encoded/decoded tile */
-	opj_tcd_tile_t *tcd_tile;
-	/** coding/decoding parameters common to all tiles */
-	opj_tcp_t *tcp;
-	/** current encoded/decoded tile */
-	int tcd_tileno;
-	/** Time taken to encode a tile*/
-	double encoding_time;
-} opj_tcd_t;
-
-
-struct opj_image;
-struct opj_cp_v2;
-struct opj_tcp_v2;
-/**
-Tile coder/decoder
-*/
-typedef struct opj_tcd_v2
-{
-	/** Position of the tilepart flag in Progression order*/
-	OPJ_INT32 tp_pos;
-	/** Tile part number*/
-	OPJ_UINT32 tp_num;
-	/** Current tile part number*/
-	OPJ_UINT32 cur_tp_num;
-	/** Total number of tileparts of the current tile*/
-	OPJ_UINT32 cur_totnum_tp;
-	/** Current Packet iterator number */
-	OPJ_UINT32 cur_pino;
-	/** info on each image tile */
-	opj_tcd_image_v2_t *tcd_image;
-	/** image header */
-	opj_image_t *image;
-	/** coding parameters */
-	struct opj_cp_v2 *cp;
-	/** coding/decoding parameters common to all tiles */
-	struct opj_tcp_v2 *tcp;
-	/** current encoded/decoded tile */
-	OPJ_UINT32 tcd_tileno;
-	/** tell if the tcd is a decoder. */
-	OPJ_UINT32 m_is_decoder : 1;
-} opj_tcd_v2_t;
-
-/** @name Exported functions */
-/*@{*/
-/* ----------------------------------------------------------------------- */
-
-/**
-Dump the content of a tcd structure
-*/
-void tcd_dump(FILE *fd, opj_tcd_t *tcd, opj_tcd_image_t *img);
-/**
-Create a new TCD handle
-@param cinfo Codec context info
-@return Returns a new TCD handle if successful returns NULL otherwise
-*/
-opj_tcd_t* tcd_create(opj_common_ptr cinfo);
-
-/**
-Create a new TCD handle
-@param FIXME
-@return Returns a new TCD handle if successful returns NULL otherwise
-*/
-opj_tcd_v2_t* tcd_create_v2(opj_bool p_is_decoder);
-
-/**
-Destroy a previously created TCD handle
-@param tcd TCD handle to destroy
-*/
-void tcd_destroy_v2(opj_tcd_v2_t *tcd);
-
-/**
- * Initialize the tile coder and may reuse some meory.
- * @param	p_tcd		TCD handle.
- * @param	p_image		raw image.
- * @param	p_cp		coding parameters.
- * @param	p_tile_no	current tile index to encode.
- *
- * @return true if the encoding values could be set (false otherwise).
-*/
-opj_bool tcd_init_v2(	opj_tcd_v2_t *p_tcd,
-						opj_image_t * p_image,
-						opj_cp_v2_t * p_cp
-					);
-
-/**
- * Allocates memory for decoding a specific tile.
- *
- * @param	p_tcd		the tile decoder.
- * @param	p_image		the image to decode.
- * @param	p_cp		the decoding parameters.
- * @param	p_tile_no	the index of the tile received in sequence. This not necesseraly lead to the
- * tile at index p_tile_no.
- * @param	p_cstr_info	codestream info (if any).
- *
- * @return	true if the remaining data is sufficient.s
- */
-opj_bool tcd_init_decode_tile(
-							opj_tcd_v2_t *p_tcd,
-							OPJ_UINT32 p_tile_no
-							);
-
-/**
-Destroy a previously created TCD handle
-@param tcd TCD handle to destroy
-*/
-void tcd_destroy(opj_tcd_t *tcd);
-/**
-Initialize the tile coder (allocate the memory)
-@param tcd TCD handle
-@param image Raw image
-@param cp Coding parameters
-@param curtileno Number that identifies the tile that will be encoded
-*/
-void tcd_malloc_encode(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp, int curtileno);
-/**
-Free the memory allocated for encoding
-@param tcd TCD handle
-*/
-void tcd_free_encode(opj_tcd_t *tcd);
-/**
-Initialize the tile coder (reuses the memory allocated by tcd_malloc_encode)
-@param tcd TCD handle
-@param image Raw image
-@param cp Coding parameters
-@param curtileno Number that identifies the tile that will be encoded
-*/
-void tcd_init_encode(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp, int curtileno);
-/**
-Initialize the tile decoder
-@param tcd TCD handle
-@param image Raw image
-@param cp Coding parameters
-*/
-void tcd_malloc_decode(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp);
-void tcd_malloc_decode_tile(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp, int tileno, opj_codestream_info_t *cstr_info);
-void tcd_makelayer_fixed(opj_tcd_t *tcd, int layno, int final);
-void tcd_rateallocate_fixed(opj_tcd_t *tcd);
-void tcd_makelayer(opj_tcd_t *tcd, int layno, double thresh, int final);
-opj_bool tcd_rateallocate(opj_tcd_t *tcd, unsigned char *dest, int len, opj_codestream_info_t *cstr_info);
-/**
-Encode a tile from the raw image into a buffer
-@param tcd TCD handle
-@param tileno Number that identifies one of the tiles to be encoded
-@param dest Destination buffer
-@param len Length of destination buffer
-@param cstr_info Codestream information structure 
-@return 
-*/
-int tcd_encode_tile(opj_tcd_t *tcd, int tileno, unsigned char *dest, int len, opj_codestream_info_t *cstr_info);
-/**
-Decode a tile from a buffer into a raw image
-@param tcd TCD handle
-@param src Source buffer
-@param len Length of source buffer
-@param tileno Number that identifies one of the tiles to be decoded
-@param cstr_info Codestream information structure
-*/
-opj_bool tcd_decode_tile(opj_tcd_t *tcd, unsigned char *src, int len, int tileno, opj_codestream_info_t *cstr_info);
-/**
-Free the memory allocated for decoding
-@param tcd TCD handle
-*/
-void tcd_free_decode(opj_tcd_t *tcd);
-void tcd_free_decode_tile(opj_tcd_t *tcd, int tileno);
-
-
-/**
- * Gets the maximum tile size that will be taken by the tile once decoded.
- */
-OPJ_UINT32 tcd_get_decoded_tile_size (
-						 opj_tcd_v2_t *p_tcd
-						 );
-
-/**
-Decode a tile from a buffer into a raw image
-@param tcd TCD handle
-@param src Source buffer
-@param len Length of source buffer
-@param tileno Number that identifies one of the tiles to be decoded
-*/
-opj_bool tcd_decode_tile_v2(opj_tcd_v2_t *tcd,
-							OPJ_BYTE *src,
-							OPJ_UINT32 len,
-							OPJ_UINT32 tileno,
-							opj_codestream_index_t *cstr_info);
-
-
-/**
- * Copies tile data from the system onto the given memory block.
- */
-opj_bool tcd_update_tile_data (
-						 opj_tcd_v2_t *p_tcd,
-						 OPJ_BYTE * p_dest,
-						 OPJ_UINT32 p_dest_length
-						 );
-
-/* ----------------------------------------------------------------------- */
-/*@}*/
-
-/*@}*/
-
-#endif /* __TCD_H */
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/tgt.c b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/tgt.c
deleted file mode 100644
index a663e85f568da409947a7f45876193ece75f05ea..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/tgt.c
+++ /dev/null
@@ -1,431 +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 "opj_includes.h"
-
-/* 
-==========================================================
-   Tag-tree coder interface
-==========================================================
-*/
-
-opj_tgt_tree_t *tgt_create(int numleafsh, int numleafsv) {
-	int nplh[32];
-	int nplv[32];
-	opj_tgt_node_t *node = NULL;
-	opj_tgt_node_t *parentnode = NULL;
-	opj_tgt_node_t *parentnode0 = NULL;
-	opj_tgt_tree_t *tree = NULL;
-	int i, j, k;
-	int numlvls;
-	int n;
-
-	tree = (opj_tgt_tree_t *) opj_malloc(sizeof(opj_tgt_tree_t));
-	if(!tree) return NULL;
-	tree->numleafsh = numleafsh;
-	tree->numleafsv = numleafsv;
-
-	numlvls = 0;
-	nplh[0] = numleafsh;
-	nplv[0] = numleafsv;
-	tree->numnodes = 0;
-	do {
-		n = nplh[numlvls] * nplv[numlvls];
-		nplh[numlvls + 1] = (nplh[numlvls] + 1) / 2;
-		nplv[numlvls + 1] = (nplv[numlvls] + 1) / 2;
-		tree->numnodes += n;
-		++numlvls;
-	} while (n > 1);
-	
-	/* ADD */
-	if (tree->numnodes == 0) {
-		opj_free(tree);
-		return NULL;
-	}
-
-	tree->nodes = (opj_tgt_node_t*) opj_calloc(tree->numnodes, sizeof(opj_tgt_node_t));
-	if(!tree->nodes) {
-		opj_free(tree);
-		return NULL;
-	}
-
-	node = tree->nodes;
-	parentnode = &tree->nodes[tree->numleafsh * tree->numleafsv];
-	parentnode0 = parentnode;
-	
-	for (i = 0; i < numlvls - 1; ++i) {
-		for (j = 0; j < nplv[i]; ++j) {
-			k = nplh[i];
-			while (--k >= 0) {
-				node->parent = parentnode;
-				++node;
-				if (--k >= 0) {
-					node->parent = parentnode;
-					++node;
-				}
-				++parentnode;
-			}
-			if ((j & 1) || j == nplv[i] - 1) {
-				parentnode0 = parentnode;
-			} else {
-				parentnode = parentnode0;
-				parentnode0 += nplh[i];
-			}
-		}
-	}
-	node->parent = 0;
-	
-	tgt_reset(tree);
-	
-	return tree;
-}
-
-opj_tgt_tree_t *tgt_create_v2(OPJ_UINT32 numleafsh, OPJ_UINT32 numleafsv) {
-	OPJ_INT32 nplh[32];
-	OPJ_INT32 nplv[32];
-	opj_tgt_node_t *node = 00;
-	opj_tgt_node_t *l_parent_node = 00;
-	opj_tgt_node_t *l_parent_node0 = 00;
-	opj_tgt_tree_t *tree = 00;
-	OPJ_UINT32 i;
-	OPJ_INT32  j,k;
-	OPJ_UINT32 numlvls;
-	OPJ_UINT32 n;
-
-	tree = (opj_tgt_tree_t *) opj_malloc(sizeof(opj_tgt_tree_t));
-	if(!tree) {
-		fprintf(stderr, "ERROR in tgt_create_v2 while allocating tree\n");
-		return 00;
-	}
-	memset(tree,0,sizeof(opj_tgt_tree_t));
-
-	tree->numleafsh = numleafsh;
-	tree->numleafsv = numleafsv;
-
-	numlvls = 0;
-	nplh[0] = numleafsh;
-	nplv[0] = numleafsv;
-	tree->numnodes = 0;
-	do {
-		n = nplh[numlvls] * nplv[numlvls];
-		nplh[numlvls + 1] = (nplh[numlvls] + 1) / 2;
-		nplv[numlvls + 1] = (nplv[numlvls] + 1) / 2;
-		tree->numnodes += n;
-		++numlvls;
-	} while (n > 1);
-
-	/* ADD */
-	if (tree->numnodes == 0) {
-		opj_free(tree);
-		fprintf(stderr, "WARNING in tgt_create_v2 tree->numnodes == 0, no tree created.\n");
-		return 00;
-	}
-
-	tree->nodes = (opj_tgt_node_t*) opj_calloc(tree->numnodes, sizeof(opj_tgt_node_t));
-	if(!tree->nodes) {
-		fprintf(stderr, "ERROR in tgt_create_v2 while allocating node of the tree\n");
-		opj_free(tree);
-		return 00;
-	}
-	memset(tree->nodes,0,tree->numnodes * sizeof(opj_tgt_node_t));
-	tree->nodes_size = tree->numnodes * sizeof(opj_tgt_node_t);
-
-	node = tree->nodes;
-	l_parent_node = &tree->nodes[tree->numleafsh * tree->numleafsv];
-	l_parent_node0 = l_parent_node;
-
-	for (i = 0; i < numlvls - 1; ++i) {
-		for (j = 0; j < nplv[i]; ++j) {
-			k = nplh[i];
-			while (--k >= 0) {
-				node->parent = l_parent_node;
-				++node;
-				if (--k >= 0) {
-					node->parent = l_parent_node;
-					++node;
-				}
-				++l_parent_node;
-			}
-			if ((j & 1) || j == nplv[i] - 1) {
-				l_parent_node0 = l_parent_node;
-			} else {
-				l_parent_node = l_parent_node0;
-				l_parent_node0 += nplh[i];
-			}
-		}
-	}
-	node->parent = 0;
-	tgt_reset(tree);
-	return tree;
-}
-
-/**
- * Reinitialises a tag-tree from an exixting one. (V2 framevork)
- *
- * @param	p_tree				the tree to reinitialize.
- * @param	p_num_leafs_h		the width of the array of leafs of the tree
- * @param	p_num_leafs_v		the height of the array of leafs of the tree
- * @return	a new tag-tree if successful, NULL otherwise
-*/
-opj_tgt_tree_t *tgt_init(opj_tgt_tree_t * p_tree,OPJ_UINT32 p_num_leafs_h, OPJ_UINT32 p_num_leafs_v)
-{
-	OPJ_INT32 l_nplh[32];
-	OPJ_INT32 l_nplv[32];
-	opj_tgt_node_t *l_node = 00;
-	opj_tgt_node_t *l_parent_node = 00;
-	opj_tgt_node_t *l_parent_node0 = 00;
-	OPJ_UINT32 i;
-	OPJ_INT32 j,k;
-	OPJ_UINT32 l_num_levels;
-	OPJ_UINT32 n;
-	OPJ_UINT32 l_node_size;
-
-	if
-		(! p_tree)
-	{
-		return 00;
-	}
-	if
-		((p_tree->numleafsh != p_num_leafs_h) || (p_tree->numleafsv != p_num_leafs_v))
-	{
-		p_tree->numleafsh = p_num_leafs_h;
-		p_tree->numleafsv = p_num_leafs_v;
-
-		l_num_levels = 0;
-		l_nplh[0] = p_num_leafs_h;
-		l_nplv[0] = p_num_leafs_v;
-		p_tree->numnodes = 0;
-		do
-		{
-			n = l_nplh[l_num_levels] * l_nplv[l_num_levels];
-			l_nplh[l_num_levels + 1] = (l_nplh[l_num_levels] + 1) / 2;
-			l_nplv[l_num_levels + 1] = (l_nplv[l_num_levels] + 1) / 2;
-			p_tree->numnodes += n;
-			++l_num_levels;
-		}
-		while (n > 1);
-
-		/* ADD */
-		if
-			(p_tree->numnodes == 0)
-		{
-			tgt_destroy(p_tree);
-            return 00;
-		}
-		l_node_size = p_tree->numnodes * sizeof(opj_tgt_node_t);
-		if
-			(l_node_size > p_tree->nodes_size)
-		{
-			p_tree->nodes = (opj_tgt_node_t*) opj_realloc(p_tree->nodes, l_node_size);
-			if
-				(! p_tree->nodes)
-			{
-				tgt_destroy(p_tree);
-				return 00;
-			}
-			memset(((char *) p_tree->nodes) + p_tree->nodes_size, 0 , l_node_size - p_tree->nodes_size);
-			p_tree->nodes_size = l_node_size;
-		}
-		l_node = p_tree->nodes;
-		l_parent_node = &p_tree->nodes[p_tree->numleafsh * p_tree->numleafsv];
-		l_parent_node0 = l_parent_node;
-
-		for
-			(i = 0; i < l_num_levels - 1; ++i)
-		{
-			for
-				(j = 0; j < l_nplv[i]; ++j)
-			{
-				k = l_nplh[i];
-				while
-					(--k >= 0)
-				{
-					l_node->parent = l_parent_node;
-					++l_node;
-					if (--k >= 0)
-					{
-						l_node->parent = l_parent_node;
-						++l_node;
-					}
-					++l_parent_node;
-				}
-				if ((j & 1) || j == l_nplv[i] - 1)
-				{
-					l_parent_node0 = l_parent_node;
-				}
-				else
-				{
-					l_parent_node = l_parent_node0;
-					l_parent_node0 += l_nplh[i];
-				}
-			}
-		}
-		l_node->parent = 0;
-	}
-	tgt_reset(p_tree);
-
-	return p_tree;
-}
-
-/*void tgt_destroy(opj_tgt_tree_t *tree) {
-	opj_free(tree->nodes);
-	opj_free(tree);
-}*/
-
-void tgt_destroy(opj_tgt_tree_t *p_tree)
-{
-	if (! p_tree) {
-		return;
-	}
-
-	if (p_tree->nodes) {
-		opj_free(p_tree->nodes);
-		p_tree->nodes = 00;
-	}
-	opj_free(p_tree);
-}
-
-/*void tgt_reset(opj_tgt_tree_t *tree) {
-	int i;
-
-	if (NULL == tree)
-		return;
-	
-	for (i = 0; i < tree->numnodes; i++) {
-		tree->nodes[i].value = 999;
-		tree->nodes[i].low = 0;
-		tree->nodes[i].known = 0;
-	}
-}*/
-
-void tgt_reset(opj_tgt_tree_t *p_tree) {
-	OPJ_UINT32 i;
-	opj_tgt_node_t * l_current_node = 00;;
-
-	if (! p_tree) {
-		return;
-	}
-
-	l_current_node = p_tree->nodes;
-	for	(i = 0; i < p_tree->numnodes; ++i)
-	{
-		l_current_node->value = 999;
-		l_current_node->low = 0;
-		l_current_node->known = 0;
-		++l_current_node;
-	}
-}
-
-void tgt_setvalue(opj_tgt_tree_t *tree, OPJ_UINT32 leafno, OPJ_INT32 value) {
-	opj_tgt_node_t *node;
-	node = &tree->nodes[leafno];
-	while (node && node->value > value) {
-		node->value = value;
-		node = node->parent;
-	}
-}
-
-void tgt_encode(opj_bio_t *bio, opj_tgt_tree_t *tree, OPJ_UINT32 leafno, OPJ_INT32 threshold) {
-	opj_tgt_node_t *stk[31];
-	opj_tgt_node_t **stkptr;
-	opj_tgt_node_t *node;
-	OPJ_INT32 low;
-
-	stkptr = stk;
-	node = &tree->nodes[leafno];
-	while (node->parent) {
-		*stkptr++ = node;
-		node = node->parent;
-	}
-	
-	low = 0;
-	for (;;) {
-		if (low > node->low) {
-			node->low = low;
-		} else {
-			low = node->low;
-		}
-		
-		while (low < threshold) {
-			if (low >= node->value) {
-				if (!node->known) {
-					bio_write(bio, 1, 1);
-					node->known = 1;
-				}
-				break;
-			}
-			bio_write(bio, 0, 1);
-			++low;
-		}
-		
-		node->low = low;
-		if (stkptr == stk)
-			break;
-		node = *--stkptr;
-	}
-}
-
-OPJ_UINT32 tgt_decode(opj_bio_t *bio, opj_tgt_tree_t *tree, OPJ_UINT32 leafno, OPJ_INT32 threshold) {
-	opj_tgt_node_t *stk[31];
-	opj_tgt_node_t **stkptr;
-	opj_tgt_node_t *node;
-	OPJ_INT32 low;
-
-	stkptr = stk;
-	node = &tree->nodes[leafno];
-	while (node->parent) {
-		*stkptr++ = node;
-		node = node->parent;
-	}
-	
-	low = 0;
-	for (;;) {
-		if (low > node->low) {
-			node->low = low;
-		} else {
-			low = node->low;
-		}
-		while (low < threshold && low < node->value) {
-			if (bio_read(bio, 1)) {
-				node->value = low;
-			} else {
-				++low;
-			}
-		}
-		node->low = low;
-		if (stkptr == stk) {
-			break;
-		}
-		node = *--stkptr;
-	}
-	
-	return (node->value < threshold) ? 1 : 0;
-}
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/tgt.h b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/tgt.h
deleted file mode 100644
index 9722e50858a5fd5e48592c027c9098d889444756..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/tgt.h
+++ /dev/null
@@ -1,141 +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
- * Copyright (c) 2008, Jerome Fimes, Communications & Systemes <jerome.fimes@c-s.fr>
- * 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 __TGT_H
-#define __TGT_H
-/**
-@file tgt.h
-@brief Implementation of a tag-tree coder (TGT)
-
-The functions in TGT.C have for goal to realize a tag-tree coder. The functions in TGT.C
-are used by some function in T2.C.
-*/
-
-/** @defgroup TGT TGT - Implementation of a tag-tree coder */
-/*@{*/
-
-/**
-Tag node
-*/
-typedef struct opj_tgt_node {
-  struct opj_tgt_node *parent;
-  OPJ_INT32 value;
-  OPJ_INT32 low;
-  OPJ_UINT32 known;
-} opj_tgt_node_t;
-
-///** OPJ_V1
-//Tag tree
-//*/
-//typedef struct opj_tgt_tree {
-//  int numleafsh;
-//  int numleafsv;
-//  int numnodes;
-//  opj_tgt_node_t *nodes;
-//} opj_tgt_tree_t;
-
-/**
-Tag tree
-*/
-typedef struct opj_tgt_tree
-{
-	OPJ_UINT32  numleafsh;
-	OPJ_UINT32  numleafsv;
-	OPJ_UINT32 numnodes;
-	opj_tgt_node_t *nodes;
-	OPJ_UINT32  nodes_size;		/* maximum size taken by nodes */
-} opj_tgt_tree_t;
-
-
-/** @name Exported functions */
-/*@{*/
-/* ----------------------------------------------------------------------- */
-/**
-Create a tag-tree
-@param numleafsh Width of the array of leafs of the tree
-@param numleafsv Height of the array of leafs of the tree
-@return Returns a new tag-tree if successful, returns NULL otherwise
-*/
-opj_tgt_tree_t *tgt_create(int numleafsh, int numleafsv);
-opj_tgt_tree_t *tgt_create_v2(OPJ_UINT32 numleafsh, OPJ_UINT32 numleafsv);
-
-/**
- * Reinitialises a tag-tree from an exixting one.
- *
- * @param	p_tree				the tree to reinitialize.
- * @param	p_num_leafs_h		the width of the array of leafs of the tree
- * @param	p_num_leafs_v		the height of the array of leafs of the tree
- * @return	a new tag-tree if successful, NULL otherwise
-*/
-opj_tgt_tree_t *tgt_init(opj_tgt_tree_t * p_tree, OPJ_UINT32  p_num_leafs_h, OPJ_UINT32  p_num_leafs_v);
-
-
-/**
-Destroy a tag-tree, liberating memory
-@param tree Tag-tree to destroy
-*/
-void tgt_destroy(opj_tgt_tree_t *tree);
-/**
-Reset a tag-tree (set all leaves to 0)
-@param tree Tag-tree to reset
-*/
-void tgt_reset(opj_tgt_tree_t *tree);
-/**
-Set the value of a leaf of a tag-tree
-@param tree Tag-tree to modify
-@param leafno Number that identifies the leaf to modify
-@param value New value of the leaf
-*/
-void tgt_setvalue(opj_tgt_tree_t *tree, OPJ_UINT32 leafno, OPJ_INT32 value);
-/**
-Encode the value of a leaf of the tag-tree up to a given threshold
-@param bio Pointer to a BIO handle
-@param tree Tag-tree to modify
-@param leafno Number that identifies the leaf to encode
-@param threshold Threshold to use when encoding value of the leaf
-*/
-void tgt_encode(opj_bio_t *bio, opj_tgt_tree_t *tree, OPJ_UINT32 leafno, OPJ_INT32 threshold);
-/**
-Decode the value of a leaf of the tag-tree up to a given threshold
-@param bio Pointer to a BIO handle
-@param tree Tag-tree to decode
-@param leafno Number that identifies the leaf to decode
-@param threshold Threshold to use when decoding value of the leaf
-@return Returns 1 if the node's value < threshold, returns 0 otherwise
-*/
-OPJ_UINT32 tgt_decode(opj_bio_t *bio, opj_tgt_tree_t *tree, OPJ_UINT32 leafno, OPJ_INT32 threshold);
-/* ----------------------------------------------------------------------- */
-/*@}*/
-
-/*@}*/
-
-#endif /* __TGT_H */
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/thix_manager.c b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/thix_manager.c
deleted file mode 100644
index e1b8ab1ba5967a2f64acfd098a7ff028824e721b..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/thix_manager.c
+++ /dev/null
@@ -1,118 +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 "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 marknum;
-  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;
-}
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/tpix_manager.c b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/tpix_manager.c
deleted file mode 100644
index 9ae78333bcab85e1e4e163da6b64a42b5e8a2f52..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/libopenjpeg/tpix_manager.c
+++ /dev/null
@@ -1,152 +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 "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;
-}
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/openjpeg_mangle.h.cmake.in b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/openjpeg_mangle.h.cmake.in
deleted file mode 100644
index 6603ab33df53f3fe2ddbd0c340dca6f38c5829be..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/openjpeg_mangle.h.cmake.in
+++ /dev/null
@@ -1,597 +0,0 @@
-/* This is a generated file by openjpeg_dump_symbols.sh *DO NOT EDIT MANUALLY !* */
-#ifndef openjpeg_mangle_h
-#define openjpeg_mangle_h
-
-#cmakedefine OPJ_USE_MANGLE_PREFIX
-
-#ifdef OPJ_USE_MANGLE_PREFIX
-
-#define allocate_buffers                        @OPJ_MANGLE_PREFIX@_allocate_buffers
-#define bio_bytein                              @OPJ_MANGLE_PREFIX@_bio_bytein
-#define bio_byteout                             @OPJ_MANGLE_PREFIX@_bio_byteout
-#define bio_create                              @OPJ_MANGLE_PREFIX@_bio_create
-#define bio_destroy                             @OPJ_MANGLE_PREFIX@_bio_destroy
-#define bio_flush                               @OPJ_MANGLE_PREFIX@_bio_flush
-#define bio_getbit                              @OPJ_MANGLE_PREFIX@_bio_getbit
-#define bio_inalign                             @OPJ_MANGLE_PREFIX@_bio_inalign
-#define bio_init_dec                            @OPJ_MANGLE_PREFIX@_bio_init_dec
-#define bio_init_enc                            @OPJ_MANGLE_PREFIX@_bio_init_enc
-#define bio_numbytes                            @OPJ_MANGLE_PREFIX@_bio_numbytes
-#define bio_putbit                              @OPJ_MANGLE_PREFIX@_bio_putbit
-#define bio_read                                @OPJ_MANGLE_PREFIX@_bio_read
-#define bio_write                               @OPJ_MANGLE_PREFIX@_bio_write
-#define check_EPHuse                            @OPJ_MANGLE_PREFIX@_check_EPHuse
-#define cio_bytein                              @OPJ_MANGLE_PREFIX@_cio_bytein
-#define cio_byteout                             @OPJ_MANGLE_PREFIX@_cio_byteout
-#define cio_getbp                               @OPJ_MANGLE_PREFIX@_cio_getbp
-#define cio_numbytesleft                        @OPJ_MANGLE_PREFIX@_cio_numbytesleft
-#define cio_read                                @OPJ_MANGLE_PREFIX@_cio_read
-#define cio_seek                                @OPJ_MANGLE_PREFIX@_cio_seek
-#define cio_skip                                @OPJ_MANGLE_PREFIX@_cio_skip
-#define cio_tell                                @OPJ_MANGLE_PREFIX@_cio_tell
-#define cio_write                               @OPJ_MANGLE_PREFIX@_cio_write
-#define dwt_calc_explicit_stepsizes             @OPJ_MANGLE_PREFIX@_dwt_calc_explicit_stepsizes
-#define dwt_decode                              @OPJ_MANGLE_PREFIX@_dwt_decode
-#define dwt_decode_1                            @OPJ_MANGLE_PREFIX@_dwt_decode_1
-#define dwt_decode_1_                           @OPJ_MANGLE_PREFIX@_dwt_decode_1_
-#define dwt_decode_real                         @OPJ_MANGLE_PREFIX@_dwt_decode_real
-#define dwt_decode_real_v2                      @OPJ_MANGLE_PREFIX@_dwt_decode_real_v2
-#define dwt_decode_tile                         @OPJ_MANGLE_PREFIX@_dwt_decode_tile
-#define dwt_decode_tile_v2                      @OPJ_MANGLE_PREFIX@_dwt_decode_tile_v2
-#define dwt_decode_v2                           @OPJ_MANGLE_PREFIX@_dwt_decode_v2
-#define dwt_deinterleave_h                      @OPJ_MANGLE_PREFIX@_dwt_deinterleave_h
-#define dwt_deinterleave_v                      @OPJ_MANGLE_PREFIX@_dwt_deinterleave_v
-#define dwt_encode                              @OPJ_MANGLE_PREFIX@_dwt_encode
-#define dwt_encode_1                            @OPJ_MANGLE_PREFIX@_dwt_encode_1
-#define dwt_encode_1_real                       @OPJ_MANGLE_PREFIX@_dwt_encode_1_real
-#define dwt_encode_real                         @OPJ_MANGLE_PREFIX@_dwt_encode_real
-#define dwt_encode_stepsize                     @OPJ_MANGLE_PREFIX@_dwt_encode_stepsize
-#define dwt_getgain                             @OPJ_MANGLE_PREFIX@_dwt_getgain
-#define dwt_getgain_real                        @OPJ_MANGLE_PREFIX@_dwt_getgain_real
-#define dwt_getgain_real_v2                     @OPJ_MANGLE_PREFIX@_dwt_getgain_real_v2
-#define dwt_getgain_v2                          @OPJ_MANGLE_PREFIX@_dwt_getgain_v2
-#define dwt_getnorm                             @OPJ_MANGLE_PREFIX@_dwt_getnorm
-#define dwt_getnorm_real                        @OPJ_MANGLE_PREFIX@_dwt_getnorm_real
-#define dwt_interleave_h                        @OPJ_MANGLE_PREFIX@_dwt_interleave_h
-#define dwt_interleave_v                        @OPJ_MANGLE_PREFIX@_dwt_interleave_v
-#define dwt_max_resolution                      @OPJ_MANGLE_PREFIX@_dwt_max_resolution
-#define dwt_max_resolution_v2                   @OPJ_MANGLE_PREFIX@_dwt_max_resolution_v2
-#define fix_mul                                 @OPJ_MANGLE_PREFIX@_fix_mul
-#define fix_mul                                 @OPJ_MANGLE_PREFIX@_fix_mul
-#define fix_mul                                 @OPJ_MANGLE_PREFIX@_fix_mul
-#define free_color_data                         @OPJ_MANGLE_PREFIX@_free_color_data
-#define get_all_encoding_parameters             @OPJ_MANGLE_PREFIX@_get_all_encoding_parameters
-#define get_num_max_tile_parts                  @OPJ_MANGLE_PREFIX@_get_num_max_tile_parts
-#define int_abs                                 @OPJ_MANGLE_PREFIX@_int_abs
-#define int_ceildiv                             @OPJ_MANGLE_PREFIX@_int_ceildiv
-#define int_ceildiv                             @OPJ_MANGLE_PREFIX@_int_ceildiv
-#define int_ceildiv                             @OPJ_MANGLE_PREFIX@_int_ceildiv
-#define int_ceildiv                             @OPJ_MANGLE_PREFIX@_int_ceildiv
-#define int_ceildivpow2                         @OPJ_MANGLE_PREFIX@_int_ceildivpow2
-#define int_ceildivpow2                         @OPJ_MANGLE_PREFIX@_int_ceildivpow2
-#define int_ceildivpow2                         @OPJ_MANGLE_PREFIX@_int_ceildivpow2
-#define int_ceildivpow2                         @OPJ_MANGLE_PREFIX@_int_ceildivpow2
-#define int_clamp                               @OPJ_MANGLE_PREFIX@_int_clamp
-#define int_floordivpow2                        @OPJ_MANGLE_PREFIX@_int_floordivpow2
-#define int_floordivpow2                        @OPJ_MANGLE_PREFIX@_int_floordivpow2
-#define int_floorlog2                           @OPJ_MANGLE_PREFIX@_int_floorlog2
-#define int_floorlog2                           @OPJ_MANGLE_PREFIX@_int_floorlog2
-#define int_floorlog2                           @OPJ_MANGLE_PREFIX@_int_floorlog2
-#define int_floorlog2                           @OPJ_MANGLE_PREFIX@_int_floorlog2
-#define int_max                                 @OPJ_MANGLE_PREFIX@_int_max
-#define int_max                                 @OPJ_MANGLE_PREFIX@_int_max
-#define int_max                                 @OPJ_MANGLE_PREFIX@_int_max
-#define int_max                                 @OPJ_MANGLE_PREFIX@_int_max
-#define int_max                                 @OPJ_MANGLE_PREFIX@_int_max
-#define int_min                                 @OPJ_MANGLE_PREFIX@_int_min
-#define int_min                                 @OPJ_MANGLE_PREFIX@_int_min
-#define int_min                                 @OPJ_MANGLE_PREFIX@_int_min
-#define int_min                                 @OPJ_MANGLE_PREFIX@_int_min
-#define int_min                                 @OPJ_MANGLE_PREFIX@_int_min
-#define int_min                                 @OPJ_MANGLE_PREFIX@_int_min
-#define j2k_add_mct                             @OPJ_MANGLE_PREFIX@_j2k_add_mct
-#define j2k_add_mhmarker                        @OPJ_MANGLE_PREFIX@_j2k_add_mhmarker
-#define j2k_add_mhmarker_v2                     @OPJ_MANGLE_PREFIX@_j2k_add_mhmarker_v2
-#define j2k_add_tlmarker                        @OPJ_MANGLE_PREFIX@_j2k_add_tlmarker
-#define j2k_add_tlmarker_v2                     @OPJ_MANGLE_PREFIX@_j2k_add_tlmarker_v2
-#define j2k_allocate_tile_element_cstr_index    @OPJ_MANGLE_PREFIX@_j2k_allocate_tile_element_cstr_index
-#define j2k_build_decoder                       @OPJ_MANGLE_PREFIX@_j2k_build_decoder
-#define j2k_calculate_tp                        @OPJ_MANGLE_PREFIX@_j2k_calculate_tp
-#define j2k_convert_progression_order           @OPJ_MANGLE_PREFIX@_j2k_convert_progression_order
-#define j2k_copy_default_tcp_and_create_tcd     @OPJ_MANGLE_PREFIX@_j2k_copy_default_tcp_and_create_tcd
-#define j2k_copy_tile_component_parameters      @OPJ_MANGLE_PREFIX@_j2k_copy_tile_component_parameters
-#define j2k_copy_tile_quantization_parameters   @OPJ_MANGLE_PREFIX@_j2k_copy_tile_quantization_parameters
-#define j2k_cp_destroy                          @OPJ_MANGLE_PREFIX@_j2k_cp_destroy
-#define j2k_create_compress                     @OPJ_MANGLE_PREFIX@_j2k_create_compress
-#define j2k_create_compress_v2                  @OPJ_MANGLE_PREFIX@_j2k_create_compress_v2
-#define j2k_create_cstr_index                   @OPJ_MANGLE_PREFIX@_j2k_create_cstr_index
-#define j2k_create_decompress                   @OPJ_MANGLE_PREFIX@_j2k_create_decompress
-#define j2k_create_decompress_v2                @OPJ_MANGLE_PREFIX@_j2k_create_decompress_v2
-#define j2k_dec_mstab_lookup                    @OPJ_MANGLE_PREFIX@_j2k_dec_mstab_lookup
-#define j2k_decode                              @OPJ_MANGLE_PREFIX@_j2k_decode
-#define j2k_decode_jpt_stream                   @OPJ_MANGLE_PREFIX@_j2k_decode_jpt_stream
-#define j2k_decode_one_tile                     @OPJ_MANGLE_PREFIX@_j2k_decode_one_tile
-#define j2k_decode_tile                         @OPJ_MANGLE_PREFIX@_j2k_decode_tile
-#define j2k_decode_tiles                        @OPJ_MANGLE_PREFIX@_j2k_decode_tiles
-#define j2k_decode_v2                           @OPJ_MANGLE_PREFIX@_j2k_decode_v2
-#define j2k_decoding_validation                 @OPJ_MANGLE_PREFIX@_j2k_decoding_validation
-#define j2k_destroy                             @OPJ_MANGLE_PREFIX@_j2k_destroy
-#define j2k_destroy_compress                    @OPJ_MANGLE_PREFIX@_j2k_destroy_compress
-#define j2k_destroy_cstr_index                  @OPJ_MANGLE_PREFIX@_j2k_destroy_cstr_index
-#define j2k_destroy_decompress                  @OPJ_MANGLE_PREFIX@_j2k_destroy_decompress
-#define j2k_dump                                @OPJ_MANGLE_PREFIX@_j2k_dump
-#define j2k_dump_image_comp_header              @OPJ_MANGLE_PREFIX@_j2k_dump_image_comp_header
-#define j2k_dump_image_header                   @OPJ_MANGLE_PREFIX@_j2k_dump_image_header
-#define j2k_dump_MH_index                       @OPJ_MANGLE_PREFIX@_j2k_dump_MH_index
-#define j2k_dump_MH_info                        @OPJ_MANGLE_PREFIX@_j2k_dump_MH_info
-#define j2k_encode                              @OPJ_MANGLE_PREFIX@_j2k_encode
-#define j2k_end_decompress                      @OPJ_MANGLE_PREFIX@_j2k_end_decompress
-#define j2k_exec                                @OPJ_MANGLE_PREFIX@_j2k_exec
-#define j2k_get_cstr_index                      @OPJ_MANGLE_PREFIX@_j2k_get_cstr_index
-#define j2k_get_cstr_info                       @OPJ_MANGLE_PREFIX@_j2k_get_cstr_info
-#define j2k_get_marker_handler                  @OPJ_MANGLE_PREFIX@_j2k_get_marker_handler
-#define j2k_get_num_tp                          @OPJ_MANGLE_PREFIX@_j2k_get_num_tp
-#define j2k_get_tile                            @OPJ_MANGLE_PREFIX@_j2k_get_tile
-#define j2k_read_cbd                            @OPJ_MANGLE_PREFIX@_j2k_read_cbd
-#define j2k_read_coc                            @OPJ_MANGLE_PREFIX@_j2k_read_coc
-#define j2k_read_coc_v2                         @OPJ_MANGLE_PREFIX@_j2k_read_coc_v2
-#define j2k_read_cod                            @OPJ_MANGLE_PREFIX@_j2k_read_cod
-#define j2k_read_cod_v2                         @OPJ_MANGLE_PREFIX@_j2k_read_cod_v2
-#define j2k_read_com                            @OPJ_MANGLE_PREFIX@_j2k_read_com
-#define j2k_read_com_v2                         @OPJ_MANGLE_PREFIX@_j2k_read_com_v2
-#define j2k_read_cox                            @OPJ_MANGLE_PREFIX@_j2k_read_cox
-#define j2k_read_crg                            @OPJ_MANGLE_PREFIX@_j2k_read_crg
-#define j2k_read_crg_v2                         @OPJ_MANGLE_PREFIX@_j2k_read_crg_v2
-#define j2k_read_eoc                            @OPJ_MANGLE_PREFIX@_j2k_read_eoc
-#define j2k_read_eoc_v2                         @OPJ_MANGLE_PREFIX@_j2k_read_eoc_v2
-#define j2k_read_float32_to_float               @OPJ_MANGLE_PREFIX@_j2k_read_float32_to_float
-#define j2k_read_float32_to_int32               @OPJ_MANGLE_PREFIX@_j2k_read_float32_to_int32
-#define j2k_read_float64_to_float               @OPJ_MANGLE_PREFIX@_j2k_read_float64_to_float
-#define j2k_read_float64_to_int32               @OPJ_MANGLE_PREFIX@_j2k_read_float64_to_int32
-#define j2k_read_header                         @OPJ_MANGLE_PREFIX@_j2k_read_header
-#define j2k_read_header_procedure               @OPJ_MANGLE_PREFIX@_j2k_read_header_procedure
-#define j2k_read_int16_to_float                 @OPJ_MANGLE_PREFIX@_j2k_read_int16_to_float
-#define j2k_read_int16_to_int32                 @OPJ_MANGLE_PREFIX@_j2k_read_int16_to_int32
-#define j2k_read_int32_to_float                 @OPJ_MANGLE_PREFIX@_j2k_read_int32_to_float
-#define j2k_read_int32_to_int32                 @OPJ_MANGLE_PREFIX@_j2k_read_int32_to_int32
-#define j2k_read_mcc                            @OPJ_MANGLE_PREFIX@_j2k_read_mcc
-#define j2k_read_mco                            @OPJ_MANGLE_PREFIX@_j2k_read_mco
-#define j2k_read_mct                            @OPJ_MANGLE_PREFIX@_j2k_read_mct
-#define j2k_read_plm                            @OPJ_MANGLE_PREFIX@_j2k_read_plm
-#define j2k_read_plm_v2                         @OPJ_MANGLE_PREFIX@_j2k_read_plm_v2
-#define j2k_read_plt                            @OPJ_MANGLE_PREFIX@_j2k_read_plt
-#define j2k_read_plt_v2                         @OPJ_MANGLE_PREFIX@_j2k_read_plt_v2
-#define j2k_read_poc                            @OPJ_MANGLE_PREFIX@_j2k_read_poc
-#define j2k_read_poc_v2                         @OPJ_MANGLE_PREFIX@_j2k_read_poc_v2
-#define j2k_read_ppm                            @OPJ_MANGLE_PREFIX@_j2k_read_ppm
-#define j2k_read_ppm_v2                         @OPJ_MANGLE_PREFIX@_j2k_read_ppm_v2
-#define j2k_read_ppm_v3                         @OPJ_MANGLE_PREFIX@_j2k_read_ppm_v3
-#define j2k_read_ppt                            @OPJ_MANGLE_PREFIX@_j2k_read_ppt
-#define j2k_read_ppt_v2                         @OPJ_MANGLE_PREFIX@_j2k_read_ppt_v2
-#define j2k_read_qcc                            @OPJ_MANGLE_PREFIX@_j2k_read_qcc
-#define j2k_read_qcc_v2                         @OPJ_MANGLE_PREFIX@_j2k_read_qcc_v2
-#define j2k_read_qcd                            @OPJ_MANGLE_PREFIX@_j2k_read_qcd
-#define j2k_read_qcd_v2                         @OPJ_MANGLE_PREFIX@_j2k_read_qcd_v2
-#define j2k_read_qcx                            @OPJ_MANGLE_PREFIX@_j2k_read_qcx
-#define j2k_read_rgn                            @OPJ_MANGLE_PREFIX@_j2k_read_rgn
-#define j2k_read_rgn_v2                         @OPJ_MANGLE_PREFIX@_j2k_read_rgn_v2
-#define j2k_read_siz                            @OPJ_MANGLE_PREFIX@_j2k_read_siz
-#define j2k_read_siz_v2                         @OPJ_MANGLE_PREFIX@_j2k_read_siz_v2
-#define j2k_read_soc                            @OPJ_MANGLE_PREFIX@_j2k_read_soc
-#define j2k_read_soc_v2                         @OPJ_MANGLE_PREFIX@_j2k_read_soc_v2
-#define j2k_read_sod                            @OPJ_MANGLE_PREFIX@_j2k_read_sod
-#define j2k_read_sod_v2                         @OPJ_MANGLE_PREFIX@_j2k_read_sod_v2
-#define j2k_read_sot                            @OPJ_MANGLE_PREFIX@_j2k_read_sot
-#define j2k_read_sot_v2                         @OPJ_MANGLE_PREFIX@_j2k_read_sot_v2
-#define j2k_read_SPCod_SPCoc                    @OPJ_MANGLE_PREFIX@_j2k_read_SPCod_SPCoc
-#define j2k_read_SQcd_SQcc                      @OPJ_MANGLE_PREFIX@_j2k_read_SQcd_SQcc
-#define j2k_read_tile_header                    @OPJ_MANGLE_PREFIX@_j2k_read_tile_header
-#define j2k_read_tlm                            @OPJ_MANGLE_PREFIX@_j2k_read_tlm
-#define j2k_read_tlm_v2                         @OPJ_MANGLE_PREFIX@_j2k_read_tlm_v2
-#define j2k_read_unk                            @OPJ_MANGLE_PREFIX@_j2k_read_unk
-#define j2k_read_unk_v2                         @OPJ_MANGLE_PREFIX@_j2k_read_unk_v2
-#define j2k_set_decode_area                     @OPJ_MANGLE_PREFIX@_j2k_set_decode_area
-#define j2k_set_decoded_resolution_factor       @OPJ_MANGLE_PREFIX@_j2k_set_decoded_resolution_factor
-#define j2k_setup_decoder                       @OPJ_MANGLE_PREFIX@_j2k_setup_decoder
-#define j2k_setup_decoder_v2                    @OPJ_MANGLE_PREFIX@_j2k_setup_decoder_v2
-#define j2k_setup_decoding                      @OPJ_MANGLE_PREFIX@_j2k_setup_decoding
-#define j2k_setup_decoding_tile                 @OPJ_MANGLE_PREFIX@_j2k_setup_decoding_tile
-#define j2k_setup_decoding_validation           @OPJ_MANGLE_PREFIX@_j2k_setup_decoding_validation
-#define j2k_setup_encoder                       @OPJ_MANGLE_PREFIX@_j2k_setup_encoder
-#define j2k_setup_header_reading                @OPJ_MANGLE_PREFIX@_j2k_setup_header_reading
-#define j2k_tcp_data_destroy                    @OPJ_MANGLE_PREFIX@_j2k_tcp_data_destroy
-#define j2k_tcp_destroy                         @OPJ_MANGLE_PREFIX@_j2k_tcp_destroy
-#define j2k_update_image_data                   @OPJ_MANGLE_PREFIX@_j2k_update_image_data
-#define j2k_write_coc                           @OPJ_MANGLE_PREFIX@_j2k_write_coc
-#define j2k_write_cod                           @OPJ_MANGLE_PREFIX@_j2k_write_cod
-#define j2k_write_com                           @OPJ_MANGLE_PREFIX@_j2k_write_com
-#define j2k_write_cox                           @OPJ_MANGLE_PREFIX@_j2k_write_cox
-#define j2k_write_eoc                           @OPJ_MANGLE_PREFIX@_j2k_write_eoc
-#define j2k_write_float_to_float                @OPJ_MANGLE_PREFIX@_j2k_write_float_to_float
-#define j2k_write_float_to_float64              @OPJ_MANGLE_PREFIX@_j2k_write_float_to_float64
-#define j2k_write_float_to_int16                @OPJ_MANGLE_PREFIX@_j2k_write_float_to_int16
-#define j2k_write_float_to_int32                @OPJ_MANGLE_PREFIX@_j2k_write_float_to_int32
-#define j2k_write_poc                           @OPJ_MANGLE_PREFIX@_j2k_write_poc
-#define j2k_write_qcc                           @OPJ_MANGLE_PREFIX@_j2k_write_qcc
-#define j2k_write_qcd                           @OPJ_MANGLE_PREFIX@_j2k_write_qcd
-#define j2k_write_qcx                           @OPJ_MANGLE_PREFIX@_j2k_write_qcx
-#define j2k_write_rgn                           @OPJ_MANGLE_PREFIX@_j2k_write_rgn
-#define j2k_write_siz                           @OPJ_MANGLE_PREFIX@_j2k_write_siz
-#define j2k_write_soc                           @OPJ_MANGLE_PREFIX@_j2k_write_soc
-#define j2k_write_sod                           @OPJ_MANGLE_PREFIX@_j2k_write_sod
-#define j2k_write_sot                           @OPJ_MANGLE_PREFIX@_j2k_write_sot
-#define j2k_write_tlm                           @OPJ_MANGLE_PREFIX@_j2k_write_tlm
-#define jp2_apply_cdef                          @OPJ_MANGLE_PREFIX@_jp2_apply_cdef
-#define jp2_apply_pclr                          @OPJ_MANGLE_PREFIX@_jp2_apply_pclr
-#define jp2_create                              @OPJ_MANGLE_PREFIX@_jp2_create
-#define jp2_create_compress                     @OPJ_MANGLE_PREFIX@_jp2_create_compress
-#define jp2_create_decompress                   @OPJ_MANGLE_PREFIX@_jp2_create_decompress
-#define jp2_decode_tile                         @OPJ_MANGLE_PREFIX@_jp2_decode_tile
-#define jp2_decode_v2                           @OPJ_MANGLE_PREFIX@_jp2_decode_v2
-#define jp2_destroy                             @OPJ_MANGLE_PREFIX@_jp2_destroy
-#define jp2_destroy_compress                    @OPJ_MANGLE_PREFIX@_jp2_destroy_compress
-#define jp2_destroy_decompress                  @OPJ_MANGLE_PREFIX@_jp2_destroy_decompress
-#define jp2_dump                                @OPJ_MANGLE_PREFIX@_jp2_dump
-#define jp2_end_decompress                      @OPJ_MANGLE_PREFIX@_jp2_end_decompress
-#define jp2_exec                                @OPJ_MANGLE_PREFIX@_jp2_exec
-#define jp2_find_handler                        @OPJ_MANGLE_PREFIX@_jp2_find_handler
-#define jp2_free_pclr                           @OPJ_MANGLE_PREFIX@_jp2_free_pclr
-#define jp2_get_cstr_index                      @OPJ_MANGLE_PREFIX@_jp2_get_cstr_index
-#define jp2_get_cstr_info                       @OPJ_MANGLE_PREFIX@_jp2_get_cstr_info
-#define jp2_get_tile                            @OPJ_MANGLE_PREFIX@_jp2_get_tile
-#define jp2_img_find_handler                    @OPJ_MANGLE_PREFIX@_jp2_img_find_handler
-#define jp2_read_boxhdr                         @OPJ_MANGLE_PREFIX@_jp2_read_boxhdr
-#define jp2_read_boxhdr_char                    @OPJ_MANGLE_PREFIX@_jp2_read_boxhdr_char
-#define jp2_read_boxhdr_v2                      @OPJ_MANGLE_PREFIX@_jp2_read_boxhdr_v2
-#define jp2_read_bpcc                           @OPJ_MANGLE_PREFIX@_jp2_read_bpcc
-#define jp2_read_bpcc_v2                        @OPJ_MANGLE_PREFIX@_jp2_read_bpcc_v2
-#define jp2_read_cdef                           @OPJ_MANGLE_PREFIX@_jp2_read_cdef
-#define jp2_read_cdef_v2                        @OPJ_MANGLE_PREFIX@_jp2_read_cdef_v2
-#define jp2_read_cmap                           @OPJ_MANGLE_PREFIX@_jp2_read_cmap
-#define jp2_read_cmap_v2                        @OPJ_MANGLE_PREFIX@_jp2_read_cmap_v2
-#define jp2_read_colr                           @OPJ_MANGLE_PREFIX@_jp2_read_colr
-#define jp2_read_colr_v2                        @OPJ_MANGLE_PREFIX@_jp2_read_colr_v2
-#define jp2_read_ftyp                           @OPJ_MANGLE_PREFIX@_jp2_read_ftyp
-#define jp2_read_ftyp_v2                        @OPJ_MANGLE_PREFIX@_jp2_read_ftyp_v2
-#define jp2_read_header                         @OPJ_MANGLE_PREFIX@_jp2_read_header
-#define jp2_read_header_procedure               @OPJ_MANGLE_PREFIX@_jp2_read_header_procedure
-#define jp2_read_ihdr                           @OPJ_MANGLE_PREFIX@_jp2_read_ihdr
-#define jp2_read_ihdr_v2                        @OPJ_MANGLE_PREFIX@_jp2_read_ihdr_v2
-#define jp2_read_jp                             @OPJ_MANGLE_PREFIX@_jp2_read_jp
-#define jp2_read_jp2c                           @OPJ_MANGLE_PREFIX@_jp2_read_jp2c
-#define jp2_read_jp2h                           @OPJ_MANGLE_PREFIX@_jp2_read_jp2h
-#define jp2_read_jp2h_v2                        @OPJ_MANGLE_PREFIX@_jp2_read_jp2h_v2
-#define jp2_read_jp_v2                          @OPJ_MANGLE_PREFIX@_jp2_read_jp_v2
-#define jp2_read_pclr                           @OPJ_MANGLE_PREFIX@_jp2_read_pclr
-#define jp2_read_pclr_v2                        @OPJ_MANGLE_PREFIX@_jp2_read_pclr_v2
-#define jp2_read_struct                         @OPJ_MANGLE_PREFIX@_jp2_read_struct
-#define jp2_read_tile_header                    @OPJ_MANGLE_PREFIX@_jp2_read_tile_header
-#define jp2_set_decode_area                     @OPJ_MANGLE_PREFIX@_jp2_set_decode_area
-#define jp2_set_decoded_resolution_factor       @OPJ_MANGLE_PREFIX@_jp2_set_decoded_resolution_factor
-#define jp2_setup_decoder                       @OPJ_MANGLE_PREFIX@_jp2_setup_decoder
-#define jp2_setup_decoder_v2                    @OPJ_MANGLE_PREFIX@_jp2_setup_decoder_v2
-#define jp2_setup_decoding_validation           @OPJ_MANGLE_PREFIX@_jp2_setup_decoding_validation
-#define jp2_setup_encoder                       @OPJ_MANGLE_PREFIX@_jp2_setup_encoder
-#define jp2_setup_end_header_reading            @OPJ_MANGLE_PREFIX@_jp2_setup_end_header_reading
-#define jp2_setup_header_reading                @OPJ_MANGLE_PREFIX@_jp2_setup_header_reading
-#define jp2_write_bpcc                          @OPJ_MANGLE_PREFIX@_jp2_write_bpcc
-#define jp2_write_colr                          @OPJ_MANGLE_PREFIX@_jp2_write_colr
-#define jp2_write_ftyp                          @OPJ_MANGLE_PREFIX@_jp2_write_ftyp
-#define jp2_write_ihdr                          @OPJ_MANGLE_PREFIX@_jp2_write_ihdr
-#define jp2_write_jp                            @OPJ_MANGLE_PREFIX@_jp2_write_jp
-#define jp2_write_jp2c                          @OPJ_MANGLE_PREFIX@_jp2_write_jp2c
-#define jp2_write_jp2h                          @OPJ_MANGLE_PREFIX@_jp2_write_jp2h
-#define jpt_init_msg_header                     @OPJ_MANGLE_PREFIX@_jpt_init_msg_header
-#define jpt_read_msg_header                     @OPJ_MANGLE_PREFIX@_jpt_read_msg_header
-#define jpt_read_VBAS_info                      @OPJ_MANGLE_PREFIX@_jpt_read_VBAS_info
-#define jpt_reinit_msg_header                   @OPJ_MANGLE_PREFIX@_jpt_reinit_msg_header
-#define mct_decode                              @OPJ_MANGLE_PREFIX@_mct_decode
-#define mct_decode_custom                       @OPJ_MANGLE_PREFIX@_mct_decode_custom
-#define mct_decode_real                         @OPJ_MANGLE_PREFIX@_mct_decode_real
-#define mct_encode                              @OPJ_MANGLE_PREFIX@_mct_encode
-#define mct_encode_real                         @OPJ_MANGLE_PREFIX@_mct_encode_real
-#define mct_getnorm                             @OPJ_MANGLE_PREFIX@_mct_getnorm
-#define mct_getnorm_real                        @OPJ_MANGLE_PREFIX@_mct_getnorm_real
-#define mqc_bypass_enc                          @OPJ_MANGLE_PREFIX@_mqc_bypass_enc
-#define mqc_bypass_flush_enc                    @OPJ_MANGLE_PREFIX@_mqc_bypass_flush_enc
-#define mqc_bypass_init_enc                     @OPJ_MANGLE_PREFIX@_mqc_bypass_init_enc
-#define mqc_bytein                              @OPJ_MANGLE_PREFIX@_mqc_bytein
-#define mqc_byteout                             @OPJ_MANGLE_PREFIX@_mqc_byteout
-#define mqc_codelps                             @OPJ_MANGLE_PREFIX@_mqc_codelps
-#define mqc_codemps                             @OPJ_MANGLE_PREFIX@_mqc_codemps
-#define mqc_create                              @OPJ_MANGLE_PREFIX@_mqc_create
-#define mqc_decode                              @OPJ_MANGLE_PREFIX@_mqc_decode
-#define mqc_destroy                             @OPJ_MANGLE_PREFIX@_mqc_destroy
-#define mqc_encode                              @OPJ_MANGLE_PREFIX@_mqc_encode
-#define mqc_erterm_enc                          @OPJ_MANGLE_PREFIX@_mqc_erterm_enc
-#define mqc_flush                               @OPJ_MANGLE_PREFIX@_mqc_flush
-#define mqc_init_dec                            @OPJ_MANGLE_PREFIX@_mqc_init_dec
-#define mqc_init_enc                            @OPJ_MANGLE_PREFIX@_mqc_init_enc
-#define mqc_lpsexchange                         @OPJ_MANGLE_PREFIX@_mqc_lpsexchange
-#define mqc_mpsexchange                         @OPJ_MANGLE_PREFIX@_mqc_mpsexchange
-#define mqc_numbytes                            @OPJ_MANGLE_PREFIX@_mqc_numbytes
-#define mqc_renormd                             @OPJ_MANGLE_PREFIX@_mqc_renormd
-#define mqc_renorme                             @OPJ_MANGLE_PREFIX@_mqc_renorme
-#define mqc_reset_enc                           @OPJ_MANGLE_PREFIX@_mqc_reset_enc
-#define mqc_resetstates                         @OPJ_MANGLE_PREFIX@_mqc_resetstates
-#define mqc_restart_enc                         @OPJ_MANGLE_PREFIX@_mqc_restart_enc
-#define mqc_restart_init_enc                    @OPJ_MANGLE_PREFIX@_mqc_restart_init_enc
-#define mqc_segmark_enc                         @OPJ_MANGLE_PREFIX@_mqc_segmark_enc
-#define mqc_setbits                             @OPJ_MANGLE_PREFIX@_mqc_setbits
-#define mqc_setstate                            @OPJ_MANGLE_PREFIX@_mqc_setstate
-#define opj_cio_close                           @OPJ_MANGLE_PREFIX@_opj_cio_close
-#define opj_cio_open                            @OPJ_MANGLE_PREFIX@_opj_cio_open
-#define opj_clock                               @OPJ_MANGLE_PREFIX@_opj_clock
-#define opj_copy_image_header                   @OPJ_MANGLE_PREFIX@_opj_copy_image_header
-#define opj_create_compress                     @OPJ_MANGLE_PREFIX@_opj_create_compress
-#define opj_create_decompress                   @OPJ_MANGLE_PREFIX@_opj_create_decompress
-#define opj_create_decompress_v2                @OPJ_MANGLE_PREFIX@_opj_create_decompress_v2
-#define opj_decode                              @OPJ_MANGLE_PREFIX@_opj_decode
-#define opj_decode_tile_data                    @OPJ_MANGLE_PREFIX@_opj_decode_tile_data
-#define opj_decode_v2                           @OPJ_MANGLE_PREFIX@_opj_decode_v2
-#define opj_decode_with_info                    @OPJ_MANGLE_PREFIX@_opj_decode_with_info
-#define opj_default_callback                    @OPJ_MANGLE_PREFIX@_opj_default_callback
-#define opj_destroy_codec                       @OPJ_MANGLE_PREFIX@_opj_destroy_codec
-#define opj_destroy_compress                    @OPJ_MANGLE_PREFIX@_opj_destroy_compress
-#define opj_destroy_cstr_index                  @OPJ_MANGLE_PREFIX@_opj_destroy_cstr_index
-#define opj_destroy_cstr_info                   @OPJ_MANGLE_PREFIX@_opj_destroy_cstr_info
-#define opj_destroy_cstr_info_v2                @OPJ_MANGLE_PREFIX@_opj_destroy_cstr_info_v2
-#define opj_destroy_decompress                  @OPJ_MANGLE_PREFIX@_opj_destroy_decompress
-#define opj_dump_codec                          @OPJ_MANGLE_PREFIX@_opj_dump_codec
-#define opj_encode                              @OPJ_MANGLE_PREFIX@_opj_encode
-#define opj_encode_with_info                    @OPJ_MANGLE_PREFIX@_opj_encode_with_info
-#define opj_end_decompress                      @OPJ_MANGLE_PREFIX@_opj_end_decompress
-#define opj_error_default_callback              @OPJ_MANGLE_PREFIX@_opj_error_default_callback
-#define opj_event_msg                           @OPJ_MANGLE_PREFIX@_opj_event_msg
-#define opj_event_msg_v2                        @OPJ_MANGLE_PREFIX@_opj_event_msg_v2
-#define opj_get_cstr_index                      @OPJ_MANGLE_PREFIX@_opj_get_cstr_index
-#define opj_get_cstr_info                       @OPJ_MANGLE_PREFIX@_opj_get_cstr_info
-#define opj_get_data_length_from_file           @OPJ_MANGLE_PREFIX@_opj_get_data_length_from_file
-#define opj_get_decoded_tile                    @OPJ_MANGLE_PREFIX@_opj_get_decoded_tile
-#define opj_image_comp_header_update            @OPJ_MANGLE_PREFIX@_opj_image_comp_header_update
-#define opj_image_create                        @OPJ_MANGLE_PREFIX@_opj_image_create
-#define opj_image_create0                       @OPJ_MANGLE_PREFIX@_opj_image_create0
-#define opj_image_destroy                       @OPJ_MANGLE_PREFIX@_opj_image_destroy
-#define opj_info_default_callback               @OPJ_MANGLE_PREFIX@_opj_info_default_callback
-#define opj_initialize_default_event_handler    @OPJ_MANGLE_PREFIX@_opj_initialize_default_event_handler
-#define opj_jp2_decode                          @OPJ_MANGLE_PREFIX@_opj_jp2_decode
-#define opj_jp2_encode                          @OPJ_MANGLE_PREFIX@_opj_jp2_encode
-#define opj_procedure_list_add_procedure        @OPJ_MANGLE_PREFIX@_opj_procedure_list_add_procedure
-#define opj_procedure_list_clear                @OPJ_MANGLE_PREFIX@_opj_procedure_list_clear
-#define opj_procedure_list_create               @OPJ_MANGLE_PREFIX@_opj_procedure_list_create
-#define opj_procedure_list_destroy              @OPJ_MANGLE_PREFIX@_opj_procedure_list_destroy
-#define opj_procedure_list_get_first_procedure  @OPJ_MANGLE_PREFIX@_opj_procedure_list_get_first_procedure
-#define opj_procedure_list_get_nb_procedures    @OPJ_MANGLE_PREFIX@_opj_procedure_list_get_nb_procedures
-#define opj_read_bytes_BE                       @OPJ_MANGLE_PREFIX@_opj_read_bytes_BE
-#define opj_read_bytes_LE                       @OPJ_MANGLE_PREFIX@_opj_read_bytes_LE
-#define opj_read_double_BE                      @OPJ_MANGLE_PREFIX@_opj_read_double_BE
-#define opj_read_double_LE                      @OPJ_MANGLE_PREFIX@_opj_read_double_LE
-#define opj_read_float_BE                       @OPJ_MANGLE_PREFIX@_opj_read_float_BE
-#define opj_read_float_LE                       @OPJ_MANGLE_PREFIX@_opj_read_float_LE
-#define opj_read_from_file                      @OPJ_MANGLE_PREFIX@_opj_read_from_file
-#define opj_read_header                         @OPJ_MANGLE_PREFIX@_opj_read_header
-#define opj_read_tile_header                    @OPJ_MANGLE_PREFIX@_opj_read_tile_header
-#define opj_seek_from_file                      @OPJ_MANGLE_PREFIX@_opj_seek_from_file
-#define opj_set_decode_area                     @OPJ_MANGLE_PREFIX@_opj_set_decode_area
-#define opj_set_decoded_resolution_factor       @OPJ_MANGLE_PREFIX@_opj_set_decoded_resolution_factor
-#define opj_set_default_decoder_parameters      @OPJ_MANGLE_PREFIX@_opj_set_default_decoder_parameters
-#define opj_set_default_encoder_parameters      @OPJ_MANGLE_PREFIX@_opj_set_default_encoder_parameters
-#define opj_set_event_mgr                       @OPJ_MANGLE_PREFIX@_opj_set_event_mgr
-#define opj_setup_decoder                       @OPJ_MANGLE_PREFIX@_opj_setup_decoder
-#define opj_setup_decoder_v2                    @OPJ_MANGLE_PREFIX@_opj_setup_decoder_v2
-#define opj_setup_encoder                       @OPJ_MANGLE_PREFIX@_opj_setup_encoder
-#define opj_skip_from_file                      @OPJ_MANGLE_PREFIX@_opj_skip_from_file
-#define opj_stream_create                       @OPJ_MANGLE_PREFIX@_opj_stream_create
-#define opj_stream_create_default_file_stream   @OPJ_MANGLE_PREFIX@_opj_stream_create_default_file_stream
-#define opj_stream_create_file_stream           @OPJ_MANGLE_PREFIX@_opj_stream_create_file_stream
-#define opj_stream_default_create               @OPJ_MANGLE_PREFIX@_opj_stream_default_create
-#define opj_stream_default_read                 @OPJ_MANGLE_PREFIX@_opj_stream_default_read
-#define opj_stream_default_seek                 @OPJ_MANGLE_PREFIX@_opj_stream_default_seek
-#define opj_stream_default_skip                 @OPJ_MANGLE_PREFIX@_opj_stream_default_skip
-#define opj_stream_default_write                @OPJ_MANGLE_PREFIX@_opj_stream_default_write
-#define opj_stream_destroy                      @OPJ_MANGLE_PREFIX@_opj_stream_destroy
-#define opj_stream_flush                        @OPJ_MANGLE_PREFIX@_opj_stream_flush
-#define opj_stream_get_number_byte_left         @OPJ_MANGLE_PREFIX@_opj_stream_get_number_byte_left
-#define opj_stream_has_seek                     @OPJ_MANGLE_PREFIX@_opj_stream_has_seek
-#define opj_stream_read_data                    @OPJ_MANGLE_PREFIX@_opj_stream_read_data
-#define opj_stream_read_seek                    @OPJ_MANGLE_PREFIX@_opj_stream_read_seek
-#define opj_stream_read_skip                    @OPJ_MANGLE_PREFIX@_opj_stream_read_skip
-#define opj_stream_seek                         @OPJ_MANGLE_PREFIX@_opj_stream_seek
-#define opj_stream_set_read_function            @OPJ_MANGLE_PREFIX@_opj_stream_set_read_function
-#define opj_stream_set_seek_function            @OPJ_MANGLE_PREFIX@_opj_stream_set_seek_function
-#define opj_stream_set_skip_function            @OPJ_MANGLE_PREFIX@_opj_stream_set_skip_function
-#define opj_stream_set_user_data                @OPJ_MANGLE_PREFIX@_opj_stream_set_user_data
-#define opj_stream_set_user_data_length         @OPJ_MANGLE_PREFIX@_opj_stream_set_user_data_length
-#define opj_stream_set_write_function           @OPJ_MANGLE_PREFIX@_opj_stream_set_write_function
-#define opj_stream_skip                         @OPJ_MANGLE_PREFIX@_opj_stream_skip
-#define opj_stream_tell                         @OPJ_MANGLE_PREFIX@_opj_stream_tell
-#define opj_stream_write_data                   @OPJ_MANGLE_PREFIX@_opj_stream_write_data
-#define opj_stream_write_seek                   @OPJ_MANGLE_PREFIX@_opj_stream_write_seek
-#define opj_stream_write_skip                   @OPJ_MANGLE_PREFIX@_opj_stream_write_skip
-#define opj_version                             @OPJ_MANGLE_PREFIX@_opj_version
-#define opj_warning_default_callback            @OPJ_MANGLE_PREFIX@_opj_warning_default_callback
-#define opj_write_bytes_BE                      @OPJ_MANGLE_PREFIX@_opj_write_bytes_BE
-#define opj_write_bytes_LE                      @OPJ_MANGLE_PREFIX@_opj_write_bytes_LE
-#define opj_write_double_BE                     @OPJ_MANGLE_PREFIX@_opj_write_double_BE
-#define opj_write_double_LE                     @OPJ_MANGLE_PREFIX@_opj_write_double_LE
-#define opj_write_float_BE                      @OPJ_MANGLE_PREFIX@_opj_write_float_BE
-#define opj_write_float_LE                      @OPJ_MANGLE_PREFIX@_opj_write_float_LE
-#define opj_write_from_file                     @OPJ_MANGLE_PREFIX@_opj_write_from_file
-#define pi_create                               @OPJ_MANGLE_PREFIX@_pi_create
-#define pi_create_decode                        @OPJ_MANGLE_PREFIX@_pi_create_decode
-#define pi_create_decode_v2                     @OPJ_MANGLE_PREFIX@_pi_create_decode_v2
-#define pi_create_encode                        @OPJ_MANGLE_PREFIX@_pi_create_encode
-#define pi_destroy                              @OPJ_MANGLE_PREFIX@_pi_destroy
-#define pi_destroy_v2                           @OPJ_MANGLE_PREFIX@_pi_destroy_v2
-#define pi_initialise_encode                    @OPJ_MANGLE_PREFIX@_pi_initialise_encode
-#define pi_next                                 @OPJ_MANGLE_PREFIX@_pi_next
-#define pi_next_cprl                            @OPJ_MANGLE_PREFIX@_pi_next_cprl
-#define pi_next_lrcp                            @OPJ_MANGLE_PREFIX@_pi_next_lrcp
-#define pi_next_pcrl                            @OPJ_MANGLE_PREFIX@_pi_next_pcrl
-#define pi_next_rlcp                            @OPJ_MANGLE_PREFIX@_pi_next_rlcp
-#define pi_next_rpcl                            @OPJ_MANGLE_PREFIX@_pi_next_rpcl
-#define pi_update_decode_not_poc                @OPJ_MANGLE_PREFIX@_pi_update_decode_not_poc
-#define pi_update_decode_poc                    @OPJ_MANGLE_PREFIX@_pi_update_decode_poc
-#define raw_create                              @OPJ_MANGLE_PREFIX@_raw_create
-#define raw_decode                              @OPJ_MANGLE_PREFIX@_raw_decode
-#define raw_destroy                             @OPJ_MANGLE_PREFIX@_raw_destroy
-#define raw_init_dec                            @OPJ_MANGLE_PREFIX@_raw_init_dec
-#define raw_numbytes                            @OPJ_MANGLE_PREFIX@_raw_numbytes
-#define t1_create                               @OPJ_MANGLE_PREFIX@_t1_create
-#define t1_create_v2                            @OPJ_MANGLE_PREFIX@_t1_create_v2
-#define t1_dec_clnpass                          @OPJ_MANGLE_PREFIX@_t1_dec_clnpass
-#define t1_dec_clnpass_step                     @OPJ_MANGLE_PREFIX@_t1_dec_clnpass_step
-#define t1_dec_clnpass_step_partial             @OPJ_MANGLE_PREFIX@_t1_dec_clnpass_step_partial
-#define t1_dec_clnpass_step_vsc                 @OPJ_MANGLE_PREFIX@_t1_dec_clnpass_step_vsc
-#define t1_decode_cblk                          @OPJ_MANGLE_PREFIX@_t1_decode_cblk
-#define t1_decode_cblks                         @OPJ_MANGLE_PREFIX@_t1_decode_cblks
-#define t1_decode_cblks_v2                      @OPJ_MANGLE_PREFIX@_t1_decode_cblks_v2
-#define t1_decode_cblk_v2                       @OPJ_MANGLE_PREFIX@_t1_decode_cblk_v2
-#define t1_dec_refpass                          @OPJ_MANGLE_PREFIX@_t1_dec_refpass
-#define t1_dec_refpass_mqc                      @OPJ_MANGLE_PREFIX@_t1_dec_refpass_mqc
-#define t1_dec_refpass_mqc_vsc                  @OPJ_MANGLE_PREFIX@_t1_dec_refpass_mqc_vsc
-#define t1_dec_refpass_raw                      @OPJ_MANGLE_PREFIX@_t1_dec_refpass_raw
-#define t1_dec_refpass_step                     @OPJ_MANGLE_PREFIX@_t1_dec_refpass_step
-#define t1_dec_refpass_step_mqc                 @OPJ_MANGLE_PREFIX@_t1_dec_refpass_step_mqc
-#define t1_dec_refpass_step_mqc_vsc             @OPJ_MANGLE_PREFIX@_t1_dec_refpass_step_mqc_vsc
-#define t1_dec_refpass_step_raw                 @OPJ_MANGLE_PREFIX@_t1_dec_refpass_step_raw
-#define t1_dec_sigpass                          @OPJ_MANGLE_PREFIX@_t1_dec_sigpass
-#define t1_dec_sigpass_mqc                      @OPJ_MANGLE_PREFIX@_t1_dec_sigpass_mqc
-#define t1_dec_sigpass_mqc_vsc                  @OPJ_MANGLE_PREFIX@_t1_dec_sigpass_mqc_vsc
-#define t1_dec_sigpass_raw                      @OPJ_MANGLE_PREFIX@_t1_dec_sigpass_raw
-#define t1_dec_sigpass_step                     @OPJ_MANGLE_PREFIX@_t1_dec_sigpass_step
-#define t1_dec_sigpass_step_mqc                 @OPJ_MANGLE_PREFIX@_t1_dec_sigpass_step_mqc
-#define t1_dec_sigpass_step_mqc_vsc             @OPJ_MANGLE_PREFIX@_t1_dec_sigpass_step_mqc_vsc
-#define t1_dec_sigpass_step_raw                 @OPJ_MANGLE_PREFIX@_t1_dec_sigpass_step_raw
-#define t1_destroy                              @OPJ_MANGLE_PREFIX@_t1_destroy
-#define t1_destroy_v2                           @OPJ_MANGLE_PREFIX@_t1_destroy_v2
-#define t1_enc_clnpass                          @OPJ_MANGLE_PREFIX@_t1_enc_clnpass
-#define t1_enc_clnpass_step                     @OPJ_MANGLE_PREFIX@_t1_enc_clnpass_step
-#define t1_encode_cblk                          @OPJ_MANGLE_PREFIX@_t1_encode_cblk
-#define t1_encode_cblks                         @OPJ_MANGLE_PREFIX@_t1_encode_cblks
-#define t1_enc_refpass                          @OPJ_MANGLE_PREFIX@_t1_enc_refpass
-#define t1_enc_refpass_step                     @OPJ_MANGLE_PREFIX@_t1_enc_refpass_step
-#define t1_enc_sigpass                          @OPJ_MANGLE_PREFIX@_t1_enc_sigpass
-#define t1_enc_sigpass_step                     @OPJ_MANGLE_PREFIX@_t1_enc_sigpass_step
-#define t1_getctxno_mag                         @OPJ_MANGLE_PREFIX@_t1_getctxno_mag
-#define t1_getctxno_sc                          @OPJ_MANGLE_PREFIX@_t1_getctxno_sc
-#define t1_getctxno_zc                          @OPJ_MANGLE_PREFIX@_t1_getctxno_zc
-#define t1_getnmsedec_ref                       @OPJ_MANGLE_PREFIX@_t1_getnmsedec_ref
-#define t1_getnmsedec_sig                       @OPJ_MANGLE_PREFIX@_t1_getnmsedec_sig
-#define t1_getspb                               @OPJ_MANGLE_PREFIX@_t1_getspb
-#define t1_getwmsedec                           @OPJ_MANGLE_PREFIX@_t1_getwmsedec
-#define t1_updateflags                          @OPJ_MANGLE_PREFIX@_t1_updateflags
-#define t2_create                               @OPJ_MANGLE_PREFIX@_t2_create
-#define t2_create_v2                            @OPJ_MANGLE_PREFIX@_t2_create_v2
-#define t2_decode_packet                        @OPJ_MANGLE_PREFIX@_t2_decode_packet
-#define t2_decode_packets                       @OPJ_MANGLE_PREFIX@_t2_decode_packets
-#define t2_decode_packets_v2                    @OPJ_MANGLE_PREFIX@_t2_decode_packets_v2
-#define t2_decode_packet_v2                     @OPJ_MANGLE_PREFIX@_t2_decode_packet_v2
-#define t2_destroy                              @OPJ_MANGLE_PREFIX@_t2_destroy
-#define t2_destroy_v2                           @OPJ_MANGLE_PREFIX@_t2_destroy_v2
-#define t2_encode_packet                        @OPJ_MANGLE_PREFIX@_t2_encode_packet
-#define t2_encode_packets                       @OPJ_MANGLE_PREFIX@_t2_encode_packets
-#define t2_getcommacode                         @OPJ_MANGLE_PREFIX@_t2_getcommacode
-#define t2_getnumpasses                         @OPJ_MANGLE_PREFIX@_t2_getnumpasses
-#define t2_init_seg                             @OPJ_MANGLE_PREFIX@_t2_init_seg
-#define t2_init_seg_v2                          @OPJ_MANGLE_PREFIX@_t2_init_seg_v2
-#define t2_putcommacode                         @OPJ_MANGLE_PREFIX@_t2_putcommacode
-#define t2_putnumpasses                         @OPJ_MANGLE_PREFIX@_t2_putnumpasses
-#define t2_read_packet_data                     @OPJ_MANGLE_PREFIX@_t2_read_packet_data
-#define t2_read_packet_header                   @OPJ_MANGLE_PREFIX@_t2_read_packet_header
-#define t2_skip_packet                          @OPJ_MANGLE_PREFIX@_t2_skip_packet
-#define t2_skip_packet_data                     @OPJ_MANGLE_PREFIX@_t2_skip_packet_data
-#define tcd_code_block_dec_allocate             @OPJ_MANGLE_PREFIX@_tcd_code_block_dec_allocate
-#define tcd_code_block_dec_deallocate           @OPJ_MANGLE_PREFIX@_tcd_code_block_dec_deallocate
-#define tcd_create                              @OPJ_MANGLE_PREFIX@_tcd_create
-#define tcd_create_v2                           @OPJ_MANGLE_PREFIX@_tcd_create_v2
-#define tcd_dc_level_shift_decode               @OPJ_MANGLE_PREFIX@_tcd_dc_level_shift_decode
-#define tcd_decode_tile                         @OPJ_MANGLE_PREFIX@_tcd_decode_tile
-#define tcd_decode_tile_v2                      @OPJ_MANGLE_PREFIX@_tcd_decode_tile_v2
-#define tcd_destroy                             @OPJ_MANGLE_PREFIX@_tcd_destroy
-#define tcd_destroy_v2                          @OPJ_MANGLE_PREFIX@_tcd_destroy_v2
-#define tcd_dump                                @OPJ_MANGLE_PREFIX@_tcd_dump
-#define tcd_dwt_decode                          @OPJ_MANGLE_PREFIX@_tcd_dwt_decode
-#define tcd_encode_tile                         @OPJ_MANGLE_PREFIX@_tcd_encode_tile
-#define tcd_free_decode                         @OPJ_MANGLE_PREFIX@_tcd_free_decode
-#define tcd_free_decode_tile                    @OPJ_MANGLE_PREFIX@_tcd_free_decode_tile
-#define tcd_free_encode                         @OPJ_MANGLE_PREFIX@_tcd_free_encode
-#define tcd_free_tile                           @OPJ_MANGLE_PREFIX@_tcd_free_tile
-#define tcd_get_decoded_tile_size               @OPJ_MANGLE_PREFIX@_tcd_get_decoded_tile_size
-#define tcd_init_decode_tile                    @OPJ_MANGLE_PREFIX@_tcd_init_decode_tile
-#define tcd_init_encode                         @OPJ_MANGLE_PREFIX@_tcd_init_encode
-#define tcd_init_v2                             @OPJ_MANGLE_PREFIX@_tcd_init_v2
-#define tcd_makelayer                           @OPJ_MANGLE_PREFIX@_tcd_makelayer
-#define tcd_makelayer_fixed                     @OPJ_MANGLE_PREFIX@_tcd_makelayer_fixed
-#define tcd_malloc_decode                       @OPJ_MANGLE_PREFIX@_tcd_malloc_decode
-#define tcd_malloc_decode_tile                  @OPJ_MANGLE_PREFIX@_tcd_malloc_decode_tile
-#define tcd_malloc_encode                       @OPJ_MANGLE_PREFIX@_tcd_malloc_encode
-#define tcd_mct_decode                          @OPJ_MANGLE_PREFIX@_tcd_mct_decode
-#define tcd_rateallocate                        @OPJ_MANGLE_PREFIX@_tcd_rateallocate
-#define tcd_rateallocate_fixed                  @OPJ_MANGLE_PREFIX@_tcd_rateallocate_fixed
-#define tcd_t1_decode                           @OPJ_MANGLE_PREFIX@_tcd_t1_decode
-#define tcd_t2_decode                           @OPJ_MANGLE_PREFIX@_tcd_t2_decode
-#define tcd_update_tile_data                    @OPJ_MANGLE_PREFIX@_tcd_update_tile_data
-#define tgt_create                              @OPJ_MANGLE_PREFIX@_tgt_create
-#define tgt_create_v2                           @OPJ_MANGLE_PREFIX@_tgt_create_v2
-#define tgt_decode                              @OPJ_MANGLE_PREFIX@_tgt_decode
-#define tgt_destroy                             @OPJ_MANGLE_PREFIX@_tgt_destroy
-#define tgt_encode                              @OPJ_MANGLE_PREFIX@_tgt_encode
-#define tgt_init                                @OPJ_MANGLE_PREFIX@_tgt_init
-#define tgt_reset                               @OPJ_MANGLE_PREFIX@_tgt_reset
-#define tgt_setvalue                            @OPJ_MANGLE_PREFIX@_tgt_setvalue
-#define uint_floorlog2                          @OPJ_MANGLE_PREFIX@_uint_floorlog2
-#define uint_max                                @OPJ_MANGLE_PREFIX@_uint_max
-#define uint_min                                @OPJ_MANGLE_PREFIX@_uint_min
-#define uint_min                                @OPJ_MANGLE_PREFIX@_uint_min
-#define v4dwt_decode                            @OPJ_MANGLE_PREFIX@_v4dwt_decode
-#define v4dwt_decode_step1_sse                  @OPJ_MANGLE_PREFIX@_v4dwt_decode_step1_sse
-#define v4dwt_decode_step2_sse                  @OPJ_MANGLE_PREFIX@_v4dwt_decode_step2_sse
-#define v4dwt_interleave_h                      @OPJ_MANGLE_PREFIX@_v4dwt_interleave_h
-#define v4dwt_interleave_v                      @OPJ_MANGLE_PREFIX@_v4dwt_interleave_v
-#define write_cidx                              @OPJ_MANGLE_PREFIX@_write_cidx
-#define write_cptr                              @OPJ_MANGLE_PREFIX@_write_cptr
-#define write_fidx                              @OPJ_MANGLE_PREFIX@_write_fidx
-#define write_iptr                              @OPJ_MANGLE_PREFIX@_write_iptr
-#define write_mainmhix                          @OPJ_MANGLE_PREFIX@_write_mainmhix
-#define write_manf                              @OPJ_MANGLE_PREFIX@_write_manf
-#define write_phix                              @OPJ_MANGLE_PREFIX@_write_phix
-#define write_phixfaix                          @OPJ_MANGLE_PREFIX@_write_phixfaix
-#define write_ppix                              @OPJ_MANGLE_PREFIX@_write_ppix
-#define write_ppixfaix                          @OPJ_MANGLE_PREFIX@_write_ppixfaix
-#define write_prxy                              @OPJ_MANGLE_PREFIX@_write_prxy
-#define write_thix                              @OPJ_MANGLE_PREFIX@_write_thix
-#define write_tilemhix                          @OPJ_MANGLE_PREFIX@_write_tilemhix
-#define write_tpix                              @OPJ_MANGLE_PREFIX@_write_tpix
-#define write_tpixfaix                          @OPJ_MANGLE_PREFIX@_write_tpixfaix
-#define dwt_alpha                               @OPJ_MANGLE_PREFIX@_dwt_alpha
-#define dwt_beta                                @OPJ_MANGLE_PREFIX@_dwt_beta
-#define dwt_gamma                               @OPJ_MANGLE_PREFIX@_dwt_gamma
-#define dwt_delta                               @OPJ_MANGLE_PREFIX@_dwt_delta
-#define K                                       @OPJ_MANGLE_PREFIX@_K
-#define c13318                                  @OPJ_MANGLE_PREFIX@_c13318
-#define dwt_norms                               @OPJ_MANGLE_PREFIX@_dwt_norms
-#define dwt_norms_real                          @OPJ_MANGLE_PREFIX@_dwt_norms_real
-#define mct_norms                               @OPJ_MANGLE_PREFIX@_mct_norms
-#define mct_norms_real                          @OPJ_MANGLE_PREFIX@_mct_norms_real
-#define MCT_ELEMENT_SIZE                        @OPJ_MANGLE_PREFIX@_MCT_ELEMENT_SIZE
-#define mqc_states                              @OPJ_MANGLE_PREFIX@_mqc_states
-#define lut_ctxno_zc                            @OPJ_MANGLE_PREFIX@_lut_ctxno_zc
-#define lut_ctxno_sc                            @OPJ_MANGLE_PREFIX@_lut_ctxno_sc
-#define lut_spb                                 @OPJ_MANGLE_PREFIX@_lut_spb
-#define lut_nmsedec_sig                         @OPJ_MANGLE_PREFIX@_lut_nmsedec_sig
-#define lut_nmsedec_sig0                        @OPJ_MANGLE_PREFIX@_lut_nmsedec_sig0
-#define lut_nmsedec_ref                         @OPJ_MANGLE_PREFIX@_lut_nmsedec_ref
-#define lut_nmsedec_ref0                        @OPJ_MANGLE_PREFIX@_lut_nmsedec_ref0
-#define j2k_memory_marker_handler_tab           @OPJ_MANGLE_PREFIX@_j2k_memory_marker_handler_tab
-#define j2k_dec_mstab                           @OPJ_MANGLE_PREFIX@_j2k_dec_mstab
-#define j2k_prog_order_list                     @OPJ_MANGLE_PREFIX@_j2k_prog_order_list
-#define j2k_mct_read_functions_to_int32         @OPJ_MANGLE_PREFIX@_j2k_mct_read_functions_to_int32
-#define j2k_mct_write_functions_from_float      @OPJ_MANGLE_PREFIX@_j2k_mct_write_functions_from_float
-#define jp2_header                              @OPJ_MANGLE_PREFIX@_jp2_header
-#define j2k_mct_read_functions_to_float         @OPJ_MANGLE_PREFIX@_j2k_mct_read_functions_to_float
-#define jp2_img_header                          @OPJ_MANGLE_PREFIX@_jp2_img_header
-
-#endif
-
-#endif
diff --git a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/opj_config.h.cmake.in b/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/opj_config.h.cmake.in
deleted file mode 100644
index fc720a7c76165e5366f3e069d95de55d050bba31..0000000000000000000000000000000000000000
--- a/Modules/ThirdParty/OpenJPEG/src/otbopenjpeg/opj_config.h.cmake.in
+++ /dev/null
@@ -1,41 +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 _LARGEFILE_SOURCE
-#cmakedefine _LARGE_FILES
-#cmakedefine _FILE_OFFSET_BITS @_FILE_OFFSET_BITS@
-#cmakedefine  HAVE_FSEEKO
-
-
-#cmakedefine HAVE_LIBLCMS1
-#cmakedefine HAVE_LIBLCMS2
-#cmakedefine HAVE_LCMS1_H
-#cmakedefine HAVE_LCMS2_H
-
-/* 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
-