[1.5] Add detail for SOVERSION. Increase VERSION number.

[1.5] Add CHANGES file
[1.5] Tag the new stable 1.5.1 OpenJPEG release
2012-09-13 07:58:05 +00:00 · 2012-09-13 07:54:04 +00:00 · 2012-09-13 07:52:49 +00:00 · 2012-09-10 11:28:38 +00:00 · 2012-09-10 11:16:55 +00:00 · 2012-09-10 09:54:40 +00:00
485 changed files with 20283 additions and 85609 deletions
--- a/4
+++ b/4
@@ -3,10 +3,8 @@ 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 2.0.
+Jerome Fimes implemented the alpha version of OpenJPEG v2.
 Giuseppe Baruffa added the JPWL functionalities.
-Micka<EFBFBD>l Savinaud implemented the final OpenJPEG 2.0 version based on a big merge between 1.5 version and alpha version of 2.0.
-Mathieu Malaterre participated to the OpenJPEG 2.0 version and improved the libraries and utilities. 
 Yannick Verschueren, 
 Herve Drolon, 
 Francois-Olivier Devaux, 
--- a/425
+++ b/425
@@ -0,0 +1,425 @@
+2012-09-10  Mathieu Malaterre
+
+	* [r1920] NEWS: [1.5] update NEWS file
+	* [r1919] libopenjpeg/j2k.c: [1.5] Fix Heap-based buffer-overflow
+	  when decoding openjpeg image
+	  
+	  Thanks to Huzaifa Sidhpurwala of Red Hat Security Response Team
+	  for dataset to reproduce the issue.
+	  Fixes issue 170
+	* [r1917] libopenjpeg/event.c: [1.5] Fix issue with str_length not
+	  being used. Rewrite code to prefer use of vsnprintf to prevent
+	  potential buffer overflow.
+	* [r1914] libopenjpeg/jpwl/crc.c, libopenjpeg/jpwl/jpwl_lib.c:
+	  [1.5] remove extra trailing semicolon
+
+2012-08-24  Mathieu Malaterre
+
+	* [r1899] applications/codec/j2k_dump.c,
+	  applications/jpip/libopenjpip/byte_manager.c,
+	  libopenjpeg/jpwl/jpwl_lib.c, libopenjpeg/tcd.c: [1.5] COMP: Fix
+	  warnings identified by clang31
+	  
+	  openjpeg/libopenjpeg/tcd.c:1884 col 48: warning: comparison of
+	  unsigned expressi
+	  on < 0 is always false
+	  
+	  openjpeg/applications/codec/j2k_dump.c:362 col 29: warning:
+	  equality comparison
+	  with extraneous parentheses
+	  
+	  openjpeg/libopenjpeg/jpwl/jpwl_lib.c:680:19: warning: format
+	  specifies type 'int
+	  ' but the argument has type 'long long' [-Wformat]
+	  printf("Marker@%d: %X\n", cio_tell(cio) - 2, id);
+	  ~^ ~~~~~~~~~~~~~~~~~
+	  %lld
+	  
+	  openjpeg/applications/jpip/libopenjpip/byte_manager.c:58:63:
+	  warning: format spe
+	  cifies type 'long' but the argument has type 'OPJ_OFF_T' (aka
+	  'long long') [-Wfo
+	  rmat]
+	  fprintf( FCGI_stderr, "Error: error in fetch_bytes( %d, %ld,
+	  %lu)\n", fd, offset
+	  , size);
+	  
+	  Author: Hans Johnson <hans-johnson@uiowa.edu>
+
+2012-07-29  Mathieu Malaterre
+
+	* [r1736] applications/jpip/libopenjpip/sock_manager.c: [1.5]
+	  Import portion of patch from Alex Zimnitsky to fix compilation on
+	  FreeBSD
+
+2012-07-11  Mathieu Malaterre
+
+	* [r1733] libopenjpeg/cio.c, libopenjpeg/cio.h: [1.5] Fix
+	  compilation issue with Compiler Borland C++ v. 5.5
+	  
+	  Fixes issue 154
+	* [r1732] libopenjpeg/j2k.c: [1.5] Fix r1727 (Issue 156) to compile
+	  on compilers where false is not defined.
+	* [r1729] libopenjpeg/j2k.c, libopenjpeg/tcd.c: [1.5] This fixes
+	  issues seen on PDF files
+	  
+	  Fixes issue 156
+
+2012-07-10  Mathieu Malaterre
+
+	* [r1727] libopenjpeg/j2k.c: [1.5] Fix heap buffer overflow
+	  
+	  Enforce sanity checks on tile number and tile length, even when
+	  the (rather
+	  broken) USE_JPWL code isn't enabled.
+
+2012-05-29  Mathieu Malaterre
+
+	* [r1705] libopenjpeg/jp2.c: [1.5] jp2_read_boxhdr() call ignores
+	  return value
+	  Fixes issue 91
+	* [r1704] applications/mj2/frames_to_mj2.c, applications/mj2/mj2.c,
+	  applications/mj2/mj2_convert.c: [1.5] Make sure openjpeg/mj2 can
+	  be compiled with gcc -std=c89
+	* [r1703] libopenjpeg/tcd.c: [1.5] This commit hides symptoms of
+	  CVE-2009-5030
+	  
+	  As explained in issue 5, comment 1. This is an easy fix to avoid
+	  memory overrun.
+	  Update issue 5
+	  Update issue 62
+	* [r1702] libopenjpeg/j2k.c,
+	  tests/nonregression/test_suite.ctest.in: [1.5] Applying old patch
+	  from r1642, with further modification from winfried. Also enable
+	  failing test. Everything seems to be working well now.
+	  Fixes issue 150
+	* [r1701] libopenjpeg/tcd.c: [1.5] Import r1669 from trunk over to
+	  1.5 branch
+	* [r1700] libopenjpeg/j2k.c, libopenjpeg/t1.c, libopenjpeg/t2.c,
+	  libopenjpeg/tcd.c: [1.5] Apply private patch from Alex Macfarlane
+	  Smith
+	  This gets rids of a lot memory leaks when used on device with low
+	  memory
+	* [r1696] applications/codec/convert.c, libopenjpeg/jp2.c: [1.5]
+	  The two files in Issue145 have a precision < 8-bit:
+	  therefore 'jp2_read_pclr' must be changed.
+	  
+	  j2k_to_image fails to create RGB/RGBA images with a
+	  precision < 8-bit: therefore 'imagetopng' must be
+	  changed.
+	  Update issue 145
+	* [r1694] libopenjpeg-jpwl.pc.in, libopenjpeg/Makefile.am: [1.5]
+	  Fix autotools installation. Thanks to winfried for patch.
+	  Update issue 149
+	* [r1693] libopenjpeg/opj_malloc.h: [1.5] Fix compilation on
+	  FreeBSD. Thanks to rafael carre (funman@videolan.org) for patch.
+	  
+	  Fixes issue 111
+
+2012-05-21  Mathieu Malaterre
+
+	* [r1686] libopenjpeg/opj_malloc.h: [1.5] Build fails on AIX
+	  
+	  Fixes issue 139
+	* [r1683] doc/man/man1/image_to_j2k.1, doc/man/man1/j2k_to_image.1,
+	  doc/man/man3/libopenjpeg.3: [1.5] Man page syntax fixes. Thanks
+	  to vskytta for patch.
+	  
+	  Fixes issue 147
+	* [r1682] libopenjpeg/tcd.c: [1.5] fix compilation warning about
+	  lrintf being implicit.
+	  
+	  Fixes issue 144
+
+2012-04-23  Mathieu Malaterre
+
+	* [r1649] libopenjpeg/j2k.c: [1.5] Revert r1642, as explained on
+	  https://groups.google.com/group/openjpeg/msg/77a67fef94a0309b
+	* [r1648] tests/nonregression/test_suite.ctest.in: [1.5] Adding
+	  test suite for file409752.jp2
+	* [r1647] CMakeLists.txt: [1.5] Make it easier to find /data from
+	  within 1.5 sub-branch
+	* [r1643] applications/JavaOpenJPEG/JavaOpenJPEG.c,
+	  applications/JavaOpenJPEG/JavaOpenJPEGDecoder.c,
+	  applications/codec/convert.c: [1.5] Integrate patch from winfried
+	  posted on the mailing list. See here for more info:
+	  https://groups.google.com/group/openjpeg/msg/6488859a0dce77
+	* [r1642] libopenjpeg/j2k.c: [1.5] Integrate patch from winfried
+	  posted on the mailing list. See here for more info:
+	  https://groups.google.com/group/openjpeg/msg/1bbf7ae7ddee3a51
+	* [r1640] applications/mj2/extract_j2k_from_mj2.c,
+	  applications/mj2/frames_to_mj2.c, applications/mj2/mj2.h,
+	  applications/mj2/mj2_to_frames.c,
+	  applications/mj2/wrap_j2k_in_mj2.c, libopenjpeg/openjpeg.h: [1.5]
+	  Integrate patch from winfried posted on the mailing list. See
+	  here for more info:
+	  https://groups.google.com/group/openjpeg/msg/7e30b6e288ad5908
+
+2012-04-20  Mathieu Malaterre
+
+	* [r1637] applications/jpip/util/CMakeLists.txt,
+	  applications/jpip/util/addXMLinJP2.c: [1.5] Need to
+	  compile/install tool to embed XML file in JP2 for jpip server
+
+2012-04-19  Mathieu Malaterre
+
+	* [r1636] applications/JavaOpenJPEG/CMakeLists.txt,
+	  applications/jpip/util/CMakeLists.txt: [1.5] jar files are arch
+	  independant. We can install them safely in share
+	* [r1635] applications/jpip/util/CMakeLists.txt: [1.5] Add install
+	  rules for openjpip client
+	* [r1634] applications/JavaOpenJPEG/CMakeLists.txt: [1.5] Add
+	  missing symbols from getopt into the java glue lib
+	* [r1633] applications/JavaOpenJPEG/CMakeLists.txt: [1.5] resolve
+	  missing symbols from convert.c/index.c
+	* [r1632] applications/JavaOpenJPEG/CMakeLists.txt: [1.5] Add
+	  explicit linking from glue java lib to real openjpeg lib
+	* [r1631] applications/JavaOpenJPEG/CMakeLists.txt: [1.5] install
+	  java module
+	* [r1630] CMake/OpenJPEGConfig.cmake.in, CMakeLists.txt: [1.5] Fix
+	  computation of relative path from include/ to lib/
+
+2012-04-18  Mathieu Malaterre
+
+	* [r1629] CMakeLists.txt, libopenjpeg/jpwl/CMakeLists.txt,
+	  tests/unit/testempty1.c, tests/unit/testempty2.c: [1.5] fix
+	  compilation warnings on windows box
+
+2012-04-16  Mathieu Malaterre
+
+	* [r1628] libopenjpeg/jpwl/CMakeLists.txt: [1.5] debian tools
+	  detected a missing link to math lib
+
+2012-04-06  Mathieu Malaterre
+
+	* [r1626] tests/CMakeLists.txt, tests/unit,
+	  tests/unit/CMakeLists.txt, tests/unit/testempty1.c,
+	  tests/unit/testempty2.c: [1.5] Adding some simple unit tests
+
+2012-04-05  Mathieu Malaterre
+
+	* [r1625] CMakeLists.txt: [1.5] introduce fix for the SOVERSION
+	  regression introduced in 1.5.0
+
+2012-03-16  Mathieu Malaterre
+
+	* [r1571] applications/jpip/libopenjpip/j2kheader_manager.c,
+	  applications/jpip/libopenjpip/query_parser.c: [1.5] Remove a
+	  simple warning report
+	* [r1570] applications/jpip/libopenjpip/query_parser.c: [1.5] I
+	  think == was meant here.
+
+2012-03-02  Mathieu Malaterre
+
+	* [r1534] applications/jpip/libopenjpip/channel_manager.c: [1.5]
+	  Remove a warning about undefined snprintf on windows compiler.
+	* [r1533] applications/jpip/libopenjpip/auxtrans_manager.c,
+	  applications/jpip/libopenjpip/byte_manager.h,
+	  applications/jpip/libopenjpip/channel_manager.c,
+	  applications/jpip/libopenjpip/channel_manager.h,
+	  applications/jpip/libopenjpip/codestream_manager.c,
+	  applications/jpip/libopenjpip/j2kheader_manager.c,
+	  applications/jpip/libopenjpip/jp2k_decoder.c,
+	  applications/jpip/libopenjpip/manfbox_manager.c,
+	  applications/jpip/libopenjpip/marker_manager.c,
+	  applications/jpip/libopenjpip/mhixbox_manager.c,
+	  applications/jpip/libopenjpip/session_manager.c,
+	  applications/jpip/libopenjpip/session_manager.h: [1.5] Change the
+	  logic in byte_manager.h. Prefer the use of stdint.h when
+	  available. Default to compiler specific mecanism otherwise.
+	  Remove some c++ comments. Fix signed vs unsigned comparison
+	* [r1527] doc/CMakeLists.txt, doc/Doxyfile.dox.cmake.in: [1.5]
+	  Finish import of r963
+	* [r1526] ., doc/Doxyfile.dox, doc/Doxyfile.dox.cmake.in,
+	  doc/mainpage.dox.cmake[CPY]: [1.5] merge r963 from trunk over to
+	  branch 1.5
+	* [r1524] tests/nonregression/test_suite.ctest.in: [1.5] Convert
+	  from DOS eol to UNIX eol
+	* [r1517] libopenjpeg/jpwl/README.txt, libopenjpeg/jpwl/crc.c,
+	  libopenjpeg/jpwl/jpwl.c: [1.5] Set from DOS eol to UNIX eol
+	* [r1510] libopenjpeg/cidx_manager.c: [1.5] Sync with trunk and
+	  remove uneeded include headers
+	* [r1506] applications/mj2/extract_j2k_from_mj2.c,
+	  applications/mj2/frames_to_mj2.c, applications/mj2/mj2.c: [1.5]
+	  Import rev 1053 from trunk over to 1.5
+	* [r1504] applications/codec/j2k_dump.c: [1.5] Fix typo in date.
+	* [r1496] applications/jpip/libopenjpip/comMakefile.mk[DEL]: [1.5]
+	  Sync with trunk. Remove remainings bits of old Makefile based
+	  build system
+	* [r1492] applications/codec/index.c, applications/codec/index.h,
+	  applications/codec/windirent.h: [1.5] Convert from DOS eol to
+	  UNIX eol
+	* [r1488] applications/OPJViewer/CMakeLists.txt,
+	  applications/OPJViewer/OPJViewer.iss,
+	  applications/OPJViewer/Readme.txt,
+	  applications/OPJViewer/about/about.htm,
+	  applications/OPJViewer/source/OPJAbout.cpp,
+	  applications/OPJViewer/source/OPJChild16.xpm,
+	  applications/OPJViewer/source/OPJDialogs.cpp,
+	  applications/OPJViewer/source/OPJThreads.cpp,
+	  applications/OPJViewer/source/OPJViewer.cpp,
+	  applications/OPJViewer/source/OPJViewer.h,
+	  applications/OPJViewer/source/OPJViewer.rc,
+	  applications/OPJViewer/source/OPJViewer16.xpm,
+	  applications/OPJViewer/source/about_htm.h,
+	  applications/OPJViewer/source/build.h,
+	  applications/OPJViewer/source/imagjpeg2000.cpp,
+	  applications/OPJViewer/source/imagjpeg2000.h,
+	  applications/OPJViewer/source/imagmxf.cpp,
+	  applications/OPJViewer/source/imagmxf.h,
+	  applications/OPJViewer/source/license.txt,
+	  applications/OPJViewer/source/readmeafter.txt,
+	  applications/OPJViewer/source/readmebefore.txt,
+	  applications/OPJViewer/source/wxj2kparser.cpp,
+	  applications/OPJViewer/source/wxjp2parser.cpp: [1.5] Use UNIX eol
+	  for source code
+	* [r1486] INSTALL: [1.5] Sync with trunk.
+	* [r1482] CMakeLists.txt: [1.5] As discussed on the mailing list.
+	  OpenJPEG should be compatible with Multi-Arch distros. Thanks to
+	  Rex for report
+	* [r1481] applications/jpip/libopenjpip/box_manager.c,
+	  applications/jpip/libopenjpip/box_manager.h,
+	  applications/jpip/libopenjpip/boxheader_manager.c,
+	  applications/jpip/libopenjpip/byte_manager.h,
+	  applications/jpip/libopenjpip/cachemodel_manager.c,
+	  applications/jpip/libopenjpip/cachemodel_manager.h,
+	  applications/jpip/libopenjpip/imgreg_manager.c,
+	  applications/jpip/libopenjpip/imgreg_manager.h,
+	  applications/jpip/libopenjpip/jp2k_encoder.c,
+	  applications/jpip/libopenjpip/jpip_parser.c,
+	  applications/jpip/libopenjpip/manfbox_manager.c,
+	  applications/jpip/libopenjpip/manfbox_manager.h,
+	  applications/jpip/libopenjpip/metadata_manager.c,
+	  applications/jpip/libopenjpip/metadata_manager.h,
+	  applications/jpip/libopenjpip/placeholder_manager.c,
+	  applications/jpip/libopenjpip/placeholder_manager.h,
+	  applications/jpip/libopenjpip/target_manager.c,
+	  applications/jpip/libopenjpip/target_manager.h,
+	  applications/jpip/util/jpip_to_j2k.c,
+	  applications/jpip/util/opj_server.c: [1.5] Fix a bunch of
+	  comparison between signed and unsigned integer expressions. Some
+	  are still left to decide.
+
+2012-03-01  Mathieu Malaterre
+
+	* [r1480] applications/jpip/libopenjpip/openjpip.c: [1.5] Fix rev
+	  1474, typo in the spelling.
+	* [r1479] libopenjpeg/jpwl/jpwl.c: [1.5] Fix a warning about
+	  comparison of ulong >= 0. Thanks to winfried for report.
+	* [r1475] applications/codec/convert.c: [1.5] Apply big-endian
+	  patch from winfried: libopenjpeg and WORDS_BIGENDIAN, 2012/02/14
+	* [r1474] applications/jpip/libopenjpip/openjpip.c: Fix a warning
+	  reported on the continuous dashboard for linux.
+	* [r1473] applications/codec/convert.c: [1.5] j2k_to_image does not
+	  support writing image with precision less than 8bits. Simply give
+	  up for now. Thanks to winfried for report. Also add static
+	  keyword for undeclared function in convert.h
+	* [r1472] applications/jpip/libopenjpip/jpipstream_manager.c,
+	  applications/jpip/libopenjpip/jpipstream_manager.h: [1.5] Fix a
+	  warning about conversion from const char* to char*
+	* [r1471] CMakeLists.txt: [1.5] cmake recommends the use of
+	  fullpath. Thanks to winfried for report.
+	* [r1468] libopenjpeg/jpwl/CMakeLists.txt: [1.5] Fix JPWL's DLL
+	  installation. Thanks to winfried for report.
+
+2012-02-29  Kaori Hagihara
+
+	* [r1467] applications/jpip/README: [1.5][JPIP] README modification
+	  regarding the JP2 encoding
+
+2012-02-28  Rex Dieter
+
+	* [r1464] CMakeLists.txt, libopenjpeg/CMakeLists.txt,
+	  libopenjpeg1.pc.cmake: allow finer-grain control of header
+	  location via OPENJPEG_INSTALL_INCLUDE_DIR
+	* [r1463] CMakeLists.txt, libopenjpeg1.pc.cmake: fix assumptions
+	  that OPENJPEG_INSTALL_*_DIR aren't relative paths
+
+2012-02-28  Kaori Hagihara
+
+	* [r1462] applications/jpip/CHANGES,
+	  applications/jpip/libopenjpip/comMakefile.mk,
+	  applications/jpip/libopenjpip/jpip_parser.c,
+	  applications/jpip/libopenjpip/metadata_manager.c,
+	  applications/jpip/libopenjpip/openjpip.c,
+	  applications/jpip/libopenjpip/query_parser.c,
+	  applications/jpip/util/opj_server.c: [1.5][JPIP] enabled the
+	  opj_server to reply the first query consisting with len request
+	  from kakadu client
+
+2012-02-23  Rex Dieter
+
+	* [r1460] libopenjpeg1.pc.cmake, libopenjpeg1.pc.in: fix pkgconfig
+	  to include -I/usr/include/openjpeg-1.5 in cflags (issue #118)
+
+2012-02-17  Mathieu Malaterre
+
+	* [r1444] applications/jpip/util/CMakeLists.txt: [1.5] allow
+	  mecanism to provide JFLAGS
+
+2012-02-16  Mathieu Malaterre
+
+	* [r1437] CMakeLists.txt: only install CHANGES when present
+	* [r1436] applications/jpip/util/opj_dec_server.c: remove a warning
+	  about unused variable
+
+2012-02-14  Mathieu Malaterre
+
+	* [r1435] CMake/CTestCustom.cmake.in: Hide some warnings generated
+	  by 3rd party libs
+	* [r1434] applications/jpip/util/opj_dec_server.c: Make the code
+	  C90 compliant for VS2010
+	* [r1433] applications/jpip/util/CMakeLists.txt: Work around issue
+	  with FindJava module
+
+2012-02-13  Mathieu Malaterre
+
+	* [r1429] applications/jpip/libopenjpip/sock_manager.c: Use C style
+	  comment.
+	* [r1424] applications/jpip/libopenjpip/sock_manager.c: [1.5] Need
+	  to include unistd for close() declaration
+	* [r1423] applications/jpip/util/CMakeLists.txt: By default,
+	  openjpip client can still built even without java compiler. Print
+	  a message to the user as warning.
+	* [r1422] applications/jpip/CMakeLists.txt: [1.5] Fix typo in
+	  CMAKE_USE_PTHREADS vs CMAKE_USE_PTHREADS_INIT
+	* [r1420] CMake/FindFCGI.cmake: [1.5] Backport diff from trunk
+	* [r1419] CMake/FindPTHREAD.cmake[DEL],
+	  applications/jpip/CMakeLists.txt,
+	  applications/jpip/libopenjpip/CMakeLists.txt: [1.5] Remove use of
+	  custom PTHREAD module. Prefer cmake's one.
+
+2012-02-10  Kaori Hagihara
+
+	* [r1405] applications/jpip/CHANGES, applications/jpip/README,
+	  applications/jpip/util/opj_dec_server.c,
+	  applications/jpip/util/opj_viewer/src/ImageManager.java,
+	  applications/jpip/util/opj_viewer/src/ImageWindow.java,
+	  applications/jpip/util/opj_viewer/src/ImgdecClient.java,
+	  applications/jpip/util/opj_viewer_xerces/src/ImageWindow.java:
+	  [1.5][JPIP] added execution argument to set port number for
+	  opj_dec_server, opj_viewer*
+	* [r1404] applications/jpip/CHANGES,
+	  applications/jpip/doc/Doxyfile: [1.5][JPIP] fixed Doxygen
+	  configuration file to document the utilities
+
+2012-02-10  Antonin Descampe
+
+	* [r1403] CMakeLists.txt, libopenjpeg/CMakeLists.txt: [1.5] revert
+	  r1399 and r1400
+	* [r1402] doc/Makefile.am: [1.5] fixed an error in autotools that
+	  prevented the build because no CHANGES file anymore
+
+2012-02-10  Rex Dieter
+
+	* [r1401] CMake/OpenJPEGConfig.cmake.in: make OpenJPEGConfig.cmake
+	  provide useful (non-empty) values
+	* [r1400] libopenjpeg/CMakeLists.txt: make openjpeg.h header
+	  symlink to match autotools
+	* [r1399] CMakeLists.txt: install cmake/pkgconfig bits in LIB_DIR
+
+2012-02-07  Antonin Descampe
+
+	* [r1391] CMake/OpenJPEGCPack.cmake: update OpenJPEGCPack.cmake
+	  with correct package names
+
--- a/CMake/CTestCustom.cmake.in
+++ b/CMake/CTestCustom.cmake.in
@@ -8,11 +8,11 @@
 #
 #----------------------------------------------------------------------

-set(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE 1000000)
-set(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS   50)
-set(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 2000)
+SET(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE 1000000)
+SET(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS   50)
+SET(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 2000)

-set(CTEST_CUSTOM_COVERAGE_EXCLUDE
+SET(CTEST_CUSTOM_COVERAGE_EXCLUDE
  ${CTEST_CUSTOM_COVERAGE_EXCLUDE}

  # Exclude files from the Testing directories
@@ -22,16 +22,13 @@ set(CTEST_CUSTOM_COVERAGE_EXCLUDE
  ".*/thirdparty/.*"
  )

-set(CTEST_CUSTOM_WARNING_EXCEPTION
+SET(CTEST_CUSTOM_WARNING_EXCEPTION
  ${CTEST_CUSTOM_WARNING_EXCEPTION}

  # Suppress warning caused by intentional messages about deprecation
  ".*warning,.* is deprecated"
-  # java also warns about deprecated API
-  ".*java.*deprecation"
-  ".*deprecation.*"
  # supress warnings caused by 3rd party libs:
-  ".*thirdparty.*"
+  ".*/thirdparty/.*"
  "libtiff.*has no symbols"
  "libpng.*has no symbols"
  )
--- a/CMake/FindFCGI.cmake
+++ b/CMake/FindFCGI.cmake
@@ -0,0 +1,20 @@
+# Look for the header file.
+FIND_PATH(FCGI_INCLUDE_DIR NAMES fastcgi.h)
+
+# Look for the library.
+FIND_LIBRARY(FCGI_LIBRARY NAMES fcgi)
+
+# Handle the QUIETLY and REQUIRED arguments and set FCGI_FOUND to TRUE if all listed variables are TRUE.
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(FCGI DEFAULT_MSG FCGI_LIBRARY FCGI_INCLUDE_DIR)
+
+# Copy the results to the output variables.
+IF(FCGI_FOUND)
+	SET(FCGI_LIBRARIES ${FCGI_LIBRARY})
+	SET(FCGI_INCLUDE_DIRS ${FCGI_INCLUDE_DIR})
+ELSE(FCGI_FOUND)
+	SET(FCGI_LIBRARIES)
+	SET(FCGI_INCLUDE_DIRS)
+ENDIF(FCGI_FOUND)
+
+MARK_AS_ADVANCED(FCGI_INCLUDE_DIR FCGI_LIBRARY)
--- a/CMake/FindKAKADU.cmake
+++ b/CMake/FindKAKADU.cmake
@@ -1,24 +1,19 @@
 #
-# this module looks for KAKADU
+# this module looks for KAKADu
 # http://www.kakadusoftware.com/
 #
 #
-#  Copyright (c) 2006-2014 Mathieu Malaterre <mathieu.malaterre@gmail.com>
+#  Copyright (c) 2006-2011 Mathieu Malaterre <mathieu.malaterre@gmail.com>
 #
 #  Redistribution and use is allowed according to the terms of the New
 #  BSD license.
 #  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 #

-find_program(KDU_EXPAND_EXECUTABLE
+FIND_PROGRAM(KDU_EXPAND_EXECUTABLE
  kdu_expand
  )

-find_program(KDU_COMPRESS_EXECUTABLE
-  kdu_compress
-  )
-
-mark_as_advanced(
+MARK_AS_ADVANCED(
  KDU_EXPAND_EXECUTABLE
-  KDU_COMPRESS_EXECUTABLE
  )
--- a/CMake/FindLCMS.cmake
+++ b/CMake/FindLCMS.cmake
@@ -12,20 +12,20 @@
 #=============================================================================
 #=============================================================================

-find_path(LCMS_INCLUDE_DIR lcms.h  PATHS /usr/include /usr/local/include /opt/include /opt/local/include)
+FIND_PATH(LCMS_INCLUDE_DIR lcms.h  PATHS /usr/include /usr/local/include /opt/include /opt/local/include)

-set(LCMS_NAMES ${LCMS_NAMES} lcms liblcms liblcms_static)
+SET(LCMS_NAMES ${LCMS_NAMES} lcms liblcms liblcms_static)

-find_library(LCMS_LIBRARY NAMES ${LCMS_NAMES} )
+FIND_LIBRARY(LCMS_LIBRARY NAMES ${LCMS_NAMES} )

-mark_as_advanced(LCMS_INCLUDE_DIR LCMS_LIBRARY)
+MARK_AS_ADVANCED(LCMS_INCLUDE_DIR LCMS_LIBRARY)

 # handle the QUIETLY and REQUIRED arguments and set LCMS_FOUND to TRUE if
 # all listed variables are TRUE
-include(FindPackageHandleStandardArgs)
+INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(LCMS  DEFAULT_MSG  LCMS_LIBRARY  LCMS_INCLUDE_DIR)

-if(LCMS_FOUND)
-  set( LCMS_INCLUDE_DIRS ${LCMS_INCLUDE_DIR})
-  set( LCMS_LIBRARIES ${LCMS_LIBRARY} )
-endif()
+IF(LCMS_FOUND)
+  SET( LCMS_INCLUDE_DIRS ${LCMS_INCLUDE_DIR})
+  SET( LCMS_LIBRARIES ${LCMS_LIBRARY} )
+ENDIF(LCMS_FOUND)
--- a/CMake/FindLCMS2.cmake
+++ b/CMake/FindLCMS2.cmake
@@ -12,20 +12,20 @@
 #=============================================================================
 #=============================================================================

-find_path(LCMS2_INCLUDE_DIR lcms2.h PATHS /usr/include /usr/local/include /opt/include /opt/local/include)
+FIND_PATH(LCMS2_INCLUDE_DIR lcms2.h PATHS /usr/include /usr/local/include /opt/include /opt/local/include)

-set(LCMS2_NAMES ${LCMS2_NAMES} lcms2 liblcms2 liblcms2_static)
+SET(LCMS2_NAMES ${LCMS2_NAMES} lcms2 liblcms2 liblcms2_static)

-find_library(LCMS2_LIBRARY NAMES ${LCMS2_NAMES} )
+FIND_LIBRARY(LCMS2_LIBRARY NAMES ${LCMS2_NAMES} )

-mark_as_advanced(LCMS2_INCLUDE_DIR LCMS2_LIBRARY)
+MARK_AS_ADVANCED(LCMS2_INCLUDE_DIR LCMS2_LIBRARY)

-# handle the QUIETLY and REQUIRED arguments and set LCMS2_FOUND to TRUE if
+# handle the QUIETLY and REQUIRED arguments and set LCMS2_FOUND to TRUE if 
 # all listed variables are TRUE
-include(FindPackageHandleStandardArgs)
+INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(LCMS2  DEFAULT_MSG  LCMS2_LIBRARY  LCMS2_INCLUDE_DIR)

-if(LCMS2_FOUND)
-  set( LCMS2_INCLUDE_DIRS ${LCMS2_INCLUDE_DIR})
-  set( LCMS2_LIBRARIES ${LCMS2_LIBRARY} )
-endif()
+IF(LCMS2_FOUND)
+  SET( LCMS2_INCLUDE_DIRS ${LCMS2_INCLUDE_DIR})
+  SET( LCMS2_LIBRARIES ${LCMS2_LIBRARY} )
+ENDIF(LCMS2_FOUND)
--- a/CMake/JPIPTestDriver.cmake
+++ b/CMake/JPIPTestDriver.cmake
--- a/CMake/OpenJPEGCPack.cmake
+++ b/CMake/OpenJPEGCPack.cmake
@@ -7,7 +7,7 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
      set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON)
    endif()
    include(${CMAKE_ROOT}/Modules/InstallRequiredSystemLibraries.cmake)
-  endif()
+  endif(EXISTS "${CMAKE_ROOT}/Modules/InstallRequiredSystemLibraries.cmake")

  set(OPJ_PACKAGE_DESCRIPTION_SUMMARY "OpenJPEG - OpenJPEG a JPEG 2000 implementation.")
  set(OPJ_PACKAGE_CONTACT "openjpeg users <openjpeg@googlegroups.com>")
@@ -28,45 +28,43 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")

  # Make this explicit here, rather than accepting the CPack default value,
  # so we can refer to it:
-  set(CPACK_PACKAGE_NAME "${OPENJPEG_LIBRARY_NAME}")
+  SET(CPACK_PACKAGE_NAME "${OPENJPEG_LIBRARY_NAME}")

-  if(NOT DEFINED CPACK_SYSTEM_NAME)
+  IF(NOT DEFINED CPACK_SYSTEM_NAME)
    # make sure package is not Cygwin-unknown, for Cygwin just
    # cygwin is good for the system name
-    if("${CMAKE_SYSTEM_NAME}" STREQUAL "CYGWIN")
-      set(CPACK_SYSTEM_NAME Cygwin)
-    else()
-      set(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR})
-    endif()
-  endif()
-  if(${CPACK_SYSTEM_NAME} MATCHES Windows)
-    if(CMAKE_CL_64)
-      set(CPACK_SYSTEM_NAME win64-x64)
-    else()
-      set(CPACK_SYSTEM_NAME win32-x86)
-    endif()
-  endif()
+    IF("${CMAKE_SYSTEM_NAME}" STREQUAL "CYGWIN")
+      SET(CPACK_SYSTEM_NAME Cygwin)
+    ELSE("${CMAKE_SYSTEM_NAME}" STREQUAL "CYGWIN")
+      SET(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR})
+    ENDIF("${CMAKE_SYSTEM_NAME}" STREQUAL "CYGWIN")
+  ENDIF(NOT DEFINED CPACK_SYSTEM_NAME)
+  IF(${CPACK_SYSTEM_NAME} MATCHES Windows)
+    IF(CMAKE_CL_64)
+      SET(CPACK_SYSTEM_NAME win64-x64)
+    ELSE(CMAKE_CL_64)
+      SET(CPACK_SYSTEM_NAME win32-x86)
+    ENDIF(CMAKE_CL_64)
+  ENDIF(${CPACK_SYSTEM_NAME} MATCHES Windows)

-  if(NOT DEFINED CPACK_PACKAGE_FILE_NAME)
+  IF(NOT DEFINED CPACK_PACKAGE_FILE_NAME)
    # if the CPACK_PACKAGE_FILE_NAME is not defined by the cache
-    # default to source package - system, on cygwin system is not
+    # default to source package - system, on cygwin system is not 
    # needed
-    if(CYGWIN)
-      set(CPACK_PACKAGE_FILE_NAME "${CPACK_SOURCE_PACKAGE_FILE_NAME}")
-    else()
-      set(CPACK_PACKAGE_FILE_NAME
+    IF(CYGWIN)
+      SET(CPACK_PACKAGE_FILE_NAME "${CPACK_SOURCE_PACKAGE_FILE_NAME}")
+    ELSE(CYGWIN)
+      SET(CPACK_PACKAGE_FILE_NAME 
        "${CPACK_SOURCE_PACKAGE_FILE_NAME}-${CPACK_SYSTEM_NAME}")
-    endif()
-  endif()
+    ENDIF(CYGWIN)
+  ENDIF(NOT DEFINED CPACK_PACKAGE_FILE_NAME)

  set(CPACK_BUNDLE_NAME "OpenJPEG ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
-  if(APPLE)
-    configure_file(${CMAKE_ROOT}/Templates/AppleInfo.plist
-      ${CMAKE_CURRENT_BINARY_DIR}/opj.plist)
-    set(CPACK_BUNDLE_PLIST
-      ${CMAKE_CURRENT_BINARY_DIR}/opj.plist)
-    #include(BundleUtilities)
-  endif()
+  configure_file(${CMAKE_ROOT}/Templates/AppleInfo.plist
+    ${CMAKE_CURRENT_BINARY_DIR}/opj.plist)
+  SET(CPACK_BUNDLE_PLIST
+    ${CMAKE_CURRENT_BINARY_DIR}/opj.plist)
+  #include(BundleUtilities)

  include(CPack)
 endiF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
--- a/CMake/OpenJPEGConfig.cmake.in
+++ b/CMake/OpenJPEGConfig.cmake.in
@@ -0,0 +1,54 @@
+#-----------------------------------------------------------------------------
+#
+# OPENJPEGConfig.cmake - CMake configuration file for external projects.
+#
+# This file is configured by OPENJPEG and used by the UseOPENJPEG.cmake
+# module to load OPENJPEG's settings for an external project.
+@OPENJPEG_CONFIG_INSTALL_ONLY@
+# The OPENJPEG version number.
+SET(OPENJPEG_MAJOR_VERSION "@OPENJPEG_VERSION_MAJOR@")
+SET(OPENJPEG_MINOR_VERSION "@OPENJPEG_VERSION_MINOR@")
+SET(OPENJPEG_BUILD_VERSION "@OPENJPEG_VERSION_BUILD@")
+
+# The libraries.
+SET(OPENJPEG_LIBRARIES "@OPENJPEG_LIBRARY_NAME@")
+
+# The CMake macros dir.
+SET(OPENJPEG_CMAKE_DIR "@OPENJPEG_INSTALL_PACKAGE_DIR@")
+
+# The configuration options.
+SET(OPENJPEG_BUILD_SHARED_LIBS "@BUILD_SHARED_LIBS@")
+
+# The "use" file.
+SET(OPENJPEG_USE_FILE "@OPENJPEG_USE_FILE_CONFIG@")
+
+get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+# The following is inspired from:
+# http://www.cmake.org/Wiki/CMake/Tutorials/Packaging#Packaging_and_Exporting
+# However the following is difficult to handle:
+# get_filename_component(myproj_INCLUDE_DIRS "${SELF_DIR}/../../include/myproj" ABSOLUTE)
+# it asssumes a non multi-arch system, where 'include' is located '../include' from lib
+# therefore we need to take into account the number of subdirs in OPENJPEG_INSTALL_LIB_DIR
+if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
+  # This is an install tree
+  include(${SELF_DIR}/OpenJPEGTargets.cmake)
+  get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/@relative_parent@/@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE)
+  set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_ROOT})
+
+else(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
+  if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake)
+    # This is a build tree
+    SET( OPENJPEG_INCLUDE_DIRS @OPENJPEG_INCLUDE_PATH@)
+
+    include(${SELF_DIR}/OpenJPEGExports.cmake)
+
+  else(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake)
+    message(FATAL_ERROR "ooops")
+  endif(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake)
+endif(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
+
+set(OPENJPEG_USE_FILE ${SELF_DIR}/UseOPENJPEG.cmake)
+
+# Backward compatible part:
+SET(OPENJPEG_FOUND       TRUE)
+
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,38 +6,37 @@
 # you will eventually like to prefix the library to avoid linking confusion
 # For this purpose you can define a CMake var: OPENJPEG_NAMESPACE to whatever you like
 # e.g.:
-# set(OPENJPEG_NAMESPACE "GDCMOPENJPEG")
-cmake_minimum_required(VERSION 2.8.2)
+# SET(OPENJPEG_NAMESPACE "GDCMOPENJPEG")
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)

-if(COMMAND CMAKE_POLICY)
-  cmake_policy(SET CMP0003 NEW)
-endif()
+IF(COMMAND CMAKE_POLICY)
+  CMAKE_POLICY(SET CMP0003 NEW)
+ENDIF(COMMAND CMAKE_POLICY)

-if(NOT OPENJPEG_NAMESPACE)
-  set(OPENJPEG_NAMESPACE "OPENJPEG")
-  set(OPENJPEG_STANDALONE 1)
-endif()
+IF(NOT OPENJPEG_NAMESPACE)
+  SET(OPENJPEG_NAMESPACE "OPENJPEG")
+  SET(OPENJPEG_STANDALONE 1)
+ENDIF(NOT OPENJPEG_NAMESPACE)
 # In all cases:
-#string(TOLOWER ${OPENJPEG_NAMESPACE} OPENJPEG_LIBRARY_NAME)
-set(OPENJPEG_LIBRARY_NAME openjp2)
+STRING(TOLOWER ${OPENJPEG_NAMESPACE} OPENJPEG_LIBRARY_NAME)

-project(${OPENJPEG_NAMESPACE} C)
+PROJECT(${OPENJPEG_NAMESPACE} C)

 # Do full dependency headers.
-include_regular_expression("^.*$")
+INCLUDE_REGULAR_EXPRESSION("^.*$")

 #-----------------------------------------------------------------------------
 # OPENJPEG version number, useful for packaging and doxygen doc:
-set(OPENJPEG_VERSION_MAJOR 2)
-set(OPENJPEG_VERSION_MINOR 0)
-set(OPENJPEG_VERSION_BUILD 1)
-set(OPENJPEG_VERSION
+SET(OPENJPEG_VERSION_MAJOR 1)
+SET(OPENJPEG_VERSION_MINOR 5)
+SET(OPENJPEG_VERSION_BUILD 1)
+SET(OPENJPEG_VERSION
  "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}")
-set(PACKAGE_VERSION
+SET(PACKAGE_VERSION
  "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}")

 # Because autotools does not support X.Y notation for SOVERSION, we have to use
-# two numbering, one for the openjpeg version and one for openjpeg soversion
+# two numerorations, one for the openjpeg version and one for openjpeg soversion
 # version | soversion
 #   1.0   |  0
 #   1.1   |  1
@@ -47,33 +46,32 @@ set(PACKAGE_VERSION
 #   1.5   |  5
 #   1.5.1 |  5
 #   2.0   |  6
-#   2.0.1 |  6
 # above is the recommendation by the OPJ team. If you really need to override this default,
 # you can specify your own OPENJPEG_SOVERSION at cmake configuration time:
 # cmake -DOPENJPEG_SOVERSION:STRING=42 /path/to/openjpeg
 if(NOT OPENJPEG_SOVERSION)
-  SET(OPENJPEG_SOVERSION 7)
+  SET(OPENJPEG_SOVERSION 5)
 endif(NOT OPENJPEG_SOVERSION)
-set(OPENJPEG_LIBRARY_PROPERTIES
+SET(OPENJPEG_LIBRARY_PROPERTIES
  VERSION   "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}"
  SOVERSION "${OPENJPEG_SOVERSION}"
 )

 # --------------------------------------------------------------------------
 # Path to additional CMake modules
-set(CMAKE_MODULE_PATH
-    ${CMAKE_SOURCE_DIR}/cmake
+SET(CMAKE_MODULE_PATH
+    ${CMAKE_SOURCE_DIR}/CMake
    ${CMAKE_MODULE_PATH})

 # --------------------------------------------------------------------------
 # On Visual Studio 8 MS deprecated C. This removes all 1.276E1265 security
 # warnings
-if(WIN32)
-  if(NOT BORLAND)
-    if(NOT CYGWIN)
-      if(NOT MINGW)
-        if(NOT ITK_ENABLE_VISUAL_STUDIO_DEPRECATED_C_WARNINGS)
-          add_definitions(
+IF(WIN32)
+  IF(NOT BORLAND)
+    IF(NOT CYGWIN)
+      IF(NOT MINGW)
+        IF(NOT ITK_ENABLE_VISUAL_STUDIO_DEPRECATED_C_WARNINGS)
+          ADD_DEFINITIONS(
            -D_CRT_FAR_MAPPINGS_NO_DEPRECATE
            -D_CRT_IS_WCTYPE_NO_DEPRECATE
            -D_CRT_MANAGED_FP_NO_DEPRECATE
@@ -85,267 +83,215 @@ if(WIN32)
            -D_CRT_VCCLRIT_NO_DEPRECATE
            -D_SCL_SECURE_NO_DEPRECATE
            )
-        endif()
-      endif()
-    endif()
-  endif()
-endif()
+        ENDIF(NOT ITK_ENABLE_VISUAL_STUDIO_DEPRECATED_C_WARNINGS)
+      ENDIF(NOT MINGW)
+    ENDIF(NOT CYGWIN)
+  ENDIF(NOT BORLAND)
+ENDIF(WIN32)


 # --------------------------------------------------------------------------
 # Install directories

-string(TOLOWER ${PROJECT_NAME} projectname)
-set(OPENJPEG_INSTALL_SUBDIR "${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}")
+STRING(TOLOWER ${PROJECT_NAME} projectname)
+SET(OPENJPEG_INSTALL_SUBDIR "${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}")

-if(NOT OPENJPEG_INSTALL_BIN_DIR)
-  set(OPENJPEG_INSTALL_BIN_DIR "bin")
-endif()
+IF(NOT OPENJPEG_INSTALL_BIN_DIR)
+  SET(OPENJPEG_INSTALL_BIN_DIR "bin")
+ENDIF(NOT OPENJPEG_INSTALL_BIN_DIR)

-if(NOT OPENJPEG_INSTALL_LIB_DIR)
-  set(OPENJPEG_INSTALL_LIB_DIR "lib")
-endif()
+IF(NOT OPENJPEG_INSTALL_LIB_DIR)
+  SET(OPENJPEG_INSTALL_LIB_DIR "lib")
+ENDIF(NOT OPENJPEG_INSTALL_LIB_DIR)

-if(NOT OPENJPEG_INSTALL_SHARE_DIR)
-  set(OPENJPEG_INSTALL_SHARE_DIR "share")
-endif()
+# The following will compute the amount of parent dir to go
+# from include to lib. it works nicely with 
+# OPENJPEG_INSTALL_LIB_DIR=lib
+# OPENJPEG_INSTALL_LIB_DIR=lib/
+# OPENJPEG_INSTALL_LIB_DIR=/lib
+# OPENJPEG_INSTALL_LIB_DIR=lib/gnu-linux-x64
+STRING(REPLACE "/" ";" relative_to_lib ${OPENJPEG_INSTALL_LIB_DIR})
+set(relative_parent "..")
+foreach( elem ${relative_to_lib})
+  set( relative_parent "${relative_parent}/.." )
+endforeach()

-if(NOT OPENJPEG_INSTALL_DATA_DIR)
-  set(OPENJPEG_INSTALL_DATA_DIR "${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
-endif()
+IF(NOT OPENJPEG_INSTALL_SHARE_DIR)
+  SET(OPENJPEG_INSTALL_SHARE_DIR "share")
+ENDIF(NOT OPENJPEG_INSTALL_SHARE_DIR)

-if(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
-  set(OPENJPEG_INSTALL_INCLUDE_DIR "include/${OPENJPEG_INSTALL_SUBDIR}")
-endif()
+IF(NOT OPENJPEG_INSTALL_DATA_DIR)
+  SET(OPENJPEG_INSTALL_DATA_DIR "${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
+ENDIF(NOT OPENJPEG_INSTALL_DATA_DIR)

-if(NOT OPENJPEG_INSTALL_MAN_DIR)
-  set(OPENJPEG_INSTALL_MAN_DIR "share/man/")
-endif()
+IF(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
+  SET(OPENJPEG_INSTALL_INCLUDE_DIR "include/${OPENJPEG_INSTALL_SUBDIR}")
+ENDIF(NOT OPENJPEG_INSTALL_INCLUDE_DIR)

-if(NOT OPENJPEG_INSTALL_DOC_DIR)
-  set(OPENJPEG_INSTALL_DOC_DIR "share/doc/${OPENJPEG_INSTALL_SUBDIR}")
-endif()
+IF(NOT OPENJPEG_INSTALL_MAN_DIR)
+  SET(OPENJPEG_INSTALL_MAN_DIR "share/man/")
+ENDIF(NOT OPENJPEG_INSTALL_MAN_DIR)

-if(NOT OPENJPEG_INSTALL_JNI_DIR)
-  if(WIN32)
-    set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_BIN_DIR})
-  else()
-    set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_LIB_DIR})
-  endif()
-endif()
+IF(NOT OPENJPEG_INSTALL_DOC_DIR)
+  SET(OPENJPEG_INSTALL_DOC_DIR "share/doc/${OPENJPEG_INSTALL_SUBDIR}")
+ENDIF(NOT OPENJPEG_INSTALL_DOC_DIR)

-if(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
+IF(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
  # We could install *.cmake files in share/ however those files contains
  # hardcoded path to libraries on a multi-arch system (fedora/debian) those
  # path will be different (lib/i386-linux-gnu vs lib/x86_64-linux-gnu)
-  set(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
-endif()
+  SET(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
+ENDIF(NOT OPENJPEG_INSTALL_PACKAGE_DIR)

 #-----------------------------------------------------------------------------
 # Big endian test:
-include (${CMAKE_ROOT}/Modules/TestBigEndian.cmake)
+INCLUDE (${CMAKE_ROOT}/Modules/TestBigEndian.cmake)
 TEST_BIG_ENDIAN(OPJ_BIG_ENDIAN)

 #-----------------------------------------------------------------------------
 # Setup file for setting custom ctest vars
-configure_file(
-  ${CMAKE_SOURCE_DIR}/cmake/CTestCustom.cmake.in
+CONFIGURE_FILE(
+  ${CMAKE_SOURCE_DIR}/CMake/CTestCustom.cmake.in
  ${CMAKE_BINARY_DIR}/CTestCustom.cmake
  @ONLY
  )

 #-----------------------------------------------------------------------------
 # OpenJPEG build configuration options.
-option(BUILD_SHARED_LIBS "Build OpenJPEG shared library and link executables against it." ON)
-set (EXECUTABLE_OUTPUT_PATH ${OPENJPEG_BINARY_DIR}/bin CACHE PATH "Single output directory for building all executables.")
-set (LIBRARY_OUTPUT_PATH ${OPENJPEG_BINARY_DIR}/bin CACHE PATH "Single output directory for building all libraries.")
-mark_as_advanced(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH)
+OPTION(BUILD_SHARED_LIBS "Build OpenJPEG shared library and link executables against it." ON)
+SET (EXECUTABLE_OUTPUT_PATH ${OPENJPEG_BINARY_DIR}/bin CACHE PATH "Single output directory for building all executables.")
+SET (LIBRARY_OUTPUT_PATH ${OPENJPEG_BINARY_DIR}/bin CACHE PATH "Single output directory for building all libraries.")
+MARK_AS_ADVANCED(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH)

 #-----------------------------------------------------------------------------
 # configure name mangling to allow multiple libraries to coexist
 # peacefully
-if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in)
-set(MANGLE_PREFIX ${OPENJPEG_LIBRARY_NAME})
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in
+IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in)
+SET(MANGLE_PREFIX ${OPENJPEG_LIBRARY_NAME})
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in
               ${CMAKE_CURRENT_BINARY_DIR}/openjpeg_mangle.h
               @ONLY)
-endif()
+ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle.h.in)
+
+#-----------------------------------------------------------------------------
+# pkgconfig support
+IF(UNIX)
+  # install in lib and not share (see multi-arch note above)
+  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libopenjpeg1.pc.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc @ONLY)
+  INSTALL( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc DESTINATION
+    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
+  INSTALL( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink
+  \"libopenjpeg1.pc\"
+  \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_SHARE_DIR}/pkgconfig/libopenjpeg.pc\")")
+ENDIF(UNIX)

 #-----------------------------------------------------------------------------
 # Compiler specific flags:
-if(CMAKE_COMPILER_IS_GNUCC)
+IF(CMAKE_COMPILER_IS_GNUCC)
  # For all builds, make sure openjpeg is std99 compliant:
-  # set(CMAKE_C_FLAGS "-Wall -std=c99 ${CMAKE_C_FLAGS}") # FIXME: this setting prevented us from setting a coverage build.
+  # SET(CMAKE_C_FLAGS "-Wall -std=c99 ${CMAKE_C_FLAGS}") # FIXME: this setting prevented us from setting a coverage build.
  # Do not use ffast-math for all build, it would produce incorrect results, only set for release:
-  set(CMAKE_C_FLAGS_RELEASE "-ffast-math ${CMAKE_C_FLAGS_RELEASE}")
-endif()
+  SET(CMAKE_C_FLAGS_RELEASE "-ffast-math ${CMAKE_C_FLAGS_RELEASE}")
+ENDIF(CMAKE_COMPILER_IS_GNUCC)

 #-----------------------------------------------------------------------------
 # opj_config.h generation (1/2)
-
-# Check if some include files are provided by the system
-include(EnsureFileInclude)
-# These files are mandatory
-ensure_file_include("string.h"   HAVE_STRING_H YES)
-ensure_file_include("memory.h"   HAVE_MEMORY_H YES)
-ensure_file_include("stdlib.h"   HAVE_STDLIB_H YES)
-ensure_file_include("stdio.h"    HAVE_STDIO_H  YES)
-ensure_file_include("math.h"     HAVE_MATH_H   YES)
-ensure_file_include("float.h"    HAVE_FLOAT_H  YES)
-ensure_file_include("time.h"     HAVE_TIME_H   YES)
-ensure_file_include("stdarg.h"   HAVE_STDARG_H YES)
-ensure_file_include("ctype.h"    HAVE_CTYPE_H  YES)
-ensure_file_include("assert.h"   HAVE_ASSERT_H YES)
-
-# For the following files, we provide an alternative, they are not mandatory
-ensure_file_include("stdint.h"   OPJ_HAVE_STDINT_H   NO)
-ensure_file_include("inttypes.h" OPJ_HAVE_INTTYPES_H NO)
-
-# why check this one ? for openjpip ?
-include (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
+INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
 CHECK_INCLUDE_FILE("strings.h"      HAVE_STRINGS_H)
+CHECK_INCLUDE_FILE("inttypes.h"     HAVE_INTTYPES_H)
+CHECK_INCLUDE_FILE("memory.h"       HAVE_MEMORY_H)
+CHECK_INCLUDE_FILE("stdint.h"       HAVE_STDINT_H)
+CHECK_INCLUDE_FILE("stdlib.h"       HAVE_STDLIB_H)
+CHECK_INCLUDE_FILE("string.h"       HAVE_STRING_H)
 CHECK_INCLUDE_FILE("sys/stat.h"     HAVE_SYS_STAT_H)
 CHECK_INCLUDE_FILE("sys/types.h"    HAVE_SYS_TYPES_H)
 CHECK_INCLUDE_FILE("unistd.h"       HAVE_UNISTD_H)

-# Enable Large file support
-include(TestLargeFiles)
-OPJ_TEST_LARGE_FILES(OPJ_HAVE_LARGEFILES)

 #-----------------------------------------------------------------------------
 # Build Library
-if(BUILD_JPIP_SERVER)
-  find_package(CURL REQUIRED)
-  find_package(FCGI REQUIRED)
-  find_package(Threads REQUIRED)
-  if(NOT CMAKE_USE_PTHREADS_INIT)
-    message(FATAL_ERROR "Only pthread are supported")
-  endif()
-endif()
-add_subdirectory(src/lib)
+INCLUDE_DIRECTORIES(BEFORE ${OPENJPEG_BINARY_DIR})
+ADD_SUBDIRECTORY(libopenjpeg)

 #-----------------------------------------------------------------------------
 # Build Applications
-option(BUILD_CODEC "Build the CODEC executables" ON)
-option(BUILD_MJ2 "Build the MJ2 executables." OFF)
-option(BUILD_JPWL "Build the JPWL library and executables" OFF)
-option(BUILD_JPIP "Build the JPIP library and executables." OFF)
-if(BUILD_JPIP)
-  option(BUILD_JPIP_SERVER "Build the JPIP server." OFF)
-endif()
-option(BUILD_VIEWER "Build the OPJViewer executable (C++)" OFF)
-option(BUILD_JAVA "Build the openjpeg jar (Java)" OFF)
-option(BUILD_JP3D "Build the JP3D comp" OFF)
-mark_as_advanced(BUILD_VIEWER)
-mark_as_advanced(BUILD_JAVA)
-mark_as_advanced(BUILD_JP3D)
+OPTION(BUILD_CODEC "Build the CODEC executables" ON)
+OPTION(BUILD_MJ2 "Build the MJ2 executables." OFF)
+OPTION(BUILD_JPWL "Build the JPWL library and executables" OFF)
+OPTION(BUILD_JPIP "Build the JPIP library and executables." OFF)
+IF(BUILD_JPIP)
+  OPTION(BUILD_JPIP_SERVER "Build the JPIP server." OFF)
+ENDIF(BUILD_JPIP)
+OPTION(BUILD_VIEWER "Build the OPJViewer executable (C++)" OFF)
+OPTION(BUILD_JAVA "Build the openjpeg jar (Java)" OFF)
+MARK_AS_ADVANCED(BUILD_VIEWER)
+MARK_AS_ADVANCED(BUILD_JAVA)

-if(BUILD_CODEC OR BUILD_MJ2)
+IF(BUILD_CODEC OR BUILD_MJ2)
  # OFF: It will only build 3rd party libs if they are not found on the system
  # ON: 3rd party libs will ALWAYS be build, and used
-  option(BUILD_THIRDPARTY "Build the thirdparty executables if it is needed" OFF)
-  add_subdirectory(thirdparty)
-  add_subdirectory(src/bin)
-endif ()
-add_subdirectory(wrapping)
+  OPTION(BUILD_THIRDPARTY "Build the thirdparty executables if it is needed" OFF)
+  ADD_SUBDIRECTORY(thirdparty)
+  ADD_SUBDIRECTORY(applications)
+ENDIF (BUILD_CODEC OR BUILD_MJ2)

 #-----------------------------------------------------------------------------
 # opj_config.h generation (2/2)
-configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/opj_config.h.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/src/lib/openjp2/opj_config.h
- @ONLY
- )
- 
- configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/opj_config_private.h.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/src/lib/openjp2/opj_config_private.h
+CONFIGURE_FILE("${OPENJPEG_SOURCE_DIR}/opj_config.h.cmake.in"
+ "${OPENJPEG_BINARY_DIR}/opj_config.h"
 @ONLY
 )

 #-----------------------------------------------------------------------------
 # Build DOCUMENTATION (not in ALL target and only if Doxygen is found)
-option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF)
-if(BUILD_DOC)
-  add_subdirectory(doc)
-endif()
+OPTION(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF)
+IF(BUILD_DOC)
+    ADD_SUBDIRECTORY(doc)
+ENDIF(BUILD_DOC)

 #-----------------------------------------------------------------------------
 # Buld Testing
-option(BUILD_TESTING "Build the tests." OFF)
-if(BUILD_TESTING)
-  if(BUILD_CODEC)
-    enable_testing()
-    include(CTest)
-
+OPTION(BUILD_TESTING "Build the tests." OFF)
+IF(BUILD_TESTING)
+  IF(BUILD_CODEC)
+    ENABLE_TESTING()
+    INCLUDE(CTest)
+  
    # Search openjpeg data needed for the tests
    # They could be found via svn on the OpenJPEG google code project
-    # svn checkout http://openjpeg.googlecode.com/svn/data (about 70 Mo)
-    find_path(OPJ_DATA_ROOT README-OPJ-Data
-      PATHS $ENV{OPJ_DATA_ROOT} ${CMAKE_SOURCE_DIR}/../../data
-      NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+    # svn checkout http://openjpeg.googlecode.com/svn/data (about 70 Mo) 
+    FIND_PATH(OPJ_DATA_ROOT README-OPJ-Data
+      PATHS
+      $ENV{OPJ_DATA_ROOT}
+      ${CMAKE_SOURCE_DIR}/../data
+      ${CMAKE_SOURCE_DIR}/../../data
      )

    # Add repository where to find tests
-    add_subdirectory(tests)
-
-  else()
+    ADD_SUBDIRECTORY(tests)
+    
+  ELSE(BUILD_CODEC)
    message(FATAL_ERROR "You need build codec to run the tests")
-  endif()
-endif()
+  ENDIF(BUILD_CODEC)
+ENDIF(BUILD_TESTING)

 #-----------------------------------------------------------------------------
 # install all targets referenced as OPENJPEGTargets
-install(EXPORT OpenJPEGTargets DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR})
-configure_file( ${OPENJPEG_SOURCE_DIR}/cmake/OpenJPEGConfig.cmake.in
+INSTALL(EXPORT OpenJPEGTargets DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR})
+CONFIGURE_FILE( ${OPENJPEG_SOURCE_DIR}/CMake/OpenJPEGConfig.cmake.in
  ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
  @ONLY
 )
-install( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
+INSTALL( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
  DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}
 )

 #-----------------------------------------------------------------------------
 # install CHANGES and LICENSE
-if(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES)
-  install(FILES CHANGES DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
-endif()
-install(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
+IF(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES)
+  INSTALL(FILES CHANGES DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
+ENDIF(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES)
+INSTALL(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})

-include (cmake/OpenJPEGCPack.cmake)
-
-#-----------------------------------------------------------------------------
-# pkgconfig support
-if(UNIX)
-  # install in lib and not share (see multi-arch note above)
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in
-    ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY)
-  install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc DESTINATION
-    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
-#
-  if(BUILD_JPWL)
-  # install in lib and not share (see multi-arch note above)
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpwl/libopenjpwl.pc.cmake.in
-    ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc @ONLY)
-  install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc DESTINATION
-    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
-  endif()
-#
-  if(BUILD_JPIP)
-  # install in lib and not share (see multi-arch note above)
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpip/libopenjpip.pc.cmake.in
-    ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc @ONLY)
-  install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc DESTINATION
-    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
-  endif()
-#
-  if(BUILD_JP3D)
-  # install in lib and not share (see multi-arch note above)
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp3d/libopenjp3d.pc.cmake.in
-    ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc @ONLY)
-  install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc DESTINATION
-    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
-  endif()
-endif()
-
-#-----------------------------------------------------------------------------
+INCLUDE (CMake/OpenJPEGCPack.cmake)
--- a/73
+++ b/73
@@ -2,10 +2,63 @@
 How to build and install openjpeg binaries
 ==========================================

-UNIX/LINUX/MacOSX/Windows systems
+UNIX/LINUX similar systems
 --------------------------

-Using cmake (see www.cmake.org)
+1) Using autotools
+
+It is highly recommended that pkg-config is installed. If needed, you have to
+properly set the environment variable PKG_CONFIG_PATH so that the .pc files
+are found.
+
+To build from top-level directory, you can simply type: 
+  ./bootstrap.sh
+  ./configure
+  make
+
+To keep all build files in a separate directory, you can type instead: 
+  ./bootstrap.sh
+  mkdir build
+  cd build
+  ../configure
+  make
+
+To install:
+  sudo make install
+  
+To clean:
+  make clean
+  make distclean
+
+To build doc (requires 'doxygen' to be found on your system):
+(this will create an html directory in TOP_LEVEL/doc)
+  make doc
+
+Main './configure' options (type './configure --help' for more details)
+  '--enable-mj2'
+  '--enable-jpwl'
+  '--enable-jpip'
+  '--prefix=/path/to/install/directory' (example : '--prefix=$PWD/installed')
+  '--enable-debug' (default : disabled)
+
+You can also specify your own CFLAGS and LDFLAGS with (for example):
+  CFLAGS="-O3 -pipe" LDFLAGS="-Wl,-s" ./configure
+
+The (optional) dependencies of some binaries are libpng, libtiff, libcms 1 or 2
+and FastCGI. Only libtiff and FastCGI have no .pc file. There should be some
+automatic detection if they are installed in /usr, /usr/local or /opt/local.
+Otherwise, you can tune their detection (as well as for libpng and libcms1 or 2
+too) with the environment variables:
+
+TIFF_CFLAGS
+TIFF_LIBS
+FCGI_CFLAGS
+FCGI_LIBS
+
+See './configure --help' output for more details.
+
+
+2) Using cmake (see www.cmake.org)

 Type:
  cmake .
@@ -31,15 +84,9 @@ Main available cmake flags:
 * To build the shared libraries and links the executables against it: '-DBUILD_SHARED_LIBS:bool=on' (default: 'ON')
  Note: when using this option, static libraries are not built and executables are dynamically linked.
 * To build the CODEC executables: '-DBUILD_CODEC:bool=on' (default: 'ON')
-* To build the documentation: '-DBUILD_DOC:bool=on' (default: 'OFF')
 * To build the MJ2 executables: '-DBUILD_MJ2:bool=on' (default: 'OFF')
 * To build the JPWL executables and JPWL library: '-DBUILD_JPWL:bool=on' (default: 'OFF')
 * To build the JPIP library and utilities: '-DBUILD_JPIP:bool=on' (default: 'OFF')
-** To build the JPIP server: '-DBUILD_JPIP_SERVER:bool=on' (default: 'OFF')
-* To build the JP3D library and utilities: '-DBUILD_JP3D:bool=on' (default: 'OFF') (experimental)
-* To build the Java binding: '-DBUILD_JAVA:bool=on' (default: 'OFF') (experimental).
-** to choose which java implementation, you can set your JAVA_HOME env var.
-* To build the wxWidgets/C++ viewer: 'BUILD_VIEWER:BOOL=ON' (default OFF) (experimental)
 * To enable testing (and automatic result upload to http://my.cdash.org/index.php?project=OPENJPEG):
    cmake . -DBUILD_TESTING:BOOL=ON -DOPJ_DATA_ROOT:PATH='path/to/the/data/directory'
    make
@@ -52,7 +99,7 @@ Main available cmake flags:
 MACOSX
 ------

-The same building procedures as above work for MACOSX.
+The same building procedures as above (autotools and cmake) work for MACOSX.
 The xcode project file can also be used.

 If it does not work, try adding the following flag to the cmake command : 
@@ -61,9 +108,7 @@ If it does not work, try adding the following flag to the cmake command :
 WINDOWS
 -------

-You can use cmake to generate project files for the IDE you are using (VS2010, NMake, etc).
+If you're using cygwin or MinGW+MSYS, the same procedures as for Unix can be used. 
+
+Otherwise you can use cmake to generate project files for the IDE you are using (VC2010, etc).
 Type 'cmake --help' for available generators on your platform.
-
-Make sure to build the third party libs (png, zlib ...):
-
-  '-DBUILD_THIRDPARTY:BOOL=ON'
--- a/14
+++ b/14
@@ -1,19 +1,11 @@
 /*
- * The copyright in this software is being made available under the 2-clauses 
- * BSD License, included below. This software may be subject to other third 
- * party and contributor rights, including patent rights, and no such rights
- * are granted under this license.
- *
- * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2014, Professor Benoit Macq
- * Copyright (c) 2003-2014, Antonin Descampe
+ * Copyright (c) 2002-2012, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2012, Professor Benoit Macq
+ * Copyright (c) 2003-2012, Antonin Descampe
 * Copyright (c) 2003-2009, Francois-Olivier Devaux
 * Copyright (c) 2005, Herve Drolon, FreeImage Team
 * Copyright (c) 2002-2003, Yannick Verschueren
 * Copyright (c) 2001-2003, David Janssens
- * Copyright (c) 2011-2012, Centre National d'Etudes Spatiales (CNES), France 
- * Copyright (c) 2012, CS Systemes d'Information, France
- *
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/Makefile.am
+++ b/Makefile.am
@@ -0,0 +1,75 @@
+DISTCHECK_CONFIGURE_FLAGS = --enable-jpip=yes --enable-jpip-server=yes --enable-jpwl=yes --enable-mj2=yes
+
+ACLOCAL_AMFLAGS = -I m4
+
+SUBDIRS = libopenjpeg applications doc
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libopenjpeg1.pc
+
+if WANT_JPWL
+pkgconfig_DATA += libopenjpeg-jpwl.pc
+endif
+
+
+MAINTAINERCLEANFILES = \
+Makefile.in \
+aclocal.m4 \
+config.guess \
+opj_config.h.in \
+opj_config.h.in~ \
+config.sub \
+configure \
+depcomp \
+install-sh \
+ltmain.sh \
+missing
+
+EXTRA_DIST = \
+CMake/CTestCustom.cmake.in \
+CMake/FindFCGI.cmake \
+CMake/FindLCMS2.cmake \
+CMake/FindLCMS.cmake \
+CMake/OpenJPEGConfig.cmake.in \
+CMakeLists.txt \
+CTestConfig.cmake \
+AUTHORS \
+CHANGES \
+INSTALL \
+LICENSE \
+NEWS \
+README \
+THANKS \
+bootstrap.sh \
+libopenjpeg1.pc.cmake \
+libopenjpeg1.pc.in \
+libopenjpeg-jpwl.pc.in \
+opj_config.h.cmake.in \
+m4/opj_check_lib.m4 \
+m4/opj_doxygen.m4 \
+m4/pkg.m4
+
+.PHONY: doc
+
+# Documentation
+
+doc:
+	@echo "entering doc/"
+	@cd doc && make doc
+
+install-data-hook:
+if HAVE_WIN32
+	$(LN_S) -f libopenjpeg1.pc $(DESTDIR)$(pkgconfigdir)/libopenjpeg.pc
+else
+	$(LN_S) -nf libopenjpeg1.pc $(DESTDIR)$(pkgconfigdir)/libopenjpeg.pc
+endif
+	@echo -e " (PC)\t$(pkgconfigdir)/libopenjpeg1.pc" >> $(top_builddir)/report.txt
+	@echo -e " (LN)\t$(pkgconfigdir)/libopenjpeg.pc" >> $(top_builddir)/report.txt
+if WANT_JPWL
+	@echo -e " (PC)\t$(pkgconfigdir)/libopenjpeg-jpwl.pc" >> $(top_builddir)/report.txt
+endif
+	@cat $(top_builddir)/report.txt
+	@rm $(top_builddir)/report.txt
+
+uninstall-hook:
+	rm -f $(DESTDIR)$(pkgconfigdir)/libopenjpeg.pc
--- a/43
+++ b/43
@@ -2,42 +2,23 @@
 OpenJPEG NEWS - user visible changes
 ====================================

-Changes from OpenJPEG 2.0.0 to OpenJPEG 2.0.1
+Changes from OpenJPEG 1.5.1 to OpenJPEG 1.5.0
 ----------------------------------------------

+Security:
+
+    * Fixes: CVE-2012-3535
+    * Fixes: CVE-2012-3358
+
 New Features:

-    * Digital Cinema profiles have been fixed and updated
-	* New option to disable MCT if needed
-    * extended RAW support: it is now possible to input raw images
-	  with subsampled color components (422, 420, etc)
-	  
-API/ABI modifications: (see abi_compat_report_2.0.1.html in dev-utils/scripts)
+    * Use a new API scheme and solve the SOVERSIONing in OpenJPEG
+    * Allow better integration with multi-arch system
+    * Compile & Install Java bindings (CMake)
+    * Install required addXMLinJP2 (JPIP)

-    * No changes, API/ABI fully compatible with 2.0.0
-    
 Misc:

-    * OpenJPEG is now officialy conformant with JPEG 2000 Part-1
-	  and will soon become official reference software at the 
-	  JPEG committee.
-	* Huge amount of bug fixes. See CHANGES for details.
-
-
-Changes from OpenJPEG 1.5.x to OpenJPEG 2.0.0
----------------------------------------------
-
-New Features:
-
-    * streaming capabilities
-    * merge JP3D
-
-API modifications:
-
-    * Use a 64bits capable API
-    
-Misc:
-
-    * removed autotools build system
-    * folders hierarchies reorganisation
+    * fix linker error by resolving all symbols (eg. missing -lm)
+    * fix some man page typos
    * Huge amount of bug fixes. See CHANGES for details.
--- a/40
+++ b/40
@@ -4,44 +4,22 @@ OPENJPEG LIBRARY and APPLICATIONS

 Details on folders hierarchy:

-* src
-  * lib
-    * openjp2: contains the sources of the openjp2 library (Part 1 & 2)
-    * openjpwl: contains the additional sources if you want to build a JPWL-flavoured library.
-    * openjpip: complete client-server architecture for remote browsing of jpeg 2000 images.
-    * openjp3d: JP3D implementation
-    * openmj2: MJ2 implementation
-  * bin: contains all applications that use the openjpeg library
+* libopenjpeg: contains the sources of the openjpeg library
+    * jpwl: contains the additional sources if you want to build a JPWL-flavoured library.
+* applications: contains all applications that use the openjpeg library
    * common: common files to all applications
-    * jp2: a basic codec
+    * codec: a basic codec
    * mj2: motion jpeg 2000 executables
-    * jpip: OpenJPIP applications (server and dec server)
-      * java: a Java client viewer for JPIP
-    * jp3d: JP3D applications
-      * tcltk: a test tool for JP3D
-    * wx
-      * OPJViewer: gui for displaying j2k files (based on wxWidget)
-* wrapping
-  * java: java jni to use openjpeg in a java program
+    * JavaOpenJPEG: java jni to use openjpeg in a java program
+    * jpip: complete client-server architecture for remote browsing of jpeg 2000 images. See corresponding README for more details.
+    * OPJViewer: gui for displaying j2k files (based on wxWidget)
 * thirdparty: thirdparty libraries used by some applications. These libraries will be built only if there are not found on the system. Note that libopenjpeg itself does not have any dependency.
 * doc: doxygen documentation setup file and man pages
 * tests: configuration files and utilities for the openjpeg test suite. All test images are located in 'http://openjpeg.googlecode.com/svn/data' folder.
-* cmake: cmake related files
+* CMake: cmake related files
+* m4: autotools related files

 see LICENSE for license and copyright information.
 see INSTALL for installation procedures.
 see NEWS for user visible changes in successive releases.
 see CHANGES for per-revision changes.
-
----------------
-API/ABI
-
-OpenJPEG strives to provide a stable API/ABI for your applications. As such it
-only exposes a limited subset of its functions.  It uses a mecanism of
-exporting/hiding functions. If you are unsure which functions you can use in
-your applications, you should compile OpenJPEG using something similar to gcc:
-fvisibility=hidden compilation flag.
-See also: http://gcc.gnu.org/wiki/Visibility
-
-On windows, MSVC directly supports export/hidding function and as such the only
-API available is the one supported by OpenJPEG.
--- a/4
+++ b/4
@@ -4,11 +4,13 @@ Many people have contributed to OpenJPEG by reporting problems, suggesting vario
 or submitting actual code. Here is a list of these people. Help me keep
 it complete and exempt of errors.

+Mathieu Malaterre
 Winfried Szukalski
 Vincent Torri
 Bob Friesenhahn
 Callum Lerwick
 Dzonatas Sol
+Mickaël Savinaud
 Julien Malik
 Jerôme Fimes
 Herve Drolon
@@ -29,5 +31,3 @@ Arnaud Maye
 Rex Dieter
 David Burken
 Parvatha Elangovan
-Hans Johnson
-Luc Hermitte
--- a/applications/CMakeLists.txt
+++ b/applications/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Build the each application if it needed
+
+IF(BUILD_CODEC)
+  ADD_SUBDIRECTORY(codec)
+ENDIF(BUILD_CODEC)
+
+IF(BUILD_MJ2)
+  ADD_SUBDIRECTORY(mj2)
+ENDIF(BUILD_MJ2)
+
+# Client & Server:
+IF(BUILD_JPIP)
+  ADD_SUBDIRECTORY(jpip)
+ENDIF(BUILD_JPIP)
+
+IF(BUILD_VIEWER)
+  ADD_SUBDIRECTORY(OPJViewer)
+ENDIF(BUILD_VIEWER)
+
+IF(BUILD_JAVA)
+	ADD_SUBDIRECTORY(JavaOpenJPEG)
+ENDIF(BUILD_JAVA)
--- a/applications/JavaOpenJPEG/CMakeLists.txt
+++ b/applications/JavaOpenJPEG/CMakeLists.txt
@@ -1,12 +1,13 @@
 #JavaOpenJPEG/CMakeLists.txt

 # First thing define the common source:
-set(openjpegjni_SRCS
+SET(openjpegjni_SRCS
  JavaOpenJPEGDecoder.c
  JavaOpenJPEG.c
-  ${OPENJPEG_SOURCE_DIR}/src/bin/common/opj_getopt.c
-  ${OPENJPEG_SOURCE_DIR}/src/bin/jp2/convert.c
-  index.c
+  ${OPENJPEG_SOURCE_DIR}/applications/codec/index.c
+  ${OPENJPEG_SOURCE_DIR}/applications/codec/convert.c
+  #${OPENJPEG_SOURCE_DIR}/applications/common/color.c
+  ${OPENJPEG_SOURCE_DIR}/applications/common/opj_getopt.c
  )

 # JNI binding:
@@ -15,36 +16,29 @@ include_directories(${JNI_INCLUDE_DIRS})

 # required header file:
 include_directories(
-  ${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
-  ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2
-  ${OPENJPEG_SOURCE_DIR}/src/bin/common
-  ${OPENJPEG_SOURCE_DIR}/src/bin/jp2
+  ${OPENJPEG_SOURCE_DIR}/libopenjpeg
+  ${OPENJPEG_SOURCE_DIR}/applications/common
+  ${OPENJPEG_SOURCE_DIR}/applications/codec
  )

 add_library(openjpegjni MODULE
  ${openjpegjni_SRCS}
  )
-# Java module should not have a SONAME:
-set_property(TARGET openjpegjni PROPERTY NO_SONAME 1)
+TARGET_LINK_LIBRARIES(openjpegjni ${OPENJPEG_LIBRARY_NAME})

-# FIXME (need to use old API):
-if(BUILD_MJ2)
-  target_link_libraries(openjpegjni openmj2)
-endif()
-target_link_libraries(openjpegjni
-  ${PNG_LIBNAME} ${TIFF_LIBNAME} ${LCMS_LIBNAME} ${Z_LIBNAME}
-)
-if(UNIX)
-  target_link_libraries(openjpegjni m)
-endif()
+IF(WIN32)
+  SET(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_BIN_DIR})
+ELSE()
+  SET(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_LIB_DIR})
+ENDIF()

-install(TARGETS openjpegjni
+INSTALL(TARGETS openjpegjni
  EXPORT OpenJPEGTargets
  LIBRARY DESTINATION ${OPENJPEG_INSTALL_JNI_DIR} COMPONENT Libraries
 )

 # build jar:
-find_package(Java 1.5 REQUIRED) # javac, jar
+FIND_PACKAGE(Java 1.5 REQUIRED) # javac, jar

 # build dep list:
 file(GLOB java_srcs "java-sources/org/openJpeg/*.java")
@@ -52,7 +46,7 @@ file(GLOB java_srcs "java-sources/org/openJpeg/*.java")
 # make sure target javac dir exists:
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/classes)
 # Build java
-add_custom_command(
+ADD_CUSTOM_COMMAND(
  OUTPUT ${LIBRARY_OUTPUT_PATH}/openjpeg.jar
  COMMAND ${Java_JAVAC_EXECUTABLE} -sourcepath  "${CMAKE_CURRENT_SOURCE_DIR}/java-sources"
  ${java_srcs} -d ${CMAKE_CURRENT_BINARY_DIR}/classes
@@ -63,11 +57,11 @@ add_custom_command(
 )

 # name the target
-add_custom_target(OpenJPEGJavaJar ALL
+ADD_CUSTOM_TARGET(OpenJPEGJavaJar ALL
  DEPENDS ${LIBRARY_OUTPUT_PATH}/openjpeg.jar
  COMMENT "building openjpeg.jar"
 )

-install(FILES ${LIBRARY_OUTPUT_PATH}/openjpeg.jar
+INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/openjpeg.jar
  DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule
 )
--- a/applications/JavaOpenJPEG/JavaOpenJPEG.c
+++ b/applications/JavaOpenJPEG/JavaOpenJPEG.c
@@ -1,10 +1,9 @@
 /*
- * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2014, Professor Benoit Macq
+ * 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 
- * Copyright (c) 2003-2014, Antonin Descampe
+ * 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) 2007, Patrick Piscaglia (Telemis)
@@ -38,7 +37,6 @@
 #include <math.h>

 #include "openjpeg.h"
-#include "opj_includes.h"
 #include "opj_getopt.h"
 #include "convert.h"
 #include "index.h"
@@ -91,7 +89,7 @@ typedef struct img_folder{
 	float *rates;
 }img_fol_t;

-static void encode_help_display() {
+void encode_help_display() {
 	fprintf(stdout,"HELP\n----\n\n");
 	fprintf(stdout,"- the -h option displays this help information on screen\n\n");

@@ -331,7 +329,7 @@ static void encode_help_display() {
 }


-static OPJ_PROG_ORDER give_progression(const char progression[4]) {
+OPJ_PROG_ORDER give_progression(char progression[4]) {
 	if(strncmp(progression, "LRCP", 4) == 0) {
 		return LRCP;
 	}
@@ -351,6 +349,19 @@ static OPJ_PROG_ORDER give_progression(const char progression[4]) {
 	return PROG_UNKNOWN;
 }

+/*
+ * <summary>
+ * Get logarithm of an integer and round downwards.
+ * </summary>
+*/
+int int_floorlog2(int a) {
+    int l;
+    for (l=0; a>1; l++) {
+        a>>=1;
+    }
+    return l;
+}
+
 static int initialise_4K_poc(opj_poc_t *POC, int numres){
 	POC[0].tile  = 1; 
 	POC[0].resno0  = 0; 
@@ -369,7 +380,7 @@ static int initialise_4K_poc(opj_poc_t *POC, int numres){
 	return 2;
 }

-static void cinema_parameters(opj_cparameters_t *parameters){
+void cinema_parameters(opj_cparameters_t *parameters){
 	parameters->tile_size_on = OPJ_FALSE;
 	parameters->cp_tdx=1;
 	parameters->cp_tdy=1;
@@ -402,7 +413,7 @@ static void cinema_parameters(opj_cparameters_t *parameters){

 }

-static void cinema_setup_encoder(opj_cparameters_t *parameters,opj_image_t *image, img_fol_t *img_fol){
+void cinema_setup_encoder(opj_cparameters_t *parameters,opj_image_t *image, img_fol_t *img_fol){
 	int i;
 	float temp_rate;
 	opj_poc_t *POC = NULL;
@@ -484,7 +495,7 @@ static void cinema_setup_encoder(opj_cparameters_t *parameters,opj_image_t *imag


 /* ------------------------------------------------------------------------------------ */
-static int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
+int parse_cmdline_encoder(int argc, char * const argv[], opj_cparameters_t *parameters,
 													img_fol_t *img_fol, char *indexfilename) {
 	int i, j,totlen;
 	opj_option_t long_option[]={
@@ -502,7 +513,7 @@ static int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *param

 	/* parse the command line */
 /* UniPG>> */
-	const char optlist[] = "i:o:hr:q:n:b:c:t:p:s:SEM:x:R:d:T:If:P:C:F:u:"
+	const char optlist[] = "i:o:hr:q:n:b:c:t:p:s:SEM:x:R:d:T:If:P:C:F:u:J"
 #ifdef USE_JPWL
 		"W:"
 #endif /* USE_JPWL */
@@ -617,7 +628,9 @@ static int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *param
 				parameters->tcp_numlayers = numlayers;
 				numresolution = parameters->numresolution;
 				matrix_width = numresolution * 3;
-				parameters->cp_matrice = (int *) opj_malloc(numlayers * matrix_width * sizeof(int));
+				parameters->cp_matrice = (int *) malloc(numlayers * matrix_width * sizeof(int));
+				if(parameters->cp_matrice == NULL) return 1;
+
 				s = s + 2;

 				for (i = 0; i < numlayers; i++) {
@@ -845,7 +858,10 @@ static int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *param

 			case 'C':			/* add a comment */
 			{
-				parameters->cp_comment = (char*)opj_malloc(strlen(opj_optarg) + 1);
+				parameters->cp_comment = (char*)malloc(strlen(opj_optarg) + 1);
+
+				if(parameters->cp_comment == NULL) return 1;
+
 				if(parameters->cp_comment) {
 					strcpy(parameters->cp_comment, opj_optarg);
 				}
@@ -874,7 +890,10 @@ static int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *param
 			
 			case 'z':			/* Image Directory path */
 			{
-				img_fol->imgdirpath = (char*)opj_malloc(strlen(opj_optarg) + 1);
+				img_fol->imgdirpath = (char*)malloc(strlen(opj_optarg) + 1);
+
+				if(img_fol->imgdirpath == NULL) return 1;
+
 				strcpy(img_fol->imgdirpath,opj_optarg);
 				img_fol->set_imgdir=1;
 			}
@@ -1236,6 +1255,10 @@ static int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *param
 /* <<UniPG */
 /* ------------------------------------------------------ */
 			
+			case 'J':			/* jpip on */
+			{
+			  parameters->jpip_on = OPJ_TRUE;
+			}
 			break;
 				/* ------------------------------------------------------ */

@@ -1325,7 +1348,7 @@ static int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *param
 				start position in the codestream
 				end position of this packet
  */
-static char* create_index_into_byte_array(opj_codestream_info_t *cstr_info, int* buffer_size) {
+char* create_index_into_byte_array(opj_codestream_info_t *cstr_info, int* buffer_size) {
 	int tileno, compno, layno, resno, precno, pack_nb, x, y;
 	char* buffer = NULL;
 	int buffer_pos = 0;
@@ -1334,11 +1357,11 @@ static char* create_index_into_byte_array(opj_codestream_info_t *cstr_info, int*
 	prec_max = 0;
 	for (tileno = 0; tileno < cstr_info->tw * cstr_info->th; tileno++) {
 		for (resno = 0; resno < cstr_info->numdecompos[0] + 1; resno++) {
-			prec_max = int_max(prec_max,cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno]);
+			prec_max = max(prec_max,cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno]);
 		}
 	}

-	/* Compute the size of the index buffer, in number of bytes*/
+/* Compute the size of the index buffer, in number of bytes*/
 	*buffer_size = 
 		  1 /* version */
 		+ (10 /* image_w until decomposition */
@@ -1347,18 +1370,18 @@ static char* create_index_into_byte_array(opj_codestream_info_t *cstr_info, int*
 		+ cstr_info->tw * cstr_info->th * 4 /* tile info, without distorsion info */
 		+ cstr_info->tw*cstr_info->th * cstr_info->numlayers * (cstr_info->numdecompos[0] + 1) * cstr_info->numcomps * prec_max *8
 		  ) * sizeof(int);
-	/*printf("C: index buffer size = %d bytes\n", *buffer_size);*/
-	buffer = (char*) opj_malloc(*buffer_size);
+/*printf("C: index buffer size = %d bytes\n", *buffer_size); */
+	buffer = (char*) malloc(*buffer_size);

 	if (!buffer) {
-		/*opj_event_msg(j2k->cinfo, EVT_ERROR, "failed to allocate index buffer for writing %d int\n", *buffer_size);*/
+/* opj_event_msg(j2k->cinfo, EVT_ERROR, "failed to allocate index buffer for writing %d int\n", *buffer_size); */
 		fprintf(stderr, "failed to allocate index buffer for writing %d int\n", *buffer_size);
 		return 0;
 	}
 	
-	buffer[0] = 1;	/* Version stored on a byte*/
+	buffer[0] = 1;	/* Version stored on a byte */
 	buffer++;
-	/* Remaining informations are stored on a int.*/
+/* Remaining informations are stored on a int. */
 	((int*)buffer)[buffer_pos++] = cstr_info->image_w;
 	((int*)buffer)[buffer_pos++] = cstr_info->image_h;
 	((int*)buffer)[buffer_pos++] = cstr_info->prog;
@@ -1583,7 +1606,7 @@ static char* create_index_into_byte_array(opj_codestream_info_t *cstr_info, int*
 	} /* tileno */

 	if (buffer_pos > *buffer_size) {
-		/*opj_event_msg(j2k->cinfo, EVT_ERROR, "index creation: buffer_pos (%d) > buffer_size (%d)!\n", buffer_pos, *buffer_size);*/
+/* opj_event_msg(j2k->cinfo, EVT_ERROR, "index creation: buffer_pos (%d) > buffer_size (%d)!\n", buffer_pos, *buffer_size); */
 		fprintf(stderr, "index creation: buffer_pos (%d) > buffer_size (%d)!\n", buffer_pos, *buffer_size);
 		return 0;
 	}
@@ -1597,7 +1620,7 @@ static char* create_index_into_byte_array(opj_codestream_info_t *cstr_info, int*
 /* -------------------------------------------------------------------------- 
   ------------ Get the image byte[] from the Java object -------------------*/

-static opj_image_t* loadImage(opj_cparameters_t *parameters, JNIEnv *env, jobject obj, jclass cls) {
+opj_image_t* loadImage(opj_cparameters_t *parameters, JNIEnv *env, jobject obj, jclass cls) {
 	int i,max,shift,w,h,depth;
 	opj_image_t * img = NULL;
 	int compno, numcomps;
@@ -1616,7 +1639,7 @@ static opj_image_t* loadImage(opj_cparameters_t *parameters, JNIEnv *env, jobjec
 	jint		*jiBody;
 	jboolean		isCopy;

-	/* Image width, height and depth*/
+/* Image width, height and depth */
 	fid = (*env)->GetFieldID(env, cls,"width", "I");
 	ji = (*env)->GetIntField(env, obj, fid);
 	w = ji;
@@ -1629,7 +1652,7 @@ static opj_image_t* loadImage(opj_cparameters_t *parameters, JNIEnv *env, jobjec
 	ji = (*env)->GetIntField(env, obj, fid);
 	depth = ji;

-	/* Read the image*/
+/* Read the image */
 	if (depth <=16) {
 		numcomps = 1;
 		color_space = CLRSPC_GRAY;
@@ -1644,8 +1667,10 @@ static opj_image_t* loadImage(opj_cparameters_t *parameters, JNIEnv *env, jobjec
 		cmptparm[0].y0 = parameters->image_offset_y0;
 		cmptparm[0].w = !cmptparm[0].x0 ? (w - 1) * parameters->subsampling_dx + 1 : cmptparm[0].x0 + (w - 1) * parameters->subsampling_dx + 1;
 		cmptparm[0].h = !cmptparm[0].y0 ? (h - 1) * parameters->subsampling_dy + 1 : cmptparm[0].y0 + (h - 1) * parameters->subsampling_dy + 1;
-		/* Java types are always signed but we use them as unsigned types (shift of the negative part of 
-		   the pixels of the images in Telemis before entering the encoder).*/
+/* Java types are always signed but we use them as unsigned types 
+ * (shift of the negative part of the pixels of the images in
+ * Telemis before entering the encoder).
+*/
 		cmptparm[0].sgnd = 0;
 		if (depth<=16) 
 			cmptparm[0].prec=depth;
@@ -1691,12 +1716,12 @@ static opj_image_t* loadImage(opj_cparameters_t *parameters, JNIEnv *env, jobjec
 		comp = &image->comps[compno];
 		max = -100000;
 		if (depth == 8) {
-			fid = (*env)->GetFieldID(env, cls,"image8", "[B");	/* byteArray []*/
+			fid = (*env)->GetFieldID(env, cls,"image8", "[B");/* byteArray []*/
 			jba = (*env)->GetObjectField(env, obj, fid);
 			len = (*env)->GetArrayLength(env, jba);
 			
 			jbBody = (*env)->GetPrimitiveArrayCritical(env, jba, &isCopy);
-			/*printf("C: before transfering 8 bpp image\n");*/
+/* printf("C: before transfering 8 bpp image\n"); */
 			if (comp->sgnd) {
 				for(i=0; i< len;i++) {
 					comp->data[i] = (char) jbBody[i];
@@ -1710,13 +1735,14 @@ static opj_image_t* loadImage(opj_cparameters_t *parameters, JNIEnv *env, jobjec
 			}
 			(*env)->ReleasePrimitiveArrayCritical(env, jba, jbBody, 0);
 		} else if(depth == 16) {
-			fid = (*env)->GetFieldID(env, cls,"image16", "[S");	/* shortArray []*/
+			fid = (*env)->GetFieldID(env, cls,"image16", "[S");/*shortArray []*/
 			jsa = (*env)->GetObjectField(env, obj, fid);
 			len = (*env)->GetArrayLength(env, jsa);
 			
 			jsBody = (*env)->GetPrimitiveArrayCritical(env, jsa, &isCopy);
-			/*printf("C: before transfering 16 bpp image\n");*/
-			if (comp->sgnd) {	/* Special behaviour to deal with signed elements ??*/
+/*printf("C: before transfering 16 bpp image\n"); */
+			if (comp->sgnd) {
+/* Special behaviour to deal with signed elements ?? */
 				comp->data[i] = (short) jsBody[i];
 				for(i=0; i< len;i++) {
 					if (comp->data[i] > max) max = comp->data[i];
@@ -1729,14 +1755,15 @@ static opj_image_t* loadImage(opj_cparameters_t *parameters, JNIEnv *env, jobjec
 			}
 			(*env)->ReleasePrimitiveArrayCritical(env, jsa, jsBody, 0);
 		} else if (depth == 24) {
-			fid = (*env)->GetFieldID(env, cls,"image24", "[I");	/* intArray []*/
+			fid = (*env)->GetFieldID(env, cls,"image24", "[I");/* intArray []*/
 			jia = (*env)->GetObjectField(env, obj, fid);
 			len = (*env)->GetArrayLength(env, jia);
 			shift = compno*8;

 			jiBody = (*env)->GetPrimitiveArrayCritical(env, jia, &isCopy);
-			/*printf("C: before transfering 24 bpp image (component %d, signed = %d)\n", compno, comp->sgnd);*/
-			if (comp->sgnd) {	/* Special behaviour to deal with signed elements ?? XXXXX*/
+/*printf("C: before transfering 24 bpp image (component %d, signed = %d)\n", compno, comp->sgnd);*/
+			if (comp->sgnd) {	
+/* Special behaviour to deal with signed elements ?? XXXXX */
 				for(i=0; i< len;i++) {
 					comp->data[i] = ( ((int) jiBody[i]) & (0xFF << shift) ) >> shift;
 					if (comp->data[i] > max) max = comp->data[i];
@@ -1751,7 +1778,7 @@ static opj_image_t* loadImage(opj_cparameters_t *parameters, JNIEnv *env, jobjec
 		}
 		comp->bpp = int_floorlog2(max)+1;
 		comp->prec = comp->bpp;
-		/*printf("C: component %d: max  %d, real bpp = %d\n", compno, max, comp->bpp);*/
+/*printf("C: component %d: max  %d, real bpp = %d\n", compno, max, comp->bpp);*/
 	}
 	return image;
 }
@@ -1761,7 +1788,7 @@ static opj_image_t* loadImage(opj_cparameters_t *parameters, JNIEnv *env, jobjec
   --------------------   MAIN METHOD, CALLED BY JAVA -----------------------*/
 JNIEXPORT jlong JNICALL Java_org_openJpeg_OpenJPEGJavaEncoder_internalEncodeImageToJ2K(JNIEnv *env, jobject obj, jobjectArray javaParameters) {
 	int argc;		/* To simulate the command line parameters (taken from the javaParameters variable) and be able to re-use the */
-	char **argv;	/*  'parse_cmdline_decoder' method taken from the j2k_to_image project */
+	const char **argv;	/*  'parse_cmdline_decoder' method taken from the j2k_to_image project */
 	opj_bool bSuccess;
 	opj_cparameters_t parameters;	/* compression parameters */
 	img_fol_t img_fol;
@@ -1769,12 +1796,12 @@ JNIEXPORT jlong JNICALL Java_org_openJpeg_OpenJPEGJavaEncoder_internalEncodeImag
 	opj_image_t *image = NULL;
 	int i,j,num_images;
 	int imageno;
-	opj_codestream_info_t cstr_info;		/* Codestream information structure */
+	opj_codestream_info_t cstr_info;	/* Codestream information structure */
 	char indexfilename[OPJ_PATH_LEN];	/* index file name */

-	char* compressed_index = NULL;
+	int* compressed_index = NULL;
 	int compressed_index_size=-1;
-	/* ==> Access variables to the Java member variables*/
+/* ==> Access variables to the Java member variables */
 	jsize		arraySize;
 	jclass		cls;
 	jobject		object;
@@ -1783,18 +1810,20 @@ JNIEXPORT jlong JNICALL Java_org_openJpeg_OpenJPEGJavaEncoder_internalEncodeImag
 	jbyteArray	jba;
 	jbyte		*jbBody;
 	callback_variables_t msgErrorCallback_vars;
-	/* <== access variable to the Java member variables.*/
-
-	/* For the encoding and storage into the file*/
+/* <== access variable to the Java member variables. */
+	jlong retval = -1;
+/* For the encoding and storage into the file */
 	opj_cinfo_t* cinfo;
-	int codestream_length;
+	int codestream_length = -1;
 	opj_cio_t *cio = NULL;
 	FILE *f = NULL;

-	/* JNI reference to the calling class*/
+/* JNI reference to the calling class */
 	cls = (*env)->GetObjectClass(env, obj);
 	
-	/* Pointers to be able to call a Java method for all the info and error messages*/
+/* Pointers to be able to call a Java method 
+ * for all the info and error messages
+*/
 	msgErrorCallback_vars.env = env;
 	msgErrorCallback_vars.jobj = &obj;
 	msgErrorCallback_vars.message_mid = (*env)->GetMethodID(env, cls, "logMessage", "(Ljava/lang/String;)V");
@@ -1802,12 +1831,15 @@ JNIEXPORT jlong JNICALL Java_org_openJpeg_OpenJPEGJavaEncoder_internalEncodeImag

 	arraySize = (*env)->GetArrayLength(env, javaParameters);
 	argc = (int) arraySize +1;
-	argv = opj_malloc(argc*sizeof(char*));
-	argv[0] = "ProgramName.exe";	/* The program name: useless*/
+	argv = (const char **)malloc(argc*sizeof(char*));
+
+	if(argv == NULL) return -1;
+
+	argv[0] = "ProgramName.exe";/* The program name: useless */
 	j=0;
 	for (i=1; i<argc; i++) {
 		object = (*env)->GetObjectArrayElement(env, javaParameters, i-1);
-		argv[i] = (char*)(*env)->GetStringUTFChars(env, object, &isCopy);
+		argv[i] = (*env)->GetStringUTFChars(env, object, &isCopy);
 	}

 	/*printf("C: ");
@@ -1827,23 +1859,21 @@ JNIEXPORT jlong JNICALL Java_org_openJpeg_OpenJPEGJavaEncoder_internalEncodeImag
 	/* set encoding parameters to default values */
 	opj_set_default_encoder_parameters(&parameters);
 	parameters.cod_format = J2K_CFMT;
-	/*parameters.index_on = 1;*/
+/* parameters.index_on = 1; */

 	/* Initialize indexfilename and img_fol */
 	*indexfilename = 0;
 	memset(&img_fol,0,sizeof(img_fol_t));

-	/* parse input and get user encoding parameters */
-	if (parse_cmdline_encoder(argc, argv, &parameters,&img_fol, indexfilename) == 1) {
-		/* Release the Java arguments array*/
-		for (i=1; i<argc; i++)
-			(*env)->ReleaseStringUTFChars(env, (*env)->GetObjectArrayElement(env, javaParameters, i-1), argv[i]);
-		return -1;
-	}
+/* parse input and get user encoding parameters */
+	j = parse_cmdline_encoder(argc, (char *const*)argv, &parameters,&img_fol, indexfilename);

-	/* Release the Java arguments array*/
+/* Release the Java arguments array */
 	for (i=1; i<argc; i++)
-		(*env)->ReleaseStringUTFChars(env, (*env)->GetObjectArrayElement(env, javaParameters, i-1), argv[i]);
+	 (*env)->ReleaseStringUTFChars(env, 
+		(*env)->GetObjectArrayElement(env, javaParameters, i-1), argv[i]);
+
+	if(j == 1) goto fin; /* failure */

 	if (parameters.cp_cinema){
 		cinema_parameters(&parameters);
@@ -1857,10 +1887,16 @@ JNIEXPORT jlong JNICALL Java_org_openJpeg_OpenJPEGJavaEncoder_internalEncodeImag
 		const char *version = opj_version();
 /* UniPG>> */
 #ifdef USE_JPWL
-		parameters.cp_comment = (char*)opj_malloc(clen+strlen(version)+11);
+		parameters.cp_comment = (char*)malloc(clen+strlen(version)+11);
+
+		if(parameters.cp_comment == NULL) goto fin;
+
 		sprintf(parameters.cp_comment,"%s%s with JPWL", comment, version);
 #else
-		parameters.cp_comment = (char*)opj_malloc(clen+strlen(version)+1);
+		parameters.cp_comment = (char*)malloc(clen+strlen(version)+1);
+
+		if(parameters.cp_comment == NULL) goto fin;
+
 		sprintf(parameters.cp_comment,"%s%s", comment, version);
 #endif
 /* <<UniPG */
@@ -1877,10 +1913,10 @@ JNIEXPORT jlong JNICALL Java_org_openJpeg_OpenJPEGJavaEncoder_internalEncodeImag
 		fprintf(stderr,"\n");

 		image = loadImage(&parameters, env, obj, cls);
-		/*printf("C: after load image: image = %d\n", image);*/
+/* printf("C: after load image: image = %d\n", image); */
 		if (!image) {
 			fprintf(stderr, "Unable to load image\n");
-			return -1; 
+			goto fin;
 		}

 		/* Decide if MCT should be used */
@@ -1914,7 +1950,7 @@ JNIEXPORT jlong JNICALL Java_org_openJpeg_OpenJPEGJavaEncoder_internalEncodeImag
 		if (!bSuccess) {
 			opj_cio_close(cio);
 			fprintf(stderr, "failed to encode image\n");
-			return -1;
+			goto fin;
 		}
 		codestream_length = cio_tell(cio);

@@ -1926,7 +1962,8 @@ JNIEXPORT jlong JNICALL Java_org_openJpeg_OpenJPEGJavaEncoder_internalEncodeImag
 			}
 		}

-		compressed_index = create_index_into_byte_array(&cstr_info, &compressed_index_size);
+		compressed_index = (int*)
+		 create_index_into_byte_array(&cstr_info, &compressed_index_size);
 		/* Allocates the Java compressedIndex byte[] and sends this index into the Java object */
 		fid = (*env)->GetFieldID(env, cls,"compressedIndex", "[B");
 		jba = (*env)->NewByteArray(env, compressed_index_size+1);
@@ -1934,21 +1971,21 @@ JNIEXPORT jlong JNICALL Java_org_openJpeg_OpenJPEGJavaEncoder_internalEncodeImag
 		memcpy(jbBody, compressed_index, compressed_index_size);
 		(*env)->ReleasePrimitiveArrayCritical(env, jba, jbBody, 0);
 		(*env)->SetObjectField(env, obj, fid, jba); 
-		opj_free(compressed_index);
+		free(compressed_index);

 		/* write the generated codestream to disk ? */
 		if (parameters.outfile[0]!='\0') {
 			f = fopen(parameters.outfile, "wb");
 			if (!f) {
 				fprintf(stderr, "failed to open [%s] for writing\n", parameters.outfile);
-				return -1;
+				goto fin;
 			}
 			fwrite(cio->buffer, 1, codestream_length, f);
 			fclose(f);
 			fprintf(stdout,"Generated outfile [%s]\n",parameters.outfile);
 		}

-		/* Write the generated codestream to the Java pre-allocated compressedStream byte[] */
+/* Write the generated codestream to the Java pre-allocated compressedStream byte[] */
 		fid = (*env)->GetFieldID(env, cls,"compressedStream", "[B");
 		jba = (*env)->GetObjectField(env, obj, fid);
 		jbBody = (*env)->GetPrimitiveArrayCritical(env, jba, 0);
@@ -1967,8 +2004,13 @@ JNIEXPORT jlong JNICALL Java_org_openJpeg_OpenJPEGJavaEncoder_internalEncodeImag
 	}

 	/* free user parameters structure */
-  if(parameters.cp_comment) opj_free(parameters.cp_comment);
-	if(parameters.cp_matrice) opj_free(parameters.cp_matrice);
+  if(parameters.cp_comment) free(parameters.cp_comment);
+	if(parameters.cp_matrice) free(parameters.cp_matrice);

-	return codestream_length;
+	retval = codestream_length;
+
+fin:
+	free(argv);
+
+	return retval;
 }
--- a/applications/JavaOpenJPEG/JavaOpenJPEGDecoder.c
+++ b/applications/JavaOpenJPEG/JavaOpenJPEGDecoder.c
@@ -1,10 +1,9 @@
 /*
- * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2014, Professor Benoit Macq
+ * 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 
- * Copyright (c) 2003-2014, Antonin Descampe
+ * 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) 2007, Patrick Piscaglia (Telemis)
@@ -38,7 +37,6 @@
 #include <math.h>

 #include "openjpeg.h"
-#include "opj_includes.h"
 #include "opj_getopt.h"
 #include "convert.h"
 #include "dirent.h"
@@ -205,7 +203,7 @@ int get_file_format(char *filename) {

 /* -------------------------------------------------------------------------- */

-int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,img_fol_t *img_fol) {
+int parse_cmdline_decoder(int argc, char * const argv[], opj_dparameters_t *parameters,img_fol_t *img_fol) {
 	/* parse the command line */
 	int totlen;
 	opj_option_t long_option[]={
@@ -340,7 +338,10 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,i

 			case 'y':			/* Image Directory path */
 				{
-					img_fol->imgdirpath = (char*)opj_malloc(strlen(opj_optarg) + 1);
+					img_fol->imgdirpath = (char*)malloc(strlen(opj_optarg) + 1);
+
+					if(img_fol->imgdirpath == NULL) return 1;
+
 					strcpy(img_fol->imgdirpath,opj_optarg);
 					img_fol->set_imgdir=1;
 				}
@@ -428,7 +429,7 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,i
 	/* No check for possible errors before the -i and -o options are of course not mandatory*/

 	return 0;
-}
+}/* parse_cmdline_decoder() */

 /* -------------------------------------------------------------------------- */

@@ -490,12 +491,13 @@ void info_callback(const char *msg, void *client_data) {
 	(*env)->DeleteLocalRef(env, jbuffer);
 }

-
+#define FAILS -1
+#define OK    0
 /* --------------------------------------------------------------------------
   --------------------   MAIN METHOD, CALLED BY JAVA -----------------------*/
 JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2KtoImage(JNIEnv *env, jobject obj, jobjectArray javaParameters) {
 	int argc;		/* To simulate the command line parameters (taken from the javaParameters variable) and be able to re-use the */
-	char **argv;	/*  'parse_cmdline_decoder' method taken from the j2k_to_image project */
+	const char **argv;	/*  'parse_cmdline_decoder' method taken from the j2k_to_image project */
 	opj_dparameters_t parameters;	/* decompression parameters */
 	img_fol_t img_fol;
 	opj_event_mgr_t event_mgr;		/* event manager */
@@ -510,7 +512,7 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto
 	int w,h;
 	long min_value, max_value;
 	short tempS; unsigned char tempUC, tempUC1, tempUC2;
-	/* ==> Access variables to the Java member variables*/
+/* ==> Access variables to the Java member variables */
 	jsize		arraySize;
 	jclass		cls;
 	jobject		object;
@@ -523,8 +525,9 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto
 	jshort		*jsBody, *ptrSBody;
 	jint		*jiBody, *ptrIBody;
 	callback_variables_t msgErrorCallback_vars;
-	/* <=== access variable to Java member variables */
-	int *ptr, *ptr1, *ptr2;				/* <== To transfer the decoded image to Java*/
+/* <=== access variable to Java member variables */
+	int *ptr, *ptr1, *ptr2;/* <== To transfer the decoded image to Java */
+	jint retval = FAILS;

 	/* configure the event callbacks */
 	memset(&event_mgr, 0, sizeof(opj_event_mgr_t));	
@@ -532,24 +535,30 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto
 	event_mgr.warning_handler = warning_callback;
 	event_mgr.info_handler = info_callback;

-	/* JNI reference to the calling class*/
+/* JNI reference to the calling class */
 	cls = (*env)->GetObjectClass(env, obj);

-	/* Pointers to be able to call a Java method for all the info and error messages*/
+/* Pointers to be able to call a Java method 
+ * for all the info and error messages
+*/
 	msgErrorCallback_vars.env = env;
 	msgErrorCallback_vars.jobj = &obj;
 	msgErrorCallback_vars.message_mid = (*env)->GetMethodID(env, cls, "logMessage", "(Ljava/lang/String;)V");
 	msgErrorCallback_vars.error_mid = (*env)->GetMethodID(env, cls, "logError", "(Ljava/lang/String;)V");

-	/* Get the String[] containing the parameters, and converts it into a char** to simulate command line arguments.*/
+/* Get the String[] containing the parameters */
+
 	arraySize = (*env)->GetArrayLength(env, javaParameters);
 	argc = (int) arraySize +1;
-	argv = opj_malloc(argc*sizeof(char*));
-	argv[0] = "ProgramName.exe";	/* The program name: useless*/
+	argv = (const char **)malloc(argc*sizeof(char*));
+
+	if(argv == NULL) return FAILS;
+
+	argv[0] = "ProgramName.exe";/* The program name: useless */
 	j=0;
 	for (i=1; i<argc; i++) {
 		object = (*env)->GetObjectArrayElement(env, javaParameters, i-1);
-		argv[i] = (char*)(*env)->GetStringUTFChars(env, object, &isCopy);
+		argv[i] = (*env)->GetStringUTFChars(env, object, &isCopy);
 	}

 	/*printf("C: decoder params = ");
@@ -563,19 +572,18 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto
 	parameters.decod_format = J2K_CFMT;

 	/* parse input and get user encoding parameters */
-	if(parse_cmdline_decoder(argc, argv, &parameters,&img_fol) == 1) {
-		/* Release the Java arguments array*/
-		for (i=1; i<argc; i++)
-			(*env)->ReleaseStringUTFChars(env, (*env)->GetObjectArrayElement(env, javaParameters, i-1), argv[i]);
-		return -1;
-	}
-	/* Release the Java arguments array*/
+	j = parse_cmdline_decoder(argc, (char * const*)argv, &parameters,&img_fol);
+
+/*	Release the Java arguments array */
 	for (i=1; i<argc; i++)
-		(*env)->ReleaseStringUTFChars(env, (*env)->GetObjectArrayElement(env, javaParameters, i-1), argv[i]);
+	 (*env)->ReleaseStringUTFChars(env, 
+		(*env)->GetObjectArrayElement(env, javaParameters, i-1), argv[i]);
+
+	if(j == 1) goto fin; /* failure */

 	num_images=1;

-	/* Get additional information from the Java object variables*/
+/* Get additional information from the Java object variables */
 	fid = (*env)->GetFieldID(env, cls,"skippedResolutions", "I");
 	parameters.cp_reduce = (short) (*env)->GetIntField(env, obj, fid);

@@ -589,22 +597,25 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto
 		   Implemented for debug purpose. */
 		/* -------------------------------------------------------------- */
 		if (parameters.infile && parameters.infile[0]!='\0') {
-			/*printf("C: opening [%s]\n", parameters.infile);*/
+			/* printf("C: opening [%s]\n", parameters.infile); */
 			fsrc = fopen(parameters.infile, "rb");
 			if (!fsrc) {
 				fprintf(stderr, "ERROR -> failed to open %s for reading\n", parameters.infile);
-				return 1;
+			goto fin;
 			}
 			fseek(fsrc, 0, SEEK_END);
 			file_length = ftell(fsrc);
 			fseek(fsrc, 0, SEEK_SET);
-			src = (unsigned char *) opj_malloc(file_length);
+			src = (unsigned char *) malloc(file_length);
+
+			if(src == NULL) goto fin;
+
 			fread(src, 1, file_length, fsrc);
 			fclose(fsrc);
-			/*printf("C: %d bytes read from file\n",file_length);*/
+			/* printf("C: %d bytes read from file\n",file_length); */
 		} else {
-			/* Preparing the transfer of the codestream from Java to C*/
-			/*printf("C: before transfering codestream\n");*/
+			/* Preparing the transfer of the codestream from Java to C */
+			/* printf("C: before transfering codestream\n"); */
 			fid = (*env)->GetFieldID(env, cls,"compressedStream", "[B");
 			jba = (*env)->GetObjectField(env, obj, fid);
 			file_length = (*env)->GetArrayLength(env, jba);
@@ -638,7 +649,7 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto
 				fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n");
 				opj_destroy_decompress(dinfo);
 				opj_cio_close(cio);
-				return 1;
+				goto fin;
 			}

 			/* close the byte stream */
@@ -668,7 +679,7 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto
 				fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n");
 				opj_destroy_decompress(dinfo);
 				opj_cio_close(cio);
-				return 1;
+				goto fin;
 			}

 			/* close the byte stream */
@@ -699,7 +710,7 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto
 				fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n");
 				opj_destroy_decompress(dinfo);
 				opj_cio_close(cio);
-				return 1;
+				goto fin;
 			}

 			/* close the byte stream */
@@ -714,7 +725,7 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto

 		/* free the memory containing the code-stream */
 		if (parameters.infile && parameters.infile[0]!='\0') {
-			opj_free(src);
+			free(src);
 		} else {
 			(*env)->ReleaseByteArrayElements(env, jba, jbBody, 0);
 		}
@@ -754,17 +765,21 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto

 		}

-		/* ========= Return the image to the Java structure ===============*/
+/* ========= Return the image to the Java structure =============== */
 #ifdef CHECK_THRESHOLDS
 		printf("C: checking thresholds\n");
 #endif
-		/* First compute the real with and height, in function of the resolutions decoded.*/
-		/*wr = (image->comps[0].w + (1 << image->comps[0].factor) -1) >> image->comps[0].factor;*/
-		/*hr = (image->comps[0].h + (1 << image->comps[0].factor) -1) >> image->comps[0].factor;*/
+/* First compute the real with and height, 
+ * in function of the resolutions decoded.
+*/
+/*---
+	wr = (image->comps[0].w + (1 << image->comps[0].factor) -1) >> image->comps[0].factor;
+	hr = (image->comps[0].h + (1 << image->comps[0].factor) -1) >> image->comps[0].factor;
+---*/
 		w = image->comps[0].w;
 		h = image->comps[0].h;

-		if (image->numcomps==3) {	/* 3 components color image*/
+		if (image->numcomps==3) {	/* 3 components color image */
 			ptr = image->comps[0].data;
 			ptr1 = image->comps[1].data;
 			ptr2 = image->comps[2].data;
@@ -777,7 +792,7 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto
 				max_value = 255;
 			}
 #endif			
-			/* Get the pointer to the Java structure where the data must be copied*/
+/* Get the pointer to the Java structure where the data must be copied */
 			fid = (*env)->GetFieldID(env, cls,"image24", "[I");
 			jia = (*env)->GetObjectField(env, obj, fid);
 			jiBody = (*env)->GetIntArrayElements(env, jia, 0);
@@ -806,7 +821,7 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto
 			}
 			(*env)->ReleaseIntArrayElements(env, jia, jiBody, 0);

-		} else {	/* 1 component 8 or 16 bpp image*/
+		} else {	/* 1 component 8 or 16 bpp image */
 			ptr = image->comps[0].data;
 			printf("C: before transfering a %d bpp image to java (length = %d)\n",image->comps[0].prec ,w*h);
 			if (image->comps[0].prec<=8) {
@@ -823,7 +838,7 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto
 					max_value = 255;
 				}
 #endif								
-				/*printf("C: transfering %d shorts to Java image8 pointer = %d\n", wr*hr,ptrSBody);*/
+/* printf("C: transfering %d shorts to Java image8 pointer = %d\n", wr*hr,ptrSBody); */
 				for (i=0; i<w*h; i++) {
 					tempUC = (unsigned char) (ptr[i]);
 #ifdef CHECK_THRESHOLDS
@@ -879,7 +894,12 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto
 		opj_image_destroy(image);

 	}
-	return 1; /* OK */
-}
-/*end main*/
+	retval = OK;
+
+fin:
+	free(argv);
+
+	return retval;
+}
+/* end main MAIN */

--- a/applications/JavaOpenJPEG/java-sources/org/openJpeg/OpenJPEGJavaDecoder.java
+++ b/applications/JavaOpenJPEG/java-sources/org/openJpeg/OpenJPEGJavaDecoder.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2014, Professor Benoit Macq
+ * 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-2007, Patrick Piscaglia, Telemis s.a.
 * All rights reserved.
 *
--- a/applications/JavaOpenJPEG/java-sources/org/openJpeg/OpenJPEGJavaEncoder.java
+++ b/applications/JavaOpenJPEG/java-sources/org/openJpeg/OpenJPEGJavaEncoder.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2014, Professor Benoit Macq
+ * 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-2007, Patrick Piscaglia, Telemis s.a.
 * All rights reserved.
 *
--- a/applications/JavaOpenJPEG/org_openJpeg_OpenJPEGJavaDecoder.h
+++ b/applications/JavaOpenJPEG/org_openJpeg_OpenJPEGJavaDecoder.h
--- a/applications/JavaOpenJPEG/org_openJpeg_OpenJPEGJavaEncoder.h
+++ b/applications/JavaOpenJPEG/org_openJpeg_OpenJPEGJavaEncoder.h
--- a/applications/Makefile.am
+++ b/applications/Makefile.am
@@ -0,0 +1,19 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+SUBDIRS = codec
+
+if WANT_MJ2
+SUBDIRS += mj2
+endif
+
+if WANT_JPIP_CODE
+SUBDIRS += jpip
+endif
+
+EXTRA_DIST = \
+CMakeLists.txt \
+common/color.c \
+common/color.h \
+common/format_defs.h \
+common/opj_getopt.c \
+common/opj_getopt.h
--- a/applications/OPJViewer/CMakeLists.txt
+++ b/applications/OPJViewer/CMakeLists.txt
@@ -1,21 +1,17 @@
-project(viewer CXX)
+PROJECT(viewer CXX)

-find_package(wxWidgets REQUIRED)
-include(${wxWidgets_USE_FILE})
+FIND_PACKAGE(wxWidgets REQUIRED)
+INCLUDE(${wxWidgets_USE_FILE})

-include_directories(
+INCLUDE_DIRECTORIES(
  ${CMAKE_CURRENT_SOURCE_DIR}/../..
  ${CMAKE_CURRENT_SOURCE_DIR}/..
-  ${OPENJPEG_SOURCE_DIR}/src/lib
-  ${OPENJPEG_SOURCE_DIR}/src/bin
-  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
-  ${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h and opj_config_private.h
  )

 # original flags:
 # -DUSE_JPWL -DwxUSE_LIBOPENJPEG -DwxUSE_GUI=1 -DOPJ_STATIC -DOPJ_HTMLABOUT -DOPJ_INICONFIG -DUSE_JPSEC -DOPJ_MANYFORMATS
-add_definitions(-DwxUSE_LIBOPENJPEG -DOPENJPEG_VERSION="1.5.0")
-set(OPJV_SRCS
+ADD_DEFINITIONS(-DwxUSE_LIBOPENJPEG -DOPENJPEG_VERSION="1.5.0")
+SET(OPJV_SRCS
  ${CMAKE_CURRENT_SOURCE_DIR}/source/imagjpeg2000.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/source/wxj2kparser.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/source/OPJViewer.cpp
@@ -23,7 +19,7 @@ set(OPJV_SRCS
  ${CMAKE_CURRENT_SOURCE_DIR}/source/OPJDialogs.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/source/OPJThreads.cpp
  ${CMAKE_CURRENT_SOURCE_DIR}/source/OPJAbout.cpp
-  ${OPENJPEG_SOURCE_DIR}/src/bin/jp2/index.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/../codec/index.c
  )
-add_executable(opjviewer ${OPJV_SRCS})
-target_link_libraries(opjviewer ${wxWidgets_LIBRARIES} openjpeg)
+ADD_EXECUTABLE(opjviewer ${OPJV_SRCS})
+TARGET_LINK_LIBRARIES(opjviewer ${wxWidgets_LIBRARIES} openjpeg)
--- a/applications/OPJViewer/OPJViewer.iss
+++ b/applications/OPJViewer/OPJViewer.iss
--- a/applications/OPJViewer/Readme.txt
+++ b/applications/OPJViewer/Readme.txt
--- a/applications/OPJViewer/about/about.htm
+++ b/applications/OPJViewer/about/about.htm
--- a/applications/OPJViewer/about/opj_logo.png
+++ b/applications/OPJViewer/about/opj_logo.png
--- a/applications/OPJViewer/source/OPJAbout.cpp
+++ b/applications/OPJViewer/source/OPJAbout.cpp
@@ -1,9 +1,4 @@
 /*
- * The copyright in this software is being made available under the 2-clauses 
- * BSD License, included below. This software may be subject to other third 
- * party and contributor rights, including patent rights, and no such rights
- * are granted under this license.
- *
 * Copyright (c) 2007, Digital Signal Processing Laboratory, Universita'  degli studi di Perugia (UPG), Italy
 * All rights reserved.
 *
--- a/applications/OPJViewer/source/OPJChild.ico
+++ b/applications/OPJViewer/source/OPJChild.ico
--- a/applications/OPJViewer/source/OPJChild16.xpm
+++ b/applications/OPJViewer/source/OPJChild16.xpm
--- a/applications/OPJViewer/source/OPJDialogs.cpp
+++ b/applications/OPJViewer/source/OPJDialogs.cpp
@@ -1,9 +1,4 @@
 /*
- * The copyright in this software is being made available under the 2-clauses 
- * BSD License, included below. This software may be subject to other third 
- * party and contributor rights, including patent rights, and no such rights
- * are granted under this license.
- *
 * Copyright (c) 2007, Digital Signal Processing Laboratory, Universita'  degli studi di Perugia (UPG), Italy
 * All rights reserved.
 *
--- a/applications/OPJViewer/source/OPJThreads.cpp
+++ b/applications/OPJViewer/source/OPJThreads.cpp
@@ -1,9 +1,4 @@
 /*
- * The copyright in this software is being made available under the 2-clauses 
- * BSD License, included below. This software may be subject to other third 
- * party and contributor rights, including patent rights, and no such rights
- * are granted under this license.
- *
 * Copyright (c) 2007, Digital Signal Processing Laboratory, Universita'  degli studi di Perugia (UPG), Italy
 * All rights reserved.
 *
--- a/applications/OPJViewer/source/OPJViewer.cpp
+++ b/applications/OPJViewer/source/OPJViewer.cpp
@@ -1,9 +1,4 @@
 /*
- * The copyright in this software is being made available under the 2-clauses 
- * BSD License, included below. This software may be subject to other third 
- * party and contributor rights, including patent rights, and no such rights
- * are granted under this license.
- *
 * Copyright (c) 2007, Digital Signal Processing Laboratory, Universita' degli studi di Perugia (UPG), Italy
 * All rights reserved.
 *
--- a/applications/OPJViewer/source/OPJViewer.h
+++ b/applications/OPJViewer/source/OPJViewer.h
@@ -1,10 +1,5 @@
 /*
- * The copyright in this software is being made available under the 2-clauses 
- * BSD License, included below. This software may be subject to other third 
- * party and contributor rights, including patent rights, and no such rights
- * are granted under this license.
- *
- * Copyright (c) 2007, Digital Signal Processing Laboratory, Universita degli studi di Perugia (UPG), Italy
+ * Copyright (c) 2007, Digital Signal Processing Laboratory, Università degli studi di Perugia (UPG), Italy
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -106,7 +101,7 @@
 #include "wx/toolbar.h"
 #include "wx/artprov.h"

-#include "openjp2/openjpeg.h"
+#include "libopenjpeg/openjpeg.h"

 //#include "imagj2k.h"
 //#include "imagjp2.h"
--- a/applications/OPJViewer/source/OPJViewer.ico
+++ b/applications/OPJViewer/source/OPJViewer.ico
--- a/applications/OPJViewer/source/OPJViewer.rc
+++ b/applications/OPJViewer/source/OPJViewer.rc
--- a/applications/OPJViewer/source/OPJViewer16.xpm
+++ b/applications/OPJViewer/source/OPJViewer16.xpm
--- a/applications/OPJViewer/source/about_htm.h
+++ b/applications/OPJViewer/source/about_htm.h
--- a/applications/OPJViewer/source/build.h
+++ b/applications/OPJViewer/source/build.h
--- a/applications/OPJViewer/source/icon1.xpm
+++ b/applications/OPJViewer/source/icon1.xpm
--- a/applications/OPJViewer/source/icon2.xpm
+++ b/applications/OPJViewer/source/icon2.xpm
--- a/applications/OPJViewer/source/icon3.xpm
+++ b/applications/OPJViewer/source/icon3.xpm
--- a/applications/OPJViewer/source/icon4.xpm
+++ b/applications/OPJViewer/source/icon4.xpm
--- a/applications/OPJViewer/source/icon5.xpm
+++ b/applications/OPJViewer/source/icon5.xpm
--- a/applications/OPJViewer/source/imagjpeg2000.cpp
+++ b/applications/OPJViewer/source/imagjpeg2000.cpp
@@ -1,9 +1,4 @@
 /*
- * The copyright in this software is being made available under the 2-clauses 
- * BSD License, included below. This software may be subject to other third 
- * party and contributor rights, including patent rights, and no such rights
- * are granted under this license.
- *
 * Copyright (c) 2007, Digital Signal Processing Laboratory, Università degli studi di Perugia (UPG), Italy
 * All rights reserved.
 *
@@ -56,7 +51,7 @@
    #include "wx/module.h"
 #endif

-#include "openjp2/openjpeg.h"
+#include "libopenjpeg/openjpeg.h"

 #include "wx/filefn.h"
 #include "wx/wfstream.h"
--- a/applications/OPJViewer/source/imagjpeg2000.h
+++ b/applications/OPJViewer/source/imagjpeg2000.h
@@ -1,10 +1,5 @@
 /*
- * The copyright in this software is being made available under the 2-clauses 
- * BSD License, included below. This software may be subject to other third 
- * party and contributor rights, including patent rights, and no such rights
- * are granted under this license.
- *
- * Copyright (c) 2007, Digital Signal Processing Laboratory, Universita degli studi di Perugia (UPG), Italy
+ * Copyright (c) 2007, Digital Signal Processing Laboratory, Università degli studi di Perugia (UPG), Italy
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -49,8 +44,8 @@
 #if wxUSE_LIBOPENJPEG

 #include "wx/image.h"
-#include "openjp2/openjpeg.h"
-#include "jp2/index.h"
+#include "libopenjpeg/openjpeg.h"
+#include "codec/index.h"

 #define wxBITMAP_TYPE_JPEG2000	50

--- a/applications/OPJViewer/source/imagmxf.cpp
+++ b/applications/OPJViewer/source/imagmxf.cpp
@@ -1,9 +1,4 @@
 /*
- * The copyright in this software is being made available under the 2-clauses 
- * BSD License, included below. This software may be subject to other third 
- * party and contributor rights, including patent rights, and no such rights
- * are granted under this license.
- *
 * Copyright (c) 2007, Digital Signal Processing Laboratory, Università degli studi di Perugia (UPG), Italy
 * All rights reserved.
 *
--- a/applications/OPJViewer/source/imagmxf.h
+++ b/applications/OPJViewer/source/imagmxf.h
@@ -1,10 +1,5 @@
 /*
- * The copyright in this software is being made available under the 2-clauses 
- * BSD License, included below. This software may be subject to other third 
- * party and contributor rights, including patent rights, and no such rights
- * are granted under this license.
- *
- * Copyright (c) 2007, Digital Signal Processing Laboratory, Universita degli studi di Perugia (UPG), Italy
+ * Copyright (c) 2007, Digital Signal Processing Laboratory, Università degli studi di Perugia (UPG), Italy
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/applications/OPJViewer/source/license.txt
+++ b/applications/OPJViewer/source/license.txt
@@ -1,5 +1,5 @@
-Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
-Copyright (c) 2002-2014, Professor Benoit Macq
+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
--- a/applications/OPJViewer/source/opj_logo.xpm
+++ b/applications/OPJViewer/source/opj_logo.xpm
--- a/applications/OPJViewer/source/readmeafter.txt
+++ b/applications/OPJViewer/source/readmeafter.txt
--- a/applications/OPJViewer/source/readmebefore.txt
+++ b/applications/OPJViewer/source/readmebefore.txt
--- a/applications/OPJViewer/source/wxj2kparser.cpp
+++ b/applications/OPJViewer/source/wxj2kparser.cpp
@@ -1,9 +1,4 @@
 /*
- * The copyright in this software is being made available under the 2-clauses 
- * BSD License, included below. This software may be subject to other third 
- * party and contributor rights, including patent rights, and no such rights
- * are granted under this license.
- *
 * Copyright (c) 2007, Digital Signal Processing Laboratory, Università degli studi di Perugia (UPG), Italy
 * All rights reserved.
 *
--- a/applications/OPJViewer/source/wxjp2parser.cpp
+++ b/applications/OPJViewer/source/wxjp2parser.cpp
@@ -1,9 +1,4 @@
 /*
- * The copyright in this software is being made available under the 2-clauses 
- * BSD License, included below. This software may be subject to other third 
- * party and contributor rights, including patent rights, and no such rights
- * are granted under this license.
- *
 * Copyright (c) 2007, Digital Signal Processing Laboratory, Università degli studi di Perugia (UPG), Italy
 * All rights reserved.
 *
--- a/applications/codec/CMakeLists.txt
+++ b/applications/codec/CMakeLists.txt
@@ -0,0 +1,113 @@
+# Build the demo app, small examples
+
+# First thing define the common source:
+SET(common_SRCS
+  convert.c
+  index.c
+  ${OPENJPEG_SOURCE_DIR}/applications/common/color.c
+  ${OPENJPEG_SOURCE_DIR}/applications/common/opj_getopt.c
+  )
+
+# Headers file are located here:
+INCLUDE_DIRECTORIES(
+  ${OPENJPEG_SOURCE_DIR}/libopenjpeg
+  ${LCMS_INCLUDE_DIRNAME}
+  ${OPENJPEG_SOURCE_DIR}/applications/common
+  ${Z_INCLUDE_DIRNAME}
+  ${PNG_INCLUDE_DIRNAME}
+  ${TIFF_INCLUDE_DIRNAME}
+  )
+
+IF(WIN32)
+  IF(BUILD_SHARED_LIBS)
+    ADD_DEFINITIONS(-DOPJ_EXPORTS)
+  ELSE(BUILD_SHARED_LIBS)
+    ADD_DEFINITIONS(-DOPJ_STATIC)
+  ENDIF(BUILD_SHARED_LIBS)
+ENDIF(WIN32)
+
+# Loop over all executables:
+FOREACH(exe j2k_to_image image_to_j2k j2k_dump)
+  ADD_EXECUTABLE(${exe} ${exe}.c ${common_SRCS})
+  TARGET_LINK_LIBRARIES(${exe} ${OPENJPEG_LIBRARY_NAME} 
+    ${PNG_LIBNAME} ${TIFF_LIBNAME} ${LCMS_LIBNAME}
+    )
+  # To support universal exe:
+  IF(ZLIB_FOUND AND APPLE)
+    TARGET_LINK_LIBRARIES(${exe} z)
+  ELSe(ZLIB_FOUND AND APPLE)
+    TARGET_LINK_LIBRARIES(${exe} ${Z_LIBNAME})
+  ENDIF(ZLIB_FOUND AND APPLE)
+
+  # On unix you need to link to the math library:
+  IF(UNIX)
+    TARGET_LINK_LIBRARIES(${exe} m)
+  ENDIF(UNIX)
+  # Install exe
+  INSTALL(TARGETS ${exe}
+    EXPORT OpenJPEGTargets
+    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
+  )
+ENDFOREACH(exe)
+
+# Install man pages
+INSTALL(
+  FILES       ${OPENJPEG_SOURCE_DIR}/doc/man/man1/image_to_j2k.1
+              ${OPENJPEG_SOURCE_DIR}/doc/man/man1/j2k_dump.1
+              ${OPENJPEG_SOURCE_DIR}/doc/man/man1/j2k_to_image.1
+  DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man1)
+#
+
+IF(BUILD_JPWL)
+  ADD_EXECUTABLE(JPWL_j2k_to_image
+  j2k_to_image.c
+  ${common_SRCS}
+  )
+  
+  SET_PROPERTY(
+     TARGET JPWL_j2k_to_image
+     APPEND PROPERTY COMPILE_DEFINITIONS USE_JPWL
+  )
+
+  TARGET_LINK_LIBRARIES(JPWL_j2k_to_image ${OPENJPEG_LIBRARY_NAME}_JPWL
+    ${LCMS_LIBNAME} ${PNG_LIBNAME} ${TIFF_LIBNAME})
+    
+  # To support universal exe:
+  IF(ZLIB_FOUND AND APPLE)
+    TARGET_LINK_LIBRARIES(JPWL_j2k_to_image z)
+  ELSe(ZLIB_FOUND AND APPLE)
+    TARGET_LINK_LIBRARIES(JPWL_j2k_to_image ${Z_LIBNAME})
+  ENDIF(ZLIB_FOUND AND APPLE)
+  
+  IF(UNIX)
+    TARGET_LINK_LIBRARIES(JPWL_j2k_to_image m)
+  ENDIF(UNIX)
+
+  ADD_EXECUTABLE(JPWL_image_to_j2k
+  image_to_j2k.c
+  ${common_SRCS}
+  )
+  
+  SET_PROPERTY(
+     TARGET JPWL_image_to_j2k
+     APPEND PROPERTY COMPILE_DEFINITIONS USE_JPWL
+  )
+
+  TARGET_LINK_LIBRARIES(JPWL_image_to_j2k ${OPENJPEG_LIBRARY_NAME}_JPWL 
+  	${LCMS_LIBNAME} ${PNG_LIBNAME} ${TIFF_LIBNAME})
+  	
+  # To support universal exe:
+  IF(ZLIB_FOUND AND APPLE)
+    TARGET_LINK_LIBRARIES(JPWL_image_to_j2k z)
+  ELSe(ZLIB_FOUND AND APPLE)
+    TARGET_LINK_LIBRARIES(JPWL_image_to_j2k ${Z_LIBNAME})
+  ENDIF(ZLIB_FOUND AND APPLE)
+
+  IF(UNIX)
+    TARGET_LINK_LIBRARIES(JPWL_image_to_j2k m)
+  ENDIF(UNIX)
+
+  INSTALL(TARGETS JPWL_image_to_j2k JPWL_j2k_to_image
+    DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
+  )
+ENDIF(BUILD_JPWL)
--- a/applications/codec/Makefile.am
+++ b/applications/codec/Makefile.am
@@ -0,0 +1,118 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+bin_PROGRAMS = j2k_to_image image_to_j2k j2k_dump
+
+if WANT_JPWL
+bin_PROGRAMS += JPWL_j2k_to_image JPWL_image_to_j2k
+endif
+
+j2k_to_image_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/applications/codec \
+-I$(top_builddir)/applications/codec \
+-I$(top_srcdir)/applications/common \
+-I$(top_builddir)/applications/common \
+-I$(top_srcdir)/libopenjpeg \
+-I$(top_builddir)/libopenjpeg \
+@PNG_CFLAGS@ \
+@TIFF_CFLAGS@ \
+@LCMS1_CFLAGS@ \
+@LCMS2_CFLAGS@
+j2k_to_image_CFLAGS = 
+j2k_to_image_LDADD = $(top_builddir)/libopenjpeg/libopenjpeg.la @LCMS1_LIBS@ @LCMS2_LIBS@ @TIFF_LIBS@ @PNG_LIBS@ -lm
+j2k_to_image_SOURCES = \
+../common/color.c \
+../common/opj_getopt.c \
+convert.c \
+index.c \
+j2k_to_image.c \
+../common/color.h
+
+image_to_j2k_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/applications/codec \
+-I$(top_builddir)/applications/codec \
+-I$(top_srcdir)/applications/common \
+-I$(top_builddir)/applications/common \
+-I$(top_srcdir)/libopenjpeg \
+-I$(top_builddir)/libopenjpeg \
+@PNG_CFLAGS@ \
+@TIFF_CFLAGS@
+image_to_j2k_CFLAGS = 
+image_to_j2k_LDADD = $(top_builddir)/libopenjpeg/libopenjpeg.la @TIFF_LIBS@ @PNG_LIBS@ -lm
+image_to_j2k_SOURCES = \
+../common/opj_getopt.c \
+convert.c \
+index.c \
+image_to_j2k.c \
+convert.h \
+../common/format_defs.h \
+index.h
+
+j2k_dump_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/applications/codec \
+-I$(top_builddir)/applications/codec \
+-I$(top_srcdir)/applications/common \
+-I$(top_builddir)/applications/common \
+-I$(top_srcdir)/libopenjpeg \
+-I$(top_builddir)/libopenjpeg
+j2k_dump_CFLAGS = 
+j2k_dump_LDADD = $(top_builddir)/libopenjpeg/libopenjpeg.la -lm
+j2k_dump_SOURCES = \
+../common/opj_getopt.c \
+index.c \
+j2k_dump.c \
+../common/opj_getopt.h \
+index.h
+
+JPWL_j2k_to_image_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/applications/common \
+-I$(top_builddir)/applications/common \
+-I$(top_srcdir)/libopenjpeg \
+-I$(top_builddir)/libopenjpeg \
+-DUSE_JPWL \
+@TIFF_CFLAGS@ \
+@PNG_CFLAGS@ \
+@LCMS1_CFLAGS@ \
+@LCMS2_CFLAGS@
+JPWL_j2k_to_image_CFLAGS =
+JPWL_j2k_to_image_LDADD = $(top_builddir)/libopenjpeg/jpwl/libopenjpeg_JPWL.la  @LCMS1_LIBS@ @LCMS2_LIBS@ @TIFF_LIBS@ @PNG_LIBS@
+JPWL_j2k_to_image_SOURCES = \
+../common/color.c \
+../common/opj_getopt.c \
+index.c \
+convert.c \
+j2k_to_image.c
+
+JPWL_image_to_j2k_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/applications/common \
+-I$(top_builddir)/applications/common \
+-I$(top_srcdir)/libopenjpeg \
+-I$(top_builddir)/libopenjpeg \
+-DUSE_JPWL \
+@TIFF_CFLAGS@ \
+@PNG_CFLAGS@
+JPWL_image_to_j2k_CFLAGS =
+JPWL_image_to_j2k_LDADD = $(top_builddir)/libopenjpeg/jpwl/libopenjpeg_JPWL.la @TIFF_LIBS@ @PNG_LIBS@
+
+JPWL_image_to_j2k_SOURCES = \
+../common/opj_getopt.c \
+index.c \
+convert.c \
+image_to_j2k.c
+
+EXTRA_DIST = \
+CMakeLists.txt \
+windirent.h
+
+install-data-hook:
+	@echo -e " (B)\t$(bindir)/j2k_to_image$(EXEEXT)" >> $(top_builddir)/report.txt
+	@echo -e " (B)\t$(bindir)/image_to_j2k$(EXEEXT)" >> $(top_builddir)/report.txt
+	@echo -e " (B)\t$(bindir)/j2k_dump$(EXEEXT)" >> $(top_builddir)/report.txt
+if WANT_JPWL
+	@echo -e " (B)\t$(bindir)/JPWL_j2k_to_image$(EXEEXT)" >> $(top_builddir)/report.txt
+	@echo -e " (B)\t$(bindir)/JPWL_image_to_j2k$(EXEEXT)" >> $(top_builddir)/report.txt
+endif
--- a/applications/codec/README
+++ b/applications/codec/README
@@ -0,0 +1,8 @@
+Simple codec compilation
+------------------------
+Once you've built the library, you might want to test it with a basic codec. To do this, go to the codec directory and either use the provided Makefile or use one of the following commands to build an encoder and decoder respectively:
+
+gcc index.c convert.c image_to_j2k.c -o image_to_j2k -lopenjpeg -I ../libopenjpeg/ -lm -ltiff
+gcc index.c convert.c j2k_to_image.c -o j2k_to_image -lopenjpeg -I ../libopenjpeg/ -lm -ltiff
+
+You should add '-L..' to those lines if you did not use the 'install' target when building the library.
--- a/applications/codec/convert.c
+++ b/applications/codec/convert.c
@@ -1,15 +1,9 @@
 /*
- * The copyright in this software is being made available under the 2-clauses 
- * BSD License, included below. This software may be subject to other third 
- * party and contributor rights, including patent rights, and no such rights
- * are granted under this license.
- *
- * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2014, Professor Benoit Macq
+ * Copyright (c) 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 
- * Copyright (c) 2003-2014, Antonin Descampe
+ * 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.
@@ -35,21 +29,21 @@
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 */
-#include "opj_apps_config.h"
+#include "opj_config.h"

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>

-#ifdef OPJ_HAVE_LIBTIFF
+#ifdef HAVE_LIBTIFF
 #include <tiffio.h>
-#endif /* OPJ_HAVE_LIBTIFF */
+#endif /* HAVE_LIBTIFF */

-#ifdef OPJ_HAVE_LIBPNG
+#ifdef HAVE_LIBPNG
 #include <zlib.h>
 #include <png.h>
-#endif /* OPJ_HAVE_LIBPNG */
+#endif /* HAVE_LIBPNG */

 #include "openjpeg.h"
 #include "convert.h"
@@ -100,7 +94,7 @@ struct tga_header

 static unsigned short get_ushort(unsigned short val) {

-#ifdef OPJ_BIG_ENDIAN
+#ifdef WORDS_BIGENDIAN
 	return( ((val & 0xff) << 8) + (val >> 8) );
 #else
    return( val );
@@ -185,7 +179,7 @@ static int tga_readheader(FILE *fp, unsigned int *bits_per_pixel,
 	return 1;
 }

-#ifdef OPJ_BIG_ENDIAN
+#if WORDS_BIGENDIAN == 1

 static inline int16_t swap16(int16_t x)
 {
@@ -232,7 +226,7 @@ static int tga_writeheader(FILE *fp, int bits_per_pixel, int width, int height,
 	image_w = (unsigned short)width;
 	image_h = (unsigned short) height;

-#ifndef OPJ_BIG_ENDIAN
+#if WORDS_BIGENDIAN == 0
 	if(fwrite(&image_w, 2, 1, fp) != 1) goto fails;
 	if(fwrite(&image_h, 2, 1, fp) != 1) goto fails;
 #else
@@ -2080,7 +2074,7 @@ int imagetopnm(opj_image_t * image, const char *outfile)
 	return 0;
 }/* imagetopnm() */

-#ifdef OPJ_HAVE_LIBTIFF
+#ifdef HAVE_LIBTIFF
 /* -->> -->> -->> -->>

 	TIFF IMAGE FORMAT
@@ -2787,7 +2781,7 @@ opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters)

 }/* tiftoimage() */

-#endif /* OPJ_HAVE_LIBTIFF */
+#endif /* HAVE_LIBTIFF */

 /* -->> -->> -->> -->>

@@ -3033,7 +3027,7 @@ int imagetoraw(opj_image_t * image, const char *outfile)
 	return 0;
 }

-#ifdef OPJ_HAVE_LIBPNG
+#ifdef HAVE_LIBPNG

 #define PNG_MAGIC "\x89PNG\x0d\x0a\x1a\x0a"
 #define MAGIC_SIZE 8
@@ -3566,4 +3560,4 @@ fin:

 	return fails;
 }/* imagetopng() */
-#endif /* OPJ_HAVE_LIBPNG */
+#endif /* HAVE_LIBPNG */
--- a/applications/codec/convert.h
+++ b/applications/codec/convert.h
@@ -1,15 +1,9 @@
 /*
- * The copyright in this software is being made available under the 2-clauses 
- * BSD License, included below. This software may be subject to other third 
- * party and contributor rights, including patent rights, and no such rights
- * are granted under this license.
- *
- * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2014, Professor Benoit Macq
+ * Copyright (c) 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 
- * Copyright (c) 2003-2014, Antonin Descampe
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
 * Copyright (c) 2005, Herve Drolon, FreeImage Team
 * All rights reserved.
 *
--- a/applications/codec/image_to_j2k.c
+++ b/applications/codec/image_to_j2k.c
@@ -1,15 +1,9 @@
 /*
- * The copyright in this software is being made available under the 2-clauses 
- * BSD License, included below. This software may be subject to other third 
- * party and contributor rights, including patent rights, and no such rights
- * are granted under this license.
- *
- * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2014, Professor Benoit Macq
+ * Copyright (c) 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 
- * Copyright (c) 2003-2014, Antonin Descampe
+ * 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.
@@ -49,13 +43,13 @@

 #ifdef _WIN32
 #include <windows.h>
-#define strcasecmp _stricmp
-#define strncasecmp _strnicmp
 #else
 #include <strings.h>
+#define _stricmp strcasecmp
+#define _strnicmp strncasecmp
 #endif /* _WIN32 */

-#include "opj_apps_config.h"
+#include "opj_config.h"
 #include "openjpeg.h"
 #include "opj_getopt.h"
 #include "convert.h"
@@ -88,8 +82,8 @@ typedef struct img_folder{
 	float *rates;
 }img_fol_t;

-static void encode_help_display(void) {
-	fprintf(stdout,"HELP for opj_jpwl_compress\n----\n\n");
+void encode_help_display(void) {
+	fprintf(stdout,"HELP for image_to_j2k\n----\n\n");
 	fprintf(stdout,"- the -h option displays this help information on screen\n\n");

 /* UniPG>> */
@@ -327,7 +321,7 @@ static void encode_help_display(void) {
 	fprintf(stdout,"TotalDisto\n\n");
 }

-static OPJ_PROG_ORDER give_progression(const char progression[4]) {
+OPJ_PROG_ORDER give_progression(char progression[4]) {
 	if(strncmp(progression, "LRCP", 4) == 0) {
 		return LRCP;
 	}
@@ -347,10 +341,10 @@ static OPJ_PROG_ORDER give_progression(const char progression[4]) {
 	return PROG_UNKNOWN;
 }

-static unsigned int get_num_images(char *imgdirpath){
+int get_num_images(char *imgdirpath){
 	DIR *dir;
 	struct dirent* content;
-	unsigned int num_images = 0;
+	int num_images = 0;

 	/*Reading the input images from given input directory*/

@@ -369,7 +363,7 @@ static unsigned int get_num_images(char *imgdirpath){
 	return num_images;
 }

-static int load_images(dircnt_t *dirptr, char *imgdirpath){
+int load_images(dircnt_t *dirptr, char *imgdirpath){
 	DIR *dir;
 	struct dirent* content;
 	int i = 0;
@@ -394,7 +388,7 @@ static int load_images(dircnt_t *dirptr, char *imgdirpath){
 	return 0;
 }

-static int get_file_format(char *filename) {
+int get_file_format(char *filename) {
 	unsigned int i;
 	static const char *extension[] = {
    "pgx", "pnm", "pgm", "ppm", "pbm", "pam", "bmp", "tif", "raw", "tga", "png", "j2k", "jp2", "j2c", "jpc"
@@ -407,21 +401,21 @@ static int get_file_format(char *filename) {
 		return -1;
 	ext++;
 	for(i = 0; i < sizeof(format)/sizeof(*format); i++) {
-		if(strcasecmp(ext, extension[i]) == 0) {
+		if(_strnicmp(ext, extension[i], 3) == 0) {
 			return format[i];
 		}
 	}
 	return -1;
 }

-static char * get_file_name(char *name){
+char * get_file_name(char *name){
 	char *fname;
 	fname= (char*)malloc(OPJ_PATH_LEN*sizeof(char));
 	fname= strtok(name,".");
 	return fname;
 }

-static char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_cparameters_t *parameters){
+char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_cparameters_t *parameters){
 	char image_filename[OPJ_PATH_LEN], infilename[OPJ_PATH_LEN],outfilename[OPJ_PATH_LEN],temp_ofname[OPJ_PATH_LEN];
  char *temp_p, temp1[OPJ_PATH_LEN]="";

@@ -464,7 +458,7 @@ static int initialise_4K_poc(opj_poc_t *POC, int numres){
 	return 2;
 }

-static void cinema_parameters(opj_cparameters_t *parameters){
+void cinema_parameters(opj_cparameters_t *parameters){
 	parameters->tile_size_on = OPJ_FALSE;
 	parameters->cp_tdx=1;
 	parameters->cp_tdy=1;
@@ -497,7 +491,7 @@ static void cinema_parameters(opj_cparameters_t *parameters){

 }

-static void cinema_setup_encoder(opj_cparameters_t *parameters,opj_image_t *image, img_fol_t *img_fol){
+void cinema_setup_encoder(opj_cparameters_t *parameters,opj_image_t *image, img_fol_t *img_fol){
 	int i;
 	float temp_rate;

@@ -582,7 +576,7 @@ static void cinema_setup_encoder(opj_cparameters_t *parameters,opj_image_t *imag

 /* ------------------------------------------------------------------------------------ */

-static int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
+int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
 													img_fol_t *img_fol, raw_cparameters_t *raw_cp, char *indexfilename) {
 	int i, j, totlen, c;
 	opj_option_t long_option[]={
@@ -1385,7 +1379,7 @@ static int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *param
 			
 			case 'J':			/* jpip on */
 			{
-			  /*parameters->jpip_on = OPJ_TRUE;*/
+			  parameters->jpip_on = OPJ_TRUE;
 			}
 			break;
 				/* ------------------------------------------------------ */
@@ -1472,21 +1466,21 @@ static int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *param
 /**
 sample error callback expecting a FILE* client object
 */
-static void error_callback(const char *msg, void *client_data) {
+void error_callback(const char *msg, void *client_data) {
 	FILE *stream = (FILE*)client_data;
 	fprintf(stream, "[ERROR] %s", msg);
 }
 /**
 sample warning callback expecting a FILE* client object
 */
-static void warning_callback(const char *msg, void *client_data) {
+void warning_callback(const char *msg, void *client_data) {
 	FILE *stream = (FILE*)client_data;
 	fprintf(stream, "[WARNING] %s", msg);
 }
 /**
 sample debug callback expecting a FILE* client object
 */
-static void info_callback(const char *msg, void *client_data) {
+void info_callback(const char *msg, void *client_data) {
 	FILE *stream = (FILE*)client_data;
 	fprintf(stream, "[INFO] %s", msg);
 }
@@ -1633,7 +1627,7 @@ int main(int argc, char **argv) {
 						return 1;
 					}
 					break;
-#ifdef OPJ_HAVE_LIBTIFF
+#ifdef HAVE_LIBTIFF
 				case TIF_DFMT:
 					image = tiftoimage(parameters.infile, &parameters);
 					if (!image) {
@@ -1641,7 +1635,7 @@ int main(int argc, char **argv) {
 						return 1;
 					}
 				break;
-#endif /* OPJ_HAVE_LIBTIFF */
+#endif /* HAVE_LIBTIFF */
 				case RAW_DFMT:
 					image = rawtoimage(parameters.infile, &parameters, &raw_cp);
 					if (!image) {
@@ -1657,7 +1651,7 @@ int main(int argc, char **argv) {
 						return 1;
 					}
 				break;
-#ifdef OPJ_HAVE_LIBPNG
+#ifdef HAVE_LIBPNG
 				case PNG_DFMT:
 					image = pngtoimage(parameters.infile, &parameters);
 					if (!image) {
@@ -1665,10 +1659,10 @@ int main(int argc, char **argv) {
 						return 1;
 					}
 					break;
-#endif /* OPJ_HAVE_LIBPNG */
+#endif /* HAVE_LIBPNG */
 		}
 /* Can happen if input file is TIFF or PNG 
- * and OPJ_HAVE_LIBTIF or OPJ_HAVE_LIBPNG is undefined
+ * and HAVE_LIBTIF or HAVE_LIBPNG is undefined
 */
 			if( !image)
 		   {
@@ -1766,7 +1760,7 @@ int main(int argc, char **argv) {
 				cio = opj_cio_open((opj_common_ptr)cinfo, NULL, 0);

 				/* encode the image */
-				if (*indexfilename /*|| parameters.jpip_on*/) /* If need to extract codestream information*/
+				if (*indexfilename || parameters.jpip_on) /* If need to extract codestream information*/
 				  bSuccess = opj_encode_with_info(cinfo, cio, image, &cstr_info);
 				else
 					bSuccess = opj_encode(cinfo, cio, image, NULL);
--- a/wrapping/java/openjp2/index.c
+++ b/wrapping/java/openjp2/index.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2014, Professor Benoit Macq
+ * 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 
 * All rights reserved.
 *
--- a/wrapping/java/openjp2/index.h
+++ b/wrapping/java/openjp2/index.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2014, Professor Benoit Macq
+ * 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
 * All rights reserved.
 *
--- a/applications/codec/j2k_dump.c
+++ b/applications/codec/j2k_dump.c
@@ -0,0 +1,677 @@
+/*
+ * Copyright (c) 2010, Mathieu Malaterre, GDCM
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <math.h>
+
+#ifdef _WIN32
+#include "windirent.h"
+#else
+#include <dirent.h>
+#endif /* _WIN32 */
+
+#ifdef _WIN32
+#include <windows.h>
+#else
+#include <strings.h>
+#define _stricmp strcasecmp
+#define _strnicmp strncasecmp
+#endif /* _WIN32 */
+
+#include "opj_config.h"
+#include "openjpeg.h"
+#include "j2k.h"
+#include "jp2.h"
+#include "opj_getopt.h"
+#include "convert.h"
+#include "index.h"
+
+#include "format_defs.h"
+
+typedef struct dircnt{
+	/** Buffer for holding images read from Directory*/
+	char *filename_buf;
+	/** Pointer to the buffer*/
+	char **filename;
+}dircnt_t;
+
+
+typedef struct img_folder{
+	/** The directory path of the folder containing input images*/
+	char *imgdirpath;
+	/** Output format*/
+	const char *out_format;
+	/** Enable option*/
+	char set_imgdir;
+	/** Enable Cod Format for output*/
+	char set_out_format;
+
+}img_fol_t;
+
+void decode_help_display(void) {
+	fprintf(stdout,"HELP for j2k_dump\n----\n\n");
+	fprintf(stdout,"- the -h option displays this help information on screen\n\n");
+
+/* UniPG>> */
+	fprintf(stdout,"List of parameters for the JPEG 2000 "
+#ifdef USE_JPWL
+		"+ JPWL "
+#endif /* USE_JPWL */
+		"decoder:\n");
+/* <<UniPG */
+	fprintf(stdout,"\n");
+	fprintf(stdout,"\n");
+	fprintf(stdout,"  -ImgDir \n");
+	fprintf(stdout,"	Image file Directory path \n");
+	fprintf(stdout,"  -i <compressed file>\n");
+	fprintf(stdout,"    REQUIRED only if an Input image directory not specified\n");
+	fprintf(stdout,"    Currently accepts J2K-files, JP2-files and JPT-files. The file type\n");
+	fprintf(stdout,"    is identified based on its suffix.\n");
+	fprintf(stdout,"  -o <output file>\n");
+  fprintf(stdout,"    OPTIONAL\n");
+  fprintf(stdout,"    Output file where file info will be dump.\n");
+  fprintf(stdout,"    By default it will be in the stdout.\n");
+	fprintf(stdout,"\n");
+}
+
+/* -------------------------------------------------------------------------- */
+static void j2k_dump_image(FILE *fd, opj_image_t * img);
+static void j2k_dump_cp(FILE *fd, opj_image_t * img, opj_cp_t * cp);
+
+int get_num_images(char *imgdirpath){
+	DIR *dir;
+	struct dirent* content;	
+	int num_images = 0;
+
+	/*Reading the input images from given input directory*/
+
+	dir= opendir(imgdirpath);
+	if(!dir){
+		fprintf(stderr,"Could not open Folder %s\n",imgdirpath);
+		return 0;
+	}
+	
+	while((content=readdir(dir))!=NULL){
+		if(strcmp(".",content->d_name)==0 || strcmp("..",content->d_name)==0 )
+			continue;
+		num_images++;
+	}
+	return num_images;
+}
+
+int load_images(dircnt_t *dirptr, char *imgdirpath){
+	DIR *dir;
+	struct dirent* content;	
+	int i = 0;
+
+	/*Reading the input images from given input directory*/
+
+	dir= opendir(imgdirpath);
+	if(!dir){
+		fprintf(stderr,"Could not open Folder %s\n",imgdirpath);
+		return 1;
+	}else	{
+		fprintf(stderr,"Folder opened successfully\n");
+	}
+	
+	while((content=readdir(dir))!=NULL){
+		if(strcmp(".",content->d_name)==0 || strcmp("..",content->d_name)==0 )
+			continue;
+
+		strcpy(dirptr->filename[i],content->d_name);
+		i++;
+	}
+	return 0;	
+}
+
+int get_file_format(char *filename) {
+	unsigned int i;
+	static const char *extension[] = {"pgx", "pnm", "pgm", "ppm", "bmp","tif", "raw", "tga", "png", "j2k", "jp2", "jpt", "j2c", "jpc"  };
+	static const int format[] = { PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, TIF_DFMT, RAW_DFMT, TGA_DFMT, PNG_DFMT, J2K_CFMT, JP2_CFMT, JPT_CFMT, J2K_CFMT, J2K_CFMT };
+	char * ext = strrchr(filename, '.');
+	if (ext == NULL)
+		return -1;
+	ext++;
+	if(ext) {
+		for(i = 0; i < sizeof(format)/sizeof(*format); i++) {
+			if(_strnicmp(ext, extension[i], 3) == 0) {
+				return format[i];
+			}
+		}
+	}
+
+	return -1;
+}
+
+char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_dparameters_t *parameters){
+	char image_filename[OPJ_PATH_LEN], infilename[OPJ_PATH_LEN],outfilename[OPJ_PATH_LEN],temp_ofname[OPJ_PATH_LEN];
+	char *temp_p, temp1[OPJ_PATH_LEN]="";
+
+	strcpy(image_filename,dirptr->filename[imageno]);
+	fprintf(stderr,"File Number %d \"%s\"\n",imageno,image_filename);
+	parameters->decod_format = get_file_format(image_filename);
+	if (parameters->decod_format == -1)
+		return 1;
+	sprintf(infilename,"%s/%s",img_fol->imgdirpath,image_filename);
+	strncpy(parameters->infile, infilename, sizeof(infilename));
+
+	/*Set output file*/
+	strcpy(temp_ofname,strtok(image_filename,"."));
+	while((temp_p = strtok(NULL,".")) != NULL){
+		strcat(temp_ofname,temp1);
+		sprintf(temp1,".%s",temp_p);
+	}
+	if(img_fol->set_out_format==1){
+		sprintf(outfilename,"%s/%s.%s",img_fol->imgdirpath,temp_ofname,img_fol->out_format);
+		strncpy(parameters->outfile, outfilename, sizeof(outfilename));
+	}
+	return 0;
+}
+
+/* -------------------------------------------------------------------------- */
+int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,img_fol_t *img_fol, char *indexfilename) {
+	/* parse the command line */
+	int totlen, c;
+	opj_option_t long_option[]={
+		{"ImgDir",REQ_ARG, NULL ,'y'},
+	};
+	const char optlist[] = "i:o:h";
+
+	OPJ_ARG_NOT_USED(indexfilename);
+
+	totlen=sizeof(long_option);
+	img_fol->set_out_format = 0;
+	do {
+		c = opj_getopt_long(argc, argv,optlist,long_option,totlen);
+		if (c == -1)
+			break;
+		switch (c) {
+			case 'i':			/* input file */
+			{
+				char *infile = opj_optarg;
+				parameters->decod_format = get_file_format(infile);
+				switch(parameters->decod_format) {
+					case J2K_CFMT:
+					case JP2_CFMT:
+					case JPT_CFMT:
+						break;
+					default:
+						fprintf(stderr, 
+							"!! Unrecognized format for infile : %s [accept only *.j2k, *.jp2, *.jpc or *.jpt] !!\n\n", 
+							infile);
+						return 1;
+				}
+				strncpy(parameters->infile, infile, sizeof(parameters->infile)-1);
+			}
+			break;
+
+			/* ------------------------------------------------------ */
+
+			case 'o':     /* output file */
+			{
+			  char *outfile = opj_optarg;
+			  strncpy(parameters->outfile, outfile, sizeof(parameters->outfile)-1);
+			}
+			break;
+				
+				/* ----------------------------------------------------- */
+
+			case 'h': 			/* display an help description */
+				decode_help_display();
+				return 1;				
+
+				/* ------------------------------------------------------ */
+
+			case 'y':			/* Image Directory path */
+				{
+					img_fol->imgdirpath = (char*)malloc(strlen(opj_optarg) + 1);
+					strcpy(img_fol->imgdirpath,opj_optarg);
+					img_fol->set_imgdir=1;
+				}
+				break;
+
+				/* ----------------------------------------------------- */
+			
+			default:
+				fprintf(stderr,"WARNING -> this option is not valid \"-%c %s\"\n",c, opj_optarg);
+				break;
+		}
+	}while(c != -1);
+
+	/* check for possible errors */
+	if(img_fol->set_imgdir==1){
+		if(!(parameters->infile[0]==0)){
+			fprintf(stderr, "Error: options -ImgDir and -i cannot be used together !!\n");
+			return 1;
+		}
+		if(img_fol->set_out_format == 0){
+			fprintf(stderr, "Error: When -ImgDir is used, -OutFor <FORMAT> must be used !!\n");
+			fprintf(stderr, "Only one format allowed! Valid format PGM, PPM, PNM, PGX, BMP, TIF, RAW and TGA!!\n");
+			return 1;
+		}
+		if(!(parameters->outfile[0] == 0)){
+			fprintf(stderr, "Error: options -ImgDir and -o cannot be used together !!\n");
+			return 1;
+		}
+	}else{
+		if( parameters->infile[0] == 0 ) {
+			fprintf(stderr, "Example: %s -i image.j2k\n",argv[0]);
+			fprintf(stderr, "    Try: %s -h\n",argv[0]);
+			return 1;
+		}
+	}
+
+	return 0;
+}
+
+/* -------------------------------------------------------------------------- */
+
+/**
+sample error callback expecting a FILE* client object
+*/
+void error_callback(const char *msg, void *client_data) {
+	FILE *stream = (FILE*)client_data;
+	fprintf(stream, "[ERROR] %s", msg);
+}
+/**
+sample warning callback expecting a FILE* client object
+*/
+void warning_callback(const char *msg, void *client_data) {
+	FILE *stream = (FILE*)client_data;
+	fprintf(stream, "[WARNING] %s", msg);
+}
+/**
+sample debug callback expecting no client object
+*/
+void info_callback(const char *msg, void *client_data) {
+	(void)client_data;
+	fprintf(stdout, "[INFO] %s", msg);
+}
+
+/* -------------------------------------------------------------------------- */
+
+int main(int argc, char *argv[])
+{
+	opj_dparameters_t parameters;	/* decompression parameters */
+	img_fol_t img_fol;
+	opj_event_mgr_t event_mgr;		/* event manager */
+	opj_image_t *image = NULL;
+	FILE *fsrc = NULL, *fout = NULL;
+	unsigned char *src = NULL;
+	int file_length;
+	int num_images;
+	int i,imageno;
+	dircnt_t *dirptr = NULL;
+	opj_dinfo_t* dinfo = NULL;	/* handle to a decompressor */
+	opj_cio_t *cio = NULL;
+	opj_codestream_info_t cstr_info;  /* Codestream information structure */
+	char indexfilename[OPJ_PATH_LEN];	/* index file name */
+
+	/* configure the event callbacks (not required) */
+	memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
+	event_mgr.error_handler = error_callback;
+	event_mgr.warning_handler = warning_callback;
+	event_mgr.info_handler = info_callback;
+
+	/* set decoding parameters to default values */
+	opj_set_default_decoder_parameters(&parameters);
+
+	/* Initialize indexfilename and img_fol */
+	*indexfilename = 0;
+	memset(&img_fol,0,sizeof(img_fol_t));
+
+	/* parse input and get user encoding parameters */
+	if(parse_cmdline_decoder(argc, argv, &parameters,&img_fol, indexfilename) == 1) {
+		return 1;
+	}
+
+	/* Initialize reading of directory */
+	if(img_fol.set_imgdir==1){	
+		num_images=get_num_images(img_fol.imgdirpath);
+
+		dirptr=(dircnt_t*)malloc(sizeof(dircnt_t));
+		if(dirptr){
+			dirptr->filename_buf = (char*)malloc(num_images*OPJ_PATH_LEN*sizeof(char));	/* Stores at max 10 image file names*/
+			dirptr->filename = (char**) malloc(num_images*sizeof(char*));
+
+			if(!dirptr->filename_buf){
+				return 1;
+			}
+			for(i=0;i<num_images;i++){
+				dirptr->filename[i] = dirptr->filename_buf + i*OPJ_PATH_LEN;
+			}
+		}
+		if(load_images(dirptr,img_fol.imgdirpath)==1){
+			return 1;
+		}
+		if (num_images==0){
+			fprintf(stdout,"Folder is empty\n");
+			return 1;
+		}
+	}else{
+		num_images=1;
+	}
+
+	/* */
+	if (parameters.outfile[0] != 0)
+	  {
+	  fout = fopen(parameters.outfile,"w");
+    if (!fout)
+      {
+      fprintf(stderr, "ERROR -> failed to open %s for reading\n", parameters.outfile);
+      return 1;
+      }
+	  }
+	else
+	  fout = stdout;
+
+	/*Encoding image one by one*/
+	for(imageno = 0; imageno < num_images ; imageno++)
+  {
+		image = NULL;
+		fprintf(stderr,"\n");
+
+		if(img_fol.set_imgdir==1){
+			if (get_next_file(imageno, dirptr,&img_fol, &parameters)) {
+				fprintf(stderr,"skipping file...\n");
+				continue;
+			}
+		}
+
+		/* read the input file and put it in memory */
+		/* ---------------------------------------- */
+		fsrc = fopen(parameters.infile, "rb");
+		if (!fsrc) {
+			fprintf(stderr, "ERROR -> failed to open %s for reading\n", parameters.infile);
+			return 1;
+		}
+		fseek(fsrc, 0, SEEK_END);
+		file_length = ftell(fsrc);
+		fseek(fsrc, 0, SEEK_SET);
+		src = (unsigned char *) malloc(file_length);
+		if (fread(src, 1, file_length, fsrc) != (size_t)file_length)
+		{
+			free(src);
+			fclose(fsrc);
+			fclose(fout);
+			fprintf(stderr, "\nERROR: fread return a number of element different from the expected.\n");
+			return 1;
+		}
+		fclose(fsrc);
+
+		/* decode the code-stream */
+		/* ---------------------- */
+
+		switch(parameters.decod_format) {
+		case J2K_CFMT:
+		{
+			/* JPEG-2000 codestream */
+
+			/* get a decoder handle */
+			dinfo = opj_create_decompress(CODEC_J2K);
+
+			/* catch events using our callbacks and give a local context */
+			opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, stderr);
+
+			/* setup the decoder decoding parameters using user parameters */
+			opj_setup_decoder(dinfo, &parameters);
+
+			/* open a byte stream */
+			cio = opj_cio_open((opj_common_ptr)dinfo, src, file_length);
+
+			/* decode the stream and fill the image structure */
+			if (*indexfilename)				/* If need to extract codestream information*/
+				image = opj_decode_with_info(dinfo, cio, &cstr_info);
+			else
+				image = opj_decode(dinfo, cio);
+			if(!image) {
+				fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n");
+				opj_destroy_decompress(dinfo);
+				opj_cio_close(cio);
+				fclose(fout);
+				free(src);
+				return 1;
+			}
+			/* dump image */
+      j2k_dump_image(fout, image);
+
+			/* dump cp */
+      j2k_dump_cp(fout, image, ((opj_j2k_t*)dinfo->j2k_handle)->cp);
+
+			/* close the byte stream */
+			opj_cio_close(cio);
+
+			/* Write the index to disk */
+			if (*indexfilename) {
+				opj_bool bSuccess;
+				bSuccess = write_index_file(&cstr_info, indexfilename);
+				if (bSuccess) {
+					fprintf(stderr, "Failed to output index file\n");
+				}
+			}
+		}
+		break;
+
+		case JP2_CFMT:
+		{
+			/* JPEG 2000 compressed image data */
+
+			/* get a decoder handle */
+			dinfo = opj_create_decompress(CODEC_JP2);
+
+			/* catch events using our callbacks and give a local context */
+			opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, stderr);
+
+			/* setup the decoder decoding parameters using the current image and user parameters */
+			opj_setup_decoder(dinfo, &parameters);
+
+			/* open a byte stream */
+			cio = opj_cio_open((opj_common_ptr)dinfo, src, file_length);
+
+			/* decode the stream and fill the image structure */
+			if (*indexfilename)				/* If need to extract codestream information*/
+				image = opj_decode_with_info(dinfo, cio, &cstr_info);
+			else
+				image = opj_decode(dinfo, cio);			
+			if(!image) {
+				fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n");
+				opj_destroy_decompress(dinfo);
+				opj_cio_close(cio);
+				fclose(fout);
+				free(src);
+				return 1;
+			}
+			/* dump image */
+	  if(image->icc_profile_buf)
+	 {
+	  free(image->icc_profile_buf); image->icc_profile_buf = NULL;
+	 }	
+      j2k_dump_image(fout, image);
+
+			/* dump cp */
+      j2k_dump_cp(fout, image, ((opj_jp2_t*)dinfo->jp2_handle)->j2k->cp);
+
+			/* close the byte stream */
+			opj_cio_close(cio);
+
+			/* Write the index to disk */
+			if (*indexfilename) {
+				opj_bool bSuccess;
+				bSuccess = write_index_file(&cstr_info, indexfilename);
+				if (bSuccess) {
+					fprintf(stderr, "Failed to output index file\n");
+				}
+			}
+		}
+		break;
+
+		case JPT_CFMT:
+		{
+			/* JPEG 2000, JPIP */
+
+			/* get a decoder handle */
+			dinfo = opj_create_decompress(CODEC_JPT);
+
+			/* catch events using our callbacks and give a local context */
+			opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, stderr);
+
+			/* setup the decoder decoding parameters using user parameters */
+			opj_setup_decoder(dinfo, &parameters);
+
+			/* open a byte stream */
+			cio = opj_cio_open((opj_common_ptr)dinfo, src, file_length);
+
+			/* decode the stream and fill the image structure */
+			if (*indexfilename)				/* If need to extract codestream information*/
+				image = opj_decode_with_info(dinfo, cio, &cstr_info);
+			else
+				image = opj_decode(dinfo, cio);
+			if(!image) {
+				fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n");
+				opj_destroy_decompress(dinfo);
+				opj_cio_close(cio);
+				fclose(fout);
+				free(src);
+				return 1;
+			}
+
+			/* close the byte stream */
+			opj_cio_close(cio);
+
+			/* Write the index to disk */
+			if (*indexfilename) {
+				opj_bool bSuccess;
+				bSuccess = write_index_file(&cstr_info, indexfilename);
+				if (bSuccess) {
+					fprintf(stderr, "Failed to output index file\n");
+				}
+			}
+		}
+		break;
+
+		default:
+			fprintf(stderr, "skipping file..\n");
+			continue;
+	}
+
+		/* free the memory containing the code-stream */
+		free(src);
+		src = NULL;
+
+		/* free remaining structures */
+		if(dinfo) {
+			opj_destroy_decompress(dinfo);
+		}
+		/* free codestream information structure */
+		if (*indexfilename)	
+			opj_destroy_cstr_info(&cstr_info);
+		/* free image data structure */
+		opj_image_destroy(image);
+
+	}
+
+	fclose(fout);
+
+  return EXIT_SUCCESS;
+}
+
+
+static void j2k_dump_image(FILE *fd, opj_image_t * img) {
+	int compno;
+	fprintf(fd, "image {\n");
+	fprintf(fd, "  x0=%d, y0=%d, x1=%d, y1=%d\n", img->x0, img->y0, img->x1, img->y1);
+	fprintf(fd, "  numcomps=%d\n", img->numcomps);
+	for (compno = 0; compno < img->numcomps; compno++) {
+		opj_image_comp_t *comp = &img->comps[compno];
+		fprintf(fd, "  comp %d {\n", compno);
+		fprintf(fd, "    dx=%d, dy=%d\n", comp->dx, comp->dy);
+		fprintf(fd, "    prec=%d\n", comp->prec);
+		/*fprintf(fd, "    bpp=%d\n", comp->bpp);*/
+		fprintf(fd, "    sgnd=%d\n", comp->sgnd);
+		fprintf(fd, "  }\n");
+	}
+	fprintf(fd, "}\n");
+}
+
+static void j2k_dump_cp(FILE *fd, opj_image_t * img, opj_cp_t * cp) {
+	int tileno, compno, layno, bandno, resno, numbands;
+	fprintf(fd, "coding parameters {\n");
+	fprintf(fd, "  tx0=%d, ty0=%d\n", cp->tx0, cp->ty0);
+	fprintf(fd, "  tdx=%d, tdy=%d\n", cp->tdx, cp->tdy);
+	fprintf(fd, "  tw=%d, th=%d\n", cp->tw, cp->th);
+	for (tileno = 0; tileno < cp->tw * cp->th; tileno++) {
+		opj_tcp_t *tcp = &cp->tcps[tileno];
+		fprintf(fd, "  tile %d {\n", tileno);
+		fprintf(fd, "    csty=%x\n", tcp->csty);
+		fprintf(fd, "    prg=%d\n", tcp->prg);
+		fprintf(fd, "    numlayers=%d\n", tcp->numlayers);
+		fprintf(fd, "    mct=%d\n", tcp->mct);
+		fprintf(fd, "    rates=");
+		for (layno = 0; layno < tcp->numlayers; layno++) {
+			fprintf(fd, "%.1f ", tcp->rates[layno]);
+		}
+		fprintf(fd, "\n");
+		for (compno = 0; compno < img->numcomps; compno++) {
+			opj_tccp_t *tccp = &tcp->tccps[compno];
+			fprintf(fd, "    comp %d {\n", compno);
+			fprintf(fd, "      csty=%x\n", tccp->csty);
+			fprintf(fd, "      numresolutions=%d\n", tccp->numresolutions);
+			fprintf(fd, "      cblkw=%d\n", tccp->cblkw);
+			fprintf(fd, "      cblkh=%d\n", tccp->cblkh);
+			fprintf(fd, "      cblksty=%x\n", tccp->cblksty);
+			fprintf(fd, "      qmfbid=%d\n", tccp->qmfbid);
+			fprintf(fd, "      qntsty=%d\n", tccp->qntsty);
+			fprintf(fd, "      numgbits=%d\n", tccp->numgbits);
+			fprintf(fd, "      roishift=%d\n", tccp->roishift);
+			fprintf(fd, "      stepsizes=");
+			numbands = tccp->qntsty == J2K_CCP_QNTSTY_SIQNT ? 1 : tccp->numresolutions * 3 - 2;
+			for (bandno = 0; bandno < numbands; bandno++) {
+				fprintf(fd, "(%d,%d) ", tccp->stepsizes[bandno].mant,
+					tccp->stepsizes[bandno].expn);
+			}
+			fprintf(fd, "\n");
+			
+			if (tccp->csty & J2K_CCP_CSTY_PRT) {
+				fprintf(fd, "      prcw=");
+				for (resno = 0; resno < tccp->numresolutions; resno++) {
+					fprintf(fd, "%d ", tccp->prcw[resno]);
+				}
+				fprintf(fd, "\n");
+				fprintf(fd, "      prch=");
+				for (resno = 0; resno < tccp->numresolutions; resno++) {
+					fprintf(fd, "%d ", tccp->prch[resno]);
+				}
+				fprintf(fd, "\n");
+			}
+			fprintf(fd, "    }\n");
+		}
+		fprintf(fd, "  }\n");
+	}
+	fprintf(fd, "}\n");
+}
+
--- a/src/bin/jpwl/opj_jpwl_decompress.c
+++ b/src/bin/jpwl/opj_jpwl_decompress.c
@@ -1,15 +1,9 @@
 /*
- * The copyright in this software is being made available under the 2-clauses 
- * BSD License, included below. This software may be subject to other third 
- * party and contributor rights, including patent rights, and no such rights
- * are granted under this license.
- *
- * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2014, Professor Benoit Macq
+ * Copyright (c) 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 
- * Copyright (c) 2003-2014, Antonin Descampe
+ * 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.
@@ -55,16 +49,16 @@
 #define _strnicmp strncasecmp
 #endif /* _WIN32 */

-#include "opj_apps_config.h"
+#include "opj_config.h"
 #include "openjpeg.h"
 #include "opj_getopt.h"
 #include "convert.h"
 #include "index.h"

-#ifdef OPJ_HAVE_LIBLCMS2
+#ifdef HAVE_LIBLCMS2
 #include <lcms2.h>
 #endif
-#ifdef OPJ_HAVE_LIBLCMS1
+#ifdef HAVE_LIBLCMS1
 #include <lcms.h>
 #endif
 #include "color.h"
@@ -759,7 +753,7 @@ int main(int argc, char **argv) {

 	if(image->icc_profile_buf)
   {
-#if defined(OPJ_HAVE_LIBLCMS1) || defined(OPJ_HAVE_LIBLCMS2)
+#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
 	color_apply_icc_profile(image);
 #endif

@@ -796,7 +790,7 @@ int main(int argc, char **argv) {
 				fprintf(stdout,"Generated Outfile %s\n",parameters.outfile);
 			}
 			break;
-#ifdef OPJ_HAVE_LIBTIFF
+#ifdef HAVE_LIBTIFF
 		case TIF_DFMT:			/* TIFF */
 			if(imagetotif(image, parameters.outfile)){
 				fprintf(stdout,"Outfile %s not generated\n",parameters.outfile);
@@ -805,7 +799,7 @@ int main(int argc, char **argv) {
 				fprintf(stdout,"Generated Outfile %s\n",parameters.outfile);
 			}
 			break;
-#endif /* OPJ_HAVE_LIBTIFF */
+#endif /* HAVE_LIBTIFF */
 		case RAW_DFMT:			/* RAW */
 			if(imagetoraw(image, parameters.outfile)){
 				fprintf(stdout,"Error generating raw file. Outfile %s not generated\n",parameters.outfile);
@@ -823,7 +817,7 @@ int main(int argc, char **argv) {
 				fprintf(stdout,"Successfully generated Outfile %s\n",parameters.outfile);
 			}
 			break;
-#ifdef OPJ_HAVE_LIBPNG
+#ifdef HAVE_LIBPNG
 		case PNG_DFMT:			/* PNG */
 			if(imagetopng(image, parameters.outfile)){
 				fprintf(stdout,"Error generating png file. Outfile %s not generated\n",parameters.outfile);
@@ -832,9 +826,9 @@ int main(int argc, char **argv) {
 				fprintf(stdout,"Successfully generated Outfile %s\n",parameters.outfile);
 			}
 			break;
-#endif /* OPJ_HAVE_LIBPNG */
+#endif /* HAVE_LIBPNG */
 /* Can happen if output file is TIFF or PNG
- * and OPJ_HAVE_LIBTIF or OPJ_HAVE_LIBPNG is undefined
+ * and HAVE_LIBTIF or HAVE_LIBPNG is undefined
 */
 			default:
 				fprintf(stderr,"Outfile %s not generated\n",parameters.outfile);
--- a/applications/codec/windirent.h
+++ b/applications/codec/windirent.h
--- a/applications/common/color.c
+++ b/applications/common/color.c
@@ -1,15 +1,9 @@
 /*
- * The copyright in this software is being made available under the 2-clauses 
- * BSD License, included below. This software may be subject to other third 
- * party and contributor rights, including patent rights, and no such rights
- * are granted under this license.
- *
- * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2014, Professor Benoit Macq
+ * Copyright (c) 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 
- * Copyright (c) 2003-2014, Antonin Descampe
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
 * Copyright (c) 2005, Herve Drolon, FreeImage Team
 * All rights reserved.
 *
@@ -39,26 +33,20 @@
 #include <string.h>
 #include <stdlib.h>
 #include <math.h>
-#include <assert.h>

-#include "opj_apps_config.h"
+#include "opj_config.h"
 #include "openjpeg.h"
 #include "color.h"

-#ifdef OPJ_HAVE_LIBLCMS2
+#ifdef HAVE_LIBLCMS2
 #include <lcms2.h>
 #endif
-#ifdef OPJ_HAVE_LIBLCMS1
+#ifdef HAVE_LIBLCMS1
 #include <lcms.h>
 #endif

-#ifdef OPJ_USE_LEGACY
-#define OPJ_CLRSPC_GRAY CLRSPC_GRAY
-#define OPJ_CLRSPC_SRGB CLRSPC_SRGB
-#endif
-
 /*--------------------------------------------------------
-Matrix for sYCC, Amendment 1 to IEC 61966-2-1
+Matrix für sYCC, Amendment 1 to IEC 61966-2-1

 Y :   0.299   0.587    0.114   :R
 Cb:  -0.1687 -0.3312   0.5     :G
@@ -93,19 +81,19 @@ static void sycc444_to_rgb(opj_image_t *img)
 	const int *y, *cb, *cr;
 	int maxw, maxh, max, i, offset, upb;

-	i = (int)img->comps[0].prec;
+	i = img->comps[0].prec;
 	offset = 1<<(i - 1); upb = (1<<i)-1;

-	maxw = (int)img->comps[0].w; maxh = (int)img->comps[0].h;
+	maxw = img->comps[0].w; maxh = img->comps[0].h;
 	max = maxw * maxh;

 	y = img->comps[0].data;
 	cb = img->comps[1].data;
 	cr = img->comps[2].data;

-	d0 = r = (int*)malloc(sizeof(int) * (size_t)max);
-	d1 = g = (int*)malloc(sizeof(int) * (size_t)max);
-	d2 = b = (int*)malloc(sizeof(int) * (size_t)max);
+	d0 = r = (int*)malloc(sizeof(int) * max);
+	d1 = g = (int*)malloc(sizeof(int) * max);
+	d2 = b = (int*)malloc(sizeof(int) * max);

 	for(i = 0; i < max; ++i)
   {
@@ -126,19 +114,19 @@ static void sycc422_to_rgb(opj_image_t *img)
 	int maxw, maxh, max, offset, upb;
 	int i, j;

-	i = (int)img->comps[0].prec;
+	i = img->comps[0].prec;
 	offset = 1<<(i - 1); upb = (1<<i)-1;

-	maxw = (int)img->comps[0].w; maxh = (int)img->comps[0].h;
+	maxw = img->comps[0].w; maxh = img->comps[0].h;
 	max = maxw * maxh;

 	y = img->comps[0].data;
 	cb = img->comps[1].data;
 	cr = img->comps[2].data;

-	d0 = r = (int*)malloc(sizeof(int) * (size_t)max);
-	d1 = g = (int*)malloc(sizeof(int) * (size_t)max);
-	d2 = b = (int*)malloc(sizeof(int) * (size_t)max);
+	d0 = r = (int*)malloc(sizeof(int) * max);
+	d1 = g = (int*)malloc(sizeof(int) * max);
+	d2 = b = (int*)malloc(sizeof(int) * max);

 	for(i=0; i < maxh; ++i)
   {
@@ -157,13 +145,8 @@ static void sycc422_to_rgb(opj_image_t *img)
 	free(img->comps[1].data); img->comps[1].data = d1;
 	free(img->comps[2].data); img->comps[2].data = d2;

-#if defined(USE_JPWL) || defined(USE_MJ2)
 	img->comps[1].w = maxw; img->comps[1].h = maxh;
 	img->comps[2].w = maxw; img->comps[2].h = maxh;
-#else
-	img->comps[1].w = (OPJ_UINT32)maxw; img->comps[1].h = (OPJ_UINT32)maxh;
-	img->comps[2].w = (OPJ_UINT32)maxw; img->comps[2].h = (OPJ_UINT32)maxh;
-#endif
 	img->comps[1].dx = img->comps[0].dx;
 	img->comps[2].dx = img->comps[0].dx;
 	img->comps[1].dy = img->comps[0].dy;
@@ -178,19 +161,19 @@ static void sycc420_to_rgb(opj_image_t *img)
 	int maxw, maxh, max, offset, upb;
 	int i, j;

-	i = (int)img->comps[0].prec;
+	i = img->comps[0].prec;
 	offset = 1<<(i - 1); upb = (1<<i)-1;

-	maxw = (int)img->comps[0].w; maxh = (int)img->comps[0].h;
+	maxw = img->comps[0].w; maxh = img->comps[0].h;
 	max = maxw * maxh;

 	y = img->comps[0].data;
 	cb = img->comps[1].data;
 	cr = img->comps[2].data;

-	d0 = r = (int*)malloc(sizeof(int) * (size_t)max);
-	d1 = g = (int*)malloc(sizeof(int) * (size_t)max);
-	d2 = b = (int*)malloc(sizeof(int) * (size_t)max);
+	d0 = r = (int*)malloc(sizeof(int) * max);
+	d1 = g = (int*)malloc(sizeof(int) * max);
+	d2 = b = (int*)malloc(sizeof(int) * max);

 	for(i=0; i < maxh; i += 2)
   {
@@ -221,13 +204,8 @@ static void sycc420_to_rgb(opj_image_t *img)
 	free(img->comps[1].data); img->comps[1].data = d1;
 	free(img->comps[2].data); img->comps[2].data = d2;

-#if defined(USE_JPWL) || defined(USE_MJ2)
 	img->comps[1].w = maxw; img->comps[1].h = maxh;
 	img->comps[2].w = maxw; img->comps[2].h = maxh;
-#else
-	img->comps[1].w = (OPJ_UINT32)maxw; img->comps[1].h = (OPJ_UINT32)maxh;
-	img->comps[2].w = (OPJ_UINT32)maxw; img->comps[2].h = (OPJ_UINT32)maxh;
-#endif
 	img->comps[1].dx = img->comps[0].dx;
 	img->comps[2].dx = img->comps[0].dx;
 	img->comps[1].dy = img->comps[0].dy;
@@ -239,7 +217,7 @@ void color_sycc_to_rgb(opj_image_t *img)
 {
 	if(img->numcomps < 3) 
   {
-	img->color_space = OPJ_CLRSPC_GRAY;
+	img->color_space = CLRSPC_GRAY;
 	return;
   }

@@ -278,12 +256,12 @@ void color_sycc_to_rgb(opj_image_t *img)
 	 __FILE__,__LINE__);
 	return;
  }
-	img->color_space = OPJ_CLRSPC_SRGB;
+	img->color_space = CLRSPC_SRGB;

 }/* color_sycc_to_rgb() */

-#if defined(OPJ_HAVE_LIBLCMS2) || defined(OPJ_HAVE_LIBLCMS1)
-#ifdef OPJ_HAVE_LIBLCMS1
+#if defined(HAVE_LIBLCMS2) || defined(HAVE_LIBLCMS1)
+#ifdef HAVE_LIBLCMS1
 /* Bob Friesenhahn proposed:*/
 #define cmsSigXYZData   icSigXYZData
 #define cmsSigLabData   icSigLabData
@@ -297,9 +275,8 @@ void color_sycc_to_rgb(opj_image_t *img)
 #define cmsColorSpaceSignature icColorSpaceSignature
 #define cmsGetHeaderRenderingIntent cmsTakeRenderingIntent

-#endif /* OPJ_HAVE_LIBLCMS1 */
+#endif /* HAVE_LIBLCMS1 */

-/*#define DEBUG_PROFILE*/
 void color_apply_icc_profile(opj_image_t *image)
 {
 	cmsHPROFILE in_prof, out_prof;
@@ -312,11 +289,6 @@ void color_apply_icc_profile(opj_image_t *image)

 	in_prof = 
 	 cmsOpenProfileFromMem(image->icc_profile_buf, image->icc_profile_len);
-#ifdef DEBUG_PROFILE
-  FILE *icm = fopen("debug.icm","wb");
-  fwrite( image->icc_profile_buf,1, image->icc_profile_len,icm);
-  fclose(icm);
-#endif

 	if(in_prof == NULL) return;

@@ -325,25 +297,16 @@ void color_apply_icc_profile(opj_image_t *image)
 	intent = cmsGetHeaderRenderingIntent(in_prof);

 	
-	max_w = (int)image->comps[0].w;
-  max_h = (int)image->comps[0].h;
-	prec = (int)image->comps[0].prec;
+	max_w = image->comps[0].w; max_h = image->comps[0].h;
+	prec = image->comps[0].prec;
 	oldspace = image->color_space;

 	if(out_space == cmsSigRgbData) /* enumCS 16 */
   {
-  if( prec <= 8 )
-{
-	in_type = TYPE_RGB_8;
-	out_type = TYPE_RGB_8;
-}
-else
-{
 	in_type = TYPE_RGB_16;
 	out_type = TYPE_RGB_16;
-}
 	out_prof = cmsCreate_sRGBProfile();
-	image->color_space = OPJ_CLRSPC_SRGB;
+	image->color_space = CLRSPC_SRGB;
   }
 	else
 	if(out_space == cmsSigGrayData) /* enumCS 17 */
@@ -351,7 +314,7 @@ else
 	in_type = TYPE_GRAY_8;
 	out_type = TYPE_RGB_8;
 	out_prof = cmsCreate_sRGBProfile();
-	image->color_space = OPJ_CLRSPC_SRGB;
+	image->color_space = CLRSPC_SRGB;
   }
 	else
 	if(out_space == cmsSigYCbCrData) /* enumCS 18 */
@@ -359,7 +322,7 @@ else
 	in_type = TYPE_YCbCr_16;
 	out_type = TYPE_RGB_16;
 	out_prof = cmsCreate_sRGBProfile();
-	image->color_space = OPJ_CLRSPC_SRGB;
+	image->color_space = CLRSPC_SRGB;
   }
 	else
   {
@@ -392,15 +355,12 @@ out_space,

 in_type,out_type
 );
-#else
-  (void)prec;
-  (void)in_space;
 #endif /* DEBUG_PROFILE */

 	transform = cmsCreateTransform(in_prof, in_type,
 	 out_prof, out_type, intent, 0);

-#ifdef OPJ_HAVE_LIBLCMS2
+#ifdef HAVE_LIBLCMS2
 /* Possible for: LCMS_VERSION >= 2000 :*/
 	cmsCloseProfile(in_prof);
 	cmsCloseProfile(out_prof);
@@ -413,7 +373,7 @@ fprintf(stderr,"%s:%d:color_apply_icc_profile\n\tcmsCreateTransform failed. "
 "ICC Profile ignored.\n",__FILE__,__LINE__);
 #endif
 	image->color_space = oldspace;
-#ifdef OPJ_HAVE_LIBLCMS1
+#ifdef HAVE_LIBLCMS1
 	cmsCloseProfile(in_prof);
 	cmsCloseProfile(out_prof);
 #endif
@@ -422,44 +382,8 @@ fprintf(stderr,"%s:%d:color_apply_icc_profile\n\tcmsCreateTransform failed. "

 	if(image->numcomps > 2)/* RGB, RGBA */
   {
-  if( prec <= 8 )
-{
-	unsigned char *inbuf, *outbuf, *in, *out;
-	max = max_w * max_h;
-  nr_samples = (cmsUInt32Number)max * 3 * (cmsUInt32Number)sizeof(unsigned char);
-	in = inbuf = (unsigned char*)malloc(nr_samples);
-	out = outbuf = (unsigned char*)malloc(nr_samples);
-
-	r = image->comps[0].data;
-	g = image->comps[1].data;
-	b = image->comps[2].data;
-
-	for(i = 0; i < max; ++i)
-  {
-	*in++ = (unsigned char)*r++;
-	*in++ = (unsigned char)*g++;
-	*in++ = (unsigned char)*b++;
-  }
-
-	cmsDoTransform(transform, inbuf, outbuf, (cmsUInt32Number)max);
-
-	r = image->comps[0].data;
-	g = image->comps[1].data;
-	b = image->comps[2].data;
-
-	for(i = 0; i < max; ++i)
-  {
-	*r++ = (int)*out++;
-	*g++ = (int)*out++;
-	*b++ = (int)*out++;
-  }
-	free(inbuf); free(outbuf);
-}
-else
-{
 	unsigned short *inbuf, *outbuf, *in, *out;
-	max = max_w * max_h;
-  nr_samples = (cmsUInt32Number)max * 3 * (cmsUInt32Number)sizeof(unsigned short);
+	max = max_w * max_h; nr_samples = max * 3 * sizeof(unsigned short);
 	in = inbuf = (unsigned short*)malloc(nr_samples);
 	out = outbuf = (unsigned short*)malloc(nr_samples);

@@ -474,7 +398,7 @@ else
 	*in++ = (unsigned short)*b++;
  }

-	cmsDoTransform(transform, inbuf, outbuf, (cmsUInt32Number)max);
+	cmsDoTransform(transform, inbuf, outbuf, max);

 	r = image->comps[0].data;
 	g = image->comps[1].data;
@@ -487,13 +411,12 @@ else
 	*b++ = (int)*out++;
  }
 	free(inbuf); free(outbuf);
-}
   }
 	else /* GRAY, GRAYA */
   {
 	unsigned char *in, *inbuf, *out, *outbuf;
-  max = max_w * max_h;
-  nr_samples = (cmsUInt32Number)max * 3 * sizeof(unsigned char);
+
+	max = max_w * max_h; nr_samples = max * 3 * sizeof(unsigned char);
 	in = inbuf = (unsigned char*)malloc(nr_samples);
 	out = outbuf = (unsigned char*)malloc(nr_samples);

@@ -506,8 +429,8 @@ else
 	image->comps[1] = image->comps[0];
 	image->comps[2] = image->comps[0];

-	image->comps[1].data = (int*)calloc((size_t)max, sizeof(int));
-	image->comps[2].data = (int*)calloc((size_t)max, sizeof(int));
+	image->comps[1].data = (int*)calloc(max, sizeof(int));
+	image->comps[2].data = (int*)calloc(max, sizeof(int));

 	image->numcomps += 2;

@@ -517,7 +440,7 @@ else
  {
 	*in++ = (unsigned char)*r++;
  }
-	cmsDoTransform(transform, inbuf, outbuf, (cmsUInt32Number)max);
+	cmsDoTransform(transform, inbuf, outbuf, max);

 	r = image->comps[0].data;
 	g = image->comps[1].data;
@@ -533,11 +456,11 @@ else

 	cmsDeleteTransform(transform);

-#ifdef OPJ_HAVE_LIBLCMS1
+#ifdef HAVE_LIBLCMS1
 	cmsCloseProfile(in_prof);
 	cmsCloseProfile(out_prof);
 #endif
 }/* color_apply_icc_profile() */

-#endif /* OPJ_HAVE_LIBLCMS2 || OPJ_HAVE_LIBLCMS1 */
+#endif /* HAVE_LIBLCMS2 || HAVE_LIBLCMS1 */

--- a/applications/common/color.h
+++ b/applications/common/color.h
@@ -1,15 +1,9 @@
 /*
- * The copyright in this software is being made available under the 2-clauses 
- * BSD License, included below. This software may be subject to other third 
- * party and contributor rights, including patent rights, and no such rights
- * are granted under this license.
- *
- * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2014, Professor Benoit Macq
+ * Copyright (c) 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 
- * Copyright (c) 2003-2014, Antonin Descampe
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
 * Copyright (c) 2005, Herve Drolon, FreeImage Team
 * All rights reserved.
 *
--- a/applications/common/format_defs.h
+++ b/applications/common/format_defs.h
@@ -1,15 +1,9 @@
 /*
- * The copyright in this software is being made available under the 2-clauses 
- * BSD License, included below. This software may be subject to other third 
- * party and contributor rights, including patent rights, and no such rights
- * are granted under this license.
- *
- * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2014, Professor Benoit Macq
+ * Copyright (c) 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 
- * Copyright (c) 2003-2014, Antonin Descampe
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
 * Copyright (c) 2005, Herve Drolon, FreeImage Team
 * All rights reserved.
 *
@@ -47,9 +41,8 @@
 #define BMP_DFMT 12
 #define YUV_DFMT 13
 #define TIF_DFMT 14
-#define RAW_DFMT 15 /* MSB / Big Endian */
+#define RAW_DFMT 15
 #define TGA_DFMT 16
 #define PNG_DFMT 17
-#define RAWL_DFMT 18 /* LSB / Little Endian */

 #endif /* _OPJ_FORMAT_DEFS_H_ */
--- a/applications/common/opj_getopt.c
+++ b/applications/common/opj_getopt.c
@@ -1,9 +1,4 @@
 /*
- * The copyright in this software is being made available under the 3-clauses 
- * BSD License, included below. This software may be subject to other third 
- * party and contributor rights, including patent rights, and no such rights
- * are granted under this license.
- *
 * Copyright (c) 1987, 1993, 1994
 *	The Regents of the University of California.  All rights reserved.
 *
@@ -15,7 +10,11 @@
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 *
--- a/applications/common/opj_getopt.h
+++ b/applications/common/opj_getopt.h
--- a/applications/jpip/CHANGES
+++ b/applications/jpip/CHANGES
@@ -0,0 +1,127 @@
+What's New for OpenJPIP
+
+* : fixed
+- : removed
+! : changed
+ : added
+
+Feburary 28, 2012
+ [kaori] enabled the opj_server to reply the first query consisting with len request from kakadu client
+
+February 9, 2012
+* [kaori] fixed Doxygen configuration file to document the utilities
+ [kaori] added execution argument to set port number for opj_dec_server, opj_viewer*
+
+January 26, 2012
+! [kaori] unapplied auxtrans_manager to the local mode
+
+December 24, 2011
+* [kaori] additional modification for the warning
+
+December 22, 2011
+* [kaori] fixed auxtrans_manager to enable MAC
+* [kaori] warnings due to disregarding return value are removed
+
+November 30, 2011
+ [kaori] TCP return (http-tcp) implemented
+
+November 16, 2011
+* [kaori] fixed Region of Interest option, and memory leak of opj_dec_server
+ [kaori] new feature to target JP2 files from www (libcurl required)
+* [kaori] fixed opj_server execusion error (instant terminating) with autotool, cmake still need to be fixed
+
+November 8, 2011
+! [kaori] updated main page of doxygen
+
+November 3, 2011
+* [kaori] solved memory leak of opj_server
+! [kaori] removed redundant defines
+
+November 2, 2011
+* [antonin] additional patches for autotools and cmake
+
+October 26, 2011
+* [kaori] additional patches for autotool are applied
+
+October 25, 2011
+* [kaori] patches for cmake and autotool are applied
+* [kaori] fixed client viewer to be compatible with server response header both Content-type and Content-Type
+
+October 20, 2011
+ [added] API style in openJPIP library
+! [kaori] rearranged directories, applications are all under util/ directory, currently only 'make -f Makefile.nix' works
+
+October 18, 2011
+! [kaori] rearranged opj_server, opj_dec_server directory
+
+October 14, 2011
+ [kaori] enable all progression orders
+
+October 12, 2011
+ [kaori] enable layers requests; restricting the number of codesream quality layers
+
+October 11, 2011
+ [antonin] enable JPT-stream request from client viewer option (credit to kaori)
+
+October 10, 2011
+- [antonin] removed obsolete indexer utility (credit to kaori)
+ [antonin] enabled JPP-stream (credit to kaori)
+
+September 16, 2011
+ [kaori] enabled stateless requests from the opj_viewers
+
+Septempber 1, 2011
+* [kaori] changed terminating status of opj_server in debug/non-server mode
+
+August 27, 2011
+* [antonin] fixed missing include directory in opj_client/opj_dec_server/CMakeLists.txt
+
+August 26, 2011
+* [antonin] fixed cmake and autotools files to reflect recent indexer changes in JPIP
+! [kaori] indexer using the latest openjpeg library
+* [antonin] fixed cmake and autotools files to reflect recent changes in JPIP
+! [kaori] fixed Makefile.nix to load openjpeg library from this archive
+
+August 25, 2011
+ [kaori] added tid request support to JPIP client
+ [kaori] added quit JPIP server request
+
+August 24, 2011
+ [kaori] added cachemodel_manager, which had been managed in target_manager previously
+ [kaori] added tid request support to JPIP server
+
+August 16, 2011
+* [antonin] fixed cmake support for openjpip
+
+August 12, 2011
+ [antonin] added cmake support to openjpip
+
+July 6, 2011
+* [antonin] JPIP : fixed autotools to work with recent name changes
+
+July 5, 2011
+! [kaori] changed parameter, file names, message names regarding JPT-stream to JPIP-stream, which handles also JPP-stream
+
+May 26, 2011
+! [antonin] changed Makefile to Makefile.nix to avoid having autotools overwrite them.
+
+May 23, 2011
+ [antonin] added autotools for the 'tools' directory
+ [antonin] added autotools as a build method for jpip (credit to Vincent Torri)
+
+May 10, 2011
+! [kaori] opj_viewer removed the xml functions (for users without Xersus2)
+ [kaori] renamed opj_viewer  to opj_viewer_xerces ( needs Xersus2)
+! [kaori] Modification of opj_dec_server to be portable to windows  
+
+May 9, 2011
+* [kaori] Removal of c99 from the compile option (to be compatible to win platform) and bool definition in libopenjpip/bool.h
+
+May 9, 2011
+* [antonin] OpenJPIP: small bug fixes to compile on win platform
+
+May 8, 2011
+* [antonin] OpenJPIP: fixed several bugs in opj_server (removal of strsep function, duplication of query string) + some changes to compile opj_server under windows (replacement of strcasecmp(), bzero()).
+
+April 14, 2011
+ [antonin] initial commit of OpenJPIP 1.0, a JPIP client-server architecture based on OpenJPEG (see README file in jpip directory for more details)
--- a/applications/jpip/CMakeLists.txt
+++ b/applications/jpip/CMakeLists.txt
@@ -0,0 +1,16 @@
+# required dep for server:
+IF(BUILD_JPIP_SERVER)
+  FIND_PACKAGE(CURL REQUIRED)
+  FIND_PACKAGE(FCGI REQUIRED)
+  FIND_PACKAGE(Threads REQUIRED)
+  IF(NOT CMAKE_USE_PTHREADS_INIT)
+    MESSAGE(FATAL_ERROR "Only pthread are supported")
+  ENDIF(NOT CMAKE_USE_PTHREADS_INIT)
+ENDIF(BUILD_JPIP_SERVER)
+
+# JPIP library:
+ADD_SUBDIRECTORY(libopenjpip)
+
+# JPIP binaries:
+ADD_SUBDIRECTORY(util)
+
--- a/applications/jpip/Makefile.am
+++ b/applications/jpip/Makefile.am
@@ -0,0 +1,3 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+SUBDIRS = libopenjpip util
--- a/applications/jpip/README
+++ b/applications/jpip/README
--- a/applications/jpip/doc/Doxyfile
+++ b/applications/jpip/doc/Doxyfile
--- a/applications/jpip/doc/jpip_architect.png
+++ b/applications/jpip/doc/jpip_architect.png
--- a/applications/jpip/doc/jpip_protocol.png
+++ b/applications/jpip/doc/jpip_protocol.png
--- a/applications/jpip/libopenjpip/CMakeLists.txt
+++ b/applications/jpip/libopenjpip/CMakeLists.txt
@@ -1,17 +1,13 @@
-include_regular_expression("^.*$")
+INCLUDE_REGULAR_EXPRESSION("^.*$")

-add_definitions(-DUSE_JPIP)
-
-include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
-  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
+INCLUDE_DIRECTORIES(
+  ${OPENJPEG_SOURCE_DIR}/libopenjpeg
  ${FCGI_INCLUDE_DIRS}
  ${CURL_INCLUDE_DIRS}
 )

 # Defines the source code for the library
-set(OPENJPIP_SRCS
+SET(OPENJPIP_SRCS
  ${CMAKE_CURRENT_SOURCE_DIR}/boxheader_manager.c
  ${CMAKE_CURRENT_SOURCE_DIR}/codestream_manager.c
  ${CMAKE_CURRENT_SOURCE_DIR}/imgreg_manager.c
@@ -38,11 +34,11 @@ set(OPENJPIP_SRCS
  ${CMAKE_CURRENT_SOURCE_DIR}/sock_manager.c
  )

-set(SERVER_SRCS
+SET(SERVER_SRCS
  ${CMAKE_CURRENT_SOURCE_DIR}/auxtrans_manager.c
  )

-set(LOCAL_SRCS
+SET(LOCAL_SRCS
  ${CMAKE_CURRENT_SOURCE_DIR}/jp2k_decoder.c
  ${CMAKE_CURRENT_SOURCE_DIR}/imgsock_manager.c
  ${CMAKE_CURRENT_SOURCE_DIR}/jpipstream_manager.c
@@ -51,37 +47,26 @@ set(LOCAL_SRCS
  )

 # Build the library
-if(WIN32)
-  if(BUILD_SHARED_LIBS)
-    add_definitions(-DOPJ_EXPORTS)
-  else()
-    add_definitions(-DOPJ_STATIC)
-  endif()
-endif()
-add_library(openjpip ${OPENJPIP_SRCS} ${LOCAL_SRCS})
-set_target_properties(openjpip
-  PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
-target_link_libraries(openjpip ${OPENJPEG_LIBRARY_NAME})
-if(WIN32)
+ADD_LIBRARY(openjpip_local STATIC ${OPENJPIP_SRCS} ${LOCAL_SRCS})
+TARGET_LINK_LIBRARIES(openjpip_local ${OPENJPEG_LIBRARY_NAME})
+IF(WIN32)
  # add Winsock on windows+mingw
-  target_link_libraries(openjpip ws2_32)
-endif()
+  TARGET_LINK_LIBRARIES(openjpip_local ws2_32)
+ENDIF(WIN32)

 # Install library
-install(TARGETS openjpip
+INSTALL(TARGETS openjpip_local
  EXPORT OpenJPEGTargets
-  RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications
-  LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
-  ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
+  DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
  )

-if(BUILD_JPIP_SERVER)
-  add_library(openjpip_server STATIC ${OPENJPIP_SRCS} ${SERVER_SRCS})
-  target_link_libraries(openjpip_server ${FCGI_LIBRARIES} ${CURL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-  set_target_properties(openjpip_server
+IF(BUILD_JPIP_SERVER)
+  ADD_LIBRARY(openjpip_server STATIC ${OPENJPIP_SRCS} ${SERVER_SRCS})
+  TARGET_LINK_LIBRARIES(openjpip_server ${FCGI_LIBRARIES} ${CURL_LIBRARIES} ${CMAKE_THREAD_LIBS})
+  SET_TARGET_PROPERTIES(openjpip_server
    PROPERTIES COMPILE_FLAGS "-DSERVER")
-  install(TARGETS openjpip_server
+  INSTALL(TARGETS openjpip_server
    EXPORT OpenJPEGTargets
    DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
    )
-endif()
+ENDIF(BUILD_JPIP_SERVER)
--- a/applications/jpip/libopenjpip/Makefile.am
+++ b/applications/jpip/libopenjpip/Makefile.am
@@ -0,0 +1,151 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+includesdir = $(includedir)/openjpeg-$(MAJOR_NR).$(MINOR_NR)
+includes_HEADERS = 
+
+lib_LTLIBRARIES =
+
+if WANT_JPIP
+lib_LTLIBRARIES += libopenjpip_local.la
+endif
+
+if WANT_JPIP_SERVER
+lib_LTLIBRARIES += libopenjpip_server.la
+endif
+
+JPIP_SRC = \
+openjpip.c \
+query_parser.c \
+channel_manager.c \
+session_manager.c \
+jpip_parser.c \
+boxheader_manager.c \
+codestream_manager.c \
+imgreg_manager.c \
+marker_manager.c \
+msgqueue_manager.c \
+box_manager.c \
+faixbox_manager.c \
+index_manager.c \
+metadata_manager.c \
+placeholder_manager.c \
+byte_manager.c \
+ihdrbox_manager.c \
+manfbox_manager.c \
+mhixbox_manager.c \
+target_manager.c \
+cachemodel_manager.c \
+j2kheader_manager.c \
+jp2k_encoder.c \
+sock_manager.c \
+openjpip.h \
+bool.h \
+boxheader_manager.h \
+box_manager.h \
+byte_manager.h \
+codestream_manager.h \
+faixbox_manager.h \
+ihdrbox_manager.h \
+imgreg_manager.h \
+index_manager.h \
+manfbox_manager.h \
+marker_manager.h \
+metadata_manager.h \
+mhixbox_manager.h \
+msgqueue_manager.h \
+placeholder_manager.h \
+target_manager.h \
+cachemodel_manager.h \
+j2kheader_manager.h \
+jp2k_encoder.h \
+query_parser.h \
+channel_manager.h \
+session_manager.h \
+jpip_parser.h \
+jp2k_decoder.h \
+sock_manager.h 
+
+SERVER_SRC = auxtrans_manager.c \
+auxtrans_manager.h
+
+LOCAL_SRC = jp2k_decoder.c \
+imgsock_manager.c \
+jpipstream_manager.c \
+cache_manager.c \
+dec_clientmsg_handler.c \
+imgsock_manager.h \
+jpipstream_manager.h \
+cache_manager.h \
+dec_clientmsg_handler.h
+
+libopenjpip_server_la_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/applications/jpip/libopenjpip \
+-I$(top_builddir)/applications/jpip/libopenjpip \
+@FCGI_CFLAGS@ \
+@LIBCURL_CFLAGS@ \
+-DSERVER
+libopenjpip_server_la_CFLAGS = @THREAD_CFLAGS@
+libopenjpip_server_la_LIBADD = @FCGI_LIBS@ @LIBCURL_LIBS@ @THREAD_LIBS@ -lm
+libopenjpip_server_la_LDFLAGS = -no-undefined -version-info @lt_version@
+libopenjpip_server_la_SOURCES = $(JPIP_SRC) $(SERVER_SRC)
+
+libopenjpip_local_la_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/libopenjpeg \
+-I$(top_builddir)/libopenjpeg \
+-I$(top_srcdir)/applications/jpip/libopenjpip \
+-I$(top_builddir)/applications/jpip/libopenjpip \
+@LIBCURL_CFLAGS@
+libopenjpip_local_la_CFLAGS = 
+libopenjpip_local_la_LIBADD = $(top_builddir)/libopenjpeg/libopenjpeg.la -lm
+libopenjpip_local_la_LDFLAGS = -no-undefined -version-info @lt_version@
+libopenjpip_local_la_SOURCES = $(JPIP_SRC) $(LOCAL_SRC)
+
+install-data-hook:
+if WANT_JPIP_SERVER
+	@echo -e " (LA)\t$(libdir)/libopenjpip_server.la" >> $(top_builddir)/report.txt
+if BUILD_SHARED
+	@( $(call solist_s) ) >> $(top_builddir)/report.txt
+endif
+if BUILD_STATIC
+	@echo -e " (A)\t$(base_s)/$(a_s)" >> $(top_builddir)/report.txt
+endif
+endif
+if WANT_JPIP
+	@echo -e " (LA)\t$(libdir)/libopenjpip_local.la" >> $(top_builddir)/report.txt
+if BUILD_SHARED
+	@( $(call solist_c) ) >> $(top_builddir)/report.txt
+endif
+if BUILD_STATIC
+	@echo -e " (A)\t$(base_c)/$(a_c)" >> $(top_builddir)/report.txt
+endif
+endif
+
+solist_s    = $(foreach f, $(dll_s) $(so_s), echo -e ' $(SO_PREFIX)\t$(base_s)/$(f)' ;)
+get_tok_s   = $(shell grep -E "^$(1)=" libopenjpip_server.la | cut -d "'" -f 2)
+base_s      = $(call get_tok_s,libdir)
+so_s        = $(call get_tok_s,library_names)
+a_s         = $(call get_tok_s,old_library)
+
+solist_c    = $(foreach f, $(dll_c) $(so_c), echo -e ' $(SO_PREFIX)\t$(base_c)/$(f)' ;)
+get_tok_c   = $(shell grep -E "^$(1)=" libopenjpip_local.la | cut -d "'" -f 2)
+base_c      = $(call get_tok_c,libdir)
+so_c        = $(call get_tok_c,library_names)
+a_c         = $(call get_tok_c,old_library)
+
+if HAVE_WIN32
+SO_PREFIX = (DLL)
+dll_s     = $(call get_tok_s,dlname)
+dll_c     = $(call get_tok_c,dlname)
+else
+if HAVE_DARWIN
+SO_PREFIX = (DY)
+dll_s     =
+dll_c     =
+else
+SO_PREFIX = (SO)
+dll_s     =
+dll_c     =
+endif
+endif
--- a/applications/jpip/libopenjpip/auxtrans_manager.c
+++ b/applications/jpip/libopenjpip/auxtrans_manager.c
@@ -1,8 +1,8 @@
 /*
 * $Id$
 *
- * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2014, Professor Benoit Macq
+ * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2011, Professor Benoit Macq
 * Copyright (c) 2010-2011, Kaori Hagihara
 * All rights reserved.
 *
@@ -56,7 +56,7 @@ auxtrans_param_t init_aux_transport( int tcp_auxport, int udp_auxport)
  auxtrans.udpauxport = udp_auxport;

  if( 49152 <= tcp_auxport && tcp_auxport <= 65535)
-    auxtrans.tcplistensock = open_listeningsocket( (uint16_t)tcp_auxport);
+    auxtrans.tcplistensock = open_listeningsocket( tcp_auxport);
  else
    auxtrans.tcplistensock = -1;

@@ -82,15 +82,15 @@ void close_aux_transport( auxtrans_param_t auxtrans)
 typedef struct aux_response_param{
  char *cid;            /*!< channel ID */
  unsigned char *data;  /*!< sending data */
-  OPJ_SIZE_T datalen;          /*!< length of data */
-  OPJ_SIZE_T maxlenPerFrame;   /*!< maximum data length to send per frame */
+  int datalen;          /*!< length of data */
+  int maxlenPerFrame;   /*!< maximum data length to send per frame */
  SOCKET listensock;    /*!< listeing socket */
 #ifdef _WIN32
  HANDLE hTh;           /*!< thread handle */
 #endif
 } aux_response_param_t;

-aux_response_param_t * gene_auxresponse( OPJ_BOOL istcp, auxtrans_param_t auxtrans, const char cid[], void *data, OPJ_SIZE_T datalen, OPJ_SIZE_T maxlenPerFrame);
+aux_response_param_t * gene_auxresponse( bool istcp, auxtrans_param_t auxtrans, char cid[], void *data, int datalen, int maxlenPerFrame);

 void delete_auxresponse( aux_response_param_t **auxresponse);

@@ -101,7 +101,7 @@ unsigned __stdcall aux_streaming( void *arg);
 void * aux_streaming( void *arg);
 #endif

-void send_responsedata_on_aux( OPJ_BOOL istcp, auxtrans_param_t auxtrans, const char cid[], void *data, OPJ_SIZE_T datalen, OPJ_SIZE_T maxlenPerFrame)
+void send_responsedata_on_aux( bool istcp, auxtrans_param_t auxtrans, char cid[], void *data, int datalen, int maxlenPerFrame)
 {
  aux_response_param_t *auxresponse;
 #ifdef _WIN32
@@ -133,11 +133,11 @@ void send_responsedata_on_aux( OPJ_BOOL istcp, auxtrans_param_t auxtrans, const
    fprintf( FCGI_stderr, "Error: error in send_responsedata_on_aux(), udp not implemented\n");
 }

-aux_response_param_t * gene_auxresponse( OPJ_BOOL istcp, auxtrans_param_t auxtrans, const char cid[], void *data, OPJ_SIZE_T datalen, OPJ_SIZE_T maxlenPerFrame)
+aux_response_param_t * gene_auxresponse( bool istcp, auxtrans_param_t auxtrans, char cid[], void *data, int datalen, int maxlenPerFrame)
 {
  aux_response_param_t *auxresponse;

-  auxresponse = (aux_response_param_t *)opj_malloc( sizeof(aux_response_param_t));
+  auxresponse = (aux_response_param_t *)malloc( sizeof(aux_response_param_t));

  auxresponse->cid = strdup( cid);
  auxresponse->data = data;
@@ -150,9 +150,9 @@ aux_response_param_t * gene_auxresponse( OPJ_BOOL istcp, auxtrans_param_t auxtra

 void delete_auxresponse( aux_response_param_t **auxresponse)
 {
-  opj_free( (*auxresponse)->cid);
-  opj_free( (*auxresponse)->data);
-  opj_free( *auxresponse);
+  free( (*auxresponse)->cid);
+  free( (*auxresponse)->data);
+  free( *auxresponse);
 }

 /**
@@ -163,9 +163,9 @@ void delete_auxresponse( aux_response_param_t **auxresponse)
 * @param [in] fp               file pointer for log of aux stream
 * @return                      true if identified, false otherwise
 */
-OPJ_BOOL identify_cid( SOCKET connected_socket, char refcid[], FILE *fp);
+bool identify_cid( SOCKET connected_socket, char refcid[], FILE *fp);

-OPJ_BOOL recv_ack( SOCKET connected_socket, void *data);
+bool recv_ack( SOCKET connected_socket, void *data);

 #ifdef _WIN32
 unsigned __stdcall aux_streaming( void *arg)
@@ -175,8 +175,8 @@ void * aux_streaming( void *arg)
 {
  SOCKET connected_socket;
  unsigned char *chunk, *ptr;
-  OPJ_SIZE_T maxLenOfBody, remlen, chunklen;
-  const OPJ_SIZE_T headlen = 8;
+  int maxLenOfBody, remlen, chunklen;
+  const int headlen = 8;
  
  aux_response_param_t *auxresponse = (aux_response_param_t *)arg;

@@ -186,7 +186,7 @@ void * aux_streaming( void *arg)
  pthread_detach( pthread_self());
 #endif

-  chunk = (unsigned char *)opj_malloc( auxresponse->maxlenPerFrame);
+  chunk = (unsigned char *)malloc( auxresponse->maxlenPerFrame);
  maxLenOfBody = auxresponse->maxlenPerFrame - headlen;
  remlen = auxresponse->datalen;

@@ -194,29 +194,29 @@ void * aux_streaming( void *arg)
    if( identify_cid( connected_socket, auxresponse->cid, FCGI_stderr)){
      ptr = auxresponse->data;
      while( 0 < remlen){
-        memset( chunk, 0, auxresponse->maxlenPerFrame);
+	memset( chunk, 0, auxresponse->maxlenPerFrame);

-        chunklen = remlen<maxLenOfBody?remlen:maxLenOfBody;
-        chunklen += headlen;
+	chunklen = remlen<maxLenOfBody?remlen:maxLenOfBody;
+	chunklen += headlen;
+	
+	chunk[0] = (chunklen >> 8) & 0xff;
+	chunk[1] = chunklen & 0xff;

-        chunk[0] = (chunklen >> 8) & 0xff;
-        chunk[1] = chunklen & 0xff;
+	memcpy( chunk+headlen, ptr, chunklen-headlen);

-        memcpy( chunk+headlen, ptr, chunklen-headlen);
+	do{
+	  send_stream( connected_socket, chunk, chunklen);
+	}while( !recv_ack( connected_socket, chunk));

-        do{
-          send_stream( connected_socket, chunk, chunklen);
-        }while( !recv_ack( connected_socket, chunk));
-
-        remlen -= maxLenOfBody;
-        ptr += maxLenOfBody;
+	remlen -= maxLenOfBody;
+	ptr += maxLenOfBody;
      }
      if( close_socket( connected_socket) != 0)
-        perror("close");
+	perror("close");
      break;
    }
  }
-  opj_free( chunk);
+  free( chunk);

  delete_auxresponse( &auxresponse);
  
@@ -230,38 +230,38 @@ void * aux_streaming( void *arg)
 }


-OPJ_BOOL identify_cid( SOCKET connected_socket, char refcid[], FILE *fp)
+bool identify_cid( SOCKET connected_socket, char refcid[], FILE *fp)
 {
  char *cid;
-  OPJ_BOOL succeed;
+  bool succeed;

  if(!(cid = receive_string( connected_socket))){
    fprintf( fp, "Error: error in identify_cid(), while receiving cid from client\n");
-    return OPJ_FALSE;
+    return false;
  }
  
-  succeed = OPJ_FALSE;
+  succeed = false;
  if( strncmp( refcid, cid, strlen( refcid)) == 0)
-    succeed = OPJ_TRUE;
+    succeed = true;
  
-  opj_free( cid);
+  free( cid);

  return succeed;
 }

-OPJ_BOOL recv_ack( SOCKET connected_socket, void *data)
+bool recv_ack( SOCKET connected_socket, void *data)
 {
  char *header;
-  OPJ_BOOL succeed;
+  bool succeed;
  
  header = receive_stream( connected_socket, 8);
  
  if( memcmp( header, data, 8) != 0)
-    succeed = OPJ_FALSE;
+    succeed = false;
  else
-    succeed = OPJ_TRUE;
+    succeed = true;
  
-  opj_free( header);
+  free( header);

  return succeed;
 }
--- a/applications/jpip/libopenjpip/auxtrans_manager.h
+++ b/applications/jpip/libopenjpip/auxtrans_manager.h
@@ -1,8 +1,8 @@
 /*
 * $Id$
 *
- * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2014, Professor Benoit Macq
+ * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2011, Professor Benoit Macq
 * Copyright (c) 2010-2011, Kaori Hagihara
 * All rights reserved.
 *
@@ -32,7 +32,6 @@
 # define        AUXTRANS_MANAGER_H_

 #include "sock_manager.h"
-#include "opj_includes.h"

 /** auxiliary transport setting parameters*/
 typedef struct auxtrans_param{
@@ -45,8 +44,8 @@ typedef struct auxtrans_param{
 /**
 * Initialize auxiliary transport server of JPIP server
 *
- * @param[in] tcp_auxport opening tcp auxiliary port ( 0 not to open, valid No. 49152-65535)
- * @param[in] udp_auxport opening udp auxiliary port ( 0 not to open, valid No. 49152-65535)
+ * @param[in] tcp_auxport opening tcp auxiliary port ( 0 not to open, valid No. 49152–65535)
+ * @param[in] udp_auxport opening udp auxiliary port ( 0 not to open, valid No. 49152–65535)
 * @return                intialized transport parameters
 */
 auxtrans_param_t init_aux_transport( int tcp_auxport, int udp_auxport);
@@ -68,6 +67,6 @@ void close_aux_transport( auxtrans_param_t auxtrans);
 * @param[in] length         length of data
 * @param[in] maxlenPerFrame maximum data length to send per frame
 */
-void send_responsedata_on_aux( OPJ_BOOL istcp, auxtrans_param_t auxtrans, const char cid[], void *data, OPJ_SIZE_T length, OPJ_SIZE_T maxlenPerFrame);
+void send_responsedata_on_aux( bool istcp, auxtrans_param_t auxtrans, char cid[], void *data, int length, int maxlenPerFrame);

 #endif /* !AUXTRANS_MANAGER_H_ */
--- a/applications/jpip/libopenjpip/bool.h
+++ b/applications/jpip/libopenjpip/bool.h
@@ -1,10 +1,9 @@
 /*
- * The copyright in this software is being made available under the 2-clauses 
- * BSD License, included below. This software may be subject to other third 
- * party and contributor rights, including patent rights, and no such rights
- * are granted under this license.
+ * $Id$
 *
- * Copyright (c) 2012, Mathieu Malaterre <mathieu.malaterre@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) 2010-2011, Kaori Hagihara
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -28,21 +27,26 @@
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 */
-#ifndef OPJ_INTTYPES_H
-#define OPJ_INTTYPES_H

-#include "opj_config_private.h"
-#ifdef OPJ_HAVE_INTTYPES_H
-#include <inttypes.h>
-#else
-#if defined(_WIN32)
-#define PRId64 "I64d"
-#define PRIi64 "I64i"
-#define PRIu64 "I64u"
-#define PRIx64 "I64x"
-#else
-#error unsupported platform
-#endif
+#ifndef   	BOOL_H_
+# define   	BOOL_H_
+
+#ifndef false
+#define false 0
 #endif

-#endif /* OPJ_INTTYPES_H */
+#ifndef FALSE
+#define FALSE 0
+#endif
+ 
+#ifndef true
+#define true (!false)
+#endif
+
+#ifndef TRUE
+#define TRUE (!FALSE)
+#endif
+ 
+typedef char bool;
+
+#endif 	    /* !BOOL_H_ */
--- a/applications/jpip/libopenjpip/box_manager.c
+++ b/applications/jpip/libopenjpip/box_manager.c
@@ -1,8 +1,8 @@
 /*
- * $Id$
+ * $Id: box_manager.c 44 2011-02-15 12:32:29Z kaori $
 *
- * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2014, Professor Benoit Macq
+ * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2011, Professor Benoit Macq
 * Copyright (c) 2010-2011, Kaori Hagihara
 * All rights reserved.
 *
@@ -32,9 +32,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include <assert.h>
 #include "box_manager.h"
-#include "opj_inttypes.h"

 #ifdef SERVER
 #include "fcgi_stdio.h"
@@ -45,7 +43,7 @@
 #define logstream stderr
 #endif /*SERVER*/

-boxlist_param_t * gene_boxlist(void)
+boxlist_param_t * gene_boxlist()
 {
  boxlist_param_t *boxlist;

@@ -57,41 +55,38 @@ boxlist_param_t * gene_boxlist(void)
  return boxlist;
 }

-boxlist_param_t * get_boxstructure( int fd, OPJ_OFF_T offset, OPJ_SIZE_T length)
+boxlist_param_t * get_boxstructure( int fd, Byte8_t offset, Byte8_t length)
 {
  boxlist_param_t *boxlist;
  box_param_t *box;
-  OPJ_OFF_T pos;
+  int pos;
  
  boxlist = NULL;
  pos = offset;
-  assert( (OPJ_OFF_T)length>=0);
  do{
    if(!(box = gene_boxbyOffset( fd, pos)))
      break;
    
-    assert( (OPJ_OFF_T)box->length >= 0);
-    pos += (OPJ_OFF_T)box->length;
+    pos += box->length;
    
    if( !boxlist)
      boxlist = gene_boxlist();
    insert_box_into_list( box, boxlist);
-  }while( pos < offset+(OPJ_OFF_T)length);
+  }while( pos < (int)(offset+length));

  return boxlist;
 }

-box_param_t * gene_boxbyOffset( int fd, OPJ_OFF_T offset)
+box_param_t * gene_boxbyOffset( int fd, Byte8_t offset)
 {
  Byte_t *data;
-  Byte8_t boxlen;
-  Byte_t headlen;
+  Byte8_t boxlen, headlen;
  char *boxtype;
  box_param_t *box;

  /* read LBox and TBox*/
  if(!(data = fetch_bytes( fd, offset, 8))){
-    fprintf( FCGI_stderr, "Error: error in gene_boxbyOffset( %d, %" PRId64 ")\n", fd, offset);
+    fprintf( FCGI_stderr, "Error: error in gene_boxbyOffset( %d, %lld)\n", fd, offset);
    return NULL;
  }
  
@@ -116,7 +111,7 @@ box_param_t * gene_boxbyOffset( int fd, OPJ_OFF_T offset)
      free(data2);
    }
    else{
-      fprintf( FCGI_stderr, "Error: error in gene_boxbyOffset( %d, %" PRId64 ")\n", fd, offset);
+      fprintf( FCGI_stderr, "Error: error in gene_boxbyOffset( %d, %lld)\n", fd, offset);
      free( data);
      return NULL;
    }
@@ -132,10 +127,9 @@ box_param_t * gene_boxbyOffset( int fd, OPJ_OFF_T offset)
  return box;
 }

-box_param_t * gene_boxbyOffinStream( Byte_t *stream, OPJ_OFF_T offset)
+box_param_t * gene_boxbyOffinStream( Byte_t *stream, Byte8_t offset)
 {
-  Byte8_t boxlen;
-  Byte_t headlen;
+  Byte8_t boxlen, headlen;
  char *boxtype;
  box_param_t *box;

@@ -167,28 +161,22 @@ box_param_t * gene_boxbyOffinStream( Byte_t *stream, OPJ_OFF_T offset)
 }


-box_param_t * gene_boxbyType( int fd, OPJ_OFF_T offset, OPJ_SIZE_T length, const char TBox[])
+box_param_t * gene_boxbyType( int fd, Byte8_t offset, Byte8_t length, const char TBox[])
 {
-  OPJ_OFF_T pos;
+  Byte8_t pos;
  Byte_t *data;
-  Byte8_t boxlen;
-  Byte_t headlen;
+  Byte8_t boxlen, headlen;
  char *boxtype;
  box_param_t *foundbox;

  
  if( length==0){ /* set the max length*/
-    if( get_filesize( fd) <= offset )
+    if( (length = get_filesize( fd) - offset) <= 0)
      return NULL;
-    assert( get_filesize( fd) > offset );
-    assert( offset >= 0 );
-    length = (OPJ_SIZE_T)(get_filesize( fd) - offset);
  }

  pos = offset;
-  assert( pos >= 0 );
-  assert( (OPJ_OFF_T)length >= 0 );
-  while( pos < offset+(OPJ_OFF_T)length-7){ /* LBox+TBox-1=7*/
+  while( pos < offset+length-7){ /* LBox+TBox-1=7*/
    
    /* read LBox and TBox*/
    if((data = fetch_bytes( fd, pos, 8))){
@@ -205,7 +193,7 @@ box_param_t * gene_boxbyType( int fd, OPJ_OFF_T offset, OPJ_SIZE_T length, const
 	  free(data2);
 	}
 	else{
-	  fprintf( FCGI_stderr, "Error: error in gene_boxbyType( %d, %" PRId64 ", %" PRId64 ", %s)\n", fd, offset, length, TBox);
+	  fprintf( FCGI_stderr, "Error: error in gene_boxbyType( %d, %lld, %lld, %s)\n", fd, offset, length, TBox);
 	  return NULL;
 	}
      }
@@ -223,30 +211,32 @@ box_param_t * gene_boxbyType( int fd, OPJ_OFF_T offset, OPJ_SIZE_T length, const
      free( data);
    }
    else{
-      fprintf( FCGI_stderr, "Error: error in gene_boxbyType( %d, %" PRId64 ", %" PRId64 ", %s)\n", fd, offset, length, TBox);
+      fprintf( FCGI_stderr, "Error: error in gene_boxbyType( %d, %lld, %lld, %s)\n", fd, offset, length, TBox);
      return NULL;
    }
-    assert( ((Byte8_t)pos+boxlen)>=(Byte8_t)pos);
-    pos+= (OPJ_OFF_T)boxlen;
+    pos+= boxlen;
  }
  fprintf( FCGI_stderr, "Error: Box %s not found\n", TBox);

  return NULL;
 }

-box_param_t * gene_boxbyTypeinStream( Byte_t *stream, OPJ_OFF_T offset, OPJ_SIZE_T length, const char TBox[])
+box_param_t * gene_boxbyTypeinStream( Byte_t *stream, Byte8_t offset, Byte8_t length, const char TBox[])
 {
-  OPJ_OFF_T pos;
+  Byte8_t pos;
  Byte_t *data;
-  Byte8_t boxlen;
-  Byte_t headlen;
+  Byte8_t boxlen, headlen;
  char *boxtype;
  box_param_t *foundbox;

+  
+  if( length<=0){ /* set the max length*/
+    fprintf( FCGI_stderr, "func gene_boxbyTypeinStream(), max length must be more than 0\n");
+    return NULL;
+  }
+  
  pos = offset;
-  assert( pos >= 0 );
-  assert( (OPJ_OFF_T)length >= 0 );
-  while( pos < offset+(OPJ_OFF_T)(length)-7){ /* LBox+TBox-1=7*/
+  while( pos < offset+length-7){ /* LBox+TBox-1=7*/
    
    /* read LBox and TBox*/
    data = stream + pos;
@@ -270,39 +260,31 @@ box_param_t * gene_boxbyTypeinStream( Byte_t *stream, OPJ_OFF_T offset, OPJ_SIZE
      foundbox->next = NULL;
      return foundbox;
    }
-    assert( ((Byte8_t)pos+boxlen)>=(Byte8_t)pos);
-    pos+= (OPJ_OFF_T)boxlen;
+    pos+= boxlen;
  }
  fprintf( FCGI_stderr, "Error: Box %s not found\n", TBox);
  
  return NULL;
 }

-box_param_t * gene_childboxbyOffset( box_param_t *superbox, OPJ_OFF_T offset)
+box_param_t * gene_childboxbyOffset( box_param_t *superbox, Byte8_t offset)
 {
  return gene_boxbyOffset( superbox->fd, get_DBoxoff( superbox)+offset);
 }

-box_param_t * gene_childboxbyType( box_param_t *superbox, OPJ_OFF_T offset, const char TBox[])
+box_param_t * gene_childboxbyType( box_param_t *superbox, Byte8_t offset, const char TBox[])
 {
-  OPJ_SIZE_T DBOXlen = get_DBoxlen(superbox);
-  assert( offset >= 0 );
-  if( DBOXlen < (OPJ_SIZE_T)offset )
-    {
-    fprintf( FCGI_stderr, "Error: Impossible happen %lu < %ld\n", DBOXlen, offset);
-    return NULL;
-    }
-  return gene_boxbyType( superbox->fd, get_DBoxoff( superbox)+offset, DBOXlen-(OPJ_SIZE_T)offset, TBox);
+  return gene_boxbyType( superbox->fd, get_DBoxoff( superbox)+offset, get_DBoxlen( superbox)-offset, TBox);
 }

-OPJ_OFF_T get_DBoxoff( box_param_t *box)
+Byte8_t get_DBoxoff( box_param_t *box)
 {
  return box->offset+box->headlen;
 }

-OPJ_SIZE_T get_DBoxlen( box_param_t *box)
+Byte8_t get_DBoxlen( box_param_t *box)
 {
-  return box->length - box->headlen;
+  return box->length-box->headlen;
 }

 Byte_t * fetch_headbytes( box_param_t *box)
@@ -310,27 +292,27 @@ Byte_t * fetch_headbytes( box_param_t *box)
  return fetch_bytes( box->fd, box->offset, box->headlen);
 }

-Byte_t * fetch_DBoxbytes( box_param_t *box, OPJ_OFF_T offset, OPJ_SIZE_T size)
+Byte_t * fetch_DBoxbytes( box_param_t *box, long offset, int size)
 {
  return fetch_bytes( box->fd, get_DBoxoff( box)+offset, size);
 }

-Byte_t fetch_DBox1byte( box_param_t *box, OPJ_OFF_T offset)
+Byte_t fetch_DBox1byte( box_param_t *box, long offset)
 {
  return fetch_1byte( box->fd, get_DBoxoff( box)+offset);
 }

-Byte2_t fetch_DBox2bytebigendian( box_param_t *box, OPJ_OFF_T offset)
+Byte2_t fetch_DBox2bytebigendian( box_param_t *box, long offset)
 {
  return fetch_2bytebigendian( box->fd, get_DBoxoff( box)+offset);
 }

-Byte4_t fetch_DBox4bytebigendian( box_param_t *box, OPJ_OFF_T offset)
+Byte4_t fetch_DBox4bytebigendian( box_param_t *box, long offset)
 {
  return fetch_4bytebigendian( box->fd, get_DBoxoff( box)+offset);
 }

-Byte8_t fetch_DBox8bytebigendian( box_param_t *box, OPJ_OFF_T offset)
+Byte8_t fetch_DBox8bytebigendian( box_param_t *box, long offset)
 {
  return fetch_8bytebigendian( box->fd, get_DBoxoff( box)+offset);
 }
@@ -357,10 +339,9 @@ void print_box( box_param_t *box)
 {
  fprintf( logstream, "box info:\n"
 	   "\t type: %.4s\n"
-	   "\t offset: %" PRId64 " %#" PRIx64 "\n" 
+	   "\t offset: %lld %#llx\n" 
 	   "\t header length: %d\n"
-     "\t length: %" PRId64 " %#" PRIx64 "\n", box->type, box->offset, 
-     box->offset, box->headlen, box->length, box->length);
+	   "\t length: %lld %#llx\n", box->type, box->offset, box->offset, box->headlen, box->length, box->length);
 }

 void print_allbox( boxlist_param_t *boxlist)
@@ -400,7 +381,7 @@ void delete_box_in_list( box_param_t **box, boxlist_param_t *boxlist)
  free( *box);
 }

-void delete_box_in_list_by_type( const char type[], boxlist_param_t *boxlist)
+void delete_box_in_list_by_type( char type[], boxlist_param_t *boxlist)
 {
  box_param_t *box;

--- a/applications/jpip/libopenjpip/box_manager.h
+++ b/applications/jpip/libopenjpip/box_manager.h
@@ -1,8 +1,8 @@
 /*
- * $Id$
+ * $Id: box_manager.h 44 2011-02-15 12:32:29Z kaori $
 *
- * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2014, Professor Benoit Macq
+ * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2011, Professor Benoit Macq
 * Copyright (c) 2010-2011, Kaori Hagihara
 * All rights reserved.
 *
@@ -36,7 +36,7 @@
 /** box parameters*/
 typedef struct box_param{
  int fd;                 /**< file descriptor*/
-  OPJ_OFF_T offset;         /**< byte position of the whole Box (LBox) in the file*/
+  Byte8_t offset;         /**< byte position of the whole Box (LBox) in the file*/
  Byte_t  headlen;        /**< header length  8 or 16*/
  Byte8_t length;         /**< length of the whole Box*/
  char    type[4];        /**< type of information in the DBox*/
@@ -56,7 +56,7 @@ typedef struct boxlist_param{
 *
 * @return pointer to the generated box list
 */
-boxlist_param_t * gene_boxlist(void);
+boxlist_param_t * gene_boxlist();

 /**
 * get box structure of JP2 file
@@ -66,7 +66,7 @@ boxlist_param_t * gene_boxlist(void);
 * @param[in]  length length of the decomposing region
 * @return            pointer to the generated boxlist
 */
-boxlist_param_t * get_boxstructure( int fd, OPJ_OFF_T offset, OPJ_SIZE_T length);
+boxlist_param_t * get_boxstructure( int fd, Byte8_t offset, Byte8_t length);


 /**
@@ -76,7 +76,7 @@ boxlist_param_t * get_boxstructure( int fd, OPJ_OFF_T offset, OPJ_SIZE_T length)
 * @param[in] offset Box offset
 * @return           pointer to the structure of generate box parameters
 */
-box_param_t * gene_boxbyOffset( int fd, OPJ_OFF_T offset);
+box_param_t * gene_boxbyOffset( int fd, Byte8_t offset);


 /**
@@ -86,7 +86,7 @@ box_param_t * gene_boxbyOffset( int fd, OPJ_OFF_T offset);
 * @param[in] offset Box offset of the whole stream
 * @return           pointer to the structure of generate box parameters
 */
-box_param_t * gene_boxbyOffinStream( Byte_t *stream, OPJ_OFF_T offset);
+box_param_t * gene_boxbyOffinStream( Byte_t *stream, Byte8_t offset);

 /**
 * generate(search) box from JP2 file
@@ -97,7 +97,7 @@ box_param_t * gene_boxbyOffinStream( Byte_t *stream, OPJ_OFF_T offset);
 * @param[in] TBox   Box Type
 * @return           pointer to the structure of generate/found box parameters
 */
-box_param_t * gene_boxbyType( int fd, OPJ_OFF_T offset, OPJ_SIZE_T length, const char TBox[]);
+box_param_t * gene_boxbyType( int fd, Byte8_t offset, Byte8_t length, const char TBox[]);

 /**
 * generate(search) box from code stream
@@ -108,7 +108,7 @@ box_param_t * gene_boxbyType( int fd, OPJ_OFF_T offset, OPJ_SIZE_T length, const
 * @param[in] TBox   Box Type
 * @return           pointer to the structure of generate/found box parameters
 */
-box_param_t * gene_boxbyTypeinStream( Byte_t *stream, OPJ_OFF_T offset, OPJ_SIZE_T length, const char TBox[]);
+box_param_t * gene_boxbyTypeinStream( Byte_t *stream, Byte8_t offset, Byte8_t length, const char TBox[]);

 /**
 * generate child box from JP2 file at the given offset
@@ -117,7 +117,7 @@ box_param_t * gene_boxbyTypeinStream( Byte_t *stream, OPJ_OFF_T offset, OPJ_SIZE
 * @param[in] offset   offset from DBox first byte of superbox
 * @return             pointer to the structure of generate box parameters
 */
-box_param_t * gene_childboxbyOffset( box_param_t *superbox, OPJ_OFF_T offset);
+box_param_t * gene_childboxbyOffset( box_param_t *superbox, Byte8_t offset);

 /**
 * generate(search) box from JP2 file
@@ -127,7 +127,7 @@ box_param_t * gene_childboxbyOffset( box_param_t *superbox, OPJ_OFF_T offset);
 * @param[in] TBox     Box Type
 * @return             pointer to the structure of generate/found box parameters
 */
-box_param_t * gene_childboxbyType( box_param_t *superbox, OPJ_OFF_T offset, const char TBox[]);
+box_param_t * gene_childboxbyType( box_param_t *superbox, Byte8_t offset, const char TBox[]);

 /**
 * get DBox offset
@@ -135,7 +135,7 @@ box_param_t * gene_childboxbyType( box_param_t *superbox, OPJ_OFF_T offset, cons
 * @param[in] box box pointer
 * @return        DBox offset (byte position) in the file
 */
-OPJ_OFF_T get_DBoxoff( box_param_t *box);
+Byte8_t get_DBoxoff( box_param_t *box);


 /**
@@ -144,7 +144,7 @@ OPJ_OFF_T get_DBoxoff( box_param_t *box);
 * @param[in] box box pointer
 * @return        DBox length ( content length)
 */
-OPJ_SIZE_T get_DBoxlen( box_param_t *box);
+Byte8_t get_DBoxlen( box_param_t *box);


 /**
@@ -164,7 +164,7 @@ Byte_t * fetch_headbytes( box_param_t *box);
 * @param[in] size   Byte length
 * @return           pointer to the fetched data
 */
-Byte_t * fetch_DBoxbytes( box_param_t *box, OPJ_OFF_T offset, OPJ_SIZE_T size);
+Byte_t * fetch_DBoxbytes( box_param_t *box, long offset, int size);

 /**
 * fetch DBox (Box Contents) 1-byte Byte codes in file stream
@@ -173,7 +173,7 @@ Byte_t * fetch_DBoxbytes( box_param_t *box, OPJ_OFF_T offset, OPJ_SIZE_T size);
 * @param[in] offset start Byte position in DBox
 * @return           fetched code
 */
-Byte_t fetch_DBox1byte( box_param_t *box, OPJ_OFF_T offset);
+Byte_t fetch_DBox1byte( box_param_t *box, long offset);

 /**
 * fetch DBox (Box Contents) 2-byte big endian Byte codes in file stream
@@ -182,7 +182,7 @@ Byte_t fetch_DBox1byte( box_param_t *box, OPJ_OFF_T offset);
 * @param[in] offset start Byte position in DBox
 * @return           fetched code
 */
-Byte2_t fetch_DBox2bytebigendian( box_param_t *box, OPJ_OFF_T offset);
+Byte2_t fetch_DBox2bytebigendian( box_param_t *box, long offset);

 /**
 * fetch DBox (Box Contents) 4-byte big endian Byte codes in file stream
@@ -191,7 +191,7 @@ Byte2_t fetch_DBox2bytebigendian( box_param_t *box, OPJ_OFF_T offset);
 * @param[in] offset start Byte position in DBox
 * @return           fetched code
 */
-Byte4_t fetch_DBox4bytebigendian( box_param_t *box, OPJ_OFF_T offset);
+Byte4_t fetch_DBox4bytebigendian( box_param_t *box, long offset);

 /**
 * fetch DBox (Box Contents) 8-byte big endian Byte codes in file stream
@@ -200,7 +200,7 @@ Byte4_t fetch_DBox4bytebigendian( box_param_t *box, OPJ_OFF_T offset);
 * @param[in] offset start Byte position in DBox
 * @return           fetched code
 */
-Byte8_t fetch_DBox8bytebigendian( box_param_t *box, OPJ_OFF_T offset);
+Byte8_t fetch_DBox8bytebigendian( box_param_t *box, long offset);


 /**
@@ -242,7 +242,7 @@ void delete_box_in_list( box_param_t **box, boxlist_param_t *boxlist);
 * @param[in,out] type    box type
 * @param[in]     boxlist box list pointer
 */
-void delete_box_in_list_by_type( const char type[], boxlist_param_t *boxlist);
+void delete_box_in_list_by_type( char type[], boxlist_param_t *boxlist);


 /**
--- a/applications/jpip/libopenjpip/boxheader_manager.c
+++ b/applications/jpip/libopenjpip/boxheader_manager.c
@@ -1,8 +1,8 @@
 /*
- * $Id$
+ * $Id: boxheader_manager.c 44 2011-02-15 12:32:29Z kaori $
 *
- * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2014, Professor Benoit Macq
+ * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2011, Professor Benoit Macq
 * Copyright (c) 2010-2011, Kaori Hagihara
 * All rights reserved.
 *
@@ -33,7 +33,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include "boxheader_manager.h"
-#include "opj_inttypes.h"

 #ifdef SERVER
 #include "fcgi_stdio.h"
@@ -45,7 +44,7 @@
 #endif /*SERVER*/


-boxheader_param_t * gene_boxheader( int fd, OPJ_OFF_T offset)
+boxheader_param_t * gene_boxheader( int fd, Byte8_t offset)
 {
  Byte8_t boxlen;
  Byte_t headlen;
@@ -71,14 +70,14 @@ boxheader_param_t * gene_boxheader( int fd, OPJ_OFF_T offset)
  return boxheader;
 }

-boxheader_param_t * gene_childboxheader( box_param_t *superbox, OPJ_OFF_T offset)
+boxheader_param_t * gene_childboxheader( box_param_t *superbox, Byte8_t offset)
 {
-  return gene_boxheader( superbox->fd, get_DBoxoff(superbox)+offset);
+  return gene_boxheader( superbox->fd, get_DBoxoff( superbox)+offset);
 }

 void print_boxheader( boxheader_param_t *boxheader)
 {
  fprintf( logstream, "boxheader info:\n"
 	   "\t type: %.4s\n"
-	   "\t length:%" PRId64 " %#" PRIx64 "\n", boxheader->type, boxheader->length, boxheader->length);
+	   "\t length:%lld %#llx\n", boxheader->type, boxheader->length, boxheader->length);
 }
--- a/applications/jpip/libopenjpip/boxheader_manager.h
+++ b/applications/jpip/libopenjpip/boxheader_manager.h
@@ -1,8 +1,8 @@
 /*
- * $Id$
+ * $Id: boxheader_manager.h 44 2011-02-15 12:32:29Z kaori $
 *
- * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2014, Professor Benoit Macq
+ * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2011, Professor Benoit Macq
 * Copyright (c) 2010-2011, Kaori Hagihara
 * All rights reserved.
 *
@@ -31,7 +31,6 @@
 #ifndef   	BOXHEADER_MANAGER_H_
 # define   	BOXHEADER_MANAGER_H_

-#include "openjpeg.h"
 #include "byte_manager.h"
 #include "box_manager.h"

@@ -51,7 +50,7 @@ typedef struct boxheader_param{
 * @param[in] offset Box offset
 * @return           pointer to the structure of generate box header parameters
 */
-boxheader_param_t * gene_boxheader( int fd, OPJ_OFF_T offset);
+boxheader_param_t * gene_boxheader( int fd, Byte8_t offset);

 /**
 * generate a child box header at the given offset
@@ -60,7 +59,7 @@ boxheader_param_t * gene_boxheader( int fd, OPJ_OFF_T offset);
 * @param[in] offset   offset from DBox first byte of superbox
 * @return             pointer to the structure of generate box header parameters
 */
-boxheader_param_t * gene_childboxheader( box_param_t *superbox, OPJ_OFF_T offset);
+boxheader_param_t * gene_childboxheader( box_param_t *superbox, Byte8_t offset);

 /**
 * print box header parameters
--- a/applications/jpip/libopenjpip/byte_manager.c
+++ b/applications/jpip/libopenjpip/byte_manager.c
@@ -1,8 +1,8 @@
 /*
- * $Id$
+ * $Id: byte_manager.c 44 2011-02-15 12:32:29Z kaori $
 *
- * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2014, Professor Benoit Macq
+ * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2011, Professor Benoit Macq
 * Copyright (c) 2010-2011, Kaori Hagihara
 * All rights reserved.
 *
@@ -49,52 +49,52 @@
 #endif /*SERVER*/


-Byte_t * fetch_bytes( int fd, OPJ_OFF_T offset, OPJ_SIZE_T size)
+Byte_t * fetch_bytes( int fd, long offset, int size)
 {
  Byte_t *data;

  if( lseek( fd, offset, SEEK_SET)==-1){
    fprintf( FCGI_stdout, "Reason: Target broken (fseek error)\r\n");
-    fprintf( FCGI_stderr, "Error: error in fetch_bytes( %d, %ld, %lu)\n", fd, offset, size);
+    fprintf( FCGI_stderr, "Error: error in fetch_bytes( %d, %ld, %d)\n", fd, offset, size);
    return NULL;
  }
  
  data = (Byte_t *)malloc( size);

-  if( (OPJ_SIZE_T)read( fd, data, size) != size){
+  if( read( fd, data, size) != size){
    free( data);
    fprintf( FCGI_stdout, "Reason: Target broken (read error)\r\n");
-    fprintf( FCGI_stderr, "Error: error in fetch_bytes( %d, %ld, %lu)\n", fd, offset, size);
+    fprintf( FCGI_stderr, "Error: error in fetch_bytes( %d, %ld, %d)\n", fd, offset, size);
    return NULL;
  }
  return data;
 }

-Byte_t fetch_1byte( int fd, OPJ_OFF_T offset)
+Byte_t fetch_1byte( int fd, long offset)
 {
  Byte_t code;

  if( lseek( fd, offset, SEEK_SET)==-1){
    fprintf( FCGI_stdout, "Reason: Target broken (seek error)\r\n");
-    fprintf( FCGI_stderr, "Error: error in fetch_1byte( %d, %ld)\n", fd, offset);
+    fprintf( FCGI_stderr, "Error: error in fetch_1byte( %d, %lld)\n", fd, offset);
    return 0;
  }
   
  if( read( fd, &code, 1) != 1){
    fprintf( FCGI_stdout, "Reason: Target broken (read error)\r\n");
-    fprintf( FCGI_stderr, "Error: error in fetch_bytes( %d, %ld)\n", fd, offset);
+    fprintf( FCGI_stderr, "Error: error in fetch_bytes( %d, %lld)\n", fd, offset);
    return 0;
  }
  return code;
 }

-Byte2_t fetch_2bytebigendian( int fd, OPJ_OFF_T offset)
+Byte2_t fetch_2bytebigendian( int fd, long offset)
 {
  Byte_t *data;
  Byte2_t code;

  if(!(data = fetch_bytes( fd, offset, 2))){
-    fprintf( FCGI_stderr, "Error: error in fetch_2bytebigendian( %d, %ld)\n", fd, offset);
+    fprintf( FCGI_stderr, "Error: error in fetch_2bytebigendian( %d, %lld)\n", fd, offset);
    return 0;
  }
  code = big2(data);
@@ -103,13 +103,13 @@ Byte2_t fetch_2bytebigendian( int fd, OPJ_OFF_T offset)
  return code;
 }

-Byte4_t fetch_4bytebigendian( int fd, OPJ_OFF_T offset)
+Byte4_t fetch_4bytebigendian( int fd, long offset)
 {
  Byte_t *data;
  Byte4_t code;

  if(!(data = fetch_bytes( fd, offset, 4))){
-    fprintf( FCGI_stderr, "Error: error in fetch_4bytebigendian( %d, %ld)\n", fd, offset);
+    fprintf( FCGI_stderr, "Error: error in fetch_4bytebigendian( %d, %lld)\n", fd, offset);
    return 0;
  }
  code = big4(data);
@@ -118,13 +118,13 @@ Byte4_t fetch_4bytebigendian( int fd, OPJ_OFF_T offset)
  return code;
 }

-Byte8_t fetch_8bytebigendian( int fd, OPJ_OFF_T offset)
+Byte8_t fetch_8bytebigendian( int fd, long offset)
 {
  Byte_t *data;
  Byte8_t code;

  if(!(data = fetch_bytes( fd, offset, 8))){
-    fprintf( FCGI_stderr, "Error: error in fetch_8bytebigendian( %d, %ld)\n", fd, offset);
+    fprintf( FCGI_stderr, "Error: error in fetch_8bytebigendian( %d, %lld)\n", fd, offset);
    return 0;
  }
  code = big8(data);
@@ -136,7 +136,7 @@ Byte8_t fetch_8bytebigendian( int fd, OPJ_OFF_T offset)

 Byte2_t big2( Byte_t *buf)
 {
-  return (Byte2_t)((((Byte2_t) buf[0]) << 8) + ((Byte2_t) buf[1]));
+  return (((Byte2_t) buf[0]) << 8) + ((Byte2_t) buf[1]);
 }

 Byte4_t big4( Byte_t *buf)
@@ -159,7 +159,7 @@ void modify_4Bytecode( Byte4_t code, Byte_t *stream)
  *(stream+3) = (Byte_t) (code & 0x000000ff);
 }

-OPJ_OFF_T get_filesize( int fd)
+Byte8_t get_filesize( int fd)
 {
  struct stat sb;
    
@@ -168,5 +168,5 @@ OPJ_OFF_T get_filesize( int fd)
    fprintf( FCGI_stderr, "Error: error in get_filesize( %d)\n", fd);
    return 0;
  }
-  return sb.st_size;
+  return (Byte8_t)sb.st_size;
 }
--- a/applications/jpip/libopenjpip/byte_manager.h
+++ b/applications/jpip/libopenjpip/byte_manager.h
@@ -1,8 +1,8 @@
 /*
- * $Id$
+ * $Id: byte_manager.h 44 2011-02-15 12:32:29Z kaori $
 *
- * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2014, Professor Benoit Macq
+ * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2011, Professor Benoit Macq
 * Copyright (c) 2010-2011, Kaori Hagihara
 * All rights reserved.
 *
@@ -31,13 +31,28 @@
 #ifndef   	BYTE_MANAGER_H_
 #define   	BYTE_MANAGER_H_

-#include <stddef.h>
-#include "openjpeg.h"
-#include "opj_stdint.h"
+#include "opj_config.h"
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
 typedef uint8_t Byte_t;
 typedef uint16_t Byte2_t;
 typedef uint32_t Byte4_t;
 typedef uint64_t Byte8_t;
+#else
+#if defined(_WIN32)
+/** 1Byte parameter type*/
+typedef unsigned __int8   Byte_t;
+/** 2Byte parameter type*/
+typedef unsigned __int16  Byte2_t;
+/** 4Byte parameter type*/
+typedef unsigned __int32  Byte4_t;
+/** 8Byte parameter type*/
+typedef unsigned __int64  Byte8_t;
+#else
+#error unsupported platform
+#endif
+#endif
+

 /**
 * fetch bytes of data in file stream
@@ -47,7 +62,7 @@ typedef uint64_t Byte8_t;
 * @param[in] size   Byte length
 * @return           pointer to the fetched data
 */
-Byte_t * fetch_bytes( int fd, OPJ_OFF_T offset, OPJ_SIZE_T size);
+Byte_t * fetch_bytes( int fd, long offset, int size);


 /**
@@ -57,7 +72,7 @@ Byte_t * fetch_bytes( int fd, OPJ_OFF_T offset, OPJ_SIZE_T size);
 * @param[in] offset start Byte position
 * @return           fetched codes
 */
-Byte_t fetch_1byte( int fd, OPJ_OFF_T offset);
+Byte_t fetch_1byte( int fd, long offset);

 /**
 * fetch a 2-byte big endian Byte codes in file stream
@@ -66,7 +81,7 @@ Byte_t fetch_1byte( int fd, OPJ_OFF_T offset);
 * @param[in] offset start Byte position
 * @return           fetched codes
 */
-Byte2_t fetch_2bytebigendian( int fd, OPJ_OFF_T offset);
+Byte2_t fetch_2bytebigendian( int fd, long offset);

 /**
 * fetch a 4-byte big endian Byte codes in file stream
@@ -75,7 +90,7 @@ Byte2_t fetch_2bytebigendian( int fd, OPJ_OFF_T offset);
 * @param[in] offset start Byte position
 * @return           fetched codes
 */
-Byte4_t fetch_4bytebigendian( int fd, OPJ_OFF_T offset);
+Byte4_t fetch_4bytebigendian( int fd, long offset);

 /**
 * fetch a 8-byte big endian Byte codes in file stream
@@ -84,7 +99,7 @@ Byte4_t fetch_4bytebigendian( int fd, OPJ_OFF_T offset);
 * @param[in] offset start Byte position
 * @return           fetched codes
 */
-Byte8_t fetch_8bytebigendian( int fd, OPJ_OFF_T offset);
+Byte8_t fetch_8bytebigendian( int fd, long offset);


 /**
@@ -125,6 +140,6 @@ void modify_4Bytecode( Byte4_t code, Byte_t *stream);
 * @param[in] fd file discriptor
 * @return       file size
 */
-OPJ_OFF_T get_filesize( int fd);
+Byte8_t get_filesize( int fd);

 #endif 	    /* !BYTE_MANAGER_H_ */
--- a/applications/jpip/libopenjpip/cache_manager.c
+++ b/applications/jpip/libopenjpip/cache_manager.c
@@ -1,8 +1,8 @@
 /*
- * $Id$
+ * $Id: cache_manager.c 53 2011-05-09 16:55:39Z kaori $
 *
- * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2014, Professor Benoit Macq
+ * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2011, Professor Benoit Macq
 * Copyright (c) 2010-2011, Kaori Hagihara
 * All rights reserved.
 *
@@ -33,7 +33,7 @@
 #include <string.h>
 #include "cache_manager.h"

-cachelist_param_t * gene_cachelist(void)
+cachelist_param_t * gene_cachelist()
 {
  cachelist_param_t *cachelist;
  
@@ -58,7 +58,7 @@ void delete_cachelist(cachelist_param_t **cachelist)
  free( *cachelist);
 }

-cache_param_t * gene_cache( const char *targetname, int csn, char *tid, char *cid)
+cache_param_t * gene_cache( char *targetname, int csn, char *tid, char *cid)
 {
  cache_param_t *cache;
  
@@ -106,7 +106,7 @@ void insert_cache_into_list( cache_param_t *cache, cachelist_param_t *cachelist)
  cachelist->last = cache;
 }

-cache_param_t * search_cache( const char targetname[], cachelist_param_t *cachelist)
+cache_param_t * search_cache( char targetname[], cachelist_param_t *cachelist)
 {
  cache_param_t *foundcache;

@@ -140,7 +140,7 @@ cache_param_t * search_cacheBycsn( int csn, cachelist_param_t *cachelist)
  return NULL;
 }

-cache_param_t * search_cacheBycid( const char cid[], cachelist_param_t *cachelist)
+cache_param_t * search_cacheBycid( char cid[], cachelist_param_t *cachelist)
 {
  cache_param_t *foundcache;
  int i;
@@ -159,7 +159,7 @@ cache_param_t * search_cacheBycid( const char cid[], cachelist_param_t *cachelis
  return NULL;
 }

-cache_param_t * search_cacheBytid( const char tid[], cachelist_param_t *cachelist)
+cache_param_t * search_cacheBytid( char tid[], cachelist_param_t *cachelist)
 {
  cache_param_t *foundcache;

@@ -176,12 +176,12 @@ cache_param_t * search_cacheBytid( const char tid[], cachelist_param_t *cachelis
  return NULL;
 }

-void add_cachecid( const char *cid, cache_param_t *cache)
+void add_cachecid( char *cid, cache_param_t *cache)
 {
  if( !cid)
    return;
  
-  if( (cache->cid = realloc( cache->cid, (OPJ_SIZE_T)(cache->numOfcid+1)*sizeof(char *))) == NULL){
+  if( (cache->cid = realloc( cache->cid, (cache->numOfcid+1)*sizeof(char *))) == NULL){
    fprintf( stderr, "failed to add new cid to cache table in add_cachecid()\n");
    return;
  }
@@ -191,7 +191,7 @@ void add_cachecid( const char *cid, cache_param_t *cache)
  cache->numOfcid ++;
 }

-void update_cachetid( const char *tid, cache_param_t *cache)
+void update_cachetid( char *tid, cache_param_t *cache)
 {
  if( !tid)
    return;
@@ -203,9 +203,9 @@ void update_cachetid( const char *tid, cache_param_t *cache)
  }
 }

-void remove_cidInCache( const char *cid, cache_param_t *cache);
+void remove_cidInCache( char *cid, cache_param_t *cache);

-void remove_cachecid( const char *cid, cachelist_param_t *cachelist)
+void remove_cachecid( char *cid, cachelist_param_t *cachelist)
 {
  cache_param_t *cache;

@@ -213,7 +213,7 @@ void remove_cachecid( const char *cid, cachelist_param_t *cachelist)
  remove_cidInCache( cid, cache);
 }

-void remove_cidInCache( const char *cid, cache_param_t *cache)
+void remove_cidInCache( char *cid, cache_param_t *cache)
 {
  int idx = -1;
  char **tmp;
@@ -232,7 +232,7 @@ void remove_cidInCache( const char *cid, cache_param_t *cache)
  
  tmp = cache->cid;

-  cache->cid = (char **)malloc( (OPJ_SIZE_T)(cache->numOfcid-1)*sizeof(char *));
+  cache->cid = (char **)malloc( (cache->numOfcid-1)*sizeof(char *));
  
  for( i=0, j=0; i<cache->numOfcid; i++){
    if( i != idx){
--- a/applications/jpip/libopenjpip/cache_manager.h
+++ b/applications/jpip/libopenjpip/cache_manager.h
@@ -1,8 +1,8 @@
 /*
- * $Id$
+ * $Id: cache_manager.h 44 2011-02-15 12:32:29Z kaori $
 *
- * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2014, Professor Benoit Macq
+ * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2011, Professor Benoit Macq
 * Copyright (c) 2010-2011, Kaori Hagihara
 * All rights reserved.
 *
@@ -58,7 +58,7 @@ typedef struct cachelist_param{
 *
 * @return pointer to the generated cache list
 */
-cachelist_param_t * gene_cachelist(void);
+cachelist_param_t * gene_cachelist();

 /**
 * delete cache list
@@ -76,7 +76,7 @@ void delete_cachelist(cachelist_param_t **cachelist);
 * @param[in] cid        channel identifier
 * @return               pointer to the generated cache
 */
-cache_param_t * gene_cache( const char *targetname, int csn, char *tid, char *cid);
+cache_param_t * gene_cache( char *targetname, int csn, char *tid, char *cid);

 /**
 * delete a cache
@@ -101,7 +101,7 @@ void insert_cache_into_list( cache_param_t *cache, cachelist_param_t *cachelist)
 * @param[in] cachelist  cache list pointer
 * @return               found cache pointer
 */
-cache_param_t * search_cache( const char targetname[], cachelist_param_t *cachelist);
+cache_param_t * search_cache( char targetname[], cachelist_param_t *cachelist);


 /**
@@ -121,7 +121,7 @@ cache_param_t * search_cacheBycsn( int csn, cachelist_param_t *cachelist);
 * @param[in] cachelist  cache list pointer
 * @return               found cache pointer
 */
-cache_param_t * search_cacheBycid( const char cid[], cachelist_param_t *cachelist);
+cache_param_t * search_cacheBycid( char cid[], cachelist_param_t *cachelist);


 /**
@@ -131,7 +131,7 @@ cache_param_t * search_cacheBycid( const char cid[], cachelist_param_t *cachelis
 * @param[in] cachelist  cache list pointer
 * @return               found cache pointer
 */
-cache_param_t * search_cacheBytid( const char tid[], cachelist_param_t *cachelist);
+cache_param_t * search_cacheBytid( char tid[], cachelist_param_t *cachelist);

 /**
 * add cid into a cache
@@ -139,7 +139,7 @@ cache_param_t * search_cacheBytid( const char tid[], cachelist_param_t *cachelis
 * @param[in] cid   channel identifier
 * @param[in] cache cache pointer
 */
-void add_cachecid( const char *cid, cache_param_t *cache);
+void add_cachecid( char *cid, cache_param_t *cache);


 /**
@@ -148,7 +148,7 @@ void add_cachecid( const char *cid, cache_param_t *cache);
 * @param[in] tid   target identifier
 * @param[in] cache cache pointer
 */
-void update_cachetid( const char *tid, cache_param_t *cache);
+void update_cachetid( char *tid, cache_param_t *cache);


 /**
@@ -157,7 +157,7 @@ void update_cachetid( const char *tid, cache_param_t *cache);
 * @param[in] cid       channel identifier
 * @param[in] cachelist cachelist pointer
 */
-void remove_cachecid( const char *cid, cachelist_param_t *cachelist);
+void remove_cachecid( char *cid, cachelist_param_t *cachelist);


 /**
--- a/applications/jpip/libopenjpip/cachemodel_manager.c
+++ b/applications/jpip/libopenjpip/cachemodel_manager.c
@@ -1,8 +1,8 @@
 /*
 * $Id$
 *
- * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2014, Professor Benoit Macq
+ * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2011, Professor Benoit Macq
 * Copyright (c) 2010-2011, Kaori Hagihara
 * All rights reserved.
 *
@@ -32,7 +32,6 @@
 #include <stdlib.h>
 #include "cachemodel_manager.h"
 #include "faixbox_manager.h"
-#include "opj_inttypes.h"

 #ifdef SERVER
 #include "fcgi_stdio.h"
@@ -48,7 +47,7 @@ cachemodellist_param_t * gene_cachemodellist(void)
 {
  cachemodellist_param_t *cachemodellist;

-  cachemodellist = (cachemodellist_param_t *)opj_malloc( sizeof(cachemodellist_param_t));
+  cachemodellist = (cachemodellist_param_t *)malloc( sizeof(cachemodellist_param_t));
  
  cachemodellist->first = NULL;
  cachemodellist->last  = NULL;
@@ -56,7 +55,7 @@ cachemodellist_param_t * gene_cachemodellist(void)
  return cachemodellist;
 }

-cachemodel_param_t * gene_cachemodel( cachemodellist_param_t *cachemodellist, target_param_t *target, OPJ_BOOL reqJPP)
+cachemodel_param_t * gene_cachemodel( cachemodellist_param_t *cachemodellist, target_param_t *target, bool reqJPP)
 {
  cachemodel_param_t *cachemodel;
  faixbox_param_t *tilepart;
@@ -65,33 +64,33 @@ cachemodel_param_t * gene_cachemodel( cachemodellist_param_t *cachemodellist, ta
  Byte8_t numOftiles;
  int i;

-  cachemodel = (cachemodel_param_t *)opj_malloc( sizeof(cachemodel_param_t));
+  cachemodel = (cachemodel_param_t *)malloc( sizeof(cachemodel_param_t));

  refer_target( target, &cachemodel->target);
  
  if( reqJPP){
    if( target->jppstream)
-      cachemodel->jppstream = OPJ_TRUE;
+      cachemodel->jppstream = true;
    else
-      cachemodel->jppstream = OPJ_FALSE;
+      cachemodel->jppstream = false;
  } else{ /* reqJPT */
    if( target->jptstream)
-      cachemodel->jppstream = OPJ_FALSE;
+      cachemodel->jppstream = false;
    else
-      cachemodel->jppstream = OPJ_TRUE;
+      cachemodel->jppstream = true;
  }

-  cachemodel->mhead_model = OPJ_FALSE;
+  cachemodel->mhead_model = false;
  
  tilepart = target->codeidx->tilepart;
  numOftiles = get_m( tilepart);
  numOfelem = get_nmax( tilepart)*numOftiles;
-  cachemodel->tp_model = (OPJ_BOOL *)opj_calloc( 1, numOfelem*sizeof(OPJ_BOOL));
-  cachemodel->th_model = (OPJ_BOOL *)opj_calloc( 1, numOftiles*sizeof(OPJ_BOOL));
-  cachemodel->pp_model = (OPJ_BOOL **)opj_malloc( target->codeidx->SIZ.Csiz*sizeof(OPJ_BOOL *));
+  cachemodel->tp_model = (bool *)calloc( 1, numOfelem*sizeof(bool));
+  cachemodel->th_model = (bool *)calloc( 1, numOftiles*sizeof(bool));
+  cachemodel->pp_model = (bool **)malloc( target->codeidx->SIZ.Csiz*sizeof(bool *));
  for( i=0; i<target->codeidx->SIZ.Csiz; i++){
    precpacket = target->codeidx->precpacket[i];
-    cachemodel->pp_model[i] = (OPJ_BOOL *)opj_calloc( 1, get_nmax(precpacket)*get_m(precpacket)*sizeof(OPJ_BOOL));
+    cachemodel->pp_model[i] = (bool *)calloc( 1, get_nmax(precpacket)*get_m(precpacket)*sizeof(bool));
  }
  cachemodel->next = NULL;
  
@@ -137,9 +136,9 @@ void print_cachemodel( cachemodel_param_t cachemodel)

  fprintf( logstream, "\t tile header and precinct packet model:\n");
  for( i=0; i<target->codeidx->SIZ.XTnum*target->codeidx->SIZ.YTnum; i++){
-    fprintf( logstream, "\t  tile.%" PRIu64 "  %d\n", i, cachemodel.th_model[i]);
+    fprintf( logstream, "\t  tile.%llud  %d\n", i, cachemodel.th_model[i]);
    for( j=0; j<target->codeidx->SIZ.Csiz; j++){
-      fprintf( logstream, "\t   compo.%" PRIu64 ": ", j);
+      fprintf( logstream, "\t   compo.%llud: ", j);
      Pmax = get_nmax( target->codeidx->precpacket[j]);
      for( k=0; k<Pmax; k++)
 	fprintf( logstream, "%d", cachemodel.pp_model[j][i*Pmax+k]);
@@ -174,7 +173,7 @@ void delete_cachemodellist( cachemodellist_param_t **cachemodellist)
    delete_cachemodel( &cachemodelPtr);
    cachemodelPtr=cachemodelNext;
  }
-  opj_free(*cachemodellist);
+  free(*cachemodellist);
 }

 void delete_cachemodel( cachemodel_param_t **cachemodel)
@@ -183,20 +182,20 @@ void delete_cachemodel( cachemodel_param_t **cachemodel)

  unrefer_target( (*cachemodel)->target);
  
-  opj_free( (*cachemodel)->tp_model);
-  opj_free( (*cachemodel)->th_model);
+  free( (*cachemodel)->tp_model);
+  free( (*cachemodel)->th_model);
  
  for( i=0; i<(*cachemodel)->target->codeidx->SIZ.Csiz; i++)
-    opj_free( (*cachemodel)->pp_model[i]);
-  opj_free( (*cachemodel)->pp_model);
+    free( (*cachemodel)->pp_model[i]);
+  free( (*cachemodel)->pp_model);

 #ifndef SERVER
  fprintf( logstream, "local log: cachemodel deleted\n");
 #endif
-  opj_free( *cachemodel);
+  free( *cachemodel);
 }

-OPJ_BOOL is_allsent( cachemodel_param_t cachemodel)
+bool is_allsent( cachemodel_param_t cachemodel)
 {
  target_param_t *target;
  Byte8_t TPnum; /* num of tile parts in each tile */
@@ -207,30 +206,30 @@ OPJ_BOOL is_allsent( cachemodel_param_t cachemodel)
  target = cachemodel.target;
  
  if( !cachemodel.mhead_model)
-    return OPJ_FALSE;
+    return false;

  TPnum = get_nmax( target->codeidx->tilepart);

  if( cachemodel.jppstream){
    for( i=0; i<target->codeidx->SIZ.XTnum*target->codeidx->SIZ.YTnum; i++){
      if( !cachemodel.th_model[i])
-	return OPJ_FALSE;
+	return false;
      
      for( j=0; j<target->codeidx->SIZ.Csiz; j++){
 	Pmax = get_nmax( target->codeidx->precpacket[j]);
 	for( k=0; k<Pmax; k++)
 	  if( !cachemodel.pp_model[j][i*Pmax+k])
-	    return OPJ_FALSE;
+	    return false;
      }
    }
-    return OPJ_TRUE;
+    return true;
  }
  else{
    for( i=0, n=0; i<target->codeidx->SIZ.YTnum; i++)
      for( j=0; j<target->codeidx->SIZ.XTnum; j++)
 	for( k=0; k<TPnum; k++)
 	  if( !cachemodel.tp_model[n++])
-	    return OPJ_FALSE;
-    return OPJ_TRUE;
+	    return false;
+    return true;
  }
 }
--- a/applications/jpip/libopenjpip/cachemodel_manager.h
+++ b/applications/jpip/libopenjpip/cachemodel_manager.h
@@ -1,8 +1,8 @@
 /*
 * $Id$
 *
- * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2014, Professor Benoit Macq
+ * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2011, Professor Benoit Macq
 * Copyright (c) 2010-2011, Kaori Hagihara
 * All rights reserved.
 *
@@ -31,16 +31,17 @@
 #ifndef   	CACHEMODEL_MANAGER_H_
 # define   	CACHEMODEL_MANAGER_H_

+#include "bool.h"
 #include "target_manager.h"

 /** Cache model parameters*/
 typedef struct cachemodel_param{
  target_param_t *target;        /**< reference pointer to the target*/
-  OPJ_BOOL jppstream;                /**< return type, true: JPP-stream, false: JPT-stream*/
-  OPJ_BOOL mhead_model;              /**< main header model, if sent, 1, else 0*/
-  OPJ_BOOL *tp_model;                /**< dynamic array pointer of tile part model, if sent, 1, else 0*/
-  OPJ_BOOL *th_model;                /**< dynamic array pointer of tile header model*/
-  OPJ_BOOL **pp_model;               /**< dynamic array pointer of precint packet model*/
+  bool jppstream;                /**< return type, true: JPP-stream, false: JPT-stream*/
+  bool mhead_model;              /**< main header model, if sent, 1, else 0*/
+  bool *tp_model;                /**< dynamic array pointer of tile part model, if sent, 1, else 0*/
+  bool *th_model;                /**< dynamic array pointer of tile header model*/
+  bool **pp_model;               /**< dynamic array pointer of precint packet model*/
  struct cachemodel_param *next; /**< pointer to the next cache model*/
 } cachemodel_param_t;

@@ -66,7 +67,7 @@ cachemodellist_param_t * gene_cachemodellist(void);
 * @param[in] reqJPP         if JPP-stream is desired true, JPT-stream false
 * @return                   pointer to the generated cache model
 */
-cachemodel_param_t * gene_cachemodel( cachemodellist_param_t *cachemodellist, target_param_t *target, OPJ_BOOL reqJPP);
+cachemodel_param_t * gene_cachemodel( cachemodellist_param_t *cachemodellist, target_param_t *target, bool reqJPP);


 /**
@@ -93,7 +94,7 @@ cachemodel_param_t * search_cachemodel( target_param_t *target, cachemodellist_p
 * @param[in] cachemodel cache model
 * @return               true if sent all, false otherwise
 */
-OPJ_BOOL is_allsent( cachemodel_param_t cachemodel);
+bool is_allsent( cachemodel_param_t cachemodel);


 /**
--- a/applications/jpip/libopenjpip/channel_manager.c
+++ b/applications/jpip/libopenjpip/channel_manager.c
@@ -1,8 +1,8 @@
 /*
- * $Id$
+ * $Id: channel_manager.c 44 2011-02-15 12:32:29Z kaori $
 *
- * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2014, Professor Benoit Macq
+ * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2011, Professor Benoit Macq
 * Copyright (c) 2010-2011, Kaori Hagihara
 * All rights reserved.
 *
@@ -49,7 +49,7 @@ channellist_param_t * gene_channellist(void)
 {
  channellist_param_t *channellist;

-  channellist = (channellist_param_t *)opj_malloc( sizeof(channellist_param_t));
+  channellist = (channellist_param_t *)malloc( sizeof(channellist_param_t));
  
  channellist->first = NULL;
  channellist->last  = NULL;
@@ -60,7 +60,7 @@ channellist_param_t * gene_channellist(void)
 channel_param_t * gene_channel( query_param_t query_param, auxtrans_param_t auxtrans, cachemodel_param_t *cachemodel, channellist_param_t *channellist)
 {
  channel_param_t *channel;
-  const char transport[4][10] = { "non", "http", "http-tcp", "http-udp"};
+  char transport[4][10] = { "non", "http", "http-tcp", "http-udp"};
  
  if( !cachemodel){
    fprintf( FCGI_stdout, "Status: 404\r\n"); 
@@ -68,7 +68,7 @@ channel_param_t * gene_channel( query_param_t query_param, auxtrans_param_t auxt
    return NULL;
  }

-  channel = (channel_param_t *)opj_malloc( sizeof(channel_param_t));
+  channel = (channel_param_t *)malloc( sizeof(channel_param_t));
  channel->cachemodel = cachemodel;

  /* set channel ID and get present time */
@@ -130,7 +130,7 @@ void delete_channel( channel_param_t **channel, channellist_param_t *channellist
 #ifndef SERVER
  fprintf( logstream, "local log: channel: %s deleted\n", (*channel)->cid);
 #endif
-  opj_free(*channel);
+  free(*channel);
 }

 void delete_channellist( channellist_param_t **channellist)
@@ -143,10 +143,10 @@ void delete_channellist( channellist_param_t **channellist)
 #ifndef SERVER
      fprintf( logstream, "local log: channel %s deleted!\n", channelPtr->cid);
 #endif
-      opj_free(channelPtr);
+      free(channelPtr);
      channelPtr=channelNext;
  }
-  opj_free( *channellist);
+  free( *channellist);
 }

 void print_allchannel( channellist_param_t *channellist)
@@ -160,7 +160,7 @@ void print_allchannel( channellist_param_t *channellist)
  }
 }

-channel_param_t * search_channel( const char cid[], channellist_param_t *channellist)
+channel_param_t * search_channel( char cid[], channellist_param_t *channellist)
 {
  channel_param_t *foundchannel;

--- a/applications/jpip/libopenjpip/channel_manager.h
+++ b/applications/jpip/libopenjpip/channel_manager.h
@@ -1,8 +1,8 @@
 /*
- * $Id$
+ * $Id: channel_manager.h 44 2011-02-15 12:32:29Z kaori $
 *
- * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2014, Professor Benoit Macq
+ * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2011, Professor Benoit Macq
 * Copyright (c) 2010-2011, Kaori Hagihara
 * All rights reserved.
 *
@@ -116,5 +116,5 @@ void print_allchannel( channellist_param_t *channellist);
 * @param[in] channellist channel list pointer
 * @return                found channel pointer
 */
-channel_param_t * search_channel( const char cid[], channellist_param_t *channellist);
+channel_param_t * search_channel( char cid[], channellist_param_t *channellist);
 #endif 	    /* !CHANNEL_MANAGER_H_ */
--- a/applications/jpip/libopenjpip/codestream_manager.c
+++ b/applications/jpip/libopenjpip/codestream_manager.c
@@ -1,8 +1,8 @@
 /*
- * $Id$
+ * $Id: codestream_manager.c 44 2011-02-15 12:32:29Z kaori $
 *
- * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2014, Professor Benoit Macq
+ * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2011, Professor Benoit Macq
 * Copyright (c) 2010-2011, Kaori Hagihara
 * All rights reserved.
 *
@@ -30,7 +30,6 @@

 #include <stdio.h>
 #include "codestream_manager.h"
-#include "opj_inttypes.h"

 #ifdef SERVER
 #include "fcgi_stdio.h"
@@ -41,7 +40,7 @@
 #define logstream stderr
 #endif /*SERVER */

-codestream_param_t set_codestream( int fd, OPJ_OFF_T offset, OPJ_SIZE_T length)
+codestream_param_t set_codestream( int fd, Byte8_t offset, Byte8_t length)
 {
  codestream_param_t cs;

@@ -52,22 +51,22 @@ codestream_param_t set_codestream( int fd, OPJ_OFF_T offset, OPJ_SIZE_T length)
  return cs;
 }

-Byte_t * fetch_codestreambytes( codestream_param_t *cs, OPJ_OFF_T offset, OPJ_SIZE_T size)
+Byte_t * fetch_codestreambytes( codestream_param_t *cs, long offset, int size)
 {
  return fetch_bytes( cs->fd, cs->offset+offset, size);
 }

-Byte_t fetch_codestream1byte( codestream_param_t *cs, OPJ_OFF_T offset)
+Byte_t fetch_codestream1byte( codestream_param_t *cs, long offset)
 {
  return fetch_1byte( cs->fd, cs->offset+offset);
 }

-Byte2_t fetch_codestream2bytebigendian( codestream_param_t *cs, OPJ_OFF_T offset)
+Byte2_t fetch_codestream2bytebigendian( codestream_param_t *cs, long offset)
 {
  return fetch_2bytebigendian( cs->fd, cs->offset+offset);
 }

-Byte4_t fetch_codestream4bytebigendian( codestream_param_t *cs, OPJ_OFF_T offset)
+Byte4_t fetch_codestream4bytebigendian( codestream_param_t *cs, long offset)
 {
  return fetch_4bytebigendian( cs->fd, cs->offset+offset);
 }
@@ -76,6 +75,6 @@ void print_codestream( codestream_param_t cs)
 {
  fprintf( logstream, "codestream info:\n"
 	   "\t fd: %d\n"
-	   "\t offset: %#" PRIx64 "\n"
-	   "\t length: %#" PRIx64 "\n", cs.fd, cs.offset, cs.length);
+	   "\t offset: %#llx\n"
+	   "\t length: %#llx\n", cs.fd, cs.offset, cs.length);
 }
--- a/applications/jpip/libopenjpip/codestream_manager.h
+++ b/applications/jpip/libopenjpip/codestream_manager.h
@@ -1,8 +1,8 @@
 /*
- * $Id$
+ * $Id: codestream_manager.h 44 2011-02-15 12:32:29Z kaori $
 *
- * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2014, Professor Benoit Macq
+ * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2011, Professor Benoit Macq
 * Copyright (c) 2010-2011, Kaori Hagihara
 * All rights reserved.
 *
@@ -36,7 +36,7 @@
 /** codestream parameters*/
 typedef struct codestream_param{
  int fd;         /**< file descriptor*/
-  OPJ_OFF_T offset; /**< byte position of DBox (Box Contents) in the file*/
+  Byte8_t offset; /**< byte position of DBox (Box Contents) in the file*/
  Byte8_t length; /**< content length*/
 } codestream_param_t;

@@ -49,7 +49,7 @@ typedef struct codestream_param{
 * @param[in] length codestream length
 * @return           structure of generated codestream parameters
 */
-codestream_param_t set_codestream( int fd, OPJ_OFF_T offset, OPJ_SIZE_T length);
+codestream_param_t set_codestream( int fd, Byte8_t offset, Byte8_t length);


 /**
@@ -60,7 +60,7 @@ codestream_param_t set_codestream( int fd, OPJ_OFF_T offset, OPJ_SIZE_T length);
 * @param[in] size   Byte length
 * @return           pointer to the fetched data
 */
-Byte_t * fetch_codestreambytes( codestream_param_t *cs, OPJ_OFF_T offset, OPJ_SIZE_T size);
+Byte_t * fetch_codestreambytes( codestream_param_t *cs, long offset, int size);

 /**
 * fetch Codestream 1-byte Byte code in file stream
@@ -69,7 +69,7 @@ Byte_t * fetch_codestreambytes( codestream_param_t *cs, OPJ_OFF_T offset, OPJ_SI
 * @param[in] offset start Byte position in codestream
 * @return           fetched code
 */
-Byte_t fetch_codestream1byte( codestream_param_t *cs, OPJ_OFF_T offset);
+Byte_t fetch_codestream1byte( codestream_param_t *cs, long offset);

 /**
 * fetch Codestream 2-byte big endian Byte codes in file stream
@@ -78,7 +78,7 @@ Byte_t fetch_codestream1byte( codestream_param_t *cs, OPJ_OFF_T offset);
 * @param[in] offset start Byte position in codestream
 * @return           fetched code
 */
-Byte2_t fetch_codestream2bytebigendian( codestream_param_t *cs, OPJ_OFF_T offset);
+Byte2_t fetch_codestream2bytebigendian( codestream_param_t *cs, long offset);

 /**
 * fetch Codestream 4-byte big endian Byte codes in file stream
@@ -87,7 +87,7 @@ Byte2_t fetch_codestream2bytebigendian( codestream_param_t *cs, OPJ_OFF_T offset
 * @param[in] offset start Byte position in codestream
 * @return           fetched code
 */
-Byte4_t fetch_codestream4bytebigendian( codestream_param_t *cs, OPJ_OFF_T offset);
+Byte4_t fetch_codestream4bytebigendian( codestream_param_t *cs, long offset);


 /**
--- a/Show More
+++ b/Show More