[2.0.1] Update changes and news file

Create OpenJPEG 2.0.1
[2.0] Backport all changes since r2798 (included) from trunk
2014-04-22 07:53:46 +00:00 · 2014-04-22 07:51:14 +00:00 · 2014-04-10 11:36:37 +00:00 · 2014-03-25 15:31:00 +00:00 · 2014-03-25 15:16:07 +00:00 · 2014-03-25 13:29:11 +00:00
722 changed files with 249089 additions and 58934 deletions
--- a/15
+++ b/15
@@ -0,0 +1,15 @@
+Authors of OpenJPEG
+See also the files THANKS and CHANGES
+
+David Janssens designed and implemented the first version of OpenJPEG.
+Kaori Hagihara designed and implemented the first version of OpenJPIP.
+Jerome Fimes implemented the alpha version of OpenJPEG 2.0.
+Giuseppe Baruffa added the JPWL functionalities.
+Micka<EFBFBD>l Savinaud implemented the final OpenJPEG 2.0 version based on a big merge between 1.5 version and alpha version of 2.0.
+Mathieu Malaterre participated to the OpenJPEG 2.0 version and improved the libraries and utilities. 
+Yannick Verschueren, 
+Herve Drolon, 
+Francois-Olivier Devaux, 
+Antonin Descampe
+    improved the libraries and utilities.
+
--- a/313
+++ b/313
@@ -0,0 +1,313 @@
+2012-12-07  Rex Dieter
+
+	* [r2261] doc/Doxyfile.dox.cmake.in: backport r2259
+	  
+	  Doxyfile: HTML_TIMESTAMP = NO
+	  
+	  helps when comparing the output of multiple runs,
+	  and distros will appreciate avoiding multilib conflicts.
+
+2013-02-02  Mickaël Savinaud
+
+	* [r2273] src/lib/openjp2/j2k.c,
+	  tests/nonregression/test_suite.ctest.in: [b2.x.x] backport into
+	  2.x.x the rev 2235
+	* [r2274] src/lib/openjp2/j2k.c: [b2.x.x] backport into 2.x.x the
+	  rev 2237 of trunk
+	* [r2275] tests/nonregression/test_suite.ctest.in: [b2.x.x]
+	  backport into 2.x.x the rev 2238 of trunk
+	* [r2276] src/lib/openjp2/j2k.c,
+	  tests/nonregression/test_suite.ctest.in: [b2.x.x] backport into
+	  2.x.x the rev 2239 of trunk
+	* [r2277] src/lib/openjp2/j2k.c,
+	  tests/nonregression/test_suite.ctest.in: [b2.x.x] backport into
+	  2.x.x the rev 2240 of trunk
+	* [r2278] tests/unit/CMakeLists.txt, tests/unit/testempty0.c:
+	  [b2.x.x] backport into 2.x.x the rev 2241 of trunk
+	* [r2279] tests/nonregression/CMakeLists.txt: [b2.x.x] backport
+	  into 2.x.x the rev 2242 of trunk
+	* [r2280] CMakeLists.txt, src/lib/openjp2/libopenjp2.pc.cmake.in:
+	  [b2.x.x] backport into 2.x.x the rev 2250 of trunk
+	* [r2281] src/lib/openjp2/jp2.c: [b2.x.x] backport into 2.x.x the
+	  rev 2251 of trunk
+	* [r2282] CMakeLists.txt, src/lib/openjp2/openjpeg.h,
+	  src/lib/openjp2/opj_stdint.h: [b2.x.x] backport into 2.x.x the
+	  rev 2252 of trunk
+	* [r2283] src/lib/openjpip/boxheader_manager.h,
+	  src/lib/openjpip/byte_manager.h: [b2.x.x] backport into 2.x.x the
+	  rev 2253 of trunk
+	* [r2284] CMakeLists.txt, src/lib/openjp2/opj_config.h.cmake.in,
+	  src/lib/openjp2/opj_stdint.h: [b2.x.x] backport into 2.x.x the
+	  rev 2254 of trunk
+
+2013-02-03  Mickaël Savinaud
+
+	* [r2288] src/lib/openjp2/j2k.h, src/lib/openjp2/t2.c,
+	  src/lib/openjp2/tcd.c, src/lib/openjp2/tcd.h,
+	  tests/nonregression/test_suite.ctest.in: [b2.x.x] backport into
+	  2.x.x the rev 2266 and 2285 of trunk
+	* [r2289] tests/nonregression/test_suite.ctest.in: [b2.x.x]
+	  backport into 2.x.x the rev 2287 of trunk
+	* [r2291] src/bin/jp2/convert.c: [b2.x.x] backport into 2.x.x the
+	  rev 2290 of trunk
+
+2013-10-28  Rex Dieter
+
+	* [r2349] CMakeLists.txt, src/lib/openjp3d/libopenjp3d.pc.cmake.in,
+	  src/lib/openjpip/libopenjpip.pc.cmake.in,
+	  src/lib/openjpwl/libopenjpwl.pc.cmake.in: [b2.x.x] backport into
+	  2.x.x the rev 2348 of trunk
+	  
+	  flesh out pkgconfig support for optional libs
+
+2014-03-25  Mathieu Malaterre
+
+	* [r2794] ., CMakeLists.txt, cmake/CTestCustom.cmake.in,
+	  cmake/EnsureFileInclude.cmake[CPY], cmake/FindKAKADU.cmake,
+	  cmake/TestLargeFiles.cmake, src/CMakeLists.txt,
+	  src/bin/common/CMakeLists.txt, src/bin/common/color.c,
+	  src/bin/common/format_defs.h,
+	  src/bin/common/opj_apps_config.h.cmake.in[CPY],
+	  src/bin/common/opj_getopt.c, src/bin/jp2/CMakeLists.txt,
+	  src/bin/jp2/convert.c, src/bin/jp2/opj_compress.c,
+	  src/bin/jp2/opj_decompress.c, src/bin/jp2/opj_dump.c,
+	  src/bin/jp3d/opj_jp3d_compress.c,
+	  src/bin/jp3d/opj_jp3d_decompress.c, src/bin/jpip/CMakeLists.txt,
+	  src/bin/jpip/opj_jpip_transcode.c, src/bin/jpip/opj_server.c,
+	  src/bin/jpwl/CMakeLists.txt, src/bin/jpwl/convert.c,
+	  src/bin/jpwl/opj_jpwl_compress.c,
+	  src/bin/jpwl/opj_jpwl_decompress.c, src/bin/mj2/CMakeLists.txt,
+	  src/bin/mj2/opj_mj2_compress.c, src/bin/mj2/opj_mj2_decompress.c,
+	  src/bin/wx/OPJViewer/CMakeLists.txt,
+	  src/lib/openjp2/CMakeLists.txt, src/lib/openjp2/bio.c,
+	  src/lib/openjp2/cidx_manager.c, src/lib/openjp2/cio.c,
+	  src/lib/openjp2/dwt.c, src/lib/openjp2/event.c,
+	  src/lib/openjp2/image.c, src/lib/openjp2/invert.c,
+	  src/lib/openjp2/j2k.c, src/lib/openjp2/jp2.c,
+	  src/lib/openjp2/libopenjp2.pc.cmake.in, src/lib/openjp2/mct.c,
+	  src/lib/openjp2/mqc.c, src/lib/openjp2/openjpeg.c,
+	  src/lib/openjp2/openjpeg.h, src/lib/openjp2/opj_clock.c,
+	  src/lib/openjp2/opj_codec.h[CPY],
+	  src/lib/openjp2/opj_config.h.cmake.in,
+	  src/lib/openjp2/opj_config_private.h.cmake.in[CPY],
+	  src/lib/openjp2/opj_includes.h, src/lib/openjp2/opj_intmath.h,
+	  src/lib/openjp2/opj_inttypes.h, src/lib/openjp2/opj_malloc.h,
+	  src/lib/openjp2/phix_manager.c, src/lib/openjp2/pi.c,
+	  src/lib/openjp2/ppix_manager.c, src/lib/openjp2/raw.c,
+	  src/lib/openjp2/t1.c, src/lib/openjp2/t1_generate_luts.c,
+	  src/lib/openjp2/t2.c, src/lib/openjp2/tcd.c,
+	  src/lib/openjp2/tgt.c, src/lib/openjp2/thix_manager.c,
+	  src/lib/openjp2/tpix_manager.c, src/lib/openjp3d/bio.c,
+	  src/lib/openjp3d/bio.h, src/lib/openjp3d/cio.c,
+	  src/lib/openjp3d/cio.h, src/lib/openjp3d/dwt.c,
+	  src/lib/openjp3d/dwt.h, src/lib/openjp3d/event.c,
+	  src/lib/openjp3d/event.h, src/lib/openjp3d/fix.h,
+	  src/lib/openjp3d/int.h, src/lib/openjp3d/jp3d.c,
+	  src/lib/openjp3d/jp3d.h, src/lib/openjp3d/jp3d_lib.c,
+	  src/lib/openjp3d/jp3d_lib.h, src/lib/openjp3d/mct.c,
+	  src/lib/openjp3d/mct.h, src/lib/openjp3d/mqc.c,
+	  src/lib/openjp3d/mqc.h, src/lib/openjp3d/openjp3d.c,
+	  src/lib/openjp3d/openjp3d.h, src/lib/openjp3d/opj_includes.h,
+	  src/lib/openjp3d/pi.c, src/lib/openjp3d/pi.h,
+	  src/lib/openjp3d/raw.c, src/lib/openjp3d/raw.h,
+	  src/lib/openjp3d/t1.c, src/lib/openjp3d/t1.h,
+	  src/lib/openjp3d/t1_3d.c, src/lib/openjp3d/t1_3d.h,
+	  src/lib/openjp3d/t2.c, src/lib/openjp3d/t2.h,
+	  src/lib/openjp3d/tcd.c, src/lib/openjp3d/tcd.h,
+	  src/lib/openjp3d/tgt.c, src/lib/openjp3d/tgt.h,
+	  src/lib/openjp3d/volume.c, src/lib/openjp3d/volume.h,
+	  src/lib/openjpip/index_manager.c,
+	  src/lib/openjpip/j2kheader_manager.c,
+	  src/lib/openjpip/jp2k_decoder.c, src/lib/openjpip/jp2k_encoder.c,
+	  src/lib/openjpip/msgqueue_manager.c, src/lib/openmj2/j2k.c,
+	  src/lib/openmj2/openjpeg.c, tests/CMakeLists.txt,
+	  tests/comparePGXimages.c[DEL], tests/compareRAWimages.c[DEL],
+	  tests/compare_dump_files.c, tests/compare_images.c[CPY],
+	  tests/compare_raw_files.c[CPY], tests/conformance/CMakeLists.txt,
+	  tests/j2k_random_tile_access.c,
+	  tests/nonregression/CMakeLists.txt,
+	  tests/nonregression/checkmd5refs.cmake[CPY],
+	  tests/nonregression/md5refs.txt[CPY],
+	  tests/nonregression/test_suite.ctest.in, tests/ppm2rgb3.c[CPY],
+	  tests/test_tile_decoder.c, tests/test_tile_encoder.c,
+	  tests/unit/CMakeLists.txt, tests/unit/testempty0.c,
+	  tests/unit/testempty1.c, tests/unit/testempty2.c,
+	  thirdparty/CMakeLists.txt, thirdparty/libtiff/test_inline.c:
+	  [2.0] Backport all changes from trunk
+	  We only backport change that do not affect API or ABI
+	  Update issue 313
+	* [r2797] ., tests/nonregression/CMakeLists.txt: [2.0] Backport
+	  from trunk
+	  Make sure to have a non empty list
+
+2014-04-10  Antonin Descampe
+
+	* [r2836] ., AUTHORS, LICENSE, NEWS, cmake/TestFileOffsetBits.c,
+	  doc/mainpage.dox.in, doc/man/man1/opj_compress.1,
+	  doc/man/man1/opj_decompress.1, doc/man/man3/libopenjp2.3,
+	  doc/openjpip.dox.in, src/bin/common/color.c,
+	  src/bin/common/color.h, src/bin/common/format_defs.h,
+	  src/bin/common/opj_getopt.c, src/bin/jp2/convert.c,
+	  src/bin/jp2/convert.h, src/bin/jp2/index.c, src/bin/jp2/index.h,
+	  src/bin/jp2/opj_compress.c, src/bin/jp2/opj_decompress.c,
+	  src/bin/jp2/opj_dump.c, src/bin/jp3d/convert.c,
+	  src/bin/jpip/opj_dec_server.c, src/bin/jpip/opj_jpip_addxml.c,
+	  src/bin/jpip/opj_jpip_test.c, src/bin/jpip/opj_jpip_transcode.c,
+	  src/bin/jpip/opj_server.c,
+	  src/bin/jpip/opj_viewer/src/ImageManager.java,
+	  src/bin/jpip/opj_viewer/src/ImageViewer.java,
+	  src/bin/jpip/opj_viewer/src/ImageWindow.java,
+	  src/bin/jpip/opj_viewer/src/ImgdecClient.java,
+	  src/bin/jpip/opj_viewer/src/JPIPHttpClient.java,
+	  src/bin/jpip/opj_viewer/src/MML.java,
+	  src/bin/jpip/opj_viewer/src/PnmImage.java,
+	  src/bin/jpip/opj_viewer/src/RegimViewer.java,
+	  src/bin/jpip/opj_viewer/src/ResizeListener.java,
+	  src/bin/jpip/opj_viewer_xerces/src/ImageViewer.java,
+	  src/bin/jpip/opj_viewer_xerces/src/ImageWindow.java,
+	  src/bin/jpip/opj_viewer_xerces/src/JP2XMLparser.java,
+	  src/bin/jpip/opj_viewer_xerces/src/OptionPanel.java,
+	  src/bin/jpwl/convert.c, src/bin/jpwl/convert.h,
+	  src/bin/jpwl/index.c, src/bin/jpwl/index.h,
+	  src/bin/jpwl/opj_jpwl_compress.c,
+	  src/bin/jpwl/opj_jpwl_decompress.c,
+	  src/bin/mj2/opj_mj2_extract.c, src/bin/mj2/opj_mj2_wrap.c,
+	  src/bin/wx/OPJViewer/source/OPJAbout.cpp,
+	  src/bin/wx/OPJViewer/source/OPJDialogs.cpp,
+	  src/bin/wx/OPJViewer/source/OPJThreads.cpp,
+	  src/bin/wx/OPJViewer/source/OPJViewer.cpp,
+	  src/bin/wx/OPJViewer/source/OPJViewer.h,
+	  src/bin/wx/OPJViewer/source/imagjpeg2000.cpp,
+	  src/bin/wx/OPJViewer/source/imagjpeg2000.h,
+	  src/bin/wx/OPJViewer/source/imagmxf.cpp,
+	  src/bin/wx/OPJViewer/source/imagmxf.h,
+	  src/bin/wx/OPJViewer/source/license.txt,
+	  src/bin/wx/OPJViewer/source/wxj2kparser.cpp,
+	  src/bin/wx/OPJViewer/source/wxjp2parser.cpp,
+	  src/lib/openjp2/bio.c, src/lib/openjp2/bio.h,
+	  src/lib/openjp2/cidx_manager.c, src/lib/openjp2/cidx_manager.h,
+	  src/lib/openjp2/cio.c, src/lib/openjp2/cio.h,
+	  src/lib/openjp2/dwt.c, src/lib/openjp2/dwt.h,
+	  src/lib/openjp2/event.c, src/lib/openjp2/event.h,
+	  src/lib/openjp2/function_list.c, src/lib/openjp2/function_list.h,
+	  src/lib/openjp2/image.c, src/lib/openjp2/image.h,
+	  src/lib/openjp2/indexbox_manager.h, src/lib/openjp2/invert.c,
+	  src/lib/openjp2/invert.h, src/lib/openjp2/j2k.c,
+	  src/lib/openjp2/j2k.h, src/lib/openjp2/jp2.c,
+	  src/lib/openjp2/jp2.h, src/lib/openjp2/mct.c,
+	  src/lib/openjp2/mct.h, src/lib/openjp2/mqc.c,
+	  src/lib/openjp2/mqc.h, src/lib/openjp2/openjpeg.c,
+	  src/lib/openjp2/openjpeg.h, src/lib/openjp2/opj_clock.c,
+	  src/lib/openjp2/opj_clock.h, src/lib/openjp2/opj_codec.h,
+	  src/lib/openjp2/opj_includes.h, src/lib/openjp2/opj_intmath.h,
+	  src/lib/openjp2/opj_inttypes.h, src/lib/openjp2/opj_malloc.h,
+	  src/lib/openjp2/opj_stdint.h, src/lib/openjp2/phix_manager.c,
+	  src/lib/openjp2/pi.c, src/lib/openjp2/pi.h,
+	  src/lib/openjp2/ppix_manager.c, src/lib/openjp2/raw.c,
+	  src/lib/openjp2/raw.h, src/lib/openjp2/t1.c,
+	  src/lib/openjp2/t1.h, src/lib/openjp2/t1_generate_luts.c,
+	  src/lib/openjp2/t2.c, src/lib/openjp2/t2.h,
+	  src/lib/openjp2/tcd.c, src/lib/openjp2/tcd.h,
+	  src/lib/openjp2/tgt.c, src/lib/openjp2/tgt.h,
+	  src/lib/openjp2/thix_manager.c, src/lib/openjp2/tpix_manager.c,
+	  src/lib/openjp3d/bio.c, src/lib/openjp3d/bio.h,
+	  src/lib/openjp3d/cio.c, src/lib/openjp3d/cio.h,
+	  src/lib/openjp3d/dwt.c, src/lib/openjp3d/dwt.h,
+	  src/lib/openjp3d/event.c, src/lib/openjp3d/event.h,
+	  src/lib/openjp3d/fix.h, src/lib/openjp3d/int.h,
+	  src/lib/openjp3d/jp3d.c, src/lib/openjp3d/jp3d.h,
+	  src/lib/openjp3d/jp3d_lib.c, src/lib/openjp3d/jp3d_lib.h,
+	  src/lib/openjp3d/mct.c, src/lib/openjp3d/mct.h,
+	  src/lib/openjp3d/mqc.c, src/lib/openjp3d/mqc.h,
+	  src/lib/openjp3d/openjp3d.c, src/lib/openjp3d/openjp3d.h,
+	  src/lib/openjp3d/opj_includes.h, src/lib/openjp3d/pi.c,
+	  src/lib/openjp3d/pi.h, src/lib/openjp3d/raw.c,
+	  src/lib/openjp3d/raw.h, src/lib/openjp3d/t1.c,
+	  src/lib/openjp3d/t1.h, src/lib/openjp3d/t2.c,
+	  src/lib/openjp3d/t2.h, src/lib/openjp3d/tcd.c,
+	  src/lib/openjp3d/tcd.h, src/lib/openjp3d/tgt.c,
+	  src/lib/openjp3d/tgt.h, src/lib/openjp3d/volume.c,
+	  src/lib/openjp3d/volume.h, src/lib/openjpip/auxtrans_manager.c,
+	  src/lib/openjpip/auxtrans_manager.h,
+	  src/lib/openjpip/box_manager.c, src/lib/openjpip/box_manager.h,
+	  src/lib/openjpip/boxheader_manager.c,
+	  src/lib/openjpip/boxheader_manager.h,
+	  src/lib/openjpip/byte_manager.c, src/lib/openjpip/byte_manager.h,
+	  src/lib/openjpip/cache_manager.c,
+	  src/lib/openjpip/cache_manager.h,
+	  src/lib/openjpip/cachemodel_manager.c,
+	  src/lib/openjpip/cachemodel_manager.h,
+	  src/lib/openjpip/channel_manager.c,
+	  src/lib/openjpip/channel_manager.h,
+	  src/lib/openjpip/codestream_manager.c,
+	  src/lib/openjpip/codestream_manager.h,
+	  src/lib/openjpip/dec_clientmsg_handler.c,
+	  src/lib/openjpip/dec_clientmsg_handler.h,
+	  src/lib/openjpip/faixbox_manager.c,
+	  src/lib/openjpip/faixbox_manager.h,
+	  src/lib/openjpip/ihdrbox_manager.c,
+	  src/lib/openjpip/ihdrbox_manager.h,
+	  src/lib/openjpip/imgreg_manager.c,
+	  src/lib/openjpip/imgreg_manager.h,
+	  src/lib/openjpip/imgsock_manager.c,
+	  src/lib/openjpip/imgsock_manager.h,
+	  src/lib/openjpip/index_manager.c,
+	  src/lib/openjpip/index_manager.h,
+	  src/lib/openjpip/j2kheader_manager.c,
+	  src/lib/openjpip/j2kheader_manager.h,
+	  src/lib/openjpip/jp2k_decoder.c, src/lib/openjpip/jp2k_decoder.h,
+	  src/lib/openjpip/jp2k_encoder.c, src/lib/openjpip/jp2k_encoder.h,
+	  src/lib/openjpip/jpip_parser.c, src/lib/openjpip/jpip_parser.h,
+	  src/lib/openjpip/jpipstream_manager.c,
+	  src/lib/openjpip/jpipstream_manager.h,
+	  src/lib/openjpip/manfbox_manager.c,
+	  src/lib/openjpip/manfbox_manager.h,
+	  src/lib/openjpip/marker_manager.c,
+	  src/lib/openjpip/marker_manager.h,
+	  src/lib/openjpip/metadata_manager.c,
+	  src/lib/openjpip/metadata_manager.h,
+	  src/lib/openjpip/mhixbox_manager.c,
+	  src/lib/openjpip/mhixbox_manager.h,
+	  src/lib/openjpip/msgqueue_manager.c,
+	  src/lib/openjpip/msgqueue_manager.h, src/lib/openjpip/openjpip.c,
+	  src/lib/openjpip/openjpip.h,
+	  src/lib/openjpip/placeholder_manager.c,
+	  src/lib/openjpip/placeholder_manager.h,
+	  src/lib/openjpip/query_parser.c, src/lib/openjpip/query_parser.h,
+	  src/lib/openjpip/session_manager.c,
+	  src/lib/openjpip/session_manager.h,
+	  src/lib/openjpip/sock_manager.c, src/lib/openjpip/sock_manager.h,
+	  src/lib/openjpip/target_manager.c,
+	  src/lib/openjpip/target_manager.h, src/lib/openjpwl/crc.c,
+	  src/lib/openjpwl/crc.h, src/lib/openjpwl/jpwl.c,
+	  src/lib/openjpwl/jpwl.h, src/lib/openjpwl/jpwl_lib.c,
+	  src/lib/openjpwl/rs.c, src/lib/openjpwl/rs.h,
+	  src/lib/openmj2/bio.c, src/lib/openmj2/bio.h,
+	  src/lib/openmj2/cio.c, src/lib/openmj2/cio.h,
+	  src/lib/openmj2/dwt.c, src/lib/openmj2/dwt.h,
+	  src/lib/openmj2/event.c, src/lib/openmj2/event.h,
+	  src/lib/openmj2/fix.h, src/lib/openmj2/image.c,
+	  src/lib/openmj2/image.h, src/lib/openmj2/int.h,
+	  src/lib/openmj2/j2k.c, src/lib/openmj2/j2k.h,
+	  src/lib/openmj2/j2k_lib.c, src/lib/openmj2/j2k_lib.h,
+	  src/lib/openmj2/jp2.c, src/lib/openmj2/jp2.h,
+	  src/lib/openmj2/jpt.c, src/lib/openmj2/jpt.h,
+	  src/lib/openmj2/mct.c, src/lib/openmj2/mct.h,
+	  src/lib/openmj2/mj2.c, src/lib/openmj2/mj2_convert.c,
+	  src/lib/openmj2/mqc.c, src/lib/openmj2/mqc.h,
+	  src/lib/openmj2/openjpeg.c, src/lib/openmj2/openjpeg.h,
+	  src/lib/openmj2/opj_includes.h, src/lib/openmj2/pi.c,
+	  src/lib/openmj2/pi.h, src/lib/openmj2/raw.c,
+	  src/lib/openmj2/raw.h, src/lib/openmj2/t1.c,
+	  src/lib/openmj2/t1.h, src/lib/openmj2/t2.c, src/lib/openmj2/t2.h,
+	  src/lib/openmj2/tcd.c, src/lib/openmj2/tcd.h,
+	  src/lib/openmj2/tgt.c, src/lib/openmj2/tgt.h,
+	  tests/CMakeLists.txt, tests/nonregression/test_suite.ctest.in,
+	  tests/pdf2jp2.c[CPY], thirdparty/CMakeLists.txt,
+	  wrapping/java/openjp2/JavaOpenJPEG.c,
+	  wrapping/java/openjp2/JavaOpenJPEGDecoder.c,
+	  wrapping/java/openjp2/index.c, wrapping/java/openjp2/index.h,
+	  wrapping/java/openjp2/java-sources/org/openJpeg/OpenJPEGJavaDecoder.java,
+	  wrapping/java/openjp2/java-sources/org/openJpeg/OpenJPEGJavaEncoder.java:
+	  [2.0] Backport all changes since r2798 (included) from trunk
+
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -0,0 +1,351 @@
+# Main CMakeLists.txt to build the OpenJPEG project using CMake (www.cmake.org)
+# Written by Mathieu Malaterre
+
+# This CMake project will by default create a library called openjpeg
+# But if you want to use this project within your own (CMake) project
+# 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)
+
+if(COMMAND CMAKE_POLICY)
+  cmake_policy(SET CMP0003 NEW)
+endif()
+
+if(NOT OPENJPEG_NAMESPACE)
+  set(OPENJPEG_NAMESPACE "OPENJPEG")
+  set(OPENJPEG_STANDALONE 1)
+endif()
+# In all cases:
+#string(TOLOWER ${OPENJPEG_NAMESPACE} OPENJPEG_LIBRARY_NAME)
+set(OPENJPEG_LIBRARY_NAME openjp2)
+
+project(${OPENJPEG_NAMESPACE} C)
+
+# Do full dependency headers.
+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
+  "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}")
+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
+# version | soversion
+#   1.0   |  0
+#   1.1   |  1
+#   1.2   |  2
+#   1.3   |  3
+#   1.4   |  4
+#   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)
+endif(NOT OPENJPEG_SOVERSION)
+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
+    ${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(
+            -D_CRT_FAR_MAPPINGS_NO_DEPRECATE
+            -D_CRT_IS_WCTYPE_NO_DEPRECATE
+            -D_CRT_MANAGED_FP_NO_DEPRECATE
+            -D_CRT_NONSTDC_NO_DEPRECATE
+            -D_CRT_SECURE_NO_DEPRECATE
+            -D_CRT_SECURE_NO_DEPRECATE_GLOBALS
+            -D_CRT_SETERRORMODE_BEEP_SLEEP_NO_DEPRECATE
+            -D_CRT_TIME_FUNCTIONS_NO_DEPRECATE
+            -D_CRT_VCCLRIT_NO_DEPRECATE
+            -D_SCL_SECURE_NO_DEPRECATE
+            )
+        endif()
+      endif()
+    endif()
+  endif()
+endif()
+
+
+# --------------------------------------------------------------------------
+# Install directories
+
+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_LIB_DIR)
+  set(OPENJPEG_INSTALL_LIB_DIR "lib")
+endif()
+
+if(NOT OPENJPEG_INSTALL_SHARE_DIR)
+  set(OPENJPEG_INSTALL_SHARE_DIR "share")
+endif()
+
+if(NOT OPENJPEG_INSTALL_DATA_DIR)
+  set(OPENJPEG_INSTALL_DATA_DIR "${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
+endif()
+
+if(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
+  set(OPENJPEG_INSTALL_INCLUDE_DIR "include/${OPENJPEG_INSTALL_SUBDIR}")
+endif()
+
+if(NOT OPENJPEG_INSTALL_MAN_DIR)
+  set(OPENJPEG_INSTALL_MAN_DIR "share/man/")
+endif()
+
+if(NOT OPENJPEG_INSTALL_DOC_DIR)
+  set(OPENJPEG_INSTALL_DOC_DIR "share/doc/${OPENJPEG_INSTALL_SUBDIR}")
+endif()
+
+if(NOT OPENJPEG_INSTALL_JNI_DIR)
+  if(WIN32)
+    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_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()
+
+#-----------------------------------------------------------------------------
+# Big endian test:
+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
+  ${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)
+
+#-----------------------------------------------------------------------------
+# 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
+               ${CMAKE_CURRENT_BINARY_DIR}/openjpeg_mangle.h
+               @ONLY)
+endif()
+
+#-----------------------------------------------------------------------------
+# Compiler specific flags:
+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.
+  # 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()
+
+#-----------------------------------------------------------------------------
+# 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)
+CHECK_INCLUDE_FILE("strings.h"      HAVE_STRINGS_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)
+
+#-----------------------------------------------------------------------------
+# 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)
+
+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)
+
+#-----------------------------------------------------------------------------
+# 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
+ @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()
+
+#-----------------------------------------------------------------------------
+# Buld Testing
+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
+      )
+
+    # Add repository where to find tests
+    add_subdirectory(tests)
+
+  else()
+    message(FATAL_ERROR "You need build codec to run the tests")
+  endif()
+endif()
+
+#-----------------------------------------------------------------------------
+# install all targets referenced as OPENJPEGTargets
+install(EXPORT OpenJPEGTargets DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR})
+configure_file( ${OPENJPEG_SOURCE_DIR}/cmake/OpenJPEGConfig.cmake.in
+  ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
+  @ONLY
+)
+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})
+
+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()
+
+#-----------------------------------------------------------------------------
--- a/CTestConfig.cmake
+++ b/CTestConfig.cmake
@@ -0,0 +1,7 @@
+set(CTEST_PROJECT_NAME "OPENJPEG")
+set(CTEST_NIGHTLY_START_TIME "3:00:00 UTC")
+
+set(CTEST_DROP_METHOD "http")
+set(CTEST_DROP_SITE "my.cdash.org")
+set(CTEST_DROP_LOCATION "/submit.php?project=OPENJPEG")
+set(CTEST_DROP_SITE_CDASH TRUE)
--- a/CVSROOT/checkoutlist
+++ b/CVSROOT/checkoutlist
@@ -1,13 +0,0 @@
-# The "checkoutlist" file is used to support additional version controlled
-# administrative files in $CVSROOT/CVSROOT, such as template files.
-#
-# The first entry on a line is a filename which will be checked out from
-# the corresponding RCS file in the $CVSROOT/CVSROOT directory.
-# The remainder of the line is an error message to use if the file cannot
-# be checked out.
-#
-# File format:
-#
-#	[<whitespace>]<filename><whitespace><error message><end-of-line>
-#
-# comment lines begin with '#'
--- a/CVSROOT/commitinfo
+++ b/CVSROOT/commitinfo
@@ -1,15 +0,0 @@
-# The "commitinfo" file is used to control pre-commit checks.
-# The filter on the right is invoked with the repository and a list 
-# of files to check.  A non-zero exit of the filter program will 
-# cause the commit to be aborted.
-#
-# The first entry on a line is a regular expression which is tested
-# against the directory that the change is being committed to, relative
-# to the $CVSROOT.  For the first match that is found, then the remainder
-# of the line is the name of the filter to run.
-#
-# If the repository name does not match any of the regular expressions in this
-# file, the "DEFAULT" line is used, if it is specified.
-#
-# If the name "ALL" appears as a regular expression it is always used
-# in addition to the first matching regex or "DEFAULT".
--- a/CVSROOT/config
+++ b/CVSROOT/config
@@ -1,14 +0,0 @@
-# Set this to "no" if pserver shouldn't check system users/passwords
-#SystemAuth=no
-
-# Put CVS lock files in this directory rather than directly in the repository.
-#LockDir=/var/lock/cvs
-
-# Set `TopLevelAdmin' to `yes' to create a CVS directory at the top
-# level of the new working directory when using the `cvs checkout'
-# command.
-#TopLevelAdmin=no
-
-# Set `LogHistory' to `all' or `TOFEWGCMAR' to log all transactions to the
-# history file, or a subset as needed (ie `TMAR' logs all write operations)
-#LogHistory=TOFEWGCMAR
--- a/CVSROOT/cvswrappers
+++ b/CVSROOT/cvswrappers
@@ -1,23 +0,0 @@
-# This file affects handling of files based on their names.
-#
-# The -t/-f options allow one to treat directories of files
-# as a single file, or to transform a file in other ways on
-# its way in and out of CVS.
-#
-# The -m option specifies whether CVS attempts to merge files.
-#
-# The -k option specifies keyword expansion (e.g. -kb for binary).
-#
-# Format of wrapper file ($CVSROOT/CVSROOT/cvswrappers or .cvswrappers)
-#
-#  wildcard	[option value][option value]...
-#
-#  where option is one of
-#  -f		from cvs filter		value: path to filter
-#  -t		to cvs filter		value: path to filter
-#  -m		update methodology	value: MERGE or COPY
-#  -k		expansion mode		value: b, o, kkv, &c
-#
-#  and value is a single-quote delimited value.
-# For example:
-#*.gif -k 'b'
--- a/CVSROOT/editinfo
+++ b/CVSROOT/editinfo
@@ -1,21 +0,0 @@
-# The "editinfo" file is used to allow verification of logging
-# information.  It works best when a template (as specified in the
-# rcsinfo file) is provided for the logging procedure.  Given a
-# template with locations for, a bug-id number, a list of people who
-# reviewed the code before it can be checked in, and an external
-# process to catalog the differences that were code reviewed, the
-# following test can be applied to the code:
-#
-#   Making sure that the entered bug-id number is correct.
-#   Validating that the code that was reviewed is indeed the code being
-#       checked in (using the bug-id number or a seperate review
-#       number to identify this particular code set.).
-#
-# If any of the above test failed, then the commit would be aborted.
-#
-# Actions such as mailing a copy of the report to each reviewer are
-# better handled by an entry in the loginfo file.
-#
-# One thing that should be noted is the the ALL keyword is not
-# supported.  There can be only one entry that matches a given
-# repository.
--- a/CVSROOT/loginfo
+++ b/CVSROOT/loginfo
@@ -1,26 +0,0 @@
-# The "loginfo" file controls where "cvs commit" log information
-# is sent.  The first entry on a line is a regular expression which must match
-# the directory that the change is being made to, relative to the
-# $CVSROOT.  If a match is found, then the remainder of the line is a filter
-# program that should expect log information on its standard input.
-#
-# If the repository name does not match any of the regular expressions in this
-# file, the "DEFAULT" line is used, if it is specified.
-#
-# If the name ALL appears as a regular expression it is always used
-# in addition to the first matching regex or DEFAULT.
-#
-# You may specify a format string as part of the
-# filter.  The string is composed of a `%' followed
-# by a single format character, or followed by a set of format
-# characters surrounded by `{' and `}' as separators.  The format
-# characters are:
-#
-#   s = file name
-#   V = old version number (pre-checkin)
-#   v = new version number (post-checkin)
-#
-# For example:
-#DEFAULT (echo ""; id; echo %s; date; cat) >> $CVSROOT/CVSROOT/commitlog
-# or
-#DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog
--- a/CVSROOT/modules
+++ b/CVSROOT/modules
@@ -1,26 +0,0 @@
-# Three different line formats are valid:
-#	key	-a    aliases...
-#	key [options] directory
-#	key [options] directory files...
-#
-# Where "options" are composed of:
-#	-i prog		Run "prog" on "cvs commit" from top-level of module.
-#	-o prog		Run "prog" on "cvs checkout" of module.
-#	-e prog		Run "prog" on "cvs export" of module.
-#	-t prog		Run "prog" on "cvs rtag" of module.
-#	-u prog		Run "prog" on "cvs update" of module.
-#	-d dir		Place module in directory "dir" instead of module name.
-#	-l		Top-level directory only -- do not recurse.
-#
-# NOTE:  If you change any of the "Run" options above, you'll have to
-# release and re-checkout any working directories of these modules.
-#
-# And "directory" is a path to a directory relative to $CVSROOT.
-#
-# The "-a" option specifies an alias.  An alias is interpreted as if
-# everything on the right of the "-a" had been typed on the command line.
-#
-# You can encode a module within a module by using the special '&'
-# character to interpose another module into the current module.  This
-# can be useful for creating a module that consists of many directories
-# spread out over the entire source repository.
--- a/CVSROOT/notify
+++ b/CVSROOT/notify
@@ -1,12 +0,0 @@
-# The "notify" file controls where notifications from watches set by
-# "cvs watch add" or "cvs edit" are sent.  The first entry on a line is
-# a regular expression which is tested against the directory that the
-# change is being made to, relative to the $CVSROOT.  If it matches,
-# then the remainder of the line is a filter program that should contain
-# one occurrence of %s for the user to notify, and information on its
-# standard input.
-#
-# "ALL" or "DEFAULT" can be used in place of the regular expression.
-#
-# For example:
-#ALL mail %s -s "CVS notification"
--- a/CVSROOT/rcsinfo
+++ b/CVSROOT/rcsinfo
@@ -1,13 +0,0 @@
-# The "rcsinfo" file is used to control templates with which the editor
-# is invoked on commit and import.
-#
-# The first entry on a line is a regular expression which is tested
-# against the directory that the change is being made to, relative to the
-# $CVSROOT.  For the first match that is found, then the remainder of the
-# line is the name of the file that contains the template.
-#
-# If the repository name does not match any of the regular expressions in this
-# file, the "DEFAULT" line is used, if it is specified.
-#
-# If the name "ALL" appears as a regular expression it is always used
-# in addition to the first matching regex or "DEFAULT".
--- a/CVSROOT/taginfo
+++ b/CVSROOT/taginfo
@@ -1,20 +0,0 @@
-# The "taginfo" file is used to control pre-tag checks.
-# The filter on the right is invoked with the following arguments:
-#
-# $1 -- tagname
-# $2 -- operation "add" for tag, "mov" for tag -F, and "del" for tag -d
-# $3 -- repository
-# $4->  file revision [file revision ...]
-#
-# A non-zero exit of the filter program will cause the tag to be aborted.
-#
-# The first entry on a line is a regular expression which is tested
-# against the directory that the change is being committed to, relative
-# to the $CVSROOT.  For the first match that is found, then the remainder
-# of the line is the name of the filter to run.
-#
-# If the repository name does not match any of the regular expressions in this
-# file, the "DEFAULT" line is used, if it is specified.
-#
-# If the name "ALL" appears as a regular expression it is always used
-# in addition to the first matching regex or "DEFAULT".
--- a/CVSROOT/verifymsg
+++ b/CVSROOT/verifymsg
@@ -1,21 +0,0 @@
-# The "verifymsg" file is used to allow verification of logging
-# information.  It works best when a template (as specified in the
-# rcsinfo file) is provided for the logging procedure.  Given a
-# template with locations for, a bug-id number, a list of people who
-# reviewed the code before it can be checked in, and an external
-# process to catalog the differences that were code reviewed, the
-# following test can be applied to the code:
-#
-#   Making sure that the entered bug-id number is correct.
-#   Validating that the code that was reviewed is indeed the code being
-#       checked in (using the bug-id number or a seperate review
-#       number to identify this particular code set.).
-#
-# If any of the above test failed, then the commit would be aborted.
-#
-# Actions such as mailing a copy of the report to each reviewer are
-# better handled by an entry in the loginfo file.
-#
-# One thing that should be noted is the the ALL keyword is not
-# supported.  There can be only one entry that matches a given
-# repository.
--- a/69
+++ b/69
@@ -0,0 +1,69 @@
+
+How to build and install openjpeg binaries
+==========================================
+
+UNIX/LINUX/MacOSX/Windows systems
+--------------------------
+
+Using cmake (see www.cmake.org)
+
+Type:
+  cmake .
+  make
+
+If you are root:
+  make install
+
+else if you have sudo power:
+  sudo make install
+
+else
+  DESTDIR=$HOME/local make install
+
+To build the Doxygen documentation (Doxygen needs to be found on the system):
+(A 'html' directory is generated in the 'doc' directory)
+  make doc
+
+Binaries are located in the 'bin' directory.
+
+Main available cmake flags:
+* To specify the install path: '-DCMAKE_INSTALL_PREFIX=/path', or use DESTDIR env variable (see above)
+* 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
+    make Experimental
+  Note : JPEG2000 test files are available with 'svn checkout http://openjpeg.googlecode.com/svn/data' (about 70 Mo).
+  If '-DOPJ_DATA_ROOT:PATH' option is omitted, test files will be automatically searched in '${CMAKE_SOURCE_DIR}/../data',
+  corresponding to the location of the data directory when compiling from the trunk (and assuming the data directory has
+  been checked out of course).
+
+MACOSX
+------
+
+The same building procedures as above work for MACOSX.
+The xcode project file can also be used.
+
+If it does not work, try adding the following flag to the cmake command : 
+  '-DCMAKE_OSX_ARCHITECTURES:STRING=i386'
+
+WINDOWS
+-------
+
+You can use cmake to generate project files for the IDE you are using (VS2010, NMake, etc).
+Type 'cmake --help' for available generators on your platform.
+
+Make sure to build the third party libs (png, zlib ...):
+
+  '-DBUILD_THIRDPARTY:BOOL=ON'
--- a/jpwl/decoder/jpwldec/convert.h
+++ b/jpwl/decoder/jpwldec/convert.h
@@ -1,7 +1,19 @@
 /*
- * Copyright (c) 2001-2003, David Janssens
+ * The copyright in this software is being made available under the 2-clauses 
+ * BSD License, included below. This software may be subject to other third 
+ * party and contributor rights, including patent rights, and no such rights
+ * are granted under this license.
+ *
+ * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2014, Professor Benoit Macq
+ * Copyright (c) 2003-2014, Antonin Descampe
+ * Copyright (c) 2003-2009, Francois-Olivier Devaux
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
 * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2002-2003,  Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
+ * 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
@@ -25,15 +37,3 @@
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 */
-
-#include "j2k.h"
-
-int bmptoimage(char *filename, j2k_image_t * img, int subsampling_dx,
-	       int subsampling_dy, int Dim[2]);
-
-int pgxtoimage(char *filename, j2k_image_t * img, int tdy,
-	       int subsampling_dx, int subsampling_dy, int Dim[2],
-	       j2k_cp_t cp);
-
-int pnmtoimage(char *filename, j2k_image_t * img, int subsampling_dx,
-	       int subsampling_dy, int Dim[2]);
--- a/24
+++ b/24
@@ -0,0 +1,24 @@
+
+OpenJPEG NEWS - user visible changes
+====================================
+
+Changes from OpenJPEG 2.0.0 to OpenJPEG 2.0.1
+----------------------------------------------
+
+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)
+
+    * 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.
--- a/47
+++ b/47
@@ -0,0 +1,47 @@
+
+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
+    * common: common files to all applications
+    * jp2: 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
+* 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
+
+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/33
+++ b/33
@@ -0,0 +1,33 @@
+OpenJPEG THANKS file
+
+Many people have contributed to OpenJPEG by reporting problems, suggesting various improvements,
+or submitting actual code. Here is a list of these people. Help me keep
+it complete and exempt of errors.
+
+Winfried Szukalski
+Vincent Torri
+Bob Friesenhahn
+Callum Lerwick
+Dzonatas Sol
+Julien Malik
+Jerôme Fimes
+Herve Drolon
+Yannick Verschueren
+Sebastien Lugan
+Kaori Hagihara
+Peter Wimmer
+Francois-Olivier Devaux
+Antonin Descampe
+David Janssens
+Pr. Benoit Macq
+Luis Ibanez
+Ben Boeckel
+Vincent Nicolas
+Glenn Pearson
+Giuseppe Baruffa
+Arnaud Maye
+Rex Dieter
+David Burken
+Parvatha Elangovan
+Hans Johnson
+Luc Hermitte
--- a/cmake/CTestCustom.cmake.in
+++ b/cmake/CTestCustom.cmake.in
@@ -0,0 +1,37 @@
+#----------------------------------------------------------------------
+#
+# For further details regarding this file,
+# see http://www.cmake.org/Wiki/CMake_Testing_With_CTest#Customizing_CTest
+#
+# and
+# http://www.kitware.com/blog/home/post/27
+#
+#----------------------------------------------------------------------
+
+set(CTEST_CUSTOM_MAXIMUM_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
+  ${CTEST_CUSTOM_COVERAGE_EXCLUDE}
+
+  # Exclude files from the Testing directories
+  ".*/tests/.*"
+
+  # Exclude files from the ThirdParty Utilities directories
+  ".*/thirdparty/.*"
+  )
+
+set(CTEST_CUSTOM_WARNING_EXCEPTION
+  ${CTEST_CUSTOM_WARNING_EXCEPTION}
+
+  # Suppress warning caused by intentional messages about deprecation
+  ".*warning,.* is deprecated"
+  # java also warns about deprecated API
+  ".*java.*deprecation"
+  ".*deprecation.*"
+  # supress warnings caused by 3rd party libs:
+  ".*thirdparty.*"
+  "libtiff.*has no symbols"
+  "libpng.*has no symbols"
+  )
--- a/cmake/EnsureFileInclude.cmake
+++ b/cmake/EnsureFileInclude.cmake
@@ -0,0 +1,26 @@
+# Ensure that an include file is provided by the system
+# Add the check about the mandatory status to the check_include_file macro 
+# provided by cmake
+
+include (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
+
+macro(ensure_file_include INCLUDE_FILENAME VARIABLE_NAME MANDATORY_STATUS)
+
+#message(WARNING "INCLUDE_FILENAME=${INCLUDE_FILENAME} \n"
+#                "VARIABLE_NAME=${VARIABLE_NAME} \n"
+#                "MANDATORY_STATUS=${MANDATORY_STATUS}")
+
+CHECK_INCLUDE_FILE(${INCLUDE_FILENAME} ${VARIABLE_NAME})
+
+#message(WARNING "INCLUDE_FILENAME=${INCLUDE_FILENAME} \n"
+#                "VARIABLE_NAME=${VARIABLE_NAME} \n"
+#                "VARIABLE_NAME_VALUE=${${VARIABLE_NAME}} \n"
+#                "MANDATORY_STATUS=${MANDATORY_STATUS}")
+
+if (NOT ${${VARIABLE_NAME}})
+  if (${MANDATORY_STATUS})
+    message(FATAL_ERROR "The file ${INCLUDE_FILENAME} is mandatory but not found on your system")
+  endif()
+endif()
+
+endmacro()
--- a/cmake/FindCPPCHECK.cmake
+++ b/cmake/FindCPPCHECK.cmake
@@ -0,0 +1,16 @@
+# cppcheck
+#
+#  Copyright (c) 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(CPPCHECK_EXECUTABLE
+  cppcheck
+  )
+
+mark_as_advanced(
+  CPPCHECK_EXECUTABLE
+  )
--- 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()
+	set(FCGI_LIBRARIES)
+	set(FCGI_INCLUDE_DIRS)
+endif()
+
+mark_as_advanced(FCGI_INCLUDE_DIR FCGI_LIBRARY)
--- a/cmake/FindKAKADU.cmake
+++ b/cmake/FindKAKADU.cmake
@@ -0,0 +1,24 @@
+#
+# this module looks for KAKADU
+# http://www.kakadusoftware.com/
+#
+#
+#  Copyright (c) 2006-2014 Mathieu Malaterre <mathieu.malaterre@gmail.com>
+#
+#  Redistribution and use is allowed according to the terms of the New
+#  BSD license.
+#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+
+find_program(KDU_EXPAND_EXECUTABLE
+  kdu_expand
+  )
+
+find_program(KDU_COMPRESS_EXECUTABLE
+  kdu_compress
+  )
+
+mark_as_advanced(
+  KDU_EXPAND_EXECUTABLE
+  KDU_COMPRESS_EXECUTABLE
+  )
--- a/cmake/FindLCMS.cmake
+++ b/cmake/FindLCMS.cmake
@@ -0,0 +1,31 @@
+# - Find LCMS library
+# Find the native LCMS includes and library
+# Once done this will define
+#
+#  LCMS_INCLUDE_DIR    - Where to find lcms.h, etc.
+#  LCMS_LIBRARIES      - Libraries to link against to use LCMS.
+#  LCMS_FOUND          - If false, do not try to use LCMS.
+#
+# also defined, but not for general use are
+#  LCMS_LIBRARY, where to find the LCMS library.
+
+#=============================================================================
+#=============================================================================
+
+find_path(LCMS_INCLUDE_DIR lcms.h  PATHS /usr/include /usr/local/include /opt/include /opt/local/include)
+
+set(LCMS_NAMES ${LCMS_NAMES} lcms liblcms liblcms_static)
+
+find_library(LCMS_LIBRARY NAMES ${LCMS_NAMES} )
+
+mark_as_advanced(LCMS_INCLUDE_DIR LCMS_LIBRARY)
+
+# handle the QUIETLY and REQUIRED arguments and set LCMS_FOUND to TRUE if
+# all listed variables are TRUE
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LCMS  DEFAULT_MSG  LCMS_LIBRARY  LCMS_INCLUDE_DIR)
+
+if(LCMS_FOUND)
+  set( LCMS_INCLUDE_DIRS ${LCMS_INCLUDE_DIR})
+  set( LCMS_LIBRARIES ${LCMS_LIBRARY} )
+endif()
--- a/cmake/FindLCMS2.cmake
+++ b/cmake/FindLCMS2.cmake
@@ -0,0 +1,31 @@
+# - Find LCMS2 library
+# Find the native LCMS2 includes and library
+# Once done this will define
+#
+#  LCMS2_INCLUDE_DIR    - Where to find lcms2.h, etc.
+#  LCMS2_LIBRARIES      - Libraries to link against to use LCMS2.
+#  LCMS2_FOUND          - If false, do not try to use LCMS2.
+#
+# also defined, but not for general use are
+#  LCMS2_LIBRARY        - Where to find the LCMS2 library.
+
+#=============================================================================
+#=============================================================================
+
+find_path(LCMS2_INCLUDE_DIR lcms2.h PATHS /usr/include /usr/local/include /opt/include /opt/local/include)
+
+set(LCMS2_NAMES ${LCMS2_NAMES} lcms2 liblcms2 liblcms2_static)
+
+find_library(LCMS2_LIBRARY NAMES ${LCMS2_NAMES} )
+
+mark_as_advanced(LCMS2_INCLUDE_DIR LCMS2_LIBRARY)
+
+# handle the QUIETLY and REQUIRED arguments and set LCMS2_FOUND to TRUE if
+# all listed variables are TRUE
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LCMS2  DEFAULT_MSG  LCMS2_LIBRARY  LCMS2_INCLUDE_DIR)
+
+if(LCMS2_FOUND)
+  set( LCMS2_INCLUDE_DIRS ${LCMS2_INCLUDE_DIR})
+  set( LCMS2_LIBRARIES ${LCMS2_LIBRARY} )
+endif()
--- a/cmake/JPIPTestDriver.cmake
+++ b/cmake/JPIPTestDriver.cmake
@@ -0,0 +1,9 @@
+# JPIP test driver
+#message(STATUS "${D_URL}")
+file(DOWNLOAD
+  "${D_URL}"
+  "${D_FILE}"
+  LOG log
+  EXPECTED_MD5 "${EXPECTED_MD5}"
+  )
+message(STATUS "LOG: ${log}")
--- a/cmake/OpenJPEGCPack.cmake
+++ b/cmake/OpenJPEGCPack.cmake
@@ -0,0 +1,72 @@
+# package bundler
+if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
+  if(EXISTS "${CMAKE_ROOT}/Modules/InstallRequiredSystemLibraries.cmake")
+    set(CMAKE_INSTALL_MFC_LIBRARIES 0)
+    set(CMAKE_INSTALL_DEBUG_LIBRARIES 0)
+    if(NOT DEFINED CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS)
+      set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON)
+    endif()
+    include(${CMAKE_ROOT}/Modules/InstallRequiredSystemLibraries.cmake)
+  endif()
+
+  set(OPJ_PACKAGE_DESCRIPTION_SUMMARY "OpenJPEG - OpenJPEG a JPEG 2000 implementation.")
+  set(OPJ_PACKAGE_CONTACT "openjpeg users <openjpeg@googlegroups.com>")
+
+  set(CPACK_PACKAGE_DESCRIPTION_SUMMARY ${OPJ_PACKAGE_DESCRIPTION_SUMMARY})
+  set(CPACK_PACKAGE_VENDOR           "OpenJPEG Team")
+  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/LICENSE"
+    "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt" COPYONLY
+    )
+  # For PackageMaker on MacOSX it is important to have a file extension:
+  set(CPACK_PACKAGE_DESCRIPTION_FILE    "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt")
+  set(CPACK_RESOURCE_FILE_LICENSE    "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt")
+  set(CPACK_PACKAGE_VERSION_MAJOR    "${OPENJPEG_VERSION_MAJOR}")
+  set(CPACK_PACKAGE_VERSION_MINOR    "${OPENJPEG_VERSION_MINOR}")
+  set(CPACK_PACKAGE_VERSION_PATCH    "${OPENJPEG_VERSION_BUILD}")
+  set(CPACK_PACKAGE_INSTALL_DIRECTORY "OpenJPEG ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
+  set(CPACK_SOURCE_PACKAGE_FILE_NAME  "openjpeg-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+
+  # Make this explicit here, rather than accepting the CPack default value,
+  # so we can refer to it:
+  set(CPACK_PACKAGE_NAME "${OPENJPEG_LIBRARY_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(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
+    # needed
+    if(CYGWIN)
+      set(CPACK_PACKAGE_FILE_NAME "${CPACK_SOURCE_PACKAGE_FILE_NAME}")
+    else()
+      set(CPACK_PACKAGE_FILE_NAME
+        "${CPACK_SOURCE_PACKAGE_FILE_NAME}-${CPACK_SYSTEM_NAME}")
+    endif()
+  endif()
+
+  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()
+
+  include(CPack)
+endiF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
--- a/cmake/OpenJPEGConfig.cmake.in
+++ b/cmake/OpenJPEGConfig.cmake.in
@@ -0,0 +1,48 @@
+#-----------------------------------------------------------------------------
+#
+# OPENJPEGConfig.cmake - CMake configuration file for external projects.
+#
+# This file is configured by OPENJPEG and used by the UseOPENJPEG.cmake
+# module to load OPENJPEG's settings for an external project.
+@OPENJPEG_CONFIG_INSTALL_ONLY@
+# The OPENJPEG version number.
+set(OPENJPEG_MAJOR_VERSION "@OPENJPEG_VERSION_MAJOR@")
+set(OPENJPEG_MINOR_VERSION "@OPENJPEG_VERSION_MINOR@")
+set(OPENJPEG_BUILD_VERSION "@OPENJPEG_VERSION_BUILD@")
+
+# The libraries.
+set(OPENJPEG_LIBRARIES "@OPENJPEG_LIBRARY_NAME@")
+
+# The CMake macros dir.
+set(OPENJPEG_CMAKE_DIR "@OPENJPEG_INSTALL_PACKAGE_DIR@")
+
+# The configuration options.
+set(OPENJPEG_BUILD_SHARED_LIBS "@BUILD_SHARED_LIBS@")
+
+# The "use" file.
+set(OPENJPEG_USE_FILE "@OPENJPEG_USE_FILE_CONFIG@")
+
+get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
+  # This is an install tree
+  include(${SELF_DIR}/OpenJPEGTargets.cmake)
+  get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE)
+  set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_ROOT})
+
+else()
+  if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake)
+    # This is a build tree
+    set( OPENJPEG_INCLUDE_DIRS @OPENJPEG_INCLUDE_PATH@)
+
+    include(${SELF_DIR}/OpenJPEGExports.cmake)
+
+  else()
+    message(FATAL_ERROR "ooops")
+  endif()
+endif()
+
+set(OPENJPEG_USE_FILE ${SELF_DIR}/UseOPENJPEG.cmake)
+
+# Backward compatible part:
+set(OPENJPEG_FOUND       TRUE)
+
--- a/cmake/TestFileOffsetBits.c
+++ b/cmake/TestFileOffsetBits.c
@@ -0,0 +1,11 @@
+#include <sys/types.h>
+
+/* Cause a compile-time error if off_t is smaller than 64 bits */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+int off_t_is_large[ (LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1 ];  
+
+int main(int argc, char **argv)
+{
+  return 0;
+}
+
--- a/cmake/TestLargeFiles.c.cmake.in
+++ b/cmake/TestLargeFiles.c.cmake.in
@@ -0,0 +1,23 @@
+#cmakedefine _LARGEFILE_SOURCE
+#cmakedefine _LARGE_FILES
+#cmakedefine _FILE_OFFSET_BITS @_FILE_OFFSET_BITS@
+
+#include <sys/types.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int main(int argc, char **argv)
+{
+  /* Cause a compile-time error if off_t is smaller than 64 bits,
+   * and make sure we have ftello / fseeko.
+   */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[ (LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1 ];
+  FILE *fp = fopen(argv[0],"r");
+  off_t offset = ftello( fp );
+
+  fseeko( fp, offset, SEEK_CUR );
+  fclose(fp);
+  return 0;
+}
+
--- a/cmake/TestLargeFiles.cmake
+++ b/cmake/TestLargeFiles.cmake
@@ -0,0 +1,134 @@
+# - Define macro to check large file support
+#
+#  OPJ_TEST_LARGE_FILES(VARIABLE)
+#
+#  VARIABLE will be set to true if off_t is 64 bits, and fseeko/ftello present.
+#  This macro will also defines the necessary variable enable large file support, for instance
+#  _LARGE_FILES
+#  _LARGEFILE_SOURCE
+#  _FILE_OFFSET_BITS 64
+#  OPJ_HAVE_FSEEKO
+#
+#  However, it is YOUR job to make sure these defines are set in a #cmakedefine so they
+#  end up in a config.h file that is included in your source if necessary!
+#
+#  Adapted from Gromacs project (http://www.gromacs.org/)
+#  by Julien Malik
+#
+
+macro(OPJ_TEST_LARGE_FILES VARIABLE)
+    if("${VARIABLE}" MATCHES "^${VARIABLE}$")
+
+        # On most platforms it is probably overkill to first test the flags for 64-bit off_t,
+        # and then separately fseeko. However, in the future we might have 128-bit filesystems
+        # (ZFS), so it might be dangerous to indiscriminately set e.g. _FILE_OFFSET_BITS=64.
+
+        message(STATUS "Checking for 64-bit off_t")
+
+        # First check without any special flags
+        try_compile(FILE64_OK "${PROJECT_BINARY_DIR}"
+                    "${PROJECT_SOURCE_DIR}/cmake/TestFileOffsetBits.c")
+        if(FILE64_OK)
+          message(STATUS "Checking for 64-bit off_t - present")
+       	endif()
+
+        if(NOT FILE64_OK)
+            # Test with _FILE_OFFSET_BITS=64
+            try_compile(FILE64_OK "${PROJECT_BINARY_DIR}"
+                        "${PROJECT_SOURCE_DIR}/cmake/TestFileOffsetBits.c"
+                        COMPILE_DEFINITIONS "-D_FILE_OFFSET_BITS=64" )
+            if(FILE64_OK)
+                message(STATUS "Checking for 64-bit off_t - present with _FILE_OFFSET_BITS=64")
+                set(_FILE_OFFSET_BITS 64)
+            endif()
+        endif()
+
+        if(NOT FILE64_OK)
+            # Test with _LARGE_FILES
+            try_compile(FILE64_OK "${PROJECT_BINARY_DIR}"
+                        "${PROJECT_SOURCE_DIR}/cmake/TestFileOffsetBits.c"
+                        COMPILE_DEFINITIONS "-D_LARGE_FILES" )
+            if(FILE64_OK)
+                message(STATUS "Checking for 64-bit off_t - present with _LARGE_FILES")
+                set(_LARGE_FILES 1)
+            endif()
+        endif()
+	
+        if(NOT FILE64_OK)
+            # Test with _LARGEFILE_SOURCE
+            try_compile(FILE64_OK "${PROJECT_BINARY_DIR}"
+                        "${PROJECT_SOURCE_DIR}/cmake/TestFileOffsetBits.c"
+                        COMPILE_DEFINITIONS "-D_LARGEFILE_SOURCE" )
+            if(FILE64_OK)
+                message(STATUS "Checking for 64-bit off_t - present with _LARGEFILE_SOURCE")
+                set(_LARGEFILE_SOURCE 1)
+            endif()
+        endif()
+
+
+        #if(NOT FILE64_OK)
+        #    # now check for Windows stuff
+        #    try_compile(FILE64_OK "${PROJECT_BINARY_DIR}"
+        #                "${PROJECT_SOURCE_DIR}/cmake/TestWindowsFSeek.c")
+        #    if(FILE64_OK)
+        #        message(STATUS "Checking for 64-bit off_t - present with _fseeki64")
+        #        set(HAVE__FSEEKI64 1)
+        #    endif()
+        #endif()
+
+        if(NOT FILE64_OK)
+            message(STATUS "Checking for 64-bit off_t - not present")
+        endif()
+
+        set(_FILE_OFFSET_BITS ${_FILE_OFFSET_BITS} CACHE INTERNAL "Result of test for needed _FILE_OFFSET_BITS=64")
+        set(_LARGE_FILES      ${_LARGE_FILES}      CACHE INTERNAL "Result of test for needed _LARGE_FILES")
+        set(_LARGEFILE_SOURCE ${_LARGEFILE_SOURCE} CACHE INTERNAL "Result of test for needed _LARGEFILE_SOURCE")
+
+        # Set the flags we might have determined to be required above
+        configure_file("${PROJECT_SOURCE_DIR}/cmake/TestLargeFiles.c.cmake.in"
+                       "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/TestLargeFiles.c")
+
+        message(STATUS "Checking for fseeko/ftello")
+
+	    # Test if ftello/fseeko are	available
+	    try_compile(FSEEKO_COMPILE_OK
+	                "${PROJECT_BINARY_DIR}"
+                    "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/TestLargeFiles.c")
+	
+	    if(FSEEKO_COMPILE_OK)
+            message(STATUS "Checking for fseeko/ftello - present")
+        endif()
+
+        if(NOT FSEEKO_COMPILE_OK)
+                # glibc 2.2 needs _LARGEFILE_SOURCE for fseeko (but not for 64-bit off_t...)
+                try_compile(FSEEKO_COMPILE_OK
+                            "${PROJECT_BINARY_DIR}"
+                            "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/TestLargeFiles.c"
+                            COMPILE_DEFINITIONS "-D_LARGEFILE_SOURCE" )
+
+                if(FSEEKO_COMPILE_OK)
+                    message(STATUS "Checking for fseeko/ftello - present with _LARGEFILE_SOURCE")
+                    set(_LARGEFILE_SOURCE ${_LARGEFILE_SOURCE} CACHE INTERNAL "Result of test for needed _LARGEFILE_SOURCE")
+                endif()
+        endif()
+
+	    if(FSEEKO_COMPILE_OK)
+                set(OPJ_HAVE_FSEEKO ON CACHE INTERNAL "Result of test for fseeko/ftello")
+        else()
+                message(STATUS "Checking for fseeko/ftello - not found")
+                set(OPJ_HAVE_FSEEKO OFF CACHE INTERNAL "Result of test for fseeko/ftello")
+        endif()
+
+	    if(FILE64_OK AND FSEEKO_COMPILE_OK)
+                message(STATUS "Large File support - found")
+                set(${VARIABLE} ON CACHE INTERNAL "Result of test for large file support")
+        else()
+                message(STATUS "Large File support - not found")
+                set(${VARIABLE} OFF CACHE INTERNAL "Result of test for large file support")
+        endif()
+
+    endif()
+endmacro()
+
+
+
--- a/cmake/TestWindowsFSeek.c
+++ b/cmake/TestWindowsFSeek.c
@@ -0,0 +1,11 @@
+
+#include <stdio.h>
+    
+int main()
+{
+  __int64 off=0;
+
+  _fseeki64(NULL, off, SEEK_SET);
+        
+  return 0;
+}
--- a/cmake/openjpeg_valgrind.supp
+++ b/cmake/openjpeg_valgrind.supp
@@ -0,0 +1,39 @@
+
+
+{
+   <Appears with libpng uses with Ubuntu10.04 (hulk)>
+   Memcheck:Cond
+   fun:deflate
+   obj:/lib/libpng12.so.0.42.0
+   obj:/lib/libpng12.so.0.42.0
+   obj:/lib/libpng12.so.0.42.0
+   fun:png_write_row
+   fun:imagetopng
+   fun:main
+}
+{
+   <Appears with libpng uses with Ubuntu10.04 (hulk)>
+   Memcheck:Value8
+   fun:crc32
+   obj:/lib/libpng12.so.0.42.0
+   fun:png_write_chunk
+   obj:/lib/libpng12.so.0.42.0
+   obj:/lib/libpng12.so.0.42.0
+   obj:/lib/libpng12.so.0.42.0
+   obj:/lib/libpng12.so.0.42.0
+   fun:png_write_row
+   fun:imagetopng
+   fun:main
+}
+{
+   <Appears with libpng uses with Ubuntu10.04 (hulk)>
+   Memcheck:Param
+   write(buf)
+   fun:__write_nocancel
+   fun:_IO_file_write@@GLIBC_2.2.5
+   fun:_IO_do_write@@GLIBC_2.2.5
+   fun:_IO_file_close_it@@GLIBC_2.2.5
+   fun:fclose@@GLIBC_2.2.5
+   fun:imagetopng
+   fun:main
+}
--- a/codec/.cvsignore
+++ b/codec/.cvsignore
@@ -1,6 +0,0 @@
-obj
-obj.w32
-bin
-bin.w32
-lib
-lib.w32
--- a/codec/Makefile
+++ b/codec/Makefile
@@ -1,94 +0,0 @@
-# $Id$
-#
-# makefile for OpenJPEG codec
-
-OPENJPEG_DIR = ../libopenjpeg
-
-ifndef DEBUG
-  LDFLAGS = -s -lm
-else
-  LDFLAGS = -lm
-endif
-
-CFLAGS = -Wall -O3 -fno-strength-reduce -fomit-frame-pointer -I$(OPENJPEG_DIR)
-
-OBJ_DIR_W32 = obj.w32
-BIN_DIR_W32 = bin.w32
-LIB_DIR_W32 = $(OPENJPEG_DIR)/lib.w32
-
-ifdef MINGW32
-  CC = i386-mingw32-gcc
-  CFLAGS += -DDONT_HAVE_GETOPT
-  OBJ_DIR = $(OBJ_DIR_W32)
-  BIN_DIR = $(BIN_DIR_W32)
-  LIB_DIR = lib.w32
-  all:	$(BIN_DIR) $(OBJ_DIR) $(LIB_DIR) \
-	$(addprefix $(BIN_DIR)/,j2k_to_image.exe image_to_j2k.exe)
-else
-  CC = gcc
-  OBJ_DIR = obj
-  BIN_DIR = bin
-  LIB_DIR = lib
-  all:	$(BIN_DIR) $(OBJ_DIR) $(LIB_DIR) \
-  	$(addprefix $(BIN_DIR)/,j2k_to_image image_to_j2k)
-endif
-
-ifdef DYNAMIC
-  ifdef MINGW32
-    LIB_OPENJPEG = $(LIB_DIR)/libopenjpeg.dll
-    LDFLAGS += -L$(LIB_DIR) -lopenjpeg
-  else
-    LIB_OPENJPEG = $(OPENJPEG_DIR)/$(LIB_DIR)/libopenjpeg.so
-    LDFLAGS += -L$(OPENJPEG_DIR)/$(LIB_DIR) -lopenjpeg
-  endif
-else
-  LIB_OPENJPEG = $(OPENJPEG_DIR)/$(LIB_DIR)/libopenjpeg.a
-  LDFLAGS += $(LIB_OPENJPEG)
-endif
-
-$(BIN_DIR):
-	mkdir $(BIN_DIR)
-
-$(OBJ_DIR):
-	mkdir $(OBJ_DIR)
-
-$(LIB_DIR):	
-	mkdir $(LIB_DIR)
-
-$(LIB_DIR)/libopenjpeg.dll: $(OPENJPEG_DIR)/$(LIB_DIR)/libopenjpeg.dll
-	ln -sf ../$< $@
-$(OPENJPEG_DIR)/$(LIB_DIR)/libopenjpeg.dll:
-	cd $(OPENJPEG_DIR) && \
-	$(MAKE) $(OBJ_DIR) $(LIB_DIR) $(LIB_DIR)/libopenjpeg.dll
-$(OPENJPEG_DIR)/$(LIB_DIR)/libopenjpeg.a:
-	cd $(OPENJPEG_DIR) && \
-	$(MAKE) $(OBJ_DIR) $(LIB_DIR) $(LIB_DIR)/libopenjpeg.a
-$(OPENJPEG_DIR)/$(LIB_DIR)/libopenjpeg.so:
-	cd $(OPENJPEG_DIR) && \
-	$(MAKE) $(LIB_DIR) $(LIB_DIR)/libopenjpeg.so
-
-$(OBJ_DIR)/%.o:
-	$(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
-
-$(OBJ_DIR)/getopt.o:		compat/getopt.c
-$(OBJ_DIR)/convert.o:		convert.c
-$(OBJ_DIR)/j2k_to_image.o:	j2k_to_image.c
-$(OBJ_DIR)/image_to_j2k.o:	image_to_j2k.c convert.h
-
-J2I_OBJS = $(addprefix $(OBJ_DIR)/,j2k_to_image.o)
-I2J_OBJS = $(addprefix $(OBJ_DIR)/,image_to_j2k.o convert.o)
-
-$(BIN_DIR)/j2k_to_image:	$(J2I_OBJS) $(LIB_OPENJPEG)
-	${CC} -o $@  $(J2I_OBJS) ${LDFLAGS} 
-
-$(BIN_DIR)/image_to_j2k:	$(I2J_OBJS) $(LIB_OPENJPEG)
-	${CC} -o $@  $(I2J_OBJS) ${LDFLAGS} 
-
-$(BIN_DIR)/j2k_to_image.exe:	$(J2I_OBJS) $(LIB_OPENJPEG)
-	${CC} -o $@  $(J2I_OBJS) ${LDFLAGS} 
-
-$(BIN_DIR)/image_to_j2k.exe:	$(I2J_OBJS) $(LIB_OPENJPEG) $(OBJ_DIR)/getopt.o
-	${CC} -o $@  $(I2J_OBJS) ${LDFLAGS} $(OBJ_DIR)/getopt.o
-
-clean:
-	rm -f $(BIN_DIR_W32)/* $(BIN_DIR)/* $(OBJ_DIR_W32)/* $(OBJ_DIR)/*
--- a/codec/compat/getopt.c
+++ b/codec/compat/getopt.c
@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 1987, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* last review : october 29th, 2002 */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getopt.c	8.3 (Berkeley) 4/27/95";
-#endif				/* LIBC_SCCS and not lint */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-int opterr = 1,			/* if error message should be printed */
- optind = 1,			/* index into parent argv vector */
- optopt,			/* character checked for validity */
- optreset;			/* reset getopt */
-char *optarg;			/* argument associated with option */
-
-#define	BADCH	(int)'?'
-#define	BADARG	(int)':'
-#define	EMSG	""
-
-/*
- * getopt --
- *	Parse argc/argv argument vector.
- */
-int getopt(nargc, nargv, ostr)
-int nargc;
-char *const *nargv;
-const char *ostr;
-{
-#  define __progname nargv[0]
-  static char *place = EMSG;	/* option letter processing */
-  char *oli;			/* option letter list index */
-
-  if (optreset || !*place) {	/* update scanning pointer */
-    optreset = 0;
-    if (optind >= nargc || *(place = nargv[optind]) != '-') {
-      place = EMSG;
-      return (-1);
-    }
-    if (place[1] && *++place == '-') {	/* found "--" */
-      ++optind;
-      place = EMSG;
-      return (-1);
-    }
-  }				/* option letter okay? */
-  if ((optopt = (int) *place++) == (int) ':' ||
-      !(oli = strchr(ostr, optopt))) {
-    /*
-     * if the user didn't specify '-' as an option,
-     * assume it means -1.
-     */
-    if (optopt == (int) '-')
-      return (-1);
-    if (!*place)
-      ++optind;
-    if (opterr && *ostr != ':')
-      (void) fprintf(stderr,
-		     "%s: illegal option -- %c\n", __progname, optopt);
-    return (BADCH);
-  }
-  if (*++oli != ':') {		/* don't need argument */
-    optarg = NULL;
-    if (!*place)
-      ++optind;
-  } else {			/* need an argument */
-    if (*place)			/* no white space */
-      optarg = place;
-    else if (nargc <= ++optind) {	/* no arg */
-      place = EMSG;
-      if (*ostr == ':')
-	return (BADARG);
-      if (opterr)
-	(void) fprintf(stderr,
-		       "%s: option requires an argument -- %c\n",
-		       __progname, optopt);
-      return (BADCH);
-    } else			/* white space */
-      optarg = nargv[optind];
-    place = EMSG;
-    ++optind;
-  }
-  return (optopt);		/* dump back option letter */
-}
--- a/codec/convert.c
+++ b/codec/convert.c
@@ -1,950 +0,0 @@
-/*
- * Copyright (c) 2001-2003, David Janssens
- * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2002-2003,  Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
- * 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 <openjpeg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-
-/* -->> -->> -->> -->>
-
-  BMP IMAGE FORMAT
-
- <<-- <<-- <<-- <<-- */
-
-/* UINT2 defines a two byte word */
-typedef unsigned short int UINT2;
-
-/* UINT4 defines a four byte word */
-typedef unsigned long int UINT4;
-
-typedef struct {
-  UINT2 bfType;			/* 'BM' for Bitmap (19776) */
-  UINT4 bfSize;			/* Size of the file        */
-  UINT2 bfReserved1;		/* Reserved : 0            */
-  UINT2 bfReserved2;		/* Reserved : 0            */
-  UINT4 bfOffBits;		/* Offset                  */
-} BITMAPFILEHEADER_t;
-
-typedef struct {
-  UINT4 biSize;			/* Size of the structure in bytes */
-  UINT4 biWidth;		/* Width of the image in pixels */
-  UINT4 biHeight;		/* Heigth of the image in pixels */
-  UINT2 biPlanes;		/* 1 */
-  UINT2 biBitCount;		/* Number of color bits by pixels */
-  UINT4 biCompression;		/* Type of encoding 0: none 1: RLE8 2: RLE4 */
-  UINT4 biSizeImage;		/* Size of the image in bytes */
-  UINT4 biXpelsPerMeter;	/* Horizontal (X) resolution in pixels/meter */
-  UINT4 biYpelsPerMeter;	/* Vertical (Y) resolution in pixels/meter */
-  UINT4 biClrUsed;		/* Number of color used in the image (0: ALL) */
-  UINT4 biClrImportant;		/* Number of important color (0: ALL) */
-} BITMAPINFOHEADER_t;
-
-int bmptoimage(char *filename, j2k_image_t * img, int subsampling_dx,
-	       int subsampling_dy, int Dim[2])
-{
-  FILE *IN;
-  FILE *Compo0 = NULL, *Compo1 = NULL, *Compo2 = NULL;
-  BITMAPFILEHEADER_t File_h;
-  BITMAPINFOHEADER_t Info_h;
-  unsigned char *RGB;
-  unsigned char *table_R, *table_G, *table_B;
-  unsigned int j, w, h, PAD, type = 0;
-
-  int i;
-  int gray_scale = 1, not_end_file = 1; 
-
-  unsigned int line = 0, col = 0;
-  unsigned char v, v2;
-  UINT4 W, H;
-
-  IN = fopen(filename, "rb");
-  if (!IN) {
-    fprintf(stderr,
-	    "\033[0;33mFailed to open %s for reading !!\033[0;39m\n",
-	    filename);
-    return 0;
-  }
-
-  File_h.bfType = getc(IN);
-  File_h.bfType = (getc(IN) << 8) + File_h.bfType;
-
-  if (File_h.bfType != 19778) {
-    fprintf(stderr,"Error, not a BMP file!\n");
-    return 0;
-  } else {
-    /* FILE HEADER */
-    /* ------------- */
-    File_h.bfSize = getc(IN);
-    File_h.bfSize = (getc(IN) << 8) + File_h.bfSize;
-    File_h.bfSize = (getc(IN) << 16) + File_h.bfSize;
-    File_h.bfSize = (getc(IN) << 24) + File_h.bfSize;
-
-    File_h.bfReserved1 = getc(IN);
-    File_h.bfReserved1 = (getc(IN) << 8) + File_h.bfReserved1;
-
-    File_h.bfReserved2 = getc(IN);
-    File_h.bfReserved2 = (getc(IN) << 8) + File_h.bfReserved2;
-
-    File_h.bfOffBits = getc(IN);
-    File_h.bfOffBits = (getc(IN) << 8) + File_h.bfOffBits;
-    File_h.bfOffBits = (getc(IN) << 16) + File_h.bfOffBits;
-    File_h.bfOffBits = (getc(IN) << 24) + File_h.bfOffBits;
-
-    /* INFO HEADER */
-    /* ------------- */
-
-    Info_h.biSize = getc(IN);
-    Info_h.biSize = (getc(IN) << 8) + Info_h.biSize;
-    Info_h.biSize = (getc(IN) << 16) + Info_h.biSize;
-    Info_h.biSize = (getc(IN) << 24) + Info_h.biSize;
-
-    Info_h.biWidth = getc(IN);
-    Info_h.biWidth = (getc(IN) << 8) + Info_h.biWidth;
-    Info_h.biWidth = (getc(IN) << 16) + Info_h.biWidth;
-    Info_h.biWidth = (getc(IN) << 24) + Info_h.biWidth;
-    w = Info_h.biWidth;
-
-    Info_h.biHeight = getc(IN);
-    Info_h.biHeight = (getc(IN) << 8) + Info_h.biHeight;
-    Info_h.biHeight = (getc(IN) << 16) + Info_h.biHeight;
-    Info_h.biHeight = (getc(IN) << 24) + Info_h.biHeight;
-    h = Info_h.biHeight;
-
-    Info_h.biPlanes = getc(IN);
-    Info_h.biPlanes = (getc(IN) << 8) + Info_h.biPlanes;
-
-    Info_h.biBitCount = getc(IN);
-    Info_h.biBitCount = (getc(IN) << 8) + Info_h.biBitCount;
-
-    Info_h.biCompression = getc(IN);
-    Info_h.biCompression = (getc(IN) << 8) + Info_h.biCompression;
-    Info_h.biCompression = (getc(IN) << 16) + Info_h.biCompression;
-    Info_h.biCompression = (getc(IN) << 24) + Info_h.biCompression;
-
-    Info_h.biSizeImage = getc(IN);
-    Info_h.biSizeImage = (getc(IN) << 8) + Info_h.biSizeImage;
-    Info_h.biSizeImage = (getc(IN) << 16) + Info_h.biSizeImage;
-    Info_h.biSizeImage = (getc(IN) << 24) + Info_h.biSizeImage;
-
-    Info_h.biXpelsPerMeter = getc(IN);
-    Info_h.biXpelsPerMeter = (getc(IN) << 8) + Info_h.biXpelsPerMeter;
-    Info_h.biXpelsPerMeter = (getc(IN) << 16) + Info_h.biXpelsPerMeter;
-    Info_h.biXpelsPerMeter = (getc(IN) << 24) + Info_h.biXpelsPerMeter;
-
-    Info_h.biYpelsPerMeter = getc(IN);
-    Info_h.biYpelsPerMeter = (getc(IN) << 8) + Info_h.biYpelsPerMeter;
-    Info_h.biYpelsPerMeter = (getc(IN) << 16) + Info_h.biYpelsPerMeter;
-    Info_h.biYpelsPerMeter = (getc(IN) << 24) + Info_h.biYpelsPerMeter;
-
-    Info_h.biClrUsed = getc(IN);
-    Info_h.biClrUsed = (getc(IN) << 8) + Info_h.biClrUsed;
-    Info_h.biClrUsed = (getc(IN) << 16) + Info_h.biClrUsed;
-    Info_h.biClrUsed = (getc(IN) << 24) + Info_h.biClrUsed;
-
-    Info_h.biClrImportant = getc(IN);
-    Info_h.biClrImportant = (getc(IN) << 8) + Info_h.biClrImportant;
-    Info_h.biClrImportant = (getc(IN) << 16) + Info_h.biClrImportant;
-    Info_h.biClrImportant = (getc(IN) << 24) + Info_h.biClrImportant;
-
-    /* Read the data and store them in the OUT file */
-
-    if (Info_h.biBitCount == 24) {
-      img->x0 = Dim[0];
-      img->y0 = Dim[1];
-      img->x1 =
-	!Dim[0] ? (w - 1) * subsampling_dx + 1 : Dim[0] + (w -
-							   1) *
-	subsampling_dx + 1;
-      img->y1 =
-	!Dim[1] ? (h - 1) * subsampling_dy + 1 : Dim[1] + (h -
-							   1) *
-	subsampling_dy + 1;
-      img->numcomps = 3;
-      img->color_space = 1;
-      img->comps =
-	(j2k_comp_t *) malloc(img->numcomps * sizeof(j2k_comp_t));
-      for (i = 0; i < img->numcomps; i++) {
-	img->comps[i].prec = 8;
-	img->comps[i].bpp = 8;
-	img->comps[i].sgnd = 0;
-	img->comps[i].dx = subsampling_dx;
-	img->comps[i].dy = subsampling_dy;
-      }
-      Compo0 = fopen("Compo0", "wb");
-      if (!Compo0) {
-	fprintf(stderr,
-		"\033[0;33mFailed to open Compo0 for writing !\033[0;39m\n");
-      }
-      Compo1 = fopen("Compo1", "wb");
-      if (!Compo1) {
-	fprintf(stderr,
-		"\033[0;33mFailed to open Compo1 for writing !\033[0;39m\n");
-      }
-      Compo2 = fopen("Compo2", "wb");
-      if (!Compo2) {
-	fprintf(stderr,
-		"\033[0;33mFailed to open Compo2 for writing !\033[0;39m\n");
-      }
-
-      /* Place the cursor at the beginning of the image information */
-      fseek(IN, 0, SEEK_SET);
-      fseek(IN, File_h.bfOffBits, SEEK_SET);
-
-      W = Info_h.biWidth;
-      H = Info_h.biHeight;
-
-      // PAD = 4 - (3 * W) % 4;
-      // PAD = (PAD == 4) ? 0 : PAD;
-      PAD = (3 * W) % 4 ? 4 - (3 * W) % 4 : 0;
-
-
-      RGB =
-	(unsigned char *) malloc((3 * W + PAD) * H *
-				 sizeof(unsigned char));
-
-      fread(RGB, sizeof(unsigned char), (3 * W + PAD) * H, IN);
-
-      for (j = 0; j < (3 * W + PAD) * H; j++) {
-	unsigned char elmt;
-	int Wp = 3 * W + PAD;
-
-	elmt = RGB[(H - (j / Wp + 1)) * Wp + j % Wp];
-	if ((j % Wp) < (3 * W)) {
-	  switch (type) {
-	  case 0:
-	    fprintf(Compo2, "%c", elmt);
-	    type = 1;
-	    break;
-	  case 1:
-	    fprintf(Compo1, "%c", elmt);
-	    type = 2;
-	    break;
-	  case 2:
-	    fprintf(Compo0, "%c", elmt);
-	    type = 0;
-	    break;
-	  }
-	}
-      }
-
-      fclose(Compo0);
-      fclose(Compo1);
-      fclose(Compo2);
-      free(RGB);
-    } else if (Info_h.biBitCount == 8 && Info_h.biCompression == 0) {
-      img->x0 = Dim[0];
-      img->y0 = Dim[1];
-      img->x1 =
-	!Dim[0] ? (w - 1) * subsampling_dx + 1 : Dim[0] + (w -
-							   1) *
-	subsampling_dx + 1;
-      img->y1 =
-	!Dim[1] ? (h - 1) * subsampling_dy + 1 : Dim[1] + (h -
-							   1) *
-	subsampling_dy + 1;
-
-      table_R = (unsigned char *) malloc(256 * sizeof(unsigned char));
-      table_G = (unsigned char *) malloc(256 * sizeof(unsigned char));
-      table_B = (unsigned char *) malloc(256 * sizeof(unsigned char));
-
-      for (j = 0; j < Info_h.biClrUsed; j++) {
-	table_B[j] = getc(IN);
-	table_G[j] = getc(IN);
-	table_R[j] = getc(IN);
-	getc(IN);
-	if (table_R[j] != table_G[j] && table_R[j] != table_B[j]
-	    && table_G[j] != table_B[j])
-	  gray_scale = 0;
-      }
-
-      /* Place the cursor at the beginning of the image information */
-      fseek(IN, 0, SEEK_SET);
-      fseek(IN, File_h.bfOffBits, SEEK_SET);
-
-      W = Info_h.biWidth;
-      H = Info_h.biHeight;
-      if (Info_h.biWidth % 2)
-	W++;
-
-      RGB = (unsigned char *) malloc(W * H * sizeof(unsigned char));
-
-      fread(RGB, sizeof(unsigned char), W * H, IN);
-      if (gray_scale) {
-	img->numcomps = 1;
-	img->comps =
-	  (j2k_comp_t *) malloc(img->numcomps * sizeof(j2k_comp_t));
-	img->comps[0].prec = 8;
-	img->comps[0].bpp = 8;
-	img->comps[0].sgnd = 0;
-	img->comps[0].dx = subsampling_dx;
-	img->comps[0].dy = subsampling_dy;
-	Compo0 = fopen("Compo0", "wb");
-	if (!Compo0) {
-	  fprintf(stderr,
-		  "\033[0;33mFailed to open Compo0 for writing !\033[0;39m\n");
-	}
-	for (j = 0; j < W * H; j++) {
-	  if ((j % W < W - 1 && Info_h.biWidth % 2)
-	      || !(Info_h.biWidth % 2))
-	    fprintf(Compo0, "%c",
-		    table_R[RGB[W * H - ((j) / (W) + 1) * W + (j) % (W)]]);
-	}
-	fclose(Compo0);
-      } else {
-	img->numcomps = 3;
-	img->comps =
-	  (j2k_comp_t *) malloc(img->numcomps * sizeof(j2k_comp_t));
-	for (i = 0; i < img->numcomps; i++) {
-	  img->comps[i].prec = 8;
-	  img->comps[i].bpp = 8;
-	  img->comps[i].sgnd = 0;
-	  img->comps[i].dx = subsampling_dx;
-	  img->comps[i].dy = subsampling_dy;
-	}
-
-	Compo0 = fopen("Compo0", "wb");
-	if (!Compo0) {
-	  fprintf(stderr,
-		  "\033[0;33mFailed to open Compo0 for writing !\033[0;39m\n");
-	}
-	Compo1 = fopen("Compo1", "wb");
-	if (!Compo1) {
-	  fprintf(stderr,
-		  "\033[0;33mFailed to open Compo1 for writing !\033[0;39m\n");
-	}
-	Compo2 = fopen("Compo2", "wb");
-	if (!Compo2) {
-	  fprintf(stderr,
-		  "\033[0;33mFailed to open Compo2 for writing !\033[0;39m\n");
-	}
-
-	for (j = 0; j < W * H; j++) {
-	  if ((j % W < W - 1 && Info_h.biWidth % 2)
-	      || !(Info_h.biWidth % 2)) {
-	    fprintf(Compo0, "%c",
-		    table_R[RGB[W * H - ((j) / (W) + 1) * W + (j) % (W)]]);
-	    fprintf(Compo1, "%c",
-		    table_G[RGB[W * H - ((j) / (W) + 1) * W + (j) % (W)]]);
-	    fprintf(Compo2, "%c",
-		    table_B[RGB[W * H - ((j) / (W) + 1) * W + (j) % (W)]]);
-	  }
-
-	}
-	fclose(Compo0);
-	fclose(Compo1);
-	fclose(Compo2);
-      }
-      free(RGB);
-
-    } else if (Info_h.biBitCount == 8 && Info_h.biCompression == 1) {
-      img->x0 = Dim[0];
-      img->y0 = Dim[1];
-      img->x1 =
-	!Dim[0] ? (w - 1) * subsampling_dx + 1 : Dim[0] + (w -
-							   1) *
-	subsampling_dx + 1;
-      img->y1 =
-	!Dim[1] ? (h - 1) * subsampling_dy + 1 : Dim[1] + (h -
-							   1) *
-	subsampling_dy + 1;
-
-      table_R = (unsigned char *) malloc(256 * sizeof(unsigned char));
-      table_G = (unsigned char *) malloc(256 * sizeof(unsigned char));
-      table_B = (unsigned char *) malloc(256 * sizeof(unsigned char));
-
-      for (j = 0; j < Info_h.biClrUsed; j++) {
-	table_B[j] = getc(IN);
-	table_G[j] = getc(IN);
-	table_R[j] = getc(IN);
-	getc(IN);
-	if (table_R[j] != table_G[j] && table_R[j] != table_B[j]
-	    && table_G[j] != table_B[j])
-	  gray_scale = 0;
-      }
-
-      /* Place the cursor at the beginning of the image information */
-      fseek(IN, 0, SEEK_SET);
-      fseek(IN, File_h.bfOffBits, SEEK_SET);
-
-      if (gray_scale) {
-	img->numcomps = 1;
-	img->comps = (j2k_comp_t *) malloc(sizeof(j2k_comp_t));
-	img->comps[0].prec = 8;
-	img->comps[0].bpp = 8;
-	img->comps[0].sgnd = 0;
-	img->comps[0].dx = subsampling_dx;
-	img->comps[0].dy = subsampling_dy;
-	Compo0 = fopen("Compo0", "wb");
-	if (!Compo0) {
-	  fprintf(stderr,
-		  "\033[0;33mFailed to open Compo0 for writing !\033[0;39m\n");
-	}
-      } else {
-	img->numcomps = 3;
-	img->comps =
-	  (j2k_comp_t *) malloc(img->numcomps * sizeof(j2k_comp_t));
-	for (i = 0; i < img->numcomps; i++) {
-	  img->comps[i].prec = 8;
-	  img->comps[i].bpp = 8;
-	  img->comps[i].sgnd = 0;
-	  img->comps[i].dx = subsampling_dx;
-	  img->comps[i].dy = subsampling_dy;
-	}
-	Compo0 = fopen("Compo0", "wb");
-	if (!Compo0) {
-	  fprintf(stderr,
-		  "\033[0;33mFailed to open Compo0 for writing !\033[0;39m\n");
-	}
-	Compo1 = fopen("Compo1", "wb");
-	if (!Compo1) {
-	  fprintf(stderr,
-		  "\033[0;33mFailed to open Compo1 for writing !\033[0;39m\n");
-	}
-	Compo2 = fopen("Compo2", "wb");
-	if (!Compo2) {
-	  fprintf(stderr,
-		  "\033[0;33mFailed to open Compo2 for writing !\033[0;39m\n");
-	}
-      }
-
-      RGB =
-	(unsigned char *) malloc(Info_h.biWidth * Info_h.biHeight *
-				 sizeof(unsigned char));
-
-      while (not_end_file) {
-	v = getc(IN);
-	if (v) {
-	  v2 = getc(IN);
-	  for (i = 0; i < (int) v; i++) {
-	    RGB[line * Info_h.biWidth + col] = v2;
-	    col++;
-	  }
-	} else {
-	  v = getc(IN);
-	  switch (v) {
-	  case 0:
-	    col = 0;
-	    line++;
-	    break;
-	  case 1:
-	    line++;
-	    not_end_file = 0;
-	    break;
-	  case 2:
-	    fprintf(stderr,"No Delta supported\n");
-	    return 1;
-	    break;
-	  default:
-	    for (i = 0; i < v; i++) {
-	      v2 = getc(IN);
-	      RGB[line * Info_h.biWidth + col] = v2;
-	      col++;
-	    }
-	    if (v % 2)
-	      v2 = getc(IN);
-	  }
-	}
-      }
-      if (gray_scale) {
-	for (line = 0; line < Info_h.biHeight; line++)
-	  for (col = 0; col < Info_h.biWidth; col++)
-	    fprintf(Compo0, "%c", table_R[(int)
-					  RGB[(Info_h.biHeight - line -
-					       1) * Info_h.biWidth +
-					      col]]);
-	fclose(Compo0);
-      } else {
-	for (line = 0; line < Info_h.biHeight; line++)
-	  for (col = 0; col < Info_h.biWidth; col++) {
-	    fprintf(Compo0, "%c", table_R[(int)
-					  RGB[(Info_h.biHeight - line -
-					       1) * Info_h.biWidth +
-					      col]]);
-	    fprintf(Compo1, "%c", table_G[(int)
-					  RGB[(Info_h.biHeight - line -
-					       1) * Info_h.biWidth +
-					      col]]);
-	    fprintf(Compo2, "%c", table_B[(int)
-					  RGB[(Info_h.biHeight - line -
-					       1) * Info_h.biWidth +
-					      col]]);
-	  }
-	fclose(Compo0);
-	fclose(Compo1);
-	fclose(Compo2);
-      }
-      free(RGB);
-    } else
-      fprintf(stderr,
-	      "Other system than 24 bits/pixels or 8 bits (no RLE coding) is not yet implemented [%d]\n",
-	      Info_h.biBitCount);
-
-    fclose(IN);
-    return 1;
-  }
-}
-
-	/* -->> -->> -->> -->>
-
-	   PGX IMAGE FORMAT
-
-	   <<-- <<-- <<-- <<-- */
-
-
-unsigned char readuchar(FILE * f)
-{
-  unsigned char c1;
-  fread(&c1, 1, 1, f);
-  return c1;
-}
-
-unsigned short readushort(FILE * f, int bigendian)
-{
-  unsigned char c1, c2;
-  fread(&c1, 1, 1, f);
-  fread(&c2, 1, 1, f);
-  if (bigendian)
-    return (c1 << 8) + c2;
-  else
-    return (c2 << 8) + c1;
-}
-
-unsigned int readuint(FILE * f, int bigendian)
-{
-  unsigned char c1, c2, c3, c4;
-  fread(&c1, 1, 1, f);
-  fread(&c2, 1, 1, f);
-  fread(&c3, 1, 1, f);
-  fread(&c4, 1, 1, f);
-  if (bigendian)
-    return (c1 << 24) + (c2 << 16) + (c3 << 8) + c4;
-  else
-    return (c4 << 24) + (c3 << 16) + (c2 << 8) + c1;
-}
-
-int pgxtoimage(char *filename, j2k_image_t * img, int tdy,
-	       int subsampling_dx, int subsampling_dy, int Dim[2],
-	       j2k_cp_t cp)
-{
-  FILE *f;
-  int w, h, prec;
-  int i, compno, bandno;
-  char str[256]; 
-
-  char endian1,endian2,sign;
-  char signtmp[32];
-
-  char temp[32];
-  int bigendian;
-  j2k_comp_t *comp;
-
-  img->numcomps = 1;
-  img->color_space = 2;
-  img->comps = (j2k_comp_t *) malloc(img->numcomps * sizeof(j2k_comp_t));
-  for (compno = 0; compno < img->numcomps; compno++) {
-    FILE *src;
-    char tmp[16];
-    int max = 0;
-    int Y1;
-
-
-    comp = &img->comps[compno];
-    sprintf(str, "%s", filename);
-    
-
-    f = fopen(str, "rb");
-    if (!f) {
-      fprintf(stderr, "Failed to open %s for reading !\n", str);
-      return 0;
-    }
-
-
-
-    fseek(f, 0, SEEK_SET);
-
-    fscanf(f, "PG%[ \t]%c%c%[ \t+-]%d%[ \t]%d%[ \t]%d",temp,&endian1,&endian2,signtmp,&prec,temp,&w,temp,&h);
-
-    
-
-    i=0;
-
-    sign='+';
-
-    while (signtmp[i]!='\0') {
-
-      if (signtmp[i]=='-') sign='-';
-
-      i++;
-
-    }
-
-    
-
-    fgetc(f);
-    if (endian1=='M' && endian2=='L')
-      bigendian = 1;
-    else if (endian2=='M' && endian1=='L')
-      bigendian = 0;
-
-    else {
-
-      fprintf(stderr, "Bad pgx header, please check input file\n");
-
-      return 0;
-
-    }
-
-
-    if (compno == 0) {
-      img->x0 = Dim[0];
-      img->y0 = Dim[1];
-      img->x1 =
-	!Dim[0] ? (w - 1) * subsampling_dx + 1 : Dim[0] + (w -
-	1) *
-	subsampling_dx + 1;
-      img->y1 =
-	!Dim[1] ? (h - 1) * subsampling_dy + 1 : Dim[1] + (h -
-	1) *
-	subsampling_dy + 1;
-    } else {
-      if (w != img->x1 || h != img->y1)
-	return 0;
-    }
-    
-    if (sign == '-') {
-      comp->sgnd = 1;
-    } else {
-      comp->sgnd = 0;
-    }
-    comp->prec = prec;
-    comp->dx = subsampling_dx;
-    comp->dy = subsampling_dy;
-    bandno = 1;
-    
-    Y1 = cp.ty0 + bandno * cp.tdy <
-      img->y1 ? cp.ty0 + bandno * cp.tdy : img->y1;
-    Y1 -= img->y0;
-    
-    sprintf(tmp, "bandtile%d", bandno);	/* bandtile file */
-    src = fopen(tmp, "wb");
-    if (!src) {
-      fprintf(stderr, "failed to open %s for writing !\n", tmp);
-    }
-    for (i = 0; i < w * h; i++) {
-      int v;
-      if (i == Y1 * w / subsampling_dy && tdy != -1) {	/* bandtile is full */
-	fclose(src);
-	bandno++;
-	sprintf(tmp, "bandtile%d", bandno);
-	src = fopen(tmp, "wb");
-	if (!src) {
-	  fprintf(stderr, "failed to open %s for writing !\n", tmp);
-	}
-	Y1 = cp.ty0 + bandno * cp.tdy <
-	  img->y1 ? cp.ty0 + bandno * cp.tdy : img->y1;
-	Y1 -= img->y0;
-      }
-      if (comp->prec <= 8) {
-	if (!comp->sgnd) {
-	  v = readuchar(f);
-	} else {
-	  v = (char) readuchar(f);
-	}
-      } else if (comp->prec <= 16) {
-	if (!comp->sgnd) {
-	  v = readushort(f, bigendian);
-	} else {
-	  v = (short) readushort(f, bigendian);
-	}
-      } else {
-	if (!comp->sgnd) {
-	  v = readuint(f, bigendian);
-	} else {
-	  v = (int) readuint(f, bigendian);
-	}
-      }
-      if (v > max)
-	max = v;
-      fprintf(src, "%d ", v);
-    }
-    fclose(f);
-    fclose(src);
-    comp->bpp = int_floorlog2(max) + 1;
-  }
-  return 1;
-}
-
-/* -->> -->> -->> -->>
-
-  PNM IMAGE FORMAT
-
- <<-- <<-- <<-- <<-- */
-
-int pnmtoimage(char *filename, j2k_image_t * img, int subsampling_dx,
-	       int subsampling_dy, int Dim[2])
-{
-  FILE *f;
-  FILE *Compo0, *Compo1, *Compo2;
-  int w, h;
-  int i;
-  char value;
-  char comment[256];
-
-  f = fopen(filename, "rb");
-  if (!f) {
-    fprintf(stderr,
-	    "\033[0;33mFailed to open %s for reading !!\033[0;39m\n",
-	    filename);
-    return 0;
-  }
-
-  if (fgetc(f) != 'P')
-    return 0;
-  value = fgetc(f);
-
-  if (value == '2') {
-    fgetc(f);
-    if (fgetc(f) == '#') {
-      fseek(f, 0, SEEK_SET);
-      fscanf(f, "P2\n");
-      fgets(comment, 256, f);
-      fscanf(f, "%d %d\n255", &w, &h);
-    } else {
-      fseek(f, 0, SEEK_SET);
-      fscanf(f, "P2\n%d %d\n255", &w, &h);
-    }
-
-    fgetc(f);
-    img->x0 = Dim[0];
-    img->y0 = Dim[1];
-    img->x1 =
-      !Dim[0] ? (w - 1) * subsampling_dx + 1 : Dim[0] + (w -
-							 1) *
-      subsampling_dx + 1;
-    img->y1 =
-      !Dim[1] ? (h - 1) * subsampling_dy + 1 : Dim[1] + (h -
-							 1) *
-      subsampling_dy + 1;
-
-    img->numcomps = 1;
-    img->color_space = 2;
-    img->comps = (j2k_comp_t *) malloc(sizeof(j2k_comp_t));
-    img->comps[0].prec = 8;
-    img->comps[0].bpp = 8;
-    img->comps[0].sgnd = 0;
-    img->comps[0].dx = subsampling_dx;
-    img->comps[0].dy = subsampling_dy;
-
-    Compo0 = fopen("Compo0", "wb");
-    if (!Compo0) {
-      fprintf(stderr,
-	      "\033[0;33mFailed to open Compo0 for writing !\033[0;39m\n");
-    }
-    for (i = 0; i < w * h; i++) {
-      unsigned int l;
-      fscanf(f, "%d", &l);
-      fprintf(Compo0, "%c", l);
-    }
-    fclose(Compo0);
-  } else if (value == '5') {
-    fgetc(f);
-    if (fgetc(f) == '#') {
-      fseek(f, 0, SEEK_SET);
-      fscanf(f, "P5\n");
-      fgets(comment, 256, f);
-      fscanf(f, "%d %d\n255", &w, &h);
-    } else {
-      fseek(f, 0, SEEK_SET);
-      fscanf(f, "P5\n%d %d\n255", &w, &h);
-    }
-
-    fgetc(f);
-    img->x0 = Dim[0];
-    img->y0 = Dim[1];
-    img->x1 =
-      !Dim[0] ? (w - 1) * subsampling_dx + 1 : Dim[0] + (w -
-							 1) *
-      subsampling_dx + 1;
-    img->y1 =
-      !Dim[1] ? (h - 1) * subsampling_dy + 1 : Dim[1] + (h -
-							 1) *
-      subsampling_dy + 1;
-
-    img->numcomps = 1;
-    img->color_space = 2;
-    img->comps = (j2k_comp_t *) malloc(sizeof(j2k_comp_t));
-    img->comps[0].prec = 8;
-    img->comps[0].bpp = 8;
-    img->comps[0].sgnd = 0;
-    img->comps[0].dx = subsampling_dx;
-    img->comps[0].dy = subsampling_dy;
-    Compo0 = fopen("Compo0", "wb");
-    if (!Compo0) {
-      fprintf(stderr,
-	      "\033[0;33mFailed to open Compo0 for writing !\033[0;39m\n");
-    }
-    for (i = 0; i < w * h; i++) {
-      unsigned char l;
-      fread(&l, 1, 1, f);
-      fwrite(&l, 1, 1, Compo0);
-    }
-    fclose(Compo0);
-  } else if (value == '3') {
-    fgetc(f);
-    if (fgetc(f) == '#') {
-      fseek(f, 0, SEEK_SET);
-      fscanf(f, "P3\n");
-      fgets(comment, 256, f);
-      fscanf(f, "%d %d\n255", &w, &h);
-    } else {
-      fseek(f, 0, SEEK_SET);
-      fscanf(f, "P3\n%d %d\n255", &w, &h);
-    }
-
-    fgetc(f);
-    img->x0 = Dim[0];
-    img->y0 = Dim[1];
-    img->x1 =
-      !Dim[0] ? (w - 1) * subsampling_dx + 1 : Dim[0] + (w -
-							 1) *
-      subsampling_dx + 1;
-    img->y1 =
-      !Dim[1] ? (h - 1) * subsampling_dy + 1 : Dim[1] + (h -
-							 1) *
-      subsampling_dy + 1;
-    img->numcomps = 3;
-    img->color_space = 1;
-    img->comps = (j2k_comp_t *) malloc(img->numcomps * sizeof(j2k_comp_t));
-    for (i = 0; i < img->numcomps; i++) {
-      img->comps[i].prec = 8;
-      img->comps[i].bpp = 8;
-      img->comps[i].sgnd = 0;
-      img->comps[i].dx = subsampling_dx;
-      img->comps[i].dy = subsampling_dy;
-    }
-    Compo0 = fopen("Compo0", "wb");
-    if (!Compo0) {
-      fprintf(stderr,
-	      "\033[0;33mFailed to open Compo0 for writing !\033[0;39m\n");
-    }
-
-    Compo1 = fopen("Compo1", "wb");
-    if (!Compo1) {
-      fprintf(stderr,
-	      "\033[0;33mFailed to open Compo1 for writing !\033[0;39m\n");
-    }
-
-    Compo2 = fopen("Compo2", "wb");
-    if (!Compo2) {
-      fprintf(stderr,
-	      "\033[0;33mFailed to open Compo2 for writing !\033[0;39m\n");
-    }
-
-    for (i = 0; i < w * h; i++) {
-      unsigned int r, g, b;
-      fscanf(f, "%d", &r);
-      fscanf(f, "%d", &g);
-      fscanf(f, "%d", &b);
-      fprintf(Compo0, "%c", r);
-      fprintf(Compo1, "%c", g);
-      fprintf(Compo2, "%c", b);
-    }
-    fclose(Compo0);
-    fclose(Compo1);
-    fclose(Compo2);
-  } else if (value == '6') {
-    fgetc(f);
-    if (fgetc(f) == '#') {
-      fseek(f, 0, SEEK_SET);
-      fscanf(f, "P6\n");
-      fgets(comment, 256, f);
-      fscanf(f, "%d %d\n255", &w, &h);
-    } else {
-      fseek(f, 0, SEEK_SET);
-      fscanf(f, "P6\n%d %d\n255", &w, &h);
-    }
-
-    fgetc(f);
-    img->x0 = Dim[0];
-    img->y0 = Dim[1];
-    img->x1 =
-      !Dim[0] ? (w - 1) * subsampling_dx + 1 : Dim[0] + (w -
-							 1) *
-      subsampling_dx + 1;
-    img->y1 =
-      !Dim[1] ? (h - 1) * subsampling_dy + 1 : Dim[1] + (h -
-							 1) *
-      subsampling_dy + 1;
-    img->numcomps = 3;
-    img->color_space = 1;
-    img->comps = (j2k_comp_t *) malloc(img->numcomps * sizeof(j2k_comp_t));
-    for (i = 0; i < img->numcomps; i++) {
-      img->comps[i].prec = 8;
-      img->comps[i].bpp = 8;
-      img->comps[i].sgnd = 0;
-      img->comps[i].dx = subsampling_dx;
-      img->comps[i].dy = subsampling_dy;
-    }
-    Compo0 = fopen("Compo0", "wb");
-    if (!Compo0) {
-      fprintf(stderr,
-	      "\033[0;33mFailed to open Compo0 for writing !\033[0;39m\n");
-    }
-
-    Compo1 = fopen("Compo1", "wb");
-    if (!Compo1) {
-      fprintf(stderr,
-	      "\033[0;33mFailed to open Compo1 for writing !\033[0;39m\n");
-    }
-
-    Compo2 = fopen("Compo2", "wb");
-    if (!Compo2) {
-      fprintf(stderr,
-	      "\033[0;33mFailed to open Compo2 for writing !\033[0;39m\n");
-    }
-
-    for (i = 0; i < w * h; i++) {
-      unsigned char r, g, b;
-      fread(&r, 1, 1, f);
-      fread(&g, 1, 1, f);
-      fread(&b, 1, 1, f);
-      fwrite(&r, 1, 1, Compo0);
-      fwrite(&g, 1, 1, Compo1);
-      fwrite(&b, 1, 1, Compo2);
-    }
-    fclose(Compo0);
-    fclose(Compo1);
-    fclose(Compo2);
-  } else {
-    return 0;
-  }
-  fclose(f);
-  return 1;
-}
--- a/codec/image_to_j2k.c
+++ b/codec/image_to_j2k.c
--- a/codec/image_to_j2k.dsp
+++ b/codec/image_to_j2k.dsp
@@ -1,249 +0,0 @@
-# Microsoft Developer Studio Project File - Name="image_to_j2k" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=image_to_j2k - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "image_to_j2k.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "image_to_j2k.mak" CFG="image_to_j2k - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "image_to_j2k - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "image_to_j2k - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "image_to_j2k - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../libopenjpeg" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "DONT_HAVE_GETOPT" /YX /FD /c
-# ADD BASE RSC /l 0x80c /d "NDEBUG"
-# ADD RSC /l 0x80c /i "../libopenjpeg" /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "image_to_j2k - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../libopenjpeg" /D "_DEBUG" /D "DONT_HAVE_GETOPT" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x80c /d "_DEBUG"
-# ADD RSC /l 0x80c /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "image_to_j2k - Win32 Release"
-# Name "image_to_j2k - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\libopenjpeg\bio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\cio.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\convert.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\dwt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\fix.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\compat\getopt.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\image_to_j2k.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\int.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\j2k.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\jp2.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\jpt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\mct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\mqc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\pi.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\raw.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\t1.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\t2.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\tcd.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\tgt.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\libopenjpeg\bio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\cio.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\convert.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\dwt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\fix.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\compat\getopt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\int.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\j2k.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\jp2.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\jpt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\mct.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\mqc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\openjpeg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\pi.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\raw.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\t1.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\t2.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\tcd.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\tgt.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
--- a/codec/j2k_to_image.c
+++ b/codec/j2k_to_image.c
@@ -1,746 +0,0 @@
-/* Copyright (c) 2001 David Janssens
-* Copyright (c) 2002-2003 Yannick Verschueren
-* Copyright (c) 2002-2003 Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
-* 
-* 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.
-*/
-
-
-
-//MEMORY LEAK
-
-#ifdef _DEBUG
-
-#define _CRTDBG_MAP_ALLOC
-
-#include <stdlib.h>  // Must be included first
-
-#include <crtdbg.h>
-
-#endif
-
-//MEM
-
-
-
-#include <openjpeg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#ifndef DONT_HAVE_GETOPT
-#include <getopt.h>
-#else
-#include "compat/getopt.h"
-#endif
-
-void usage_display(char *prgm)
-{
-  fprintf(stdout,"Usage:\n");
-  fprintf(stdout,"  %s...\n",prgm);
-  fprintf(stdout,"  -i <compressed file>\n");
-  fprintf(stdout,"    REQUIRED\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 <decompressed file>\n");
-  fprintf(stdout,"    REQUIRED\n");
-  fprintf(stdout,"    Currently accepts PGM-files, PPM-files, PNM-files, PGX-files and\n");
-  fprintf(stdout,"    BMP-files. Binary data is written to the file (not ascii). If a PGX\n");
-  fprintf(stdout,"    filename is given, there will be as many output files as there are\n");
-  fprintf(stdout,"    components: an indice starting from 0 will then be appended to the\n");
-  fprintf(stdout,"    output filename, just before the \"pgx\" extension. If a PGM filename\n");
-  fprintf(stdout,"    is given and there are more than one component, only the first component\n");
-  fprintf(stdout,"    will be written to the file.\n");
-  fprintf(stdout,"  -r <reduce factor>\n");
-  fprintf(stdout,"    Set the number of highest resolution levels to be discarded. The\n");
-  fprintf(stdout,"    image resolution is effectively divided by 2 to the power of the\n");
-  fprintf(stdout,"    number of discarded levels. The reduce factor is limited by the\n");
-  fprintf(stdout,"    smallest total number of decomposition levels among tiles.\n");
-  fprintf(stdout,"  -l <number of quality layers to decode>\n");
-  fprintf(stdout,"    Set the maximum number of quality layers to decode. If there are\n");
-  fprintf(stdout,"    less quality layers than the specified number, all the quality layers\n");
-  fprintf(stdout,"    are decoded.\n");
-  fprintf(stdout,"  -u\n");
-  fprintf(stdout,"    print an usage statement\n");
-  fprintf(stdout,"\n");
-}
-
-int main(int argc, char **argv)
-{
-  FILE *fsrc=NULL;
-  FILE *fdest=NULL;
-  char *infile=NULL;
-  char *outfile=NULL;
-  char *tmp=NULL;
-  char S1, S2, S3;
-  
-  char *src=NULL; 
-  
-  int len;
-  
-  j2k_image_t img;
-  j2k_cp_t cp;
-  jp2_struct_t *jp2_struct=NULL;
-  
-  int w, wr, wrr, h, hr, hrr, max;
-  int i, compno, pad, j;
-  int adjust;
-  
-  cp.layer=0;
-  cp.reduce=0;
-  cp.decod_format=-1;
-  cp.cod_format=-1;
-  
-  while (1) {
-    int c = getopt(argc, argv,"i:o:r:l:u");
-    if (c == -1)
-      break;
-    switch (c) {
-      
-      //Input file
-    case 'i':
-      infile = optarg;
-      tmp = optarg;
-      while (*tmp) {
-	tmp++;
-      }
-      tmp--;
-      S3 = *tmp;
-      tmp--;
-      S2 = *tmp;
-      tmp--;
-      S1 = *tmp;
-      
-      /* J2K format */
-      if ((S1 == 'j' && S2 == '2' && S3 == 'k')
-	|| (S1 == 'J' && S2 == '2' && S3 == 'K') 
-	|| (S1 == 'j' && S2 == '2' && S3 == 'c')
-	|| (S1 == 'J' && S2 == '2' && S3 == 'C')) {
-	cp.cod_format=J2K_CFMT;
-	break;
-      }
-      
-      /* JP2 format */
-      if ((S1 == 'j' && S2 == 'p' && S3 == '2')
-	|| (S1 == 'J' && S2 == 'P' && S3 == '2')) {
-	cp.cod_format=JP2_CFMT;
-	break;
-      }
-      
-      /* JPT format */
-      if ((S1 == 'j' && S2 == 'p' && S3 == 't')
-	|| (S1 == 'J' && S2 == 'P' && S3 == 'T')) {
-	cp.cod_format=JPT_CFMT;
-	break;
-      }
-      
-      fprintf(stderr,
-	"j2k_to_image : Unknown input image format *.%c%c%c [only *.j2k, *.jp2, *.jpc or *.jpt]!! \n",
-	S1, S2, S3);
-      return 1;
-      break;
-      
-      /* ----------------------------------------------------- */
-      
-      //Output file
-    case 'o':
-      outfile = optarg;
-      tmp = optarg;
-      while (*tmp) {
-	tmp++;
-      }
-      tmp--;
-      S3 = *tmp;
-      tmp--;
-      S2 = *tmp;
-      tmp--;
-      S1 = *tmp;
-      
-      // PGX format      
-      if ((S1 == 'p' && S2 == 'g' && S3 == 'x')
-	|| (S1 == 'P' && S2 == 'G' && S3 == 'X')) {
-	cp.decod_format = PGX_DFMT;
-	break;
-      }
-      
-      // PxM format 
-      if ((S1 == 'p' && S2 == 'n' && S3 == 'm')
-	|| (S1 == 'P' && S2 == 'N' && S3 == 'M') 
-	|| (S1 == 'p' && S2 == 'g' && S3 == 'm')
-	|| (S1 == 'P' && S2 == 'G' && S3 == 'M') 
-	|| (S1 == 'P' && S2 == 'P' && S3 == 'M')
-	|| (S1 == 'p' && S2 == 'p' && S3 == 'm')) {
-	cp.decod_format = PXM_DFMT;
-	break;
-      }
-      
-      // BMP format 
-      if ((S1 == 'b' && S2 == 'm' && S3 == 'p')
-	|| (S1 == 'B' && S2 == 'M' && S3 == 'P')) {
-	cp.decod_format = BMP_DFMT;
-	break;
-      }
-      
-      // otherwise : error
-      fprintf(stderr,
-	"!! Unrecognized output image format *.%c%c%c [only *.pnm, *.pgm, *.ppm, *.pgx or *.bmp] !!\n",
-	S1, S2, S3);
-      
-      return 1;
-      break;
-      
-      /* ----------------------------------------------------- */
-      
-      //Reduce option
-    case 'r':
-      tmp=optarg;
-      sscanf(tmp, "%d", &cp.reduce);
-      break;
-      
-      /* ----------------------------------------------------- */
-      
-      //Layering option
-    case 'l':
-      tmp=optarg;
-      sscanf(tmp, "%d", &cp.layer);
-      break;
-      
-      /* ----------------------------------------------------- */
-      
-    case 'u':			
-      usage_display(argv[0]);
-      return 0;
-      break;
-      /* ----------------------------------------------------- */
-      
-    default:
-      fprintf(stderr,"WARNING -> this option is not valid \"-%c %s\"\n",c,optarg);
-      break;
-      
-    }
-  }
-  
-  //Check required arguments
-  //------------------------
-  if (!infile || !outfile) {
-    fprintf(stderr,"ERROR -> At least one required argument is missing\nCheck j2k_to_image -u for usage information\n");
-    return 1;
-  }
-  
-  //Read the input file and put it in memory
-  //----------------------------------------
-  fsrc = fopen(infile, "rb");
-  if (!fsrc) {
-    fprintf(stderr, "ERROR -> failed to open %s for reading\n", infile);
-    return 1;
-  }
-  fseek(fsrc, 0, SEEK_END);
-  len = ftell(fsrc);
-  fseek(fsrc, 0, SEEK_SET);
-  src = (char *) malloc(len);
-  fread(src, 1, len, fsrc);
-  fclose(fsrc);
-  
-  //Decode the code-stream
-  //----------------------
-  switch(cp.cod_format) {
-    
-  case J2K_CFMT:
-    if (!j2k_decode(src, len, &img, &cp)) {
-      fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n");
-      return 1;
-    }
-    break;
-    
-  case JP2_CFMT:
-    jp2_struct = (jp2_struct_t *) malloc(sizeof(jp2_struct_t));
-    jp2_struct->image = &img;
-    
-    if (jp2_read_struct(src, jp2_struct, len)) {
-      fprintf(stderr, "ERROR -> j2k_to_image: failed to decode jp2 structure!\n");
-      return 1;
-    }
-    
-    if (!j2k_decode(src + jp2_struct->j2k_codestream_offset, jp2_struct->j2k_codestream_len, &img, &cp)) {
-      fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n");
-      return 1;
-    }
-    
-    /* Insert code here if you want to create actions on jp2_struct before deleting it */
-    
-    free(jp2_struct);
-    break;
-    
-  case JPT_CFMT:
-    if (!j2k_decode_jpt_stream(src, len, &img, &cp)) {
-      fprintf(stderr, "ERROR -> j2k_to_image: failed to decode JPT-file!\n");
-      return 1;
-    }
-    break;
-    
-  default:
-    fprintf(stderr,
-      "ERROR -> j2k_to_image : Unknown input image format\n");
-    return 1;
-    break;
-  }
-  
-  //Free the memory containing the code-stream
-  //------------------------------------------
-  
-  free(src);
-  
-  
-  //Create output image
-  //-------------------
-  
-  /* ---------------------------- / */
-  /* /                            / */
-  /* /  FORMAT : PNM, PGM or PPM  / */
-  /* /                            / */
-  /* ---------------------------- / */
-  
-  switch (cp.decod_format) {
-  case PXM_DFMT:			/* PNM PGM PPM */
-    
-    tmp=outfile;
-    while (*tmp) {
-      tmp++;
-    }
-    tmp--;
-    tmp--;
-    S2 = *tmp;
-    
-    if (img.numcomps == 3 && img.comps[0].dx == img.comps[1].dx
-      && img.comps[1].dx == img.comps[2].dx
-      && img.comps[0].dy == img.comps[1].dy
-      && img.comps[1].dy == img.comps[2].dy
-      && img.comps[0].prec == img.comps[1].prec
-      && img.comps[1].prec == img.comps[2].prec
-      && S2 !='g' && S2 !='G') {
-      
-      fdest = fopen(outfile, "wb");
-      if (!fdest) {
-	fprintf(stderr, "ERROR -> failed to open %s for writing\n", outfile);
-	return 1;
-      }
-      
-      w = int_ceildiv(img.x1 - img.x0, img.comps[0].dx);
-      // wr = int_ceildiv(int_ceildivpow2(img.x1 - img.x0,img.factor),img.comps[0].dx);
-      wr = img.comps[0].w;
-      wrr = int_ceildivpow2(img.comps[0].w, img.comps[0].factor);
-      
-      h = int_ceildiv(img.y1 - img.y0, img.comps[0].dy);
-      // hr = int_ceildiv(int_ceildivpow2(img.y1 - img.y0,img.factor), img.comps[0].dy);
-      hr = img.comps[0].h;
-      hrr = int_ceildivpow2(img.comps[0].h, img.comps[0].factor);
-      
-      max = img.comps[0].prec > 8 ? 255 : (1 << img.comps[0].prec) - 1;
-      
-      img.comps[0].x0 =
-	int_ceildivpow2(img.comps[0].x0 -
-	int_ceildiv(img.x0, img.comps[0].dx),
-	img.comps[0].factor);
-      img.comps[0].y0 =
-	int_ceildivpow2(img.comps[0].y0 -
-	int_ceildiv(img.y0, img.comps[0].dy),
-	img.comps[0].factor);
-      
-      
-      fprintf(fdest, "P6\n%d %d\n%d\n", wrr, hrr, max);
-      adjust = img.comps[0].prec > 8 ? img.comps[0].prec - 8 : 0;
-      for (i = 0; i < wrr * hrr; i++) {
-	int r, g, b;
-        unsigned char rc,gc,bc;
-	r = img.comps[0].data[i / wrr * wr + i % wrr];
-	r += (img.comps[0].sgnd ? 1 << (img.comps[0].prec - 1) : 0);
-	rc = (unsigned char) ((r >> adjust)+((r >> (adjust-1))%2));
-	
-	g = img.comps[1].data[i / wrr * wr + i % wrr];
-	g += (img.comps[1].sgnd ? 1 << (img.comps[1].prec - 1) : 0);
-	gc = (unsigned char) ((g >> adjust)+((g >> (adjust-1))%2));
-	
-	b = img.comps[2].data[i / wrr * wr + i % wrr];
-	b += (img.comps[2].sgnd ? 1 << (img.comps[2].prec - 1) : 0);
-	bc = (unsigned char) ((b >> adjust)+((b >> (adjust-1))%2));
-	
-	fprintf(fdest, "%c%c%c", rc, gc, bc);
-      }
-      free(img.comps[0].data);
-      free(img.comps[1].data);
-      free(img.comps[2].data);
-      fclose(fdest);
-      
-    } else {
-      int ncomp=(S2=='g' || S2=='G')?1:img.numcomps;
-      if (img.numcomps>ncomp) {
-	fprintf(stderr,"WARNING -> [PGM files] Only the first component\n");
-	fprintf(stderr,"           is written to the file\n");
-      }
-      for (compno = 0; compno < ncomp; compno++) {
-	char name[256];
-	if (ncomp > 1) {
-	  sprintf(name, "%d.%s", compno, outfile);
-	} else {
-	  sprintf(name, "%s", outfile);
-	}
-	
-	fdest = fopen(name, "wb");
-	if (!fdest) {
-	  fprintf(stderr, "ERROR -> failed to open %s for writing\n", name);
-	  return 1;
-	}
-	
-	w = int_ceildiv(img.x1 - img.x0, img.comps[compno].dx);
-	// wr = int_ceildiv(int_ceildivpow2(img.x1 - img.x0,img.factor),img.comps[compno].dx);
-	wr = img.comps[compno].w;
-	wrr =
-	  int_ceildivpow2(img.comps[compno].w, img.comps[compno].factor);
-	
-	h = int_ceildiv(img.y1 - img.y0, img.comps[compno].dy);
-	// hr = int_ceildiv(int_ceildivpow2(img.y1 - img.y0,img.factor), img.comps[compno].dy);
-	hr = img.comps[compno].h;
-	hrr =
-	  int_ceildivpow2(img.comps[compno].h, img.comps[compno].factor);
-	
-	max =
-	  img.comps[compno].prec >
-	  8 ? 255 : (1 << img.comps[compno].prec) - 1;
-	
-	img.comps[compno].x0 =
-	  int_ceildivpow2(img.comps[compno].x0 -
-	  int_ceildiv(img.x0,
-				      img.comps[compno].dx),
-				      img.comps[compno].factor);
-	img.comps[compno].y0 =
-	  int_ceildivpow2(img.comps[compno].y0 -
-	  int_ceildiv(img.y0,
-				      img.comps[compno].dy),
-				      img.comps[compno].factor);
-	
-	fprintf(fdest, "P5\n%d %d\n%d\n", wrr, hrr, max);
-	adjust =
-	  img.comps[compno].prec > 8 ? img.comps[compno].prec - 8 : 0;
-	for (i = 0; i < wrr * hrr; i++) {
-	  int l;
-          unsigned char lc;
-	  l = img.comps[compno].data[i / wrr * wr + i % wrr];
-	  l += (img.comps[compno].
-	    sgnd ? 1 << (img.comps[compno].prec - 1) : 0);
-	  lc = (unsigned char) ((l >> adjust)+((l >> (adjust-1))%2));
-	  fprintf(fdest, "%c", lc);
-	}
-	fclose(fdest);
-	free(img.comps[compno].data);
-      }
-    }
-    break;
-    
-    /* ------------------------ / */
-    /* /                        / */
-    /* /     FORMAT : PGX       / */
-    /* /                        / */
-    /* /----------------------- / */
-  case PGX_DFMT:			/* PGX */
-    for (compno = 0; compno < img.numcomps; compno++) {
-      j2k_comp_t *comp = &img.comps[compno];
-      char name[256];
-      int nbytes = 0;
-      tmp = outfile;
-      while (*tmp) {
-	tmp++;
-      }
-      while (*tmp!='.') {
-	tmp--;
-      }
-      *tmp='\0';
-      
-      if (img.numcomps > 1)
-        sprintf(name, "%s-%d.pgx", outfile, compno);
-      else
-        sprintf(name, "%s.pgx", outfile);
-      
-      fdest = fopen(name, "wb");
-      if (!fdest) {
-	fprintf(stderr, "ERROR -> failed to open %s for writing\n", name);
-	return 1;
-      }
-      
-      // w = int_ceildiv(img.x1 - img.x0, comp->dx);
-      // wr = int_ceildiv(int_ceildivpow2(img.x1 - img.x0,img.factor), comp->dx);
-      w = img.comps[compno].w;
-      wr = int_ceildivpow2(img.comps[compno].w, img.comps[compno].factor);
-      
-      // h = int_ceildiv(img.y1 - img.y0, comp->dy);
-      // hr = int_ceildiv(int_ceildivpow2(img.y1 - img.y0,img.factor), comp->dy);
-      h = img.comps[compno].h;
-      hr = int_ceildivpow2(img.comps[compno].h, img.comps[compno].factor);
-      
-      fprintf(fdest, "PG ML %c %d %d %d\n", comp->sgnd ? '-' : '+',
-	comp->prec, wr, hr);
-      
-      if (comp->prec <= 8)
-	nbytes = 1;
-      
-      else if (comp->prec <= 16)
-	nbytes = 2;
-      
-      else
-	nbytes = 4;
-      for (i = 0; i < wr * hr; i++) {
-	int v = img.comps[compno].data[i / wr * w + i % wr];
-	
-	for (j = nbytes - 1; j >= 0; j--) {
-	  
-	  char byte = (char) (v >> (j * 8));
-	  
-	  fwrite(&byte, 1, 1, fdest);
-	  
-	}
-      }
-      free(img.comps[compno].data);
-      fclose(fdest);
-    }
-    break;
-    
-    /* ------------------------ / */
-    /* /                        / */
-    /* /     FORMAT : BMP       / */
-    /* /                        / */
-    /* /----------------------- / */
-    
-  case BMP_DFMT:			/* BMP */
-    if (img.numcomps == 3 && img.comps[0].dx == img.comps[1].dx
-      && img.comps[1].dx == img.comps[2].dx
-      && img.comps[0].dy == img.comps[1].dy
-      && img.comps[1].dy == img.comps[2].dy
-      && img.comps[0].prec == img.comps[1].prec
-      && img.comps[1].prec == img.comps[2].prec) {
-      /* -->> -->> -->> -->>
-      
-       24 bits color
-       
-      <<-- <<-- <<-- <<-- */
-      
-      fdest = fopen(outfile, "wb");
-      if (!fdest) {
-	fprintf(stderr, "ERROR -> failed to open %s for writing\n", outfile);
-	return 1;
-      }
-      
-      // w = int_ceildiv(img.x1 - img.x0, img.comps[0].dx);
-      // wr = int_ceildiv(int_ceildivpow2(img.x1 - img.x0,img.factor), img.comps[0].dx);
-      w = img.comps[0].w;
-      wr = int_ceildivpow2(img.comps[0].w, img.comps[0].factor);
-      
-      // h = int_ceildiv(img.y1 - img.y0, img.comps[0].dy);
-      // hr = int_ceildiv(int_ceildivpow2(img.y1 - img.y0,img.factor), img.comps[0].dy);
-      h = img.comps[0].h;
-      hr = int_ceildivpow2(img.comps[0].h, img.comps[0].factor);
-      
-      fprintf(fdest, "BM");
-      
-      /* FILE HEADER */
-      /* ------------- */
-      fprintf(fdest, "%c%c%c%c",
-	(unsigned char) (hr * wr * 3 + 3 * hr * (wr % 2) +
-	54) & 0xff,
-	(unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2) + 54)
-	>> 8) & 0xff,
-	(unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2) + 54)
-	>> 16) & 0xff,
-	(unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2) + 54)
-	>> 24) & 0xff);
-      fprintf(fdest, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
-	((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
-      fprintf(fdest, "%c%c%c%c", (54) & 0xff, ((54) >> 8) & 0xff,
-	((54) >> 16) & 0xff, ((54) >> 24) & 0xff);
-      
-      /* INFO HEADER   */
-      /* ------------- */
-      fprintf(fdest, "%c%c%c%c", (40) & 0xff, ((40) >> 8) & 0xff,
-	((40) >> 16) & 0xff, ((40) >> 24) & 0xff);
-      fprintf(fdest, "%c%c%c%c", (unsigned char) ((wr) & 0xff),
-	(unsigned char) ((wr) >> 8) & 0xff,
-	(unsigned char) ((wr) >> 16) & 0xff,
-	(unsigned char) ((wr) >> 24) & 0xff);
-      fprintf(fdest, "%c%c%c%c", (unsigned char) ((hr) & 0xff),
-	(unsigned char) ((hr) >> 8) & 0xff,
-	(unsigned char) ((hr) >> 16) & 0xff,
-	(unsigned char) ((hr) >> 24) & 0xff);
-      fprintf(fdest, "%c%c", (1) & 0xff, ((1) >> 8) & 0xff);
-      fprintf(fdest, "%c%c", (24) & 0xff, ((24) >> 8) & 0xff);
-      fprintf(fdest, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
-	((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
-      fprintf(fdest, "%c%c%c%c",
-	(unsigned char) (3 * hr * wr +
-	3 * hr * (wr % 2)) & 0xff,
-	(unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2)) >>
-	8) & 0xff,
-	(unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2)) >>
-	16) & 0xff,
-	(unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2)) >>
-	24) & 0xff);
-      fprintf(fdest, "%c%c%c%c", (7834) & 0xff, ((7834) >> 8) & 0xff,
-	((7834) >> 16) & 0xff, ((7834) >> 24) & 0xff);
-      fprintf(fdest, "%c%c%c%c", (7834) & 0xff, ((7834) >> 8) & 0xff,
-	((7834) >> 16) & 0xff, ((7834) >> 24) & 0xff);
-      fprintf(fdest, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
-	((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
-      fprintf(fdest, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
-	((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
-      
-      for (i = 0; i < wr * hr; i++) {
-	unsigned char R, G, B;
-	/* a modifier */
-	// R = img.comps[0].data[w * h - ((i) / (w) + 1) * w + (i) % (w)];
-	R = img.comps[0].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
-	// G = img.comps[1].data[w * h - ((i) / (w) + 1) * w + (i) % (w)];
-	G = img.comps[1].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
-	// B = img.comps[2].data[w * h - ((i) / (w) + 1) * w + (i) % (w)];
-	B = img.comps[2].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
-	fprintf(fdest, "%c%c%c", B, G, R);
-	
-	if ((i + 1) % wr == 0) {
-	  for (pad = (3 * wr) % 4 ? 4 - (3 * wr) % 4 : 0; pad > 0; pad--)	/* ADD */
-	    fprintf(fdest, "%c", 0);
-	}
-      }
-      fclose(fdest);
-      free(img.comps[1].data);
-      free(img.comps[2].data);
-    } else {			/* Gray-scale */
-      
-				/* -->> -->> -->> -->>
-				
-				 8 bits non code (Gray scale)
-				 
-	<<-- <<-- <<-- <<-- */
-      fdest = fopen(outfile, "wb");
-      // w = int_ceildiv(img.x1 - img.x0, img.comps[0].dx);
-      // wr = int_ceildiv(int_ceildivpow2(img.x1 - img.x0,img.factor), img.comps[0].dx);
-      w = img.comps[0].w;
-      wr = int_ceildivpow2(img.comps[0].w, img.comps[0].factor);
-      
-      // h = int_ceildiv(img.y1 - img.y0, img.comps[0].dy);
-      // hr = int_ceildiv(int_ceildivpow2(img.y1 - img.y0,img.factor), img.comps[0].dy);
-      h = img.comps[0].h;
-      hr = int_ceildivpow2(img.comps[0].h, img.comps[0].factor);
-      
-      fprintf(fdest, "BM");
-      
-      /* FILE HEADER */
-      /* ------------- */
-      fprintf(fdest, "%c%c%c%c",
-	(unsigned char) (hr * wr + 54 + 1024 +
-	hr * (wr % 2)) & 0xff,
-	(unsigned char) ((hr * wr + 54 + 1024 + hr * (wr % 2))
-	>> 8) & 0xff,
-	(unsigned char) ((hr * wr + 54 + 1024 + hr * (wr % 2))
-	>> 16) & 0xff,
-	(unsigned char) ((hr * wr + 54 + 1024 + wr * (wr % 2))
-	>> 24) & 0xff);
-      fprintf(fdest, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
-	((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
-      fprintf(fdest, "%c%c%c%c", (54 + 1024) & 0xff,
-	((54 + 1024) >> 8) & 0xff, ((54 + 1024) >> 16) & 0xff,
-	((54 + 1024) >> 24) & 0xff);
-      
-      /* INFO HEADER */
-      /* ------------- */
-      fprintf(fdest, "%c%c%c%c", (40) & 0xff, ((40) >> 8) & 0xff,
-	((40) >> 16) & 0xff, ((40) >> 24) & 0xff);
-      fprintf(fdest, "%c%c%c%c", (unsigned char) ((wr) & 0xff),
-	(unsigned char) ((wr) >> 8) & 0xff,
-	(unsigned char) ((wr) >> 16) & 0xff,
-	(unsigned char) ((wr) >> 24) & 0xff);
-      fprintf(fdest, "%c%c%c%c", (unsigned char) ((hr) & 0xff),
-	(unsigned char) ((hr) >> 8) & 0xff,
-	(unsigned char) ((hr) >> 16) & 0xff,
-	(unsigned char) ((hr) >> 24) & 0xff);
-      fprintf(fdest, "%c%c", (1) & 0xff, ((1) >> 8) & 0xff);
-      fprintf(fdest, "%c%c", (8) & 0xff, ((8) >> 8) & 0xff);
-      fprintf(fdest, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
-	((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
-      fprintf(fdest, "%c%c%c%c",
-	(unsigned char) (hr * wr + hr * (wr % 2)) & 0xff,
-	(unsigned char) ((hr * wr + hr * (wr % 2)) >> 8) &
-	0xff,
-	(unsigned char) ((hr * wr + hr * (wr % 2)) >> 16) &
-	0xff,
-	(unsigned char) ((hr * wr + hr * (wr % 2)) >> 24) & 0xff);
-      fprintf(fdest, "%c%c%c%c", (7834) & 0xff, ((7834) >> 8) & 0xff,
-	((7834) >> 16) & 0xff, ((7834) >> 24) & 0xff);
-      fprintf(fdest, "%c%c%c%c", (7834) & 0xff, ((7834) >> 8) & 0xff,
-	((7834) >> 16) & 0xff, ((7834) >> 24) & 0xff);
-      fprintf(fdest, "%c%c%c%c", (256) & 0xff, ((256) >> 8) & 0xff,
-	((256) >> 16) & 0xff, ((256) >> 24) & 0xff);
-      fprintf(fdest, "%c%c%c%c", (256) & 0xff, ((256) >> 8) & 0xff,
-	((256) >> 16) & 0xff, ((256) >> 24) & 0xff);
-    }
-    
-    for (i = 0; i < 256; i++) {
-      fprintf(fdest, "%c%c%c%c", i, i, i, 0);
-    }
-    
-    for (i = 0; i < wr * hr; i++) {
-      /* a modifier !! */
-      // fprintf(fdest, "%c", img.comps[0].data[w * h - ((i) / (w) + 1) * w + (i) % (w)]);
-      fprintf(fdest, "%c",
-	img.comps[0].data[w * hr - ((i) / (wr) + 1) * w +
-	(i) % (wr)]);
-	/*if (((i + 1) % w == 0 && w % 2))
-      fprintf(fdest, "%c", 0); */
-      if ((i + 1) % wr == 0) {
-	for (pad = wr % 4 ? 4 - wr % 4 : 0; pad > 0; pad--)	/* ADD */
-	  fprintf(fdest, "%c", 0);
-      }
-    }
-    fclose(fdest);
-    free(img.comps[0].data);
-    break;
-
-  default:
-    fprintf(stderr,
-      "ERROR -> j2k_to_image : Unknown output image format\n");
-    return 1;
-    break;
-  }
-  
-  
-  // Free remaining structures
-  //--------------------------
-  j2k_dec_release();
-  
-  
-  
-  // Check memory leaks if debug mode
-  //---------------------------------
-  
-#ifdef _DEBUG
-  
-  _CrtDumpMemoryLeaks();
-  
-#endif
-  
-  return 0;
-}
--- a/codec/j2k_to_image.dsp
+++ b/codec/j2k_to_image.dsp
@@ -1,240 +0,0 @@
-# Microsoft Developer Studio Project File - Name="j2k_to_image" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=j2k_to_image - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "j2k_to_image.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "j2k_to_image.mak" CFG="j2k_to_image - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "j2k_to_image - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "j2k_to_image - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "j2k_to_image - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../libopenjpeg" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "DONT_HAVE_GETOPT" /YX /FD /c
-# ADD BASE RSC /l 0x80c /d "NDEBUG"
-# ADD RSC /l 0x80c /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "j2k_to_image - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "j2k_to_image___Win32_Debug"
-# PROP BASE Intermediate_Dir "j2k_to_image___Win32_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "j2k_to_image___Win32_Debug"
-# PROP Intermediate_Dir "j2k_to_image___Win32_Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../libopenjpeg" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "DONT_HAVE_GETOPT" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x80c /d "_DEBUG"
-# ADD RSC /l 0x80c /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "j2k_to_image - Win32 Release"
-# Name "j2k_to_image - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\libopenjpeg\bio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\cio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\dwt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\fix.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\compat\getopt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\int.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\j2k.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\j2k_to_image.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\jp2.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\jpt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\mct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\mqc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\pi.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\raw.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\t1.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\t2.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\tcd.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\tgt.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\libopenjpeg\bio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\cio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\dwt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\fix.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\compat\getopt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\int.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\j2k.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\jp2.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\jpt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\mct.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\mqc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\openjpeg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\pi.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\raw.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\t1.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\t2.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\tcd.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\tgt.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
--- a/codec/readme.txt
+++ b/codec/readme.txt
@@ -1,105 +0,0 @@
-List of parameters for the coder JPEG 2000 :
-
-Date : June the 25th, 2003
-Author : Yannick Verschueren
-Contact : verschueren@tele.ucl.ac.be 
-
- the option -help displays the readme.txt file on screen
-
- The markers COD and QCD are writed both of two in the main_header and never appear in the tile_header.  The markers in the main header are : SOC SIZ COD QCD COM.
-
- This coder can encode mega image, a test was made on a 24000x24000 pixels color image.  You need enough disk space memory (twice the original) to encode the image. (i.e. for a 1.5 Gb image you need a minimum of 3Gb of disk memory) 
-
-REMARKS :
---------
-
-* the value of rate enter in the code line is the compression factor !
-exemple :
-
-r 20,10,1 means quality 1 : compress 20x, quality 2 : compress 10x and quality 3 : compress 1x = lossless  
-
-* The number of resolution can be modified by the program in view to respect profile-0 conditions (Taubman, Marcelin (2002), "JPEG2000, image compression fundamentals, standards and practice", p700)
-
-By default :
------------
-
- * lossless
- * 1 tile
- * size of precinct 2^15 x 2^15 (means 1 precinct)
- * size of code-block 64 x 64
- * Number of resolution : 6
- * No SOP marker in the codestream
- * No EPH marker in the codestream
- * No sub-sampling in x and y direction
- * No mode switch activated
- * progression order : LRCP
- * No index file
- * No ROI upshifted
- * No offset of the origin of the image
- * No offset of the origin of the tiles
- * Reversible DWT 5-3
-
-Parameters :
------------
-
-i             : source file  (-i source.pnm also *.pgm, *.ppm) "required"
-
-o             : destination file (-o dest.j2k) "required"
-
-r             : different rates (-r 20,10,5) "optional" 
-
-n             : Number of resolution (-n 3) "optional"
-
-b             : size of code block (-b 32,32) "optional"
-
-c             : size of precinct (-c 128,128) "optional"
-
-t             : size of tile (-t 512,512) "optional"
-
-p             : progression order (-p LRCP) [LRCP, RLCP, RPCL, PCRL, CPRL] "optional"
-
-s             : subsampling factor (-s 2,2) [-s X,Y] "optional"
-
-SOP           : write SOP marker before each packet "optional"
-
-EPH           : write EPH marker after each header packet "optional"
-
-M             : mode switch (-M 3) [1= BYPASS(LAZY) 2=RESET 4=RESTART(TERMALL) 8=VSC 16=ERTERM(SEGTERM) 32=SEGMARK(SEGSYM)]  "optional"
-                    for several mode switch you have to add the value of each mode you want
-                    ex : RESTART(4) + RESET(2) + SEGMARK(32) = -M 38 
-
-x             : Create an index file *.Idx (-x index_name.Idx) "optional"
-
-ROI:c=%d,U=%d : quantization indices upshifted for component c=%d [%d = 0,1,2] 
-                 with a value of U=%d [0 <= %d <= 37] (i.e. -ROI:c=0,U=25) "optional"
-
-d             : offset of the origin of the image (-d 150,300) "optional"
-
-T             : offset of the origin of the tiles (-T 100,75) "optional"
-
-I             : Use the irreversible DWT 9-7 (-I) "optional"
-
-IMPORTANT : 
-----------
-
-* subsampling bigger than 2 can produce error
-
-The index file respect the structure below :
---------------------------------------------
-
-Image_height Image_width
-progression order
-Tiles_size_X Tiles_size_Y
-Components_nb
-Layers_nb
-decomposition_levels
-Precincts_size_X Precincts_size_Y
-Main_header_end_position
-Codestream_size
-Tile0 start_pos end_Theader end_pos
-Tile1  "         "           "
-...
-TileN  "         "           "
-Tpacket_0 Tile layer res. comp. prec. start_pos end_pos
-...
-Tpacket_M "    "     "    "     "     "         "
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -0,0 +1,52 @@
+# Generate target to build the html documentation through CMake tool
+# After having configured the project with the BUILD_DOC option you can run make doc
+# to generate the html documentation in the doc/html repository of the build folder.
+
+# Try to find the doxygen tool
+find_package(Doxygen)
+
+if(DOXYGEN_FOUND)
+  # Configure the doxygen config file with variable from CMake and move it
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.dox.cmake.in
+    ${CMAKE_BINARY_DIR}/doc/Doxyfile-html.dox @ONLY)
+
+  # Configure the html mainpage file of the doxygen documentation with variable
+  # from CMake and move it
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/mainpage.dox.in
+    ${CMAKE_BINARY_DIR}/doc/mainpage.dox @ONLY)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/openjpip.dox.in
+    ${CMAKE_BINARY_DIR}/doc/openjpip.dox @ONLY)
+  # copy png file to make local (binary tree) documentation valid:
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/jpip_architect.png
+    ${CMAKE_BINARY_DIR}/doc/html/jpip_architect.png COPYONLY)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/jpip_protocol.png
+    ${CMAKE_BINARY_DIR}/doc/html/jpip_protocol.png COPYONLY)
+
+  file(GLOB headers
+    ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/*.h
+    ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2/*.c
+    ${OPENJPEG_SOURCE_DIR}/src/lib/openjpip/*.h
+    ${OPENJPEG_SOURCE_DIR}/src/lib/openjpip/*.c
+  )
+  # Generate new target to build the html documentation
+  add_custom_command(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/html/index.html
+    COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/doc/Doxyfile-html.dox
+    DEPENDS ${CMAKE_BINARY_DIR}/doc/Doxyfile-html.dox
+            ${CMAKE_BINARY_DIR}/doc/mainpage.dox
+            ${CMAKE_BINARY_DIR}/doc/openjpip.dox
+            ${headers}
+  )
+  add_custom_target(doc ALL
+    DEPENDS ${CMAKE_BINARY_DIR}/doc/html/index.html
+    COMMENT "Building doxygen documentation"
+  )
+
+  # install HTML documentation (install png files too):
+  install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/html
+    DESTINATION share/doc
+    PATTERN ".svn" EXCLUDE
+  )
+else()
+  message(STATUS "Doxygen not found, we cannot generate the documentation")
+endif()
--- a/doc/Doxyfile.dox.cmake.in
+++ b/doc/Doxyfile.dox.cmake.in
@@ -0,0 +1,285 @@
+# Doxyfile 1.7.1
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+DOXYFILE_ENCODING      = UTF-8
+PROJECT_NAME           = OpenJPEG
+PROJECT_NUMBER         = @OPENJPEG_VERSION@
+OUTPUT_DIRECTORY       = @OPENJPEG_BINARY_DIR@/doc
+CREATE_SUBDIRS         = NO
+OUTPUT_LANGUAGE        = English
+BRIEF_MEMBER_DESC      = YES
+REPEAT_BRIEF           = YES
+ABBREVIATE_BRIEF       = "The $name class" \
+                         "The $name widget" \
+                         "The $name file" \
+                         is \
+                         provides \
+                         specifies \
+                         contains \
+                         represents \
+                         a \
+                         an \
+                         the
+ALWAYS_DETAILED_SEC    = NO
+INLINE_INHERITED_MEMB  = NO
+FULL_PATH_NAMES        = NO
+STRIP_FROM_PATH        = C://
+STRIP_FROM_INC_PATH    =
+SHORT_NAMES            = NO
+JAVADOC_AUTOBRIEF      = YES
+QT_AUTOBRIEF           = NO
+MULTILINE_CPP_IS_BRIEF = NO
+INHERIT_DOCS           = YES
+SEPARATE_MEMBER_PAGES  = NO
+TAB_SIZE               = 8
+ALIASES                =
+OPTIMIZE_OUTPUT_FOR_C  = YES
+OPTIMIZE_OUTPUT_JAVA   = NO
+OPTIMIZE_FOR_FORTRAN   = NO
+OPTIMIZE_OUTPUT_VHDL   = NO
+EXTENSION_MAPPING      =
+BUILTIN_STL_SUPPORT    = NO
+CPP_CLI_SUPPORT        = NO
+SIP_SUPPORT            = NO
+IDL_PROPERTY_SUPPORT   = YES
+DISTRIBUTE_GROUP_DOC   = NO
+SUBGROUPING            = YES
+TYPEDEF_HIDES_STRUCT   = NO
+SYMBOL_CACHE_SIZE      = 0
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL            = YES
+EXTRACT_PRIVATE        = YES
+EXTRACT_STATIC         = YES
+EXTRACT_LOCAL_CLASSES  = YES
+EXTRACT_LOCAL_METHODS  = NO
+EXTRACT_ANON_NSPACES   = NO
+HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_CLASSES     = NO
+HIDE_FRIEND_COMPOUNDS  = NO
+HIDE_IN_BODY_DOCS      = NO
+INTERNAL_DOCS          = NO
+CASE_SENSE_NAMES       = NO
+HIDE_SCOPE_NAMES       = NO
+SHOW_INCLUDE_FILES     = YES
+FORCE_LOCAL_INCLUDES   = NO
+INLINE_INFO            = YES
+SORT_MEMBER_DOCS       = YES
+SORT_BRIEF_DOCS        = NO
+SORT_MEMBERS_CTORS_1ST = NO
+SORT_GROUP_NAMES       = NO
+SORT_BY_SCOPE_NAME     = NO
+GENERATE_TODOLIST      = YES
+GENERATE_TESTLIST      = YES
+GENERATE_BUGLIST       = YES
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS       =
+MAX_INITIALIZER_LINES  = 30
+SHOW_USED_FILES        = YES
+SHOW_DIRECTORIES       = NO
+SHOW_FILES             = YES
+SHOW_NAMESPACES        = YES
+FILE_VERSION_FILTER    =
+LAYOUT_FILE            =
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET                  = NO
+WARNINGS               = YES
+WARN_IF_UNDOCUMENTED   = YES
+WARN_IF_DOC_ERROR      = YES
+WARN_NO_PARAMDOC       = NO
+WARN_FORMAT            = "$file:$line: $text"
+WARN_LOGFILE           =
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT                  = @OPENJPEG_SOURCE_DIR@/src/lib/openjp2 \
+                         @OPENJPEG_SOURCE_DIR@/src/lib/openjpip \
+                         @OPENJPEG_BINARY_DIR@/doc
+INPUT_ENCODING         = UTF-8
+FILE_PATTERNS          = *.h \
+                         *.c \
+                         *.dox
+RECURSIVE              = YES
+EXCLUDE                =
+EXCLUDE_SYMLINKS       = NO
+EXCLUDE_PATTERNS       = */.svn/*
+EXCLUDE_SYMBOLS        =
+EXAMPLE_PATH           =
+EXAMPLE_PATTERNS       = *
+EXAMPLE_RECURSIVE      = NO
+IMAGE_PATH             = @OPENJPEG_SOURCE_DIR@/doc
+INPUT_FILTER           =
+FILTER_PATTERNS        =
+FILTER_SOURCE_FILES    = NO
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER         = NO
+INLINE_SOURCES         = NO
+STRIP_CODE_COMMENTS    = YES
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION    = YES
+REFERENCES_LINK_SOURCE = YES
+USE_HTAGS              = NO
+VERBATIM_HEADERS       = YES
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX     = NO
+COLS_IN_ALPHA_INDEX    = 5
+IGNORE_PREFIX          =
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML          = YES
+HTML_OUTPUT            = ./html
+HTML_FILE_EXTENSION    = .html
+HTML_HEADER            =
+HTML_FOOTER            =
+HTML_STYLESHEET        =
+HTML_COLORSTYLE_HUE    = 220
+HTML_COLORSTYLE_SAT    = 100
+HTML_COLORSTYLE_GAMMA  = 80
+HTML_TIMESTAMP         = NO 
+HTML_ALIGN_MEMBERS     = YES
+HTML_DYNAMIC_SECTIONS  = NO
+GENERATE_DOCSET        = NO
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+DOCSET_PUBLISHER_NAME  = Publisher
+GENERATE_HTMLHELP      = NO
+CHM_FILE               =
+HHC_LOCATION           =
+GENERATE_CHI           = NO
+CHM_INDEX_ENCODING     =
+BINARY_TOC             = NO
+TOC_EXPAND             = NO
+GENERATE_QHP           = NO
+QCH_FILE               =
+QHP_NAMESPACE          = org.doxygen.Project
+QHP_VIRTUAL_FOLDER     = doc
+QHP_CUST_FILTER_NAME   =
+QHP_CUST_FILTER_ATTRS  =
+QHP_SECT_FILTER_ATTRS  =
+QHG_LOCATION           =
+GENERATE_ECLIPSEHELP   = NO
+ECLIPSE_DOC_ID         = org.doxygen.Project
+DISABLE_INDEX          = NO
+ENUM_VALUES_PER_LINE   = 4
+GENERATE_TREEVIEW      = NO
+USE_INLINE_TREES       = NO
+TREEVIEW_WIDTH         = 250
+EXT_LINKS_IN_WINDOW    = NO
+FORMULA_FONTSIZE       = 10
+FORMULA_TRANSPARENT    = YES
+SEARCHENGINE           = NO
+SERVER_BASED_SEARCH    = NO
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX         = NO
+LATEX_OUTPUT           = latex
+LATEX_CMD_NAME         = latex
+MAKEINDEX_CMD_NAME     = makeindex
+COMPACT_LATEX          = NO
+PAPER_TYPE             = a4wide
+EXTRA_PACKAGES         =
+LATEX_HEADER           =
+PDF_HYPERLINKS         = NO
+USE_PDFLATEX           = NO
+LATEX_BATCHMODE        = NO
+LATEX_HIDE_INDICES     = NO
+LATEX_SOURCE_CODE      = NO
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF           = NO
+RTF_OUTPUT             = rtf
+COMPACT_RTF            = NO
+RTF_HYPERLINKS         = NO
+RTF_STYLESHEET_FILE    =
+RTF_EXTENSIONS_FILE    =
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN           = NO
+MAN_OUTPUT             = man
+MAN_EXTENSION          = .3
+MAN_LINKS              = NO
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML           = NO
+XML_OUTPUT             = xml
+XML_SCHEMA             =
+XML_DTD                =
+XML_PROGRAMLISTING     = YES
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF   = NO
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD       = NO
+PERLMOD_LATEX          = NO
+PERLMOD_PRETTY         = YES
+PERLMOD_MAKEVAR_PREFIX =
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING   = YES
+MACRO_EXPANSION        = NO
+EXPAND_ONLY_PREDEF     = NO
+SEARCH_INCLUDES        = YES
+INCLUDE_PATH           =
+INCLUDE_FILE_PATTERNS  =
+PREDEFINED             = USE_JPWL \
+                         USE_JPSEC
+EXPAND_AS_DEFINED      =
+SKIP_FUNCTION_MACROS   = YES
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+TAGFILES               =
+GENERATE_TAGFILE       =
+ALLEXTERNALS           = NO
+EXTERNAL_GROUPS        = YES
+PERL_PATH              = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS         = YES
+MSCGEN_PATH            =
+HIDE_UNDOC_RELATIONS   = YES
+HAVE_DOT               = NO
+DOT_NUM_THREADS        = 0
+DOT_FONTNAME           = Helvetica
+DOT_FONTSIZE           = 10
+DOT_FONTPATH           =
+CLASS_GRAPH            = YES
+COLLABORATION_GRAPH    = YES
+GROUP_GRAPHS           = YES
+UML_LOOK               = NO
+TEMPLATE_RELATIONS     = NO
+INCLUDE_GRAPH          = YES
+INCLUDED_BY_GRAPH      = YES
+CALL_GRAPH             = NO
+CALLER_GRAPH           = NO
+GRAPHICAL_HIERARCHY    = YES
+DIRECTORY_GRAPH        = YES
+DOT_IMAGE_FORMAT       = png
+DOT_PATH               =
+DOTFILE_DIRS           =
+DOT_GRAPH_MAX_NODES    = 50
+MAX_DOT_GRAPH_DEPTH    = 1000
+DOT_TRANSPARENT        = NO
+DOT_MULTI_TARGETS      = NO
+GENERATE_LEGEND        = YES
+DOT_CLEANUP            = YES
--- a/doc/jpip_architect.png
+++ b/doc/jpip_architect.png
--- a/doc/jpip_protocol.png
+++ b/doc/jpip_protocol.png
--- a/doc/mainpage.dox.in
+++ b/doc/mainpage.dox.in
@@ -0,0 +1,62 @@
+/*
+ * $Id$
+ *
+ * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2011, Mickael Savinaud, Communications & Systemes <mickael.savinaud@c-s.fr>
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+/*! \mainpage OpenJPEG v@OPENJPEG_VERSION@ Documentation
+*
+* \section intro Introduction
+* This manual documents the low-level OpenJPEG C API.\n
+* The OpenJPEG library is an open-source JPEG 2000 library developed in order to promote the use of JPEG 2000.\n
+* This documents is focused on the main part of the library which try to implement Part 1 and Part 2 of the JPEG2000 norm.\n
+*
+* \section home Home page
+*
+* The Home Page of the OpenJPEG library can be found at:
+*
+* http://code.google.com/p/openjpeg/
+*
+* More information about the OpenJPEG library is available here:
+*
+* http://www.openjpeg.org/
+*
+* The OpenJPEG mailing list is located here:
+*
+* http://groups.google.com/group/openjpeg
+*
+* All the source code is online and can be retrieved using svn from here:
+*
+* http://openjpeg.googlecode.com/svn/
+*
+* \section license License
+* This software is released under the BSD license, anybody can use or modify the library, even for commercial applications.\n
+* The only restriction is to retain the copyright in the sources or the binaries documentation.\n
+* Neither the author, nor the university accept any responsibility for any kind of error or data loss which may occur during usage.
+*
+* \author OpenJPEG Team
+*
+*/
--- a/doc/man/man1/opj_compress.1
+++ b/doc/man/man1/opj_compress.1
@@ -0,0 +1,222 @@
+'\" t
+'\" The line above instructs most `man' programs to invoke tbl
+'\"
+'\" Separate paragraphs; not the same as PP which resets indent level.
+.de SP
+.if t .sp .5
+.if n .sp
+..
+'\"
+'\" Replacement em-dash for nroff (default is too short).
+.ie n .ds m " -
+.el .ds m \(em
+'\"
+'\" Placeholder macro for if longer nroff arrow is needed.
+.ds RA \(->
+'\"
+'\" Decimal point set slightly raised
+.if t .ds d \v'-.15m'.\v'+.15m'
+.if n .ds d .
+'\"
+'\" Enclosure macro for examples
+.de EX
+.SP
+.nf
+.ft CW
+..
+.de EE
+.ft R
+.SP
+.fi
+..
+.TH opj_compress 1 "Version 1.4.0" "opj_compress" "converts to jpeg2000 files"
+.P
+.SH NAME
+opj_compress - 
+This program reads in an image of a certain type and converts it to a
+jpeg2000 file. It is part of the OpenJPEG library.
+.SP
+Valid input image extensions are
+.B .bmp, .pgm, .pgx, .png, .pnm, .ppm, .raw, .tga, .tif \fR. For PNG resp. TIF it needs libpng resp. libtiff .
+.SP
+Valid output image extensions are
+.B .j2k, .jp2
+.SH SYNOPSIS
+.P
+.B opj_compress -i \fRinfile.bmp \fB-o \fRoutfile.j2k
+.P
+.B opj_compress -ImgDir \fRdirectory_name \fB-OutFor \fRjp2
+.P
+.B opj_compress -h \fRPrint a help message and exit.
+.P
+.R See JPWL OPTIONS for special options
+.SH OPTIONS
+.TP
+.B \-\^b " n,n"
+(Size of code block (e.g. -b 32,32). Default: 64 x 64)
+.TP
+.B \-\^c " n"
+(Size of precinct (e.g. -c 128,128). Default: 2^15 x 2^15)
+.TP
+.B \-\^cinema2K " fps"
+Digital Cinema 2K profile compliant codestream. Valid \fBfps\fR values are 24 or 48.
+.TP
+.B \-\^cinema4K
+Digital Cinema 4K profile compliant codestream. Does not need an fps: default is 24 fps.
+.TP
+.B \-\^d " X,Y"
+(Offset of image origin (e.g. -d 150,300))
+.TP
+.B \-\^h
+Print a help message and exit.
+.TP
+.B \-\^i " name"
+(input file name)
+.TP
+.B \-\^n " n"
+(Number of resolutions. Default: 6)
+.TP
+.B \-\^o " name"
+(output file name)
+.TP
+.B \-\^p " name"
+Progression order. \fBname\fR can be one out of:LRCP, RLCP, RPCL, PCRL, CPRL. Default: LRCP.
+.TP
+.B \-\^q " n"
+different psnr for successive layers
+.br
+.B Note: \fR(options -r and -q cannot be used together)
+.TP
+.B \-\^r " n"
+different compression ratio(s) for successive layers. The rate specified for each quality level is the desired compression factor.
+.br
+.B Note: \fR(options -r and -q cannot be used together)
+.TP
+.B \-\^s " X,Y"
+sub-sampling factor (e.g. -s 2,2). Default: No sub-sampling in x or y direction.
+.br
+.B Remark: \fRsub-sampling bigger than 2 can produce errors.
+.TP
+.B \-\^t " W,H"
+(Size of tile (e.g. -t 512,512) )
+.TP
+.B \-\^x " name"
+(Create index file and fill it. Default: no index file)
+.TP
+.B \-\^EPH
+(Write EPH marker after each header packet. Default:no EPH)
+.TP
+.B \-\^F " rawWidth,rawHeight,rawComp,rawBitDepth,s_or_u"
+characteristics of the raw input image
+.TP
+.B \-\^I
+(Use the irreversible DWT 9-7. Default: Reversible DWT 5-3)
+.TP
+.B \-\^ImgDir " directory_name"
+(directory containing input files)
+.TP
+.B \-\^M " n"
+mode switch with values: 1, 2, 4, 8, 16, 32. Default:No mode switch activated. 
+.br
+\fIMeaning:\fR
+.br
+BYPASS(1) 
+.br
+RESET(2) 
+.br
+RESTART(4) 
+.br
+VSC(8) 
+.br
+ERTERM(16) 
+.br
+SEGMARK(32)
+.br
+Values can be added: RESTART(4) + RESET(2) + SEGMARK(32) = -M 38
+.TP
+.B \-\^OutFor "ext"
+(extension for output files)
+.TP
+.B \-\^POC "TtileNr=resolutionStart, componentStart, layerEnd, resolutionEnd, componentEnd, progressionOrder"
+(see Examples)
+.TP
+.B \-\^ROI "c=n,U=n"
+quantization indices upshifted for component c (0 or 1 or 2) with a value of U (>= 0 and <= 37)
+.br
+e.g. \fB-ROI c=0,U=25\fR
+.TP
+.B \-\^SOP
+(Write SOP marker before each packet. Default: No SOP marker in the codestream.)
+.TP
+.B \-\^T "X,Y"
+(Offset of the origin of the tiles (e.g. -T 100,75) )
+.TP
+.B \-\^W
+(see JPWL OPTIONS)
+.P
+.SH JPWL OPTIONS
+Options usable only if the library has been compiled with \fB-DUSE_JPWL\fR
+.P
+.B      -W h<tilepart><=type>, s<tilepart><=method>, a=<addr>, z=<size>, g=<range>, p<tilepart:pack><=type>
+.P
+.B h\fR selects the header error protection (EPB): \fBtype\fR can be
+   [0=none 1,absent=predefined 16=CRC-16 32=CRC-32 37-128=RS]
+   if \fBtilepart\fR is absent, it is for main and tile headers
+   if \fBtilepart\fR is present, it applies from that tile
+     onwards, up to the next h<> spec, or to the last tilepart
+     in the codestream (max. 16 specs)
+.P
+.B p \fRselects the packet error protection (EEP/UEP with EPBs)
+  to be applied to raw data: \fBtype\fR can be
+   [0=none 1,absent=predefined 16=CRC-16 32=CRC-32 37-128=RS]
+   if \fBtilepart:pack\fR is absent, it is from tile 0, packet 0
+   if \fBtilepart:pack\fR is present, it applies from that tile
+     and that packet onwards, up to the next packet spec
+     or to the last packet in the last tilepart in the stream
+     (max. 16 specs)
+.P
+.B s \fRenables sensitivity data insertion (ESD): \fBmethod\fR can be
+   [-1=NO ESD 0=RELATIVE ERROR 1=MSE 2=MSE REDUCTION 3=PSNR
+    4=PSNR INCREMENT 5=MAXERR 6=TSE 7=RESERVED]
+   if \fBtilepart\fR is absent, it is for main header only
+   if \fBtilepart\fR is present, it applies from that tile
+     onwards, up to the next s<> spec, or to the last tilepart
+     in the codestream (max. 16 specs)
+.P
+.B g \fRdetermines the addressing mode: \fBrange\fR can be
+   [0=PACKET 1=BYTE RANGE 2=PACKET RANGE]
+.P
+.B a \fRdetermines the size of data addressing: \fBaddr\fR can be
+   2/4 bytes (small/large codestreams). If not set, auto-mode
+.P
+.B z \fRdetermines the size of sensitivity values: \fBsize\fR can be
+   1/2 bytes, for the transformed pseudo-floating point value
+.P
+.SH EXAMPLES
+.P
+.B opj_compress -i \fRfile.bmp \fB-o \fRfile.j2k \fB-r \fR20,10,1 (compress 20x, then 10x, then lossless).
+.P
+.B opj_compress -i \fRfile.ppm \fB-o \fRfile.j2k \fB-q \fR30,40,50
+.P
+.B opj_compress -i \fRfile.pgx \fB-o \fRfile.j2k \fB-POC \fRT1=0,0,1,5,3,CPRL
+.P
+.B opj_compress -i \fRlena.raw \fB-o \fRlena.j2k \fB-F \fR512,512,3,8,u
+.P
+.SH AUTHORS
+Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
+.br
+Copyright (c) 2002-2014, Professor Benoit Macq
+.br
+Copyright (c) 2001-2003, David Janssens
+.br
+Copyright (c) 2002-2003, Yannick Verschueren
+.br
+Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+.br
+Copyright (c) 2005, Herve Drolon, FreeImage Team
+.br
+Copyright (c) 2006-2007, Parvatha Elangovan
+.P
+.SH "SEE ALSO"
+opj_decompress(1) opj_dump(1)
+
--- a/doc/man/man1/opj_decompress.1
+++ b/doc/man/man1/opj_decompress.1
@@ -0,0 +1,109 @@
+'\" t
+'\" The line above instructs most `man' programs to invoke tbl
+'\"
+'\" Separate paragraphs; not the same as PP which resets indent level.
+.de SP
+.if t .sp .5
+.if n .sp
+..
+'\"
+'\" Replacement em-dash for nroff (default is too short).
+.ie n .ds m " -
+.el .ds m \(em
+'\"
+'\" Placeholder macro for if longer nroff arrow is needed.
+.ds RA \(->
+'\"
+'\" Decimal point set slightly raised
+.if t .ds d \v'-.15m'.\v'+.15m'
+.if n .ds d .
+'\"
+'\" Enclosure macro for examples
+.de EX
+.SP
+.nf
+.ft CW
+..
+.de EE
+.ft R
+.SP
+.fi
+..
+.TH opj_decompress 1 "Version 1.4.0" "opj_decompress" "converts jpeg2000 files"
+.P
+.SH NAME
+opj_decompress - 
+This program reads in a jpeg2000 image and converts it to another 
+image type. It is part of the OpenJPEG library.
+.SP
+Valid input image extensions are
+.B .j2k, .jp2, .j2c, .jpt
+.SP
+Valid output image extensions are
+.B .bmp, .pgm, .pgx, .png, .pnm, .ppm, .raw, .tga, .tif \fR. For PNG resp. TIF it needs libpng resp. libtiff .
+.SH SYNOPSIS
+.P
+.B opj_decompress -i \fRinfile.j2k \fB-o \fRoutfile.png
+.P
+.B opj_decompress -ImgDir \fRimages/ \fB-OutFor \fRbmp
+.P
+.B opj_decompress -h  \fRPrint help message and exit
+.P
+.R See JPWL OPTIONS for special options
+.SH OPTIONS
+.TP
+.B \-\^i "name"
+(jpeg2000 input file name)
+.TP
+.B \-\^l "n"
+n is the maximum number of quality layers to decode. See LAYERS below)
+.TP
+.B \-\^o "name"
+(output file name with extension)
+.TP
+.B \-\^r "n"
+(n is the highest resolution level to be discarded. See REDUCTION below)
+.TP
+.B \-\^x "name"
+(use name as index file and fill it)
+.TP
+.B \-\^ImgDir "directory_name"
+(directory containing input files)
+.TP
+.B \-\^OutFor "ext"
+(extension for output files)
+.P
+.SH JPWL OPTIONS
+Options usable only if the library has been compiled with
+.B -DUSE_JPWL
+.TP
+.B -W c\fR[=Nc] (Nc is the  number of expected components in the codestream; default:3)
+.TP
+.B -W t\fR[=Nt] (Nt is the maximum number of tiles in the codestream; default:8192)
+.TP
+.B -W c\fR[=Nc]\fB, t\fR[=Nt] \fR(same as above)
+.P
+.SH REDUCTION
+Set the number of highest resolution levels to be discarded.
+The image resolution is effectively divided by 2 to the power of the number of discarded levels. The reduce factor is limited by the smallest total number of decomposition levels among tiles.
+.SH TILES
+Set the maximum number of quality layers to decode. If there are less quality layers than the specified number, all the quality layers are decoded.
+.P
+'\".SH BUGS
+.SH AUTHORS
+Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
+.br
+Copyright (c) 2002-2014, Professor Benoit Macq
+.br
+Copyright (c) 2001-2003, David Janssens
+.br
+Copyright (c) 2002-2003, Yannick Verschueren
+.br
+Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+.br
+Copyright (c) 2005, Herve Drolon, FreeImage Team
+.br
+Copyright (c) 2006-2007, Parvatha Elangovan
+.P
+.SH "SEE ALSO"
+opj_compress(1) opj_dump(1)
--- a/doc/man/man1/opj_dump.1
+++ b/doc/man/man1/opj_dump.1
@@ -0,0 +1,62 @@
+'\" t
+'\" The line above instructs most `man' programs to invoke tbl
+'\"
+'\" Separate paragraphs; not the same as PP which resets indent level.
+.de SP
+.if t .sp .5
+.if n .sp
+..
+'\"
+'\" Replacement em-dash for nroff (default is too short).
+.ie n .ds m " -
+.el .ds m \(em
+'\"
+'\" Placeholder macro for if longer nroff arrow is needed.
+.ds RA \(->
+'\"
+'\" Decimal point set slightly raised
+.if t .ds d \v'-.15m'.\v'+.15m'
+.if n .ds d .
+'\"
+'\" Enclosure macro for examples
+.de EX
+.SP
+.nf
+.ft CW
+..
+.de EE
+.ft R
+.SP
+.fi
+..
+.TH opj_dump 1 "Version 1.4.0" "opj_dump" "dumps jpeg2000 files"
+.P
+.SH NAME
+opj_dump - 
+This program reads in a jpeg2000 image and dumps the contents to stdout. It is part of the OpenJPEG library.
+.SP
+Valid input image extensions are
+.B .j2k, .jp2, .jpt
+.SP
+.SH SYNOPSIS
+.P
+.B opj_dump -i \fRinfile.j2k 
+.P
+.B opj_dump -ImgDir \fRimages/ \fRDump all files in images/
+.P
+.B opj_dump -h  \fRPrint help message and exit
+.P
+.SH OPTIONS
+.TP
+.B \-\^i "name"
+(jpeg2000 input file name)
+.TP
+.B \-\^ImgDir "directory_name"
+(directory containing jpeg2000 input files)
+.P
+'\".SH BUGS
+.SH AUTHORS
+Copyright (c) 2010, Mathieu Malaterre
+.P
+.SH "SEE ALSO"
+opj_compress(1) opj_decompress(1)
--- a/doc/man/man3/libopenjp2.3
+++ b/doc/man/man3/libopenjp2.3
@@ -0,0 +1,337 @@
+'\" t
+'\" The line above instructs most `man' programs to invoke tbl
+'\"
+'\" Separate paragraphs; not the same as PP which resets indent level.
+.de SP
+.if t .sp .5
+.if n .sp
+..
+'\"
+'\" Replacement em-dash for nroff (default is too short).
+.ie n .ds m " -
+.el .ds m \(em
+'\"
+'\" Placeholder macro for if longer nroff arrow is needed.
+.ds RA \(->
+'\"
+'\" Decimal point set slightly raised
+.if t .ds d \v'-.15m'.\v'+.15m'
+.if n .ds d .
+'\"
+'\" Enclosure macro for examples
+.de EX
+.SP
+.nf
+.ft CW
+..
+.de EE
+.ft R
+.SP
+.fi
+..
+.TH libopenjp2 3 "Oct 2010" "Version 1.4.0" "Oct 2010"
+.P
+.SH NAME
+libopenjp2 -
+a library for reading and writing JPEG2000 image files.
+.SP
+.SH SYNOPSIS
+.P
+.B #include <openjpeg.h>
+.P
+.SS CONVERSION FORMATS
+.B PGX: imagetopgx() \fR/\fB pgxtoimage()
+.P
+.B PXM: imagetopnm() \fR/\fB pnmtoimage()
+.P
+.B BMP: imagetobmp() \fR/\fB bmptoimage()
+.P
+.B TIF: imagetotif() \fR/\fB tiftoimage()
+.P
+.B RAW: imagetoraw() \fR/\fB rawtoimage()
+.P
+.B TGA: imagetotga() \fR/\fB tgatoimage()
+.P
+.B PNG: imagetopng() \fR/\fB pngtoimage()
+.P
+.B YUV: imagetoyuv() \fR/\fB yuvtoimage() \fR(MJ2) 
+.P
+.SS READ
+.B opj_set_default_decoder_parameters(opj_dparameters_t *\fIparams\fB);
+.P
+.B opj_dinfo_t *opj_create_decompress(OPJ_CODEC_FORMAT \fIformat\fB);
+.P
+.B opj_event_mgr_t *opj_set_event_mgr(opj_common_ptr \fIinfo\fB, opj_event_mgr_t *\fIevent_mgr\fB, void *\fIcontext\fB);
+.P
+.B void opj_setup_decoder(opj_dinfo_t *\fIdinfo\fB, opj_dparameters_t * \fIparams\fB);
+.P
+.B opj_cio_t *opj_cio_open(opj_common_ptr \fIinfo\fB, unsigned char *\fIbuf\fB, int \fIbuf_len\fB);
+.P
+.B opj_image_t *opj_decode(opj_dinfo_t *\fIdinfo\fB, opj_cio_t *\fIcio\fB);
+.P
+.B void opj_cio_close(opj_cio_t *\fIcio\fB);
+.P
+.B void opj_destroy_decompress(opj_dinfo_t *\fIdinfo\fB);
+.P
+.B void opj_image_destroy(opj_image_t *\fIimage\fB);
+.P
+.SS WRITE
+.B void opj_set_default_encoder_parameters(opj_cparameters_t *\fIparams\fB);
+.P
+/*
+.B opj_image_t *FORMATtoimage(const char *\fIfname\fB, opj_cparameters_t *\fIparams\fB);
+.P
+*/
+.br
+.B opj_cinfo_t* opj_create_compress(OPJ_CODEC_FORMAT \fIformat\fB);
+.P
+.B opj_event_mgr_t *opj_set_event_mgr(opj_common_ptr \fIinfo\fB, opj_event_mgr_t *\fIevent_mgr\fB, void *\fIcontext\fB);
+.P
+.B void opj_setup_encoder(opj_cinfo_t *\fIcinfo\fB, opj_cparameters_t *\fIparams\fB, opj_image_t *\fIimage\fB);
+.P
+.B opj_cio_t *opj_cio_open(opj_common_ptr \fIcinfo\fB, \fINULL\fB, \fI0\fB);
+.P
+.B  bool opj_encode(opj_cinfo_t *\fIcinfo\fB, opj_cio_t *\fIcio\fB, opj_image_t *\fIimage\fB, char *\fIindex\fB);
+.P
+.B void opj_cio_close(opj_cio_t *\fIcio\fB);
+.P
+.B void opj_destroy_compress(opj_cinfo_t *\fIcinfo\fB);
+.P
+.B void opj_image_destroy(opj_image_t *\fIimage\fB);
+.P
+.SS GENERAL
+.P
+.B void opj_image_create(int \fInumcmpts\fB, opj_image_cmptparm_t *\fIcmptparms\fB, OPJ_COLOR_SPACE \fIclrspc\fB);
+.P
+.B int cio_tell(opj_cio_t *\fIcio\fB);
+.P
+.B void cio_seek(opj_cio_t *\fIcio\fB, int \fIpos\fB);
+.P
+.B opj_image_t *opj_decode_with_info(opj_dinfo_t *\fIdinfo\fB, opj_cio_t *\fIcio\fB, opj_codestream_info_t *\fIcstr_info\fB);
+.P
+.B bool opj_encode_with_info(opj_cinfo_t *\fIcinfo\fB, opj_cio_t *\fIcio\fB, opj_image_t *\fIimage\fB, opj_codestream_info_t *\fIcstr_info\fB);
+.P
+.B void opj_destroy_cstr_info(opj_codestream_info_t *\fIcstr_info\fB);
+.P
+.B const char *opj_version(\fIvoid\fB);
+.P
+.SH OPJ_CODEC_FORMAT
+.P
+.B CODEC_J2K\fR or \fBCODEC_JPT\fR or \fBCODEC_JP2
+.P
+.SH OPJ_COLOR_SPACE
+.P
+.B CLRSPC_UNKNOWN\fR or \fBCLRSPC_UNSPECIFIED\fR or \fBCLRSPC_SRGB\fR or \fBCLRSPC_GRAY\fR or \fBCLRSPC_SYCC
+.P
+.SH DECOMPRESSION PARAMETERS
+.p
+typedef struct opj_dparameters 
+.br
+{
+    /*
+    Set the number of highest resolution levels to be discarded.
+    The image resolution is effectively divided by 2 to the power 
+    of the number of discarded levels.
+    The reduce factor is limited by the smallest total number of 
+    decomposition levels among tiles.
+    if != 0, then original dimension divided by 2^(reduce);
+    if == 0 or not used, image is decoded to the full resolution
+    */
+    \fBint\fR cp_reduce;
+    /*
+    Set the maximum number of quality layers to decode.
+    If there are less quality layers than the specified number, 
+    all the quality layers are decoded.
+    if != 0, then only the first "layer" layers are decoded;
+    if == 0 or not used, all the quality layers are decoded
+    */
+    \fBint\fR cp_layer;
+
+    /*command line encoder parameters (not used inside the library) */
+    /* input file name */
+    \fBchar\fR infile[OPJ_PATH_LEN];
+    /* output file name */
+    \fBchar\fR outfile[OPJ_PATH_LEN];
+    /* input file format: see OPJ_CODEC_FORMAT */
+    \fBint\fR decod_format;
+    /* output file format */
+    \fBint\fR cod_format;
+
+    /*JPWL decoding parameters */
+    /* activates the JPWL correction capabilities */
+    \fBbool\fR jpwl_correct;
+    /* expected number of components */
+    \fBint\fR jpwl_exp_comps;
+    /* maximum number of tiles */
+    \fBint\fR jpwl_max_tiles;
+
+    /*
+    Specify whether the decoding should be done on the entire 
+    codestream, or be limited to the main header
+    Limiting the decoding to the main header makes it possible 
+    to extract the characteristics of the codestream
+    if == NO_LIMITATION, the entire codestream is decoded;
+    if == LIMIT_TO_MAIN_HEADER, only the main header is decoded;
+    */
+    \fBOPJ_LIMIT_DECODING\fR cp_limit_decoding;
+.br
+} opj_dparameters_t;
+
+.SH COMPRESSION PARAMETERS
+.P
+typedef struct opj_cparameters 
+.br
+{
+    /* size of tile: tile_size_on = false (not in argument) 
+    or tile_size_on = true (in argument) */
+    \fBbool\fR tile_size_on;
+    /* XTOsiz */
+    \fBint\fR cp_tx0;
+    /* YTOsiz */
+    \fBint\fR cp_ty0;
+    /* XTsiz */
+    \fBint\fR cp_tdx;
+    /* YTsiz */
+    \fBint\fR cp_tdy;
+    /* allocation by rate/distortion */
+    \fBint\fR cp_disto_alloc;
+    /* allocation by fixed layer */
+    \fBint\fR cp_fixed_alloc;
+    /* add fixed_quality */
+    \fBint\fR cp_fixed_quality;
+    /* fixed layer */
+    \fBint *\fRcp_matrice;
+    /* comment for coding */
+    \fBchar *\fRcp_comment;
+    /* coding style */
+    \fBint\fR csty;
+    /* progression order:
+       PROG_UNKNOWN, LRCP(default), RLCP, RPCL, PCRL, CPRL */
+    \fBOPJ_PROG_ORDER\fR prog_order;
+    /* progression order changes */
+    \fBopj_poc_t\fR POC[32];
+    /* number of progression order changes (POC), default: 0 */
+    \fBint\fR numpocs;
+    /* number of layers */
+    \fBint\fR tcp_numlayers;
+    /* rates of layers */
+    \fBfloat\fR tcp_rates[100];
+    /* different psnr for successive layers */
+    \fBfloat\fR tcp_distoratio[100];
+    /* number of resolutions */
+    \fBint\fR numresolution;
+    /* initial code block width, default: 64 */
+    \fBint\fR cblockw_init;
+    /* initial code block height, default: 64 */
+    \fBint\fR cblockh_init;
+    /* mode switch (cblk_style) */
+    /* 1 : use the irreversible DWT 9-7, 
+        0 : use lossless compression (default) */
+    \fBint\fR irreversible;
+    /* region of interest: affected component in [0..3], 
+        -1 means no ROI */
+    \fBint\fR roi_compno;
+    /* region of interest: upshift value */
+    \fBint\fR roi_shift;
+    /* number of precinct size specifications */
+    \fBint\fR res_spec;
+    /* initial precinct width */
+    \fBint\fR prcw_init[J2K_MAXRLVLS];
+    /* initial precinct height */
+    \fBint\fR prch_init[J2K_MAXRLVLS];
+
+    /*command line encoder parameters (not used inside the library) */
+    /* input file name */
+    \fBchar\fR infile[OPJ_PATH_LEN];
+    /* output file name */
+    \fBchar\fR outfile[OPJ_PATH_LEN];
+    /* DEPRECATED. Index generation is now handeld with the 
+        opj_encode_with_info() function. Set to NULL */
+    \fBint\fR index_on;
+    /* DEPRECATED. Index generation is now handeld with the 
+        opj_encode_with_info() function. Set to NULL */
+    \fBchar\fR index[OPJ_PATH_LEN];
+    /* subimage encoding: origin image offset in x direction */
+    \fBint\fR image_offset_x0;
+    /* subimage encoding: origin image offset in y direction */
+    \fBint\fR image_offset_y0;
+    /* subsampling value for dx */
+    \fBint\fR subsampling_dx;
+    /* subsampling value for dy */
+    \fBint\fR subsampling_dy;
+    /* input file format */
+    \fBint\fR decod_format;
+    /* output file format: see OPJ_CODEC_FORMAT */
+    \fBint\fR cod_format;
+
+    /*JPWL encoding parameters */
+    /* enables writing of EPC in MH, thus activating JPWL */
+    \fBbool\fR jpwl_epc_on;
+    /* error protection method for MH (0,1,16,32,37-128) */
+    \fBint\fR jpwl_hprot_MH;
+    /* tile number of header protection specification (>=0) */
+    \fBint\fR jpwl_hprot_TPH_tileno[JPWL_MAX_NO_TILESPECS];
+    /* error protection methods for TPHs (0,1,16,32,37-128) */
+    \fBint\fR jpwl_hprot_TPH[JPWL_MAX_NO_TILESPECS];
+    /* tile number of packet protection specification (>=0) */
+    \fBint\fR jpwl_pprot_tileno[JPWL_MAX_NO_PACKSPECS];
+    /* packet number of packet protection specification (>=0) */
+    \fBint\fR jpwl_pprot_packno[JPWL_MAX_NO_PACKSPECS];
+    /* error protection methods for packets (0,1,16,32,37-128) */
+    \fBint\fR jpwl_pprot[JPWL_MAX_NO_PACKSPECS];
+    /* enables writing of ESD, (0=no/1/2 bytes) */
+    \fBint\fR jpwl_sens_size;
+    /* sensitivity addressing size (0=auto/2/4 bytes) */
+    \fBint\fR jpwl_sens_addr;
+    /* sensitivity range (0-3) */
+    \fBint\fR jpwl_sens_range;
+    /* sensitivity method for MH (-1=no,0-7) */
+    \fBint\fR jpwl_sens_MH;
+    /* tile number of sensitivity specification (>=0) */
+    \fBint\fR jpwl_sens_TPH_tileno[JPWL_MAX_NO_TILESPECS];
+    /* sensitivity methods for TPHs (-1=no,0-7) */
+    \fBint\fR jpwl_sens_TPH[JPWL_MAX_NO_TILESPECS];
+
+    /* Digital Cinema compliance: OFF-not compliant, 
+       CINEMA2K_24, CINEMA2K_48, CINEMA4K_24 */
+    \fBOPJ_CINEMA_MODE\fR cp_cinema;
+    /* Maximum rate for each component. 
+        If == 0, component size limitation is not considered */
+    \fBint\fR max_comp_size;
+    /* Profile name*/
+    \fBOPJ_RSIZ_CAPABILITIES\fR cp_rsiz;
+    /* Tile part generation*/
+    \fBchar\fR tp_on;
+    /* Flag for Tile part generation*/
+    \fBchar\fR tp_flag;
+    /* MCT (multiple component transform) */
+    \fBchar\fR tcp_mct;
+.br
+} opj_cparameters_t;
+
+
+'\".SH OPTIONS
+'\".SH BUGS
+.SH AUTHORS
+Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
+
+Copyright (c) 2002-2014, Professor Benoit Macq
+
+Copyright (c) 2001-2003, David Janssens
+
+Copyright (c) 2002-2003, Yannick Verschueren
+
+Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+
+Copyright (c) 2005, Herve Drolon, FreeImage Team
+
+Copyright (c) 2006-2007, Parvatha Elangovan
+
+.P
+.SH "SEE ALSO"
+\fBimage_to_j2k\fR(1) \fBj2k_to_image\fR(1) \fBj2k_dump\fR(1)
+
+\fBJPWL_image_to_j2k\fR(1) \fBJPWL_j2k_to_image\fR(1)
+
+\fBextract_j2k_from_mj2\fR(1) \fBwrap_j2k_in_mj2\fR(1) 
+\fBframes_to_mj2\fR(1) \fBmj2_to_frames\fR(1)
--- a/doc/openjpip.dox.in
+++ b/doc/openjpip.dox.in
@@ -0,0 +1,94 @@
+/*
+ * $Id$
+ *
+ * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2014, Professor Benoit Macq
+ * Copyright (c) 2010-2011, Kaori Hagihara
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+/*! \page openjpippage OpenJPIP v@OPENJPEG_VERSION@ Documentation
+ *
+ * \section intro Introduction
+ * This manual documents the low-level OpenJPIP C API.\n
+ * OpenJPIP software is an implementation of JPEG 2000 Part9: Interactivity tools, APIs and protocols (JPIP).\n
+ * ( For more info about JPIP, check the website: http://www.jpeg.org/jpeg2000/j2kpart9.html)\n
+ *
+ * This whole documents covers the following six programs.\n
+ * - opj_server.c          JPIP server supporting HTTP connection and JPT/JPP-stream
+ * - opj_dec_server.c      Server to decode JPT/JPP-stream and communicate locally with JPIP client, which is coded in java
+ * - opj_jpip_addxml.c     To Embed metadata into JP2 file
+ * - opj_jpip_transcode.c  To Convert JPT/JPP-stream to JP2 or J2K
+ * - opj_jpip_test.c       To test index code format of a JP2 file
+ *
+ * \section license License
+ * This software is released under the BSD license, anybody can use or modify the library, even for commercial applications.\n
+ * The only restriction is to retain the copyright in the sources or the binaries documentation.\n
+ * Neither the author, nor the university accept any responsibility for any kind of error or data loss which may occur during usage.
+ *
+ *
+ * \section reqlibs Required libraries
+ *  - OpenJPEG library
+ *  - FastCGI development kit (C libraries) at server (http://www.fastcgi.com)
+ *  - libcURL library
+ *
+ *  We tested this software with a virtual server running on the same Linux machine as the clients.
+ *
+ *
+ * \section compilenotes Compiling Notes
+ * When you are making opj_server, set anything (e.g. yes) to the parameter jpipserver to define itself in the Makefile, which enables to make it in server mode.\n
+ * Otherwise do not define (or do not set to) the parameter jpipserver.\n
+ * Be sure that any object files and library file libopenjpip.a are not reused to compile in the two different mode (server mode and non server mode).\n
+ * In other words, do make clean before making new targets which are in different modes as previous make.\n
+ *
+ * 
+ * \section sysarchtect System Architecture
+ * JPIP protocol is implimented between the JPIP server program (opj_server) and the JPIP client java program (opj_viewer).\n
+ * Figure below represents the overview of our system architecture.\n
+ * The JPIP server parses JPIP query and sends corresponding JPT/JPP-stream.
+ * The JPIP client viewer is an image viewer with GUI to publish JPIP requests and receive JPT/JPP-stream.\n
+ * Particularly, our system has the image decoding module implemented on a server (opj_dec_server, Image decoding Server). 
+ * Image decoding Server and JPIP client viewer communicate closely. 
+ * This specific architecture enables sharing cache of image codestream data among all viewers connected to the same Image decoding Server not only locally but also remotely.
+ *
+ *  \image html jpip_architect.png "OpenJPIP system architecture"
+ *
+ * JPIP server follows up the client cache during a session. \n
+ * Concretely, the JPIP server models cache in each session, to which Channel IDs are associated. 
+ * A Channel ID identifies a JPIP client viewer. 
+ * And, new viewers can belong to a session by referring to one of its channel ID.
+ * The Image decoding Server maintains the association between channel IDs and targets, and provides a reference channel ID to a Viewer on demand.\n
+ * 
+ * Typical requests and replies among JPIP server, JPIP client, and Image decoding server is presented below.\n
+ * The JPIP server parses HTTP query and sends corresponding JPT/JPP-stream back to the JPIP client (Viewer).
+ * JPT/JPP-stream is unreadable by JPIP client, and it is directly passed to Image decoding Server, and which provides the image in raw format (PGM or PPM) to the JPIP client.
+ * The Image decoding Server handles the decoding and caching of JPT/JPP-stream.
+ * JPIP client can read PGM and PPM images natively.
+ * Before connecting to the JPIP server, every JPIP client checks local cache data of the requesting image with the image decoding server.
+ * If its cache exists, the image decoding server provides ChannelID (CID), which identifies the image and its cache model on the JPIP server, and the whole system can continue the session using the CID.
+ *
+ *  \image html jpip_protocol.png "Message Sequence Chart of OpenJPIP impementation"
+ *
+ * \author Kaori Hagihara UCL/SST/ICTM/ELEN
+ */
--- a/indexer_JPIP/Makefile
+++ b/indexer_JPIP/Makefile
@@ -1,23 +0,0 @@
-CC = gcc
-
-LDFLAGS = -lm
-CFLAGS = -Wall
-
-all: index_create
-
-
-bio.o : bio.c bio.h
-cio.o : cio.c cio.h
-int.o : int.c
-pi.o  : pi.c pi.h int.h
-index_create.o : index_create.c j2k.h cio.h tcd.h int.h
-t2.o  : t2.c t2.h tcd.h bio.h j2k.h pi.h tgt.h int.h cio.h
-tgt.o : tgt.c bio.h tgt.h
-tcd.o : tcd.c tcd.h t2.h int.h
-jpip.o : jpip.c j2k.h cio.h tcd.h int.h
-jp2.o : jp2.c j2k.h cio.h tcd.h int.h
-
-index_create : bio.o cio.o int.o pi.o t2.o tgt.o tcd.o index_create.o jpip.o jp2.o
-
-clean:
-	rm -rf *.o *.*~ *~ core.*
--- a/indexer_JPIP/bio.c
+++ b/indexer_JPIP/bio.c
@@ -1,125 +0,0 @@
-/*
- * Copyright (c) 2001-2002, David Janssens
- * Copyright (c) 2003, Yannick Verschueren
- * Copyright (c) 2003,  Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
- * 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 "bio.h"
-#include <setjmp.h>
-
-static unsigned char *bio_start, *bio_end, *bio_bp;
-static unsigned int bio_buf;
-static int bio_ct;
-
-extern jmp_buf j2k_error;
-
-/// <summary>
-/// Number of bytes written.
-/// </summary>
-int bio_numbytes() {
-    return bio_bp-bio_start;
-}
-
-/// <summary>
-/// Init decoder.
-/// </summary>
-/// <param name="bp">Input buffer</param>
-/// <param name="len">Input buffer length</param>
-void bio_init_dec(unsigned char *bp, int len) {
-    bio_start=bp;
-    bio_end=bp+len;
-    bio_bp=bp;
-    bio_buf=0;
-    bio_ct=0;
-}
-
-int bio_byteout()
-{
-	bio_buf = (bio_buf << 8) & 0xffff;
-	bio_ct = bio_buf == 0xff00 ? 7 : 8;
-	if (bio_bp >= bio_end)
-		return 1;
-	*bio_bp++ = bio_buf >> 8;
-	return 0;
-}
-
-/// <summary>
-/// Read byte. 
-/// </summary>
-int bio_bytein() {
-    bio_buf=(bio_buf<<8)&0xffff;
-    bio_ct=bio_buf==0xff00?7:8;
-    if (bio_bp>=bio_end) return 1; //longjmp(j2k_error, 1);
-    bio_buf|=*bio_bp++;
-    return 0;
-}
-
-/// <summary>
-/// Read bit.
-/// </summary>
-int bio_getbit() {
-    if (bio_ct==0) {
-        bio_bytein();
-    }
-    bio_ct--;
-    return (bio_buf>>bio_ct)&1;
-}
-
-/// <summary>
-/// Read bits.
-/// </summary>
-/// <param name="n">Number of bits to read</param>
-int bio_read(int n) {
-    int i, v;
-    v=0;
-    for (i=n-1; i>=0; i--) {
-        v+=bio_getbit()<<i;
-    }
-    return v;
-}
-
-/// <summary>
-/// Flush bits.
-/// </summary>
-int bio_flush() {
-    bio_ct=0;
-    bio_byteout();
-    if (bio_ct==7) {
-        bio_ct=0;
-       if ( bio_byteout()) return 1;;
-    }
-    return 0;
-}
-
-/// <summary>
-/// </summary>
-int bio_inalign() {
-    bio_ct=0;
-    if ((bio_buf&0xff)==0xff) {
-       if( bio_bytein()) return 1;
-        bio_ct=0;
-    }
-    return 0;
-}
--- a/indexer_JPIP/cio.c
+++ b/indexer_JPIP/cio.c
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 2001-2002, David Janssens
- * Copyright (c) 2003, Yannick Verschueren
- * Copyright (c) 2003, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
- * 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 "cio.h"
-#include <setjmp.h>
-
-static unsigned char *cio_start, *cio_end, *cio_bp;
-
-extern jmp_buf j2k_error;
-
-/// <summary>
-/// Number of bytes written.
-/// </summary>
-int cio_numbytes() {
-    return cio_bp-cio_start;
-}
-
-/// <summary>
-/// Get position in byte stream.
-/// </summary>
-int cio_tell() {
-    return cio_bp-cio_start;
-}
-
-/// <summary>
-/// Set position in byte stream.
-/// </summary>
-void cio_seek(int pos) {
-    cio_bp=cio_start+pos;
-}
-
-/// <summary>
-/// Number of bytes left before the end of the stream.
-/// </summary>
-int cio_numbytesleft() {
-    return cio_end-cio_bp;
-}
-
-/// <summary>
-/// Get pointer to the current position in the stream.
-/// </summary>
-unsigned char *cio_getbp() {
-    return cio_bp;
-}
-
-/// <summary>
-/// Initialize byte IO.
-/// </summary>
-void cio_init(unsigned char *bp, int len) {
-    cio_start=bp;
-    cio_end=bp+len;
-    cio_bp=bp;
-}
-
-/// <summary>
-/// Write a byte.
-/// </summary>
-void cio_byteout(unsigned char v) {
-  if (cio_bp>=cio_end) longjmp(j2k_error, 1);
-  *cio_bp++=v;
-    
-}
-
-/// <summary>
-/// Read a byte.
-/// </summary>
-unsigned char cio_bytein() {
-    if (cio_bp>=cio_end) longjmp(j2k_error, 1);
-    return *cio_bp++;
-}
-
-/// <summary>
-/// Write a byte.
-/// </summary>
-//void cio_write(unsigned int v, int n) {
-void cio_write(long long v, int n) {
-    int i;
-    for (i=n-1; i>=0; i--) 
-      {
-	cio_byteout((unsigned char)((v>>(i<<3))&0xff));
-      }
-}
-
-/// <summary>
-/// Read some bytes.
-/// </summary>
-/* unsigned int cio_read(int n) { */
-long long cio_read(int n) {
-    int i;
-    /*unsigned int v;*/
-    long long v;
-    v=0;
-    for (i=n-1; i>=0; i--) {
-      v+=cio_bytein()<<(i<<3);
-    }
-    return v;
-}
-
-/// <summary>
-/// Write some bytes.
-/// </summary>
-void cio_skip(int n) {
-    cio_bp+=n;
-}
--- a/indexer_JPIP/fix.h
+++ b/indexer_JPIP/fix.h
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2001-2002, David Janssens
- * Copyright (c) 2003, Yannick Verschueren
- * Copyright (c) 2003,  Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __FIX_H
-#define __FIX_H
-
-int fix_mul(int a, int b);
-
-#endif
--- a/indexer_JPIP/index_create.c
+++ b/indexer_JPIP/index_create.c
--- a/indexer_JPIP/int.c
+++ b/indexer_JPIP/int.c
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2001-2002, David Janssens
- * Copyright (c) 2003, Yannick Verschueren
- * Copyright (c) 2003, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
- * 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.
- */
-
-/// <summary>
-/// Get the minimum of two integers.
-/// </summary>
-int int_min(int a, int b) {
-    return a<b?a:b;
-}
-
-/// <summary>
-/// Get the maximum of two integers.
-/// </summary>
-int int_max(int a, int b) {
-    return a>b?a:b;
-}
-
-/// <summary>
-/// Clamp an integer inside an interval.
-/// </summary>
-int int_clamp(int a, int min, int max) {
-    if (a<min) return min;
-    if (a>max) return max;
-    return a;
-}
-
-/// <summary>
-/// Get absolute value of integer.
-/// </summary>
-int int_abs(int a) {
-    return a<0?-a:a;
-}
-
-/// <summary>
-/// Divide an integer and round upwards.
-/// </summary>
-int int_ceildiv(int a, int b) {
-    return (a+b-1)/b;
-}
-
-/// <summary>
-/// Divide an integer by a power of 2 and round upwards.
-/// </summary>
-int int_ceildivpow2(int a, int b) {
-    return (a+(1<<b)-1)>>b;
-}
-
-/// <summary>
-/// Divide an integer by a power of 2 and round downwards.
-/// </summary>
-int int_floordivpow2(int a, int b) {
-    return a>>b;
-}
-
-/// <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;
-}
--- a/indexer_JPIP/int.h
+++ b/indexer_JPIP/int.h
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2001-2002, David Janssens
- * Copyright (c) 2003, Yannick Verschueren
- * Copyright (c) 2003, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __INT_H
-#define __INT_H
-
-int int_min(int a, int b);
-int int_max(int a, int b);
-int int_clamp(int a, int min, int max);
-int int_abs(int a);
-int int_ceildiv(int a, int b);
-int int_ceildivpow2(int a, int b);
-int int_floordivpow2(int a, int b);
-int int_floorlog2(int a);
-
-#endif
--- a/indexer_JPIP/j2k.h
+++ b/indexer_JPIP/j2k.h
@@ -1,288 +0,0 @@
-/*
- * Copyright (c) 2001-2002, David Janssens
- * Copyright (c) 2003-2004, Yannick Verschueren
- * Copyright (c) 2003-2004, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
- * 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.
- */
-
-#define VERSION "0.0.8"
-
-#ifdef WIN32
-#ifdef LIBJ2K_EXPORTS
-#define LIBJ2K_API __declspec(dllexport)
-#else
-#define LIBJ2K_API __declspec(dllimport)
-#endif
-#else
-#define LIBJ2K_API
-#endif
-
-#ifndef __J2K_H
-#define __J2K_H
-
-#define J2K_MAXRLVLS 33
-#define J2K_MAXBANDS (3*J2K_MAXRLVLS+1)
-
-#define J2K_CP_CSTY_PRT 0x01
-#define J2K_CP_CSTY_SOP 0x02
-#define J2K_CP_CSTY_EPH 0x04
-#define J2K_CCP_CSTY_PRT 0x01
-#define J2K_CCP_CBLKSTY_LAZY 0x01
-#define J2K_CCP_CBLKSTY_RESET 0x02
-#define J2K_CCP_CBLKSTY_TERMALL 0x04
-#define J2K_CCP_CBLKSTY_VSC 0x08
-#define J2K_CCP_CBLKSTY_PTERM 0x10
-#define J2K_CCP_CBLKSTY_SEGSYM 0x20
-#define J2K_CCP_QNTSTY_NOQNT 0
-#define J2K_CCP_QNTSTY_SIQNT 1
-#define J2K_CCP_QNTSTY_SEQNT 2
-
-typedef struct 
-{
-  int dx, dy;   /* XRsiz, YRsiz            */
-  int prec;     /* precision               */
-  int bpp;      /* deapth of image in bits */
-  int sgnd;     /* signed                  */
-  int *data;    /* image-component data    */
-} j2k_comp_t;
-
-typedef struct {
-  int version;
-  int x0, y0;          /* XOsiz, YOsiz              */
-  int x1, y1;          /* Xsiz, Ysiz                */ 
-  int numcomps;        /* number of components      */
-  int index_on;        /* 0 = no index || 1 = index */
-  j2k_comp_t *comps;   /* image-components          */
-} j2k_image_t;
-
-typedef struct {
-  int expn;     /* exponent */
-  int mant;     /* mantissa */
-} j2k_stepsize_t;
-
-typedef struct {
-  int csty;                                /* coding style                          */
-  int numresolutions;                      /* number of resolutions                 */
-  int cblkw;                               /* width of code-blocks                  */
-  int cblkh;                               /* height of code-blocks                 */
-  int cblksty;                             /* code-block coding style               */
-  int qmfbid;                              /* discrete wavelet transform identifier */
-  int qntsty;                              /* quantisation style                    */
-  j2k_stepsize_t stepsizes[J2K_MAXBANDS];  /* stepsizes used for quantisation       */
-  int numgbits;                            /* number of guard bits                  */
-  int roishift;                            /* Region of Interest shift              */
-  int prcw[J2K_MAXRLVLS];                  /* Precinct width                        */
-  int prch[J2K_MAXRLVLS];                  /* Precinct height                       */
-} j2k_tccp_t;
-
-typedef struct {
-    int resno0, compno0; 
-    int layno1, resno1, compno1;
-    int prg;
-    int tile;
-    char progorder[4];
-} j2k_poc_t;
-
-typedef struct {
-  int csty;                  /* coding style                                                            */  
-  int prg;                   /* progression order                                                       */
-  int numlayers;             /* number of layers                                                        */
-  int mct;                   /* multi-component transform identifier                                    */
-  int rates[100];            /* rates of layers                                                         */
-  int numpocs;               /* number of progression order changes                                     */
-  int POC;                   /* Precise if a POC marker has been used O:NO, 1:YES                       */
-  j2k_poc_t pocs[32];        /* progression order changes                                               */
-  unsigned char *ppt_data;   /* packet header store there for futur use in t2_decode_packet             */
-  int ppt;                   /* If ppt == 1 --> there was a PPT marker for the present tile             */
-  int ppt_store;             /* Use in case of multiple marker PPT (number of info already store)       */
-  j2k_tccp_t *tccps;         /* tile-component coding parameters                                        */
-} j2k_tcp_t;
-
-typedef struct {
-  int tx0, ty0;              /* XTOsiz, YTOsiz                                                          */
-  int tdx, tdy;              /* XTsiz, YTsiz                                                            */
-  int tw, th;
-  unsigned char *ppm_data;   /* packet header store there for futur use in t2_decode_packet             */
-  int ppm;                   /* If ppm == 1 --> there was a PPM marker for the present tile             */
-  int ppm_store;             /* Use in case of multiple marker PPM (number of info already store)       */
-  int ppm_previous;          /* Use in case of multiple marker PPM (case on non-finished previous info) */
-  j2k_tcp_t *tcps;           /* tile coding parameters                                                  */
-} j2k_cp_t;
-
-
-
-
-
-/* Packet information : Layer level */
-typedef struct {  
-  int len;               /* Length of the body of the packet   */
-  int len_header;        /* Length of the header of the packet */
-  int offset;            /* Offset of the body of the packet   */
-  int offset_header;     /* Offset of the header of the packet */
-} info_layer_t;
-
-
-/* Access to packet information : precinct level */
-typedef struct {  
-  info_layer_t *layer;
-} info_prec_t;
-
-
-/* Access to packet information : resolution level */
-typedef struct {  
-  info_prec_t *prec;
-} info_reso_t;
-
-
-/* Access to packet information : component level */
-typedef struct {  
-  info_reso_t *reso;
-} info_compo_t;
-
-
-/* Information about the marker */
-typedef struct {
-  int type;       /* type of marker [SIZ, QCD, POC, PPM, CRG, COD] appearing only once */
-  int start_pos;  /* Start position of the marker                                      */
-  int len;        /* Length of the marker                                              */
-} info_marker_t;
-
-
-/* Multiple marker in tile header */
-typedef struct{
-  info_marker_t *COC;    /* COC markers                    */
-  int num_COC;           /* Number of COC marker           */
-  int CzCOC;             /* Current size of the vector COC */
-  
-  info_marker_t *RGN;    /* RGN markers                    */
-  int num_RGN;           /* Number of RGN marker           */
-  int CzRGN;             /* Current size of the vector RGN */
-  
-  info_marker_t *QCC;    /* QCC markers                    */
-  int num_QCC;           /* Number of QCC marker           */
-  int CzQCC;             /* Current size of the vector QCC */
-  
-  info_marker_t *PLT;    /* PLT markers                    */
-  int num_PLT;           /* Number of PLT marker           */
-  int CzPLT;             /* Current size of the vector PLT */
-  
-  info_marker_t *PPT;    /* PPT markers                    */
-  int num_PPT;           /* Number of PPT marker           */
-  int CzPPT;             /* Current size of the vector PPT */
-  
-  info_marker_t *COM;    /* COM markers                    */
-  int num_COM;           /* Number of COM marker           */
-  int CzCOM;             /* Current size of the vector COC */
-} info_marker_mul_tile_t; 
-
-
-/* Information about each tile_part for a particulary tile */
-typedef struct{
-  int start_pos;                      /* Start position of the tile_part       */ 
-  int length;                         /* Length of the tile_part header + body */
-  int length_header;                  /* Length of the header                  */
-  int end_pos;                        /* End position of the tile part         */
-  int end_header;                     /* End position of the tile part header  */
-
-  int num_reso_AUX;                   /* Number of resolution level completed  */
-} info_tile_part_t;
-
-
-/* Information about each tile */
-typedef struct {
-  int num_tile;                       /* Number of Tile                                                    */
-  int pw, ph;                         /* number of precinct by tile                                        */
-  int num_packet;                     /* number of packet in the tile                                      */
-  info_compo_t *compo;                /* component [packet]                                                */
-  
-  info_marker_t *marker;              /* information concerning markers inside image [only one apparition] */
-  info_marker_mul_tile_t marker_mul;  /* information concerning markers inside image [multiple apparition] */ 
-  int num_marker;                     /* number of marker                                                  */
-  
-  int numparts;                       /* number of tile_part for this tile                                 */
-  info_tile_part_t *tile_parts;       /* Information about each tile_part                                  */
-  int Cztile_parts;                   /* Current size of the tile_parts vector                             */
-} info_tile_t;                        /* index struct                                                      */
-
-
-/* Multiple marker in main header */
-typedef struct{
-  info_marker_t *COC;    /* COC markers                    */
-  int num_COC;           /* Number of COC marker           */
-  int CzCOC;             /* Current size of the vector COC */
- 
-  info_marker_t *RGN;    /* RGN markers                    */
-  int num_RGN;           /* Number of RGN marker           */
-  int CzRGN;             /* Current size of the vector RGN */
-  
-  info_marker_t *QCC;    /* QCC markers                    */
-  int num_QCC;           /* Number of QCC marker           */
-  int CzQCC;             /* Current size of the vector QCC */
-  
-  info_marker_t *TLM;    /* TLM markers                    */
-  int num_TLM;           /* Number of TLM marker           */
-  int CzTLM;             /* Current size of the vector TLM */
-  
-  info_marker_t *PLM;    /* PLM markers                    */
-  int num_PLM;           /* Number of PLM marker           */
-  int CzPLM;             /* Current size of the vector PLM */
-  
-  info_marker_t *PPM;    /* PPM markers                    */
-  int num_PPM;           /* Number of PPM marker           */
-  int CzPPM;             /* Current size of the vector PPM */
-  
-  info_marker_t *COM;    /* COM markers                    */
-  int num_COM;           /* Number of COM marker           */
-  int CzCOM;             /* Current size of the vector COM */
-} info_marker_mul_t; /* index struct */
-
-
-/* Information about image */
-typedef struct {
-  int Im_w, Im_h;                /* Image width and Height                                            */
-  int Tile_x, Tile_y;            /* Number of Tile in X and Y                                         */
-  int tw, th;
-  int pw, ph;                    /* nombre precinct in X and Y                                        */
-  int pdx, pdy;                  /* size of precinct in X and Y                                       */
-
-  int Prog;                      /* progression order                                                 */
-  int Comp;                      /* Component numbers                                                 */
-  int Layer;                     /* number of layer                                                   */
-  int Decomposition;             /* number of decomposition                                           */
-
-  int Main_head_end;             /* Main header position                                              */
-  int codestream_size;           /* codestream's size                                                 */
-
-  info_marker_t *marker;         /* information concerning markers inside image [only one apparition] */
-  info_marker_mul_t marker_mul;  /* information concerning markers inside image [multiple apparition] */ 
-  int num_marker;                /* number of marker                                                  */
-
-  int num_packet_max;            /* Maximum number of packet                                          */
-
-  int num_max_tile_parts;        /* Maximum number of tile-part                                       */
-  info_tile_t *tile;             /* information concerning tiles inside image                         */
-} info_image_t; /* index struct */
-
-
-#endif
--- a/indexer_JPIP/jp2.c
+++ b/indexer_JPIP/jp2.c
@@ -1,301 +0,0 @@
-/*
- * Copyright (c) 2003-2004, Yannick Verschueren
- * Copyright (c) 2003-2004,  Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
- * 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 <stdlib.h>
-#include <string.h>
-
-#include "j2k.h"
-#include "cio.h"
-#include "tcd.h"
-#include "int.h"
-
-#define JPIP_JPIP 0x6a706970
-
-#define JP2_JP   0x6a502020
-#define JP2_FTYP 0x66747970
-#define JP2_JP2H 0x6a703268
-#define JP2_IHDR 0x69686472
-#define JP2_COLR 0x636f6c72
-#define JP2_JP2C 0x6a703263
-#define JP2_URL  0x75726c20
-#define JP2_DBTL 0x6474626c
-#define JP2_BPCC 0x62706363
-#define JP2      0x6a703220
-
-
-void jp2_write_url(char *Idx_file)
-{
-  int len, lenp, i;
-  char str[256];
-
-  sprintf(str, "%s", Idx_file);
-  lenp=cio_tell();
-  cio_skip(4);
-  cio_write(JP2_URL, 4);  // DBTL
-  cio_write(0,1);          // VERS
-  cio_write(0,3);          // FLAG
-
-  for (i=0; i<strlen(str); i++) {
-        cio_write(str[i], 1);
-    }
-
-  len=cio_tell()-lenp;
-  cio_seek(lenp);
-  cio_write(len,4);         // L
-  cio_seek(lenp+len);
-}
-
-void jp2_write_dbtl(char *Idx_file)
-{
-  int len, lenp;
-
-  lenp=cio_tell();
-  cio_skip(4);
-  cio_write(JP2_DBTL, 4);  // DBTL
-  cio_write(1,2);           // NDR : Only 1
-  
-  jp2_write_url(Idx_file); // URL Box
-
-  len=cio_tell()-lenp;
-  cio_seek(lenp);
-  cio_write(len,4);         // L
-  cio_seek(lenp+len);
-}
-
-int jp2_write_ihdr(j2k_image_t *j2k_img)
-{
-  int len, lenp,i; 
-  int depth_0,depth, sign, BPC_ok=1;
-
-  lenp=cio_tell();
-  cio_skip(4);
-  cio_write(JP2_IHDR, 4);  // IHDR
-
-  cio_write(j2k_img->y1-j2k_img->x0,4);   // HEIGHT
-  cio_write(j2k_img->x1-j2k_img->x0,4);   // WIDTH
-  cio_write(j2k_img->numcomps,2);   // NC
-
-  depth_0=j2k_img->comps[0].prec-1;
-  sign=j2k_img->comps[0].sgnd;
-
-  for(i=1;i<j2k_img->numcomps;i++)
-    {
-      depth=j2k_img->comps[i].prec-1;
-      sign=j2k_img->comps[i].sgnd;
-      if(depth_0!=depth) BPC_ok=0;
-    }
-  
-  if (BPC_ok)
-    cio_write(depth_0+(sign<<7),1);
-  else
-    cio_write(255,1);
-
-  cio_write(7,1);          // C : Always 7
-  cio_write(1,1);          // UnkC, colorspace unknow
-  cio_write(0,1);          // IPR, no intellectual property
-
-  len=cio_tell()-lenp;
-  cio_seek(lenp);
-  cio_write(len,4);         // L
-  cio_seek(lenp+len);
-
-  return BPC_ok;
-}
-
-void jp2_write_bpcc(j2k_image_t *j2k_img)
-{
-  int len, lenp, i;
-  
-  lenp=cio_tell();
-  cio_skip(4);
-  cio_write(JP2_BPCC, 4);  // BPCC
-  
-  for(i=0;i<j2k_img->numcomps;i++)
-    cio_write(j2k_img->comps[i].prec-1+(j2k_img->comps[i].sgnd<<7),1);
-
-  len=cio_tell()-lenp;
-  cio_seek(lenp);
-  cio_write(len,4);         // L
-  cio_seek(lenp+len);
-}
-
-void jp2_write_colr(int BPC_ok, j2k_image_t *j2k_img)
-{
-  int len, lenp, meth;
-  
-  lenp=cio_tell();
-  cio_skip(4);
-  cio_write(JP2_COLR, 4);  // COLR
-
-  if ((j2k_img->numcomps==1 || j2k_img->numcomps==3) && (BPC_ok && j2k_img->comps[0].prec==8))
-    meth=1;
-  else
-    meth=2;
-
-  cio_write(meth,1);       // METH
-  cio_write(0,1);          // PREC
-  cio_write(0,1);          // APPROX
-  
-  if (meth==1)
-    cio_write(j2k_img->numcomps>1?16:17,4);          // EnumCS
-
-  if (meth==2)
-    cio_write(0,1);        // PROFILE (??) 
-
-  len=cio_tell()-lenp;
-  cio_seek(lenp);
-  cio_write(len,4);         // L
-  cio_seek(lenp+len);
-}
-
-/*
- * Write the JP2H box
- *
- * JP2 Header box
- *
- */
-void jp2_write_jp2h(j2k_image_t *j2k_img)
-{
-  int len, lenp, BPC_ok;
-  
-  lenp=cio_tell();
-  cio_skip(4);
-  cio_write(JP2_JP2H, 4);           /* JP2H */
-
-  BPC_ok=jp2_write_ihdr(j2k_img);
-
-  if (!BPC_ok)
-    jp2_write_bpcc(j2k_img);
-  jp2_write_colr(BPC_ok, j2k_img);
-
-  len=cio_tell()-lenp;
-  cio_seek(lenp);
-  cio_write(len,4);         /* L */
-  cio_seek(lenp+len);
-}
-
-/*
- * Write the FTYP box
- *
- * File type box
- *
- */
-void jp2_write_ftyp()
-{
-  int len, lenp;
-  
-  lenp=cio_tell();
-  cio_skip(4);
-  cio_write(JP2_FTYP, 4);   /* FTYP       */
-
-  cio_write(JP2,4);         /* BR         */
-  cio_write(0,4);           /* MinV       */
-  cio_write(JP2,4);         /* CL0 : JP2  */
-  cio_write(JPIP_JPIP,4);   /* CL1 : JPIP */
-
-  len=cio_tell()-lenp;
-  cio_seek(lenp);
-  cio_write(len,4);         /* L          */
-  cio_seek(lenp+len);
-}
-
-/*
- * Read the FTYP box
- *
- * File type box
- *
- */
-void jp2_read_ftyp(int length)
-{
-  int BR, MinV, type, i;
-
-  BR = cio_read(4);         /* BR              */
-  MinV = cio_read(4);       /* MinV            */
-  length-=8;
-  
-  for (i=length/4;i>0;i--)
-    type = cio_read(4);     /* CLi : JP2, JPIP */
-}
-
-int jp2_write_jp2c(char *J2K_file)
-{
-  int len, lenp, totlen, i;
-  FILE *src;
-  char *j2kfile;
-
-  lenp=cio_tell();
-  cio_skip(4);
-  cio_write(JP2_JP2C, 4);  // JP2C
-
-  src=fopen(J2K_file, "rb");
-  fseek(src, 0, SEEK_END);
-  totlen=ftell(src);
-  fseek(src, 0, SEEK_SET);
-  
-  j2kfile=(char*)malloc(totlen);
-  fread(j2kfile, 1, totlen, src);
-  fclose(src);
-
-  for (i=0;i<totlen;i++)
-    cio_write(j2kfile[i],1);
-  
-  len=cio_tell()-lenp;
-  cio_seek(lenp);
-  cio_write(len,4);         // L
-  cio_seek(lenp+len);
-  return lenp;
-}
-
-void jp2_write_jp()
-{
-  int len, lenp;
-  
-  lenp=cio_tell();
-  cio_skip(4);
-  cio_write(JP2_JP, 4);  // JP
-  cio_write(0x0d0a870a,4);
-  len=cio_tell()-lenp;
-  cio_seek(lenp);
-  cio_write(len,4);         // L
-  cio_seek(lenp+len);
-}
-
-/*
- * Read the JP box
- *
- * JPEG 2000 signature
- *
- * return 1 if error else 0
- */
-int jp2_read_jp()
-{
-  if (0x0d0a870a!=cio_read(4))
-    return 1;
-  else
-    return 0;
-}
--- a/indexer_JPIP/jpip.c
+++ b/indexer_JPIP/jpip.c
@@ -1,768 +0,0 @@
-/*
- * Copyright (c) 2003-2004, Yannick Verschueren
- * Copyright (c) 2003-2004, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
- * 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 <stdlib.h>
-#include <string.h>
-#include <setjmp.h>
-#include <math.h>
-
-#include "j2k.h"
-#include "cio.h"
-#include "tcd.h"
-#include "int.h"
-
-#define JPIP_CIDX 0x63696478   /* Codestream index                */
-#define JPIP_CPTR 0x63707472   /* Codestream Finder Box           */
-#define JPIP_MANF 0x6d616e66   /* Manifest Box                    */
-#define JPIP_FAIX 0x66616978   /* Fragment array Index box        */
-#define JPIP_MHIX 0x6d686978   /* Main Header Index Table         */
-#define JPIP_TPIX 0x74706978   /* Tile-part Index Table box       */
-#define JPIP_THIX 0x74686978   /* Tile header Index Table box     */
-#define JPIP_PPIX 0x70706978   /* Precinct Packet Index Table box */
-#define JPIP_PHIX 0x70686978   /* Packet Header index Table       */
-#define JPIP_FIDX 0x66696478   /* File Index                      */
-#define JPIP_FPTR 0x66707472   /* File Finder                     */
-#define JPIP_PRXY 0x70727879   /* Proxy boxes                     */
-#define JPIP_IPTR 0x69707472   /* Index finder box                */
-#define JPIP_PHLD 0x70686c64   /* Place holder                    */
-
-#define JP2C      0x6a703263
-
-//static info_marker_t marker_jpip[32], marker_local_jpip[32];  /* SIZE to precise ! */
-//static int num_marker_jpip, num_marker_local_jpip;
-
-/* 
- * Write the CPTR box
- *
- * Codestream finder box (box)
- *
- */
-void jpip_write_cptr(int offset, info_image_t img)
-{
-  int len, lenp;
-
-  lenp=cio_tell(); 
-  cio_skip(4);                       /* L [at the end]     */
-  cio_write(JPIP_CPTR,4);            /* T                  */
-  cio_write(0,2);                    /* DR  A PRECISER !!  */
-  cio_write(0,2);                    /* CONT               */
-  cio_write(offset,8);               /* COFF A PRECISER !! */
-  cio_write(img.codestream_size,8);  /* CLEN               */
-  len=cio_tell()-lenp;
-  cio_seek(lenp);
-  cio_write(len, 4);                 /* L                  */
-  cio_seek(lenp+len);
-}
-
-/* 
- * Read the CPTR box
- *
- * Codestream finder box (box)
- *
- */
-void jpip_read_cptr()
-{
-  int DR, CONT;
-  long long Coff, codestream_size;
-
-  DR = cio_read(2);               /* DR   */
-  CONT = cio_read(2);             /* CONT */
-  Coff = cio_read(8);             /* COFF */
-  codestream_size = cio_read(8);  /* CLEN */
-}
-
-/* 
- * Write the MANF box
- *
- * Manifest box (box)
- *
- */
-void jpip_write_manf(int second, int v, info_marker_t *marker)
-{
-  int len, lenp, i;
-  lenp=cio_tell(); 
-  cio_skip(4);                         /* L [at the end]                    */
-  cio_write(JPIP_MANF,4);              /* T                                 */
-
-  if (second)                          /* Write only during the second pass */
-    {
-      for(i=0;i<v;i++)
-	{
-	  cio_write(marker[i].len,4);  /* Marker length                     */ 
-	  cio_write(marker[i].type,4); /* Marker type                       */
-	}
-    }
-
-  len=cio_tell()-lenp;
-  cio_seek(lenp);
-  cio_write(len, 4);                   /* L                                 */
-  cio_seek(lenp+len);
-}
-
-/* 
- * Read the MANF box
- *
- * Manifest box (box)
- *
- */
-void jpip_read_manf(int len)
-{
-  int i, v, marker_len, marker_type;
-  
-  v = (len - 8)/ 8;
-  
-  for(i=0;i<v;i++)
-    {
-      marker_len = cio_read(4);       /* Marker length */ 
-      marker_type = cio_read(4);      /* Marker type   */
-    }
-}
-
-/* 
- * Write the MHIX box
- *
- * Main Header Index Table (box)
- *
- */
-int jpip_write_mhix(info_image_t img, int status, int tileno)
-{
-  int len, lenp, i;
-  info_tile_t *tile;
-  lenp=cio_tell();
-  cio_skip(4);                               /* L [at the end]                    */
-  cio_write(JPIP_MHIX, 4);                   /* MHIX                              */
-
-  if (status) /* MAIN HEADER */
-    {
-      cio_write(img.Main_head_end,8);        /* TLEN                              */
-      
-      for(i = 0; i < img.num_marker; i++)    /* Marker restricted to 1 apparition */
-	{
-	  cio_write(img.marker[i].type, 2);
-	  cio_write(0, 2);
-	  cio_write(img.marker[i].start_pos, 8);
-	  cio_write(img.marker[i].len, 2);
-	}
-      
-      /* Marker NOT restricted to 1 apparition */
-      for(i = img.marker_mul.num_COC - 1; i >= 0; i--) /* COC */
-	{
-	  cio_write(img.marker_mul.COC[i].type, 2);
-	  cio_write(i, 2);
-	  cio_write(img.marker_mul.COC[i].start_pos, 8);
-	  cio_write(img.marker_mul.COC[i].len, 2);
-	}
-      
-      for(i = img.marker_mul.num_RGN - 1; i >= 0; i--) /* RGN */
-	{
-	  cio_write(img.marker_mul.RGN[i].type, 2);
-	  cio_write(i, 2);
-	  cio_write(img.marker_mul.RGN[i].start_pos, 8);
-	  cio_write(img.marker_mul.RGN[i].len, 2);
-	}
-      
-      for(i = img.marker_mul.num_QCC - 1; i >= 0; i--) /* QCC */
-	{
-	  cio_write(img.marker_mul.QCC[i].type, 2);
-	  cio_write(i, 2);
-	  cio_write(img.marker_mul.QCC[i].start_pos, 8);
-	  cio_write(img.marker_mul.QCC[i].len, 2);
-	}
-      
-      for(i = img.marker_mul.num_TLM - 1; i >= 0; i--) /* TLM */
-	{
-	  cio_write(img.marker_mul.TLM[i].type, 2);
-	  cio_write(i, 2);
-	  cio_write(img.marker_mul.TLM[i].start_pos, 8);
-	  cio_write(img.marker_mul.TLM[i].len, 2);
-	}
-      
-      for(i = img.marker_mul.num_PLM - 1; i >= 0; i--) /* PLM */
-	{
-	  cio_write(img.marker_mul.PLM[i].type, 2);
-	  cio_write(i, 2);
-	  cio_write(img.marker_mul.PLM[i].start_pos, 8);
-	  cio_write(img.marker_mul.PLM[i].len, 2);
-	}
-      
-      for(i = img.marker_mul.num_PPM - 1; i >= 0; i--) /* PPM */
-	{
-	  cio_write(img.marker_mul.PPM[i].type, 2);
-	  cio_write(i, 2);
-	  cio_write(img.marker_mul.PPM[i].start_pos, 8);
-	  cio_write(img.marker_mul.PPM[i].len, 2);
-	}
-
-      for(i = img.marker_mul.num_COM - 1; i >= 0; i--) /* COM */
-	{
-	  cio_write(img.marker_mul.COM[i].type, 2);
-	  cio_write(i, 2);
-	  cio_write(img.marker_mul.COM[i].start_pos, 8);
-	  cio_write(img.marker_mul.COM[i].len, 2);
-	}
-    } 
-  else /* TILE HEADER */
-    {
-      tile = &img.tile[tileno];
-      cio_write(tile->tile_parts[0].length_header, 8);  /* TLEN                              */ 
-      
-      for(i = 0; i < tile->num_marker; i++)             /* Marker restricted to 1 apparition */
-	{
-	  cio_write(tile->marker[i].type, 2);
-	  cio_write(0, 2);
-	  cio_write(tile->marker[i].start_pos, 8);
-	  cio_write(tile->marker[i].len, 2);
-	}
-      
-      /* Marker NOT restricted to 1 apparition */
-      for(i = tile->marker_mul.num_COC - 1; i >= 0; i--) /* COC */
-	{
-	  cio_write(tile->marker_mul.COC[i].type, 2);
-	  cio_write(i, 2);
-	  cio_write(tile->marker_mul.COC[i].start_pos, 8);
-	  cio_write(tile->marker_mul.COC[i].len, 2);
-	}
-      
-      for(i = tile->marker_mul.num_RGN - 1; i >= 0; i--) /* RGN */
-	{
-	  cio_write(tile->marker_mul.RGN[i].type, 2);
-	  cio_write(i, 2);
-	  cio_write(tile->marker_mul.RGN[i].start_pos, 8);
-	  cio_write(tile->marker_mul.RGN[i].len, 2);
-	}
-      
-      for(i = tile->marker_mul.num_QCC - 1; i >= 0; i--) /* QCC */
-	{
-	  cio_write(tile->marker_mul.QCC[i].type, 2);
-	  cio_write(i, 2);
-	  cio_write(tile->marker_mul.QCC[i].start_pos, 8);
-	  cio_write(tile->marker_mul.QCC[i].len, 2);
-	}
-      
-      for(i = tile->marker_mul.num_PLT - 1; i >= 0; i--) /* PLT */
-	{
-	  cio_write(tile->marker_mul.PLT[i].type,2);
-	  cio_write(i,2);
-	  cio_write(tile->marker_mul.PLT[i].start_pos,8);
-	  cio_write(tile->marker_mul.PLT[i].len,2);
-	}
-      
-      for(i = tile->marker_mul.num_PPT - 1; i >= 0; i--) /* PPT */
-	{
-	  cio_write(tile->marker_mul.PPT[i].type, 2);
-	  cio_write(i, 2);
-	  cio_write(tile->marker_mul.PPT[i].start_pos, 8);
-	  cio_write(tile->marker_mul.PPT[i].len, 2);
-	}
-      
-      for(i = tile->marker_mul.num_COM - 1; i >= 0; i--) /* COM */
-	{
-	  cio_write(tile->marker_mul.COM[i].type, 2);
-	  cio_write(i, 2);
-	  cio_write(tile->marker_mul.COM[i].start_pos, 8);
-	  cio_write(tile->marker_mul.COM[i].len, 2);
-	} 
-    }      
-  
-  len=cio_tell()-lenp;
-  cio_seek(lenp);
-  cio_write(len, 4);        /* L           */
-  cio_seek(lenp+len);
-  
-  return len;
-}
-
-/* 
- * Read the MHIX box
- *
- * Main Header Index Table (box)
- *
- */
-void jpip_read_mhix(int len)
-{
-  int i, v, marker_type, marker_start_pos, marker_len, marker_remains;
-
-  v = (len - 8) / 14;
-
-  for (i=0; i<v ; i++)
-    {
-      marker_type = cio_read(2);       /* Type of the marker               */ 
-      marker_remains = cio_read(2);    /* Number of same markers following */
-      marker_start_pos = cio_read(2);  /* Start position of the marker     */
-      marker_len = cio_read(2);        /* Length of the marker             */
-    }
-}
-
-/* 
- * Write the FAIX box
- *
- * Fragment array Index box (box)
- *
- */
-int jpip_write_faix(int v, int compno, info_image_t img, j2k_cp_t *j2k_cp, int version)
-{
-  int len, lenp, i, j;
-  /*int version = 0;*/
-  int tileno, resno, precno, layno, num_packet=0;
-
-  lenp=cio_tell();
-  cio_skip(4);              /* L [at the end]      */
-  cio_write(JPIP_FAIX, 4);  /* FAIX                */ 
-  cio_write(version,1);     /* Version 0 = 4 bytes */
-  
-  switch(v)
-    {
-    case 0:   /* TPIX */
-      cio_write(img.num_max_tile_parts,(version & 0x01)?8:4);                      /* NMAX           */
-      cio_write(img.tw*img.th,(version & 0x01)?8:4);                               /* M              */
-      for (i = 0; i < img.tw*img.th; i++)
-	{
-	  for (j = 0; j < img.tile[i].numparts ; j++)
-	    {
-	      cio_write(img.tile[i].tile_parts[j].start_pos,(version & 0x01)?8:4); /* start position */
-	      cio_write(img.tile[i].tile_parts[j].length,(version & 0x01)?8:4);    /* length         */
-	      if (version & 0x02)
-		cio_write(img.tile[i].tile_parts[j].num_reso_AUX,4); /* Aux_i,j : Auxiliary value */
-	      //cio_write(0,4);
-	    }
-	  /* PADDING */
-	  while (j < img.num_max_tile_parts)
-	    {
-	      cio_write(0,(version & 0x01)?8:4); /* start position            */
-	      cio_write(0,(version & 0x01)?8:4); /* length                    */
-	      if (version & 0x02)
-		cio_write(0,4);                  /* Aux_i,j : Auxiliary value */
-	      j++;
-	    }
-	}
-      break;
-      
-      /*   case 1: */   /* THIX */
-      /* cio_write(1,(version & 0x01)?8:4);  */           /* NMAX */
-      /* cio_write(img.tw*img.th,(version & 0x01)?8:4); */ /* M    */
-      /* for (i=0;i<img.tw*img.th;i++) */
-      /* { */
-      /* cio_write(img.tile[i].start_pos,(version & 0x01)?8:4); */                         /* start position */
-      /* cio_write(img.tile[i].end_header-img.tile[i].start_pos,(version & 0x01)?8:4); */  /* length         */
-      /* if (version & 0x02)*/
-      /* cio_write(0,4); */ /* Aux_i,j : Auxiliary value */
-      /* } */
-      /* break; */
-
-    case 2:  /* PPIX  NOT FINISHED !! */
-      cio_write(img.num_packet_max,(version & 0x01)?8:4); /* NMAX */
-      cio_write(img.tw*img.th,(version & 0x01)?8:4);      /* M    */
-      for(tileno=0;tileno<img.tw*img.th;tileno++)
-	{
-	  info_tile_t *tile_Idx = &img.tile[tileno];
-	  info_compo_t *compo_Idx = &tile_Idx->compo[compno];
-	  int correction;
-	  
-	  num_packet=0;
-	  
-	  if(j2k_cp->tcps[tileno].csty&J2K_CP_CSTY_EPH)
-	    correction=3;
-	  else
-	    correction=1;
-	  for(resno=0;resno<img.Decomposition+1;resno++)
-	    {
-	      info_reso_t *reso_Idx = &compo_Idx->reso[resno];
-	      for (precno=0;precno<img.tile[tileno].pw*img.tile[tileno].ph;precno++)
-		{
-		  info_prec_t *prec_Idx = &reso_Idx->prec[precno];
-		  for(layno=0;layno<img.Layer;layno++)
-		    {
-		      info_layer_t *layer_Idx = &prec_Idx->layer[layno];
-		      cio_write(layer_Idx->offset,(version & 0x01)?8:4);                                   /* start position */
-		      cio_write((layer_Idx->len_header-correction)?0:layer_Idx->len,(version & 0x01)?8:4); /* length         */
-		      if (version & 0x02)
-			cio_write(0,4); /* Aux_i,j : Auxiliary value */
-		      num_packet++;
-		    }
-		}
-	    }
-	  /* PADDING */
-	  while (num_packet < img.num_packet_max)
-	    {
-	      cio_write(0,(version & 0x01)?8:4); /* start position            */
-	      cio_write(0,(version & 0x01)?8:4); /* length                    */
-	      if (version & 0x02)
-		cio_write(0,4);                  /* Aux_i,j : Auxiliary value */
-	      num_packet++;
-	    }
-	}
-      
-      break;
-      
-    case 3:  /* PHIX NOT FINISHED !! */
-      cio_write(img.num_packet_max,(version & 0x01)?8:4); /* NMAX */
-      cio_write(img.tw*img.th,(version & 0x01)?8:4);      /* M    */
-      for(tileno=0;tileno<img.tw*img.th;tileno++)
-	{
-	  info_tile_t *tile_Idx = &img.tile[tileno];
-	  info_compo_t *compo_Idx = &tile_Idx->compo[compno];
-	  int correction;
-
-	  num_packet = 0;
-	  if(j2k_cp->tcps[tileno].csty&J2K_CP_CSTY_EPH)
-	    correction=3;
-	  else
-	    correction=1;
-	  for(resno=0;resno<img.Decomposition+1;resno++)
-	    {
-	      info_reso_t *reso_Idx = &compo_Idx->reso[resno];
-	      for (precno=0;precno<img.tile[tileno].pw*img.tile[tileno].ph;precno++)
-		{
-		  info_prec_t *prec_Idx = &reso_Idx->prec[precno];
-		  for(layno=0;layno<img.Layer;layno++)
-		    {
-		      info_layer_t *layer_Idx = &prec_Idx->layer[layno];
-		      cio_write(layer_Idx->offset_header,(version & 0x01)?8:4);                                   /* start position */
-		      cio_write((layer_Idx->len_header-correction)?0:layer_Idx->len_header,(version & 0x01)?8:4); /* length         */
-		      if (version & 0x02)
-			cio_write(0,4); /* Aux_i,j : Auxiliary value */
-		      num_packet++;
-		    }
-		}
-	    }
-	  /* PADDING */
-	  while (num_packet<img.num_packet_max)
-	    {
-	      cio_write(0,(version & 0x01)?8:4); /* start position            */
-	      cio_write(0,(version & 0x01)?8:4); /* length                    */
-	      if (version & 0x02)
-		cio_write(0,4);                  /* Aux_i,j : Auxiliary value */
-	      num_packet++;
-	    }
-	}
-      break;
-    }
-  
-  len=cio_tell()-lenp;
-  cio_seek(lenp);
-  cio_write(len, 4);        /* L  */
-  cio_seek(lenp+len);
-
-  return len;
-}
-
-/* 
- * Write the TPIX box
- *
- * Tile-part Index table box (superbox)
- *
- */
-int jpip_write_tpix(info_image_t img, j2k_cp_t *j2k_cp, int version)
-{
-  int len, lenp;
-  lenp=cio_tell();
-  cio_skip(4);              /* L [at the end] */
-  cio_write(JPIP_TPIX, 4);  /* TPIX           */
-  
-  jpip_write_faix(0,0,img, j2k_cp, version);
-
-  len=cio_tell()-lenp;
-  cio_seek(lenp);
-  cio_write(len, 4);        /* L              */
-  cio_seek(lenp+len);
-
-  return len;
-}
-
-/* 
- * Write the THIX box
- *
- * Tile header Index table box (superbox)
- *
- */
-//int jpip_write_thix(info_image_t img, j2k_cp_t *j2k_cp)
-//  {
-//  int len, lenp;
-//  lenp=cio_tell();
-//  cio_skip(4);              /* L [at the end] */
-//  cio_write(JPIP_THIX, 4);  /* THIX           */
-  
-//  jpip_write_faix(1,0,img, j2k_cp);
-
-//  len=cio_tell()-lenp;
-//  cio_seek(lenp);
-//  cio_write(len, 4);        /* L              */
-//  cio_seek(lenp+len);
-
-//  return len;
-//}
-
-int jpip_write_thix(info_image_t img, j2k_cp_t *j2k_cp)
-{
-  int len, lenp, i;
-  int tileno;
-  info_marker_t *marker;
-  int num_marker_local_jpip;
-
-  marker = (info_marker_t*)calloc(sizeof(info_marker_t), j2k_cp->tw*j2k_cp->th);
-
-  for ( i = 0; i < 2 ; i++ )
-    {
-      if (i) cio_seek(lenp);
-      
-      lenp = cio_tell();
-      cio_skip(4);              /* L [at the end] */
-      cio_write(JPIP_THIX, 4);  /* THIX           */
-      jpip_write_manf(i, j2k_cp->tw*j2k_cp->th, marker);
-      num_marker_local_jpip=img.Comp;
-      
-      for (tileno = 0; tileno < j2k_cp->tw*j2k_cp->th; tileno++)
-	{
-	  marker[tileno].len = jpip_write_mhix(img, 1, tileno);
-	  marker[tileno].type = JPIP_MHIX;
-	}
-      
-      len=cio_tell()-lenp;
-      cio_seek(lenp);
-      cio_write(len, 4);        /* L              */
-      cio_seek(lenp+len);
-    }
-
-  free(marker);
-
-  return len;
-}
-/* 
- * Write the PPIX box
- *
- * Precinct Packet Index table box (superbox)
- *
- */
-int jpip_write_ppix(info_image_t img,j2k_cp_t *j2k_cp)
-{
-  int len, lenp, compno, i;
-  info_marker_t *marker;
-  int num_marker_local_jpip;
-  marker = (info_marker_t*)calloc(sizeof(info_marker_t), img.Comp);
-  
-  for (i=0;i<2;i++)
-    {
-      if (i) cio_seek(lenp);
-      
-      lenp=cio_tell();
-      cio_skip(4);              /* L [at the end] */
-      cio_write(JPIP_PPIX, 4);  /* PPIX           */
-      jpip_write_manf(i,img.Comp,marker);
-      num_marker_local_jpip=img.Comp;
-      
-      for (compno=0; compno<img.Comp; compno++)
-	{
-	  marker[compno].len=jpip_write_faix(2,compno,img, j2k_cp, 0);
-	  marker[compno].type=JPIP_FAIX;
-	}
-   
-      len=cio_tell()-lenp;
-      cio_seek(lenp);
-      cio_write(len, 4);        /* L              */
-      cio_seek(lenp+len);
-    }
-  
-  free(marker);
-
-  return len;
-}
-
-/* 
- * Write the PHIX box
- *
- * Packet Header Index table box (superbox)
- *
- */
-int jpip_write_phix(info_image_t img, j2k_cp_t *j2k_cp)
-{
-  int len, lenp=0, compno, i;
-  info_marker_t *marker;
-
-  marker = (info_marker_t*)calloc(sizeof(info_marker_t), img.Comp);
-
-  for (i=0;i<2;i++)
-    {
-      if (i) cio_seek(lenp);
-      
-      lenp=cio_tell();
-      cio_skip(4);              /* L [at the end] */
-      cio_write(JPIP_PHIX, 4);  /* PHIX           */
-      
-      jpip_write_manf(i,img.Comp,marker);
-
-      for (compno=0; compno<img.Comp; compno++)
-	{	
-	  marker[compno].len=jpip_write_faix(3,compno,img, j2k_cp, 0);
-	  marker[compno].type=JPIP_FAIX;
-	}
-
-      len=cio_tell()-lenp;
-      cio_seek(lenp);
-      cio_write(len, 4);        /* L              */
-      cio_seek(lenp+len);
-    }
-
-  free(marker);
-
-  return len;
-}
-
-/* 
- * Write the CIDX box
- *
- * Codestream Index box (superbox)
- *
- */
-int jpip_write_cidx(int offset, info_image_t img, j2k_cp_t *j2k_cp, int version)
-{
-  int len, lenp = 0, i;
-  info_marker_t *marker_jpip;
-  int num_marker_jpip = 0;
-
-  marker_jpip = (info_marker_t*)calloc(sizeof(info_marker_t), 32);
-
-  for (i=0;i<2;i++)
-    {
-      if(i)
-	cio_seek(lenp);
-
-      lenp=cio_tell();
-
-      cio_skip(4);              /* L [at the end] */
-      cio_write(JPIP_CIDX, 4);  /* CIDX           */
-      jpip_write_cptr(offset, img);
-
-      jpip_write_manf(i,num_marker_jpip, marker_jpip);
-
-      num_marker_jpip=0;
-      marker_jpip[num_marker_jpip].len=jpip_write_mhix(img, 0, 0);
-      marker_jpip[num_marker_jpip].type=JPIP_MHIX;
-      num_marker_jpip++;
-
-      marker_jpip[num_marker_jpip].len=jpip_write_tpix(img, j2k_cp, version);
-      marker_jpip[num_marker_jpip].type=JPIP_TPIX;
-      num_marker_jpip++;
-
-      marker_jpip[num_marker_jpip].len=jpip_write_thix(img, j2k_cp);
-      marker_jpip[num_marker_jpip].type=JPIP_THIX;
-      num_marker_jpip++;
-
-      marker_jpip[num_marker_jpip].len=jpip_write_ppix(img, j2k_cp);
-      marker_jpip[num_marker_jpip].type=JPIP_PPIX;
-      num_marker_jpip++;
-
-      marker_jpip[num_marker_jpip].len=jpip_write_phix(img, j2k_cp);
-      marker_jpip[num_marker_jpip].type=JPIP_PHIX;
-      num_marker_jpip++;
-
-      len=cio_tell()-lenp;
-      cio_seek(lenp);
-      cio_write(len, 4);        /* L             */
-      cio_seek(lenp+len);
-    }
-
-  free(marker_jpip);
-
-  return len;
-
-}
-
-/* 
- * Write the IPTR box
- *
- * Index Finder box
- *
- */
-void jpip_write_iptr(int offset, int length)
-{
-  int len, lenp;
-  lenp=cio_tell();
-  cio_skip(4);              /* L [at the end] */
-  cio_write(JPIP_IPTR, 4);  /* IPTR           */
-  
-  cio_write(offset,8);
-  cio_write(length,8);
-
-  len=cio_tell()-lenp;
-  cio_seek(lenp);
-  cio_write(len, 4);        /* L             */
-  cio_seek(lenp+len);
-}
-
-/* 
- * Write the PRXY box
- *
- * proxy (box)
- *
- */
-void jpip_write_prxy(int offset_jp2c, int length_jp2c, int offset_idx, int length_idx)
-{
-  int len, lenp;
-  lenp=cio_tell();
-  cio_skip(4);              /* L [at the end] */
-  cio_write(JPIP_PRXY, 4);  /* IPTR           */
-  
-  cio_write(offset_jp2c,8); /* OOFF           */
-  cio_write(length_jp2c,4); /* OBH part 1     */
-  cio_write(JP2C,4);        /* OBH part 2     */
-  
-  cio_write(1,1);           /* NI             */
-
-  cio_write(offset_idx,8);  /* IOFF           */
-  cio_write(length_idx,4);  /* IBH part 1     */
-  cio_write(JPIP_CIDX,4);   /* IBH part 2     */
-
-  len=cio_tell()-lenp;
-  cio_seek(lenp);
-  cio_write(len, 4);        /* L              */
-  cio_seek(lenp+len);
-}
-
-
-/* 
- * Write the FIDX box
- *
- * File Index (superbox)
- *
- */
-int jpip_write_fidx(int offset_jp2c, int length_jp2c, int offset_idx, int length_idx)
-{
-  int len, lenp;
-  lenp=cio_tell();
-  cio_skip(4);              /* L [at the end] */
-  cio_write(JPIP_FIDX, 4);  /* IPTR           */
-  
-  jpip_write_prxy(offset_jp2c, length_jp2c, offset_idx, offset_jp2c);
-
-  len=cio_tell()-lenp;
-  cio_seek(lenp);
-  cio_write(len, 4);        /* L              */
-  cio_seek(lenp+len);
-
-  return len;
-}
--- a/indexer_JPIP/pi.c
+++ b/indexer_JPIP/pi.c
@@ -1,465 +0,0 @@
-/*
- * Copyright (c) 2001-2002, David Janssens
- * Copyright (c) 2003-2004, Yannick Verschueren
- * Copyright (c) 2003-2004, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
- * 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 "pi.h"
-#include "int.h"
-#include <stdlib.h>
-#include <stdio.h>
-
-
-/* <summary> */
-/* Create a packet iterator.   */
-/* </summary> */
-pi_iterator_t *pi_create(j2k_image_t * img, j2k_cp_t * cp, int tileno)
-{
-	int p, q;
-	int compno, resno, pino;
-	int maxres = 0;
-	pi_iterator_t *pi;
-	j2k_tcp_t *tcp;
-	j2k_tccp_t *tccp;
-
-	tcp = &cp->tcps[tileno];
-	pi = (pi_iterator_t *) malloc((tcp->numpocs + 1) * sizeof(pi_iterator_t));
-
-	for (pino = 0; pino < tcp->numpocs + 1; pino++) {	/* change */
-		p = tileno % cp->tw;
-		q = tileno / cp->tw;
-
-		pi[pino].tx0 = int_max(cp->tx0 + p * cp->tdx, img->x0);
-		pi[pino].ty0 = int_max(cp->ty0 + q * cp->tdy, img->y0);
-		pi[pino].tx1 = int_min(cp->tx0 + (p + 1) * cp->tdx, img->x1);
-		pi[pino].ty1 = int_min(cp->ty0 + (q + 1) * cp->tdy, img->y1);
-		pi[pino].numcomps = img->numcomps;
-		pi[pino].comps = (pi_comp_t *) malloc(img->numcomps * sizeof(pi_comp_t));
-
-		for (compno = 0; compno < pi->numcomps; compno++) {
-			int tcx0, tcy0, tcx1, tcy1;
-			pi_comp_t *comp = &pi[pino].comps[compno];
-			tccp = &tcp->tccps[compno];
-			comp->dx = img->comps[compno].dx;
-			comp->dy = img->comps[compno].dy;
-			comp->numresolutions = tccp->numresolutions;
-			comp->resolutions =
-				(pi_resolution_t *) malloc(comp->numresolutions *
-																	 sizeof(pi_resolution_t));
-			tcx0 = int_ceildiv(pi->tx0, comp->dx);
-			tcy0 = int_ceildiv(pi->ty0, comp->dy);
-			tcx1 = int_ceildiv(pi->tx1, comp->dx);
-			tcy1 = int_ceildiv(pi->ty1, comp->dy);
-			if (comp->numresolutions > maxres) {
-				maxres = comp->numresolutions;
-			}
-			for (resno = 0; resno < comp->numresolutions; resno++) {
-				int levelno;
-				int rx0, ry0, rx1, ry1;
-				int px0, py0, px1, py1;
-				pi_resolution_t *res = &comp->resolutions[resno];
-				if (tccp->csty & J2K_CCP_CSTY_PRT) {
-					res->pdx = tccp->prcw[resno];
-					res->pdy = tccp->prch[resno];
-				} else {
-					res->pdx = 15;
-					res->pdy = 15;
-				}
-				levelno = comp->numresolutions - 1 - resno;
-				rx0 = int_ceildivpow2(tcx0, levelno);
-				ry0 = int_ceildivpow2(tcy0, levelno);
-				rx1 = int_ceildivpow2(tcx1, levelno);
-				ry1 = int_ceildivpow2(tcy1, levelno);
-				px0 = int_floordivpow2(rx0, res->pdx) << res->pdx;
-				py0 = int_floordivpow2(ry0, res->pdy) << res->pdy;
-				px1 = int_ceildivpow2(rx1, res->pdx) << res->pdx;
-				py1 = int_ceildivpow2(ry1, res->pdy) << res->pdy;
-				res->pw = (px1 - px0) >> res->pdx;
-				res->ph = (py1 - py0) >> res->pdy;
-			}
-		}
-		
-		tccp = &tcp->tccps[0];
-		pi[pino].step_p=1;
-		pi[pino].step_c=100*pi[pino].step_p;
-		pi[pino].step_r=img->numcomps*pi[pino].step_c;
-		pi[pino].step_l=maxres*pi[pino].step_r;
-		
-		if (pino==0)
-		  pi[pino].include=(short int*)calloc(img->numcomps*maxres*tcp->numlayers*100,sizeof(short int));
-		else
-		  pi[pino].include=pi[pino-1].include;
-
-		/*if (pino == tcp->numpocs) {*/
-		  if (tcp->POC == 0) {
-			pi[pino].first = 1;
-			pi[pino].poc.resno0 = 0;
-			pi[pino].poc.compno0 = 0;
-			pi[pino].poc.layno1 = tcp->numlayers;
-			pi[pino].poc.resno1 = maxres;
-			pi[pino].poc.compno1 = img->numcomps;
-			pi[pino].poc.prg = tcp->prg;
-		} else {
-			pi[pino].first = 1;
-			pi[pino].poc.resno0 = tcp->pocs[pino].resno0;
-			pi[pino].poc.compno0 = tcp->pocs[pino].compno0;
-			pi[pino].poc.layno1 = tcp->pocs[pino].layno1;
-			pi[pino].poc.resno1 = tcp->pocs[pino].resno1;
-			pi[pino].poc.compno1 = tcp->pocs[pino].compno1;
-			pi[pino].poc.prg = tcp->pocs[pino].prg;
-		}
-	}
-	return pi;
-}
-
-/* <summary> */
-/* Get next packet in layer=resolution-component-precinct order.   */
-/* </summary> */
-int pi_next_lrcp(pi_iterator_t * pi)
-{
-	pi_comp_t *comp;
-	pi_resolution_t *res;
-
-	if (!pi->first) {
-		comp = &pi->comps[pi->compno];
-		res = &comp->resolutions[pi->resno];
-		goto skip;
-	} else {
-		pi->first = 0;
-	}
-	for (pi->layno = 0; pi->layno < pi->poc.layno1; pi->layno++) {
-		for (pi->resno = pi->poc.resno0; pi->resno < pi->poc.resno1;
-				 pi->resno++) {
-			for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1;
-					 pi->compno++) {
-				comp = &pi->comps[pi->compno];
-				if (pi->resno >= comp->numresolutions) {
-
-					continue;
-				}
-				res = &comp->resolutions[pi->resno];
-				for (pi->precno = 0; pi->precno < res->pw * res->ph; pi->precno++) {
-				  if (!pi->include[pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p]){
-				    pi->include[pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p] = 1;
-				    return 1;
-					}
-				skip:;
-				}
-			}
-		}
-	}
-	return 0;
-}
-
-/* <summary> */
-/* Get next packet in resolution-layer-component-precinct order.   */
-/* </summary> */
-int pi_next_rlcp(pi_iterator_t * pi)
-{
-	pi_comp_t *comp;
-	pi_resolution_t *res;
-	if (!pi->first) {
-		comp = &pi->comps[pi->compno];
-		res = &comp->resolutions[pi->resno];
-		goto skip;
-	} else {
-		pi->first = 0;
-	}
-	for (pi->resno = pi->poc.resno0; pi->resno < pi->poc.resno1; pi->resno++) {
-		for (pi->layno = 0; pi->layno < pi->poc.layno1; pi->layno++) {
-			for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1;
-					 pi->compno++) {
-				comp = &pi->comps[pi->compno];
-				if (pi->resno >= comp->numresolutions) {
-					continue;
-				}
-				res = &comp->resolutions[pi->resno];
-				for (pi->precno = 0; pi->precno < res->pw * res->ph; pi->precno++) {
-				  if (!pi->include[pi->layno*pi->step_l+pi->resno*pi->step_r+pi->compno*pi->step_c+pi->precno*pi->step_p]){
-				    pi->include[pi->layno*pi->step_l+pi->resno*pi->step_r+pi->compno*pi->step_c+pi->precno*pi->step_p] = 1;
-				    return 1;
-				  }
-				skip:;
-				}
-			}
-		}
-	}
-	return 0;
-}
-
-/* <summary> */
-/* Get next packet in resolution-precinct-component-layer order.   */
-/* </summary> */
-int pi_next_rpcl(pi_iterator_t * pi)
-{
-	pi_comp_t *comp;
-	pi_resolution_t *res;
-	if (!pi->first) {
-		goto skip;
-	} else {
-		int compno, resno;
-		pi->first = 0;
-		pi->dx = 0;
-		pi->dy = 0;
-		for (compno = 0; compno < pi->numcomps; compno++) {
-			comp = &pi->comps[compno];
-			for (resno = 0; resno < comp->numresolutions; resno++) {
-				int dx, dy;
-				res = &comp->resolutions[resno];
-				dx =
-					comp->dx * (1 << (res->pdx + comp->numresolutions - 1 - resno));
-				dy =
-					comp->dy * (1 << (res->pdy + comp->numresolutions - 1 - resno));
-				pi->dx = !pi->dx ? dx : int_min(pi->dx, dx);
-				pi->dy = !pi->dy ? dy : int_min(pi->dy, dy);
-			}
-		}
-	}
-	for (pi->resno = pi->poc.resno0; pi->resno < pi->poc.resno1; pi->resno++) {
-		for (pi->y = pi->ty0; pi->y < pi->ty1;
-				 pi->y += pi->dy - (pi->y % pi->dy)) {
-			for (pi->x = pi->tx0; pi->x < pi->tx1;
-					 pi->x += pi->dx - (pi->x % pi->dx)) {
-				for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1;
-						 pi->compno++) {
-					int levelno;
-					int trx0, try0;
-					int rpx, rpy;
-					int prci, prcj;
-					comp = &pi->comps[pi->compno];
-					if (pi->resno >= comp->numresolutions) {
-						continue;
-					}
-					res = &comp->resolutions[pi->resno];
-					levelno = comp->numresolutions - 1 - pi->resno;
-					trx0 = int_ceildiv(pi->tx0, comp->dx << levelno);
-					try0 = int_ceildiv(pi->ty0, comp->dy << levelno);
-					rpx = res->pdx + levelno;
-					rpy = res->pdy + levelno;
-					if (!
-							(pi->x % (comp->dx << rpx) == 0
-							 || (pi->x == pi->tx0 && (trx0 << levelno) % (1 << rpx)))) {
-						continue;
-					}
-					if (!
-							(pi->y % (comp->dy << rpy) == 0
-							 || (pi->y == pi->ty0 && (try0 << levelno) % (1 << rpx)))) {
-						continue;
-					}
-					prci =
-						int_floordivpow2(int_ceildiv(pi->x, comp->dx << levelno),
-														 res->pdx) - int_floordivpow2(trx0, res->pdx);
-					prcj =
-						int_floordivpow2(int_ceildiv(pi->y, comp->dy << levelno),
-														 res->pdy) - int_floordivpow2(try0, res->pdy);
-					pi->precno = prci + prcj * res->pw;
-					for (pi->layno = 0; pi->layno < pi->poc.layno1; pi->layno++) {
-					  if (!pi->include[pi->layno*pi->step_l+pi->resno*pi->step_r+pi->compno*pi->step_c+pi->precno*pi->step_p]){
-					    pi->include[pi->layno*pi->step_l+pi->resno*pi->step_r+pi->compno*pi->step_c+pi->precno*pi->step_p] = 1;
-					    return 1;
-						}
-					skip:;
-					}
-				}
-			}
-		}
-	}
-	return 0;
-}
-
-/* <summary> */
-/* Get next packet in precinct-component-resolution-layer order.   */
-/* </summary> */
-int pi_next_pcrl(pi_iterator_t * pi)
-{
-	pi_comp_t *comp;
-	pi_resolution_t *res;
-	if (!pi->first) {
-		comp = &pi->comps[pi->compno];
-		goto skip;
-	} else {
-		int compno, resno;
-		pi->first = 0;
-		pi->dx = 0;
-		pi->dy = 0;
-		for (compno = 0; compno < pi->numcomps; compno++) {
-			comp = &pi->comps[compno];
-			for (resno = 0; resno < comp->numresolutions; resno++) {
-				int dx, dy;
-				res = &comp->resolutions[resno];
-				dx =
-					comp->dx * (1 << (res->pdx + comp->numresolutions - 1 - resno));
-				dy =
-					comp->dy * (1 << (res->pdy + comp->numresolutions - 1 - resno));
-				pi->dx = !pi->dx ? dx : int_min(pi->dx, dx);
-				pi->dy = !pi->dy ? dy : int_min(pi->dy, dy);
-			}
-		}
-	}
-	for (pi->y = pi->ty0; pi->y < pi->ty1;
-			 pi->y += pi->dy - (pi->y % pi->dy)) {
-		for (pi->x = pi->tx0; pi->x < pi->tx1;
-				 pi->x += pi->dx - (pi->x % pi->dx)) {
-			for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1;
-					 pi->compno++) {
-				comp = &pi->comps[pi->compno];
-				for (pi->resno = pi->poc.resno0;
-						 pi->resno < int_min(pi->poc.resno1, comp->numresolutions);
-						 pi->resno++) {
-					int levelno;
-					int trx0, try0;
-					int rpx, rpy;
-					int prci, prcj;
-					res = &comp->resolutions[pi->resno];
-					levelno = comp->numresolutions - 1 - pi->resno;
-					trx0 = int_ceildiv(pi->tx0, comp->dx << levelno);
-					try0 = int_ceildiv(pi->ty0, comp->dy << levelno);
-					rpx = res->pdx + levelno;
-					rpy = res->pdy + levelno;
-					if (!
-							(pi->x % (comp->dx << rpx) == 0
-							 || (pi->x == pi->tx0 && (trx0 << levelno) % (1 << rpx)))) {
-						continue;
-					}
-					if (!
-							(pi->y % (comp->dy << rpy) == 0
-							 || (pi->y == pi->ty0 && (try0 << levelno) % (1 << rpx)))) {
-						continue;
-					}
-					prci =
-						int_floordivpow2(int_ceildiv(pi->x, comp->dx << levelno),
-														 res->pdx) - int_floordivpow2(trx0, res->pdx);
-					prcj =
-						int_floordivpow2(int_ceildiv(pi->y, comp->dy << levelno),
-														 res->pdy) - int_floordivpow2(try0, res->pdy);
-					pi->precno = prci + prcj * res->pw;
-					for (pi->layno = 0; pi->layno < pi->poc.layno1; pi->layno++) {
-					  if (! pi->include[pi->layno*pi->step_l+pi->resno*pi->step_r+pi->compno*pi->step_c+pi->precno*pi->step_p]){
-					    pi->include[pi->layno*pi->step_l+pi->resno*pi->step_r+pi->compno*pi->step_c+pi->precno*pi->step_p] = 1;
-							return 1;
-						}
-					skip:;
-					}
-				}
-			}
-		}
-	}
-	return 0;
-}
-
-/* <summary> */
-/* Get next packet in component-precinct-resolution-layer order.   */
-/* </summary> */
-int pi_next_cprl(pi_iterator_t * pi)
-{
-	pi_comp_t *comp;
-	pi_resolution_t *res;
-	if (!pi->first) {
-		comp = &pi->comps[pi->compno];
-		goto skip;
-	} else {
-		pi->first = 0;
-	}
-	for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1;
-			 pi->compno++) {
-		int resno;
-		comp = &pi->comps[pi->compno];
-		pi->dx = 0;
-		pi->dy = 0;
-		for (resno = 0; resno < comp->numresolutions; resno++) {
-			int dx, dy;
-			res = &comp->resolutions[resno];
-			dx = comp->dx * (1 << (res->pdx + comp->numresolutions - 1 - resno));
-			dy = comp->dy * (1 << (res->pdy + comp->numresolutions - 1 - resno));
-			pi->dx = !pi->dx ? dx : int_min(pi->dx, dx);
-			pi->dy = !pi->dy ? dy : int_min(pi->dy, dy);
-		}
-		for (pi->y = pi->ty0; pi->y < pi->ty1;
-				 pi->y += pi->dy - (pi->y % pi->dy)) {
-			for (pi->x = pi->tx0; pi->x < pi->tx1;
-					 pi->x += pi->dx - (pi->x % pi->dx)) {
-				for (pi->resno = pi->poc.resno0;
-						 pi->resno < int_min(pi->poc.resno1, comp->numresolutions);
-						 pi->resno++) {
-					int levelno;
-					int trx0, try0;
-					int rpx, rpy;
-					int prci, prcj;
-					res = &comp->resolutions[pi->resno];
-					levelno = comp->numresolutions - 1 - pi->resno;
-					trx0 = int_ceildiv(pi->tx0, comp->dx << levelno);
-					try0 = int_ceildiv(pi->ty0, comp->dy << levelno);
-					rpx = res->pdx + levelno;
-					rpy = res->pdy + levelno;
-					if (!
-							(pi->x % (comp->dx << rpx) == 0
-							 || (pi->x == pi->tx0 && (trx0 << levelno) % (1 << rpx)))) {
-						continue;
-					}
-					if (!
-							(pi->y % (comp->dy << rpy) == 0
-							 || (pi->y == pi->ty0 && (try0 << levelno) % (1 << rpx)))) {
-						continue;
-					}
-					prci =
-						int_floordivpow2(int_ceildiv(pi->x, comp->dx << levelno),
-														 res->pdx) - int_floordivpow2(trx0, res->pdx);
-					prcj =
-						int_floordivpow2(int_ceildiv(pi->y, comp->dy << levelno),
-														 res->pdy) - int_floordivpow2(try0, res->pdy);
-					pi->precno = prci + prcj * res->pw;
-					for (pi->layno = 0; pi->layno < pi->poc.layno1; pi->layno++) {
-					  if (! pi->include[pi->layno*pi->step_l+pi->resno*pi->step_r+pi->compno*pi->step_c+pi->precno*pi->step_p]){
-					    pi->include[pi->layno*pi->step_l+pi->resno*pi->step_r+pi->compno*pi->step_c+pi->precno*pi->step_p] = 1;
-					    return 1;
-						}
-					skip:;
-					}
-				}
-			}
-		}
-	}
-	return 0;
-}
-
-/* <summary> */
-/* Get next packet.   */
-/* </summary> */
-int pi_next(pi_iterator_t * pi)
-{
-	switch (pi->poc.prg) {
-	case 0:
-		return pi_next_lrcp(pi);
-	case 1:
-		return pi_next_rlcp(pi);
-	case 2:
-		return pi_next_rpcl(pi);
-	case 3:
-		return pi_next_pcrl(pi);
-	case 4:
-		return pi_next_cprl(pi);
-	}
-	return 0;
-}
--- a/indexer_JPIP/pi.h
+++ b/indexer_JPIP/pi.h
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2001-2002, David Janssens
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __PI_H
-#define __PI_H
-
-#include "j2k.h"
-#include "tcd.h"
-
-typedef struct {
-	int pdx, pdy;
-	int pw, ph;
-} pi_resolution_t;
-
-typedef struct {
-	int dx, dy;
-	int numresolutions;
-	pi_resolution_t *resolutions;
-} pi_comp_t;
-
-typedef struct {
-	short int *include;
-  int step_l, step_r, step_c, step_p; 
-	int compno, resno, precno, layno;	/* component, resolution, precinct and layer that indentify the packet */
-	int first;
-	j2k_poc_t poc;
-	int numcomps;
-	pi_comp_t *comps;
-	int tx0, ty0, tx1, ty1;
-	int x, y, dx, dy;
-} pi_iterator_t;								/* packet iterator */
-
-/*
- * Create a packet iterator
- * img: raw image for which the packets will be listed
- * cp: coding paremeters
- * tileno: number that identifies the tile for which to list the packets
- * return value: returns a packet iterator that points to the first packet of the tile
- */
-pi_iterator_t *pi_create(j2k_image_t * img, j2k_cp_t * cp, int tileno);
-
-/* 
- * Modify the packet iterator to point to the next packet
- * pi: packet iterator to modify
- * return value: returns 0 if pi pointed to the last packet or else returns 1 
- */
-int pi_next(pi_iterator_t * pi);
-
-#endif
--- a/indexer_JPIP/t2.c
+++ b/indexer_JPIP/t2.c
@@ -1,389 +0,0 @@
-/*
- * Copyright (c) 2001-2002, David Janssens
- * Copyright (c) 2003, Yannick Verschueren
- * Copyright (c) 2003,  Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
- * 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 "t2.h"
-#include "tcd.h"
-#include "bio.h"
-#include "j2k.h"
-#include "pi.h"
-#include "tgt.h"
-#include "int.h"
-#include "cio.h"
-#include <stdio.h>
-#include <setjmp.h>
-#include <string.h>
-#include <stdlib.h> 
-
-#define RESTART 0x04
-
-extern jmp_buf j2k_error;
-
-int t2_getcommacode() {
-    int n;
-    for (n=0; bio_read(1); n++) {}
-    return n;
-}
-
-int t2_getnumpasses()
-{
-    int n;
-    if (!bio_read(1)) return 1;
-    if (!bio_read(1)) return 2;
-    if ((n=bio_read(2))!=3) return 3+n;
-    if ((n=bio_read(5))!=31) return 6+n;
-    return 37+bio_read(7);
-}
-
-void t2_init_seg(tcd_seg_t *seg, int cblksty) {
-    seg->numpasses=0;
-    seg->len=0;
-    seg->maxpasses=cblksty&J2K_CCP_CBLKSTY_TERMALL?1:100;
-}
-
-int t2_decode_packet(unsigned char *src, int len, tcd_tile_t *tile, j2k_cp_t * cp, j2k_tcp_t *tcp, int compno, int resno, int precno, int layno, info_layer_t *layer_Idx) {
-    int bandno, cblkno;
-    tcd_tilecomp_t *tilec = &tile->comps[compno];
-    tcd_resolution_t *res = &tilec->resolutions[resno];
-    unsigned char *c = src;
-    unsigned char *d = c;
-    int e;
-    int present;
-
-    if (layno == 0) {
-        for (bandno = 0; bandno < res->numbands; bandno++) {
-            tcd_band_t *band = &res->bands[bandno];
-            tcd_precinct_t *prc = &band->precincts[precno];
-            tgt_reset(prc->incltree);
-            tgt_reset(prc->imsbtree);
-            for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-                tcd_cblk_t *cblk = &prc->cblks[cblkno];
-                cblk->numsegs = 0;
-            }
-        }  
-    }
-    /* INDEX */
-    layer_Idx->len_header = 0;
-
-    /* When the marker PPT/PPM is used the packet header are store in PPT/PPM marker
-       This part deal with this caracteristic
-       step 1: Read packet header in the saved structure
-       step 2: (futher) return to codestream for decoding */
-    if (cp->ppm == 1) /* PPM */
-      {	    
-	c = cp->ppm_data;
-	d = c;
-	bio_init_dec(c, 1000);
-      } else 
-	{
-	  if (tcp->ppt == 1) /* PPT */
-	    {
-	      c = tcp->ppt_data;
-	      d = c;
-	      bio_init_dec(c, 1000);
-	    } else /* Normal Case */
-	      {
-		if (tcp->csty & J2K_CP_CSTY_SOP) 
-		  {
-		    if ((*c) != 255 || (*(c+1) != 145)) {printf("Error : expected SOP marker [1]!!!\n");}
-		    c += 6;
-		  }
-		bio_init_dec(c, src + len - c);
-		layer_Idx->len_header = -6;
-	      }
-	}
-    
-    present = bio_read(1);
-    
-    if (!present) 
-      {
-	bio_inalign();
-	/* Normal case */
-	c += bio_numbytes();
-	if (tcp->csty & J2K_CP_CSTY_EPH) 
-	  {
-	    if ((*c) != 255 || (*(c+1) != 146)) {printf("Error : expected EPH marker [1]!!!\n");}
-	    c += 2;
-	  }
-	/* INDEX */
-	layer_Idx->len_header += (c-d);
-
-	/* PPT and PPM dealing */
-	if (cp->ppm == 1) /* PPM */
-	  {	
-	    cp->ppm_data = c;	    
-	    return 0;
-	  }
-	if (tcp->ppt == 1) /* PPT */
-	  {
-	    tcp->ppt_data = c;
-	    return 0;
-	  }
-	return c - src;
-      }
-    
-    for (bandno=0; bandno<res->numbands; bandno++) {
-        tcd_band_t *band = &res->bands[bandno];
-        tcd_precinct_t *prc = &band->precincts[precno];
-        for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
-            int included, increment, n;
-            tcd_cblk_t *cblk = &prc->cblks[cblkno];
-            tcd_seg_t *seg;
-            if (!cblk->numsegs) {
-                included = tgt_decode(prc->incltree, cblkno, layno+1);
-            } else {
-                included = bio_read(1);
-            }
-            if (!included) {
-                cblk->numnewpasses = 0;
-                continue;
-            }
-            if (!cblk->numsegs) {
-                int i, numimsbs;
-                for (i = 0; !tgt_decode(prc->imsbtree, cblkno, i); i++) {}
-                numimsbs = i-1;
-                cblk->numbps = band->numbps - numimsbs;
-                cblk->numlenbits = 3;
-            }
-            cblk->numnewpasses = t2_getnumpasses();
-            increment = t2_getcommacode();
-            cblk->numlenbits += increment;
-            if (!cblk->numsegs) {
-                seg = &cblk->segs[0];
-                t2_init_seg(seg, tcp->tccps[compno].cblksty);
-            } else {
-                seg = &cblk->segs[cblk->numsegs - 1];
-                if (seg->numpasses == seg->maxpasses) {
-                    t2_init_seg(++seg, tcp->tccps[compno].cblksty);
-                }
-            }
-            n = cblk->numnewpasses;
-            do {
-                seg->numnewpasses = int_min(seg->maxpasses-seg->numpasses, n);
-                seg->newlen = bio_read(cblk->numlenbits + int_floorlog2(seg->numnewpasses));
-                n -= seg->numnewpasses;
-                if (n > 0) {
-                    t2_init_seg(++seg, tcp->tccps[compno].cblksty);
-                }
-            } while (n > 0);
-        }
-    }
-    if(bio_inalign()) return -999;
-    c += bio_numbytes();
-
-    if (tcp->csty & J2K_CP_CSTY_EPH) { /* EPH marker */
-      if ((*c) != 255 || (*(c+1) != 146)) {printf("Error : expected EPH marker [2]!!!\n"); }
-      c += 2;
-    }
-    
-    /* INDEX */
-    layer_Idx->len_header += (c-d);
-
-    /* PPT Step 2 : see above for details */
-    if (cp->ppm == 1)
-      {
-	cp->ppm_data = c; /* Update pointer */
-
-	/* INDEX */
-	layer_Idx->len_header = c-d;
-
-	c = src;
-	d = c;
-	if (tcp->csty & J2K_CP_CSTY_SOP) 
-	  {
-	    if ((*c) != 255 || (*(c+1) != 145)) {printf("Error : expected SOP marker [2] !!!\n"); }
-	    c += 6;
-	  }
-	bio_init_dec(c, src + len - c);
-      } else 
-	{
-	  if (tcp->ppt == 1)
-	    { 
-	      tcp->ppt_data = c; /* Update pointer */
-	      /* INDEX */
-	      layer_Idx->len_header = c-d;
-
-	      c = src;
-	      d = c;
-	      if (tcp->csty & J2K_CP_CSTY_SOP) /* SOP marker */
-		{ 
-		  if ((*c) != 255 || (*(c+1) != 145)) {printf("Error : expected SOP marker [2] !!!\n"); }
-		  c += 6;
-		}
-	      bio_init_dec(c, src + len - c);
-	      
-	    }
-	}
-
-    for (bandno = 0; bandno < res->numbands; bandno++) {
-        tcd_band_t *band = &res->bands[bandno];
-        tcd_precinct_t *prc = &band->precincts[precno];
-        for (cblkno = 0; cblkno < prc->cw*prc->ch; cblkno++) {
-            tcd_cblk_t *cblk = &prc->cblks[cblkno];
-            tcd_seg_t *seg;
-            if (!cblk->numnewpasses) continue;
-            if (!cblk->numsegs) {
-                seg = &cblk->segs[cblk->numsegs++];
-                cblk->len = 0;
-            } else {
-                seg = &cblk->segs[cblk->numsegs-1];
-                if (seg->numpasses == seg->maxpasses) {
-                    seg++;
-                    cblk->numsegs++;
-                }
-            }
-            do {
-	      if (c + seg->newlen > src + len) return -999;
-                memcpy(cblk->data + cblk->len, c, seg->newlen);
-                if (seg->numpasses == 0) {
-                    seg->data = cblk->data + cblk->len;
-                }
-                c += seg->newlen;
-                cblk->len += seg->newlen;
-                seg->len += seg->newlen;
-                seg->numpasses += seg->numnewpasses;
-                cblk->numnewpasses -= seg->numnewpasses;
-                if (cblk->numnewpasses > 0) {
-                    seg++;
-                    cblk->numsegs++;
-                }
-            } while (cblk->numnewpasses > 0);
-        }
-    }
-    /* <INDEX> */
-    e = c-d;
-    layer_Idx->len = e;
-    /* </INDEX> */
-
-    return c-src;
-}
-
-void t2_init_info_packets(info_image_t *img, j2k_cp_t *cp)
-{
-  int compno, tileno, resno, precno, layno;
-
-  for(compno = 0; compno < img->Comp; compno++)
-    {
-      for(tileno = 0; tileno < img->tw*img->th; tileno++)
-	{
-	  info_tile_t *tile_Idx = &img->tile[tileno];
-	  info_compo_t *compo_Idx = &tile_Idx->compo[compno];
-	  for(resno = 0; resno < img->Decomposition + 1 ; resno++)
-	    {
-	      info_reso_t *reso_Idx = &compo_Idx->reso[resno];
-	      for (precno = 0; precno < img->tile[tileno].pw * img->tile[tileno].ph; precno++)
-		{
-		  info_prec_t *prec_Idx = &reso_Idx->prec[precno];
-		  for(layno = 0; layno < img->Layer ; layno++)
-		    {
-		      info_layer_t *layer_Idx = &prec_Idx->layer[layno];
-		      layer_Idx->offset = 0;        /* start position */
-		      layer_Idx->len_header = 0;    /* length         */
-		    }
-		}
-	    }
-	}
-    }
-}
-
-int t2_decode_packets(unsigned char *src, int len, j2k_image_t *img, j2k_cp_t *cp, int tileno, tcd_tile_t *tile, info_image_t *imgg) {
-    unsigned char *c = src;
-    pi_iterator_t *pi;
-    int pino, compno,e;
-    int partno;
-    info_tile_part_t *tile_part;
-    int position;
-    int length_read;
-    info_tile_t *tile_Idx;
-    info_compo_t *compo_Idx;
-    info_reso_t *reso_Idx;
-    info_prec_t *prec_Idx;
-    info_layer_t *layer_Idx;
-
-    t2_init_info_packets(imgg, cp); /* Initialize the packets information : LEN and OFFSET to 0 */
-
-    tile_Idx = &imgg->tile[tileno];
-    tile_Idx->num_packet = 0;
-    pi = pi_create(img, cp, tileno);
-    partno = 0;
-    tile_part = &tile_Idx->tile_parts[partno];
-    position = tile_part->end_header + 1;
-    length_read = 0;
-
-    for (pino = 0; pino <= cp->tcps[tileno].numpocs; pino++)
-      {
-	while (pi_next(&pi[pino])) 
-	  {   
-	    compo_Idx = &tile_Idx->compo[pi[pino].compno];
-	    reso_Idx = &compo_Idx->reso[pi[pino].resno];
-	    prec_Idx = &reso_Idx->prec[pi[pino].precno];
-	    layer_Idx = &prec_Idx->layer[pi[pino].layno];
-	    
-	    layer_Idx->offset = position;
-	    layer_Idx->offset_header = position;
-	    
-	    e = t2_decode_packet(c, src+len-c, tile, cp, &cp->tcps[tileno], pi[pino].compno, pi[pino].resno, pi[pino].precno, pi[pino].layno,layer_Idx);
-	    if (e == -999)
-	      {
-		break;
-	      } else
-		c += e;
-	    position += e;
-	    
-	    /* Update position in case of multiple tile-parts for a tile >> */
-	    length_read += e;
-	    if (length_read >= (tile_part->end_pos - tile_part->end_header))
-	      {
-		partno++;
-		tile_part = &tile_Idx->tile_parts[partno];
-		position = tile_part->end_header + 1;
-		length_read = 0;
-	      }
-	    /* << end_update */
-	    
-	    tile_Idx->num_packet++;
-	  }
-	
-	// FREE space memory taken by pi
-	for (compno = 0; compno < pi[pino].numcomps; compno++) 
-	  { 
-	    free(pi[pino].comps[compno].resolutions);
-	  } 
-	free(pi[pino].comps);
-      }
-    
-    free(pi[0].include);
-    free(pi);
- 
-    if (e==-999)
-      return e;
-    else
-      {
-	imgg->num_packet_max=int_max(imgg->num_packet_max,tile_Idx->num_packet);
-	return c-src;
-      }
-}
--- a/indexer_JPIP/t2.h
+++ b/indexer_JPIP/t2.h
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2001-2002, David Janssens
- * Copyright (c) 2003, Yannick Verschueren
- * Copyright (c) 2003,  Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __T2_H
-#define __T2_H
-
-#include "tcd.h"
-#include "j2k.h"
-
-/*
- * Decode the packets of a tile from a source buffer
- * src: the source buffer
- * len: length of the source buffer
- * img: destination image
- * cp: image coding parameters
- * tileno: number that identifies the tile for which to decode the packets
- * tile: tile for which to decode the packets
- */
-int t2_decode_packets(unsigned char *src, int len, j2k_image_t *img, j2k_cp_t *cp, int tileno, tcd_tile_t *tile, info_image_t *imgg);
-
-#endif
--- a/indexer_JPIP/tcd.c
+++ b/indexer_JPIP/tcd.c
@@ -1,285 +0,0 @@
-/*
- * Copyright (c) 2001-2002, David Janssens
- * Copyright (c) 2003, Yannick Verschueren
- * Copyright (c) 2003,  Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
- * 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 "tcd.h"
-#include "int.h"
-#include "t2.h"
-#include <setjmp.h>
-#include <float.h>
-#include <stdio.h>
-#include <time.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-
-static tcd_image_t tcd_image;
-
-static j2k_image_t *tcd_img;
-static j2k_cp_t *tcd_cp;
-
-extern jmp_buf j2k_error;
-
-void tcd_init(j2k_image_t *img, j2k_cp_t *cp, info_image_t *imgg) {
-    int tileno, compno, resno, bandno, precno, cblkno;
-    tcd_img=img;
-    tcd_cp=cp;
-    tcd_image.tw=cp->tw;
-    tcd_image.th=cp->th;
-    tcd_image.tiles=(tcd_tile_t*)malloc(cp->tw*cp->th*sizeof(tcd_tile_t));
-    for (tileno=0; tileno<cp->tw*cp->th; tileno++) {
-        j2k_tcp_t *tcp=&cp->tcps[tileno];
-        tcd_tile_t *tile=&tcd_image.tiles[tileno];
-        // cfr p59 ISO/IEC FDIS15444-1 : 2000 (18 august 2000)
-        int p=tileno%cp->tw;  // si numerotation matricielle ..
-        int q=tileno/cp->tw;  // .. coordonnees de la tile (q,p) q pour ligne et p pour colonne
-	info_tile_t *tile_Idx=&imgg->tile[tileno]; // INDEX
-
-	// 4 borders of the tile rescale on the image if necessary
-        tile->x0=int_max(cp->tx0+p*cp->tdx, img->x0);
-        tile->y0=int_max(cp->ty0+q*cp->tdy, img->y0);
-        tile->x1=int_min(cp->tx0+(p+1)*cp->tdx, img->x1);
-        tile->y1=int_min(cp->ty0+(q+1)*cp->tdy, img->y1);
-	
-        tile->numcomps=img->numcomps;
-        tile->comps=(tcd_tilecomp_t*)malloc(img->numcomps*sizeof(tcd_tilecomp_t));
-        tile_Idx->compo=(info_compo_t*)malloc(img->numcomps*sizeof(info_compo_t)); // INDEX
-	for (compno=0; compno<tile->numcomps; compno++) {
-            j2k_tccp_t *tccp=&tcp->tccps[compno];
-            tcd_tilecomp_t *tilec=&tile->comps[compno];
-	    info_compo_t *compo_Idx=&tile_Idx->compo[compno]; // INDEX
-
-	    // border of each tile component (global)
-            tilec->x0=int_ceildiv(tile->x0, img->comps[compno].dx);
-            tilec->y0=int_ceildiv(tile->y0, img->comps[compno].dy);
-	    tilec->x1=int_ceildiv(tile->x1, img->comps[compno].dx);
-            tilec->y1=int_ceildiv(tile->y1, img->comps[compno].dy);
-	    
-            tilec->data=(int*)malloc(sizeof(int)*(tilec->x1-tilec->x0)*(tilec->y1-tilec->y0));
-            tilec->numresolutions=tccp->numresolutions;
-            tilec->resolutions=(tcd_resolution_t*)malloc(tilec->numresolutions*sizeof(tcd_resolution_t));
-	    compo_Idx->reso=(info_reso_t*)malloc(tilec->numresolutions*sizeof(info_reso_t)); // INDEX
-            for (resno=0; resno<tilec->numresolutions; resno++) {
-                int pdx, pdy;
-                int levelno=tilec->numresolutions-1-resno;
-                int tlprcxstart, tlprcystart, brprcxend, brprcyend;
-                int tlcbgxstart, tlcbgystart, brcbgxend, brcbgyend;
-                int cbgwidthexpn, cbgheightexpn;
-                int cblkwidthexpn, cblkheightexpn;
-                tcd_resolution_t *res=&tilec->resolutions[resno];
-		info_reso_t *res_Idx=&compo_Idx->reso[resno]; // INDEX
-		int precno_Idx; // INDEX
-
-		// border for each resolution level (global)
-                res->x0=int_ceildivpow2(tilec->x0, levelno);
-                res->y0=int_ceildivpow2(tilec->y0, levelno);
-                res->x1=int_ceildivpow2(tilec->x1, levelno);
-                res->y1=int_ceildivpow2(tilec->y1, levelno);
-		
-		res->numbands=resno==0?1:3;
-		// p. 35, table A-23, ISO/IEC FDIS154444-1 : 2000 (18 august 2000)
-                if (tccp->csty&J2K_CCP_CSTY_PRT) {
-                    pdx=tccp->prcw[resno];
-                    pdy=tccp->prch[resno];
-		} else {
-                    pdx=15;
-                    pdy=15;
-                }
-		// p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000) 
-                tlprcxstart=int_floordivpow2(res->x0, pdx)<<pdx;
-                tlprcystart=int_floordivpow2(res->y0, pdy)<<pdy;
-                brprcxend=int_ceildivpow2(res->x1, pdx)<<pdx;
-                brprcyend=int_ceildivpow2(res->y1, pdy)<<pdy;
-                res->pw=(brprcxend-tlprcxstart)>>pdx;
-                res->ph=(brprcyend-tlprcystart)>>pdy;
-
-		// <INDEX>
-		imgg->tile[tileno].pw=res->pw;
-		imgg->tile[tileno].ph=res->ph;
-		
-		res_Idx->prec=(info_prec_t*)malloc(res->pw*res->ph*sizeof(info_prec_t));
-		for (precno_Idx=0;precno_Idx<res->pw*res->ph;precno_Idx++)
-		  {
-		    info_prec_t *prec_Idx = &res_Idx->prec[precno_Idx];
-		    prec_Idx->layer=(info_layer_t*)malloc(imgg->Layer*sizeof(info_layer_t));
-		  }
-		
-		imgg->pw=res->pw;  // old parser version
-		imgg->ph=res->ph;  // old parser version
-		imgg->pdx=1<<pdx;
-		imgg->pdy=1<<pdy;
-		// </INDEX>
-
-                if (resno==0) {
-                    tlcbgxstart=tlprcxstart;
-                    tlcbgystart=tlprcystart;
-                    brcbgxend=brprcxend;
-                    brcbgyend=brprcyend;
-                    cbgwidthexpn=pdx;
-                    cbgheightexpn=pdy;
-                } else {
-                    tlcbgxstart=int_ceildivpow2(tlprcxstart, 1);
-                    tlcbgystart=int_ceildivpow2(tlprcystart, 1);
-                    brcbgxend=int_ceildivpow2(brprcxend, 1);
-                    brcbgyend=int_ceildivpow2(brprcyend, 1);
-                    cbgwidthexpn=pdx-1;
-                    cbgheightexpn=pdy-1;
-                }
-
-                cblkwidthexpn=int_min(tccp->cblkw, cbgwidthexpn);
-                cblkheightexpn=int_min(tccp->cblkh, cbgheightexpn);
-
-                for (bandno=0; bandno<res->numbands; bandno++) {
-                    int x0b, y0b;
-                    tcd_band_t *band=&res->bands[bandno];
-                    band->bandno=resno==0?0:bandno+1;
-                    x0b=(band->bandno==1)||(band->bandno==3)?1:0;
-                    y0b=(band->bandno==2)||(band->bandno==3)?1:0;
-
-                    if (band->bandno==0) {
-		      // band border (global)
-		      band->x0=int_ceildivpow2(tilec->x0, levelno);
-		      band->y0=int_ceildivpow2(tilec->y0, levelno);
-		      band->x1=int_ceildivpow2(tilec->x1, levelno);
-		      band->y1=int_ceildivpow2(tilec->y1, levelno);
-                    } else {
-		      // band border (global)
-		      band->x0=int_ceildivpow2(tilec->x0-(1<<levelno)*x0b, levelno+1);
-		      band->y0=int_ceildivpow2(tilec->y0-(1<<levelno)*y0b, levelno+1);
-		      band->x1=int_ceildivpow2(tilec->x1-(1<<levelno)*x0b, levelno+1);
-		      band->y1=int_ceildivpow2(tilec->y1-(1<<levelno)*y0b, levelno+1);
-                    }
-
-                    band->precincts=(tcd_precinct_t*)malloc(res->pw*res->ph*sizeof(tcd_precinct_t));
-
-                    for (precno=0; precno<res->pw*res->ph; precno++) {
-                        int tlcblkxstart, tlcblkystart, brcblkxend, brcblkyend;
-                        int cbgxstart=tlcbgxstart+(precno%res->pw)*(1<<cbgwidthexpn);
-                        int cbgystart=tlcbgystart+(precno/res->pw)*(1<<cbgheightexpn);
-                        int cbgxend=cbgxstart+(1<<cbgwidthexpn);
-                        int cbgyend=cbgystart+(1<<cbgheightexpn);
-                        tcd_precinct_t *prc=&band->precincts[precno];
-			// precinct size (global)
-                        prc->x0=int_max(cbgxstart, band->x0);
-                        prc->y0=int_max(cbgystart, band->y0);
-                        prc->x1=int_min(cbgxend, band->x1);
-                        prc->y1=int_min(cbgyend, band->y1);
-
-                        tlcblkxstart=int_floordivpow2(prc->x0, cblkwidthexpn)<<cblkwidthexpn;
-                        tlcblkystart=int_floordivpow2(prc->y0, cblkheightexpn)<<cblkheightexpn;
-                        brcblkxend=int_ceildivpow2(prc->x1, cblkwidthexpn)<<cblkwidthexpn;
-                        brcblkyend=int_ceildivpow2(prc->y1, cblkheightexpn)<<cblkheightexpn;
-                        prc->cw=(brcblkxend-tlcblkxstart)>>cblkwidthexpn;
-                        prc->ch=(brcblkyend-tlcblkystart)>>cblkheightexpn;
-
-                        prc->cblks=(tcd_cblk_t*)malloc(prc->cw*prc->ch*sizeof(tcd_cblk_t));
-
-                        prc->incltree=tgt_create(prc->cw, prc->ch);
-                        prc->imsbtree=tgt_create(prc->cw, prc->ch);
-
-                        for (cblkno=0; cblkno<prc->cw*prc->ch; cblkno++) {
-                            int cblkxstart=tlcblkxstart+(cblkno%prc->cw)*(1<<cblkwidthexpn);
-                            int cblkystart=tlcblkystart+(cblkno/prc->cw)*(1<<cblkheightexpn);
-                            int cblkxend=cblkxstart+(1<<cblkwidthexpn);
-                            int cblkyend=cblkystart+(1<<cblkheightexpn);
-                            tcd_cblk_t *cblk=&prc->cblks[cblkno];
-			    // code-block size (global)
-                            cblk->x0=int_max(cblkxstart, prc->x0);
-                            cblk->y0=int_max(cblkystart, prc->y0);
-                            cblk->x1=int_min(cblkxend, prc->x1);
-                            cblk->y1=int_min(cblkyend, prc->y1);
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-
-void tcd_free(j2k_image_t *img, j2k_cp_t *cp) {
-  int tileno, compno, resno, bandno, precno;
-  tcd_img=img;
-  tcd_cp=cp;
-  tcd_image.tw=cp->tw;
-  tcd_image.th=cp->th;
-  for (tileno=0; tileno<tcd_image.tw*tcd_image.th; tileno++) 
-    {
-      //  j2k_tcp_t *tcp=&cp->tcps[curtileno];
-      tcd_tile_t *tile=&tcd_image.tiles[tileno];
-      for (compno=0; compno<tile->numcomps; compno++) 
-	{
-	 tcd_tilecomp_t *tilec=&tile->comps[compno];
-	  for (resno=0; resno<tilec->numresolutions; resno++) 
-	    {
-	      tcd_resolution_t *res=&tilec->resolutions[resno];
-	      for (bandno=0; bandno<res->numbands; bandno++) 
-		{
-		 tcd_band_t *band=&res->bands[bandno];
-		  for (precno=0; precno<res->pw*res->ph; precno++) 
-		    {
-		     tcd_precinct_t *prc=&band->precincts[precno];
-		      
-		      if (prc->incltree!=NULL)
-			tgt_destroy(prc->incltree);
-		      if (prc->imsbtree!=NULL)
-			tgt_destroy(prc->imsbtree);
-		      free(prc->cblks);
-		    } // for (precno
-		  free(band->precincts);
-		} // for (bandno
-	    }	// for (resno
-	  free(tilec->resolutions);
-	}	// for (compno
-      free(tile->comps);
-    }	// for (tileno
-  free(tcd_image.tiles);
-}
-
-
-int tcd_decode_tile(unsigned char *src, int len, int tileno, info_image_t *imgg) {
-    int l;
-    int eof=0;
-    tcd_tile_t *tile;
-
-    tile = &tcd_image.tiles[tileno];
-
-    l = t2_decode_packets(src, len, tcd_img, tcd_cp, tileno, tile, imgg);
-
-    if (l==-999)
-      {
-	eof=1;
-	fprintf(stderr, "tcd_decode: incomplete bistream\n");
-      }
-    
-     if (eof) {
-       longjmp(j2k_error, 1);
-     }
-
-    l=1;
-    return l;
-}
--- a/indexer_JPIP/tcd.h
+++ b/indexer_JPIP/tcd.h
@@ -1,137 +0,0 @@
-/*
- * Copyright (c) 2001-2002, David Janssens
- * Copyright (c) 2003, Yannick Verschueren
- * Copyright (c) 2003,  Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __TCD_H
-#define __TCD_H
-
-#include "j2k.h"
-#include "tgt.h"
-
-typedef struct {
-    int numpasses;
-    int len;
-    unsigned char *data;
-    int maxpasses;
-    int numnewpasses;
-    int newlen;
-} tcd_seg_t;
-
-typedef struct {
-    int rate;
-    double distortiondec;
-} tcd_pass_t;
-
-typedef struct {
-    int numpasses;
-    int len;
-    unsigned char *data;
-} tcd_layer_t;
-
-typedef struct {
-    int x0, y0, x1, y1;
-    int numbps;
-    int numlenbits;
-    int len;
-    int numpasses;
-    int numnewpasses;
-    int numsegs;
-    tcd_seg_t segs[100];
-    unsigned char data[8192];
-    int numpassesinlayers;
-    tcd_layer_t layers[100];
-    int totalpasses;
-    tcd_pass_t passes[100];
-} tcd_cblk_t;
-
-typedef struct {
-    int x0, y0, x1, y1;
-    int cw, ch;
-    tcd_cblk_t *cblks;
-    tgt_tree_t *incltree;
-    tgt_tree_t *imsbtree;
-} tcd_precinct_t;
-
-typedef struct {
-    int x0, y0, x1, y1;
-    int bandno;
-    tcd_precinct_t *precincts;
-    int numbps;
-    int stepsize;
-} tcd_band_t;
-
-typedef struct {
-    int x0, y0, x1, y1;  
-  int previous_x0, previous_y0, previous_x1, previous_y1; // usefull for the DWT
-  int cas_col, cas_row; // usefull for the DWT
-    int pw, ph;
-    int numbands;
-    tcd_band_t bands[3];
-} tcd_resolution_t;
-
-typedef struct {
-    int x0, y0, x1, y1;
-  int previous_row, previous_col; // usefull for the DWT
-    int numresolutions;
-    tcd_resolution_t *resolutions;
-    int *data;
-} tcd_tilecomp_t;
-
-typedef struct {
-    int x0, y0, x1, y1;
-    int numcomps;
-  //int PPT;
-  //int len_ppt;
-    tcd_tilecomp_t *comps;
-} tcd_tile_t;
-
-typedef struct {
-    int tw, th;
-    tcd_tile_t *tiles;
-} tcd_image_t;
-
-/*
- * Initialize the tile coder/decoder
- * img: raw image
- * cp: coding parameters
- * imgg: creation of index file
- */
-
-void tcd_init(j2k_image_t *img, j2k_cp_t *cp, info_image_t *imgg);
-
-void tcd_free(j2k_image_t *img, j2k_cp_t *cp);
-
-/*
- * Decode a tile from a buffer into a raw image
- * src: source buffer
- * len: length of the source buffer
- * tileno: number that identifies the tile that will be decoded
- * imgg : Structure for index file
- */
-int tcd_decode_tile(unsigned char *src, int len, int tileno, info_image_t *imgg);
-
-#endif
--- a/indexer_JPIP/tgt.c
+++ b/indexer_JPIP/tgt.c
@@ -1,170 +0,0 @@
-/*
- * Copyright (c) 2001-2002, David Janssens
- * Copyright (c) 2003, Yannick Verschueren
- * Copyright (c) 2003, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
- * 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 "tgt.h"
-#include "bio.h"
-#include <stdlib.h>
-#include <stdio.h>
-
-/// <summary>
-/// Reset tag-tree.
-/// </summary>
-void tgt_reset(tgt_tree_t *tree)
-{
-    int i;
-    for (i=0; i<tree->numnodes; i++) {
-        tree->nodes[i].value=999;
-        tree->nodes[i].low=0;
-        tree->nodes[i].known=0;
-    }
-}
-
-/// <summary>
-/// Create tag-tree.
-/// </summary>
-tgt_tree_t *tgt_create(int numleafsh, int numleafsv)
-{
-    int nplh[32];
-    int nplv[32];
-    tgt_node_t *node;
-    tgt_node_t *parentnode;
-    tgt_node_t *parentnode0;
-    tgt_tree_t *tree;
-    int i, j, k;
-    int numlvls;
-    int n;
-
-    tree=(tgt_tree_t*)malloc(sizeof(tgt_tree_t));
-    tree->numleafsh=numleafsh;
-    tree->numleafsv=numleafsv;
-
-    numlvls=0;
-    nplh[0]=numleafsh;
-    nplv[0]=numleafsv;
-    tree->numnodes=0;
-    do {
-        n=nplh[numlvls]*nplv[numlvls];
-        nplh[numlvls+1]=(nplh[numlvls]+1)/2;
-        nplv[numlvls+1]=(nplv[numlvls]+1)/2;
-        tree->numnodes+=n;
-        ++numlvls;
-    } while (n>1);
-
-    tree->nodes=(tgt_node_t*)malloc(tree->numnodes*sizeof(tgt_node_t));
-
-    node=tree->nodes;
-    parentnode=&tree->nodes[tree->numleafsh*tree->numleafsv];
-    parentnode0=parentnode;
-
-    for (i=0; i<numlvls-1; ++i) {
-        for (j=0; j<nplv[i]; ++j) {
-            k=nplh[i];
-            while (--k>=0) {
-                node->parent=parentnode;
-                ++node;
-                if (--k >= 0) {
-                    node->parent=parentnode;
-                    ++node;
-                }
-                ++parentnode;
-            }
-            if ((j&1)||j==nplv[i]-1) {
-                parentnode0=parentnode;
-            } else {
-                parentnode=parentnode0;
-                parentnode0+=nplh[i];
-            }
-        }
-    }
-    node->parent=0;
-
-    tgt_reset(tree);
-
-    return tree;
-}
-
-/// <summary>
-/// Destroy tag-tree.
-/// </summary>
-void tgt_destroy(tgt_tree_t *t) {
-    free(t->nodes);
-    free(t);
-}
-
-/// <summary>
-/// Set the value of a leaf of the tag-tree.
-/// </summary>
-void tgt_setvalue(tgt_tree_t *tree, int leafno, int value) {
-    tgt_node_t *node;
-    node=&tree->nodes[leafno];
-    while (node && node->value>value) {
-        node->value=value;
-        node=node->parent;
-    }
-}
-
-/// <summary>
-/// Decode the value of a leaf of the tag-tree.
-/// </summary>
-int tgt_decode(tgt_tree_t *tree, int leafno, int threshold)
-{
-    tgt_node_t *stk[31];
-    tgt_node_t **stkptr;
-    tgt_node_t *node;
-    int low;
-
-    stkptr=stk;
-    node=&tree->nodes[leafno];
-    while (node->parent) {
-        *stkptr++=node;
-        node=node->parent;
-    }
-
-    low=0;
-    for (;;) {
-        if (low>node->low) {
-            node->low=low;
-        } else {
-            low=node->low;
-        }
-        while (low<threshold && low<node->value) {
-            if (bio_read(1)) {
-                node->value=low;
-            } else {
-                ++low;
-            }
-        }
-        node->low=low;
-        if (stkptr==stk) {
-            break;
-        }
-        node=*--stkptr;
-    }
-
-    return (node->value<threshold)?1:0;
-}
--- a/indexer_JPIP/tgt.h
+++ b/indexer_JPIP/tgt.h
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2001-2002, David Janssens
- * Copyright (c) 2003, Yannick Verschueren
- * Copyright (c) 2003,  Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __TGT_H
-#define __TGT_H
-
-typedef struct tgt_node {
-	struct tgt_node *parent;
-	int value;
-	int low;
-	int known;
-} tgt_node_t;
-
-typedef struct {
-	int numleafsh;
-	int numleafsv;
-	int numnodes;
-	tgt_node_t *nodes;
-} tgt_tree_t;
-
-/*
- * Create a tag-tree
- * numleafsh: width of the array of leafs of the tree
- * numleafsv: height of the array of leafs of the tree
- */
-tgt_tree_t *tgt_create(int numleafsh, int numleafsv);
-
-/*
- * Reset a tag-tree (set all leafs to 0)
- * tree: tag-tree to reset
- */
-void tgt_reset(tgt_tree_t *tree);
-
-/*
- * Destroy a tag-tree, liberating memory
- * tree: tag-tree to destroy
- */
-void tgt_destroy(tgt_tree_t *tree);
-
-/*
- * Set the value of a leaf of a tag-tree
- * tree: tag-tree to modify
- * leafno: number that identifies the leaf to modify
- * value: new value of the leaf
- */
-void tgt_setvalue(tgt_tree_t *tree, int leafno, int value);
-
-/*
- * Decode the value of a leaf of the tag-tree up to a given threshold
- * leafno: number that identifies the leaf to decode
- * threshold: threshold to use when decoding value of the leaf
- */
-int tgt_decode(tgt_tree_t *tree, int leafno, int threshold);
-
-#endif
--- a/j2kviewer/build.xml
+++ b/j2kviewer/build.xml
@@ -1,35 +0,0 @@
-<project name="seb_j2kviewer" default="dist" basedir=".">
-  <description>Seb's J2K viewer</description>
-  <property name="src"   location="src"  />
-  <property name="build" location="build"/>
-  <property name="dist"  location="dist" />
-
-  <target name="init">
-    <tstamp/>
-    <mkdir dir="${build}"/>
-  </target>
-  <target name="compile" depends="init">
-    <javac srcdir="${src}" destdir="${build}"/>
-  </target>
-  <target name="dist" depends="compile">
-    <mkdir dir="${dist}"/>
-    <jar jarfile="${dist}/seb_j2kviewer-${DSTAMP}.jar"
-         basedir="${build}" manifest="${dist}/manifest.txt"/>
-    <exec dir="${dist}" executable="ln">
-      <arg line="-sf seb_j2kviewer-${DSTAMP}.jar seb_j2kviewer.jar"/>
-    </exec>
-  </target>
-  <target name="clean">
-    <delete dir="${build}"/>
-    <delete dir="${dist}"/>
-  </target>
-  <target name="test" depends="dist">
-    <exec executable="appletviewer"><arg line="dist.html"/></exec>
-  </target>
-  <target name="build_test" depends="compile">
-    <exec executable="appletviewer"><arg line="compile.html"/></exec>
-  </target>
-  <target name="build_testj" depends="compile">
-    <exec executable="java"><arg line="-classpath build ImageViewer girl"/></exec>
-  </target>
-</project>
--- a/j2kviewer/src/Exec.java
+++ b/j2kviewer/src/Exec.java
@@ -1,212 +0,0 @@
-import java.io.*;
-
-// This appears in Core Web Programming from
-// Prentice Hall Publishers, and may be freely used
-// or adapted. 1997 Marty Hall, hall@apl.jhu.edu.
-
-/** A class that eases the pain of running external
- *  processes from applications.
- *  Lets you run a program three ways:
- *  <OL>
- *     <LI><B>exec</B>: Execute the command, returning
- *         immediately even if the command is still
- *         running. This would be appropriate
- *         for printing a file.
- *     <LI><B>execWait</B>: Execute the command, but
- *         don't return until the command finishes.
- *         This would be appropriate for
- *         sequential commands where the first depends
- *         on the second having finished (e.g.
- *         <CODE>javac</CODE> followed by
- *         <CODE>java</CODE>).
- *     <LI><B>execPrint</B>: Execute the command and
- *         print the output. This would be appropriate
- *         for the UNIX command <CODE>ls</CODE>.
- *  </OL>
- *  Note that the PATH is not taken into account,
- *  so  you must specify the <B>full</B> pathname to
- *  the command, and shell builtin commands
- *  will not work. For instance, on Unix the above
- *  three examples might look like:
- *  <OL>
- *    <LI><PRE>Exec.exec("/usr/ucb/lpr Some-File");</PRE>
- *    <LI><PRE>
- *        Exec.execWait("/usr/local/bin/javac Foo.java");
- *        Exec.execWait("/usr/local/bin/java Foo");
- *        </PRE>
- *    <LI><PRE>Exec.execPrint("/usr/bin/ls -al");</PRE>
- *  </OL>
- *
- * @author Marty Hall
- *  (<A HREF="mailto:hall@apl.jhu.edu">
- *   hall@apl.jhu.edu</A>)
- * @version 1.0 1997
- */
-
-public class Exec {
-  //----------------------------------------------------
-  
-  private static boolean verbose = true;
-
-  /** Determines if the Exec class should print which
-   *  commands are being executed, and print error
-   *  messages if a problem is found. Default is true.
-   *
-   * @param verboseFlag true: print messages.
-   *        false: don't.
-   */
-  
-  public static void setVerbose(boolean verboseFlag) {
-    verbose = verboseFlag;
-  }
-
-  /** Will Exec print status messages? */
-  
-  public static boolean getVerbose() {
-    return(verbose);
-  }
-  
-  //----------------------------------------------------
-  /** Starts a process to execute the command. Returns
-   *  immediately, even if the new process is still
-   *  running.
-   *
-   * @param command The <B>full</B> pathname of the
-   *        command to be executed. No shell builtins
-   *        (e.g. "cd") or shell meta-chars (e.g. ">")
-   *        allowed.
-   * @return false if a problem is known to occur, but
-   *         since this returns immediately, problems
-   *         aren't usually found in time.
-   *         Returns true otherwise.
-   */
-  
-  public static boolean exec(String command) {
-    return(exec(command, false, false));
-  }
-  
-  //----------------------------------------------------
-  /** Starts a process to execute the command. Waits
-   *  for the process to finish before returning.
-   *
-   * @param command The <B>full</B> pathname of the
-   *        command to be executed. No shell builtins
-   *        or shell meta-chars allowed.
-   * @return false if a problem is known to occur,
-   *         either due to an exception or from the
-   *         subprocess returning a non-zero value.
-   *         Returns true otherwise.
-   */
-  
-  public static boolean execWait(String command) {
-    return(exec(command, false, true));
-  }
-  
-  //----------------------------------------------------
-  /** Starts a process to execute the command. Prints
-   *  all output the command gives.
-   *
-   * @param command The <B>full</B> pathname of the
-   *        command to be executed. No shell builtins
-   *        or shell meta-chars allowed.
-   * @return false if a problem is known to occur,
-   *         either due to an exception or from the
-   *         subprocess returning a non-zero value.
-   *         Returns true otherwise.
-   */
-  
-  public static boolean execPrint(String command) {
-    return(exec(command, true, false));
-  }
-  
-  //----------------------------------------------------
-  // This creates a Process object via
-  // Runtime.getRuntime.exec(). Depending on the
-  // flags, it may call waitFor on the process
-  // to avoid continuing until the process terminates,
-  // or open an input stream from the process to read
-  // the results.
-
-  private static boolean exec(String command,
-                              boolean printResults,
-                              boolean wait) {
-    if (verbose) {
-      printSeparator();
-      System.out.println("Executing '" + command + "'.");
-    }
-    try {
-      // Start running command, returning immediately.
-      Process p  = Runtime.getRuntime().exec(command);
-      
-      // Print the output. Since we read until
-      // there is no more input, this causes us
-      // to wait until the process is completed
-      if(printResults) {
-        BufferedInputStream buffer =
-          new BufferedInputStream(p.getInputStream());
-        DataInputStream commandResult =
-          new DataInputStream(buffer);
-        String s = null;
-        try {
-          while ((s = commandResult.readLine()) != null)
-            System.out.println("Output: " + s);
-          commandResult.close();
-          if (p.exitValue() != 0) {
-            if (verbose)
-              printError(command +
-                         " -- p.exitValue() != 0");
-            return(false);
-          }
-        // Ignore read errors; they mean process is done
-        } catch (Exception e) {}
-        
-      // If you don't print the results, then you
-      // need to call waitFor to stop until the process
-      // is completed
-      } else if (wait) {
-        try {
-          System.out.println(" ");
-          int returnVal = p.waitFor();
-          if (returnVal != 0) {
-            if (verbose)
-              printError(command);
-            return(false);
-          }
-        } catch (Exception e) {
-          if (verbose)
-            printError(command, e);
-          return(false);
-        }
-      }
-    } catch (Exception e) {
-      if (verbose)
-        printError(command, e);
-      return(false);
-    }
-    return(true);
-  }
-  
-  //----------------------------------------------------
-
-  private static void printError(String command,
-                                 Exception e) {
-    System.out.println("Error doing exec(" +
-                       command + "): " + e.getMessage());
-    System.out.println("Did you specify the full " +
-                       "pathname?");
-  }
-
-  private static void printError(String command) {
-    System.out.println("Error executing '" +
-                       command + "'.");
-  }
-    
-  //----------------------------------------------------
-
-  private static void printSeparator() {
-    System.out.println
-      ("==============================================");
-  }
-  
-  //----------------------------------------------------
-}
--- a/j2kviewer/src/ImageViewer.java
+++ b/j2kviewer/src/ImageViewer.java
@@ -1,222 +0,0 @@
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.awt.image.*;
-import java.awt.geom.*;
-import java.net.URL;
-import javax.swing.border.*;
-import java.util.*;
-import java.io.*;
-
-public class ImageViewer extends JApplet
-{
-  private class zoomLevel {
-    int x1, y1, x2, y2, zf;
-    
-    zoomLevel() {}
-    zoomLevel(zoomLevel zl)
-    {
-      x1 = zl.x1;
-      y1 = zl.y1;
-      x2 = zl.x2;
-      y2 = zl.y2;
-      zf = zl.zf;
-    }
-  }
-  
-  private BufferedImage bi;
-  private Graphics2D big;
-  private MML myMML;
-  private int iw, ih;
-  private int selected = 0, imgId;
-  private Image img;
-  private PgmImage pgm = new PgmImage();
-  private String cmdline = new String();
-  private static String hostname;
-  private static boolean isApplet = true;
-  private boolean fullRefresh = false;
-  private Point offset = new Point(0,0);
-  private zoomLevel zl = new zoomLevel();
-  private Rectangle rect = new Rectangle();
-  private Stack zoomStack = new Stack();
-  private static String j2kfilename;
-
-  public int getX()      { return offset.x; }
-  public int getY()      { return offset.y; }
-  public int getWidth()  { return iw; }
-  public int getHeight() { return ih; }
-  
-  public void destroy()
-  {
-  }
-  
-  public void zoomIn()
-  {
-    Dimension asz = this.getSize();
-    int maxzf = 3;
-    int coef = 1;
-    int r;
-    
-    cmdline = 
-      "/bin/sh get.sh " + j2kfilename + " " + iw
-      + " " + ih + " " + rect.x + " " + rect.y + " "
-      + rect.width + " " + rect.height;
-    Exec.execPrint(cmdline);
-
-    rect.x = rect.y = rect.width = rect.height = 0;
-
-    img = pgm.open("out.pgm");
-    
-    iw = img.getWidth(this);
-    ih = img.getHeight(this);
-    bi = new BufferedImage(iw, ih, BufferedImage.TYPE_INT_RGB);
-    big = bi.createGraphics();
-    selected = 0;
-    fullRefresh = true;
-    repaint();
-  }
-
-  public void zoomOut()
-  {
-  }
-
-  public void init()
-  {
-    String str;
-    int port;
-
-    imgId = 4;
-    if (isApplet && (((hostname = this.getParameter("hostname")) == null)
-		    || hostname.equals("")))
-      hostname = "localhost";
-    if (!isApplet || ((str = this.getParameter("cmdPort")) == null)) {
-      port = 3000;
-    } else {
-      port = new Integer(str).intValue();
-    }
-    
-    this.setSize(512, 512);
-    Dimension asz = this.getSize();
-    zl.x2 = asz.width;
-    zl.y2 = asz.height;
-    
-    cmdline = 
-      "/bin/sh get.sh " + j2kfilename + " " + asz.width
-      + " " + asz.height + " " + zl.x1 + " " + zl.y1 + " "
-      + zl.x2 + " " + zl.y2;
-    Exec.execPrint(cmdline);
-    img = pgm.open("out.pgm");
-    
-    iw = img.getWidth(this);
-    ih = img.getHeight(this);
-    
-    setBackground(Color.black);
-    bi = new BufferedImage(iw, ih, BufferedImage.TYPE_INT_RGB);
-    big = bi.createGraphics();
-    myMML = new MML(this);
-    addMouseListener(myMML);
-    addMouseMotionListener(myMML);
-  }
-  
-  public void setSelected(int state)
-  {
-    if (state != selected) {
-      selected = state;
-      repaint();
-    }
-  }
-  
-  public boolean isInsideRect(int x, int y)
-  {
-    return rect.contains(x - offset.x, y - offset.y);
-  }
-
-  public void setRGeom(int x1, int y1, int x2, int y2)
-  {
-    rect.x = Math.min(x1,x2) - offset.x;
-    rect.y = Math.min(y1,y2) - offset.y;
-    rect.width = Math.abs(x2-x1);
-    rect.height = Math.abs(y2-y1);
-  }
-
-  public void paint(Graphics g)
-  {
-    Graphics2D g2 = (Graphics2D) g;
-    Dimension asz = this.getSize();
-
-    if (fullRefresh) {
-      g2.clearRect(0, 0, asz.width, asz.height);
-      fullRefresh = false;
-    }
-    g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
-                        RenderingHints.VALUE_ANTIALIAS_ON);
-    g2.setRenderingHint(RenderingHints.KEY_RENDERING,
-                        RenderingHints.VALUE_RENDER_QUALITY);
-    big.setColor(Color.black);
-    offset.x = (int) (asz.width  - iw) / 2;
-    offset.y = (int) (asz.height - ih) / 2;
-    big.drawImage(img, 0, 0, this);
-    big.setPaint(Color.red);
-    if ((rect.width > 0) && (rect.height > 0))
-      big.draw(rect);
-    if (selected == 1)
-      shadeExt(big, 0, 0, 0, 64);
-    else if (selected == 2) {
-      shadeExt(big, 0, 0, 0, 255);
-      selected = 1;
-    }
-    g2.drawImage(bi, offset.x, offset.y, this);
-  }
-
-  private void shadeRect(Graphics2D g2, int r, int g, int b, int a)
-  {
-    g2.setPaint(new Color(r, g, b, a));
-    g2.fillRect(rect.x + 1, rect.y + 1, rect.width - 1, rect.height - 1);
-  }
-  
-  private void shadeExt(Graphics2D g2, int r, int g, int b, int a)
-  {
-    g2.setPaint(new Color(r, g, b, a));
-    g2.fillRect(0, 0, iw, rect.y); /* _N_ */
-    g2.fillRect(rect.x + rect.width + 1, rect.y,
-    		iw - rect.x - rect.width - 1, rect.height + 1); /* E */
-    g2.fillRect(0, rect.y, rect.x, rect.height + 1); /* W */
-    g2.fillRect(0, rect.y + rect.height + 1,
-    		iw, ih - rect.y - rect.height - 1); /* _S_ */
-  }
-
-  protected URL getURL(String filename)
-  {
-    URL codeBase = this.getCodeBase();
-    URL url = null;
-
-    try {
-      url = new URL(codeBase, filename);
-    } catch (java.net.MalformedURLException e) {
-      System.out.println("Couldn't create image: badly specified URL");
-      return null;
-    }
-
-    return url;
-  }
-
-  public static void main(String s[])
-  {
-    if (s.length > 0)
-      j2kfilename = s[0];
-    else
-      j2kfilename = "girl";
-      System.out.println(j2kfilename);
-    isApplet = false;
-    JFrame f = new JFrame("ImageViewer");
-    f.addWindowListener(new WindowAdapter() {
-        public void windowClosing(WindowEvent e) {System.exit(0);}
-    });
-    JApplet applet = new ImageViewer();
-    f.getContentPane().add("Center", applet);
-    applet.init();
-    f.pack();
-    f.setSize(new Dimension(550,550));
-    f.show();
-  }
-}
--- a/j2kviewer/src/MML.java
+++ b/j2kviewer/src/MML.java
@@ -1,85 +0,0 @@
-import java.awt.event.*;
-
-class MML implements MouseMotionListener, MouseListener
-{
-  public void mouseExited(MouseEvent e) {}
-  public void mouseEntered(MouseEvent e) {}
-  public void mouseClicked(MouseEvent e) {}
-  
-  private ImageViewer applet;
-  private int x1, y1, x2, y2, zf, btn;
-  private boolean zoomrq;
-  
-  public MML(ImageViewer iv)
-  {
-    x1 = y1 = -1;
-    applet = iv;
-    zoomrq = false;
-    zf = 0;
-  }
-  
-  private boolean isInside(int x, int y)
-  {
-    x -= applet.getX();
-    y -= applet.getY();
-    return (x >= 0) && (x < applet.getWidth())
-        && (y >= 0) && (y < applet.getHeight());
-  }
-
-  public void mousePressed(MouseEvent e)
-  {
-    btn = e.getButton();
-    if (applet.isInsideRect(e.getX(), e.getY())) {
-      applet.setSelected(2);
-      applet.repaint();
-      zoomrq = true;
-    } else {
-      applet.setRGeom(0, 0, 0, 0);
-      applet.setSelected(0);
-      applet.repaint();
-      x1 = y1 = -1;
-    }
-  }
-  
-  public void mouseReleased(MouseEvent e)
-  {
-    if (zoomrq && (e.getButton() == 1)) {
-      applet.zoomIn();
-      zoomrq = false;
-    } else if (e.getButton() == 3) {
-      applet.zoomOut();
-      zoomrq = false;
-    }
-  }
-
-  public void mouseMoved(MouseEvent e)
-  {
-    applet.setSelected(applet.isInsideRect(e.getX(), e.getY()) ? 1 : 0);
-  }
-  
-  public void mouseDragged(MouseEvent e)
-  {
-    String str;
-    
-    if (btn == 1) {
-      x2 = e.getX();
-      y2 = e.getY();
-
-      applet.setSelected(0);
-      zoomrq = false;
-
-      if (isInside(x2, y2)) {
-	str = "[IN ]";
-	if (x1 == -1) {
-          x1 = x2;
-	  y1 = y2;
-	} else {
-          applet.setRGeom(x1, y1, x2, y2);
-	  applet.repaint();
-	}
-      } else {
-	str = "[OUT]";
-      }
-    }    
-  }
-}
--- a/j2kviewer/src/PgmImage.java
+++ b/j2kviewer/src/PgmImage.java
@@ -1,93 +0,0 @@
-import java.awt.*;
-import java.awt.image.*;
-import java.net.*;
-import java.io.*;
-import java.util.regex.*;
-
-class PgmImage extends Component
-{
-  private Socket s;
-  private BufferedReader in;
-  private int x, y;
-  
-  PgmImage()
-  {
-  }
-  
-  private String read()
-  {
-    try { return in.readLine(); }
-    catch (IOException e) {
-      e.printStackTrace();
-      return null;
-    }
-  }
-  
-  public Image open(String filename)
-  {
-    String  str;
-    Pattern pat;
-    Matcher mat;
-    int bytes, width, height, depth;
-    FileInputStream fis;
-    
-    try {
-      in  = new BufferedReader(
-              new InputStreamReader(
-	        fis = new FileInputStream(
-		  new File(filename))));
-
-      pat = Pattern.compile("^P5$");
-      mat = pat.matcher(str = read());
-      mat.matches();
-      pat = Pattern.compile("^(\\d+) (\\d+)$");
-      mat = pat.matcher(str = read());
-      mat.matches();
-      x = new Integer(mat.group(1)).intValue();
-      y = new Integer(mat.group(2)).intValue();
-      width  = x;
-      height = y;
-      depth  = 1;
-      pat = Pattern.compile("^255$");
-      mat = pat.matcher(str = read());
-      mat.matches();
-      bytes = x*y;
-      char[] buf = new char[bytes];
-      int r, offset = 0;
-      while (bytes > 0) {
-	try { r = in.read(buf, offset, bytes); offset += r; bytes -= r; }
-	catch (IOException e) { e.printStackTrace(); }
-      }
-      int[] buf2 = new int[buf.length];
-      if (depth == 3) {
-	for (int i = 0; i < buf.length/3; ++i)
-	  buf2[i] = 0xFF << 24 | buf[3*i] << 16 | buf[3*i+1] << 8 | buf[3*i+2];
-      } else {
-	for (int i = 0; i < buf.length; ++i)
-	  buf2[i] = 0xFF << 24 | buf[i] << 16 | buf[i] << 8 | buf[i];
-      }
-      fis.close();
-      return createImage(new MemoryImageSource(width, height, buf2, 0, width));
-    } catch (IOException e) { e.printStackTrace(); }
-    return null;
-  }
-
-  public void close()
-  {
-  }
-  
-  public boolean bye()
-  {
-    return true;
-  }
-  
-  public int getXOffset()
-  {
-    return x;
-  }
-  
-  public int getYOffset()
-  {
-    return y;
-  }
-}
--- a/jpwl/decoder/ReadmeJPWLdec.txt
+++ b/jpwl/decoder/ReadmeJPWLdec.txt
@@ -1,20 +0,0 @@
-Version ****JPWLcorrect****
-
-This version realizes a JPWL decoder based on OpenJPEG library.
-Realized decoder accepts an input JPWL codestream, corrects errors sgnalling eventual
-residual errors and finally outputs the corrected JPWL codestream. This codestream shall 
-be used by a JPEG2000 Part-1 decoder to decode the image.
-
-How to use decoder from prompt line:
-
-"jpwl_correct input.j2k o.bmp"
-
-where,
-
-	- "input.j2k" is the input corrupted JPWL codestream
-	- "o.bmp" this file is necessary as parameter but the decoder doesn't create
-           that as output.
-
-Decoder create output file "output.j2c", that is the corrected JPWL codestream.
-
-Note that .j2c is the extension accepted by "kakadu" decoder.
--- a/jpwl/decoder/jpwldec/.cvsignore
+++ b/jpwl/decoder/jpwldec/.cvsignore
@@ -1,6 +0,0 @@
-obj
-obj.w32
-bin
-bin.w32
-lib
-lib.w32
--- a/jpwl/decoder/jpwldec/Makefile
+++ b/jpwl/decoder/jpwldec/Makefile
@@ -1,94 +0,0 @@
-# $Id$
-#
-# makefile for OpenJPEG codec
-
-OPENJPEG_DIR = ../libopenjpeg
-
-ifndef DEBUG
-  LDFLAGS = -s -lm
-else
-  LDFLAGS = -lm
-endif
-
-CFLAGS = -Wall -O3 -fno-strength-reduce -fomit-frame-pointer -I$(OPENJPEG_DIR)
-
-OBJ_DIR_W32 = obj.w32
-BIN_DIR_W32 = bin.w32
-LIB_DIR_W32 = $(OPENJPEG_DIR)/lib.w32
-
-ifdef MINGW32
-  CC = i386-mingw32-gcc
-  CFLAGS += -DDONT_HAVE_GETOPT
-  OBJ_DIR = $(OBJ_DIR_W32)
-  BIN_DIR = $(BIN_DIR_W32)
-  LIB_DIR = lib.w32
-  all:	$(BIN_DIR) $(OBJ_DIR) $(LIB_DIR) \
-	$(addprefix $(BIN_DIR)/,j2k_to_image.exe image_to_j2k.exe)
-else
-  CC = gcc
-  OBJ_DIR = obj
-  BIN_DIR = bin
-  LIB_DIR = lib
-  all:	$(BIN_DIR) $(OBJ_DIR) $(LIB_DIR) \
-  	$(addprefix $(BIN_DIR)/,j2k_to_image image_to_j2k)
-endif
-
-ifdef DYNAMIC
-  ifdef MINGW32
-    LIB_OPENJPEG = $(LIB_DIR)/libopenjpeg.dll
-    LDFLAGS += -L$(LIB_DIR) -lopenjpeg
-  else
-    LIB_OPENJPEG = $(OPENJPEG_DIR)/$(LIB_DIR)/libopenjpeg.so
-    LDFLAGS += -L$(OPENJPEG_DIR)/$(LIB_DIR) -lopenjpeg
-  endif
-else
-  LIB_OPENJPEG = $(OPENJPEG_DIR)/$(LIB_DIR)/libopenjpeg.a
-  LDFLAGS += $(LIB_OPENJPEG)
-endif
-
-$(BIN_DIR):
-	mkdir $(BIN_DIR)
-
-$(OBJ_DIR):
-	mkdir $(OBJ_DIR)
-
-$(LIB_DIR):	
-	mkdir $(LIB_DIR)
-
-$(LIB_DIR)/libopenjpeg.dll: $(OPENJPEG_DIR)/$(LIB_DIR)/libopenjpeg.dll
-	ln -sf ../$< $@
-$(OPENJPEG_DIR)/$(LIB_DIR)/libopenjpeg.dll:
-	cd $(OPENJPEG_DIR) && \
-	$(MAKE) $(OBJ_DIR) $(LIB_DIR) $(LIB_DIR)/libopenjpeg.dll
-$(OPENJPEG_DIR)/$(LIB_DIR)/libopenjpeg.a:
-	cd $(OPENJPEG_DIR) && \
-	$(MAKE) $(OBJ_DIR) $(LIB_DIR) $(LIB_DIR)/libopenjpeg.a
-$(OPENJPEG_DIR)/$(LIB_DIR)/libopenjpeg.so:
-	cd $(OPENJPEG_DIR) && \
-	$(MAKE) $(LIB_DIR) $(LIB_DIR)/libopenjpeg.so
-
-$(OBJ_DIR)/%.o:
-	$(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
-
-$(OBJ_DIR)/getopt.o:		compat/getopt.c
-$(OBJ_DIR)/convert.o:		convert.c
-$(OBJ_DIR)/j2k_to_image.o:	j2k_to_image.c
-$(OBJ_DIR)/image_to_j2k.o:	image_to_j2k.c convert.h
-
-J2I_OBJS = $(addprefix $(OBJ_DIR)/,j2k_to_image.o)
-I2J_OBJS = $(addprefix $(OBJ_DIR)/,image_to_j2k.o convert.o)
-
-$(BIN_DIR)/j2k_to_image:	$(J2I_OBJS) $(LIB_OPENJPEG)
-	${CC} -o $@  $(J2I_OBJS) ${LDFLAGS} 
-
-$(BIN_DIR)/image_to_j2k:	$(I2J_OBJS) $(LIB_OPENJPEG)
-	${CC} -o $@  $(I2J_OBJS) ${LDFLAGS} 
-
-$(BIN_DIR)/j2k_to_image.exe:	$(J2I_OBJS) $(LIB_OPENJPEG)
-	${CC} -o $@  $(J2I_OBJS) ${LDFLAGS} 
-
-$(BIN_DIR)/image_to_j2k.exe:	$(I2J_OBJS) $(LIB_OPENJPEG) $(OBJ_DIR)/getopt.o
-	${CC} -o $@  $(I2J_OBJS) ${LDFLAGS} $(OBJ_DIR)/getopt.o
-
-clean:
-	rm -f $(BIN_DIR_W32)/* $(BIN_DIR)/* $(OBJ_DIR_W32)/* $(OBJ_DIR)/*
--- a/jpwl/decoder/jpwldec/compat/getopt.h
+++ b/jpwl/decoder/jpwldec/compat/getopt.h
@@ -1,14 +0,0 @@
-/* last review : october 29th, 2002 */
-
-#ifndef _GETOPT_H_
-#define _GETOPT_H_
-
-extern int opterr;
-extern int optind;
-extern int optopt;
-extern int optreset;
-extern char *optarg;
-
-extern int getopt(int nargc, char *const *nargv, const char *ostr);
-
-#endif				/* _GETOPT_H_ */
--- a/jpwl/decoder/jpwldec/convert.c
+++ b/jpwl/decoder/jpwldec/convert.c
@@ -1,913 +0,0 @@
-/*
- * Copyright (c) 2001-2003, David Janssens
- * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2002-2003,  Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
- * 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 <openjpeg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-
-/* -->> -->> -->> -->>
-
-  BMP IMAGE FORMAT
-
- <<-- <<-- <<-- <<-- */
-
-/* UINT2 defines a two byte word */
-typedef unsigned short int UINT2;
-
-/* UINT4 defines a four byte word */
-typedef unsigned long int UINT4;
-
-typedef struct {
-  UINT2 bfType;			/* 'BM' for Bitmap (19776) */
-  UINT4 bfSize;			/* Size of the file        */
-  UINT2 bfReserved1;		/* Reserved : 0            */
-  UINT2 bfReserved2;		/* Reserved : 0            */
-  UINT4 bfOffBits;		/* Offset                  */
-} BITMAPFILEHEADER_t;
-
-typedef struct {
-  UINT4 biSize;			/* Size of the structure in bytes */
-  UINT4 biWidth;		/* Width of the image in pixels */
-  UINT4 biHeight;		/* Heigth of the image in pixels */
-  UINT2 biPlanes;		/* 1 */
-  UINT2 biBitCount;		/* Number of color bits by pixels */
-  UINT4 biCompression;		/* Type of encoding 0: none 1: RLE8 2: RLE4 */
-  UINT4 biSizeImage;		/* Size of the image in bytes */
-  UINT4 biXpelsPerMeter;	/* Horizontal (X) resolution in pixels/meter */
-  UINT4 biYpelsPerMeter;	/* Vertical (Y) resolution in pixels/meter */
-  UINT4 biClrUsed;		/* Number of color used in the image (0: ALL) */
-  UINT4 biClrImportant;		/* Number of important color (0: ALL) */
-} BITMAPINFOHEADER_t;
-
-int bmptoimage(char *filename, j2k_image_t * img, int subsampling_dx,
-	       int subsampling_dy, int Dim[2])
-{
-  FILE *IN;
-  FILE *Compo0 = NULL, *Compo1 = NULL, *Compo2 = NULL;
-  BITMAPFILEHEADER_t File_h;
-  BITMAPINFOHEADER_t Info_h;
-  unsigned char *RGB;
-  unsigned char *table_R, *table_G, *table_B;
-  unsigned int j, w, h, PAD, type = 0;
-
-  int i;
-  int gray_scale = 1, not_end_file = 1; 
-
-  unsigned int line = 0, col = 0;
-  unsigned char v, v2;
-  UINT4 W, H;
-
-  IN = fopen(filename, "rb");
-  if (!IN) {
-    fprintf(stderr,
-	    "\033[0;33mFailed to open %s for reading !!\033[0;39m\n",
-	    filename);
-    return 0;
-  }
-
-  File_h.bfType = getc(IN);
-  File_h.bfType = (getc(IN) << 8) + File_h.bfType;
-
-  if (File_h.bfType != 19778) {
-    printf("Error, not a BMP file!\n");
-    return 0;
-  } else {
-    /* FILE HEADER */
-    /* ------------- */
-    File_h.bfSize = getc(IN);
-    File_h.bfSize = (getc(IN) << 8) + File_h.bfSize;
-    File_h.bfSize = (getc(IN) << 16) + File_h.bfSize;
-    File_h.bfSize = (getc(IN) << 24) + File_h.bfSize;
-
-    File_h.bfReserved1 = getc(IN);
-    File_h.bfReserved1 = (getc(IN) << 8) + File_h.bfReserved1;
-
-    File_h.bfReserved2 = getc(IN);
-    File_h.bfReserved2 = (getc(IN) << 8) + File_h.bfReserved2;
-
-    File_h.bfOffBits = getc(IN);
-    File_h.bfOffBits = (getc(IN) << 8) + File_h.bfOffBits;
-    File_h.bfOffBits = (getc(IN) << 16) + File_h.bfOffBits;
-    File_h.bfOffBits = (getc(IN) << 24) + File_h.bfOffBits;
-
-    /* INFO HEADER */
-    /* ------------- */
-
-    Info_h.biSize = getc(IN);
-    Info_h.biSize = (getc(IN) << 8) + Info_h.biSize;
-    Info_h.biSize = (getc(IN) << 16) + Info_h.biSize;
-    Info_h.biSize = (getc(IN) << 24) + Info_h.biSize;
-
-    Info_h.biWidth = getc(IN);
-    Info_h.biWidth = (getc(IN) << 8) + Info_h.biWidth;
-    Info_h.biWidth = (getc(IN) << 16) + Info_h.biWidth;
-    Info_h.biWidth = (getc(IN) << 24) + Info_h.biWidth;
-    w = Info_h.biWidth;
-
-    Info_h.biHeight = getc(IN);
-    Info_h.biHeight = (getc(IN) << 8) + Info_h.biHeight;
-    Info_h.biHeight = (getc(IN) << 16) + Info_h.biHeight;
-    Info_h.biHeight = (getc(IN) << 24) + Info_h.biHeight;
-    h = Info_h.biHeight;
-
-    Info_h.biPlanes = getc(IN);
-    Info_h.biPlanes = (getc(IN) << 8) + Info_h.biPlanes;
-
-    Info_h.biBitCount = getc(IN);
-    Info_h.biBitCount = (getc(IN) << 8) + Info_h.biBitCount;
-
-    Info_h.biCompression = getc(IN);
-    Info_h.biCompression = (getc(IN) << 8) + Info_h.biCompression;
-    Info_h.biCompression = (getc(IN) << 16) + Info_h.biCompression;
-    Info_h.biCompression = (getc(IN) << 24) + Info_h.biCompression;
-
-    Info_h.biSizeImage = getc(IN);
-    Info_h.biSizeImage = (getc(IN) << 8) + Info_h.biSizeImage;
-    Info_h.biSizeImage = (getc(IN) << 16) + Info_h.biSizeImage;
-    Info_h.biSizeImage = (getc(IN) << 24) + Info_h.biSizeImage;
-
-    Info_h.biXpelsPerMeter = getc(IN);
-    Info_h.biXpelsPerMeter = (getc(IN) << 8) + Info_h.biXpelsPerMeter;
-    Info_h.biXpelsPerMeter = (getc(IN) << 16) + Info_h.biXpelsPerMeter;
-    Info_h.biXpelsPerMeter = (getc(IN) << 24) + Info_h.biXpelsPerMeter;
-
-    Info_h.biYpelsPerMeter = getc(IN);
-    Info_h.biYpelsPerMeter = (getc(IN) << 8) + Info_h.biYpelsPerMeter;
-    Info_h.biYpelsPerMeter = (getc(IN) << 16) + Info_h.biYpelsPerMeter;
-    Info_h.biYpelsPerMeter = (getc(IN) << 24) + Info_h.biYpelsPerMeter;
-
-    Info_h.biClrUsed = getc(IN);
-    Info_h.biClrUsed = (getc(IN) << 8) + Info_h.biClrUsed;
-    Info_h.biClrUsed = (getc(IN) << 16) + Info_h.biClrUsed;
-    Info_h.biClrUsed = (getc(IN) << 24) + Info_h.biClrUsed;
-
-    Info_h.biClrImportant = getc(IN);
-    Info_h.biClrImportant = (getc(IN) << 8) + Info_h.biClrImportant;
-    Info_h.biClrImportant = (getc(IN) << 16) + Info_h.biClrImportant;
-    Info_h.biClrImportant = (getc(IN) << 24) + Info_h.biClrImportant;
-
-    /* Read the data and store them in the OUT file */
-
-    if (Info_h.biBitCount == 24) {
-      img->x0 = Dim[0];
-      img->y0 = Dim[1];
-      img->x1 =
-	!Dim[0] ? (w - 1) * subsampling_dx + 1 : Dim[0] + (w -
-							   1) *
-	subsampling_dx + 1;
-      img->y1 =
-	!Dim[1] ? (h - 1) * subsampling_dy + 1 : Dim[1] + (h -
-							   1) *
-	subsampling_dy + 1;
-      img->numcomps = 3;
-      img->color_space = 1;
-      img->comps =
-	(j2k_comp_t *) malloc(img->numcomps * sizeof(j2k_comp_t));
-      for (i = 0; i < img->numcomps; i++) {
-	img->comps[i].prec = 8;
-	img->comps[i].bpp = 8;
-	img->comps[i].sgnd = 0;
-	img->comps[i].dx = subsampling_dx;
-	img->comps[i].dy = subsampling_dy;
-      }
-      Compo0 = fopen("Compo0", "wb");
-      if (!Compo0) {
-	fprintf(stderr,
-		"\033[0;33mFailed to open Compo0 for writing !\033[0;39m\n");
-      }
-      Compo1 = fopen("Compo1", "wb");
-      if (!Compo1) {
-	fprintf(stderr,
-		"\033[0;33mFailed to open Compo1 for writing !\033[0;39m\n");
-      }
-      Compo2 = fopen("Compo2", "wb");
-      if (!Compo2) {
-	fprintf(stderr,
-		"\033[0;33mFailed to open Compo2 for writing !\033[0;39m\n");
-      }
-
-      /* Place the cursor at the beginning of the image information */
-      fseek(IN, 0, SEEK_SET);
-      fseek(IN, File_h.bfOffBits, SEEK_SET);
-
-      W = Info_h.biWidth;
-      H = Info_h.biHeight;
-
-      // PAD = 4 - (3 * W) % 4;
-      // PAD = (PAD == 4) ? 0 : PAD;
-      PAD = (3 * W) % 4 ? 4 - (3 * W) % 4 : 0;
-
-
-      RGB =
-	(unsigned char *) malloc((3 * W + PAD) * H *
-				 sizeof(unsigned char));
-
-      fread(RGB, sizeof(unsigned char), (3 * W + PAD) * H, IN);
-
-      for (j = 0; j < (3 * W + PAD) * H; j++) {
-	unsigned char elmt;
-	int Wp = 3 * W + PAD;
-
-	elmt = RGB[(H - (j / Wp + 1)) * Wp + j % Wp];
-	if ((j % Wp) < (3 * W)) {
-	  switch (type) {
-	  case 0:
-	    fprintf(Compo2, "%c", elmt);
-	    type = 1;
-	    break;
-	  case 1:
-	    fprintf(Compo1, "%c", elmt);
-	    type = 2;
-	    break;
-	  case 2:
-	    fprintf(Compo0, "%c", elmt);
-	    type = 0;
-	    break;
-	  }
-	}
-      }
-
-      fclose(Compo0);
-      fclose(Compo1);
-      fclose(Compo2);
-      free(RGB);
-    } else if (Info_h.biBitCount == 8 && Info_h.biCompression == 0) {
-      img->x0 = Dim[0];
-      img->y0 = Dim[1];
-      img->x1 =
-	!Dim[0] ? (w - 1) * subsampling_dx + 1 : Dim[0] + (w -
-							   1) *
-	subsampling_dx + 1;
-      img->y1 =
-	!Dim[1] ? (h - 1) * subsampling_dy + 1 : Dim[1] + (h -
-							   1) *
-	subsampling_dy + 1;
-
-      table_R = (unsigned char *) malloc(256 * sizeof(unsigned char));
-      table_G = (unsigned char *) malloc(256 * sizeof(unsigned char));
-      table_B = (unsigned char *) malloc(256 * sizeof(unsigned char));
-
-      for (j = 0; j < Info_h.biClrUsed; j++) {
-	table_B[j] = getc(IN);
-	table_G[j] = getc(IN);
-	table_R[j] = getc(IN);
-	getc(IN);
-	if (table_R[j] != table_G[j] && table_R[j] != table_B[j]
-	    && table_G[j] != table_B[j])
-	  gray_scale = 0;
-      }
-
-      /* Place the cursor at the beginning of the image information */
-      fseek(IN, 0, SEEK_SET);
-      fseek(IN, File_h.bfOffBits, SEEK_SET);
-
-      W = Info_h.biWidth;
-      H = Info_h.biHeight;
-      if (Info_h.biWidth % 2)
-	W++;
-
-      RGB = (unsigned char *) malloc(W * H * sizeof(unsigned char));
-
-      fread(RGB, sizeof(unsigned char), W * H, IN);
-      if (gray_scale) {
-	img->numcomps = 1;
-	img->comps =
-	  (j2k_comp_t *) malloc(img->numcomps * sizeof(j2k_comp_t));
-	img->comps[0].prec = 8;
-	img->comps[0].bpp = 8;
-	img->comps[0].sgnd = 0;
-	img->comps[0].dx = subsampling_dx;
-	img->comps[0].dy = subsampling_dy;
-	Compo0 = fopen("Compo0", "wb");
-	if (!Compo0) {
-	  fprintf(stderr,
-		  "\033[0;33mFailed to open Compo0 for writing !\033[0;39m\n");
-	}
-	for (j = 0; j < W * H; j++) {
-	  if ((j % W < W - 1 && Info_h.biWidth % 2)
-	      || !(Info_h.biWidth % 2))
-	    fprintf(Compo0, "%c",
-		    table_R[RGB[W * H - ((j) / (W) + 1) * W + (j) % (W)]]);
-	}
-	fclose(Compo0);
-      } else {
-	img->numcomps = 3;
-	img->comps =
-	  (j2k_comp_t *) malloc(img->numcomps * sizeof(j2k_comp_t));
-	for (i = 0; i < img->numcomps; i++) {
-	  img->comps[i].prec = 8;
-	  img->comps[i].bpp = 8;
-	  img->comps[i].sgnd = 0;
-	  img->comps[i].dx = subsampling_dx;
-	  img->comps[i].dy = subsampling_dy;
-	}
-
-	Compo0 = fopen("Compo0", "wb");
-	if (!Compo0) {
-	  fprintf(stderr,
-		  "\033[0;33mFailed to open Compo0 for writing !\033[0;39m\n");
-	}
-	Compo1 = fopen("Compo1", "wb");
-	if (!Compo1) {
-	  fprintf(stderr,
-		  "\033[0;33mFailed to open Compo1 for writing !\033[0;39m\n");
-	}
-	Compo2 = fopen("Compo2", "wb");
-	if (!Compo2) {
-	  fprintf(stderr,
-		  "\033[0;33mFailed to open Compo2 for writing !\033[0;39m\n");
-	}
-
-	for (j = 0; j < W * H; j++) {
-	  if ((j % W < W - 1 && Info_h.biWidth % 2)
-	      || !(Info_h.biWidth % 2)) {
-	    fprintf(Compo0, "%c",
-		    table_R[RGB[W * H - ((j) / (W) + 1) * W + (j) % (W)]]);
-	    fprintf(Compo1, "%c",
-		    table_G[RGB[W * H - ((j) / (W) + 1) * W + (j) % (W)]]);
-	    fprintf(Compo2, "%c",
-		    table_B[RGB[W * H - ((j) / (W) + 1) * W + (j) % (W)]]);
-	  }
-
-	}
-	fclose(Compo0);
-	fclose(Compo1);
-	fclose(Compo2);
-      }
-      free(RGB);
-
-    } else if (Info_h.biBitCount == 8 && Info_h.biCompression == 1) {
-      img->x0 = Dim[0];
-      img->y0 = Dim[1];
-      img->x1 =
-	!Dim[0] ? (w - 1) * subsampling_dx + 1 : Dim[0] + (w -
-							   1) *
-	subsampling_dx + 1;
-      img->y1 =
-	!Dim[1] ? (h - 1) * subsampling_dy + 1 : Dim[1] + (h -
-							   1) *
-	subsampling_dy + 1;
-
-      table_R = (unsigned char *) malloc(256 * sizeof(unsigned char));
-      table_G = (unsigned char *) malloc(256 * sizeof(unsigned char));
-      table_B = (unsigned char *) malloc(256 * sizeof(unsigned char));
-
-      for (j = 0; j < Info_h.biClrUsed; j++) {
-	table_B[j] = getc(IN);
-	table_G[j] = getc(IN);
-	table_R[j] = getc(IN);
-	getc(IN);
-	if (table_R[j] != table_G[j] && table_R[j] != table_B[j]
-	    && table_G[j] != table_B[j])
-	  gray_scale = 0;
-      }
-
-      /* Place the cursor at the beginning of the image information */
-      fseek(IN, 0, SEEK_SET);
-      fseek(IN, File_h.bfOffBits, SEEK_SET);
-
-      if (gray_scale) {
-	img->numcomps = 1;
-	img->comps = (j2k_comp_t *) malloc(sizeof(j2k_comp_t));
-	img->comps[0].prec = 8;
-	img->comps[0].bpp = 8;
-	img->comps[0].sgnd = 0;
-	img->comps[0].dx = subsampling_dx;
-	img->comps[0].dy = subsampling_dy;
-	Compo0 = fopen("Compo0", "wb");
-	if (!Compo0) {
-	  fprintf(stderr,
-		  "\033[0;33mFailed to open Compo0 for writing !\033[0;39m\n");
-	}
-      } else {
-	img->numcomps = 3;
-	img->comps =
-	  (j2k_comp_t *) malloc(img->numcomps * sizeof(j2k_comp_t));
-	for (i = 0; i < img->numcomps; i++) {
-	  img->comps[i].prec = 8;
-	  img->comps[i].bpp = 8;
-	  img->comps[i].sgnd = 0;
-	  img->comps[i].dx = subsampling_dx;
-	  img->comps[i].dy = subsampling_dy;
-	}
-	Compo0 = fopen("Compo0", "wb");
-	if (!Compo0) {
-	  fprintf(stderr,
-		  "\033[0;33mFailed to open Compo0 for writing !\033[0;39m\n");
-	}
-	Compo1 = fopen("Compo1", "wb");
-	if (!Compo1) {
-	  fprintf(stderr,
-		  "\033[0;33mFailed to open Compo1 for writing !\033[0;39m\n");
-	}
-	Compo2 = fopen("Compo2", "wb");
-	if (!Compo2) {
-	  fprintf(stderr,
-		  "\033[0;33mFailed to open Compo2 for writing !\033[0;39m\n");
-	}
-      }
-
-      RGB =
-	(unsigned char *) malloc(Info_h.biWidth * Info_h.biHeight *
-				 sizeof(unsigned char));
-
-      while (not_end_file) {
-	v = getc(IN);
-	if (v) {
-	  v2 = getc(IN);
-	  for (i = 0; i < (int) v; i++) {
-	    RGB[line * Info_h.biWidth + col] = v2;
-	    col++;
-	  }
-	} else {
-	  v = getc(IN);
-	  switch (v) {
-	  case 0:
-	    col = 0;
-	    line++;
-	    break;
-	  case 1:
-	    line++;
-	    not_end_file = 0;
-	    break;
-	  case 2:
-	    printf("No Delta supported\n");
-	    return 1;
-	    break;
-	  default:
-	    for (i = 0; i < v; i++) {
-	      v2 = getc(IN);
-	      RGB[line * Info_h.biWidth + col] = v2;
-	      col++;
-	    }
-	    if (v % 2)
-	      v2 = getc(IN);
-	  }
-	}
-      }
-      if (gray_scale) {
-	for (line = 0; line < Info_h.biHeight; line++)
-	  for (col = 0; col < Info_h.biWidth; col++)
-	    fprintf(Compo0, "%c", table_R[(int)
-					  RGB[(Info_h.biHeight - line -
-					       1) * Info_h.biWidth +
-					      col]]);
-	fclose(Compo0);
-      } else {
-	for (line = 0; line < Info_h.biHeight; line++)
-	  for (col = 0; col < Info_h.biWidth; col++) {
-	    fprintf(Compo0, "%c", table_R[(int)
-					  RGB[(Info_h.biHeight - line -
-					       1) * Info_h.biWidth +
-					      col]]);
-	    fprintf(Compo1, "%c", table_G[(int)
-					  RGB[(Info_h.biHeight - line -
-					       1) * Info_h.biWidth +
-					      col]]);
-	    fprintf(Compo2, "%c", table_B[(int)
-					  RGB[(Info_h.biHeight - line -
-					       1) * Info_h.biWidth +
-					      col]]);
-	  }
-	fclose(Compo0);
-	fclose(Compo1);
-	fclose(Compo2);
-      }
-      free(RGB);
-    } else
-      fprintf(stderr,
-	      "Other system than 24 bits/pixels or 8 bits (no RLE coding) is not yet implemented [%d]\n",
-	      Info_h.biBitCount);
-
-    fclose(IN);
-    return 1;
-  }
-}
-
-	/* -->> -->> -->> -->>
-
-	   PGX IMAGE FORMAT
-
-	   <<-- <<-- <<-- <<-- */
-
-
-unsigned char readuchar(FILE * f)
-{
-  unsigned char c1;
-  fread(&c1, 1, 1, f);
-  return c1;
-}
-
-unsigned short readushort(FILE * f, int bigendian)
-{
-  unsigned char c1, c2;
-  fread(&c1, 1, 1, f);
-  fread(&c2, 1, 1, f);
-  if (bigendian)
-    return (c1 << 8) + c2;
-  else
-    return (c2 << 8) + c1;
-}
-
-unsigned int readuint(FILE * f, int bigendian)
-{
-  unsigned char c1, c2, c3, c4;
-  fread(&c1, 1, 1, f);
-  fread(&c2, 1, 1, f);
-  fread(&c3, 1, 1, f);
-  fread(&c4, 1, 1, f);
-  if (bigendian)
-    return (c1 << 24) + (c2 << 16) + (c3 << 8) + c4;
-  else
-    return (c4 << 24) + (c3 << 16) + (c2 << 8) + c1;
-}
-
-int pgxtoimage(char *filename, j2k_image_t * img, int tdy,
-	       int subsampling_dx, int subsampling_dy, int Dim[2],
-	       j2k_cp_t cp)
-{
-  FILE *f;
-  int w, h, prec;
-  int i, compno, bandno;
-  char str[256], endian[16];
-  char sign;
-  int bigendian;
-  j2k_comp_t *comp;
-
-  img->numcomps = 1;
-  img->color_space = 2;
-  img->comps = (j2k_comp_t *) malloc(img->numcomps * sizeof(j2k_comp_t));
-  for (compno = 0; compno < img->numcomps; compno++) {
-    FILE *src;
-    char tmp[16];
-    int max = 0;
-    int Y1;
-    comp = &img->comps[compno];
-    sprintf(str, "%s", filename);
-    f = fopen(str, "rb");
-    if (!f) {
-      fprintf(stderr, "Failed to open %s for reading !\n", str);
-      return 0;
-    }
-    if (fscanf(f, "PG %s %c %d %d %d", endian, &sign, &prec, &w, &h) == 5) {
-      fgetc(f);
-      if (!strcmp(endian, "ML"))
-	bigendian = 1;
-      else
-	bigendian = 0;
-      if (compno == 0) {
-	img->x0 = Dim[0];
-	img->y0 = Dim[1];
-	img->x1 =
-	  !Dim[0] ? (w - 1) * subsampling_dx + 1 : Dim[0] + (w -
-							     1) *
-	  subsampling_dx + 1;
-	img->y1 =
-	  !Dim[1] ? (h - 1) * subsampling_dy + 1 : Dim[1] + (h -
-							     1) *
-	  subsampling_dy + 1;
-      } else {
-	if (w != img->x1 || h != img->y1)
-	  return 0;
-      }
-
-      if (sign == '-') {
-	comp->sgnd = 1;
-      } else {
-	comp->sgnd = 0;
-      }
-      comp->prec = prec;
-      comp->dx = subsampling_dx;
-      comp->dy = subsampling_dy;
-      bandno = 1;
-
-      Y1 = cp.ty0 + bandno * cp.tdy <
-	img->y1 ? cp.ty0 + bandno * cp.tdy : img->y1;
-      Y1 -= img->y0;
-
-      sprintf(tmp, "bandtile%d", bandno);	/* bandtile file */
-      src = fopen(tmp, "wb");
-      if (!src) {
-	fprintf(stderr, "failed to open %s for writing !\n", tmp);
-      }
-      for (i = 0; i < w * h; i++) {
-	int v;
-	if (i == Y1 * w / subsampling_dy && tdy != -1) {	/* bandtile is full */
-	  fclose(src);
-	  bandno++;
-	  sprintf(tmp, "bandtile%d", bandno);
-	  src = fopen(tmp, "wb");
-	  if (!src) {
-	    fprintf(stderr, "failed to open %s for writing !\n", tmp);
-	  }
-	  Y1 = cp.ty0 + bandno * cp.tdy <
-	    img->y1 ? cp.ty0 + bandno * cp.tdy : img->y1;
-	  Y1 -= img->y0;
-	}
-	if (comp->prec <= 8) {
-	  if (!comp->sgnd) {
-	    v = readuchar(f);
-	  } else {
-	    v = (char) readuchar(f);
-	  }
-	} else if (comp->prec <= 16) {
-	  if (!comp->sgnd) {
-	    v = readushort(f, bigendian);
-	  } else {
-	    v = (short) readushort(f, bigendian);
-	  }
-	} else {
-	  if (!comp->sgnd) {
-	    v = readuint(f, bigendian);
-	  } else {
-	    v = (int) readuint(f, bigendian);
-	  }
-	}
-	if (v > max)
-	  max = v;
-	fprintf(src, "%d ", v);
-      }
-    } else {
-      return 0;
-    }
-    fclose(f);
-    fclose(src);
-    comp->bpp = int_floorlog2(max) + 1;
-  }
-  return 1;
-}
-
-/* -->> -->> -->> -->>
-
-  PNM IMAGE FORMAT
-
- <<-- <<-- <<-- <<-- */
-
-int pnmtoimage(char *filename, j2k_image_t * img, int subsampling_dx,
-	       int subsampling_dy, int Dim[2])
-{
-  FILE *f;
-  FILE *Compo0, *Compo1, *Compo2;
-  int w, h;
-  int i;
-  char value;
-  char comment[256];
-
-  f = fopen(filename, "rb");
-  if (!f) {
-    fprintf(stderr,
-	    "\033[0;33mFailed to open %s for reading !!\033[0;39m\n",
-	    filename);
-    return 0;
-  }
-
-  if (fgetc(f) != 'P')
-    return 0;
-  value = fgetc(f);
-
-  if (value == '2') {
-    fgetc(f);
-    if (fgetc(f) == '#') {
-      fseek(f, 0, SEEK_SET);
-      fscanf(f, "P2\n");
-      fgets(comment, 256, f);
-      fscanf(f, "%d %d\n255", &w, &h);
-    } else {
-      fseek(f, 0, SEEK_SET);
-      fscanf(f, "P2\n%d %d\n255", &w, &h);
-    }
-
-    fgetc(f);
-    img->x0 = Dim[0];
-    img->y0 = Dim[1];
-    img->x1 =
-      !Dim[0] ? (w - 1) * subsampling_dx + 1 : Dim[0] + (w -
-							 1) *
-      subsampling_dx + 1;
-    img->y1 =
-      !Dim[1] ? (h - 1) * subsampling_dy + 1 : Dim[1] + (h -
-							 1) *
-      subsampling_dy + 1;
-
-    img->numcomps = 1;
-    img->color_space = 2;
-    img->comps = (j2k_comp_t *) malloc(sizeof(j2k_comp_t));
-    img->comps[0].prec = 8;
-    img->comps[0].bpp = 8;
-    img->comps[0].sgnd = 0;
-    img->comps[0].dx = subsampling_dx;
-    img->comps[0].dy = subsampling_dy;
-
-    Compo0 = fopen("Compo0", "wb");
-    if (!Compo0) {
-      fprintf(stderr,
-	      "\033[0;33mFailed to open Compo0 for writing !\033[0;39m\n");
-    }
-    for (i = 0; i < w * h; i++) {
-      unsigned int l;
-      fscanf(f, "%d", &l);
-      fprintf(Compo0, "%c", l);
-    }
-    fclose(Compo0);
-  } else if (value == '5') {
-    fgetc(f);
-    if (fgetc(f) == '#') {
-      fseek(f, 0, SEEK_SET);
-      fscanf(f, "P5\n");
-      fgets(comment, 256, f);
-      fscanf(f, "%d %d\n255", &w, &h);
-    } else {
-      fseek(f, 0, SEEK_SET);
-      fscanf(f, "P5\n%d %d\n255", &w, &h);
-    }
-
-    fgetc(f);
-    img->x0 = Dim[0];
-    img->y0 = Dim[1];
-    img->x1 =
-      !Dim[0] ? (w - 1) * subsampling_dx + 1 : Dim[0] + (w -
-							 1) *
-      subsampling_dx + 1;
-    img->y1 =
-      !Dim[1] ? (h - 1) * subsampling_dy + 1 : Dim[1] + (h -
-							 1) *
-      subsampling_dy + 1;
-
-    img->numcomps = 1;
-    img->color_space = 2;
-    img->comps = (j2k_comp_t *) malloc(sizeof(j2k_comp_t));
-    img->comps[0].prec = 8;
-    img->comps[0].bpp = 8;
-    img->comps[0].sgnd = 0;
-    img->comps[0].dx = subsampling_dx;
-    img->comps[0].dy = subsampling_dy;
-    Compo0 = fopen("Compo0", "wb");
-    if (!Compo0) {
-      fprintf(stderr,
-	      "\033[0;33mFailed to open Compo0 for writing !\033[0;39m\n");
-    }
-    for (i = 0; i < w * h; i++) {
-      unsigned char l;
-      fread(&l, 1, 1, f);
-      fwrite(&l, 1, 1, Compo0);
-    }
-    fclose(Compo0);
-  } else if (value == '3') {
-    fgetc(f);
-    if (fgetc(f) == '#') {
-      fseek(f, 0, SEEK_SET);
-      fscanf(f, "P3\n");
-      fgets(comment, 256, f);
-      fscanf(f, "%d %d\n255", &w, &h);
-    } else {
-      fseek(f, 0, SEEK_SET);
-      fscanf(f, "P3\n%d %d\n255", &w, &h);
-    }
-
-    fgetc(f);
-    img->x0 = Dim[0];
-    img->y0 = Dim[1];
-    img->x1 =
-      !Dim[0] ? (w - 1) * subsampling_dx + 1 : Dim[0] + (w -
-							 1) *
-      subsampling_dx + 1;
-    img->y1 =
-      !Dim[1] ? (h - 1) * subsampling_dy + 1 : Dim[1] + (h -
-							 1) *
-      subsampling_dy + 1;
-    img->numcomps = 3;
-    img->color_space = 1;
-    img->comps = (j2k_comp_t *) malloc(img->numcomps * sizeof(j2k_comp_t));
-    for (i = 0; i < img->numcomps; i++) {
-      img->comps[i].prec = 8;
-      img->comps[i].bpp = 8;
-      img->comps[i].sgnd = 0;
-      img->comps[i].dx = subsampling_dx;
-      img->comps[i].dy = subsampling_dy;
-    }
-    Compo0 = fopen("Compo0", "wb");
-    if (!Compo0) {
-      fprintf(stderr,
-	      "\033[0;33mFailed to open Compo0 for writing !\033[0;39m\n");
-    }
-
-    Compo1 = fopen("Compo1", "wb");
-    if (!Compo1) {
-      fprintf(stderr,
-	      "\033[0;33mFailed to open Compo1 for writing !\033[0;39m\n");
-    }
-
-    Compo2 = fopen("Compo2", "wb");
-    if (!Compo2) {
-      fprintf(stderr,
-	      "\033[0;33mFailed to open Compo2 for writing !\033[0;39m\n");
-    }
-
-    for (i = 0; i < w * h; i++) {
-      unsigned int r, g, b;
-      fscanf(f, "%d", &r);
-      fscanf(f, "%d", &g);
-      fscanf(f, "%d", &b);
-      fprintf(Compo0, "%c", r);
-      fprintf(Compo1, "%c", g);
-      fprintf(Compo2, "%c", b);
-    }
-    fclose(Compo0);
-    fclose(Compo1);
-    fclose(Compo2);
-  } else if (value == '6') {
-    fgetc(f);
-    if (fgetc(f) == '#') {
-      fseek(f, 0, SEEK_SET);
-      fscanf(f, "P6\n");
-      fgets(comment, 256, f);
-      fscanf(f, "%d %d\n255", &w, &h);
-    } else {
-      fseek(f, 0, SEEK_SET);
-      fscanf(f, "P6\n%d %d\n255", &w, &h);
-    }
-
-    fgetc(f);
-    img->x0 = Dim[0];
-    img->y0 = Dim[1];
-    img->x1 =
-      !Dim[0] ? (w - 1) * subsampling_dx + 1 : Dim[0] + (w -
-							 1) *
-      subsampling_dx + 1;
-    img->y1 =
-      !Dim[1] ? (h - 1) * subsampling_dy + 1 : Dim[1] + (h -
-							 1) *
-      subsampling_dy + 1;
-    img->numcomps = 3;
-    img->color_space = 1;
-    img->comps = (j2k_comp_t *) malloc(img->numcomps * sizeof(j2k_comp_t));
-    for (i = 0; i < img->numcomps; i++) {
-      img->comps[i].prec = 8;
-      img->comps[i].bpp = 8;
-      img->comps[i].sgnd = 0;
-      img->comps[i].dx = subsampling_dx;
-      img->comps[i].dy = subsampling_dy;
-    }
-    Compo0 = fopen("Compo0", "wb");
-    if (!Compo0) {
-      fprintf(stderr,
-	      "\033[0;33mFailed to open Compo0 for writing !\033[0;39m\n");
-    }
-
-    Compo1 = fopen("Compo1", "wb");
-    if (!Compo1) {
-      fprintf(stderr,
-	      "\033[0;33mFailed to open Compo1 for writing !\033[0;39m\n");
-    }
-
-    Compo2 = fopen("Compo2", "wb");
-    if (!Compo2) {
-      fprintf(stderr,
-	      "\033[0;33mFailed to open Compo2 for writing !\033[0;39m\n");
-    }
-
-    for (i = 0; i < w * h; i++) {
-      unsigned char r, g, b;
-      fread(&r, 1, 1, f);
-      fread(&g, 1, 1, f);
-      fread(&b, 1, 1, f);
-      fwrite(&r, 1, 1, Compo0);
-      fwrite(&g, 1, 1, Compo1);
-      fwrite(&b, 1, 1, Compo2);
-    }
-    fclose(Compo0);
-    fclose(Compo1);
-    fclose(Compo2);
-  } else {
-    return 0;
-  }
-  fclose(f);
-  return 1;
-}
--- a/jpwl/decoder/jpwldec/image_to_j2k.c
+++ b/jpwl/decoder/jpwldec/image_to_j2k.c
@@ -1,887 +0,0 @@
-/*
- * Copyright (c) 2001-2003, David Janssens
- * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2002-2003,  Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
- * 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 <openjpeg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-#ifndef DONT_HAVE_GETOPT
-#include <getopt.h>
-#else
-#include "compat/getopt.h"
-#endif
-#include "convert.h"
-
-void help_display()
-{
-  printf("HELP\n----\n\n");
-  printf("- the option -help displays the readme.txt file on screen\n\n");
-
-
-  printf("List of parameters for the coder JPEG 2000 :\n");
-  printf("\n");
-  printf
-    ("- The markers COD and QCD are writed both of two in the main_header and never appear in the tile_header.  The markers in the main header are : SOC SIZ COD QCD COM.\n");
-  printf("\n");
-  printf
-    ("- This coder can encode mega image, a test was made on a 24000x24000 pixels color image.  You need enough disk space memory (twice the original) to encode the image. (i.e. for a 1.5 Gb image you need a minimum of 3Gb of disk memory)\n");
-  printf("\n");
-  printf("REMARKS :\n");
-  printf("---------\n");
-  printf("\n");
-  printf
-    ("* the value of rate enter in the code line is the compression factor !\n");
-  printf("exemple :\n");
-  printf("\n");
-  printf
-    ("-r 20,10,1 means quality 1 : compress 20x, quality 2 : compress 10x and quality 3 : compress 1x = lossless\n");
-  printf("\n");
-  printf("By default :\n");
-  printf("------------\n");
-  printf("\n");
-  printf(" * lossless\n");
-  printf(" * 1 tile\n");
-  printf(" * size of precinct 2^15 x 2^15 (means 1 precinct)\n");
-  printf(" * size of code-block 64 x 64\n");
-  printf(" * Number of resolution : 6\n");
-  printf(" * No SOP marker in the codestream\n");
-  printf(" * No EPH marker in the codestream\n");
-  printf(" * No sub-sampling in x and y direction\n");
-  printf(" * No mode switch activated\n");
-  printf(" * progression order : LRCP\n");
-  printf(" * No index file\n");
-  printf(" * No ROI upshifted\n");
-  printf(" * No offset of the origin of the image\n");
-  printf(" * No offset of the origin of the tiles\n");
-  printf(" * Reversible DWT 5-3\n");
-  printf("\n");
-  printf("Parameters :\n");
-  printf("------------\n");
-  printf("\n");
-  printf
-    ("-i             : source file  (-i source.pnm also *.pgm, *.ppm) required\n");
-  printf("\n");
-  printf("-o             : destination file (-o dest.j2k or .jp2) required\n");
-  printf("\n");
-  printf("-help          : Display the help information optional\n ");
-  printf("\n");
-  printf("-r             : different rates (-r 20,10,5) optional\n ");
-  printf("\n");
-  printf("-n             : Number of resolution (-n 3) optional\n");
-  printf("\n");
-  printf("-b             : size of code block (-b 32,32) optional\n");
-  printf("\n");
-  printf("-c             : size of precinct (-c 128,128) optional\n");
-  printf("\n");
-  printf("-t             : size of tile (-t 512,512) optional\n");
-  printf("\n");
-  printf
-    ("-p             : progression order (-p LRCP) [LRCP, RLCP, RPCL, PCRL, CPRL] optional\n");
-  printf("\n");
-  printf
-    ("-s             : subsampling factor (-s 2,2) [-s X,Y] optional\n");
-  printf("\n");
-  printf
-    ("-SOP           : write SOP marker before each packet optional\n");
-  printf("\n");
-  printf
-    ("-EPH           : write EPH marker after each header packet optional\n");
-  printf("\n");
-  printf
-    ("-M             : mode switch (-M 3) [1=BYPASS(LAZY) 2=RESET 4=RESTART(TERMALL) 8=VSC 16=ERTERM(SEGTERM) 32=SEGMARK(SEGSYM)] optional\n");
-  printf
-    ("                    for several mode switch you have to add the value of each mode you want\n");
-  printf
-    ("                    ex : RESTART(4) + RESET(2) + SEGMARK(32) = -M 38\n");
-  printf("\n");
-  printf
-    ("-x             : Create an index file *.Idx (-x index_name.Idx) optional\n");
-  printf("\n");
-  printf
-    ("-ROI:c=%%d,U=%%d : quantization indices upshifted for component c=%%d [%%d = 0,1,2]\n");
-  printf
-    ("                 with a value of U=%%d [0 <= %%d <= 37] (i.e. -ROI:c=0,U=25) optional\n");
-  printf("\n");
-  printf
-    ("-d             : offset of the origin of the image (-d 150,300) optional\n");
-  printf("\n");
-  printf
-    ("-T             : offset of the origin of the tiles (-T 100,75) optional\n");
-  printf("\n");
-  printf("-I             : Use the irreversible DWT 9-7 (-I) optional\n");
-  printf("\n");
-  printf("IMPORTANT :\n");
-  printf("-----------\n");
-  printf("\n");
-  printf("* subsampling bigger than 2 can produce error\n");
-  printf("\n");
-  printf("The index file respect the structure below :\n");
-  printf("---------------------------------------------\n");
-  printf("\n");
-  printf("Image_height Image_width\n");
-  printf("progression order\n");
-  printf("Tiles_size_X Tiles_size_Y\n");
-  printf("Components_nb\n");
-  printf("Layers_nb\n");
-  printf("decomposition_levels\n");
-  printf("Precincts_size_X Precincts_size_Y\n");
-  printf("Main_header_end_position\n");
-  printf("Codestream_size\n");
-  printf("Tile0 start_pos end_Theader end_pos\n");
-  printf("Tile1  ''           ''        ''\n");
-  printf("...\n");
-  printf("TileN  ''           ''        ''\n");
-  printf("Tpacket_0 Tile layer res. comp. prec. start_pos end_pos\n");
-  printf("...\n");
-  printf("Tpacket_M  ''    ''   ''   ''    ''       ''       ''\n");
-}
-
-int give_progression(char progression[4])
-{
-  if (progression[0] == 'L' && progression[1] == 'R'
-      && progression[2] == 'C' && progression[3] == 'P') {
-    return 0;
-  } else {
-    if (progression[0] == 'R' && progression[1] == 'L'
-	&& progression[2] == 'C' && progression[3] == 'P') {
-      return 1;
-    } else {
-      if (progression[0] == 'R' && progression[1] == 'P'
-	  && progression[2] == 'C' && progression[3] == 'L') {
-	return 2;
-      } else {
-	if (progression[0] == 'P' && progression[1] == 'C'
-	    && progression[2] == 'R' && progression[3] == 'L') {
-	  return 3;
-	} else {
-	  if (progression[0] == 'C' && progression[1] == 'P'
-	      && progression[2] == 'R' && progression[3] == 'L') {
-	    return 4;
-	  } else {
-	    return -1;
-	  }
-	}
-      }
-    }
-  }
-}
-
-double dwt_norms_97[4][10] = {
-  {1.000, 1.965, 4.177, 8.403, 16.90, 33.84, 67.69, 135.3, 270.6, 540.9},
-  {2.022, 3.989, 8.355, 17.04, 34.27, 68.63, 137.3, 274.6, 549.0},
-  {2.022, 3.989, 8.355, 17.04, 34.27, 68.63, 137.3, 274.6, 549.0},
-  {2.080, 3.865, 8.307, 17.18, 34.71, 69.59, 139.3, 278.6, 557.2}
-};
-
-int floorlog2(int a)
-{
-  int l;
-  for (l = 0; a > 1; l++) {
-    a >>= 1;
-  }
-  return l;
-}
-
-void encode_stepsize(int stepsize, int numbps, int *expn, int *mant)
-{
-  int p, n;
-  p = floorlog2(stepsize) - 13;
-  n = 11 - floorlog2(stepsize);
-  *mant = (n < 0 ? stepsize >> -n : stepsize << n) & 0x7ff;
-  *expn = numbps - p;
-}
-
-void calc_explicit_stepsizes(j2k_tccp_t * tccp, int prec)
-{
-  int numbands, bandno;
-  numbands = 3 * tccp->numresolutions - 2;
-  for (bandno = 0; bandno < numbands; bandno++) {
-    double stepsize;
-
-    int resno, level, orient, gain;
-    resno = bandno == 0 ? 0 : (bandno - 1) / 3 + 1;
-    orient = bandno == 0 ? 0 : (bandno - 1) % 3 + 1;
-    level = tccp->numresolutions - 1 - resno;
-    gain =
-      tccp->qmfbid == 0 ? 0 : (orient ==
-			       0 ? 0 : (orient == 1
-					|| orient == 2 ? 1 : 2));
-    if (tccp->qntsty == J2K_CCP_QNTSTY_NOQNT) {
-      stepsize = 1.0;
-    } else {
-      double norm = dwt_norms_97[orient][level];
-      stepsize = (1 << (gain + 1)) / norm;
-    }
-    encode_stepsize((int) floor(stepsize * 8192.0), prec + gain,
-		    &tccp->stepsizes[bandno].expn,
-		    &tccp->stepsizes[bandno].mant);
-  }
-}
-
-int main(int argc, char **argv)
-{
-  int len;
-  int NumResolution, numD_min;	/*   NumResolution : number of resolution                     */
-  int Tile_arg;			/*   Tile_arg = 0 (not in argument) ou = 1 (in argument)      */
-  int CSty;			/*   CSty : coding style                                      */
-  int Prog_order;		/*   progression order (default LRCP)                         */
-  char progression[4];
-  int numpocs, numpocs_tile;	/*   Number of progression order change (POC) default 0       */
-  int prcw_init[J2K_MAXRLVLS];	/*   Initialisation Precinct width                            */
-  int prch_init[J2K_MAXRLVLS];	/*   Initialisation Precinct height                           */
-  //int prcw_init, prch_init;                     /*   Initialisation precincts' size                           */
-  int cblockw_init, cblockh_init;	/*   Initialisation codeblocks' size                          */
-  int mode, value;		/*   Mode switch (cblk_style)                                 */
-  int subsampling_dx, subsampling_dy;	/* subsampling value for dx and dy                    */
-  int ROI_compno, ROI_shift;	/*   region of interrest                                      */
-  int Dim[2];			/*   portion of the image coded                               */
-  int TX0, TY0;			/*   tile off-set                                             */
-  j2k_image_t img;
-  j2k_cp_t cp, cp_init;		/*   cp_init is used to initialise in multiple tiles          */
-  j2k_tcp_t *tcp, *tcp_init;	/*   tcp_init is used to initialise in multiple tile          */
-  j2k_poc_t POC[32];		/*   POC : used in case of Progression order change           */
-  j2k_poc_t *tcp_poc;
-  j2k_tccp_t *tccp;
-  int i, tileno, j;
-  char *infile = 0;
-  char *outfile = 0;
-  char *index = 0;
-  char *s, S1, S2, S3;
-  int ir = 0;
-  int res_spec = 0;		/*   For various precinct sizes specification                 */
-  char sep;
-  char *outbuf;
-  FILE *f;
-
-
-  /* default value */
-  /* ------------- */
-  NumResolution = 6;
-  CSty = 0;
-  cblockw_init = 64;
-  cblockh_init = 64;
-  cp.tw = 1;
-  cp.th = 1;
-  cp.index_on = 0;
-  Prog_order = 0;
-  numpocs = 0;
-  mode = 0;
-  subsampling_dx = 1;
-  subsampling_dy = 1;
-  ROI_compno = -1;		/* no ROI */
-  ROI_shift = 0;
-  Dim[0] = 0;
-  Dim[1] = 0;
-  TX0 = 0;
-  TY0 = 0;
-  cp.comment = "Created by OpenJPEG version 0.9";
-  cp.disto_alloc = 0;
-  cp.fixed_alloc = 0;
-  cp.fixed_quality = 0;		//add fixed_quality
-  /* img.PPT=0; */
-
-  Tile_arg = 0;
-  cp_init.tcps = (j2k_tcp_t *) malloc(sizeof(j2k_tcp_t));	/* initialisation if only one tile */
-  tcp_init = &cp_init.tcps[0];
-  tcp_init->numlayers = 0;
-
-  cp.intermed_file=1;
-
-  while (1) {
-    int c = getopt(argc, argv,
-		   "i:o:r:q:f:t:n:c:b:x:p:s:d:h:P:S:E:M:R:T:C:I");
-    if (c == -1)
-      break;
-    switch (c) {
-    case 'i':			/* IN fill */
-      infile = optarg;
-      s = optarg;
-      while (*s) {
-	s++;
-      }
-      s--;
-      S3 = *s;
-      s--;
-      S2 = *s;
-      s--;
-      S1 = *s;
-
-      if ((S1 == 'p' && S2 == 'g' && S3 == 'x')
-	  || (S1 == 'P' && S2 == 'G' && S3 == 'X')) {
-	cp.image_type = 0;
-	break;
-      }
-
-      if ((S1 == 'p' && S2 == 'n' && S3 == 'm')
-	  || (S1 == 'P' && S2 == 'N' && S3 == 'M')
-	  || (S1 == 'p' && S2 == 'g' && S3 == 'm') || (S1 == 'P'
-						       && S2 == 'G'
-						       && S3 == 'M')
-	  || (S1 == 'P' && S2 == 'P' && S3 == 'M') || (S1 == 'p'
-						       && S2 == 'p'
-						       && S3 == 'm')) {
-	cp.image_type = 1;
-	break;
-      }
-
-      if ((S1 == 'b' && S2 == 'm' && S3 == 'p')
-	  || (S1 == 'B' && S2 == 'M' && S3 == 'P')) {
-	cp.image_type = 2;
-	break;
-      }
-      fprintf(stderr,
-	      "!! Unrecognized format for infile : %c%c%c [accept only *.pnm, *.pgm, *.ppm, *.pgx or *.bmp] !!\n\n",
-	      S1, S2, S3);
-      return 1;
-      break;
-      /* ----------------------------------------------------- */
-    case 'o':			/* OUT fill */
-      outfile = optarg;
-      while (*outfile) {
-	outfile++;
-      }
-      outfile--;
-      S3 = *outfile;
-      outfile--;
-      S2 = *outfile;
-      outfile--;
-      S1 = *outfile;
-      
-      outfile = optarg;
-      
-      if ((S1 == 'j' && S2 == '2' && S3 == 'k') || (S1 == 'J' && S2 == '2' && S3 == 'K'))
-	cp.JPEG2000_format=0;
-      else if ((S1 == 'j' && S2 == 'p' && S3 == '2') || (S1 == 'J' && S2 == 'P' && S3 == '2'))
-	cp.JPEG2000_format=1;
-      else    {
-	fprintf(stderr,"Unknown output format image *.%c%c%c [only *.j2k, *.jp2]!! \n",S1,S2,S3);
-	return 1;
-      }
-      
-      
-      
-      break;
-      /* ----------------------------------------------------- */
-    case 'r':			/* rates rates/distorsion */
-      s = optarg;
-      while (sscanf(s, "%d", &tcp_init->rates[tcp_init->numlayers])
-	     == 1) {
-	tcp_init->numlayers++;
-	while (*s && *s != ',') {
-	  s++;
-	}
-	if (!*s)
-	  break;
-	s++;
-      }
-      cp.disto_alloc = 1;
-      cp.matrice = NULL;
-      break;
-      /* ----------------------------------------------------- */
-    case 'q':			/* add fixed_quality */
-      s = optarg;
-      while (sscanf(s, "%f", &tcp_init->distoratio[tcp_init->numlayers]) ==
-	     1) {
-	tcp_init->numlayers++;
-	while (*s && *s != ',') {
-	  s++;
-	}
-	if (!*s)
-	  break;
-	s++;
-      }
-      cp.fixed_quality = 1;
-      cp.matrice = NULL;
-      break;
-      /* dda */
-      /* ----------------------------------------------------- */
-    case 'f':			/* mod fixed_quality (before : -q) */
-      s = optarg;
-      sscanf(s, "%d", &tcp_init->numlayers);
-      s++;
-      if (tcp_init->numlayers > 9)
-	s++;
-      cp.matrice =
-	(int *) malloc(tcp_init->numlayers * NumResolution * 3 *
-		       sizeof(int));
-      s = s + 2;
-      for (i = 0; i < tcp_init->numlayers; i++) {
-	tcp_init->rates[i] = 1;
-	sscanf(s, "%d,", &cp.matrice[i * NumResolution * 3]);
-	s += 2;
-	if (cp.matrice[i * NumResolution * 3] > 9)
-	  s++;
-	cp.matrice[i * NumResolution * 3 + 1] = 0;
-	cp.matrice[i * NumResolution * 3 + 2] = 0;
-	for (j = 1; j < NumResolution; j++) {
-	  sscanf(s, "%d,%d,%d",
-		 &cp.matrice[i * NumResolution * 3 + j * 3 + 0],
-		 &cp.matrice[i * NumResolution * 3 + j * 3 + 1],
-		 &cp.matrice[i * NumResolution * 3 + j * 3 + 2]);
-	  s += 6;
-	  if (cp.matrice[i * NumResolution * 3 + j * 3] > 9)
-	    s++;
-	  if (cp.matrice[i * NumResolution * 3 + j * 3 + 1] > 9)
-	    s++;
-	  if (cp.matrice[i * NumResolution * 3 + j * 3 + 2] > 9)
-	    s++;
-	}
-	if (i < tcp_init->numlayers - 1)
-	  s++;
-      }
-      cp.fixed_alloc = 1;
-      break;
-      /* ----------------------------------------------------- */
-    case 't':			/* tiles */
-      sscanf(optarg, "%d,%d", &cp.tdx, &cp.tdy);
-      Tile_arg = 1;
-      break;
-      /* ----------------------------------------------------- */
-    case 'n':			/* resolution */
-      sscanf(optarg, "%d", &NumResolution);
-      break;
-      /* ----------------------------------------------------- */
-    case 'c':			/* precinct dimension */
-      s = optarg;
-      do {
-	sep = 0;
-	sscanf(s, "[%d,%d]%c", &prcw_init[res_spec],
-	       &prch_init[res_spec], &sep);
-	CSty |= 0x01;
-	res_spec++;
-	s = strpbrk(s, "]") + 2;
-      } while (sep == ',');
-      break;
-      /* ----------------------------------------------------- */
-    case 'b':			/* code-block dimension */
-      sscanf(optarg, "%d,%d", &cblockw_init, &cblockh_init);
-      if (cblockw_init * cblockh_init > 4096 || cblockw_init > 1024
-	  || cblockw_init < 4 || cblockh_init > 1024 || cblockh_init < 4) {
-	fprintf(stderr,
-		"!! Size of code_block error (option -b) !!\n\nRestriction :\n    * width*height<=4096\n    * 4<=width,height<= 1024\n\n");
-	return 1;
-      }
-      break;
-      /* ----------------------------------------------------- */
-    case 'x':			/* creation of index file */
-      index = optarg;
-      cp.index_on = 1;
-      break;
-      /* ----------------------------------------------------- */
-    case 'p':			/* progression order */
-      s = optarg;
-      for (i = 0; i < 4; i++) {
-	progression[i] = *s;
-	s++;
-      }
-      Prog_order = give_progression(progression);
-
-      if (Prog_order == -1) {
-	fprintf(stderr,
-		"Unrecognized progression order [LRCP, RLCP, RPCL, PCRL, CPRL] !!\n");
-	return 1;
-      }
-      break;
-      /* ----------------------------------------------------- */
-    case 's':			/* subsampling factor */
-      if (sscanf(optarg, "%d,%d", &subsampling_dx, &subsampling_dy)
-	  != 2) {
-	fprintf(stderr,
-		"'-s' sub-sampling argument error !  [-s dx,dy]\n");
-	return 1;
-      }
-      break;
-      /* ----------------------------------------------------- */
-    case 'd':			/* coordonnate of the reference grid */
-      if (sscanf(optarg, "%d,%d", &Dim[0], &Dim[1]) != 2) {
-	fprintf(stderr,
-		"-d 'coordonnate of the reference grid' argument error !! [-d x0,y0]\n");
-	return 1;
-      }
-      break;
-      /* ----------------------------------------------------- */
-    case 'h':			/* Display an help description */
-      help_display();
-      return 0;
-      break;
-      /* ----------------------------------------------------- */
-    case 'P':			/* POC */
-      fprintf(stderr, "/----------------------------------\\\n");
-      fprintf(stderr, "|  POC option not fully tested !!  |\n");
-      fprintf(stderr, "\\----------------------------------/\n");
-
-      s = optarg;
-      while (sscanf(s, "T%d=%d,%d,%d,%d,%d,%s", &POC[numpocs].tile,
-		    &POC[numpocs].resno0, &POC[numpocs].compno0,
-		    &POC[numpocs].layno1, &POC[numpocs].resno1,
-		    &POC[numpocs].compno1, POC[numpocs].progorder) == 7) {
-	POC[numpocs].prg = give_progression(POC[numpocs].progorder);
-	/* POC[numpocs].tile; */
-	numpocs++;
-	while (*s && *s != '/') {
-	  s++;
-	}
-	if (!*s)
-	  break;
-	s++;
-      }
-      break;
-      /* ------------------------------------------------------ */
-    case 'S':			/* SOP marker */
-      CSty |= 0x02;
-      break;
-      /* ------------------------------------------------------ */
-    case 'E':			/* EPH marker */
-      CSty |= 0x04;
-      break;
-      /* ------------------------------------------------------ */
-    case 'M':			/* Mode switch pas tous au point !! */
-      if (sscanf(optarg, "%d", &value) == 1) {
-	for (i = 0; i <= 5; i++) {
-	  int cache = value & (1 << i);
-	  if (cache)
-	    mode |= (1 << i);
-	}
-      }
-      break;
-      /* ------------------------------------------------------ */
-    case 'R':			/* ROI */
-      if (sscanf(optarg, "OI:c=%d,U=%d", &ROI_compno, &ROI_shift) != 2) {
-	fprintf(stderr, "ROI error !! [-ROI:c='compno',U='shift']\n");
-	return 1;
-      }
-      break;
-      /* ------------------------------------------------------ */
-    case 'T':			/* Tile offset */
-      if (sscanf(optarg, "%d,%d", &TX0, &TY0) != 2) {
-	fprintf(stderr, "-T 'tile offset' argument error !! [-T X0,Y0]");
-	return 1;
-      }
-      break;
-      /* ------------------------------------------------------ */
-    case 'C':			/* Add a comment */
-      cp.comment = optarg;
-      break;
-      /* ------------------------------------------------------ */
-    case 'I':			/* reversible or not */
-      ir = 1;
-      break;
-      /* ------------------------------------------------------ */
-    default:
-      return 1;
-    }
-  }
-
-  cp.tx0 = TX0;
-  cp.ty0 = TY0;
-
-  /* Error messages */
-  /* -------------- */
-  if (!infile || !outfile) {
-    fprintf(stderr,
-	    "usage: image_to_j2k -i image-file -o j2k/jp2-file (+ options)\n");
-    return 1;
-  }
-
-  if ((cp.disto_alloc || cp.fixed_alloc || cp.fixed_quality)&&(!(cp.disto_alloc ^ cp.fixed_alloc ^ cp.fixed_quality))) {
-    fprintf(stderr,
-	    "Error: options -r -q and -f can not be used together !!\n");
-    return 1;
-  } // mod fixed_quality
-
-  /* if no rate entered, lossless by default */
-  if (tcp_init->numlayers == 0) {
-    tcp_init->rates[tcp_init->numlayers] = 1;
-    tcp_init->numlayers++;
-    cp.disto_alloc = 1;
-  }
-
-  if (TX0 > Dim[0] || TY0 > Dim[1]) {
-    fprintf(stderr,
-	    "Error: Tile offset dimension is unnappropriate --> TX0(%d)<=IMG_X0(%d) TYO(%d)<=IMG_Y0(%d) \n",
-	    TX0, Dim[0], TY0, Dim[1]);
-    return 1;
-  }
-
-  for (i = 0; i < numpocs; i++) {
-    if (POC[i].prg == -1) {
-      fprintf(stderr,
-	      "Unrecognized progression order in option -P (POC n %d) [LRCP, RLCP, RPCL, PCRL, CPRL] !!\n",
-	      i + 1);
-    }
-  }
-
-  switch (cp.image_type) {
-  case 0:
-    if (Tile_arg) {
-      if (!pgxtoimage
-	  (infile, &img, cp.tdy, subsampling_dx, subsampling_dy, Dim,
-	   cp)) {
-	fprintf(stderr, "not a pgx file\n");
-	return 1;
-      }
-    } else {
-      if (!pgxtoimage
-	  (infile, &img, -1, subsampling_dx, subsampling_dy, Dim, cp)) {
-	fprintf(stderr, " not a pgx file\n");
-	return 1;
-      }
-    }
-    break;
-
-  case 1:
-    if (!pnmtoimage(infile, &img, subsampling_dx, subsampling_dy, Dim)) {
-      fprintf(stderr, " not a pnm file\n");
-      return 1;
-    }
-    break;
-
-  case 2:
-    if (!bmptoimage(infile, &img, subsampling_dx, subsampling_dy, Dim)) {
-      fprintf(stderr, " not a bmp file\n");
-      return 1;
-    }
-    break;
-  }
-  /* to respect profile - 0 */
-  /* ---------------------- */
-  numD_min = 0;
-  /*   while (int_ceildiv(img.x1,(1<<numD_min))-int_ceildiv(img.x0,(1<<numD_min))>120 || int_ceildiv(img.y1,(1<<numD_min))-int_ceildiv(img.y0,(1<<numD_min))>160) numD_min++;
-     if ((numD_min+1)>NumResolution)
-     {
-     fprintf(stderr,"\n********************************************************************************\n\n");
-     fprintf(stderr,  "In view to respect Profile-0, the number of resolution used is %d in place of %d\n\n",numD_min+1,NumResolution);
-     fprintf(stderr,  "********************************************************************************\n\n");
-     NumResolution=numD_min+1;
-     } */
-
-  if (Tile_arg == 1) {
-    cp.tw = int_ceildiv(img.x1 - cp.tx0, cp.tdx);
-    cp.th = int_ceildiv(img.y1 - cp.ty0, cp.tdy);
-  } else {
-    cp.tdx = img.x1 - cp.tx0;
-    cp.tdy = img.y1 - cp.ty0;
-  }
- 
-  /* Initialization for PPM marker */
-  cp.ppm = 0;
-  cp.ppm_data = NULL;
-  cp.ppm_previous = 0;
-  cp.ppm_store = 0;
-
-  /* Init the mutiple tiles */
-  /* ---------------------- */
-  cp.tcps = (j2k_tcp_t *) malloc(cp.tw * cp.th * sizeof(j2k_tcp_t));
-
-  for (tileno = 0; tileno < cp.tw * cp.th; tileno++) {
-    tcp = &cp.tcps[tileno];
-    tcp->numlayers = tcp_init->numlayers;
-    for (j = 0; j < tcp->numlayers; j++) {
-      if (cp.fixed_quality)   // add fixed_quality
-	tcp->distoratio[j] = tcp_init->distoratio[j];
-      else
-	tcp->rates[j] = tcp_init->rates[j];
-    }
-    tcp->csty = CSty;
-    tcp->prg = Prog_order;
-    tcp->mct = img.numcomps == 3 ? 1 : 0;
-    tcp->ppt = 0;
-    tcp->ppt_data = NULL;
-    tcp->ppt_store = 0;
-
-    numpocs_tile = 0;
-    tcp->POC = 0;
-    if (numpocs) {
-      /* intialisation of POC */
-      tcp->POC = 1;
-      for (i = 0; i < numpocs; i++) {
-	if (tileno == POC[i].tile - 1 || POC[i].tile == -1) {
-	  tcp_poc = &tcp->pocs[numpocs_tile];
-	  tcp_poc->resno0 = POC[numpocs_tile].resno0;
-	  tcp_poc->compno0 = POC[numpocs_tile].compno0;
-	  tcp_poc->layno1 = POC[numpocs_tile].layno1;
-	  tcp_poc->resno1 = POC[numpocs_tile].resno1;
-	  tcp_poc->compno1 = POC[numpocs_tile].compno1;
-	  tcp_poc->prg = POC[numpocs_tile].prg;
-	  tcp_poc->tile = POC[numpocs_tile].tile;
-	  numpocs_tile++;
-	}
-      }
-    }
-    tcp->numpocs = numpocs_tile;
-    tcp->tccps = (j2k_tccp_t *) malloc(img.numcomps * sizeof(j2k_tccp_t));
-
-    for (i = 0; i < img.numcomps; i++) {
-      tccp = &tcp->tccps[i];
-      tccp->csty = CSty & 0x01;	/* 0 => one precinct || 1 => custom precinct  */
-      tccp->numresolutions = NumResolution;
-      tccp->cblkw = int_floorlog2(cblockw_init);
-      tccp->cblkh = int_floorlog2(cblockh_init);
-      tccp->cblksty = mode;
-      tccp->qmfbid = ir ? 0 : 1;
-      tccp->qntsty = ir ? J2K_CCP_QNTSTY_SEQNT : J2K_CCP_QNTSTY_NOQNT;
-      tccp->numgbits = 2;
-      if (i == ROI_compno)
-	tccp->roishift = ROI_shift;
-      else
-	tccp->roishift = 0;
-      if (CSty & J2K_CCP_CSTY_PRT) {
-	int p = 0;
-	for (j = tccp->numresolutions - 1; j >= 0; j--) {
-	  if (p < res_spec) {
-	    if (prcw_init[p] < 1)
-	      tccp->prcw[j] = 1;
-	    else
-	      tccp->prcw[j] = int_floorlog2(prcw_init[p]);
-
-	    if (prch_init[p] < 1)
-	      tccp->prch[j] = 1;
-	    else
-	      tccp->prch[j] = int_floorlog2(prch_init[p]);
-	  } else {
-	    int size_prcw, size_prch;
-	    size_prcw = prcw_init[res_spec - 1] >> (p - (res_spec - 1));
-	    size_prch = prch_init[res_spec - 1] >> (p - (res_spec - 1));
-	    if (size_prcw < 1)
-	      tccp->prcw[j] = 1;
-	    else
-	      tccp->prcw[j] = int_floorlog2(size_prcw);
-	    if (size_prch < 1)
-	      tccp->prch[j] = 1;
-	    else
-	      tccp->prch[j] = int_floorlog2(size_prch);
-	  }
-	  p++;
-	  /*printf("\nsize precinct pour level %d : %d,%d\n", j,
-		 tccp->prcw[j], tccp->prch[j]);*/
-	}
-      } else {
-	for (j = 0; j < tccp->numresolutions; j++) {
-	  tccp->prcw[j] = 15;
-	  tccp->prch[j] = 15;
-	}
-      }
-      calc_explicit_stepsizes(tccp, img.comps[i].prec);
-    }
-  }
-
-  if (cp.JPEG2000_format==0) {	      /* J2K format output */
-    if (cp.intermed_file==1) {	      /* After the encoding of each tile, j2k_encode 
-					 stores the data in the file*/
-      len = j2k_encode(&img, &cp, outfile, cp.tdx * cp.tdy * 2, index);
-      if (len == 0) {
-	fprintf(stderr, "failed to encode image\n");
-	return 1;
-      }
-    }
-    else {
-      outbuf = (char *) malloc( cp.tdx * cp.tdy * cp.tw * cp.th * 2); /* Allocate memory for all tiles */
-      cio_init(outbuf, cp.tdx * cp.tdy * cp.tw * cp.th * 2);							 
-      len = j2k_encode(&img, &cp, outbuf, cp.tdx * cp.tdy * cp.tw * cp.th * 2, index); 
-      if (len == 0) {
-	fprintf(stderr, "failed to encode image\n");
-	return 1;
-      }
-      f = fopen(outfile, "wb");	
-      if (!f) {					
-	fprintf(stderr, "failed to open %s for writing\n", outfile);	
-	return 1;				
-      }   
-      fwrite(outbuf, 1, len, f);
-      free(outbuf);
-      fclose(f);
-    }
-  }
-  else			       /* JP2 format output */
-  {
-    jp2_struct_t * jp2_struct;
-    jp2_struct = (jp2_struct_t *) malloc(sizeof(jp2_struct_t));
-    jp2_struct->image = &img;
-        
-    /* Initialising the standard JP2 box content*/
-    /* If you wish to modify those boxes, you have to modify the jp2_struct content*/ 
-    if (jp2_init_stdjp2(jp2_struct, &img))
-    {
-      fprintf(stderr,"Error with jp2 initialization");
-      return 1;
-    };
-
-    if (cp.intermed_file==1) {	      
-      /*For the moment, JP2 format does not use intermediary files for each tile*/
-      cp.intermed_file=0;
-    }
-    outbuf = (char *) malloc( cp.tdx * cp.tdy * cp.tw * cp.th * 2);
-    cio_init(outbuf, cp.tdx * cp.tdy * cp.tw * cp.th * 2);    
-    len = jp2_encode(jp2_struct, &cp, outbuf, index);
-    if (len == 0) {
-      fprintf(stderr, "failed to encode image\n");
-      return 1;
-    }
-    f = fopen(outfile, "wb");	
-    if (!f) {					
-      fprintf(stderr, "failed to open %s for writing\n", outfile);	
-      return 1;				
-    }
-    fwrite(outbuf, 1, len, f);
-    free(outbuf);
-    fclose(f);
-  }
-
-  /* Remove the temporary files */
-  /* -------------------------- */
-  if (cp.image_type) {		/* PNM PGM PPM */
-    for (i = 0; i < img.numcomps; i++) {
-      char tmp;
-      sprintf(&tmp, "Compo%d", i);
-      if (remove(&tmp) == -1) {
-	fprintf(stderr, "failed to kill %s file !\n", &tmp);
-      }
-    }
-  } else {			/* PGX */
-    for (i = 0; i < cp.th; i++) {
-      char tmp;
-      sprintf(&tmp, "bandtile%d", i + 1);
-
-      if (remove(&tmp) == -1) {
-	fprintf(stderr, "failed to kill %s file !\n", &tmp);
-      }
-    }
-  }
-
-  /* Free memory */
-  free(img.comps);
-  free(cp_init.tcps);
-  if (tcp_init->numlayers > 9) free(cp.matrice);
-  for (tileno = 0; tileno < cp.tw * cp.th; tileno++)
-    free(cp.tcps[tileno].tccps);
-  free(cp.tcps);
-
-  system("pause");
-  return 0;
-}
--- a/jpwl/decoder/jpwldec/image_to_j2k.dsp
+++ b/jpwl/decoder/jpwldec/image_to_j2k.dsp
@@ -1,249 +0,0 @@
-# Microsoft Developer Studio Project File - Name="image_to_j2k" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=image_to_j2k - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "image_to_j2k.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "image_to_j2k.mak" CFG="image_to_j2k - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "image_to_j2k - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "image_to_j2k - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "image_to_j2k - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../libopenjpeg" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "DONT_HAVE_GETOPT" /YX /FD /c
-# ADD BASE RSC /l 0x80c /d "NDEBUG"
-# ADD RSC /l 0x80c /i "../libopenjpeg" /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "image_to_j2k - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../libopenjpeg" /D "_DEBUG" /D "DONT_HAVE_GETOPT" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x80c /d "_DEBUG"
-# ADD RSC /l 0x80c /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "image_to_j2k - Win32 Release"
-# Name "image_to_j2k - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\libopenjpeg\bio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\cio.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\convert.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\dwt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\fix.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\compat\getopt.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\image_to_j2k.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\int.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\j2k.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\jp2.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\jpt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\mct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\mqc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\pi.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\raw.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\t1.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\t2.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\tcd.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\tgt.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\libopenjpeg\bio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\cio.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\convert.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\dwt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\fix.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\compat\getopt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\int.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\j2k.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\jp2.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\jpt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\mct.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\mqc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\openjpeg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\pi.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\raw.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\t1.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\t2.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\tcd.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\tgt.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
--- a/jpwl/decoder/jpwldec/image_to_j2k.ncb
+++ b/jpwl/decoder/jpwldec/image_to_j2k.ncb
@@ -1 +0,0 @@
-Microsoft C/C++ MSF 7.00
--- a/jpwl/decoder/jpwldec/image_to_j2k.vcproj
+++ b/jpwl/decoder/jpwldec/image_to_j2k.vcproj
@@ -1,254 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.00"
-	Name="image_to_j2k"
-	ProjectGUID="{7CB555D4-C2D9-40B9-B666-E8E1236E5699}"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../libopenjpeg"
-				PreprocessorDefinitions="_DEBUG,DONT_HAVE_GETOPT,WIN32,_CONSOLE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Debug/image_to_j2k.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile=".\Debug/image_to_j2k.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\Debug/image_to_j2k.pdb"
-				SubSystem="1"/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/image_to_j2k.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="2060"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../libopenjpeg"
-				PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE,DONT_HAVE_GETOPT"
-				StringPooling="TRUE"
-				RuntimeLibrary="4"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Release/image_to_j2k.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile=".\Release/image_to_j2k.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				ProgramDatabaseFile=".\Release/image_to_j2k.pdb"
-				SubSystem="1"/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/image_to_j2k.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="2060"
-				AdditionalIncludeDirectories="../libopenjpeg"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-			<File
-				RelativePath="..\libopenjpeg\bio.c">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\cio.c">
-			</File>
-			<File
-				RelativePath=".\convert.c">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\dwt.c">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\fix.c">
-			</File>
-			<File
-				RelativePath=".\compat\getopt.c">
-			</File>
-			<File
-				RelativePath=".\image_to_j2k.c">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\int.c">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\j2k.c">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\jp2.c">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\jpt.c">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\mct.c">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\mqc.c">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\pi.c">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\raw.c">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\t1.c">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\t2.c">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\tcd.c">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\tgt.c">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
-			<File
-				RelativePath="..\libopenjpeg\bio.h">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\cio.h">
-			</File>
-			<File
-				RelativePath=".\convert.h">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\dwt.h">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\fix.h">
-			</File>
-			<File
-				RelativePath=".\compat\getopt.h">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\int.h">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\j2k.h">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\jp2.h">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\jpt.h">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\mct.h">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\mqc.h">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\openjpeg.h">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\pi.h">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\raw.h">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\t1.h">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\t2.h">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\tcd.h">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\tgt.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/jpwl/decoder/jpwldec/j2k_to_image.c
+++ b/jpwl/decoder/jpwldec/j2k_to_image.c
@@ -1,561 +0,0 @@
-/* Copyright (c) 2001 David Janssens
- * Copyright (c) 2002-2003 Yannick Verschueren
- * Copyright (c) 2002-2003 Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
- * 
- * 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 <openjpeg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-extern int cslen; // Aggiunta in JPWL (per gestire l'inserimento di RED nella CS!)
-
-int ceildiv(int a, int b)
-{
-  return (a + b - 1) / b;
-}
-
-int main(int argc, char **argv)
-{
-  FILE *f;
-  char *src, *src_name;
-  char *dest, S1, S2, S3;
-  int len;
-
-  j2k_image_t img;
-
-  j2k_cp_t cp;
-  int w, wr, wrr, h, hr, hrr, max;
-  int i, image_type = -1, compno, pad, j;
-  int adjust;
-  jp2_struct_t *jp2_struct;
-
-  if (argc < 3) {
-    fprintf(stderr,
-	    "usage: %s j2k-file image-file [-reduce n]\n", argv[0]);
-    return 1;
-  }
-
-  f = fopen(argv[1], "rb");
-  if (!f) {
-    fprintf(stderr, "failed to open %s for reading\n", argv[1]);
-    return 1;
-  }
-
-  dest = argv[2];
-
-  cp.reduce_on = 0;
-  cp.reduce_value = 0;
-
-  /* OPTION REDUCE IS ACTIVE */
-  if (argc == 5) {
-    if (strcmp(argv[3], "-reduce")) {
-      fprintf(stderr,
-	      "usage: options " "-reduce n"
-	      " where n is the factor of reduction [%s]\n", argv[3]);
-      return 1;
-    }
-    cp.reduce_on = 1;
-    sscanf(argv[4], "%d", &cp.reduce_value);
-  }
-
-  while (*dest) {
-    dest++;
-  }
-  dest--;
-  S3 = *dest;
-  dest--;
-  S2 = *dest;
-  dest--;
-  S1 = *dest;
-
-  if ((S1 == 'p' && S2 == 'g' && S3 == 'x')
-      || (S1 == 'P' && S2 == 'G' && S3 == 'X')) {
-    image_type = 0;
-
-    dest--;
-
-    *dest = '\0';
-  }
-
-  if ((S1 == 'p' && S2 == 'n' && S3 == 'm')
-      || (S1 == 'P' && S2 == 'N' && S3 == 'M') || (S1 == 'p' && S2 == 'g'
-						   && S3 == 'm')
-      || (S1 == 'P' && S2 == 'G' && S3 == 'M') || (S1 == 'P' && S2 == 'P'
-						   && S3 == 'M')
-      || (S1 == 'p' && S2 == 'p' && S3 == 'm')) {
-    image_type = 1;
-  }
-
-  if ((S1 == 'b' && S2 == 'm' && S3 == 'p')
-      || (S1 == 'B' && S2 == 'M' && S3 == 'P')) {
-    image_type = 2;
-  }
-
-  if (image_type == -1) {
-    fprintf(stderr,
-	    "!! Unrecognized format for infile : %c%c%c [accept only *.pnm, *.pgm, *.ppm, *.pgx or *.bmp] !!\n\n",
-	    S1, S2, S3);
-    return 1;
-  }
-
-  fseek(f, 0, SEEK_END);
-  len = ftell(f);
-  fseek(f, 0, SEEK_SET);
-  src = (char *) malloc(len);
-  fread(src, 1, len, f);
-  fclose(f);
-
-  src_name = argv[1];
-  while (*src_name) {
-    src_name++;
-  }
-  src_name--;
-  S3 = *src_name;
-  src_name--;
-  S2 = *src_name;
-  src_name--;
-  S1 = *src_name;
-
-  /* J2K format */
-  if ((S1 == 'j' && S2 == '2' && S3 == 'k')
-      || (S1 == 'J' && S2 == '2' && S3 == 'K') || (S1 == 'j' && S2 == '2'
-						   && S3 == 'c')
-      || (S1 == 'J' && S2 == '2' && S3 == 'C')) {
-    if (!j2k_decode(src, len, &img, &cp)) {
-      fprintf(stderr, "j2k_to_image: failed to decode image!\n");
-      return 1;
-    }
-  }
-
-  /* JP2 format */
-  else if ((S1 == 'j' && S2 == 'p' && S3 == '2')
-	   || (S1 == 'J' && S2 == 'P' && S3 == '2')) {
-    jp2_struct = (jp2_struct_t *) malloc(sizeof(jp2_struct_t));
-
-    jp2_struct->image = &img;
-
-    if (jp2_decode(src, len, jp2_struct, &cp)) {
-      fprintf(stderr, "j2k_to_image: failed to decode image!\n");
-      return 1;
-    }
-    /* Insert code here if you want to create actions on jp2_struct before deleting it */
-    free(jp2_struct);
-  }
-
-  /* JPT format */
-  else if ((S1 == 'j' && S2 == 'p' && S3 == 't')
-	   || (S1 == 'J' && S2 == 'P' && S3 == 'T')) {
-    if (!j2k_decode_jpt_stream(src, len, &img, &cp)) {
-      fprintf(stderr, "j2k_to_image: failed to decode image!\n");
-      return 1;
-    }
-  }
-
-  /* otherwise : error */
-  else {
-    fprintf(stderr,
-	    "j2k_to_image : Unknown format image *.%c%c%c [only *.j2k, *.jp2, *.jpc or *.jpt]!! \n",
-	    S1, S2, S3);
-    return 1;
-  }
-  
-  src = realloc(src, cslen);  // Aggiunta in JPWL per evitare errori di free a causa
-							// della modifica di CS in caso di aggiunta RED!
-  free(src);
-  /* ------------------  CREATE OUT IMAGE WITH THE RIGHT FORMAT ----------------------- */
-
-  /* ---------------------------- / */
-  /* /                            / */
-  /* /  FORMAT : PNM, PGM or PPM  / */
-  /* /                            / */
-  /* ---------------------------- / */
-
-  switch (image_type) {
-  case 1:			/* PNM PGM PPM */
-    if (img.numcomps == 3 && img.comps[0].dx == img.comps[1].dx
-	&& img.comps[1].dx == img.comps[2].dx
-	&& img.comps[0].dy == img.comps[1].dy
-	&& img.comps[1].dy == img.comps[2].dy
-	&& img.comps[0].prec == img.comps[1].prec
-	&& img.comps[1].prec == img.comps[2].prec) {
-      f = fopen(argv[2], "wb");
-      w = ceildiv(img.x1 - img.x0, img.comps[0].dx);
-      // wr = ceildiv(int_ceildivpow2(img.x1 - img.x0,img.factor),img.comps[0].dx);
-      wr = img.comps[0].w;
-      wrr = int_ceildivpow2(img.comps[0].w, img.comps[0].factor);
-
-      h = ceildiv(img.y1 - img.y0, img.comps[0].dy);
-      // hr = ceildiv(int_ceildivpow2(img.y1 - img.y0,img.factor), img.comps[0].dy);
-      hr = img.comps[0].h;
-      hrr = int_ceildivpow2(img.comps[0].h, img.comps[0].factor);
-
-      max = img.comps[0].prec > 8 ? 255 : (1 << img.comps[0].prec) - 1;
-
-      img.comps[0].x0 =
-	int_ceildivpow2(img.comps[0].x0 -
-			int_ceildiv(img.x0, img.comps[0].dx),
-			img.comps[0].factor);
-      img.comps[0].y0 =
-	int_ceildivpow2(img.comps[0].y0 -
-			int_ceildiv(img.y0, img.comps[0].dy),
-			img.comps[0].factor);
-
-
-      fprintf(f, "P6\n# %d %d %d %d %d\n%d %d\n%d\n",
-	      cp.tcps[cp.tileno[0]].tccps[0].numresolutions, w, h,
-	      img.comps[0].x0, img.comps[0].y0, wrr, hrr, max);
-      adjust = img.comps[0].prec > 8 ? img.comps[0].prec - 8 : 0;
-      for (i = 0; i < wrr * hrr; i++) {
-	char r, g, b;
-	r = img.comps[0].data[i / wrr * wr + i % wrr];
-	r += (img.comps[0].sgnd ? 1 << (img.comps[0].prec - 1) : 0);
-	r = r >> adjust;
-
-	g = img.comps[1].data[i / wrr * wr + i % wrr];
-	g += (img.comps[1].sgnd ? 1 << (img.comps[1].prec - 1) : 0);
-	g = g >> adjust;
-
-	b = img.comps[2].data[i / wrr * wr + i % wrr];
-	b += (img.comps[2].sgnd ? 1 << (img.comps[2].prec - 1) : 0);
-	b = b >> adjust;
-
-	fprintf(f, "%c%c%c", r, g, b);
-      }
-      free(img.comps[0].data);
-      free(img.comps[1].data);
-      free(img.comps[2].data);
-      fclose(f);
-    } else {
-      for (compno = 0; compno < img.numcomps; compno++) {
-	char name[256];
-	if (img.numcomps > 1) {
-	  sprintf(name, "%d.%s", compno, argv[2]);
-	} else {
-	  sprintf(name, "%s", argv[2]);
-	}
-	f = fopen(name, "wb");
-	w = ceildiv(img.x1 - img.x0, img.comps[compno].dx);
-	// wr = ceildiv(int_ceildivpow2(img.x1 - img.x0,img.factor),img.comps[compno].dx);
-	wr = img.comps[compno].w;
-	wrr =
-	  int_ceildivpow2(img.comps[compno].w, img.comps[compno].factor);
-
-	h = ceildiv(img.y1 - img.y0, img.comps[compno].dy);
-	// hr = ceildiv(int_ceildivpow2(img.y1 - img.y0,img.factor), img.comps[compno].dy);
-	hr = img.comps[compno].h;
-	hrr =
-	  int_ceildivpow2(img.comps[compno].h, img.comps[compno].factor);
-
-	max =
-	  img.comps[compno].prec >
-	  8 ? 255 : (1 << img.comps[compno].prec) - 1;
-
-	img.comps[compno].x0 =
-	  int_ceildivpow2(img.comps[compno].x0 -
-			  int_ceildiv(img.x0,
-				      img.comps[compno].dx),
-			  img.comps[compno].factor);
-	img.comps[compno].y0 =
-	  int_ceildivpow2(img.comps[compno].y0 -
-			  int_ceildiv(img.y0,
-				      img.comps[compno].dy),
-			  img.comps[compno].factor);
-
-	fprintf(f, "P5\n# %d %d %d %d %d\n%d %d\n%d\n",
-		cp.tcps[cp.tileno[0]].tccps[compno].
-		numresolutions, w, h, img.comps[compno].x0,
-		img.comps[compno].y0, wrr, hrr, max);
-	adjust =
-	  img.comps[compno].prec > 8 ? img.comps[compno].prec - 8 : 0;
-	for (i = 0; i < wrr * hrr; i++) {
-	  char l;
-	  l = img.comps[compno].data[i / wrr * wr + i % wrr];
-	  l += (img.comps[compno].
-		sgnd ? 1 << (img.comps[compno].prec - 1) : 0);
-	  l = l >> adjust;
-	  fprintf(f, "%c", l);
-	}
-	fclose(f);
-	free(img.comps[compno].data);
-      }
-    }
-    break;
-
-    /* ------------------------ / */
-    /* /                        / */
-    /* /     FORMAT : PGX       / */
-    /* /                        / */
-    /* /----------------------- / */
-  case 0:			/* PGX */
-    for (compno = 0; compno < img.numcomps; compno++) {
-      j2k_comp_t *comp = &img.comps[compno];
-      char name[256];
-
-      int nbytes = 0;
-      //if (img.numcomps > 1)
-      sprintf(name, "%s-%d.pgx", argv[2], compno);
-
-      //else
-
-      //sprintf(name, "%s.pgx", argv[2]);
-
-      f = fopen(name, "wb");
-      // w = ceildiv(img.x1 - img.x0, comp->dx);
-      // wr = ceildiv(int_ceildivpow2(img.x1 - img.x0,img.factor), comp->dx);
-      w = img.comps[compno].w;
-      wr = int_ceildivpow2(img.comps[compno].w, img.comps[compno].factor);
-
-      // h = ceildiv(img.y1 - img.y0, comp->dy);
-      // hr = ceildiv(int_ceildivpow2(img.y1 - img.y0,img.factor), comp->dy);
-      h = img.comps[compno].h;
-      hr = int_ceildivpow2(img.comps[compno].h, img.comps[compno].factor);
-
-      fprintf(f, "PG ML %c %d %d %d\n", comp->sgnd ? '-' : '+',
-	      comp->prec, wr, hr);
-
-      if (comp->prec <= 8)
-	nbytes = 1;
-
-      else if (comp->prec <= 16)
-	nbytes = 2;
-
-      else
-	nbytes = 4;
-      for (i = 0; i < wr * hr; i++) {
-	int v = img.comps[compno].data[i / wr * w + i % wr];
-
-	for (j = nbytes - 1; j >= 0; j--) {
-
-	  char byte = (char) (v >> (j * 8));
-
-	  fwrite(&byte, 1, 1, f);
-
-	}
-      }
-      free(img.comps[compno].data);
-      fclose(f);
-    }
-    break;
-
-    /* ------------------------ / */
-    /* /                        / */
-    /* /     FORMAT : BMP       / */
-    /* /                        / */
-    /* /----------------------- / */
-
-  case 2:			/* BMP */
-    if (img.numcomps == 3 && img.comps[0].dx == img.comps[1].dx
-	&& img.comps[1].dx == img.comps[2].dx
-	&& img.comps[0].dy == img.comps[1].dy
-	&& img.comps[1].dy == img.comps[2].dy
-	&& img.comps[0].prec == img.comps[1].prec
-	&& img.comps[1].prec == img.comps[2].prec) {
-      /* -->> -->> -->> -->>
-
-         24 bits color
-
-         <<-- <<-- <<-- <<-- */
-
-      f = fopen(argv[2], "wb");
-      // w = ceildiv(img.x1 - img.x0, img.comps[0].dx);
-      // wr = ceildiv(int_ceildivpow2(img.x1 - img.x0,img.factor), img.comps[0].dx);
-      w = img.comps[0].w;
-      wr = int_ceildivpow2(img.comps[0].w, img.comps[0].factor);
-
-      // h = ceildiv(img.y1 - img.y0, img.comps[0].dy);
-      // hr = ceildiv(int_ceildivpow2(img.y1 - img.y0,img.factor), img.comps[0].dy);
-      h = img.comps[0].h;
-      hr = int_ceildivpow2(img.comps[0].h, img.comps[0].factor);
-
-      fprintf(f, "BM");
-
-      /* FILE HEADER */
-      /* ------------- */
-      fprintf(f, "%c%c%c%c",
-	      (unsigned char) (hr * wr * 3 + 3 * hr * (wr % 2) +
-			       54) & 0xff,
-	      (unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2) + 54)
-			       >> 8) & 0xff,
-	      (unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2) + 54)
-			       >> 16) & 0xff,
-	      (unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2) + 54)
-			       >> 24) & 0xff);
-      fprintf(f, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
-	      ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
-      fprintf(f, "%c%c%c%c", (54) & 0xff, ((54) >> 8) & 0xff,
-	      ((54) >> 16) & 0xff, ((54) >> 24) & 0xff);
-
-      /* INFO HEADER   */
-      /* ------------- */
-      fprintf(f, "%c%c%c%c", (40) & 0xff, ((40) >> 8) & 0xff,
-	      ((40) >> 16) & 0xff, ((40) >> 24) & 0xff);
-      fprintf(f, "%c%c%c%c", (unsigned char) ((wr) & 0xff),
-	      (unsigned char) ((wr) >> 8) & 0xff,
-	      (unsigned char) ((wr) >> 16) & 0xff,
-	      (unsigned char) ((wr) >> 24) & 0xff);
-      fprintf(f, "%c%c%c%c", (unsigned char) ((hr) & 0xff),
-	      (unsigned char) ((hr) >> 8) & 0xff,
-	      (unsigned char) ((hr) >> 16) & 0xff,
-	      (unsigned char) ((hr) >> 24) & 0xff);
-      fprintf(f, "%c%c", (1) & 0xff, ((1) >> 8) & 0xff);
-      fprintf(f, "%c%c", (24) & 0xff, ((24) >> 8) & 0xff);
-      fprintf(f, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
-	      ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
-      fprintf(f, "%c%c%c%c",
-	      (unsigned char) (3 * hr * wr +
-			       3 * hr * (wr % 2)) & 0xff,
-	      (unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2)) >>
-			       8) & 0xff,
-	      (unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2)) >>
-			       16) & 0xff,
-	      (unsigned char) ((hr * wr * 3 + 3 * hr * (wr % 2)) >>
-			       24) & 0xff);
-      fprintf(f, "%c%c%c%c", (7834) & 0xff, ((7834) >> 8) & 0xff,
-	      ((7834) >> 16) & 0xff, ((7834) >> 24) & 0xff);
-      fprintf(f, "%c%c%c%c", (7834) & 0xff, ((7834) >> 8) & 0xff,
-	      ((7834) >> 16) & 0xff, ((7834) >> 24) & 0xff);
-      fprintf(f, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
-	      ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
-      fprintf(f, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
-	      ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
-
-      for (i = 0; i < wr * hr; i++) {
-	unsigned char R, G, B;
-	/* a modifier */
-	// R = img.comps[0].data[w * h - ((i) / (w) + 1) * w + (i) % (w)];
-	R = img.comps[0].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
-	// G = img.comps[1].data[w * h - ((i) / (w) + 1) * w + (i) % (w)];
-	G = img.comps[1].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
-	// B = img.comps[2].data[w * h - ((i) / (w) + 1) * w + (i) % (w)];
-	B = img.comps[2].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
-	fprintf(f, "%c%c%c", B, G, R);
-
-	if ((i + 1) % wr == 0) {
-	  for (pad = (3 * wr) % 4 ? 4 - (3 * wr) % 4 : 0; pad > 0; pad--)	/* ADD */
-	    fprintf(f, "%c", 0);
-	}
-      }
-      fclose(f);
-      free(img.comps[1].data);
-      free(img.comps[2].data);
-    } else {			/* Gray-scale */
-
-      /* -->> -->> -->> -->>
-
-         8 bits non code (Gray scale)
-
-         <<-- <<-- <<-- <<-- */
-      f = fopen(argv[2], "wb");
-      // w = ceildiv(img.x1 - img.x0, img.comps[0].dx);
-      // wr = ceildiv(int_ceildivpow2(img.x1 - img.x0,img.factor), img.comps[0].dx);
-      w = img.comps[0].w;
-      wr = int_ceildivpow2(img.comps[0].w, img.comps[0].factor);
-
-      // h = ceildiv(img.y1 - img.y0, img.comps[0].dy);
-      // hr = ceildiv(int_ceildivpow2(img.y1 - img.y0,img.factor), img.comps[0].dy);
-      h = img.comps[0].h;
-      hr = int_ceildivpow2(img.comps[0].h, img.comps[0].factor);
-
-      fprintf(f, "BM");
-
-      /* FILE HEADER */
-      /* ------------- */
-      fprintf(f, "%c%c%c%c",
-	      (unsigned char) (hr * wr + 54 + 1024 +
-			       hr * (wr % 2)) & 0xff,
-	      (unsigned char) ((hr * wr + 54 + 1024 + hr * (wr % 2))
-			       >> 8) & 0xff,
-	      (unsigned char) ((hr * wr + 54 + 1024 + hr * (wr % 2))
-			       >> 16) & 0xff,
-	      (unsigned char) ((hr * wr + 54 + 1024 + wr * (wr % 2))
-			       >> 24) & 0xff);
-      fprintf(f, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
-	      ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
-      fprintf(f, "%c%c%c%c", (54 + 1024) & 0xff,
-	      ((54 + 1024) >> 8) & 0xff, ((54 + 1024) >> 16) & 0xff,
-	      ((54 + 1024) >> 24) & 0xff);
-
-      /* INFO HEADER */
-      /* ------------- */
-      fprintf(f, "%c%c%c%c", (40) & 0xff, ((40) >> 8) & 0xff,
-	      ((40) >> 16) & 0xff, ((40) >> 24) & 0xff);
-      fprintf(f, "%c%c%c%c", (unsigned char) ((wr) & 0xff),
-	      (unsigned char) ((wr) >> 8) & 0xff,
-	      (unsigned char) ((wr) >> 16) & 0xff,
-	      (unsigned char) ((wr) >> 24) & 0xff);
-      fprintf(f, "%c%c%c%c", (unsigned char) ((hr) & 0xff),
-	      (unsigned char) ((hr) >> 8) & 0xff,
-	      (unsigned char) ((hr) >> 16) & 0xff,
-	      (unsigned char) ((hr) >> 24) & 0xff);
-      fprintf(f, "%c%c", (1) & 0xff, ((1) >> 8) & 0xff);
-      fprintf(f, "%c%c", (8) & 0xff, ((8) >> 8) & 0xff);
-      fprintf(f, "%c%c%c%c", (0) & 0xff, ((0) >> 8) & 0xff,
-	      ((0) >> 16) & 0xff, ((0) >> 24) & 0xff);
-      fprintf(f, "%c%c%c%c",
-	      (unsigned char) (hr * wr + hr * (wr % 2)) & 0xff,
-	      (unsigned char) ((hr * wr + hr * (wr % 2)) >> 8) &
-	      0xff,
-	      (unsigned char) ((hr * wr + hr * (wr % 2)) >> 16) &
-	      0xff,
-	      (unsigned char) ((hr * wr + hr * (wr % 2)) >> 24) & 0xff);
-      fprintf(f, "%c%c%c%c", (7834) & 0xff, ((7834) >> 8) & 0xff,
-	      ((7834) >> 16) & 0xff, ((7834) >> 24) & 0xff);
-      fprintf(f, "%c%c%c%c", (7834) & 0xff, ((7834) >> 8) & 0xff,
-	      ((7834) >> 16) & 0xff, ((7834) >> 24) & 0xff);
-      fprintf(f, "%c%c%c%c", (256) & 0xff, ((256) >> 8) & 0xff,
-	      ((256) >> 16) & 0xff, ((256) >> 24) & 0xff);
-      fprintf(f, "%c%c%c%c", (256) & 0xff, ((256) >> 8) & 0xff,
-	      ((256) >> 16) & 0xff, ((256) >> 24) & 0xff);
-    }
-
-    for (i = 0; i < 256; i++) {
-      fprintf(f, "%c%c%c%c", i, i, i, 0);
-    }
-
-    for (i = 0; i < wr * hr; i++) {
-      /* a modifier !! */
-      // fprintf(f, "%c", img.comps[0].data[w * h - ((i) / (w) + 1) * w + (i) % (w)]);
-      fprintf(f, "%c",
-	      img.comps[0].data[w * hr - ((i) / (wr) + 1) * w +
-				(i) % (wr)]);
-      /*if (((i + 1) % w == 0 && w % 2))
-         fprintf(f, "%c", 0); */
-      if ((i + 1) % wr == 0) {
-	for (pad = wr % 4 ? 4 - wr % 4 : 0; pad > 0; pad--)	/* ADD */
-	  fprintf(f, "%c", 0);
-      }
-    }
-    fclose(f);
-    free(img.comps[0].data);
-    break;
-  default:
-    break;
-  }
-
-  return 0;
-}
--- a/jpwl/decoder/jpwldec/j2k_to_image.dsp
+++ b/jpwl/decoder/jpwldec/j2k_to_image.dsp
@@ -1,240 +0,0 @@
-# Microsoft Developer Studio Project File - Name="j2k_to_image" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=j2k_to_image - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "j2k_to_image.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "j2k_to_image.mak" CFG="j2k_to_image - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "j2k_to_image - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "j2k_to_image - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "j2k_to_image - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../libopenjpeg" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "DONT_HAVE_GETOPT" /YX /FD /c
-# ADD BASE RSC /l 0x80c /d "NDEBUG"
-# ADD RSC /l 0x80c /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "j2k_to_image - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "j2k_to_image___Win32_Debug"
-# PROP BASE Intermediate_Dir "j2k_to_image___Win32_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "j2k_to_image___Win32_Debug"
-# PROP Intermediate_Dir "j2k_to_image___Win32_Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../libopenjpeg" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "DONT_HAVE_GETOPT" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x80c /d "_DEBUG"
-# ADD RSC /l 0x80c /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "j2k_to_image - Win32 Release"
-# Name "j2k_to_image - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\libopenjpeg\bio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\cio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\dwt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\fix.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\compat\getopt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\int.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\j2k.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\j2k_to_image.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\jp2.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\jpt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\mct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\mqc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\pi.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\raw.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\t1.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\t2.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\tcd.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\tgt.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\libopenjpeg\bio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\cio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\dwt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\fix.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\compat\getopt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\int.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\j2k.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\jp2.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\jpt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\mct.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\mqc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\openjpeg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\pi.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\raw.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\t1.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\t2.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\tcd.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg\tgt.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
--- a/jpwl/decoder/jpwldec/j2k_to_image.ncb
+++ b/jpwl/decoder/jpwldec/j2k_to_image.ncb
@@ -1 +0,0 @@
-Microsoft C/C++ MSF 7.00
--- a/jpwl/decoder/jpwldec/j2k_to_image.sln
+++ b/jpwl/decoder/jpwldec/j2k_to_image.sln
@@ -1,21 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "j2k_to_image", "j2k_to_image.vcproj", "{3C09E691-8555-47D1-B1E6-D411A6314AC8}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Release = Release
-	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{3C09E691-8555-47D1-B1E6-D411A6314AC8}.Debug.ActiveCfg = Debug|Win32
-		{3C09E691-8555-47D1-B1E6-D411A6314AC8}.Debug.Build.0 = Debug|Win32
-		{3C09E691-8555-47D1-B1E6-D411A6314AC8}.Release.ActiveCfg = Release|Win32
-		{3C09E691-8555-47D1-B1E6-D411A6314AC8}.Release.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-EndGlobal
--- a/jpwl/decoder/jpwldec/j2k_to_image.suo
+++ b/jpwl/decoder/jpwldec/j2k_to_image.suo
@@ -1 +0,0 @@
-<EFBFBD><EFBFBD>ࡱ
--- a/jpwl/decoder/jpwldec/j2k_to_image.vcproj
+++ b/jpwl/decoder/jpwldec/j2k_to_image.vcproj
@@ -1,266 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="j2k_to_image"
-	ProjectGUID="{3C09E691-8555-47D1-B1E6-D411A6314AC8}"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../libopenjpeg"
-				PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE,DONT_HAVE_GETOPT"
-				StringPooling="TRUE"
-				RuntimeLibrary="4"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Release/j2k_to_image.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile=".\Release/j2k_to_image.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				ProgramDatabaseFile=".\Release/j2k_to_image.pdb"
-				SubSystem="1"/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/j2k_to_image.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="2060"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\j2k_to_image___Win32_Debug"
-			IntermediateDirectory=".\j2k_to_image___Win32_Debug"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../libopenjpeg"
-				PreprocessorDefinitions="_DEBUG,WIN32,_CONSOLE,DONT_HAVE_GETOPT"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\j2k_to_image___Win32_Debug/j2k_to_image.pch"
-				AssemblerListingLocation=".\j2k_to_image___Win32_Debug/"
-				ObjectFile=".\j2k_to_image___Win32_Debug/"
-				ProgramDataBaseFileName=".\j2k_to_image___Win32_Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile=".\j2k_to_image___Win32_Debug/j2k_to_image.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\j2k_to_image___Win32_Debug/j2k_to_image.pdb"
-				SubSystem="1"/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\j2k_to_image___Win32_Debug/j2k_to_image.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="2060"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-			<File
-				RelativePath="..\libopenjpeg\bio.c">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\cio.c">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\dwt.c">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\fix.c">
-			</File>
-			<File
-				RelativePath=".\compat\getopt.c">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\int.c">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\j2k.c">
-			</File>
-			<File
-				RelativePath=".\j2k_to_image.c">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\jp2.c">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\jpt.c">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\jpw.c">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\mct.c">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\mqc.c">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\pi.c">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\raw.c">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\t1.c">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\t2.c">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\tcd.c">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\tgt.c">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
-			<File
-				RelativePath="..\libopenjpeg\bio.h">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\cio.h">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\dwt.h">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\fix.h">
-			</File>
-			<File
-				RelativePath=".\compat\getopt.h">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\int.h">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\j2k.h">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\jp2.h">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\jpt.h">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\jpw.h">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\mct.h">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\mqc.h">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\openjpeg.h">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\pi.h">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\raw.h">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\t1.h">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\t2.h">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\tcd.h">
-			</File>
-			<File
-				RelativePath="..\libopenjpeg\tgt.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/jpwl/decoder/jpwldec/readme.txt
+++ b/jpwl/decoder/jpwldec/readme.txt
@@ -1,105 +0,0 @@
-List of parameters for the coder JPEG 2000 :
-
-Date : June the 25th, 2003
-Author : Yannick Verschueren
-Contact : verschueren@tele.ucl.ac.be 
-
- the option -help displays the readme.txt file on screen
-
- The markers COD and QCD are writed both of two in the main_header and never appear in the tile_header.  The markers in the main header are : SOC SIZ COD QCD COM.
-
- This coder can encode mega image, a test was made on a 24000x24000 pixels color image.  You need enough disk space memory (twice the original) to encode the image. (i.e. for a 1.5 Gb image you need a minimum of 3Gb of disk memory) 
-
-REMARKS :
---------
-
-* the value of rate enter in the code line is the compression factor !
-exemple :
-
-r 20,10,1 means quality 1 : compress 20x, quality 2 : compress 10x and quality 3 : compress 1x = lossless  
-
-* The number of resolution can be modified by the program in view to respect profile-0 conditions (Taubman, Marcelin (2002), "JPEG2000, image compression fundamentals, standards and practice", p700)
-
-By default :
------------
-
- * lossless
- * 1 tile
- * size of precinct 2^15 x 2^15 (means 1 precinct)
- * size of code-block 64 x 64
- * Number of resolution : 6
- * No SOP marker in the codestream
- * No EPH marker in the codestream
- * No sub-sampling in x and y direction
- * No mode switch activated
- * progression order : LRCP
- * No index file
- * No ROI upshifted
- * No offset of the origin of the image
- * No offset of the origin of the tiles
- * Reversible DWT 5-3
-
-Parameters :
------------
-
-i             : source file  (-i source.pnm also *.pgm, *.ppm) "required"
-
-o             : destination file (-o dest.j2k) "required"
-
-r             : different rates (-r 20,10,5) "optional" 
-
-n             : Number of resolution (-n 3) "optional"
-
-b             : size of code block (-b 32,32) "optional"
-
-c             : size of precinct (-c 128,128) "optional"
-
-t             : size of tile (-t 512,512) "optional"
-
-p             : progression order (-p LRCP) [LRCP, RLCP, RPCL, PCRL, CPRL] "optional"
-
-s             : subsampling factor (-s 2,2) [-s X,Y] "optional"
-
-SOP           : write SOP marker before each packet "optional"
-
-EPH           : write EPH marker after each header packet "optional"
-
-M             : mode switch (-M 3) [1= BYPASS(LAZY) 2=RESET 4=RESTART(TERMALL) 8=VSC 16=ERTERM(SEGTERM) 32=SEGMARK(SEGSYM)]  "optional"
-                    for several mode switch you have to add the value of each mode you want
-                    ex : RESTART(4) + RESET(2) + SEGMARK(32) = -M 38 
-
-x             : Create an index file *.Idx (-x index_name.Idx) "optional"
-
-ROI:c=%d,U=%d : quantization indices upshifted for component c=%d [%d = 0,1,2] 
-                 with a value of U=%d [0 <= %d <= 37] (i.e. -ROI:c=0,U=25) "optional"
-
-d             : offset of the origin of the image (-d 150,300) "optional"
-
-T             : offset of the origin of the tiles (-T 100,75) "optional"
-
-I             : Use the irreversible DWT 9-7 (-I) "optional"
-
-IMPORTANT : 
-----------
-
-* subsampling bigger than 2 can produce error
-
-The index file respect the structure below :
---------------------------------------------
-
-Image_height Image_width
-progression order
-Tiles_size_X Tiles_size_Y
-Components_nb
-Layers_nb
-decomposition_levels
-Precincts_size_X Precincts_size_Y
-Main_header_end_position
-Codestream_size
-Tile0 start_pos end_Theader end_pos
-Tile1  "         "           "
-...
-TileN  "         "           "
-Tpacket_0 Tile layer res. comp. prec. start_pos end_pos
-...
-Tpacket_M "    "     "    "     "     "         "
--- a/jpwl/decoder/libopenjpeg/.cvsignore
+++ b/jpwl/decoder/libopenjpeg/.cvsignore
@@ -1,6 +0,0 @@
-obj
-obj.w32
-bin
-bin.w32
-lib
-lib.w32
--- a/jpwl/decoder/libopenjpeg/Makefile
+++ b/jpwl/decoder/libopenjpeg/Makefile
@@ -1,78 +0,0 @@
-# $Id$
-#
-# makefile for OpenJPEG library
-
-CFLAGS  = -Wall -O3 -fno-strength-reduce -fomit-frame-pointer
-
-ifndef DEBUG
-  LDFLAGS = -s -lm
-else
-  LDFLAGS = -lm
-endif
-
-OBJ_DIR_W32 = obj.w32
-LIB_DIR_W32 = lib.w32
-
-ifdef MINGW32
-  CC = i386-mingw32-gcc
-  AR = i386-mingw32-ar
-  OBJ_DIR = $(OBJ_DIR_W32)
-  LIB_DIR = $(LIB_DIR_W32)
-  all:	$(OBJ_DIR) $(LIB_DIR) \
-	$(LIB_DIR)/libopenjpeg.a $(LIB_DIR)/libopenjpeg.dll
-else
-  CC = gcc
-  AR = ar
-  OBJ_DIR = obj
-  LIB_DIR = lib
-  all:	$(OBJ_DIR) $(LIB_DIR) \
-	$(LIB_DIR)/libopenjpeg.a $(LIB_DIR)/libopenjpeg.so
-endif
-
-$(OBJ_DIR):
-	mkdir $(OBJ_DIR)
-
-$(LIB_DIR):	
-	mkdir $(LIB_DIR)
-
-$(OBJ_DIR)/%.o:
-	$(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
-
-$(OBJ_DIR)/bio.o:	bio.c bio.h
-$(OBJ_DIR)/cio.o:	cio.c cio.h
-$(OBJ_DIR)/dwt.o:	dwt.c dwt.h int.h fix.h tcd.h
-$(OBJ_DIR)/fix.o:	fix.c fix.h
-$(OBJ_DIR)/int.o:	int.c
-$(OBJ_DIR)/j2k.o:	j2k.c j2k.h cio.h tcd.h dwt.h int.h
-$(OBJ_DIR)/mct.o:	mct.c mct.h fix.h
-$(OBJ_DIR)/mqc.o:	mqc.c mqc.h
-
-$(OBJ_DIR)/pi.o:	pi.c pi.h int.h
-$(OBJ_DIR)/raw.o:	raw.c raw.h
-$(OBJ_DIR)/t1.o:	t1.c t1.h j2k.h mqc.h raw.h int.h mct.h dwt.h fix.h
-$(OBJ_DIR)/t2.o:	t2.c t2.h tcd.h bio.h j2k.h pi.h tgt.h int.h cio.h
-$(OBJ_DIR)/tcd.o:	tcd.c tcd.h int.h t1.h t2.h dwt.h mct.h
-$(OBJ_DIR)/tgt.o:	tgt.c tgt.h bio.h
-$(OBJ_DIR)/jpt.o:       jpt.c jpt.h cio.h
-$(OBJ_DIR)/jp2.o:	jp2.c jp2.h
-
-COM_OBJS = $(addprefix $(OBJ_DIR)/, j2k.o bio.o cio.o dwt.o fix.o int.o mct.o \
-	   mqc.o pi.o t1.o t2.o  tgt.o tcd.o raw.o jpt.o jp2.o)
-
-$(LIB_DIR)/libopenjpeg.a: ${COM_OBJS}
-	$(AR) -sr $@ $^
-
-$(LIB_DIR)/libopenjpeg.dll: ${COM_OBJS}
-	${CC} -s -shared -Wl,-soname,libopenjpeg.dll -o $@ $^
-
-$(LIB_DIR)/libopenjpeg.so.1.0: ${COM_OBJS}
-	${CC} -s -shared -Wl,-soname,libopenjpeg.so.1 -o $@ $^
-
-$(LIB_DIR)/libopenjpeg.so.1: $(LIB_DIR)/libopenjpeg.so.1.0
-	ln -s libopenjpeg.so.1.0 $(LIB_DIR)/libopenjpeg.so.1
-
-$(LIB_DIR)/libopenjpeg.so: $(LIB_DIR)/libopenjpeg.so.1
-	ln -s libopenjpeg.so.1 $(LIB_DIR)/libopenjpeg.so
-
-clean:
-	rm -f $(OBJ_DIR_W32)/* $(OBJ_DIR)/* $(LIB_DIR_W32)/* $(LIB_DIR)/*
--- a/jpwl/decoder/libopenjpeg/bio.c
+++ b/jpwl/decoder/libopenjpeg/bio.c
@@ -1,194 +0,0 @@
-/*
- * Copyright (c) 2001-2002, David Janssens
- * Copyright (c) 2003, Yannick Verschueren
- * Copyright (c) 2003,  Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
- *
- * 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 "bio.h"
-#include <stdio.h>
-#include <setjmp.h>
-
-static unsigned char *bio_start;	/* pointer to the start of the buffer */
-static unsigned char *bio_end;	/* pointer to the end of the buffer */
-static unsigned char *bio_bp;	/* pointer to the present position in the buffer */
-static unsigned int bio_buf;	/* temporary place where each byte is read or written */
-static int bio_ct;		/* coder : number of bits free to write // decoder : number of bits read */
-
-extern jmp_buf j2k_error;
-
-/*
- * Number of bytes written.
- */
-int bio_numbytes()
-{
-  return bio_bp - bio_start;
-}
-
-/*
- * Init encoder.
- *
- * bp  : Output buffer
- * len : Output buffer length 
- */
-void bio_init_enc(unsigned char *bp, int len)
-{
-  bio_start = bp;
-  bio_end = bp + len;
-  bio_bp = bp;
-  bio_buf = 0;
-  bio_ct = 8;
-}
-
-/*
- * Init decoder.
- * 
- * bp  : Input buffer
- * len : Input buffer length 
- */
-void bio_init_dec(unsigned char *bp, int len)
-{
-  bio_start = bp;
-  bio_end = bp + len;
-  bio_bp = bp;
-  bio_buf = 0;
-  bio_ct = 0;
-}
-
-/*
- * Write byte. --> function modified to eliminate longjmp !!! 
- *
- */
-int bio_byteout()
-{
-  bio_buf = (bio_buf << 8) & 0xffff;
-  bio_ct = bio_buf == 0xff00 ? 7 : 8;
-  if (bio_bp >= bio_end)
-    return 1;
-  *bio_bp++ = bio_buf >> 8;
-  return 0;
-}
-
-/*
- * Read byte. --> function modified to eliminate longjmp !!
- *
- */
-int bio_bytein()
-{
-  bio_buf = (bio_buf << 8) & 0xffff;
-  bio_ct = bio_buf == 0xff00 ? 7 : 8;
-  if (bio_bp >= bio_end)
-    return 1;
-  bio_buf |= *bio_bp++;
-  return 0;
-}
-
-/*
- * Write bit.
- *
- * b : Bit to write (0 or 1)
- */
-void bio_putbit(int b)
-{
-  if (bio_ct == 0) {
-    bio_byteout();
-  }
-  bio_ct--;
-  bio_buf |= b << bio_ct;
-}
-
-/*
- * Read bit.
- *
- */
-int bio_getbit()
-{
-  if (bio_ct == 0) {
-    bio_bytein();
-  }
-  bio_ct--;
-  return (bio_buf >> bio_ct) & 1;
-}
-
-/*
- * Write bits.
- *
- * v : Value of bits
- * n : Number of bits to write 
- */
-void bio_write(int v, int n)
-{
-  int i;
-  for (i = n - 1; i >= 0; i--) {
-    bio_putbit((v >> i) & 1);
-  }
-}
-
-/*
- * Read bits.
- * 
- * n : Number of bits to read
- */
-int bio_read(int n)
-{
-  int i, v;
-  v = 0;
-  for (i = n - 1; i >= 0; i--) {
-    v += bio_getbit() << i;
-  }
-  return v;
-}
-
-/*
- * Flush bits. Modified to eliminate longjmp !!
- *
- */
-int bio_flush()
-{
-  bio_ct = 0;
-  if (bio_byteout())
-    return 1;
-  if (bio_ct == 7) {
-    bio_ct = 0;
-
-    if (bio_byteout())
-      return 1;
-  }
-  return 0;
-}
-
-/*
- * Passes the ending bits (coming from flushing)
- */
-int bio_inalign()
-{
-  bio_ct = 0;
-  if ((bio_buf & 0xff) == 0xff) {
-    if (bio_bytein())
-      return 1;
-    bio_ct = 0;
-  }
-  return 0;
-}
--- a/jpwl/decoder/libopenjpeg/cio.c
+++ b/jpwl/decoder/libopenjpeg/cio.c
@@ -1,152 +0,0 @@
-/*
- * Copyright (c) 2001-2002, David Janssens
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "cio.h"
-#include <setjmp.h>
-
-static unsigned char *cio_start;	/* pointer to the start of the stream */
-static unsigned char *cio_end;	/* pointer to the end of the stream */
-static unsigned char *cio_bp;	/* pointer to the present position */
-
-extern jmp_buf j2k_error;
-
-/* 
- * Number of bytes written.
- */
-int cio_numbytes()
-{
-  return cio_bp - cio_start;
-}
-
-/*
- * Get position in byte stream.
- */
-int cio_tell()
-{
-  return cio_bp - cio_start;
-}
-
-/*
- * Set position in byte stream.
- *
- * pos : position, in number of bytes, from the beginning of the stream
- */
-void cio_seek(int pos)
-{
-  cio_bp = cio_start + pos;
-}
-
-/*
- * Number of bytes left before the end of the stream.
- */
-int cio_numbytesleft()
-{
-  return cio_end - cio_bp;
-}
-
-/*
- * Get pointer to the current position in the stream.
- */
-unsigned char *cio_getbp()
-{
-  return cio_bp;
-}
-
-/* 
- * Initialize byte IO
- *
- * bp  : destination/source stream
- * len : length of the stream
- */
-void cio_init(unsigned char *bp, int len)
-{
-  cio_start = bp;
-  cio_end = bp + len;
-  cio_bp = bp;
-}
-
-/*
- * Write a byte.
- */
-void cio_byteout(unsigned char v)
-{
-  if (cio_bp >= cio_end)
-    longjmp(j2k_error, 1);
-  *cio_bp++ = v;
-
-}
-
-/*
- * Read a byte.
- */
-unsigned char cio_bytein()
-{
-  if (cio_bp >= cio_end)
-    longjmp(j2k_error, 1);
-  return *cio_bp++;
-}
-
-/*
- * Write some bytes.
- *
- * v : value to write
- * n : number of bytes to write
- */
-void cio_write(unsigned int v, int n)
-{
-  int i;
-  for (i = n - 1; i >= 0; i--) {
-    cio_byteout((unsigned char) ((v >> (i << 3)) & 0xff));
-  }
-}
-
-/*
- * Read some bytes.
- *
- * n : number of bytes to read
- *
- * return : value of the n bytes read
- */
-unsigned int cio_read(int n)
-{
-  int i;
-  unsigned int v;
-  v = 0;
-  for (i = n - 1; i >= 0; i--) {
-    v += cio_bytein() << (i << 3);
-  }
-  return v;
-}
-
-/* 
- * Skip some bytes.
- *
- * n : number of bytes to skip
- */
-void cio_skip(int n)
-{
-  cio_bp += n;
-}
--- a/jpwl/decoder/libopenjpeg/dwt.c
+++ b/jpwl/decoder/libopenjpeg/dwt.c
@@ -1,454 +0,0 @@
-/*
- * Copyright (c) 2001-2002, David Janssens
- * Copyright (c) 2002-2004, Yannick Verschueren
- * Copyright (c) 2002-2004, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
- * 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 "dwt.h"
-#include "int.h"
-#include "fix.h"
-#include "tcd.h"
-#include <stdlib.h>
-#include <stdio.h>
-//#include <math.h>
-
-#define S(i) a[x*(i)*2]
-#define D(i) a[x*(1+(i)*2)]
-#define S_(i) ((i)<0?S(0):((i)>=sn?S(sn-1):S(i)))
-#define D_(i) ((i)<0?D(0):((i)>=dn?D(dn-1):D(i)))
-/* new */
-#define SS_(i) ((i)<0?S(0):((i)>=dn?S(dn-1):S(i)))
-#define DD_(i) ((i)<0?D(0):((i)>=sn?D(sn-1):D(i)))
-
-/* <summary>                                                              */
-/* This table contains the norms of the 5-3 wavelets for different bands. */
-/* </summary>                                                             */
-double dwt_norms[4][10] = {
-  {1.000, 1.500, 2.750, 5.375, 10.68, 21.34, 42.67, 85.33, 170.7, 341.3},
-  {1.038, 1.592, 2.919, 5.703, 11.33, 22.64, 45.25, 90.48, 180.9},
-  {1.038, 1.592, 2.919, 5.703, 11.33, 22.64, 45.25, 90.48, 180.9},
-  {.7186, .9218, 1.586, 3.043, 6.019, 12.01, 24.00, 47.97, 95.93}
-};
-
-/* <summary>                                                              */
-/* This table contains the norms of the 9-7 wavelets for different bands. */
-/* </summary>                                                             */
-double dwt_norms_real[4][10] = {
-  {1.000, 1.965, 4.177, 8.403, 16.90, 33.84, 67.69, 135.3, 270.6, 540.9},
-  {2.022, 3.989, 8.355, 17.04, 34.27, 68.63, 137.3, 274.6, 549.0},
-  {2.022, 3.989, 8.355, 17.04, 34.27, 68.63, 137.3, 274.6, 549.0},
-  {2.080, 3.865, 8.307, 17.18, 34.71, 69.59, 139.3, 278.6, 557.2}
-};
-
-/* Add Patrick */
-static int *b = NULL;
-static int lastSizeOfB = 0;
-
-/* <summary>       */
-/* Cleaning memory. */
-/* </summary>      */
-
-void dwt_clean()
-{
-  if (b != NULL) {
-    free(b);
-  }
-  b = NULL;
-  lastSizeOfB = 0;
-}
-
-/* \ Add Patrick */
-
-/* <summary>               */
-/* Forward lazy transform. */
-/* </summary>              */
-void dwt_deinterleave(int *a, int n, int x, int res, int cas)
-{
-  int dn, sn, i;
-  sn = res;
-  dn = n - res;
-  if (lastSizeOfB != n) {
-    if (b != NULL)
-      free(b);
-    b = (int *) malloc(n * sizeof(int));
-    lastSizeOfB = n;
-  }
-
-  if (cas) {
-    for (i = 0; i < sn; i++)
-      b[i] = a[(2 * i + 1) * x];
-    for (i = 0; i < dn; i++)
-      b[sn + i] = a[2 * i * x];
-  } else {
-    for (i = 0; i < sn; i++)
-      b[i] = a[2 * i * x];
-    for (i = 0; i < dn; i++)
-      b[sn + i] = a[(2 * i + 1) * x];
-  }
-  for (i = 0; i < n; i++)
-    a[i * x] = b[i];
-}
-
-/* <summary>               */
-/* Inverse lazy transform. */
-/* </summary>              */
-void dwt_interleave(int *a, int n, int x, int res, int cas)
-{
-  int dn, sn, i;
-  sn = res;
-  dn = n - res;
-
-  if (lastSizeOfB != n) {
-    if (b != NULL)
-      free(b);
-    b = (int *) malloc(n * sizeof(int));
-    lastSizeOfB = n;
-  }
-
-  if (cas) {
-    for (i = 0; i < sn; i++)
-      b[2 * i + 1] = a[i * x];
-    for (i = 0; i < dn; i++)
-      b[2 * i] = a[(sn + i) * x];
-  } else {
-    for (i = 0; i < sn; i++)
-      b[2 * i] = a[i * x];
-    for (i = 0; i < dn; i++)
-      b[2 * i + 1] = a[(sn + i) * x];
-  }
-  for (i = 0; i < n; i++)
-    a[i * x] = b[i];
-}
-
-/* <summary>                            */
-/* Forward 5-3 wavelet tranform in 1-D. */
-/* </summary>                           */
-void dwt_encode_1(int *a, int n, int x, int res, int cas)
-{
-  int dn, sn, i = 0;
-  sn = res;
-  dn = n - res;
-
-  if (cas) {
-    if (!sn && dn == 1)		/* NEW :  CASE ONE ELEMENT */
-      S(i) *= 2;
-    else {
-      for (i = 0; i < dn; i++)
-	S(i) -= (DD_(i) + DD_(i - 1)) >> 1;
-      for (i = 0; i < sn; i++)
-	D(i) += (SS_(i) + SS_(i + 1) + 2) >> 2;
-    }
-  } else {
-    if ((dn > 0) || (sn > 1)) {	/* NEW :  CASE ONE ELEMENT */
-      for (i = 0; i < dn; i++)
-	D(i) -= (S_(i) + S_(i + 1)) >> 1;
-      for (i = 0; i < sn; i++)
-	S(i) += (D_(i - 1) + D_(i) + 2) >> 2;
-    }
-  }
-  dwt_deinterleave(a, n, x, res, cas);
-}
-
-/* <summary>                            */
-/* Inverse 5-3 wavelet tranform in 1-D. */
-/* </summary>                           */
-void dwt_decode_1(int *a, int n, int x, int res, int cas)
-{
-  int dn, sn, i = 0;
-  sn = res;
-  dn = n - res;
-
-  dwt_interleave(a, n, x, res, cas);
-  if (cas) {
-    if (!sn && dn == 1)		/* NEW :  CASE ONE ELEMENT */
-      S(i) /= 2;
-    else {
-      for (i = 0; i < sn; i++)
-	D(i) -= (SS_(i) + SS_(i + 1) + 2) >> 2;
-      for (i = 0; i < dn; i++)
-	S(i) += (DD_(i) + DD_(i - 1)) >> 1;
-    }
-  } else {
-    if ((dn > 0) || (sn > 1)) {	/* NEW :  CASE ONE ELEMENT */
-      for (i = 0; i < sn; i++)
-	S(i) -= (D_(i - 1) + D_(i) + 2) >> 2;
-      for (i = 0; i < dn; i++)
-	D(i) += (S_(i) + S_(i + 1)) >> 1;
-    }
-  }
-}
-
-/* <summary>                            */
-/* Forward 5-3 wavelet tranform in 2-D. */
-/* </summary>                           */
-void dwt_encode(int *a, int w, int h, tcd_tilecomp_t * tilec, int l)
-{
-  int i, j;
-  int rw;			/* width of the resolution level computed                                                           */
-  int rh;			/* heigth of the resolution level computed                                                          */
-  int rw1;			/* width of the resolution level once lower than computed one                                       */
-  int rh1;			/* height of the resolution level once lower than computed one                                      */
-
-  for (i = 0; i < l; i++) {
-    int cas_col = 0;		/* 0 = non inversion on horizontal filtering 1 = inversion between low-pass and high-pass filtering */
-    int cas_row = 0;		/* 0 = non inversion on vertical filtering 1 = inversion between low-pass and high-pass filtering   */
-    rw = tilec->resolutions[l - i].x1 - tilec->resolutions[l - i].x0;
-    rh = tilec->resolutions[l - i].y1 - tilec->resolutions[l - i].y0;
-    rw1 =
-      tilec->resolutions[l - i - 1].x1 - tilec->resolutions[l - i - 1].x0;
-    rh1 =
-      tilec->resolutions[l - i - 1].y1 - tilec->resolutions[l - i - 1].y0;
-
-    cas_row = tilec->resolutions[l - i].x0 % 2;
-    cas_col = tilec->resolutions[l - i].y0 % 2;
-
-    for (j = 0; j < rw; j++)
-      dwt_encode_1(a + j, rh, w, rh1, cas_col);
-    for (j = 0; j < rh; j++)
-      dwt_encode_1(a + j * w, rw, 1, rw1, cas_row);
-  }
-
-  dwt_clean();
-}
-
-/* <summary>                            */
-/* Inverse 5-3 wavelet tranform in 2-D. */
-/* </summary>                           */
-void dwt_decode(int *a, int w, int h, tcd_tilecomp_t * tilec, int l,
-		int stop)
-{
-  int i, j;
-  int rw;			/* width of the resolution level computed                                                           */
-  int rh;			/* heigth of the resolution level computed                                                          */
-  int rw1;			/* width of the resolution level once lower than computed one                                       */
-  int rh1;			/* height of the resolution level once lower than computed one                                      */
-
-  for (i = l - 1; i >= stop; i--) {
-    int cas_col = 0;		/* 0 = non inversion on horizontal filtering 1 = inversion between low-pass and high-pass filtering */
-    int cas_row = 0;		/* 0 = non inversion on vertical filtering 1 = inversion between low-pass and high-pass filtering   */
-
-    rw = tilec->resolutions[l - i].x1 - tilec->resolutions[l - i].x0;
-    rh = tilec->resolutions[l - i].y1 - tilec->resolutions[l - i].y0;
-    rw1 =
-      tilec->resolutions[l - i - 1].x1 - tilec->resolutions[l - i - 1].x0;
-    rh1 =
-      tilec->resolutions[l - i - 1].y1 - tilec->resolutions[l - i - 1].y0;
-
-    cas_row = tilec->resolutions[l - i].x0 % 2;
-    cas_col = tilec->resolutions[l - i].y0 % 2;
-
-    for (j = 0; j < rh; j++)
-      dwt_decode_1(a + j * w, rw, 1, rw1, cas_row);
-    for (j = 0; j < rw; j++)
-      dwt_decode_1(a + j, rh, w, rh1, cas_col);
-  }
-  dwt_clean();
-}
-
-/* <summary>                          */
-/* Get gain of 5-3 wavelet transform. */
-/* </summary>                         */
-int dwt_getgain(int orient)
-{
-  if (orient == 0)
-    return 0;
-  if (orient == 1 || orient == 2)
-    return 1;
-  return 2;
-}
-
-/* <summary>                */
-/* Get norm of 5-3 wavelet. */
-/* </summary>               */
-double dwt_getnorm(int level, int orient)
-{
-  return dwt_norms[orient][level];
-}
-
-/* <summary>                             */
-/* Forward 9-7 wavelet transform in 1-D. */
-/* </summary>                            */
-void dwt_encode_1_real(int *a, int n, int x, int res, int cas)
-{
-  int dn, sn, i = 0;
-  dn = n - res;
-  sn = res;
-
-  if (cas) {
-    if ((sn > 0) || (dn > 1)) {	/* NEW :  CASE ONE ELEMENT */
-      for (i = 0; i < dn; i++)
-	S(i) -= fix_mul(DD_(i) + DD_(i - 1), 12993);
-      for (i = 0; i < sn; i++)
-	D(i) -= fix_mul(SS_(i) + SS_(i + 1), 434);
-      for (i = 0; i < dn; i++)
-	S(i) += fix_mul(DD_(i) + DD_(i - 1), 7233);
-      for (i = 0; i < sn; i++)
-	D(i) += fix_mul(SS_(i) + SS_(i + 1), 3633);
-      for (i = 0; i < dn; i++)
-	S(i) = fix_mul(S(i), 5038);	/*5038 */
-      for (i = 0; i < sn; i++)
-	D(i) = fix_mul(D(i), 6659);	/*6660 */
-    }
-  } else {
-    if ((dn > 0) || (sn > 1)) {	/* NEW :  CASE ONE ELEMENT */
-      for (i = 0; i < dn; i++)
-	D(i) -= fix_mul(S_(i) + S_(i + 1), 12993);
-      for (i = 0; i < sn; i++)
-	S(i) -= fix_mul(D_(i - 1) + D_(i), 434);
-      for (i = 0; i < dn; i++)
-	D(i) += fix_mul(S_(i) + S_(i + 1), 7233);
-      for (i = 0; i < sn; i++)
-	S(i) += fix_mul(D_(i - 1) + D_(i), 3633);
-      for (i = 0; i < dn; i++)
-	D(i) = fix_mul(D(i), 5038);	/*5038 */
-      for (i = 0; i < sn; i++)
-	S(i) = fix_mul(S(i), 6659);	/*6660 */
-    }
-  }
-  dwt_deinterleave(a, n, x, res, cas);
-}
-
-/* <summary>                             */
-/* Inverse 9-7 wavelet transform in 1-D. */
-/* </summary>                            */
-void dwt_decode_1_real(int *a, int n, int x, int res, int cas)
-{
-  int dn, sn, i = 0;
-  dn = n - res;
-  sn = res;
-  dwt_interleave(a, n, x, res, cas);
-  if (cas) {
-    if ((sn > 0) || (dn > 1)) {	/* NEW :  CASE ONE ELEMENT */
-      for (i = 0; i < sn; i++)
-	D(i) = fix_mul(D(i), 10078);	/* 10076 */
-      for (i = 0; i < dn; i++)
-	S(i) = fix_mul(S(i), 13318);	/* 13320 */
-      for (i = 0; i < sn; i++)
-	D(i) -= fix_mul(SS_(i) + SS_(i + 1), 3633);
-      for (i = 0; i < dn; i++)
-	S(i) -= fix_mul(DD_(i) + DD_(i - 1), 7233);
-      for (i = 0; i < sn; i++)
-	D(i) += fix_mul(SS_(i) + SS_(i + 1), 434);
-      for (i = 0; i < dn; i++)
-	S(i) += fix_mul(DD_(i) + DD_(i - 1), 12993);
-    }
-  } else {
-    if ((dn > 0) || (sn > 1)) {	/* NEW :  CASE ONE ELEMENT */
-      for (i = 0; i < sn; i++)
-	S(i) = fix_mul(S(i), 10078);	/* 10076 */
-      for (i = 0; i < dn; i++)
-	D(i) = fix_mul(D(i), 13318);	/* 13320 */
-      for (i = 0; i < sn; i++)
-	S(i) -= fix_mul(D_(i - 1) + D_(i), 3633);
-      for (i = 0; i < dn; i++)
-	D(i) -= fix_mul(S_(i) + S_(i + 1), 7233);
-      for (i = 0; i < sn; i++)
-	S(i) += fix_mul(D_(i - 1) + D_(i), 434);
-      for (i = 0; i < dn; i++)
-	D(i) += fix_mul(S_(i) + S_(i + 1), 12993);
-    }
-  }
-}
-
-/* <summary>                             */
-/* Forward 9-7 wavelet transform in 2-D. */
-/* </summary>                            */
-
-void dwt_encode_real(int *a, int w, int h, tcd_tilecomp_t * tilec, int l)
-{
-  int i, j;
-  int rw;			/* width of the resolution level computed                                                     */
-  int rh;			/* heigth of the resolution level computed                                                    */
-  int rw1;			/* width of the resolution level once lower than computed one                                 */
-  int rh1;			/* height of the resolution level once lower than computed one                                */
-
-  for (i = 0; i < l; i++) {
-    int cas_col = 0;		/* 0 = non inversion on horizontal filtering 1 = inversion between low-pass and high-pass filtering */
-    int cas_row = 0;		/* 0 = non inversion on vertical filtering 1 = inversion between low-pass and high-pass filtering   */
-    rw = tilec->resolutions[l - i].x1 - tilec->resolutions[l - i].x0;
-    rh = tilec->resolutions[l - i].y1 - tilec->resolutions[l - i].y0;
-    rw1 =
-      tilec->resolutions[l - i - 1].x1 - tilec->resolutions[l - i - 1].x0;
-    rh1 =
-      tilec->resolutions[l - i - 1].y1 - tilec->resolutions[l - i - 1].y0;
-
-    cas_row = tilec->resolutions[l - i].x0 % 2;
-    cas_col = tilec->resolutions[l - i].y0 % 2;
-
-    for (j = 0; j < rw; j++)
-      dwt_encode_1_real(a + j, rh, w, rh1, cas_col);
-    for (j = 0; j < rh; j++)
-      dwt_encode_1_real(a + j * w, rw, 1, rw1, cas_row);
-  }
-}
-
-/* <summary>                             */
-/* Inverse 9-7 wavelet transform in 2-D. */
-/* </summary>                            */
-void dwt_decode_real(int *a, int w, int h, tcd_tilecomp_t * tilec, int l,
-		     int stop)
-{
-  int i, j;
-  int rw;			/* width of the resolution level computed                                                           */
-  int rh;			/* heigth of the resolution level computed                                                          */
-  int rw1;			/* width of the resolution level once lower than computed one                                       */
-  int rh1;			/* height of the resolution level once lower than computed one                                      */
-
-  for (i = l - 1; i >= stop; i--) {
-    int cas_col = 0;		/* 0 = non inversion on horizontal filtering 1 = inversion between low-pass and high-pass filtering */
-    int cas_row = 0;		/* 0 = non inversion on vertical filtering 1 = inversion between low-pass and high-pass filtering   */
-
-    rw = tilec->resolutions[l - i].x1 - tilec->resolutions[l - i].x0;
-    rh = tilec->resolutions[l - i].y1 - tilec->resolutions[l - i].y0;
-    rw1 =
-      tilec->resolutions[l - i - 1].x1 - tilec->resolutions[l - i - 1].x0;
-    rh1 =
-      tilec->resolutions[l - i - 1].y1 - tilec->resolutions[l - i - 1].y0;
-
-    cas_row = tilec->resolutions[l - i].x0 % 2;
-    cas_col = tilec->resolutions[l - i].y0 % 2;
-
-    for (j = 0; j < rh; j++)
-      dwt_decode_1_real(a + j * w, rw, 1, rw1, cas_row);
-    for (j = 0; j < rw; j++)
-      dwt_decode_1_real(a + j, rh, w, rh1, cas_col);
-  }
-}
-
-/* <summary>                          */
-/* Get gain of 9-7 wavelet transform. */
-/* </summary>                         */
-int dwt_getgain_real(int orient)
-{
-  return 0;
-}
-
-/* <summary>                */
-/* Get norm of 9-7 wavelet. */
-/* </summary>               */
-double dwt_getnorm_real(int level, int orient)
-{
-  return dwt_norms_real[orient][level];
-}
--- a/jpwl/decoder/libopenjpeg/dwt.h
+++ b/jpwl/decoder/libopenjpeg/dwt.h
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 2001-2002, David Janssens
- * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2002-2003,  Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
- * 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 "tcd.h"
-
-#ifndef __DWT_H
-#define __DWT_H
-
-/*
- * Apply a reversible DWT transform to a component of an image  
- * a: samples of the component
- * w: width of the component
- * h: height of the component
- * tilec : tile component information (present tile)
- * l: number of decomposition levels in the DWT
- */
-/* void dwt_encode(int* a, int w, int h, int l); */
-void dwt_encode(int *a, int w, int h, tcd_tilecomp_t * tilec, int l);
-/*
- * Apply a reversible inverse DWT transform to a component of an image  
- * a: samples of the component
- * w: width of the component
- * h: height of the component
- * tilec : tile component information (present tile)
- * l: number of decomposition levels in the DWT
- * row_tilec : tile component information (previous tile on the same row)
- * col_tilec : tile component information (previous tile on the same column)
- */
-void dwt_decode(int *a, int w, int h, tcd_tilecomp_t * tilec, int l,
-		int stop);
-
-/*
- * Get the gain of a subband for the reversible DWT
- * orient: number that identifies the subband (0->LL, 1->HL, 2->LH, 3->HH)
- */
-int dwt_getgain(int orient);
-
-/*
- * Get the norm of a wavelet function of a subband at a specified level for the reversible DWT
- * level: level of the wavelet function
- * orient: band of the wavelet function
- */
-double dwt_getnorm(int level, int orient);
-
-/*
- * Apply an irreversible DWT transform to a component of an image  
- * a: samples of the component
- * w: width of the component
- * h: height of the component
- * l: number of decomposition levels in the DWT
- */
-void dwt_encode_real(int *a, int w, int h, tcd_tilecomp_t * tilec, int l);
-
-/*
- * Apply an irreversible inverse DWT transform to a component of an image  
- * a: samples of the component
- * w: width of the component
- * h: height of the component
- * l: number of decomposition levels in the DWT
- */
-void dwt_decode_real(int *a, int w, int h, tcd_tilecomp_t * tilec, int l,
-		     int stop);
-/*
- * Get the gain of a subband for the irreversible DWT
- * orient: number that identifies the subband (0->LL, 1->HL, 2->LH, 3->HH)
- */
-int dwt_getgain_real(int orient);
-
-/*
- * Get the norm of a wavelet function of a subband at a specified level for the irreversible DWT
- * level: level of the wavelet function
- * orient: band of the wavelet function
- */
-double dwt_getnorm_real(int level, int orient);
-
-#endif
--- a/jpwl/decoder/libopenjpeg/int.c
+++ b/jpwl/decoder/libopenjpeg/int.c
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 2001-2002, David Janssens
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Get the minimum of two integers.
- *
- * returns a if a < b else b
- */
-int int_min(int a, int b)
-{
-  return a < b ? a : b;
-}
-
-/*
- * Get the maximum of two integers.
- *
- * returns a if a > b else b
- */
-int int_max(int a, int b)
-{
-  return a > b ? a : b;
-}
-
-/*
- * Clamp an integer inside an interval.
- *
- * return a if (min < a < max)
- * return max if (a > max)
- * return min if (a < min) 
- */
-int int_clamp(int a, int min, int max)
-{
-  if (a < min)
-    return min;
-  if (a > max)
-    return max;
-  return a;
-}
-
-/*
- * Get absolute value of integer.
- */
-int int_abs(int a)
-{
-  return a < 0 ? -a : a;
-}
-
-/*
- * Divide an integer and round upwards.
- *
- * a divided by b
- */
-int int_ceildiv(int a, int b)
-{
-  return (a + b - 1) / b;
-}
-
-/*
- * Divide an integer by a power of 2 and round upwards.
- *
- * a divided by 2^b
- */
-int int_ceildivpow2(int a, int b)
-{
-  return (a + (1 << b) - 1) >> b;
-}
-
-/*
- * Divide an integer by a power of 2 and round downwards.
- *
- * a divided by 2^b
- */
-int int_floordivpow2(int a, int b)
-{
-  return a >> b;
-}
-
-/*
- * Get logarithm of an integer and round downwards.
- *
- * log2(a)
- */
-int int_floorlog2(int a)
-{
-  int l;
-  for (l = 0; a > 1; l++) {
-    a >>= 1;
-  }
-  return l;
-}
--- a/Show More
+++ b/Show More