OpenJPEG version 1.2

Fixed the parameters used for cinema compression (9-7 transform used instead of 5-3). Modified "image_to_j2k.c"

ChangeLog

@@ -5,7 +5,148 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+----------------------
+MAY 4, 2007
+VERSION 1.2.0 RELEASED
+----------------------
+
+May 4, 2007
+* [FOD] Bugs corrected in decoding of command line (getopt.c), in the handling of 16 bit files (t1.c and tcd.c) and the calculation of elapsed time for multiple tiles parts (tcd.c and tdc.h).
+
+June 2, 2007
++ [GB] OPJViewer opens now BMP, PNG, GIF, PNM, TIFF (with wxWidgets internals); added an encoder settings tab, for future integration with "save file as..." in JPEG 2000 format
+
+May 31, 2007
+* [FOD] Fixed the handling of 16bit TIFF files for cinema compression. Modified "convert.c"
+* [FOD] Fixed the parameters used for cinema compression (9-7 transform used instead of 5-3). Modified "image_to_j2k.c"
+
+May 24, 2007
+* [FOD] Bug fixed by Sylvain Munaut. Change in the reading of the POC marker. Since COD/COC can be anywhere in the header, the decoder cannot always know while decoding the POC marker the value of numlayers and numresolution.
+
+May 23, 2007
+! [FOD] Patch suggested by Callum Lerwick <seg@haxxed.com>: "This makes the t1 data arrays dynamic, which greatly reduces cache thrashing. Also, some minor cleanup to prevent unnecessary casts"
+
+May 22, 2007
+! [FOD] Patch suggested by Callum Lerwick <seg@haxxed.com>: "Some formatting cleanups, so that the long function definitions and calls fit on screen. Use of prefix increment which is theoretically faster, in practice any sane compiler can optimize a postfix increment but its best not to count on such things. Consolidation of some redundant calculations in the inner loops, which becomes very useful in the future autovectorize patch."
+! [FOD] Patch suggested by Callum Lerwick <seg@haxxed.com>: "This changes the flag code in t1 to use a flag_t type, which can then be changed to reduce RAM usage. It is now typedef to a short."
+! [FOD] Patch suggested by Callum Lerwick <seg@haxxed.com>: "This patch makes the t1 LUTs static. I actually intend this as a prelude to possibly eliminating some or all of the LUTs entirely."
+
+May 11, 2007
+- [FOD]	JP3D library Binaries removed from SVN.
+! [FOD] MJ2 codec updated from LibOpenJPEG version 0.97 to LibOpenJPEG version 1. Hence, the MJ2 codec will now take advantage of all the improvements and optimizations done on the LibOpenJPEG library.
+! [FOD] Possibility to choose to apply MCT (multiple component transform) enabled, and new decoding_limit: DECODE_ALL_BUT_PACKETS (openjpeg.h)
+
+April 26, 2007
++ [gdcm] Add basic steps on how to use CMake for building examples (README.cmake)
+
+April 25, 2007
++ [FOD] Modification of the openjpeg.h file to avoid and ABI break with v1.1, removed the dangerous #IFDEF JPWL and added tcp_mct in cparameters.
+
+April 23, 2007
++ [GB] Enable/disable image decoding in OPJViewer
+
+April 12,2007
+* [Parvatha] Fixed Error in tiftoimage(). Modification in convert.c.
+
+April 10,2007
++ [Parvatha] Accepting "j2c"  as format for Encoding and Decoding. Modification in image_to_j2k.c.
+* [Parvatha] Modified imagetotif() to read images with signed data. Modification in convert.c.
+
+April 5, 2007
+! [FOD] fix.h optimized. Thanks a lot to Dzonatas <dzonatas at dzonux.net> !
+! [FOD] dwt.c optimized. Thanks a lot to Dzonatas <dzonatas at dzonux.net> !
+! [FOD] t1.c optimized. Thanks a lot to Callum Lerwick <seg at haxxed.com>  !
+
+April 4,2007
++ [Parvatha] Digital cinema compliance for 4K chosen by "-cinema4K" option. Modification in image_to_j2k.c.
++ [Parvatha] Bit rate limitation for each color component. Modification in image_to_j2k.c, t2.c.
+* [Parvatha] Modified and tested Progression order change "-POC" option. Modification in image_to_j2k.c, j2k.c, pi.c.
++ [Parvatha] Function j2k_check_poc_val() to check for possible loss of packets in case of wrong POC declaration. Modification in j2k.c.
++ [Parvatha] Structure T2_MODE. This tells if the t2_encode_packets() is called during Threshold calculation or in Final pass. Modification in j2k.h, tcd.c
+
+March 30, 2007
+* [GB] OPJViewer should now work under Linux, at least with not big j2k files. Tested under Suse 10.1 64 bit.
+
+March 29, 2007
+* [Parvatha] Enable accepting file names with `-<2D> symbol .Modification getopt.c
+* [Parvatha] Rsiz profile name generation to be STD_RSIZ for profiles which are not DCI compliant.Modification in image_to_j2k.c
+! [Parvatha] renamed convert_progression_order to j2k_convert_progression_order. Modification j2k.c
+* [Parvatha] Calculation of number of tile part in each tile in j2k_calculate_tp. Modification j2k.c
+! [Parvatha] j2k_setup_encoder to set bit rate limitation for digital cinema compliance with quality option. Modification in j2k.c
+* [Parvatha] Equation to check multiple tile precincts. Modification pi.c
+! [Parvatha] array size generation of pi->include in pi_initialise_encode().Modification in pi.c
+* [Parvatha] modification in pi_create_encode for tile part generation.Modification in pi.c
++ [Parvatha] In tcd_rateallocate a variable stable_threshold which holds the valid threshold value. This is used to avoid error in case of a wrong threshold value in the last iteration. Modification in tcd.c.
+
+March 28, 2007
+* [FOD] Fixed an historical bug in t1.c that leaded to the inclusion of useless 0xFF in the codestream. Thanks to Sylvain, Pascal and Parvatha !
+
+March 27, 2007
++ [GB] Improved parsing in OPJViewer, as well some minor aesthetic modifications; support for image rendering with bit depths lower than 8 bits; can display an arbitrary frame of an MJ2 file (only in B/W, though); can reload a file; better resizing capabilities
+* [GB] Following to Herv<72>'s suggestions, all the exit() calls, added by JPWL strict checking in t2.c and j2k.c, have been substituted with (object free'ing + opj_evt_message(EVT_ERROR) + return)
++ [GB] Added linking to TIFF library in the JPWL VC6 workspaces
+
+March 23, 2007
+* [antonin] Fixed Makefile.osx and changed Readme.osx accordingly
+
+March 21, 2007
+* [Parvatha] Fixed j2k_prog_order_list[]. Modifications in j2k.c.
+* [Parvatha] Fixed t1_decode_cblks. Modifications in t1.c.
+
+March 20, 2007
++ [Parvatha] Added feature for generation of tile parts. Modifications in image_to_j2k.c, openjpeg.c, j2k.c, pi.c
++ [Parvatha] Added function j2k_write_tlm(),to generate TLM marker for a Digital cinema compliant codestream. Modifications in j2k.c.
+
+March 14, 2007
+* [FOD] Fixed linux makefile, with help from David Fries and Guido
+
+March 7, 2007
++ [Parvatha] Added option for Digital cinema profile compliant codestream. This can be chosen by "-cinema2K" or "-cinema4K" for a 2K and 4K compliance respectively. The feature for tileparts has not been implemented in this version. Modification in image_to_j2k.c
++ [Parvatha] Added the Digital Cinema profiles (CINEMA2K and CINEMA4K) to the list of profiles recognized in the codestream SIZ marker segment. Modification in openjpeg.h,j2k.c
++ [Parvatha] Added feature for constant quality within bitrate defined in Digital cinema standards. Modification in tcd.c
+! [Parvatha] Modified the method of generation of buffer length. Modification in cio.c
+ 
+
+March 1, 2007
+* [FOD] Modified codec projects (*.dsp) and makefile to include the tiff library (modified codec/image_to_j2k.dsp codec/j2k_to_image.dsp and codec/makefile)
++ [GB] Zoom capability and decoder settings dialog in OPJViewer; modified JPWL library .dsp project in order to create a library with embedded JPWL functions
+
+February 28, 2007
++ [Parvatha] Enabled compression of TIF image format to j2k by tifftoimage() and decompression of codestream to TIF image format using imagetotif(). Modifications in image_to_j2k.c, j2k_to_image.c, convert.c, convert.h
+* [antonin] fixed a bug in context numerotation that prevented the RESET switch to work correctly : mqc_reset_enc in mqc.c
+* [Fod] Corrected codec Makefile by adding the compilation of "compat/getopt.c" 
+
+February 27, 2007
+* [Parvatha] Made get_file_format function more robust. Modifications in image_to_j2k.c, j2k_to_image.c, getopt.c, getopt.h
+
+February 26, 2007
++ [Parvatha] Option to read images from a Folder whose path is specified in the Input parameters by "-ImgDir" along with output decod format specified by "-OutFor" . Modifications in image_to_j2k.c, j2k_to_image.c, getopt.c, getopt.h
++ [Parvatha] Enabling use of multi character input parameters in the codec. Modifications in image_to_j2k.c, j2k_to_image.c, getopt.c, getopt.h
+
+----------------------
+February 23, 2007
+VERSION 1.1.1 RELEASED
+----------------------
+
+February 23, 2007
+* [GB] Fixed a copy-and-paste type assignment error (bool instead of int) in the JPWL section of decoder parameters structure in openjpeg.h; minor type-casting in jpwl_lib.c. As a result, now OPJViewer should run correctly when built against the most current SVN trunk of LibOpenJPEG.lib
++ [GB] Linux makefile for the JPWL module; newlines at end of JPWL files
+
+February 22, 2007
++ [FOD] Added the OPJViewer Module (/OPJViewer), developed by Giuseppe Baruffa of the university of Perugia
+
+February 21, 2007
++ [FOD] Algorithmic optimizations in t1.c, thanks to Guido J. !
+
+February 19, 2007
++ [FOD] Added OPJ_LIMIT_DECODING enabling us to limit the decoding to main header (modified openjpeg.c, openjpeg.h, j2k.c and j2k.h)
+
+February 13, 2007
+! [FOD] David Fries suggestions. In image_to_j2k and j2k_to_image, strncpy() functions: instead of specifying the path size macro, let the compiler read the length out of the array entry.
+! [FOD] David Fries suggestions. Makefile modified. -fPIC flag used for 64-bit compilation. Move operation (rather than copy) for the dist library creation, and -p flag added.
+
 January 31, 2007
+! [FOD] Extra tokens at the end of #endif directive corrected in openjpeg.c, j2k.c and image_to_j2k.c -> no more warnings in linux compilation
 ! [FOD] Linux Makefile added for the codec
 
 January 30, 2007

LibOpenJPEG.dsp

@@ -243,6 +243,10 @@ SOURCE=libopenjpeg\t1.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\libopenjpeg\t1_luts.h
+# End Source File
+# Begin Source File
+
 SOURCE=libopenjpeg\t2.h
 # End Source File
 # Begin Source File

Makefile

@@ -1,7 +1,7 @@
 # Linux makefile for OpenJPEG
 
-VER_MAJOR = 1
-VER_MINOR = 0.0
+VER_MAJOR = 2
+VER_MINOR = 1.2.0
 
 SRCS = ./libopenjpeg/bio.c ./libopenjpeg/cio.c ./libopenjpeg/dwt.c ./libopenjpeg/event.c ./libopenjpeg/image.c ./libopenjpeg/j2k.c ./libopenjpeg/j2k_lib.c ./libopenjpeg/jp2.c ./libopenjpeg/jpt.c ./libopenjpeg/mct.c ./libopenjpeg/mqc.c ./libopenjpeg/openjpeg.c ./libopenjpeg/pi.c ./libopenjpeg/raw.c ./libopenjpeg/t1.c ./libopenjpeg/t2.c ./libopenjpeg/tcd.c ./libopenjpeg/tgt.c
 INCLS = ./libopenjpeg/bio.h ./libopenjpeg/cio.h ./libopenjpeg/dwt.h ./libopenjpeg/event.h ./libopenjpeg/fix.h ./libopenjpeg/image.h ./libopenjpeg/int.h ./libopenjpeg/j2k.h ./libopenjpeg/j2k_lib.h ./libopenjpeg/jp2.h ./libopenjpeg/jpt.h ./libopenjpeg/mct.h ./libopenjpeg/mqc.h ./libopenjpeg/openjpeg.h ./libopenjpeg/pi.h ./libopenjpeg/raw.h ./libopenjpeg/t1.h ./libopenjpeg/t2.h ./libopenjpeg/tcd.h ./libopenjpeg/tgt.h ./libopenjpeg/opj_includes.h
@@ -11,12 +11,14 @@ INCLUDE = -Ilibopenjpeg
 CC = gcc
 AR = ar
 
-INSTALLDIR = /usr/lib
+PREFIX = /usr
+INSTALL_LIBDIR = $(PREFIX)/lib
+INSTALL_INCLUDE = $(PREFIX)/include
 
 # Converts cr/lf to just lf
 DOS2UNIX = dos2unix
 
-COMPILERFLAGS = -O3
+COMPILERFLAGS = -O3 -fPIC
 LIBRARIES = -lstdc++
 
 MODULES = $(SRCS:.c=.o)
@@ -31,13 +33,14 @@ LIBNAME = lib$(TARGET).so.$(VER_MAJOR)
 
 default: all
 
-all: dist
+all: OpenJPEG
 
 dist: OpenJPEG
-	mkdir dist
-	cp *.a dist/
-	cp *.so dist/
-	cp libopenjpeg/openjpeg.h dist/
+	install -d dist
+	install -m 644 $(STATICLIB) dist
+	install -m 755 $(SHAREDLIB) dist
+	ln -sf $(SHAREDLIB) dist/$(LIBNAME)
+	install libopenjpeg/openjpeg.h dist
 
 dos2unix:
 	@$(DOS2UNIX) $(SRCS) $(INCLS)
@@ -53,11 +56,14 @@ $(STATICLIB): $(MODULES)
 $(SHAREDLIB): $(MODULES)
 	$(CC) -s -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES)
 
-install:
-	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
-	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
-	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(LIBNAME)
-	ldconfig
+install: OpenJPEG
+	install -d '$(DESTDIR)$(INSTALL_LIBDIR)' '$(DESTDIR)$(INSTALL_INCLUDE)'
+	install -m 644 -o root -g root $(STATICLIB) '$(DESTDIR)$(INSTALL_LIBDIR)'
+	ranlib '$(DESTDIR)$(INSTALL_LIBDIR)/$(STATICLIB)'
+	install -m 755 -o root -g root $(SHAREDLIB) '$(DESTDIR)$(INSTALL_LIBDIR)'
+	ln -sf $(SHAREDLIB) '$(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)'
+	install -m 644 -o root -g root libopenjpeg/openjpeg.h '$(DESTDIR)$(INSTALL_INCLUDE)'
+	-ldconfig
 
 clean:
 	rm -rf core dist/ u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)

Makefile.osx

@@ -1,7 +1,7 @@
-# Mac OSX makefile for OpenJPEG
+# MacOSX makefile for OpenJPEG
 
 VER_MAJOR = 1
-VER_MINOR = 0.0
+VER_MINOR = 1.1
 
 SRCS = ./libopenjpeg/bio.c ./libopenjpeg/cio.c ./libopenjpeg/dwt.c ./libopenjpeg/event.c ./libopenjpeg/image.c ./libopenjpeg/j2k.c ./libopenjpeg/j2k_lib.c ./libopenjpeg/jp2.c ./libopenjpeg/jpt.c ./libopenjpeg/mct.c ./libopenjpeg/mqc.c ./libopenjpeg/openjpeg.c ./libopenjpeg/pi.c ./libopenjpeg/raw.c ./libopenjpeg/t1.c ./libopenjpeg/t2.c ./libopenjpeg/tcd.c ./libopenjpeg/tgt.c
 INCLS = ./libopenjpeg/bio.h ./libopenjpeg/cio.h ./libopenjpeg/dwt.h ./libopenjpeg/event.h ./libopenjpeg/fix.h ./libopenjpeg/image.h ./libopenjpeg/int.h ./libopenjpeg/j2k.h ./libopenjpeg/j2k_lib.h ./libopenjpeg/jp2.h ./libopenjpeg/jpt.h ./libopenjpeg/mct.h ./libopenjpeg/mqc.h ./libopenjpeg/openjpeg.h ./libopenjpeg/pi.h ./libopenjpeg/raw.h ./libopenjpeg/t1.h ./libopenjpeg/t2.h ./libopenjpeg/tcd.h ./libopenjpeg/tgt.h ./libopenjpeg/opj_includes.h
@@ -9,12 +9,14 @@ INCLUDE = -Ilibopenjpeg
 
 # General configuration variables:
 CC = gcc
-LIBTOOL = libtool
+LIBTOOLSTAT = libtool
+LIBTOOLDYN = gcc
 
-INSTALLDIR = /usr/lib
+PREFIX = /usr
+INSTALL_LIBDIR = $(PREFIX)/lib
+INSTALL_INCLUDE = $(PREFIX)/include
 
-COMPILERFLAGS = -O3
-LIBRARIES = -lc -lgcc -lstdc++
+COMPILERFLAGS = -O3 -fPIC
 
 MODULES = $(SRCS:.c=.o)
 CFLAGS = $(COMPILERFLAGS) $(INCLUDE)
@@ -22,19 +24,23 @@ CFLAGS = $(COMPILERFLAGS) $(INCLUDE)
 TARGET  = openjpeg
 STATICLIB = lib$(TARGET).a
 SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).dylib
-LIBNAME = lib$(TARGET).dylib.$(VER_MAJOR)
+LIBNAME = lib$(TARGET).dylib
 
 
 
 default: all
 
-all: dist
+all: OpenJPEG
+
+dos2unix:
+	@$(DOS2UNIX) $(SRCS) $(INCLS)
 
 dist: OpenJPEG
-	mkdir dist
-	cp *.a dist/
-	cp *.dylib dist/
-	cp libopenjpeg/openjpeg.h dist/
+	install -d dist
+	install -m 644 $(STATICLIB) dist
+	install -m 755 $(SHAREDLIB) dist
+	ln -sf $(SHAREDLIB) dist/$(LIBNAME)
+	install libopenjpeg/openjpeg.h dist
 
 OpenJPEG: $(STATICLIB) $(SHAREDLIB)
 
@@ -42,16 +48,18 @@ OpenJPEG: $(STATICLIB) $(SHAREDLIB)
 	$(CC) $(CFLAGS) -c $< -o $@
 
 $(STATICLIB): $(MODULES)
-	$(LIBTOOL) -o $@ $(MODULES)
+	$(LIBTOOLSTAT) -o $@ $(MODULES)
 
 $(SHAREDLIB): $(MODULES)
-	$(LIBTOOL) -dynamic $(LIBRARIES) -o $@ $(MODULES)
+	$(LIBTOOLDYN) -dynamiclib -o $@ $(MODULES)
 
 install:
-	install -m 644 -o root -g wheel $(STATICLIB) $(INSTALLDIR)
-	install -m 755 -o root -g wheel $(SHAREDLIB) $(INSTALLDIR)
-	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(LIBNAME)
-	ranlib $(INSTALLDIR)/$(STATICLIB)
+	install -d '$(DESTDIR)$(INSTALL_LIBDIR)' '$(DESTDIR)$(INSTALL_INCLUDE)'
+	install -m 644 -o root -g wheel $(STATICLIB) '$(DESTDIR)$(INSTALL_LIBDIR)'
+	ranlib '$(DESTDIR)$(INSTALL_LIBDIR)/$(STATICLIB)'
+	install -m 755 -o root -g wheel $(SHAREDLIB) '$(DESTDIR)$(INSTALL_LIBDIR)'
+	ln -sf $(SHAREDLIB) '$(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)'
+	install -m 644 -o root -g wheel ./libopenjpeg/openjpeg.h '$(DESTDIR)$(INSTALL_INCLUDE)'
 
 clean:
 	rm -rf core dist/ u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)

OPJViewer/Makefile

@@ -0,0 +1,41 @@
+# Makefile for the main JPWL OpenJPEG codecs: JPWL_ j2k_to_image and JPWL_image_to_j2k
+
+# General configuration variables:
+CC = $(shell wx-config-2.8 --cxx)
+AR = ar
+
+CFLAGS = -DUSE_JPWL -DwxUSE_LIBOPENJPEG -DwxUSE_GUI=1 -DOPJ_STATIC -DOPJ_HTMLABOUT $(shell wx-config-2.8 --cxxflags) # -g -p -pg -DUSE_JPWL
+
+OPJV_SRCS = source/imagj2k.cpp source/imagmj2.cpp source/wxj2kparser.cpp source/imagjp2.cpp source/OPJViewer.cpp source/wxjp2parser.cpp
+
+MODULES = $(OPJV_SRCS:.cpp=.o)
+
+all: opjviewer lib
+
+.cpp.o:
+	$(CC) $(CFLAGS) -c $< -o $@
+
+lib:
+	cd ../jpwl; make
+
+opjviewer: $(OPJV_SRCS) lib
+	$(CC) $(CFLAGS) -I .. $(OPJV_SRCS) -o OPJViewer -L ../jpwl -lopenjpeg_JPWL -lm -lstdc++ -ltiff $(shell wx-config-2.8 --libs)  
+
+
+clean:
+	rm -f OPJViewer *.o *.a
+	cd ../libopenjpeg; rm -f *.o
+
+
+
+
+#.cpp.o :
+#	$(CXX) -g -c `wx-config-2.8 --cxxflags` -I ../.. -D wxUSE_LIBOPENJPEG -D wxHACK_BOOLEAN -o $@ $<
+
+#all:    $(PROGRAM)
+
+#$(PROGRAM):     $(OBJECTS)
+#	$(CXX) -o $(PROGRAM) $(OBJECTS) -lopenjpeg -L ../.. `wx-config-2.8 --libs`
+
+#clean:
+#	rm -f *.o $(PROGRAM)

OPJViewer/OPJViewer.dsp

@@ -0,0 +1,193 @@
+# Microsoft Developer Studio Project File - Name="OPJViewer" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=OPJVIEWER - WIN32 RELEASE
+!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 "OPJViewer.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 "OPJViewer.mak" CFG="OPJVIEWER - WIN32 RELEASE"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "OPJViewer - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "OPJViewer - 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)" == "OPJViewer - 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 Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /G6 /MD /W3 /GX /O2 /I "c:\programmi\wxWidgets-2.8.0\lib\vc_lib\msw" /I "c:\programmi\wxWidgets-2.8.0\include" /I ".." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D WINVER=0x400 /D "_MT" /D wxUSE_GUI=1 /D "wxUSE_LIBOPENJPEG" /D "OPJ_STATIC" /D "USE_JPWL" /D "OPJ_HTMLABOUT" /D "OPJ_MANYFORMATS" /FR /FD /c
+# ADD BASE RSC /l 0x410 /d "NDEBUG"
+# ADD RSC /l 0x409 /i "c:\programmi\wxWidgets-2.8.0\include" /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 /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 comctl32.lib rpcrt4.lib wsock32.lib wxzlib.lib wxregex.lib wxpng.lib wxjpeg.lib wxbase28.lib wxmsw28_core.lib wxmsw28_html.lib wxmsw28_adv.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib LibOpenJPEG_JPWL.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libcmt.lib" /libpath:"c:\programmi\wxWidgets-2.8.0\lib\vc_lib" /libpath:"..\jpwl\Release" /IGNORE:4089
+# SUBTRACT LINK32 /pdb:none
+
+!ELSEIF  "$(CFG)" == "OPJViewer - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "OPJViewer___Win32_Debug"
+# PROP BASE Intermediate_Dir "OPJViewer___Win32_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 /MDd /W3 /Gm /GX /Zi /Od /I "d:\Programmi\wxWidgets-2.8.0\INCLUDE" /I "d:\programmi\wxWidgets-2.8.0\lib\vc_lib\msw" /I "d:\programmi\wxWidgets-2.8.0\include" /I ".." /D "_DEBUG" /D "__WXDEBUG__" /D WXDEBUG=1 /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D WINVER=0x400 /D "_MT" /D wxUSE_GUI=1 /D "wxUSE_LIBOPENJPEG" /D "OPJ_STATIC" /D "USE_JPWL" /D "OPJ_HTMLABOUT" /FR /FD /GZ /c
+# ADD BASE RSC /l 0x410 /d "_DEBUG"
+# ADD RSC /l 0x410 /i "d:\programmi\wxWidgets-2.8.0\include" /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 /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 comctl32.lib rpcrt4.lib wsock32.lib wxzlibd.lib wxregexd.lib wxpngd.lib wxjpegd.lib wxtiffd.lib wxbase28d.lib wxmsw28d_core.lib wxmsw28d_html.lib wxmsw28d_adv.lib LibOpenJPEG_JPWLd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcmtd.lib" /pdbtype:sept /libpath:"d:\programmi\wxWidgets-2.8.0\lib\vc_lib" /libpath:"..\jpwl\Debug"
+# SUBTRACT LINK32 /pdb:none
+
+!ENDIF 
+
+# Begin Target
+
+# Name "OPJViewer - Win32 Release"
+# Name "OPJViewer - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\source\imagj2k.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\source\imagjp2.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\source\imagjpeg2000.cpp
+# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
+
+SOURCE=.\source\imagmj2.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\source\OPJViewer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\source\wxj2kparser.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\source\wxjp2parser.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\source\about_htm.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\source\imagj2k.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\source\imagjp2.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\source\imagmj2.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\source\OPJViewer.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"
+# Begin Source File
+
+SOURCE=.\source\icon1.xpm
+# End Source File
+# Begin Source File
+
+SOURCE=.\source\icon2.xpm
+# End Source File
+# Begin Source File
+
+SOURCE=.\source\icon3.xpm
+# End Source File
+# Begin Source File
+
+SOURCE=.\source\icon4.xpm
+# End Source File
+# Begin Source File
+
+SOURCE=.\source\icon5.xpm
+# End Source File
+# Begin Source File
+
+SOURCE=.\source\opj_logo.xpm
+# End Source File
+# Begin Source File
+
+SOURCE=.\source\OPJChild.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\source\OPJChild16.xpm
+# End Source File
+# Begin Source File
+
+SOURCE=.\source\OPJViewer.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\source\OPJViewer.rc
+# End Source File
+# Begin Source File
+
+SOURCE=.\source\OPJViewer16.xpm
+# End Source File
+# End Group
+# End Target
+# End Project

OPJViewer/OPJViewer.dsw

@@ -0,0 +1,44 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "LibOpenJPEG_JPWL"=..\jpwl\LibOpenJPEG_JPWL.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "OPJViewer"=.\OPJViewer.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name LibOpenJPEG_JPWL
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+

OPJViewer/OPJViewer.iss

@@ -0,0 +1,44 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+[Setup]
+AppName=OPJViewer
+AppVerName=OPJViewer 0.3 alpha
+AppPublisher=OpenJPEG
+AppPublisherURL=http://www.openjpeg.org
+AppSupportURL=http://www.openjpeg.org
+AppUpdatesURL=http://www.openjpeg.org
+DefaultDirName={pf}\OPJViewer
+DefaultGroupName=OPJViewer
+OutputDir=setup
+OutputBaseFilename=OPJViewer03alpha_setup
+Compression=lzma
+SolidCompression=true
+InfoBeforeFile=source\readmebefore.txt
+InfoAfterFile=source\readmeafter.txt
+LicenseFile=source\license.txt
+VersionInfoVersion=0.3.0.0
+VersionInfoCompany=OpenJPEG
+VersionInfoDescription=JPEG 2000 viewer
+ShowLanguageDialog=yes
+SetupIconFile=source\OPJViewer.ico
+
+[Languages]
+Name: english; MessagesFile: compiler:Default.isl
+
+[Tasks]
+Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
+
+[Files]
+Source: Release\OPJViewer.exe; DestDir: {app}; Flags: ignoreversion
+;Source: about\about.htm; DestDir: {app}/about; Flags: ignoreversion
+;Source: about\opj_logo.png; DestDir: {app}/about; Flags: ignoreversion
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Icons]
+Name: {group}\OPJViewer; Filename: {app}\OPJViewer.exe; WorkingDir: {app}; IconIndex: 0
+Name: {group}\{cm:UninstallProgram,OPJViewer}; Filename: {uninstallexe}
+Name: {userdesktop}\OPJViewer; Filename: {app}\OPJViewer.exe; Tasks: desktopicon; WorkingDir: {app}; IconIndex: 0
+
+[Run]
+Filename: {app}\OPJViewer.exe; Description: {cm:LaunchProgram,OPJViewer}; Flags: nowait postinstall skipifsilent; WorkingDir: {app}

OPJViewer/Readme.txt

@@ -0,0 +1,101 @@
+===============================================================================
+
+	JPEG2000 Visualization Software - OPJViewer
+
+		Version 0.1 alpha
+
+===============================================================================
+
+
+
+
+
+1. Scope
+=============
+
+This document describes the installation and use of the OPJViewer in the framework of OpenJPEG library.
+
+This implementation has been developed using the OpenJPEG library as decoding engine and wxWidgets 2.8.0 as GUI engine.
+
+If you find some bugs or if you have problems using the viewer, please send an e-mail to jpwl@diei.unipg.it
+
+2. Installing the viewer
+==========================
+
+There are two options available, at the moment:
+
+a) compile from source code
+b) download a precompiled binary.
+
+In order to use option a), it is mandatory to have compiled and built the LibOpenJPEG_JPWL library and the wxWidgets 2.8.0 framework (you have to download it from http://www.wxwidgets.org/ and compile the wx* libraries).
+
+2.1. Compiling the source code in Windows
+-------------------------------------------
+
+The steps required to compile the viewer under windows are:
+
+a) Download at least the libopenjpeg, jpwl, and opjviewer folders from the SVN trunk.
+b) Open the OPJViewer.dsw workspace with Visual C++ 6 and activate the "OPJViewer - Win32 Release" configuration.
+c) In the configuration settings, go to the C++ tab and modify the wxWidgets paths in order to reflect your wx* install configuration (Preprocessor -> Additional include directories): simply update each instance of the two wx paths, do not remove or add them.
+d) In the configuration settings, go to the Link tab and modify the wxWidgets path in order to reflect your wx* install configuration (Input -> Additional library path): simply update the wx path.
+e) In the configuration settings, go to the Resources tab and modify the wxWidgets path in order to reflect your wx* install configuration (Additional resource include directories): simply update the wx path.
+f) Build!
+g) Run!
+h) (OPTIONAL) Prepare an installer by compiling the InnoSetup script OPJViewer.iss (you need to download InnoSetup from http://www.jrsoftware.org/isinfo.php).
+
+2.2. Compiling the source code in Unix-like systems
+-----------------------------------------------------
+
+The porting is possible and under way.
+
+
+3. General information on the viewer
+====================================
+
+This viewer is conceived to open and display information and image content of J2K, JP2,
+and MJ2 files.
+The viewer application interface is divided into three main panels:
+- a browsing pane;
+- a viewing pane;
+- a log/peek pane.
+
+The browsing pane will present the markers or boxes hierarchy, with position (byte number where marker/box starts and stops) and length information (i.e., inner length as signalled by marker/box and total length, with marker/box sign included), in the following form:
+
+filename
+|
+|_ #000: Marker/Box short name (Hex code)
+|  |
+|  |_ *** Marker/Box long name ***
+|  |_ startbyte > stopbyte, inner_length + marker/box sign length (total length)
+|  |_ Additional info, depending on the marker/box type
+|  |_ ...
+|
+|_ #001: Marker/Box short name (Hex code)
+|  |
+|  |_ ...
+|
+...
+
+
+The viewing pane will display the decoded image contained in the JPEG 2000 file.
+It should display correctly images as large as 4000x2000, provided that a couple of GB of RAM are available. Nothing is known about the display of larger sizes: let us know if you manage to get it working.
+
+
+The log/peek pane is shared among two different subpanels:
+
+- the log panel will report a lot of debugging info coming out from the wx GUI as well as from the openjpeg library
+- the peek pane tries to give a peek on the codestream/file portion which is currently selected in the browsing pane. It shows both hex and ascii values corresponding to the marker/box section. 
+
+
+4. Known bugs and limitations
+===============================
+
+4.1. Bugs
+-----------
+
+* 
+
+4.2. Limitations
+------------------
+
+* For mj2 files, rendering is only in B/W

OPJViewer/about/about.htm

@@ -0,0 +1,36 @@
+<html>
+<body bgcolor="#FFFFFF">
+<table cellspacing=7 cellpadding=1 border=0 width="100%">
+<tr>
+<td rowspan=3 valign=top align=center width=70>
+<img src="opj_logo.png"><br><br>
+</td>
+<td align=center>
+<font size=+2 color="#000000"><b>OPJViewer v0.2 alpha</b></font><br>
+<font size=+0 color="#000000"><b>A JPEG 2000 image viewer</b></font>
+</td>
+</tr>
+<tr height=3 valign=center>
+<td valign=center  bgcolor=#cc3300></td>
+</tr>
+<tr>
+<td align=justify>
+<center><font size=+0 color="#000000"><a href="http://www.openjpeg.org/">OpenJPEG</a></font></center>
+<font size=-1 color="#000000">The OpenJPEG library is an open-source JPEG 2000 codec written in C language.
+In addition to the basic codec, various other features are under development,
+among them the JP2 and MJ2 (Motion JPEG 2000) file formats, an indexing tool
+useful for the JPIP protocol, JPWL-tools for error-resilience, ...</font>
+</td>
+</tr>
+<tr>
+<td colspan=2 bgcolor="#CC3300" height=3 valign=center></td>
+</tr>
+<tr>
+<td colspan=2>
+<font size=-2 color="#444444">OpenJPEG is &copy; 2002-2007 <a href="http://www.tele.ucl.ac.be/">TELE</a> - <a href="http://www.uclouvain.be/">Universit<EFBFBD> Catholique de Louvain</a></font><br>
+<font size=-2 color="#444444">OPJViewer is also &copy; 2005-2007 <a href="http://dsplab.diei.unipg.it/">DSPLab</a> - <a href="http://www.unipg.it/">Universit<EFBFBD> degli studi di Perugia</a></font>
+</td>
+</tr>
+</table>
+</body>
+</html>

OPJViewer/source/OPJChild16.xpm

@@ -0,0 +1,28 @@
+/* XPM */
+static char *OPJChild16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 6 1",
+"  c black",
+". c #008000",
+"X c red",
+"o c #800080",
+"O c gray100",
+"+ c None",
+/* pixels */
+"++++++++++++++++",
+"+OOOOOOOOOOOOOO+",
+"+OooooooooooooO+",
+"+OooooooooooooO+",
+"+OooOOOOOOOOOoO+",
+"+OooO.......OoO+",
+"+OooO.......OoO+",
+"+OooO..OOO..OoO+",
+"+OooO..OXO..OoO+",
+"+OooO..OOO..OoO+",
+"+OooO.......OoO+",
+"+OooO.......OoO+",
+"+OooOOOOOOOOOoO+",
+"+OooooooooooooO+",
+"+OOOOOOOOOOOOOO+",
+"++++++++++++++++"
+};

OPJViewer/source/OPJViewer.h

@@ -0,0 +1,659 @@
+/*
+ * Copyright (c) 2007, Digital Signal Processing Laboratory, Universit<69> degli studi di Perugia (UPG), Italy
+ * 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.
+ */
+/////////////////////////////////////////////////////////////////////////////
+// Name:        sashtest.h
+// Purpose:     Layout window/sash sample
+// Author:      Julian Smart
+// Modified by:
+// Created:     04/01/98
+// RCS-ID:      $Id: sashtest.h,v 1.5 2005/06/02 12:04:24 JS Exp $
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+// Name:        treectrl.h
+// Purpose:     wxTreeCtrl sample
+// Author:      Julian Smart
+// Modified by:
+// Created:     04/01/98
+// RCS-ID:      $Id: treetest.h,v 1.50 2006/11/04 11:26:51 VZ Exp $
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+// Name:        dialogs.h
+// Purpose:     Common dialogs demo
+// Author:      Julian Smart
+// Modified by: ABX (2004) - adjustementd for conditional building
+// Created:     04/01/98
+// RCS-ID:      $Id: dialogs.h,v 1.50 2006/10/08 14:12:59 VZ Exp $
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __OPJ_VIEWER_H__
+#define __OPJ_VIEWER_H__
+
+// For compilers that support precompilation, includes "wx/wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+#include "wx/wx.h"
+#include "wx/mdi.h"
+#endif
+
+#include "wx/toolbar.h"
+#include "wx/laywin.h"
+#include "wx/treectrl.h"
+
+#include "icon1.xpm"
+#include "icon2.xpm"
+#include "icon3.xpm"
+#include "icon4.xpm"
+#include "icon5.xpm"
+
+#include "wx/filedlg.h"
+#include "wx/toolbar.h"
+#include <wx/filename.h>
+#include <wx/busyinfo.h>
+#include <wx/cmdline.h>
+#include <wx/file.h>
+#include "wx/notebook.h"
+#include <wx/numdlg.h>
+
+#include "wx/propdlg.h"
+#include "wx/spinctrl.h"
+
+#include <wx/dnd.h>
+#include "wx/wxhtml.h"
+#include "wx/statline.h"
+#include <wx/fs_mem.h>
+
+#include <wx/imaglist.h>
+
+#include "libopenjpeg/openjpeg.h"
+
+#include "imagj2k.h"
+#include "imagjp2.h"
+#include "imagmj2.h"
+
+#ifdef __WXMSW__
+typedef unsigned __int64 int8byte;
+#endif // __WXMSW__
+
+#ifdef __WXGTK__
+typedef unsigned long long int8byte;
+#endif // __WXGTK__
+
+#define USE_GENERIC_TREECTRL 0
+#define USE_PENCIL_ON_CANVAS 0
+
+#if USE_GENERIC_TREECTRL
+#include "wx/generic/treectlg.h"
+#ifndef wxTreeCtrl
+#define wxTreeCtrl wxGenericTreeCtrl
+#define sm_classwxTreeCtrl sm_classwxGenericTreeCtrl
+#endif
+#endif
+
+#define OPJ_APPLICATION             wxT("OPJViewer")
+#define OPJ_APPLICATION_NAME		wxT("OpenJPEG Viewer")
+#define OPJ_APPLICATION_VERSION		wxT("0.3 alpha")
+#define OPJ_APPLICATION_TITLEBAR	OPJ_APPLICATION_NAME wxT(" ") OPJ_APPLICATION_VERSION
+#define OPJ_APPLICATION_COPYRIGHT	wxT("(C) 2007, Giuseppe Baruffa")
+
+#ifdef __WXMSW__
+#define OPJ_APPLICATION_PLATFORM    wxT("Windows")
+#endif
+
+#ifdef __WXGTK__
+#define OPJ_APPLICATION_PLATFORM    wxT("Linux")
+#endif
+
+#define OPJ_CANVAS_BORDER 10
+#define OPJ_CANVAS_COLOUR *wxWHITE
+
+class OPJDecoThread;
+class OPJParseThread;
+WX_DEFINE_ARRAY_PTR(wxThread *, wxArrayThread);
+class OPJChildFrame;
+
+//////////////////////////////////
+// this is our main application //
+//////////////////////////////////
+class OPJViewerApp: public wxApp
+{
+	// public methods and variables
+	public:
+
+		// class constructor
+		OPJViewerApp() { m_showImages = true; m_showButtons = false; }
+
+		// other methods
+		bool OnInit(void);
+		void SetShowImages(bool show) { m_showImages = show; }
+		bool ShowImages() const { return m_showImages; }
+		void ShowCmdLine(const wxCmdLineParser& parser);
+
+		// all the threads currently alive - as soon as the thread terminates, it's
+		// removed from the array
+		wxArrayThread m_deco_threads, m_parse_threads;
+
+		// crit section protects access to all of the arrays below
+		wxCriticalSection m_deco_critsect, m_parse_critsect;
+
+		// semaphore used to wait for the threads to exit, see OPJFrame::OnQuit()
+		wxSemaphore m_deco_semAllDone, m_parse_semAllDone;
+
+		// the last exiting thread should post to m_semAllDone if this is true
+		// (protected by the same m_critsect)
+		bool m_deco_waitingUntilAllDone, m_parse_waitingUntilAllDone;
+
+		// the list of all filenames written in the command line
+		wxArrayString m_filelist;
+
+		// displaying engine parameters
+		int m_resizemethod;
+
+		// decoding engine parameters
+		bool m_enabledeco;
+		int m_reducefactor, m_qualitylayers, m_components, m_framenum;
+#ifdef USE_JPWL
+		bool m_enablejpwl;
+		int m_expcomps, m_maxtiles;
+#endif // USE_JPWL
+
+	// private methods and variables
+	private:
+		bool m_showImages, m_showButtons;
+
+};
+
+DECLARE_APP(OPJViewerApp)
+
+///////////////////////////////////////////
+// this canvas is used to draw the image //
+///////////////////////////////////////////
+class OPJCanvas: public wxScrolledWindow
+{
+	// public methods and variables
+	public:
+
+		// class constructor
+		OPJCanvas(wxFileName fname, wxWindow *parent, const wxPoint& pos, const wxSize& size);
+
+		virtual void OnDraw(wxDC& dc);
+		void OnEvent(wxMouseEvent& event);
+		void WriteText(const wxString& text) {
+#ifndef __WXGTK__ 
+			wxMutexGuiEnter();
+#endif //__WXGTK__
+			wxLogMessage(text);
+#ifndef __WXGTK__ 
+			wxMutexGuiLeave();
+#endif //__WXGTK__
+		}
+		OPJDecoThread *CreateDecoThread(void);
+		OPJChildFrame *m_childframe;
+
+		wxBitmap  m_image, m_image100;
+		wxFileName m_fname;
+		long m_zooml;
+
+	DECLARE_EVENT_TABLE()
+};
+
+///////////////////////////////////////////////////
+// the data associated to each tree leaf or node //
+///////////////////////////////////////////////////
+class OPJMarkerData : public wxTreeItemData
+{
+	// public methods and variables
+	public:
+
+		// class constructor
+		OPJMarkerData(const wxString& desc, const wxString& fname = wxT(""), wxFileOffset start = 0, wxFileOffset length = 0) : m_desc(desc), m_filestring(fname) { m_start = start; m_length = length; }
+
+		void ShowInfo(wxTreeCtrl *tree);
+		const wxChar *GetDesc1() const { return m_desc.c_str(); }
+		const wxChar *GetDesc2() const { return m_filestring.c_str(); }
+		wxFileOffset m_start, m_length;
+
+	// private methods and variables
+	private:
+		wxString m_desc;
+		wxString m_filestring;
+};
+
+
+class OPJMarkerTree : public wxTreeCtrl
+{
+public:
+    enum
+    {
+        TreeCtrlIcon_File,
+        TreeCtrlIcon_FileSelected,
+        TreeCtrlIcon_Folder,
+        TreeCtrlIcon_FolderSelected,
+        TreeCtrlIcon_FolderOpened
+    };
+
+    OPJMarkerTree() { };
+    OPJMarkerTree(wxWindow *parent, OPJChildFrame *subframe, wxFileName fname, wxString name, const wxWindowID id,
+               const wxPoint& pos, const wxSize& size,
+               long style);
+    virtual ~OPJMarkerTree(){};
+	OPJParseThread *CreateParseThread(wxTreeItemId parentid = 0x00, OPJChildFrame *subframe = NULL);
+    void WriteText(const wxString& text) { wxMutexGuiEnter(); wxLogMessage(text); wxMutexGuiLeave(); }
+
+	wxFileName m_fname;
+	wxTextCtrl *m_peektextCtrl;
+	OPJChildFrame *m_childframe;
+
+    /*void OnBeginDrag(wxTreeEvent& event);
+    void OnBeginRDrag(wxTreeEvent& event);
+    void OnEndDrag(wxTreeEvent& event);*/
+    /*void OnBeginLabelEdit(wxTreeEvent& event);
+    void OnEndLabelEdit(wxTreeEvent& event);*/
+    /*void OnDeleteItem(wxTreeEvent& event);*/
+    /*void OnContextMenu(wxContextMenuEvent& event);*/
+    void OnItemMenu(wxTreeEvent& event);
+    /*void OnGetInfo(wxTreeEvent& event);
+    void OnSetInfo(wxTreeEvent& event);*/
+    /*void OnItemExpanded(wxTreeEvent& event);*/
+    void OnItemExpanding(wxTreeEvent& event);
+    /*void OnItemCollapsed(wxTreeEvent& event);
+    void OnItemCollapsing(wxTreeEvent& event);*/
+    void OnSelChanged(wxTreeEvent& event);
+    /*void OnSelChanging(wxTreeEvent& event);*/
+    /*void OnTreeKeyDown(wxTreeEvent& event);*/
+    /*void OnItemActivated(wxTreeEvent& event);*/
+    /*void OnItemRClick(wxTreeEvent& event);*/
+    /*void OnRMouseDown(wxMouseEvent& event);
+    void OnRMouseUp(wxMouseEvent& event);
+    void OnRMouseDClick(wxMouseEvent& event);*/
+    /*void GetItemsRecursively(const wxTreeItemId& idParent,
+                             wxTreeItemIdValue cookie = 0);*/
+
+    void CreateImageList(int size = 16);
+    void CreateButtonsImageList(int size = 11);
+
+    /*void AddTestItemsToTree(size_t numChildren, size_t depth);*/
+    /*void DoSortChildren(const wxTreeItemId& item, bool reverse = false)
+        { m_reverseSort = reverse; wxTreeCtrl::SortChildren(item); }*/
+    /*void DoEnsureVisible() { if (m_lastItem.IsOk()) EnsureVisible(m_lastItem); }*/
+    /*void DoToggleIcon(const wxTreeItemId& item);*/
+    /*void ShowMenu(wxTreeItemId id, const wxPoint& pt);*/
+
+    int ImageSize(void) const { return m_imageSize; }
+
+    void SetLastItem(wxTreeItemId id) { m_lastItem = id; }
+
+protected:
+    /*virtual int OnCompareItems(const wxTreeItemId& i1, const wxTreeItemId& i2);*/
+
+    // is this the test item which we use in several event handlers?
+    /*bool IsTestItem(const wxTreeItemId& item)
+    {
+        // the test item is the first child folder
+        return GetItemParent(item) == GetRootItem() && !GetPrevSibling(item);
+    }*/
+
+private:
+    /*void AddItemsRecursively(const wxTreeItemId& idParent,
+                             size_t nChildren,
+                             size_t depth,
+                             size_t folder);*/
+
+    void LogEvent(const wxChar *name, const wxTreeEvent& event);
+
+    int          m_imageSize;               // current size of images
+    bool         m_reverseSort;             // flag for OnCompareItems
+    wxTreeItemId m_lastItem,                // for OnEnsureVisible()
+                 m_draggedItem;             // item being dragged right now
+
+    // NB: due to an ugly wxMSW hack you _must_ use DECLARE_DYNAMIC_CLASS()
+    //     if you want your overloaded OnCompareItems() to be called.
+    //     OTOH, if you don't want it you may omit the next line - this will
+    //     make default (alphabetical) sorting much faster under wxMSW.
+    DECLARE_DYNAMIC_CLASS(OPJMarkerTree)
+    DECLARE_EVENT_TABLE()
+};
+
+// this hash map stores all the trees of currently opened images, with an integer key
+WX_DECLARE_HASH_MAP(int, OPJMarkerTree*, wxIntegerHash, wxIntegerEqual, OPJMarkerTreeHash);
+
+// this hash map stores all the children of currently opened images, with an integer key
+WX_DECLARE_HASH_MAP(int, OPJChildFrame*, wxIntegerHash, wxIntegerEqual, OPJChildFrameHash);
+
+// Define a new frame
+class OPJFrame: public wxMDIParentFrame
+{
+  public:
+
+    OPJFrame(wxWindow *parent, const wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, const long style);
+
+    ~OPJFrame(void);
+	void OnSize(wxSizeEvent& WXUNUSED(event));
+    void OnAbout(wxCommandEvent& WXUNUSED(event));
+    void OnFileOpen(wxCommandEvent& WXUNUSED(event));
+    void OnQuit(wxCommandEvent& WXUNUSED(event));
+    void OnClose(wxCommandEvent& WXUNUSED(event));
+    void OnZoom(wxCommandEvent& WXUNUSED(event));
+	void OnFit(wxCommandEvent& WXUNUSED(event));
+	void OnToggleBrowser(wxCommandEvent& WXUNUSED(event));
+	void OnTogglePeeker(wxCommandEvent& WXUNUSED(event));
+	void OnReload(wxCommandEvent& event);
+	void OnSetsEnco(wxCommandEvent& event);
+	void OnSetsDeco(wxCommandEvent& event);
+	void OnSashDrag(wxSashEvent& event);
+	void OpenFiles(wxArrayString paths, wxArrayString filenames);
+	void OnNotebook(wxNotebookEvent& event);
+	void Rescale(int scale, OPJChildFrame *child);
+
+	OPJMarkerTreeHash m_treehash;
+	OPJChildFrameHash m_childhash;
+    wxSashLayoutWindow* markerTreeWindow;
+    wxSashLayoutWindow* loggingWindow;
+    void Resize(int number);
+	wxNotebook *m_bookCtrl;
+	wxNotebook *m_bookCtrlbottom;
+    wxTextCtrl *m_textCtrlbrowse;
+
+  private:
+    void TogStyle(int id, long flag);
+
+    void DoSort(bool reverse = false);
+
+    wxPanel *m_panel;
+    wxTextCtrl *m_textCtrl;
+
+    void DoSetBold(bool bold = true);
+
+protected:
+    wxSashLayoutWindow* m_topWindow;
+    wxSashLayoutWindow* m_leftWindow2;
+
+DECLARE_EVENT_TABLE()
+};
+
+class OPJChildFrame: public wxMDIChildFrame
+{
+  public:
+    OPJCanvas *m_canvas;
+    OPJChildFrame(OPJFrame *parent, wxFileName fname, int winnumber, const wxString& title, const wxPoint& pos, const wxSize& size, const long style);
+    ~OPJChildFrame(void);
+    void OnActivate(wxActivateEvent& event);
+	/*void OnQuit(wxCommandEvent& WXUNUSED(event));*/
+	void OnClose(wxCloseEvent& event);
+	void OnGotFocus(wxFocusEvent& event);
+	void OnLostFocus(wxFocusEvent& event);
+    OPJFrame *m_frame;
+	wxFileName m_fname;
+	int m_winnumber;
+
+	unsigned long  m_twidth, m_theight, m_tx, m_ty;
+
+	DECLARE_EVENT_TABLE()
+};
+
+// frame and main menu ids
+enum {
+	OPJFRAME_FILEEXIT = wxID_EXIT,
+	OPJFRAME_HELPABOUT = wxID_ABOUT,
+	OPJFRAME_FILEOPEN,
+	OPJFRAME_FILETOGGLEB,
+	OPJFRAME_FILETOGGLEP,
+	OPJFRAME_VIEWZOOM,
+	OPJFRAME_VIEWFIT,
+	OPJFRAME_VIEWRELOAD,
+	OPJFRAME_FILECLOSE,
+	OPJFRAME_SETSENCO,
+	OPJFRAME_SETSDECO,
+
+	OPJFRAME_BROWSEWIN = 10000,
+	OPJFRAME_LOGWIN
+};
+
+
+// menu and control ids
+enum
+{
+    TreeTest_Quit = wxID_EXIT,
+    TreeTest_About = wxID_ABOUT,
+    TreeTest_TogButtons = wxID_HIGHEST,
+    TreeTest_TogTwist,
+    TreeTest_TogLines,
+    TreeTest_TogEdit,
+    TreeTest_TogHideRoot,
+    TreeTest_TogRootLines,
+    TreeTest_TogBorder,
+    TreeTest_TogFullHighlight,
+    TreeTest_SetFgColour,
+    TreeTest_SetBgColour,
+    TreeTest_ResetStyle,
+    TreeTest_Highlight,
+    TreeTest_Dump,
+    TreeTest_DumpSelected,
+    TreeTest_Count,
+    TreeTest_CountRec,
+    TreeTest_Sort,
+    TreeTest_SortRev,
+    TreeTest_SetBold,
+    TreeTest_ClearBold,
+    TreeTest_Rename,
+    TreeTest_Delete,
+    TreeTest_DeleteChildren,
+    TreeTest_DeleteAll,
+    TreeTest_Recreate,
+    TreeTest_ToggleImages,
+    TreeTest_ToggleButtons,
+    TreeTest_SetImageSize,
+    TreeTest_ToggleSel,
+    TreeTest_CollapseAndReset,
+    TreeTest_EnsureVisible,
+    TreeTest_AddItem,
+    TreeTest_InsertItem,
+    TreeTest_IncIndent,
+    TreeTest_DecIndent,
+    TreeTest_IncSpacing,
+    TreeTest_DecSpacing,
+    TreeTest_ToggleIcon,
+    TreeTest_Select,
+    TreeTest_Unselect,
+    TreeTest_SelectRoot,
+    TreeTest_Ctrl = 1000,
+	BOTTOM_NOTEBOOK_ID,
+	LEFT_NOTEBOOK_ID
+};
+
+class OPJDecoThread : public wxThread
+{
+public:
+    OPJDecoThread(OPJCanvas *canvas);
+
+    // thread execution starts here
+    virtual void *Entry();
+
+    // called when the thread exits - whether it terminates normally or is
+    // stopped with Delete() (but not when it is Kill()ed!)
+    virtual void OnExit();
+
+    // write something to the text control
+    void WriteText(const wxString& text);
+
+public:
+    unsigned m_count;
+    OPJCanvas *m_canvas;
+};
+
+class OPJParseThread : public wxThread
+{
+public:
+    OPJParseThread(OPJMarkerTree *tree, wxTreeItemId parentid = 0x00);
+
+    // thread execution starts here
+    virtual void *Entry();
+
+    // called when the thread exits - whether it terminates normally or is
+    // stopped with Delete() (but not when it is Kill()ed!)
+    virtual void OnExit();
+
+    // write something to the text control
+    void WriteText(const wxString& text);
+	void LoadFile(wxFileName fname);
+	void ParseJ2KFile(wxFile *m_file, wxFileOffset offset, wxFileOffset length, wxTreeItemId parentid);
+	void ParseJP2File(wxFile *fileid, wxFileOffset filepoint, wxFileOffset filelimit, wxTreeItemId parentid);
+
+    unsigned m_count;
+    OPJMarkerTree *m_tree;
+	wxTreeItemId m_parentid;
+
+private:
+	int jpeg2000parse(wxFile *fileid, wxFileOffset filepoint, wxFileOffset filelimit,
+			wxTreeItemId parentid, int level, char *scansign, unsigned long int *scanpoint);
+	int box_handler_function(int boxtype, wxFile *fileid, wxFileOffset filepoint, wxFileOffset filelimit,
+			wxTreeItemId parentid, int level, char *scansign, unsigned long int *scanpoint);
+
+};
+
+
+// Drag and drop files target
+class OPJDnDFile: public wxFileDropTarget
+{
+public:
+    OPJDnDFile(OPJFrame *pOwner) { m_pOwner = pOwner; }
+    virtual bool OnDropFiles(wxCoord x, wxCoord y, const wxArrayString& filenames);
+
+private:
+    OPJFrame *m_pOwner;
+};
+
+
+
+// Property sheet dialog: encoder
+class OPJEncoderDialog: public wxPropertySheetDialog
+{
+DECLARE_CLASS(OPJEncoderDialog)
+public:
+    OPJEncoderDialog(wxWindow* parent, int dialogType);
+    ~OPJEncoderDialog();
+
+	wxBookCtrlBase* m_settingsNotebook;
+
+    wxPanel* CreateMainSettingsPage(wxWindow* parent);
+    wxPanel* CreatePart1SettingsPage(wxWindow* parent);
+/*    wxPanel* CreatePart3SettingsPage(wxWindow* parent);*/
+#ifdef USE_JPWL
+	void OnEnableJPWL(wxCommandEvent& event);
+/*    wxPanel* CreatePart11SettingsPage(wxWindow* parent);
+	wxCheckBox *m_enablejpwlCheck;*/
+#endif // USE_JPWL
+
+
+protected:
+
+    enum {
+		OPJENCO_ENABLEJPWL = 100,
+		OPJENCO_RATEFACTOR,
+		OPJENCO_QUALITYFACTOR,
+		OPJENCO_RESNUMBER,
+		OPJENCO_CODEBLOCKSIZE,
+		OPJENCO_PRECINCTSIZE,
+		OPJENCO_TILESIZE,
+		OPJENCO_PROGRESSION,
+		OPJENCO_SUBSAMPLING,
+		OPJENCO_ENABLESOP,
+		OPJENCO_ENABLEEPH,
+		OPJENCO_ENABLEBYPASS,
+		OPJENCO_ENABLERESET,
+		OPJENCO_ENABLERESTART,
+		OPJENCO_ENABLEVSC,
+		OPJENCO_ENABLEERTERM,
+		OPJENCO_ENABLESEGMARK,
+		OPJENCO_ROICOMP,
+		OPJENCO_ROISHIFT,
+		OPJENCO_IMORIG,
+		OPJENCO_TILORIG,
+		OPJENCO_ENABLEIRREV,
+		OPJENCO_ENABLEINDEX,
+		OPJENCO_INDEXNAME
+    };
+
+DECLARE_EVENT_TABLE()
+};
+
+// Property sheet dialog: decoder
+class OPJDecoderDialog: public wxPropertySheetDialog
+{
+DECLARE_CLASS(OPJDecoderDialog)
+public:
+    OPJDecoderDialog(wxWindow* parent, int dialogType);
+    ~OPJDecoderDialog();
+
+	wxBookCtrlBase* m_settingsNotebook;
+	wxCheckBox *m_enabledecoCheck;
+	wxSpinCtrl *m_reduceCtrl, *m_layerCtrl, *m_numcompsCtrl;
+	wxRadioBox* m_resizeBox;
+
+	void OnEnableDeco(wxCommandEvent& event);
+
+    wxPanel* CreateMainSettingsPage(wxWindow* parent);
+    wxPanel* CreatePart1SettingsPage(wxWindow* parent);
+    wxPanel* CreatePart3SettingsPage(wxWindow* parent);
+#ifdef USE_JPWL
+	void OnEnableJPWL(wxCommandEvent& event);
+    wxPanel* CreatePart11SettingsPage(wxWindow* parent);
+	wxSpinCtrl *m_expcompsCtrl, *m_framenumCtrl, *m_maxtilesCtrl;
+	wxCheckBox *m_enablejpwlCheck;
+#endif // USE_JPWL
+
+
+protected:
+
+    enum {
+		OPJDECO_RESMETHOD = 100,
+		OPJDECO_REDUCEFACTOR,
+		OPJDECO_QUALITYLAYERS,
+		OPJDECO_NUMCOMPS,
+		OPJDECO_ENABLEDECO,
+		OPJDECO_ENABLEJPWL,
+		OPJDECO_EXPCOMPS,
+		OPJDECO_MAXTILES,
+		OPJDECO_FRAMENUM
+    };
+
+DECLARE_EVENT_TABLE()
+};
+
+#endif //__OPJ_VIEWER_H__
+
+
+

OPJViewer/source/OPJViewer.rc

@@ -0,0 +1,3 @@
+OPJChild16 ICON OPJChild.ico
+OPJViewer16 ICON OPJViewer.ico
+#include "wx/msw/wx.rc"

OPJViewer/source/OPJViewer16.xpm

@@ -0,0 +1,26 @@
+/* XPM */
+static char *OPJViewer16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 4 1",
+"  c black",
+". c #800000",
+"X c red",
+"o c None",
+/* pixels */
+"oooooooooooooooo",
+"ooo.XXXXoooooooo",
+"ooXXoo .Xooooooo",
+"o..oooo .ooooooo",
+"oX.oooo  ooooooo",
+"oX.oooo .ooooooo",
+"oXXoooo .ooooooo",
+"o.XXoo .oooooooo",
+"oo.XXXXooooooooo",
+"ooooooooo.Xo .oo",
+"ooooooooo X. ooo",
+"oooooooooo...ooo",
+"oooooooooo XXooo",
+"oooooooooo .Xooo",
+"oooooooooooooooo",
+"oooooooooooooooo"
+};

OPJViewer/source/about_htm.h

@@ -0,0 +1,47 @@
+wxString htmlaboutpage = wxT(
+"<html>"
+"<body bgcolor=#FFFFFF>"
+"<table cellspacing=7 cellpadding=1 border=0 width=100%>"
+"<tr>"
+"<td rowspan=3 valign=top align=center width=70>"
+"<img src=\"memory:opj_logo.xpm\"><br><br>"
+"</td>"
+"<td align=center>"
+"<font size=+0 color=#000000><b>"
+OPJ_APPLICATION " " OPJ_APPLICATION_VERSION
+"</b></font><br>"
+"<font size=-1 color=#000000><b>A JPEG 2000 image viewer</b></font><br>"
+"<font size=-2 color=#000000><b>" OPJ_APPLICATION_PLATFORM " version</b></font>"
+"</td>"
+"</tr>"
+"<tr height=3 valign=center>"
+"<td valign=center  bgcolor=#cc3300></td>"
+"</tr>"
+"<tr>"
+"<td align=justify>"
+"<center><font size=+0 color=#000000><a href=\"http://www.openjpeg.org/\">OpenJPEG</a></font></center>"
+"<font size=-1 color=#000000>The OpenJPEG library is an open-source JPEG 2000 codec written in C language. "
+"In addition to the basic codec, various other features are under development.</font><br>"
+"<font size=-2 color=red>* Build: " wxVERSION_STRING ", " __DATE__ ", " __TIME__ "</font><br>"
+)
+#ifdef USE_JPWL
+wxT("<font size=-2 color=green>- Compiled with JPWL support</font><br>")
+#endif // USE_JPWL
+#ifdef USE_JPSEC
+wxT("<font size=-2 color=green>- Compiled with JPSEC support</font>")
+#endif // USE_JPSEC
+wxT("</td>"
+"</tr>"
+"<tr>"
+"<td colspan=2 bgcolor=#CC3300 height=3 valign=center></td>"
+"</tr>"
+"<tr>"
+"<td colspan=2>"
+"<font size=-2 color=#444444>OpenJPEG is &copy; 2002-2007 <a href=\"http://www.tele.ucl.ac.be/\">TELE</a> - <a href=\"http://www.uclouvain.be/\">Universite' Catholique de Louvain</a></font><br>"
+"<font size=-2 color=#444444>OPJViewer is also &copy; 2007 <a href=\"http://dsplab.diei.unipg.it/\">DSPLab</a> - <a href=\"http://www.unipg.it/\">Universita' degli studi di Perugia</a></font>"
+"</td>"
+"</tr>"
+"</table>"
+"</body>"
+"</html>"
+);

OPJViewer/source/icon1.xpm

@@ -0,0 +1,79 @@
+/* XPM */
+static char *icon1_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 41 1",
+"> c #97C4E7",
+"# c #4381AA",
+"d c #FFFFFF",
+"< c #71B2DE",
+"+ c #538BB1",
+"& c #D1E5F5",
+"q c #63B3DE",
+"6 c #F1F4F7",
+"* c #CAE1F3",
+"y c #7AC4E5",
+"= c #C3DDF1",
+"X c #74A1BD",
+"- c #BCD9EF",
+"5 c #619BC4",
+"3 c #E6EAF1",
+"2 c #4B8EBF",
+"o c #6B97B6",
+". c #4B82A8",
+"  c None",
+"w c #54A6D8",
+"1 c #71A8D1",
+", c #85BBE2",
+"t c #EFF6FC",
+"7 c #DEEDF8",
+"@ c #4388B4",
+"a c #F7FBFD",
+"$ c #D7E0E9",
+"r c #FAFCFE",
+"4 c #DAEAF7",
+"e c #E9F3FA",
+"0 c #76BAE2",
+"% c #7FA6C0",
+"s c #FDFDFE",
+"O c #5896BE",
+"p c #B6D5EE",
+"8 c #87ABC3",
+": c #A5CCEA",
+"9 c #E5F0F9",
+"; c #AFD1EC",
+"i c #F4F9FD",
+"u c #8FB0C3",
+/* pixels */
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"        .XXXooOO++@#$           ",
+"        %&*=-;:>>,<123          ",
+"        %4&*=-;:>>,1>56         ",
+"        %74&*=-;:>>1*>56        ",
+"        89700qqqqwq1e*>X        ",
+"        8e974&*=-;:1re*>8       ",
+"        8te974&*=-;11111#       ",
+"        8tty000qqqqqww>,+       ",
+"        uitte974&*=-p:>>+       ",
+"        uaitte974&*=-p:>O       ",
+"        uaayyyy000qqqqp:O       ",
+"        uraaitte974&*=-po       ",
+"        urraaitte974&*=-o       ",
+"        usryyyyyyy000q*=X       ",
+"        ussrraaitte974&*X       ",
+"        udssrraaitte974&X       ",
+"        uddyyyyyyyyyy074%       ",
+"        udddssrraaitte97%       ",
+"        uddddssrraaitte9%       ",
+"        udddddssrraaitte8       ",
+"        uddddddssrraaitt8       ",
+"        uuuuuuuuuuuuuu88u       ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                "
+};

OPJViewer/source/icon2.xpm

@@ -0,0 +1,53 @@
+/* XPM */
+static char *icon2_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 15 1",
+". c Black",
+"O c #97C4E7",
+"$ c #63B3DE",
+"@ c #CAE1F3",
+"; c #7AC4E5",
+"* c #74A1BD",
+"+ c #619BC4",
+"o c #4B8EBF",
+"  c None",
+"% c #54A6D8",
+"= c #FAFCFE",
+"& c #E9F3FA",
+"# c #76BAE2",
+"X c #C00000",
+"- c #87ABC3",
+/* pixels */
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"        .............           ",
+"        .XXXXXXXXXX.o.          ",
+"        .XXXXXXXXXX.O+.         ",
+"        .XXXXXXXXXX.@O+.        ",
+"        .XX##$$$$%$.&@O*        ",
+"        .XXXXXXXXXX.=&@O-       ",
+"        .XXXXXXXXXX......       ",
+"        .XX;###$$$$$%%XX.       ",
+"        .XXXXXXXXXXXXXXX.       ",
+"        .XXXXXXXXXXXXXXX.       ",
+"        .XX;;;;###$$$$XX.       ",
+"        .XXXXXXXXXXXXXXX.       ",
+"        .XXXXXXXXXXXXXXX.       ",
+"        .XX;;;;;;;###$XX.       ",
+"        .XXXXXXXXXXXXXXX.       ",
+"        .XXXXXXXXXXXXXXX.       ",
+"        .XX;;;;;;;;;;#XX.       ",
+"        .XXXXXXXXXXXXXXX.       ",
+"        .XXXXXXXXXXXXXXX.       ",
+"        .XXXXXXXXXXXXXXX.       ",
+"        .XXXXXXXXXXXXXXX.       ",
+"        .................       ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                "
+};

OPJViewer/source/icon3.xpm

@@ -0,0 +1,79 @@
+/* XPM */
+static char *icon3_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 41 1",
+"6 c #EDF2FB",
+"- c #AAC1E8",
+": c #B9CDED",
+"X c #295193",
+", c #C6D6F0",
+"a c #4A7CCE",
+"u c #779DDB",
+"y c #7FA2DD",
+"$ c #3263B4",
+"5 c #EAF0FA",
+". c #2D59A3",
+"o c #6E96D8",
+"* c #356AC1",
+"r c #F7F9FD",
+"> c #BED0EE",
+"3 c #E1E9F7",
+"7 c #F0F5FC",
+"< c #CBD9F1",
+"2 c #DAE5F6",
+"# c #3161B1",
+"  c None",
+"0 c #FDFEFF",
+"= c #9FB9E5",
+"e c #AEC5EA",
+"t c #89A9DF",
+"q c #98B5E4",
+"p c #5584D1",
+"d c #3A70CA",
+"@ c #305FAC",
+"i c #5D89D3",
+"1 c #D2DFF4",
+"% c #3366B9",
+"9 c #FAFCFE",
+"8 c #F5F8FD",
+"s c #4075CC",
+"O c #638ED5",
+"w c #90AFE2",
+"& c #3467BC",
+"+ c #2F5DA9",
+"; c #B3C8EB",
+"4 c #E5EDF9",
+/* pixels */
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"      ......X                   ",
+"      .oooooO+                  ",
+"      .ooooooo.                 ",
+"      .+@@@##$%%&&&&&****.      ",
+"      .=-;:>,<12345678900.      ",
+"      .q=-;:>,<1234567890.      ",
+"      .wq=-e:>,<12345678r.      ",
+"      .twq=-e:>,<12345678.      ",
+"      .ytwq=-e:>,<1234567.      ",
+"      .uytwq=-e:>,<123456.      ",
+"      .ouytwq=-e:>,<12345.      ",
+"      .Oouytwq=-e;>,<1234.      ",
+"      .iOouytwq=-e;>,<123.      ",
+"      .piOouytwq=-e;>,<12.      ",
+"      .apiOouytwq=-e;>,<1.      ",
+"      .sapiOouytwq=-e;>,<.      ",
+"      .dsapiOouytwq=-e;>,.      ",
+"      ...................#      ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                "
+};

OPJViewer/source/icon4.xpm

@@ -0,0 +1,43 @@
+/* XPM */
+static char *icon4_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 5 1",
+". c Black",
+"o c #8399B4",
+"X c #8DA0B9",
+"  c None",
+"O c #800000",
+/* pixels */
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"      .......                   ",
+"      .XXXXXo.                  ",
+"      .XXXXXXX.                 ",
+"      ....................      ",
+"      .OOOOOOOOOOOOOOOOOO.      ",
+"      .OOOOOOOOOOOOOOOOOO.      ",
+"      .OOOOOOOOOOOOOOOOOO.      ",
+"      .OOOOOOOOOOOOOOOOOO.      ",
+"      .OOOOOOOOOOOOOOOOOO.      ",
+"      .OOOOOOOOOOOOOOOOOO.      ",
+"      .OOOOOOOOOOOOOOOOOO.      ",
+"      .OOOOOOOOOOOOOOOOOO.      ",
+"      .OOOOOOOOOOOOOOOOOO.      ",
+"      .OOOOOOOOOOOOOOOOOO.      ",
+"      .OOOOOOOOOOOOOOOOOO.      ",
+"      .OOOOOOOOOOOOOOOOOO.      ",
+"      .OOOOOOOOOOOOOOOOOO.      ",
+"      ....................      ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                "
+};

OPJViewer/source/icon5.xpm

@@ -0,0 +1,79 @@
+/* XPM */
+static char *icon5_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 41 1",
+"0 c #AAC1E8",
+"q c #B9CDED",
+"X c #295193",
+"e c #C6D6F0",
+"a c #4A7CCE",
+"& c #779DDB",
+"* c #7FA2DD",
+"2 c #EAF0FA",
+"@ c #2D59A3",
+"o c #6E96D8",
+"y c #356AC1",
+"d c #214279",
+"w c #BED0EE",
+"= c #85A7DF",
+"< c #E1E9F7",
+"3 c #F0F5FC",
+"s c #CBD9F1",
+", c #DAE5F6",
+"7 c #3161B1",
+"  c None",
+". c #274D8B",
+"6 c #FDFEFF",
+"i c #E7EEF9",
+"9 c #9FB9E5",
+"- c #89A9DF",
+"8 c #98B5E4",
+"$ c #5584D1",
+"+ c #3569BF",
+"% c #305FAC",
+"O c #5D89D3",
+"> c #D2DFF4",
+"p c #3366B9",
+"5 c #FAFCFE",
+"4 c #F5F8FD",
+"t c #4075CC",
+"u c #638ED5",
+"r c #CEDCF2",
+"; c #90AFE2",
+"# c #2F5DA9",
+": c #B3C8EB",
+"1 c #E5EDF9",
+/* pixels */
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"     ......X                    ",
+"     XoooooO.                   ",
+"     Xoooooo+.                  ",
+"     Xooooooo@XXXXXXXXXX#       ",
+"     Xoooooooooooooooooo#       ",
+"     Xoooooooooooooooooo#       ",
+"     Xoo$###################    ",
+"     Xoo%O&*=-;:>,<123445667    ",
+"     XooX890:qwer>,<123445q#    ",
+"     Xoty;890:qwer>,<12344#     ",
+"     Xo%u-;890:qwer>,<i234#     ",
+"     XoX&*-;890:qwer>,<i2r#     ",
+"     Xtpo&*-;890:qwer>,<i#      ",
+"     X%auo&*-;890:qwer>,<#      ",
+"     XX$Ouo&*-;890:qwer>s#      ",
+"     d%a$Ouo&*-;890:qwer#       ",
+"     d+ta$Ouo&*-;890:qwe#       ",
+"     d..................#       ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                "
+};

OPJViewer/source/imagj2k.cpp

@@ -0,0 +1,264 @@
+/*
+ * Copyright (c) 2007, Digital Signal Processing Laboratory, Universit<69> degli studi di Perugia (UPG), Italy
+ * 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.
+ */
+/////////////////////////////////////////////////////////////////////////////
+// Name:        imagj2k.cpp
+// Purpose:     wxImage JPEG 2000 codestream handler
+// Author:      Giuseppe Baruffa - based on imagjpeg.cpp, Vaclav Slavik
+// RCS-ID:      $Id: imagj2k.cpp,v 0.00 2007/02/08 23:59:00 MW Exp $
+// Copyright:   (c) Giuseppe Baruffa
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_IMAGE && wxUSE_LIBOPENJPEG
+
+#include "imagj2k.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/intl.h"
+    #include "wx/bitmap.h"
+    #include "wx/module.h"
+#endif
+
+#include "wx/filefn.h"
+#include "wx/wfstream.h"
+
+// ----------------------------------------------------------------------------
+// types
+// ----------------------------------------------------------------------------
+
+
+//-----------------------------------------------------------------------------
+// wxJ2KHandler
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxJ2KHandler,wxImageHandler)
+
+#if wxUSE_STREAMS
+
+//------------- JPEG 2000 Data Source Manager
+
+#define J2K_CFMT 0
+#define JP2_CFMT 1
+#define JPT_CFMT 2
+#define MJ2_CFMT 3
+#define PXM_DFMT 0
+#define PGX_DFMT 1
+#define BMP_DFMT 2
+#define YUV_DFMT 3
+
+#define MAX_MESSAGE_LEN 200
+
+/* sample error callback expecting a FILE* client object */
+void j2k_error_callback(const char *msg, void *client_data) {
+	int message_len = strlen(msg) - 1;
+	if (msg[message_len] != '\n')
+		message_len = MAX_MESSAGE_LEN;
+#ifndef __WXGTK__ 
+    wxMutexGuiEnter();
+#endif /* __WXGTK__ */
+	wxLogMessage(wxT("[ERROR] %.*s"), message_len, msg);
+#ifndef __WXGTK__ 
+    wxMutexGuiLeave();
+#endif /* __WXGTK__ */
+}
+
+/* sample warning callback expecting a FILE* client object */
+void j2k_warning_callback(const char *msg, void *client_data) {
+	int message_len = strlen(msg) - 1;
+	if (msg[message_len] != '\n')
+		message_len = MAX_MESSAGE_LEN;
+#ifndef __WXGTK__ 
+    wxMutexGuiEnter();
+#endif /* __WXGTK__ */
+	wxLogMessage(wxT("[WARNING] %.*s"), message_len, msg);
+#ifndef __WXGTK__ 
+    wxMutexGuiLeave();
+#endif /* __WXGTK__ */
+}
+
+/* sample debug callback expecting no client object */
+void j2k_info_callback(const char *msg, void *client_data) {
+	int message_len = strlen(msg) - 1;
+	if (msg[message_len] != '\n')
+		message_len = MAX_MESSAGE_LEN;
+#ifndef __WXGTK__ 
+    wxMutexGuiEnter();
+#endif /* __WXGTK__ */
+	wxLogMessage(wxT("[INFO] %.*s"), message_len, msg);
+#ifndef __WXGTK__ 
+    wxMutexGuiLeave();
+#endif /* __WXGTK__ */
+}
+
+// load the j2k codestream
+bool wxJ2KHandler::LoadFile(wxImage *image, wxInputStream& stream, bool verbose, int index)
+{
+	opj_dparameters_t parameters;	/* decompression parameters */
+	opj_event_mgr_t event_mgr;		/* event manager */
+	opj_image_t *opjimage = NULL;
+	unsigned char *src = NULL;
+    unsigned char *ptr;
+	int file_length;
+
+	// destroy the image
+    image->Destroy();
+
+	/* handle to a decompressor */
+	opj_dinfo_t* dinfo = NULL;	
+	opj_cio_t *cio = NULL;
+
+
+	/* configure the event callbacks (not required) */
+	memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
+	event_mgr.error_handler = j2k_error_callback;
+	event_mgr.warning_handler = j2k_warning_callback;
+	event_mgr.info_handler = j2k_info_callback;
+
+	/* set decoding parameters to default values */
+	opj_set_default_decoder_parameters(&parameters);
+
+	/* prepare parameters */
+	strncpy(parameters.infile, "", sizeof(parameters.infile)-1);
+	strncpy(parameters.outfile, "", sizeof(parameters.outfile)-1);
+	parameters.decod_format = J2K_CFMT;
+	parameters.cod_format = BMP_DFMT;
+	if (m_reducefactor)
+		parameters.cp_reduce = m_reducefactor;
+	if (m_qualitylayers)
+		parameters.cp_layer = m_qualitylayers;
+
+	/* JPWL only */
+#ifdef USE_JPWL
+	parameters.jpwl_exp_comps = m_expcomps;
+	parameters.jpwl_max_tiles = m_maxtiles;
+	parameters.jpwl_correct = m_enablejpwl;
+#endif /* USE_JPWL */
+
+	/* get a decoder handle */
+	dinfo = opj_create_decompress(CODEC_J2K);
+
+	/* find length of the stream */
+	stream.SeekI(0, wxFromEnd);
+	file_length = (int) stream.TellI();
+
+	/* get data */
+	stream.SeekI(0, wxFromStart);
+    src = (unsigned char *) malloc(file_length);
+	stream.Read(src, file_length);
+
+	/* catch events using our callbacks and give a local context */
+	opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, stderr);
+
+	/* setup the decoder decoding parameters using user parameters */
+	opj_setup_decoder(dinfo, &parameters);
+
+	/* open a byte stream */
+	cio = opj_cio_open((opj_common_ptr)dinfo, src, file_length);
+
+	/* decode the stream and fill the image structure */
+	opjimage = opj_decode(dinfo, cio);
+	if (!opjimage) {
+#ifndef __WXGTK__ 
+		wxMutexGuiEnter();
+#endif /* __WXGTK__ */
+		wxLogError(wxT("J2K: failed to decode image!"));
+#ifndef __WXGTK__ 
+		wxMutexGuiLeave();
+#endif /* __WXGTK__ */
+		opj_destroy_decompress(dinfo);
+		opj_cio_close(cio);
+		opj_image_destroy(opjimage);
+		free(src);
+		return false;
+	}
+
+	/* close the byte stream */
+	opj_cio_close(cio);
+
+	/* common rendering method */
+#include "imagjpeg2000.cpp"
+
+#ifndef __WXGTK__ 
+    wxMutexGuiEnter();
+#endif /* __WXGTK__ */
+    wxLogMessage(wxT("J2K: image loaded."));
+#ifndef __WXGTK__ 
+    wxMutexGuiLeave();
+#endif /* __WXGTK__ */
+
+	/* close openjpeg structs */
+	opj_destroy_decompress(dinfo);
+	opj_image_destroy(opjimage);
+	free(src);
+
+	if (!image->Ok())
+		return false;
+	else
+		return true;
+
+}
+
+// save the j2k codestream
+bool wxJ2KHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbose )
+{
+#ifndef __WXGTK__ 
+    wxMutexGuiEnter();
+#endif /* __WXGTK__ */
+    wxLogError(wxT("J2K: Couldn't save image -> not implemented."));
+#ifndef __WXGTK__ 
+    wxMutexGuiLeave();
+#endif /* __WXGTK__ */
+
+    return false;
+}
+
+#ifdef __VISUALC__
+    #pragma warning(default:4611)
+#endif /* VC++ */
+
+// recognize the 0xFF4F JPEG 2000 SOC marker
+bool wxJ2KHandler::DoCanRead( wxInputStream& stream )
+{
+    unsigned char hdr[2];
+
+    if ( !stream.Read(hdr, WXSIZEOF(hdr)) )
+        return false;
+
+    return hdr[0] == 0xFF && hdr[1] == 0x4F;
+}
+
+#endif   // wxUSE_STREAMS
+
+#endif   // wxUSE_LIBOPENJPEG

OPJViewer/source/imagj2k.h

@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2007, Digital Signal Processing Laboratory, Universit<69> degli studi di Perugia (UPG), Italy
+ * 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.
+ */
+/////////////////////////////////////////////////////////////////////////////
+// Name:        imagj2k.h
+// Purpose:     wxImage JPEG 2000 raw codestream handler
+// Author:      G. Baruffa - based on imagjpeg.h, Vaclav Slavik
+// RCS-ID:      $Id: imagj2k.h,v 0.0 2007/02/08 23:45:00 VZ Exp $
+// Copyright:   (c) Giuseppe Baruffa
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_IMAGJ2K_H_
+#define _WX_IMAGJ2K_H_
+
+#include "wx/defs.h"
+
+//-----------------------------------------------------------------------------
+// wxJ2KHandler
+//-----------------------------------------------------------------------------
+
+#if wxUSE_LIBOPENJPEG
+
+#include "wx/image.h"
+#include "libopenjpeg/openjpeg.h"
+
+#define wxBITMAP_TYPE_J2K	47
+
+#define wxIMAGE_OPTION_REDUCEFACTOR  wxString(_T("reducefactor"))
+#define wxIMAGE_OPTION_QUALITYLAYERS  wxString(_T("qualitylayers"))
+#define wxIMAGE_OPTION_MAXCOMPS  wxString(_T("maxcomps"))
+#ifdef USE_JPWL
+#define wxIMAGE_OPTION_ENABLEJPWL  wxString(_T("enablejpwl"))
+#define wxIMAGE_OPTION_EXPCOMPS  wxString(_T("expcomps"))
+#define wxIMAGE_OPTION_MAXTILES  wxString(_T("maxtiles"))
+#endif // USE_JPWL
+
+class WXDLLEXPORT wxJ2KHandler: public wxImageHandler
+{
+public:
+    inline wxJ2KHandler()
+    {
+        m_name = wxT("JPEG 2000 codestream file");
+        m_extension = wxT("j2k");
+        m_type = wxBITMAP_TYPE_J2K;
+        m_mime = wxT("image/j2k");
+
+		m_reducefactor = 0;
+		m_qualitylayers = 0;
+		m_components = 0;
+#ifdef USE_JPWL
+		m_enablejpwl = true;
+		m_expcomps = JPWL_EXPECTED_COMPONENTS;
+		m_maxtiles = JPWL_MAXIMUM_TILES;
+#endif // USE_JPWL
+    }
+
+		// decoding engine parameters
+		int m_reducefactor, m_qualitylayers, m_components;
+#ifdef USE_JPWL
+		bool m_enablejpwl;
+		int m_expcomps, m_maxtiles;
+#endif // USE_JPWL
+
+#if wxUSE_STREAMS
+    virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 );
+    virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true );
+protected:
+    virtual bool DoCanRead( wxInputStream& stream );
+#endif
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxJ2KHandler)
+};
+
+#endif // wxUSE_LIBOPENJPEG
+
+#endif // _WX_IMAGJ2K_H_
+

OPJViewer/source/imagjp2.cpp

@@ -0,0 +1,278 @@
+/*
+ * Copyright (c) 2007, Digital Signal Processing Laboratory, Universit<69> degli studi di Perugia (UPG), Italy
+ * 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.
+ */
+/////////////////////////////////////////////////////////////////////////////
+// Name:        imagjp2.cpp
+// Purpose:     wxImage JPEG 2000 file format handler
+// Author:      Giuseppe Baruffa - based on imagjpeg.cpp, Vaclav Slavik
+// RCS-ID:      $Id: imagjp2.cpp,v 0.00 2007/02/08 23:59:00 MW Exp $
+// Copyright:   (c) Giuseppe Baruffa
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_IMAGE && wxUSE_LIBOPENJPEG
+
+#include "imagjp2.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/intl.h"
+    #include "wx/bitmap.h"
+    #include "wx/module.h"
+#endif
+
+
+#include "libopenjpeg/openjpeg.h"
+
+
+#include "wx/filefn.h"
+#include "wx/wfstream.h"
+
+// ----------------------------------------------------------------------------
+// types
+// ----------------------------------------------------------------------------
+
+
+//-----------------------------------------------------------------------------
+// wxJP2Handler
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxJP2Handler,wxImageHandler)
+
+#if wxUSE_STREAMS
+
+//------------- JPEG 2000 Data Source Manager
+
+#define J2K_CFMT 0
+#define JP2_CFMT 1
+#define JPT_CFMT 2
+#define MJ2_CFMT 3
+#define PXM_DFMT 0
+#define PGX_DFMT 1
+#define BMP_DFMT 2
+#define YUV_DFMT 3
+
+#define MAX_MESSAGE_LEN 200
+
+/* sample error callback expecting a FILE* client object */
+void jp2_error_callback(const char *msg, void *client_data) {
+	int message_len = strlen(msg) - 1;
+	if (msg[message_len] != '\n')
+		message_len = MAX_MESSAGE_LEN;
+#ifndef __WXGTK__ 
+		wxMutexGuiEnter();
+#endif /* __WXGTK__ */
+	wxLogMessage(wxT("[ERROR] %.*s"), message_len, msg);
+#ifndef __WXGTK__ 
+    wxMutexGuiLeave();
+#endif /* __WXGTK__ */
+}
+
+/* sample warning callback expecting a FILE* client object */
+void jp2_warning_callback(const char *msg, void *client_data) {
+	int message_len = strlen(msg) - 1;
+	if (msg[message_len] != '\n')
+		message_len = MAX_MESSAGE_LEN;
+#ifndef __WXGTK__ 
+		wxMutexGuiEnter();
+#endif /* __WXGTK__ */
+	wxLogMessage(wxT("[WARNING] %.*s"), message_len, msg);
+#ifndef __WXGTK__ 
+    wxMutexGuiLeave();
+#endif /* __WXGTK__ */
+}
+
+/* sample debug callback expecting no client object */
+void jp2_info_callback(const char *msg, void *client_data) {
+	int message_len = strlen(msg) - 1;
+	if (msg[message_len] != '\n')
+		message_len = MAX_MESSAGE_LEN;
+#ifndef __WXGTK__ 
+		wxMutexGuiEnter();
+#endif /* __WXGTK__ */
+	wxLogMessage(wxT("[INFO] %.*s"), message_len, msg);
+#ifndef __WXGTK__ 
+    wxMutexGuiLeave();
+#endif /* __WXGTK__ */
+}
+
+// load the jp2 file format
+bool wxJP2Handler::LoadFile(wxImage *image, wxInputStream& stream, bool verbose, int index)
+{
+	opj_dparameters_t parameters;	/* decompression parameters */
+	opj_event_mgr_t event_mgr;		/* event manager */
+	opj_image_t *opjimage = NULL;
+	unsigned char *src = NULL;
+    unsigned char *ptr;
+	int file_length;
+
+	// destroy the image
+    image->Destroy();
+
+	/* handle to a decompressor */
+	opj_dinfo_t* dinfo = NULL;	
+	opj_cio_t *cio = NULL;
+
+	/* configure the event callbacks (not required) */
+	memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
+	event_mgr.error_handler = jp2_error_callback;
+	event_mgr.warning_handler = jp2_warning_callback;
+	event_mgr.info_handler = jp2_info_callback;
+
+	/* set decoding parameters to default values */
+	opj_set_default_decoder_parameters(&parameters);
+
+	/* prepare parameters */
+	strncpy(parameters.infile, "", sizeof(parameters.infile)-1);
+	strncpy(parameters.outfile, "", sizeof(parameters.outfile)-1);
+	parameters.decod_format = JP2_CFMT;
+	parameters.cod_format = BMP_DFMT;
+	if (m_reducefactor)
+		parameters.cp_reduce = m_reducefactor;
+	if (m_qualitylayers)
+		parameters.cp_layer = m_qualitylayers;
+	/*if (n_components)
+		parameters. = n_components;*/
+
+	/* JPWL only */
+#ifdef USE_JPWL
+	parameters.jpwl_exp_comps = m_expcomps;
+	parameters.jpwl_max_tiles = m_maxtiles;
+	parameters.jpwl_correct = m_enablejpwl;
+#endif /* USE_JPWL */
+
+	/* get a decoder handle */
+	dinfo = opj_create_decompress(CODEC_JP2);
+
+	/* find length of the stream */
+	stream.SeekI(0, wxFromEnd);
+	file_length = (int) stream.TellI();
+
+	/* get data */
+	stream.SeekI(0, wxFromStart);
+    src = (unsigned char *) malloc(file_length);
+	stream.Read(src, file_length);
+
+	/* catch events using our callbacks and give a local context */
+	opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, stderr);
+
+	/* setup the decoder decoding parameters using user parameters */
+	opj_setup_decoder(dinfo, &parameters);
+
+	/* open a byte stream */
+	cio = opj_cio_open((opj_common_ptr)dinfo, src, file_length);
+
+	/* decode the stream and fill the image structure */
+	opjimage = opj_decode(dinfo, cio);
+	if (!opjimage) {
+#ifndef __WXGTK__ 
+		wxMutexGuiEnter();
+#endif /* __WXGTK__ */
+		wxLogError(wxT("JP2: failed to decode image!"));
+#ifndef __WXGTK__ 
+		wxMutexGuiLeave();
+#endif /* __WXGTK__ */
+		opj_destroy_decompress(dinfo);
+		opj_cio_close(cio);
+		free(src);
+		return false;
+	}
+
+	/* close the byte stream */
+	opj_cio_close(cio);
+
+	/* common rendering method */
+#include "imagjpeg2000.cpp"
+
+#ifndef __WXGTK__ 
+		wxMutexGuiEnter();
+#endif /* __WXGTK__ */
+    wxLogMessage(wxT("JP2: image loaded."));
+#ifndef __WXGTK__ 
+		wxMutexGuiLeave();
+#endif /* __WXGTK__ */
+
+	/* close openjpeg structs */
+	opj_destroy_decompress(dinfo);
+	opj_image_destroy(opjimage);
+	free(src);
+
+	if (!image->Ok())
+		return false;
+	else
+		return true;
+
+}
+
+// save the jp2 file format
+bool wxJP2Handler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbose )
+{
+#ifndef __WXGTK__ 
+		wxMutexGuiEnter();
+#endif /* __WXGTK__ */
+    wxLogError(wxT("JP2: Couldn't save image -> not implemented."));
+#ifndef __WXGTK__ 
+		wxMutexGuiLeave();
+#endif /* __WXGTK__ */
+
+    return false;
+}
+
+#ifdef __VISUALC__
+    #pragma warning(default:4611)
+#endif /* VC++ */
+
+// recognize the JPEG 2000 starting box
+bool wxJP2Handler::DoCanRead( wxInputStream& stream )
+{
+    unsigned char hdr[23];
+
+    if ( !stream.Read(hdr, WXSIZEOF(hdr)) )
+        return false;
+
+    return (hdr[0] == 0x00 &&
+			hdr[1] == 0x00 &&
+			hdr[2] == 0x00 &&
+			hdr[3] == 0x0C &&
+			hdr[4] == 0x6A &&
+			hdr[5] == 0x50 &&
+			hdr[6] == 0x20 &&
+			hdr[7] == 0x20 &&
+			hdr[20] == 0x6A &&
+			hdr[21] == 0x70 &&
+			hdr[22] == 0x32);
+}
+
+#endif   // wxUSE_STREAMS
+
+#endif   // wxUSE_LIBOPENJPEG

OPJViewer/source/imagjp2.h

@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2007, Digital Signal Processing Laboratory, Universit<69> degli studi di Perugia (UPG), Italy
+ * 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.
+ */
+/////////////////////////////////////////////////////////////////////////////
+// Name:        imagjp2.h
+// Purpose:     wxImage JPEG 2000 file format handler
+// Author:      G. Baruffa - based on imagjpeg.h, Vaclav Slavik
+// RCS-ID:      $Id: imagjp2.h,v 0.0 2007/02/08 23:45:00 VZ Exp $
+// Copyright:   (c) Giuseppe Baruffa
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_IMAGJP2_H_
+#define _WX_IMAGJP2_H_
+
+#include "wx/defs.h"
+
+//-----------------------------------------------------------------------------
+// wxJP2Handler
+//-----------------------------------------------------------------------------
+
+#if wxUSE_LIBOPENJPEG
+
+#include "wx/image.h"
+#include "libopenjpeg/openjpeg.h"
+
+#define wxBITMAP_TYPE_JP2	48
+
+class WXDLLEXPORT wxJP2Handler: public wxImageHandler
+{
+public:
+    inline wxJP2Handler()
+    {
+        m_name = wxT("JPEG 2000 file format");
+        m_extension = wxT("jp2");
+        m_type = wxBITMAP_TYPE_JP2;
+        m_mime = wxT("image/jp2");
+
+		m_reducefactor = 0;
+		m_qualitylayers = 0;
+		m_components = 0;
+#ifdef USE_JPWL
+		m_enablejpwl = true;
+		m_expcomps = JPWL_EXPECTED_COMPONENTS;
+		m_maxtiles = JPWL_MAXIMUM_TILES;
+#endif // USE_JPWL
+    }
+
+		// decoding engine parameters
+		int m_reducefactor, m_qualitylayers, m_components;
+#ifdef USE_JPWL
+		bool m_enablejpwl;
+		int m_expcomps, m_maxtiles;
+#endif // USE_JPWL
+
+#if wxUSE_STREAMS
+    virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 );
+    virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true );
+protected:
+    virtual bool DoCanRead( wxInputStream& stream );
+#endif
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxJP2Handler)
+};
+
+#endif // wxUSE_LIBOPENJPEG
+
+#endif // _WX_IMAGJP2_H_
+

OPJViewer/source/imagjpeg2000.cpp

@@ -0,0 +1,186 @@
+/*
+ * Copyright (c) 2007, Digital Signal Processing Laboratory, Universit<69> degli studi di Perugia (UPG), Italy
+ * 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.
+ */
+/////////////////////////////////////////////////////////////////////////////
+// Name:        imagjpeg2000.cpp
+// Purpose:     wxImage JPEG 2000 imagage rendering common functions
+// Author:      Giuseppe Baruffa
+// RCS-ID:      $Id: imagjpeg2000.cpp,v 0.00 2007/04/27 22:11:00 MW Exp $
+// Copyright:   (c) Giuseppe Baruffa
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+/*
+
+- At this point, we have the structure "opjimage" that is filled with decompressed
+  data, as processed by the OpenJPEG decompression engine
+
+- We need to fill the class "image" with the proper pixel sample values
+
+*/
+{
+	int shiftbpp;
+	int c, tempcomps;
+
+	// check components number
+	if (m_components > opjimage->numcomps)
+		m_components = opjimage->numcomps;
+
+	// check image depth (only on the first one, for now)
+	if (m_components)
+		shiftbpp = opjimage->comps[m_components - 1].prec - 8;
+	else
+		shiftbpp = opjimage->comps[0].prec - 8;
+
+	// prepare image size
+	if (m_components)
+		image->Create(opjimage->comps[m_components - 1].w, opjimage->comps[m_components - 1].h, true);
+	else
+		image->Create(opjimage->comps[0].w, opjimage->comps[0].h, true);
+
+	// access image raw data
+    image->SetMask(false);
+    ptr = image->GetData();
+
+	// workaround for components different from 1 or 3
+	if ((opjimage->numcomps != 1) && (opjimage->numcomps != 3)) {
+#ifndef __WXGTK__ 
+		wxMutexGuiEnter();
+#endif /* __WXGTK__ */
+		wxLogMessage(wxT("JPEG2000: weird number of components"));
+#ifndef __WXGTK__ 
+		wxMutexGuiLeave();
+#endif /* __WXGTK__ */
+		tempcomps = 1;
+	} else
+		tempcomps = opjimage->numcomps;
+
+	// workaround for subsampled components
+	for (c = 1; c < tempcomps; c++) {
+		if ((opjimage->comps[c].w != opjimage->comps[c - 1].w) || (opjimage->comps[c].h != opjimage->comps[c - 1].h)) {
+			tempcomps = 1;
+			break;
+		}
+	}
+
+	// workaround for different precision components
+	for (c = 1; c < tempcomps; c++) {
+		if (opjimage->comps[c].bpp != opjimage->comps[c - 1].bpp) {
+			tempcomps = 1;
+			break;
+		}
+	}
+
+	// only one component selected
+	if (m_components)
+		tempcomps = 1;
+
+	// RGB color picture
+	if (tempcomps == 3) {
+		int row, col;
+		int *r = opjimage->comps[0].data;
+		int *g = opjimage->comps[1].data;
+		int *b = opjimage->comps[2].data;
+		if (shiftbpp > 0) {
+			for (row = 0; row < opjimage->comps[0].h; row++) {
+				for (col = 0; col < opjimage->comps[0].w; col++) {
+					
+					*(ptr++) = (*(r++)) >> shiftbpp;
+					*(ptr++) = (*(g++)) >> shiftbpp;
+					*(ptr++) = (*(b++)) >> shiftbpp;
+
+				}
+			}
+
+		} else if (shiftbpp < 0) {
+			for (row = 0; row < opjimage->comps[0].h; row++) {
+				for (col = 0; col < opjimage->comps[0].w; col++) {
+					
+					*(ptr++) = (*(r++)) << -shiftbpp;
+					*(ptr++) = (*(g++)) << -shiftbpp;
+					*(ptr++) = (*(b++)) << -shiftbpp;
+
+				}
+			}
+			
+		} else {
+			for (row = 0; row < opjimage->comps[0].h; row++) {
+				for (col = 0; col < opjimage->comps[0].w; col++) {
+
+					*(ptr++) = *(r++);
+					*(ptr++) = *(g++);
+					*(ptr++) = *(b++);
+				
+				}
+			}
+		}
+	}
+
+	// B/W picture
+	if (tempcomps == 1) {
+		int row, col;
+		int selcomp;
+
+		if (m_components)
+			selcomp = m_components - 1;
+		else
+			selcomp = 0;
+
+		int *y = opjimage->comps[selcomp].data;
+		if (shiftbpp > 0) {
+			for (row = 0; row < opjimage->comps[selcomp].h; row++) {
+				for (col = 0; col < opjimage->comps[selcomp].w; col++) {
+					
+					*(ptr++) = (*(y)) >> shiftbpp;
+					*(ptr++) = (*(y)) >> shiftbpp;
+					*(ptr++) = (*(y++)) >> shiftbpp;
+
+				}
+			}
+		} else if (shiftbpp < 0) {
+			for (row = 0; row < opjimage->comps[selcomp].h; row++) {
+				for (col = 0; col < opjimage->comps[selcomp].w; col++) {
+					
+					*(ptr++) = (*(y)) << -shiftbpp;
+					*(ptr++) = (*(y)) << -shiftbpp;
+					*(ptr++) = (*(y++)) << -shiftbpp;
+
+				}
+			}
+		} else {
+			for (row = 0; row < opjimage->comps[selcomp].h; row++) {
+				for (col = 0; col < opjimage->comps[selcomp].w; col++) {
+					
+					*(ptr++) = *(y);
+					*(ptr++) = *(y);
+					*(ptr++) = *(y++);
+
+				}
+			}
+		}
+	}
+
+
+}

OPJViewer/source/imagmj2.cpp

@@ -0,0 +1,762 @@
+/*
+ * Copyright (c) 2007, Digital Signal Processing Laboratory, Universit<69> degli studi di Perugia (UPG), Italy
+ * 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.
+ */
+/////////////////////////////////////////////////////////////////////////////
+// Name:        imagmj2.cpp
+// Purpose:     wxImage Motion JPEG 2000 file format handler
+// Author:      Giuseppe Baruffa - based on imagjpeg.cpp, Vaclav Slavik
+// RCS-ID:      $Id: imagmj2.cpp,v 0.00 2007/02/18 23:59:00 MW Exp $
+// Copyright:   (c) Giuseppe Baruffa
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_IMAGE && wxUSE_LIBOPENJPEG
+
+#include "imagmj2.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/intl.h"
+    #include "wx/bitmap.h"
+    #include "wx/module.h"
+#endif
+
+
+#include "libopenjpeg/openjpeg.h"
+
+
+#include "wx/filefn.h"
+#include "wx/wfstream.h"
+
+// ----------------------------------------------------------------------------
+// types
+// ----------------------------------------------------------------------------
+
+
+//-----------------------------------------------------------------------------
+// wxMJ2Handler
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxMJ2Handler,wxImageHandler)
+
+#if wxUSE_STREAMS
+
+//------------- JPEG 2000 Data Source Manager
+
+#define J2K_CFMT 0
+#define JP2_CFMT 1
+#define JPT_CFMT 2
+#define MJ2_CFMT 3
+#define PXM_DFMT 0
+#define PGX_DFMT 1
+#define BMP_DFMT 2
+#define YUV_DFMT 3
+
+#define MAX_MESSAGE_LEN 200
+
+/* sample error callback expecting a FILE* client object */
+void mj2_error_callback(const char *msg, void *client_data) {
+	int message_len = strlen(msg) - 1;
+	if (msg[message_len] != '\n')
+		message_len = MAX_MESSAGE_LEN;
+#ifndef __WXGTK__ 
+		wxMutexGuiEnter();
+#endif /* __WXGTK__ */
+	wxLogMessage(wxT("[ERROR] %.*s"), message_len, msg);
+#ifndef __WXGTK__ 
+    wxMutexGuiLeave();
+#endif /* __WXGTK__ */
+}
+
+/* sample warning callback expecting a FILE* client object */
+void mj2_warning_callback(const char *msg, void *client_data) {
+	int message_len = strlen(msg) - 1;
+	if (msg[message_len] != '\n')
+		message_len = MAX_MESSAGE_LEN;
+#ifndef __WXGTK__ 
+		wxMutexGuiEnter();
+#endif /* __WXGTK__ */
+	wxLogMessage(wxT("[WARNING] %.*s"), message_len, msg);
+#ifndef __WXGTK__ 
+    wxMutexGuiLeave();
+#endif /* __WXGTK__ */
+}
+
+/* sample debug callback expecting no client object */
+void mj2_info_callback(const char *msg, void *client_data) {
+	int message_len = strlen(msg) - 1;
+	if (msg[message_len] != '\n')
+		message_len = MAX_MESSAGE_LEN;
+#ifndef __WXGTK__ 
+		wxMutexGuiEnter();
+#endif /* __WXGTK__ */
+	wxLogMessage(wxT("[INFO] %.*s"), message_len, msg);
+#ifndef __WXGTK__ 
+    wxMutexGuiLeave();
+#endif /* __WXGTK__ */
+}
+
+/* macro functions */
+/* From little endian to big endian, 2 and 4 bytes */
+#define	BYTE_SWAP2(X)	((X & 0x00FF) << 8) | ((X & 0xFF00) >> 8)
+#define	BYTE_SWAP4(X)	((X & 0x000000FF) << 24) | ((X & 0x0000FF00) << 8) | ((X & 0x00FF0000) >> 8) | ((X & 0xFF000000) >> 24)
+#define	BYTE_SWAP8(X)	((X & 0x00000000000000FF) << 56) | ((X & 0x000000000000FF00) << 40) | \
+                        ((X & 0x0000000000FF0000) << 24) | ((X & 0x00000000FF000000) << 8) | \
+						((X & 0x000000FF00000000) >> 8)  | ((X & 0x0000FF0000000000) >> 24) | \
+						((X & 0x00FF000000000000) >> 40) | ((X & 0xFF00000000000000) >> 56)
+
+/* From codestream to int values */
+#define STREAM_TO_UINT32(C, P)	(((unsigned long int) (C)[(P) + 0] << 24) + \
+								((unsigned long int) (C)[(P) + 1] << 16) + \
+								((unsigned long int) (C)[(P) + 2] << 8) + \
+								((unsigned long int) (C)[(P) + 3] << 0))
+
+#define STREAM_TO_UINT16(C, P)	(((unsigned long int) (C)[(P) + 0] << 8) + \
+								((unsigned long int) (C)[(P) + 1] << 0))
+
+/* defines */
+#define SHORT_DESCR_LEN        32
+#define LONG_DESCR_LEN         256
+
+/* enumeration for file formats */
+#define J2FILENUM              4
+typedef enum {
+
+        JP2_FILE,
+        J2K_FILE,
+		MJ2_FILE,
+		UNK_FILE
+
+} my_j2filetype;
+
+/* enumeration for the box types */
+#define J2BOXNUM                23
+typedef enum {
+
+			FILE_BOX,
+			JP_BOX,
+			FTYP_BOX,
+			JP2H_BOX,
+			IHDR_BOX,
+			COLR_BOX,
+			JP2C_BOX,
+			JP2I_BOX,
+			XML_BOX,
+			UUID_BOX,
+			UINF_BOX,
+			MOOV_BOX,
+			MVHD_BOX,
+			TRAK_BOX,
+			TKHD_BOX,
+			MDIA_BOX,
+			MINF_BOX,
+			STBL_BOX,
+			STSD_BOX,
+			MJP2_BOX,
+			MDAT_BOX,
+			ANY_BOX,
+			UNK_BOX
+
+} my_j2boxtype;
+
+/* jp2 family box signatures */
+#define FILE_SIGN           ""
+#define JP_SIGN             "jP\040\040"
+#define FTYP_SIGN           "ftyp"
+#define JP2H_SIGN           "jp2h"
+#define IHDR_SIGN           "ihdr"
+#define COLR_SIGN           "colr"
+#define JP2C_SIGN           "jp2c"
+#define JP2I_SIGN           "jp2i"
+#define XML_SIGN            "xml\040"
+#define UUID_SIGN           "uuid"
+#define UINF_SIGN           "uinf"
+#define MOOV_SIGN           "moov"
+#define MVHD_SIGN           "mvhd"
+#define TRAK_SIGN           "trak"
+#define TKHD_SIGN           "tkhd"
+#define MDIA_SIGN           "mdia"
+#define MINF_SIGN           "minf"
+#define VMHD_SIGN           "vmhd"
+#define STBL_SIGN           "stbl"
+#define STSD_SIGN           "stsd"
+#define MJP2_SIGN           "mjp2"
+#define MDAT_SIGN           "mdat"
+#define ANY_SIGN 			""
+#define UNK_SIGN            ""
+
+/* the box structure itself */
+struct my_boxdef {
+
+        char                  value[5];                 /* hexadecimal value/string*/
+		char                  name[SHORT_DESCR_LEN];    /* short description       */
+		char                  descr[LONG_DESCR_LEN];    /* long  description       */
+		int                   sbox;                     /* is it a superbox?       */
+		int                   req[J2FILENUM];           /* mandatory box           */
+		my_j2boxtype             ins;                      /* contained in box...     */
+
+};
+
+/* the possible boxes */
+struct my_boxdef j2box[] =
+{
+/* sign */	{FILE_SIGN,
+/* short */	"placeholder for nothing",
+/* long */	"Nothing to say",
+/* sbox */	0,
+/* req */	{1, 1, 1},
+/* ins */	FILE_BOX},
+
+/* sign */	{JP_SIGN,
+/* short */	"JPEG 2000 Signature box",
+/* long */	"This box uniquely identifies the file as being part of the JPEG 2000 family of files",
+/* sbox */	0,
+/* req */	{1, 1, 1},
+/* ins */	FILE_BOX},
+
+/* sign */	{FTYP_SIGN,
+/* short */	"File Type box",
+/* long */	"This box specifies file type, version and compatibility information, including specifying if this file "
+			"is a conforming JP2 file or if it can be read by a conforming JP2 reader",
+/* sbox */	0,
+/* req */	{1, 1, 1},
+/* ins */	FILE_BOX},
+
+/* sign */	{JP2H_SIGN,
+/* short */	"JP2 Header box",
+/* long */	"This box contains a series of boxes that contain header-type information about the file",
+/* sbox */	1,
+/* req */	{1, 1, 1},
+/* ins */	FILE_BOX},
+
+/* sign */	{IHDR_SIGN,
+/* short */	"Image Header box",
+/* long */	"This box specifies the size of the image and other related fields",
+/* sbox */	0,
+/* req */	{1, 1, 1},
+/* ins */	JP2H_BOX},
+
+/* sign */	{COLR_SIGN,
+/* short */	"Colour Specification box",
+/* long */	"This box specifies the colourspace of the image",
+/* sbox */	0,
+/* req */	{1, 1, 1},
+/* ins */	JP2H_BOX},
+
+/* sign */	{JP2C_SIGN,
+/* short */	"Contiguous Codestream box",
+/* long */	"This box contains the codestream as defined by Annex A",
+/* sbox */	0,
+/* req */	{1, 1, 1},
+/* ins */	FILE_BOX},
+
+/* sign */	{JP2I_SIGN,
+/* short */	"Intellectual Property box",
+/* long */	"This box contains intellectual property information about the image",
+/* sbox */	0,
+/* req */	{0, 0, 0},
+/* ins */	FILE_BOX},
+
+/* sign */	{XML_SIGN,
+/* short */	"XML box",
+/* long */	"This box provides a tool by which vendors can add XML formatted information to a JP2 file",
+/* sbox */	0,
+/* req */	{0, 0, 0},
+/* ins */	FILE_BOX},
+
+/* sign */	{UUID_SIGN,
+/* short */	"UUID box",
+/* long */	"This box provides a tool by which vendors can add additional information to a file "
+			"without risking conflict with other vendors",
+/* sbox */	0,
+/* req */	{0, 0, 0},
+/* ins */	FILE_BOX},
+
+/* sign */	{UINF_SIGN,
+/* short */	"UUID Info box",
+/* long */	"This box provides a tool by which a vendor may provide access to additional information associated with a UUID",
+/* sbox */	0,
+/* req */	{0, 0, 0},
+/* ins */	FILE_BOX},
+
+/* sign */	{MOOV_SIGN,
+/* short */	"Movie box",
+/* long */	"This box contains the media data. In video tracks, this box would contain JPEG2000 video frames",
+/* sbox */	1,
+/* req */	{1, 1, 1},
+/* ins */	FILE_BOX},
+
+/* sign */	{MVHD_SIGN,
+/* short */	"Movie Header box",
+/* long */	"This box defines overall information which is media-independent, and relevant to the entire presentation "
+			"considered as a whole",
+/* sbox */	0,
+/* req */	{1, 1, 1},
+/* ins */	MOOV_BOX},
+
+/* sign */	{TRAK_SIGN,
+/* short */	"Track box",
+/* long */	"This is a container box for a single track of a presentation. A presentation may consist of one or more tracks",
+/* sbox */	1,
+/* req */	{1, 1, 1},
+/* ins */	MOOV_BOX},
+
+/* sign */	{TKHD_SIGN,
+/* short */	"Track Header box",
+/* long */	"This box specifies the characteristics of a single track. Exactly one Track Header Box is contained in a track",
+/* sbox */	0,
+/* req */	{1, 1, 1},
+/* ins */	TRAK_BOX},
+
+/* sign */	{MDIA_SIGN,
+/* short */	"Media box",
+/* long */	"The media declaration container contains all the objects which declare information about the media data "
+			"within a track",
+/* sbox */	1,
+/* req */	{1, 1, 1},
+/* ins */	TRAK_BOX},
+
+/* sign */	{MINF_SIGN,
+/* short */	"Media Information box",
+/* long */	"This box contains all the objects which declare characteristic information of the media in the track",
+/* sbox */	1,
+/* req */	{1, 1, 1},
+/* ins */	MDIA_BOX},
+
+/* sign */	{STBL_SIGN,
+/* short */	"Sample Table box",
+/* long */	"The sample table contains all the time and data indexing of the media samples in a track",
+/* sbox */	1,
+/* req */	{1, 1, 1},
+/* ins */	MINF_BOX},
+
+/* sign */	{STSD_SIGN,
+/* short */	"Sample Description box",
+/* long */	"The sample description table gives detailed information about the coding type used, and any initialization "
+			"information needed for that coding",
+/* sbox */	0,
+/* req */	{1, 1, 1},
+/* ins */	MINF_BOX},
+
+/* sign */	{MJP2_SIGN,
+/* short */	"MJP2 Sample Description box",
+/* long */	"The MJP2 sample description table gives detailed information about the coding type used, and any initialization "
+			"information needed for that coding",
+/* sbox */	0,
+/* req */	{1, 1, 1},
+/* ins */	MINF_BOX},
+
+/* sign */	{MDAT_SIGN,
+/* short */	"Media Data box",
+/* long */	"The meta-data for a presentation is stored in the single Movie Box which occurs at the top-level of a file",
+/* sbox */	1,
+/* req */	{1, 1, 1},
+/* ins */	FILE_BOX},
+
+/* sign */	{ANY_SIGN,
+/* short */	"Any box",
+/* long */	"All the existing boxes",
+/* sbox */	0,
+/* req */	{0, 0, 0},
+/* ins */	FILE_BOX},
+
+/* sign */	{UNK_SIGN,
+/* short */	"Unknown Type box",
+/* long */	"The signature is not recognised to be that of an existing box",
+/* sbox */	0,
+/* req */	{0, 0, 0},
+/* ins */	ANY_BOX}
+
+};
+
+/* declaration */
+int
+my_box_handler_function(my_j2boxtype boxtype, wxInputStream& stream, unsigned long int filepoint, unsigned long int filelimit, int level,
+					 char *scansign, unsigned long int *scanpoint);
+
+#ifdef __WXMSW__
+typedef unsigned __int64 int8byte;
+#endif // __WXMSW__
+
+#ifdef __WXGTK__
+typedef unsigned long long int8byte;
+#endif // __WXGTK__
+
+/* internal mini-search for a box signature */
+int
+my_jpeg2000parse(wxInputStream& stream, unsigned long int filepoint, unsigned long int filelimit, int level,
+			  char *scansign, unsigned long int *scanpoint)
+{
+	unsigned long int       LBox = 0x00000000;
+	//int                     LBox_read;
+	char                    TBox[5] = "\0\0\0\0";
+	//int                     TBox_read;
+	int8byte                 XLBox = 0x0000000000000000;
+	//int                     XLBox_read;
+	unsigned long int       box_length = 0;
+	int                     last_box = 0, box_num = 0;
+	int                     box_type = ANY_BOX;
+	unsigned char           /*onebyte[1], twobytes[2],*/ fourbytes[4];
+	int                     box_number = 0;
+
+	/* cycle all over the file */
+	box_num = 0;
+	last_box = 0;
+	while (!last_box) {
+
+		/* do not exceed file limit */
+		if (filepoint >= filelimit)
+			return (0);
+
+		/* seek on file */
+		if (stream.SeekI(filepoint, wxFromStart) == wxInvalidOffset)
+			return (-1);
+
+		/* read the mandatory LBox, 4 bytes */
+		if (!stream.Read(fourbytes, 4)) {
+			(wxT("Problem reading LBox from the file (file ended?)"));
+			return -1;
+		};
+		LBox = STREAM_TO_UINT32(fourbytes, 0);
+
+		/* read the mandatory TBox, 4 bytes */
+		if (!stream.Read(TBox, 4)) {
+			wxLogError(wxT("Problem reading TBox from the file (file ended?)"));
+			return -1;
+		};
+
+		/* look if scansign is got */
+		if ((scansign != NULL) && (memcmp(TBox, scansign, 4) == 0)) {
+			/* hack/exploit */
+			// stop as soon as you find the level-th codebox
+			if (box_number == level) {
+				memcpy(scansign, "    ", 4);
+				*scanpoint = filepoint;
+				return (0);
+			} else
+				box_number++;
+
+		};
+
+
+		/* determine the box type */
+		for (box_type = JP_BOX; box_type < UNK_BOX; box_type++)
+			if (memcmp(TBox, j2box[box_type].value, 4) == 0)
+				break;	
+
+		/* read the optional XLBox, 8 bytes */
+		if (LBox == 1) {
+
+			if (!stream.Read(&XLBox, 8)) {
+				wxLogError(wxT("Problem reading XLBox from the file (file ended?)"));
+				return -1;
+			};
+			box_length = (unsigned long int) BYTE_SWAP8(XLBox);
+
+		} else if (LBox == 0x00000000) {
+
+			/* last box in file */
+			last_box = 1; 
+			box_length = filelimit - filepoint;
+
+		} else
+
+			box_length = LBox;
+
+
+		/* go deep in the box */
+		my_box_handler_function((my_j2boxtype) box_type, stream, (LBox == 1) ? (filepoint + 16) : (filepoint + 8), filepoint + box_length, level,
+			scansign, scanpoint);
+
+		/* if it's a superbox go inside it */
+		if (j2box[box_type].sbox)
+			my_jpeg2000parse(stream, (LBox == 1) ? (filepoint + 16) : (filepoint + 8), filepoint + box_length,
+				level, scansign, scanpoint);
+
+		/* increment box number and filepoint*/
+		box_num++;
+		filepoint += box_length;
+
+	};
+
+	/* all good */
+	return (0);
+}
+
+// search first contiguos codestream box in an mj2 file
+unsigned long int
+searchjp2c(wxInputStream& stream, unsigned long int fsize, int number)
+{
+	char scansign[] = "jp2c";
+	unsigned long int scanpoint = 0L;
+
+	wxLogMessage(wxT("MJ2: searching jp2c box... "));
+
+	/* do the parsing */
+	if (my_jpeg2000parse(stream, 0, fsize, number, scansign, &scanpoint) < 0)		
+		wxLogMessage(wxT("MJ2: Unrecoverable error during file parsing: stopping"));
+
+	if (strcmp(scansign, "    "))
+		wxLogMessage(wxT("MJ2: not found"));
+	else {
+
+		wxLogMessage(wxString::Format(wxT("MJ2: found at byte %d"), scanpoint));
+
+	};
+
+
+	return (scanpoint);
+}
+
+// search the jp2h box in the file
+unsigned long int
+searchjpegheaderbox(wxInputStream& stream, unsigned long int fsize)
+{
+	char scansign[] = "jp2h";
+	unsigned long int scanpoint = 0L;
+
+	wxLogMessage(wxT("MJ2: searching jp2h box... "));
+
+	/* do the parsing */
+	if (my_jpeg2000parse(stream, 0, fsize, 0, scansign, &scanpoint) < 0)		
+		wxLogMessage(wxT("Unrecoverable error during file parsing: stopping"));
+
+	if (strcmp(scansign, "    "))
+		wxLogMessage(wxT("MJ2: not found"));
+	else
+		wxLogMessage(wxString::Format(wxT("MJ2: found at byte %d"), scanpoint));
+
+	return (scanpoint);
+}
+
+/* handling functions */
+#define ITEM_PER_ROW	10
+
+/* Box handler function */
+int
+my_box_handler_function(my_j2boxtype boxtype, wxInputStream& stream, unsigned long int filepoint, unsigned long int filelimit, int level,
+					 char *scansign, unsigned long int *scanpoint)
+{
+	switch (boxtype) {
+
+			/* Sample Description box */
+	case (STSD_BOX):
+		my_jpeg2000parse(stream, filepoint + 8, filelimit, level, scansign, scanpoint);
+		break;
+
+			/* MJP2 Sample Description box */
+	case (MJP2_BOX):
+		my_jpeg2000parse(stream, filepoint + 78, filelimit, level, scansign, scanpoint);
+		break;
+		
+	/* not yet implemented */
+	default:
+		break;
+
+	};
+
+	return (0);
+}
+
+// the jP and ftyp parts of the header
+#define my_jPheadSIZE	32
+unsigned char my_jPhead[my_jPheadSIZE] = {
+		0x00, 0x00, 0x00, 0x0C,  'j',  'P',  ' ',  ' ',
+		0x0D, 0x0A, 0x87, 0x0A, 0x00, 0x00, 0x00, 0x14,
+		 'f',  't',  'y',  'p',  'j',  'p',  '2',  ' ',
+		0x00, 0x00, 0x00, 0x00,  'j',  'p',  '2',  ' '			
+};
+
+/////////////////////////////////////////////////
+/////////////////////////////////////////////////
+
+// load the mj2 file format
+bool wxMJ2Handler::LoadFile(wxImage *image, wxInputStream& stream, bool verbose, int index)
+{
+	opj_dparameters_t parameters;	/* decompression parameters */
+	opj_event_mgr_t event_mgr;		/* event manager */
+	opj_image_t *opjimage = NULL;
+	unsigned char *src = NULL;
+    unsigned char *ptr;
+	int file_length, jp2c_point, jp2h_point;
+	unsigned long int jp2hboxlen, jp2cboxlen;
+
+	// destroy the image
+    image->Destroy();
+
+	/* handle to a decompressor */
+	opj_dinfo_t* dinfo = NULL;	
+	opj_cio_t *cio = NULL;
+
+	/* configure the event callbacks (not required) */
+	memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
+	event_mgr.error_handler = mj2_error_callback;
+	event_mgr.warning_handler = mj2_warning_callback;
+	event_mgr.info_handler = mj2_info_callback;
+
+	/* set decoding parameters to default values */
+	opj_set_default_decoder_parameters(&parameters);
+
+	/* prepare parameters */
+	strncpy(parameters.infile, "", sizeof(parameters.infile)-1);
+	strncpy(parameters.outfile, "", sizeof(parameters.outfile)-1);
+	parameters.decod_format = JP2_CFMT;
+	parameters.cod_format = BMP_DFMT;
+	if (m_reducefactor)
+		parameters.cp_reduce = m_reducefactor;
+	if (m_qualitylayers)
+		parameters.cp_layer = m_qualitylayers;
+	/*if (n_components)
+		parameters. = n_components;*/
+
+	/* JPWL only */
+#ifdef USE_JPWL
+	parameters.jpwl_exp_comps = m_expcomps;
+	parameters.jpwl_max_tiles = m_maxtiles;
+	parameters.jpwl_correct = m_enablejpwl;
+#endif /* USE_JPWL */
+
+	/* get a decoder handle */
+	dinfo = opj_create_decompress(CODEC_JP2);
+
+	/* find length of the stream */
+	stream.SeekI(0, wxFromEnd);
+	file_length = (int) stream.TellI();
+
+	/* search for the first codestream box and the movie header box  */
+	jp2c_point = searchjp2c(stream, file_length, m_framenum);
+	jp2h_point = searchjpegheaderbox(stream, file_length);
+
+	// read the jp2h box and store it
+	stream.SeekI(jp2h_point, wxFromStart);
+	stream.Read(&jp2hboxlen, sizeof(unsigned long int));
+	jp2hboxlen = BYTE_SWAP4(jp2hboxlen);
+
+	// read the jp2c box and store it
+	stream.SeekI(jp2c_point, wxFromStart);
+	stream.Read(&jp2cboxlen, sizeof(unsigned long int));
+	jp2cboxlen = BYTE_SWAP4(jp2cboxlen);
+
+	// malloc memory source
+    src = (unsigned char *) malloc(my_jPheadSIZE + jp2hboxlen + jp2cboxlen);
+
+	// copy the jP and ftyp
+	memcpy(src, my_jPhead, my_jPheadSIZE);
+
+	// copy the jp2h
+	stream.SeekI(jp2h_point, wxFromStart);
+	stream.Read(&src[my_jPheadSIZE], jp2hboxlen);
+
+	// copy the jp2c
+	stream.SeekI(jp2c_point, wxFromStart);
+	stream.Read(&src[my_jPheadSIZE + jp2hboxlen], jp2cboxlen);
+
+	/* catch events using our callbacks and give a local context */
+	opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, stderr);
+
+	/* setup the decoder decoding parameters using user parameters */
+	opj_setup_decoder(dinfo, &parameters);
+
+	/* open a byte stream */
+	cio = opj_cio_open((opj_common_ptr)dinfo, src, my_jPheadSIZE + jp2hboxlen + jp2cboxlen);
+
+	/* decode the stream and fill the image structure */
+	opjimage = opj_decode(dinfo, cio);
+	if (!opjimage) {
+		wxMutexGuiEnter();
+		wxLogError(wxT("MJ2: failed to decode image!"));
+		wxMutexGuiLeave();
+		opj_destroy_decompress(dinfo);
+		opj_cio_close(cio);
+		free(src);
+		return false;
+	}
+
+	/* close the byte stream */
+	opj_cio_close(cio);
+
+	/* common rendering method */
+#include "imagjpeg2000.cpp"
+
+    wxMutexGuiEnter();
+    wxLogMessage(wxT("MJ2: image loaded."));
+    wxMutexGuiLeave();
+
+	/* close openjpeg structs */
+	opj_destroy_decompress(dinfo);
+	opj_image_destroy(opjimage);
+	free(src);
+
+	if (!image->Ok())
+		return false;
+	else
+		return true;
+
+}
+
+// save the mj2 file format
+bool wxMJ2Handler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbose )
+{
+    wxLogError(wxT("MJ2: Couldn't save movie -> not implemented."));
+    return false;
+}
+
+#ifdef __VISUALC__
+    #pragma warning(default:4611)
+#endif /* VC++ */
+
+// recognize the Motion JPEG 2000 starting box
+bool wxMJ2Handler::DoCanRead( wxInputStream& stream )
+{
+    unsigned char hdr[24];
+
+    if ( !stream.Read(hdr, WXSIZEOF(hdr)) )
+        return false;
+
+    return (hdr[0] == 0x00 &&
+			hdr[1] == 0x00 &&
+			hdr[2] == 0x00 &&
+			hdr[3] == 0x0C &&
+			hdr[4] == 0x6A &&
+			hdr[5] == 0x50 &&
+			hdr[6] == 0x20 &&
+			hdr[7] == 0x20 &&
+			hdr[20] == 0x6D &&
+			hdr[21] == 0x6A &&
+			hdr[22] == 0x70 &&
+			hdr[23] == 0x32);
+}
+
+#endif   // wxUSE_STREAMS
+
+#endif   // wxUSE_LIBOPENJPEG

OPJViewer/source/imagmj2.h

@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2007, Digital Signal Processing Laboratory, Universit<69> degli studi di Perugia (UPG), Italy
+ * 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.
+ */
+/////////////////////////////////////////////////////////////////////////////
+// Name:        imagmj2.h
+// Purpose:     wxImage Motion JPEG 2000 file format handler
+// Author:      G. Baruffa - based on imagjpeg.h, Vaclav Slavik
+// RCS-ID:      $Id: imagmj2.h,v 0.0 2007/02/18 23:45:00 VZ Exp $
+// Copyright:   (c) Giuseppe Baruffa
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_IMAGMJ2_H_
+#define _WX_IMAGMJ2_H_
+
+#include "wx/defs.h"
+
+//-----------------------------------------------------------------------------
+// wxMJ2Handler
+//-----------------------------------------------------------------------------
+
+#if wxUSE_LIBOPENJPEG
+
+#include "wx/image.h"
+#include "libopenjpeg/openjpeg.h"
+
+#define wxBITMAP_TYPE_MJ2	49
+
+class WXDLLEXPORT wxMJ2Handler: public wxImageHandler
+{
+public:
+    inline wxMJ2Handler()
+    {
+        m_name = wxT("Motion JPEG 2000 file format");
+        m_extension = wxT("mj2");
+        m_type = wxBITMAP_TYPE_MJ2;
+        m_mime = wxT("image/mj2");
+
+		m_reducefactor = 0;
+		m_qualitylayers = 0;
+		m_components = 0;
+#ifdef USE_JPWL
+		m_enablejpwl = true;
+		m_expcomps = JPWL_EXPECTED_COMPONENTS;
+		m_maxtiles = JPWL_MAXIMUM_TILES;
+#endif // USE_JPWL
+    }
+
+		// decoding engine parameters
+		int m_reducefactor, m_qualitylayers, m_components, m_framenum;
+#ifdef USE_JPWL
+		bool m_enablejpwl;
+		int m_expcomps, m_maxtiles;
+#endif // USE_JPWL
+
+#if wxUSE_STREAMS
+    virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 );
+    virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true );
+protected:
+    virtual bool DoCanRead( wxInputStream& stream );
+#endif
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxMJ2Handler)
+};
+
+#endif // wxUSE_LIBOPENJPEG
+
+#endif // _WX_IMAGMJ2_H_
+

OPJViewer/source/license.txt

@@ -0,0 +1,14 @@
+Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+Copyright (c) 2002-2007, Professor Benoit Macq
+Copyright (c) 2001-2003, David Janssens
+Copyright (c) 2002-2003, Yannick Verschueren
+Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+Copyright (c) 2005, Herve Drolon, FreeImage Team
+Copyright (c) 2007, Digital Signal Processing Laboratory, Universit<69> degli studi di Perugia (UPG), Italy
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditionsare 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.

OPJViewer/source/opj_logo.xpm

@@ -0,0 +1,285 @@
+/* XPM */
+static char *opj_logo[] = {
+/* columns rows colors chars-per-pixel */
+"90 61 218 2",
+"   c #BE3D12",
+".  c #BF461D",
+"X  c #AD5435",
+"o  c #B64925",
+"O  c #B54E2B",
+"+  c #BC4620",
+"@  c #BB4B25",
+"#  c #BC4E29",
+"$  c #B5502F",
+"%  c #BD512C",
+"&  c #B45334",
+"*  c #B35638",
+"=  c #B45B3D",
+"-  c #BB5533",
+";  c #BE5937",
+":  c #BC5C3D",
+">  c #9C766A",
+",  c #AD5D42",
+"<  c #B55F41",
+"1  c #BA5E40",
+"2  c #A7634D",
+"3  c #A76C57",
+"4  c #AA6750",
+"5  c #AC6B56",
+"6  c #AA6E5A",
+"7  c #A4705E",
+"8  c #B46045",
+"9  c #B1644B",
+"0  c #BD6244",
+"q  c #B96448",
+"w  c #BC694D",
+"e  c #B36B53",
+"r  c #B26E58",
+"t  c #BB6C52",
+"y  c #B2725D",
+"u  c #BD7056",
+"i  c #BB745C",
+"p  c #A67566",
+"a  c #A57B6D",
+"s  c #AE7562",
+"d  c #AB7867",
+"f  c #AA7C6C",
+"g  c #A07E73",
+"h  c #AA7F71",
+"j  c #B37661",
+"k  c #B47863",
+"l  c #B27D6B",
+"z  c #BB7863",
+"x  c #BA7E69",
+"c  c #C73605",
+"v  c #C63A0B",
+"b  c #CB3300",
+"n  c #CA3807",
+"m  c #C93A0A",
+"M  c #C43E11",
+"N  c #C93E10",
+"B  c #C44115",
+"V  c #C3441A",
+"C  c #C4481E",
+"Z  c #CA4113",
+"A  c #C94519",
+"S  c #CB481C",
+"D  c #C24A23",
+"F  c #C24F28",
+"G  c #CD4D23",
+"H  c #C4522D",
+"J  c #CB532B",
+"K  c #C25632",
+"L  c #C35936",
+"P  c #C25C3B",
+"I  c #C85630",
+"U  c #CB5933",
+"Y  c #CB5E3A",
+"T  c #D05026",
+"R  c #CC613D",
+"E  c #C26343",
+"W  c #C46748",
+"Q  c #C1694C",
+"!  c #CD6744",
+"~  c #CA6C4D",
+"^  c #C37155",
+"/  c #C4755B",
+"(  c #CB7356",
+")  c #C8765B",
+"_  c #D06D4C",
+"`  c #D07253",
+"'  c #D47B5E",
+"]  c #C37B63",
+"[  c #C27E68",
+"{  c #C97F68",
+"}  c #A68175",
+"|  c #A48479",
+" . c #AD8172",
+".. c #AD8578",
+"X. c #AB897D",
+"o. c #B1806F",
+"O. c #BA816F",
+"+. c #B38373",
+"@. c #B58778",
+"#. c #B3897B",
+"$. c #BA8472",
+"%. c #BB8C7C",
+"&. c #C2816B",
+"*. c #CD846C",
+"=. c #C38470",
+"-. c #C38976",
+";. c #C38D7B",
+":. c #CC8973",
+">. c #CF8F7A",
+",. c #CB907D",
+"<. c #D1937F",
+"1. c #948E8C",
+"2. c #9D8C86",
+"3. c #9D8F89",
+"4. c #96908E",
+"5. c #9C918D",
+"6. c #949392",
+"7. c #9B9492",
+"8. c #9D9997",
+"9. c #9D9C9C",
+"0. c #A38B83",
+"q. c #AA8D83",
+"w. c #A4918B",
+"e. c #AC9087",
+"r. c #AB938C",
+"t. c #A49590",
+"y. c #A29996",
+"u. c #A19D9C",
+"i. c #AA9790",
+"p. c #AC9994",
+"a. c #AC9E99",
+"s. c #B18D81",
+"d. c #B59084",
+"f. c #B49389",
+"g. c #BA9184",
+"h. c #B89589",
+"j. c #BA988D",
+"k. c #B29B93",
+"l. c #BC9C92",
+"z. c #ACA19D",
+"x. c #B1A19D",
+"c. c #BCA39B",
+"v. c #A3A3A3",
+"b. c #ABA5A3",
+"n. c #AEA9A7",
+"m. c #ABABAA",
+"M. c #B3A5A1",
+"N. c #B3A9A6",
+"B. c #B3ADAA",
+"V. c #B9A6A0",
+"C. c #B9AAA5",
+"Z. c #BAADA9",
+"A. c #B4B0AF",
+"S. c #BAB0AD",
+"D. c #B4B3B3",
+"F. c #BAB5B3",
+"G. c #BDB8B6",
+"H. c #BBBBBB",
+"J. c #C39384",
+"K. c #C0978A",
+"L. c #C2998B",
+"P. c #CA9483",
+"I. c #CD9A8A",
+"U. c #C19D92",
+"Y. c #D69B89",
+"T. c #DB9680",
+"R. c #C2A095",
+"E. c #C4A69C",
+"W. c #CCA193",
+"Q. c #C8A599",
+"!. c #CBA99D",
+"~. c #C6AEA6",
+"^. c #CCACA2",
+"/. c #CBB2AB",
+"(. c #C3B8B5",
+"). c #C2BDBC",
+"_. c #C9B9B3",
+"`. c #D3ADA0",
+"'. c #D3B4A9",
+"]. c #DCB2A4",
+"[. c #DEB6A8",
+"{. c #D1BFB9",
+"}. c #D9BEB5",
+"|. c #C5C0BE",
+" X c #CDC0BC",
+".X c #D2C1BB",
+"XX c #DDC3BB",
+"oX c #E0C5BC",
+"OX c #E0C8BF",
+"+X c #C2C2C2",
+"@X c #CBC4C2",
+"#X c #CDC8C6",
+"$X c #CCCBCB",
+"%X c #D2C6C2",
+"&X c #D1CECD",
+"*X c #DDC8C1",
+"=X c #DECFCA",
+"-X c #D9D1CE",
+";X c #D3D3D3",
+":X c #D9D5D4",
+">X c #DED9D7",
+",X c #DBDBDB",
+"<X c #E1CAC3",
+"1X c #E2CFC8",
+"2X c #E1D3CE",
+"3X c #E2D5D0",
+"4X c #E5D8D3",
+"5X c #E4DDDB",
+"6X c #E8DBD6",
+"7X c #EADEDA",
+"8X c #E6E0DE",
+"9X c #EBE0DC",
+"0X c #E4E4E4",
+"qX c #E8E2E0",
+"wX c #EBEBEB",
+"eX c #F0EAE8",
+"rX c #F3F3F3",
+"tX c #FEFEFE",
+/* pixels */
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXrXrXtXrXrXrXrXrXrXrXtXrXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXrXtXrXrXrXwXwXrXwXrXrXrXrXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXrXrXrXwXwX0X0XqX0X0X0X0XwXwXwXrXrXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtXtXrXtXrXwXwX2X[.[.].].].].].1XwXrXwXrXrXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXrXrXrXwX0X0XL.J b b b b b b b J '.0X0XwXwXrXrXrXrXrXrXrXrXrXrXtXrXrXrXtXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXtXtXrXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtXrXrXwX0XXXt m b m B V N b b v >.;X0XwXwXwXwXrXwXwXrXrXrXrXtXrXtXrXrXrXwXrXrXrXrXrXrXrXrXrXrXrXwXrXrXwXrXrXrXtXtXrXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXrXrXrX0X,X'.S b b P l.z.M.k.w n b b g.;X,X,X,X0X0X0X0X0XwXwXwXwXwXwXwXwXwX0X0X0XwX0X0XwXwXwXwX0X0X0X0X0X0XwXwXwXwXrXrXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXrXrXrXwX0X:XT.m b A ] G.D.D.m.$.m b b $.$X&X.X}.XX>XOX}.oXXX<X0X0XwXwXwX0X2XXXoXXXoXOX5X0XwX0X1XoXXX5X*X}.}.oX<XqXrXrXrXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXrXrXwX0X,XL.b b D M.H.D.D.D.D.m.L b b W H.Z.# b Y / m b b b Z P.:X:X:X$X:.Z b b b b n :.;X;X;XR b A &.Z b b b b *.wXwXrXrXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXrXwX0X:X$.b b E B.H.H.D.D.D.D.P b b E H.V.. b U L v v n b b ( #X;X$X~.Y b m N m b b ! {.&X#XI b C R v v n b b ! 0XwXrXrXrXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXrXwX0X:X!.A b Z F.H.H.H.H.H.D.m.L b b e b.+.b b V k i.r.t n b b s.H.x v b L q.b.p.D b b t F.$.n b M l a.M.y b b A :X0XwXrXrXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXrXwX0X:XL.m b D H.).H.+XH.H.H.D.H b b 6 v.j b b - a.A.m.@.m b b h D.< b b w z.b.b.P b b q B.z b b @ B.D.m...v b G :X,XwXwXrXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXwX0X,X&X/ b b , D.H.+X+X+X+XH.f.B b b 5.8.M b M w.v.v.v.r.D b b h l v b b M     V v b b q u.X b n @.v.m.v.j b b Q &X,X0XwXrXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXwX0X,X$X^ b b , H.H.+X+XH.H.H.s.N b n 7.7.v b B 8.v.v.v.w.M b b g r b b b n n n b b b b e y.O b n X.m.v.n.e b b u &X,X0XrXrXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXrX0X,X$X/ b b + F.H.H.H.+XH.d.b b M | 8.> c b @ 9.v.9.u., b b - 3.& b b 7 1.1.4.4.4.6.7.9.w.m b + t.v.m.p.D b b K.;X,X0XwXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXwX0X,X$X-.b b b i D.H.G.H.J.N b b = 9.9.5 c b B 7.9.v.y.b b m f 4.O b b 3 6.6.6.g 9 4 h u.h b b - b.m.m.s.b b N ~.;X,X0XwXrXrXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXwX0X,X;XE.G b b I z ] ] ] W n b H l 9.8.9 b b m e 6 r e b b # 0.y.< b b O 6 p 6 < # ; q.v.t b b 0 n.A.A.+.b b H _.;X,XwXwXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXwXwX,X;X#Xf.b b b b b b b b b - a.v.v.w.@ b b v b b b b b @ b.m.v.w.M b b b b b b v ..m.n.A b n g.H.H.H.4 b b [ &X,X0XwXrXrXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXwXwX0X:X$XZ.Q H v n b m B H E x n.m.m.q.B b v < . v N + E z m.m.m.b.e - M m v M - t k.D.m.; # - V.H.+XH.s # # K.:X,X0XwXrXrXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXrXwXwX,X,X$X+XG.Z.Z.B.C.S.F.H.H.H.D.D.j b b q v.b.a.n.B.H.H.+X+X+XH.H.D.Z.C.Z.Z.F.H.H.+X+XH.).H.$X&X&X;X$X#X#X:X,X0XwXrXrXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXrXrXwX0X,X;X#X+X+X+XH.H.+X+X+XH.H.H.D.e b n i n.m.D.H.H.+X#X$X$X+X+X+X+XH.H.H.H.+X+X+X$X&X&X&X$X;X;X;X:X;X:X,X,X0XwXwXrXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXrXrXwXwX,X,X;X;X$X$X$X;X;X&X;X$X#X+XF b v s.H.H.+X$X&X;X;X,X,X,X;X:X;X;X;X;X;X;X:X,X,X,X0X,X0X,X0X0X0X0X0X0X0XwXwXrXtXrXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXrXtXrXwXwX0X,X:X;X;X;X;X;X:X;X;X;X$X+XC b B k.+X+X$X$X;X,X,X0X0X0X0X0X;X,X,X,X,X,X,X,X,X0X0X0X0X0X0XwX0X0X0XwXwXrXrXrXrXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXrXrXrXrXwXwXwX0X0X0X0X0X0X0X,X,X:X^.^.!.$X$X;X,X,X0XwXwXwXwXwXwXwXwX0X0X0X0XwXwXwXwXwXwXrXrXwXrXrXrXrXrXrXrXrXrXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtXrXrXrXrXwXwXwXwX0XwXwXwX0X0X,X:X;X$X&X&X;X,X,X0XwXwXwXrXrXrXrXrXwXwXwXwXwXwXwXrXrXrXwXrXrXrXrXrXrXrXrXrXrXtXrXtXtXrXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXrXrXrXrXrXrXrXrXrXwXwXwXwX0X,X0X0X0XwXwXrXrXrXrXrXrXrXrXrXrXrXrXrXrXwXrXrXrXrXrXtXrXrXrXtXrXrXrXrXrXrXrXrXrXtXtXtXrXrXtXtXtXtXrXrXtXrXrXtXrXtXrXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXrXtXtXrXtXrXrXrXrXrXrXwXwXwX0XwX0XwXwXwXrXrXrXtXtXrXrXrXrXrXrXrXrXwXrXwXrXwXwXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXtXrXrXtXtXrXrXrXrXrXrXrXrXrXrXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXrXrXrXwXrXrXrXrXrXrXtXrXtXrXrXrXrXrXwXwXwXwXwX0X0XwX0XwXwXwXwXwXwXwXrXwXwXwX0X0X0X0XwX0XwXwXrXrXrXwXrXwXwXwX0XwX0XwXwXwXrXrXrXrXtXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXrXrXrXrXrXrXrXrXtXtXrXrXtXrXrXeX7X7X9XwXwXwX5X3X3X3X2X2X2X5X0XwXwXwXwXwX8X3X3X2X2X2X2X2X3X6X6X7XwXwXwXwXwXwX7X1XXXOXOX1X8XwXwXrXrXrXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXrXtXtXtXrXrXrXwXT.T T :.,X,X-X` G G G G G G U _ J.-X,X,X,X[ G G G G G G G G G G _ >XwX0X,X&XI.R N b b b m ! `.5XwXrXrXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXrXtXtXtXrXtXrXrXrXwX0X' b b ] >X,X%XJ b b b b b b b b Q {.:X;X:Xq b b b b b b b b b b Y >X0X,X-X'.^ n b b b b b m *.1XwXwXrXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXrXrX0X0X%XL b b L.@X+X-.b b M L L L D b b b M V.+X(.N b b D H H H H H U U W.;X&X^.H b b n W -.-.W n b b J &XwXrXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXrXwXwX0X XF b b U.+X+X[ b b D z z j P v b b N U.H.S.m b m E Q t ^ ) / ) ) /.$X$X;.m b n A %.H.H.J.N b b N .XwXwXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXrXwXwX,X:X!.m b L N.D.m.* b b y v.v.v.v.p.n b M f.m.w b b D u.v.m.m.D.G.H.H.+X).g.b b B j.F.D.D.D.D.l.; F I /.0XwXrXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXrXrXwX,X:XU.n b E B.A.n.$ b b s v.9.v.v.r.n n M r.b.1 b b D u.v.m.m.D.D.H.H.).H.k b b # M.G.D.D.D.D.Z.t w u _.0XwXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXrXrXwXwX,X;X$XJ b m h b.v.i.m b M a 5.5.2.p M b c < 8.2.+ b b M o o o o # % j G.H.g.m b A M.D.D.D.B.M.M.M.M.Z.(.:X0XwXrXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXrXrXrXrXrXwX,X,X&X(.n b M 0.v.v.s b b b b b n b b c b M u.v.g M b b b b b b b b b i G.D.0 b b 8 D.D.H.G.P n b b n b U :X,XwXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXrXrXrXrXwX0X,X;X$XV.n b M w.v.9.< b b b b b b b b c H r 9.v.a n b   * < < w w Q Q g.D.B.: b b r D.D.D.m.C b b b b b ) ;X0XwXrXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXrXrXrXrX6XP.=.K.;X#X+Xx n b D v.u.7.. b b M D . D & 2 q.b.b.v.v.< b b X 6.9.9.b.m.D.D.D.D.n.# b b f D.D.D.b.= 1 * N b n !.;X,XwXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXrXtXrXrXwX<X~ P x $X+XH.z b b - v.v.3.M b b < r r r k 0.a.m.m.m.v.# b b , 6.9.v.m.D.D.D.H.D.z.O b b s D.D.D.N.f l 9 v b M ~.;X,XwXrXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXrXtXrXwX0XY.n b e H.H.V.F b b p b.v.h v b v v.m.A.D.H.+X+X+XH.D.p.b b m p 9.v.m.D.D.H.H.H.D.N.- b b - m.A.D.A.m.a.B b b - (.:X0XwXrXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXrXwXwX0XY.n b ; Z.C.$.A b v 0.m.m.l n b M m.D.D.H.+X#X+X+XH.H.r.b b m < d l l l $.;.J.V.H.B.w b b C @.s.a.k.#.j n b b : ).:X,XwXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXrXrXwXwX0X'.N b b A B n b n z m.D.B.0 b b 9 H.H.+X$X;X:X;X$X$X+Xl b b b b b b b b b b b s.H.H.B.H b b b n Z Z b b V n b ] $X:X0XwXrXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXrXwX0X,X.XR b b b b b A P d.D.D.C.H b b j H.$X$X;X:X,X,X;X;X+X/ b b b b b b b b b b b a.H.H.D.u G b b b b b B H : v m ;.$X,XwXwXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXrXwXwX,X:X Xg.j 5 y s.C.H.H.+X+X|.E.Q.Q. X;X;X,X0XwXwX0X0X,X;X/.U.j.h.g.f.h.j.U.U.U.!.$X$X+X+XH.Z.g.y 4 6 l x.D.A.l.~.#X,X0XwXrXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXrXrXrXwX0X:X$XG.k.e.f.B.H.H.+X$X$X$X#X$X$X;X;X,X0XwXwXwXwX0X0X;X$X+XH.D.D.D.F.H.+X+X#X&X$X;X$X$X+X+XA.r.X.e.a.H.H.H.+X+X;X,X0XwXrXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXrXrXwX,X,X$X&X$X$X$X$X;X;X,X,X,X,X,X,X0XwXwXwXrXtXrXrXwXwX0X,X;X$X$X+X$X$X$X;X;X:X,X,X,X,X,X;X$X&X#X#X$X$X$X$X$X;X,X,X0XwXrXrXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXrXrXwXwX0X,X:X;X;X$X;X;X:X,X,X0X0X,X0X0X0XwXwXwXrXrXtXrXrXwXwX0X;X;X$X&X$X$X&X:X,X,X,X,X0X,X,X:X;X;X$X$X$X$X$X;X:X,X,X0XwXwXrXrXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXrXtXrXwXwXwX0X0X0X0X0X0XwXwXwXwXwXwXwXwXrXwXrXtXtXrXtXtXrXrXrXwX0X0X0X0X,X,X0X0X0X0XwXwXwXwXwXwX0X0X0X,X,X,X,X0X0XwXwXwXrXtXrXtXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXrXrXrXrXwXwX0X0X0X0X0XwXwXwXrXwXrXrXrXrXrXtXrXtXtXtXtXrXrXrXwXwXwX0X0X0X0X0X0X0XwXwXwXwXwXwXwXwXwX0X0X0X0XwXwXwXwXwXrXrXrXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXrXtXrXrXrXrXrXrXrXrXrXrXtXtXrXtXtXrXtXtXtXtXtXtXtXrXtXrXtXrXrXrXrXwXwXrXrXrXrXrXrXrXtXrXrXrXrXrXrXrXwXrXrXrXrXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXrXtXrXrXrXrXrXrXtXtXrXtXrXtXrXrXtXtXtXtXtXtXtXtXtXtXtXrXrXrXrXrXrXrXrXrXrXrXtXtXrXtXrXrXtXrXrXrXrXrXrXrXrXtXrXrXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX",
+"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX"
+};

OPJViewer/source/readmeafter.txt

@@ -0,0 +1,34 @@
+This viewer is conceived to open and display information and image content of J2K, JP2,
+and MJ2 files.
+The viewer application interface is divided into three main panels:
+- a browsing pane;
+- a viewing pane;
+- a log/peek pane.
+
+The browsing pane will present the markers or boxes hierarchy, with position (byte number where marker/box starts and stops) and length information (i.e., inner length as signalled by marker/box and total length, with marker/box sign included), in the following form:
+
+filename
+|
+|_ #000: Marker/Box short name (Hex code)
+|  |
+|  |_ *** Marker/Box long name ***
+|  |_ startbyte > stopbyte, inner_length + marker/box sign length (total length)
+|  |_ Additional info, depending on the marker/box type
+|  |_ ...
+|
+|_ #001: Marker/Box short name (Hex code)
+|  |
+|  |_ ...
+|
+...
+
+
+The viewing pane will display the decoded image contained in the JPEG 2000 file.
+It should display correctly images as large as 4000x2000, provided that a couple of GB of RAM are available. Nothing is known about the display of larger sizes: let us know if you manage to get it working.
+
+
+The log/peek pane is shared among two different subpanels:
+
+- the log panel will report a lot of debugging info coming out from the wx GUI as well as from the openjpeg library
+- the peek pane tries to give a peek on the codestream/file portion which is currently selected in the browsing pane. It shows both hex and ascii values corresponding to the marker/box section. 
+

OPJViewer/source/readmebefore.txt

@@ -0,0 +1,11 @@
+What is OpenJPEG ?
+==================
+The OpenJPEG library is an open-source JPEG 2000 codec written in C language. It has been developed in order to promote the use of JPEG 2000, the new still-image compression standard from the Joint Photographic Experts Group (JPEG). In addition to the basic codec, various other features are under development, among them the JP2 and MJ2 (Motion JPEG 2000) file formats, an indexing tool useful for the JPIP protocol, JPWL-tools for error-resilience, a Java-viewer for j2k-images, ... 
+
+Who can use the library ?
+=========================
+Anybody. As the OpenJPEG library is released under the BSD license, anybody can use or modify the library, even for commercial applications. The only restriction is to retain the copyright in the sources or the binaries documentation.
+
+Who is developing the library ?
+===============================
+The library is developed by the Communications and Remote Sensing Lab (TELE), in the Universit<69> Catholique de Louvain (UCL). The JPWL module is developped and maintained by the Digital Signal Processing Lab (DSPLab) of the University of Perugia, Italy (UNIPG). As our purpose is to make OpenJPEG really useful for those interested in the image compression field, any feedback/advices are obviously welcome ! We will do our best to handle them quickly. 

OPJViewer/source/wxjp2parser.cpp

@@ -0,0 +1,981 @@
+/*
+ * Copyright (c) 2007, Digital Signal Processing Laboratory, Universit<69> degli studi di Perugia (UPG), Italy
+ * 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 "OPJViewer.h"
+
+/* defines */
+#define SHORT_DESCR_LEN        32
+#define LONG_DESCR_LEN         256
+
+/* enumeration for file formats */
+#define J2FILENUM              4
+typedef enum {
+
+        JP2_FILE,
+        J2K_FILE,
+		MJ2_FILE,
+		UNK_FILE
+
+} j2filetype;
+
+/* enumeration for the box types */
+#define j22boxNUM                23
+typedef enum {
+
+			FILE_BOX,
+			JP_BOX,
+			FTYP_BOX,
+			JP2H_BOX,
+			IHDR_BOX,
+			COLR_BOX,
+			JP2C_BOX,
+			JP2I_BOX,
+			XML_BOX,
+			UUID_BOX,
+			UINF_BOX,
+			MOOV_BOX,
+			MVHD_BOX,
+			TRAK_BOX,
+			TKHD_BOX,
+			MDIA_BOX,
+			MINF_BOX,
+			VMHD_BOX,
+			STBL_BOX,
+			STSD_BOX,
+			STSZ_BOX,
+			MJP2_BOX,
+			MDAT_BOX,
+			ANY_BOX,
+			UNK_BOX
+
+} j22boxtype;
+
+/* the box structure itself */
+struct boxdef {
+
+        char                  value[5];                 /* hexadecimal value/string*/
+		char                  name[SHORT_DESCR_LEN];    /* short description       */
+		char                  descr[LONG_DESCR_LEN];    /* long  description       */
+		int                   sbox;                     /* is it a superbox?       */
+		int                   req[J2FILENUM];           /* mandatory box           */
+		j22boxtype             ins;                      /* contained in box...     */
+
+};
+
+
+/* jp2 family box signatures */
+#define FILE_SIGN           ""
+#define JP_SIGN             "jP\040\040"
+#define FTYP_SIGN           "ftyp"
+#define JP2H_SIGN           "jp2h"
+#define IHDR_SIGN           "ihdr"
+#define COLR_SIGN           "colr"
+#define JP2C_SIGN           "jp2c"
+#define JP2I_SIGN           "jp2i"
+#define XML_SIGN            "xml\040"
+#define UUID_SIGN           "uuid"
+#define UINF_SIGN           "uinf"
+#define MOOV_SIGN           "moov"
+#define MVHD_SIGN           "mvhd"
+#define TRAK_SIGN           "trak"
+#define TKHD_SIGN           "tkhd"
+#define MDIA_SIGN           "mdia"
+#define MINF_SIGN           "minf"
+#define VMHD_SIGN           "vmhd"
+#define STBL_SIGN           "stbl"
+#define STSD_SIGN           "stsd"
+#define STSZ_SIGN           "stsz"
+#define MJP2_SIGN           "mjp2"
+#define MDAT_SIGN           "mdat"
+#define ANY_SIGN 			""
+#define UNK_SIGN            ""
+
+/* the possible boxes */
+struct boxdef j22box[] =
+{
+/* sign */	{FILE_SIGN,
+/* short */	"placeholder for nothing",
+/* long */	"Nothing to say",
+/* sbox */	0,
+/* req */	{1, 1, 1},
+/* ins */	FILE_BOX},
+
+/* sign */	{JP_SIGN,
+/* short */	"JPEG 2000 Signature box",
+/* long */	"This box uniquely identifies the file as being part of the JPEG 2000 family of files",
+/* sbox */	0,
+/* req */	{1, 1, 1},
+/* ins */	FILE_BOX},
+
+/* sign */	{FTYP_SIGN,
+/* short */	"File Type box",
+/* long */	"This box specifies file type, version and compatibility information, including specifying if this file "
+			"is a conforming JP2 file or if it can be read by a conforming JP2 reader",
+/* sbox */	0,
+/* req */	{1, 1, 1},
+/* ins */	FILE_BOX},
+
+/* sign */	{JP2H_SIGN,
+/* short */	"JP2 Header box",
+/* long */	"This box contains a series of boxes that contain header-type information about the file",
+/* sbox */	1,
+/* req */	{1, 1, 1},
+/* ins */	FILE_BOX},
+
+/* sign */	{IHDR_SIGN,
+/* short */	"Image Header box",
+/* long */	"This box specifies the size of the image and other related fields",
+/* sbox */	0,
+/* req */	{1, 1, 1},
+/* ins */	JP2H_BOX},
+
+/* sign */	{COLR_SIGN,
+/* short */	"Colour Specification box",
+/* long */	"This box specifies the colourspace of the image",
+/* sbox */	0,
+/* req */	{1, 1, 1},
+/* ins */	JP2H_BOX},
+
+/* sign */	{JP2C_SIGN,
+/* short */	"Contiguous Codestream box",
+/* long */	"This box contains the codestream as defined by Annex A",
+/* sbox */	0,
+/* req */	{1, 1, 1},
+/* ins */	FILE_BOX},
+
+/* sign */	{JP2I_SIGN,
+/* short */	"Intellectual Property box",
+/* long */	"This box contains intellectual property information about the image",
+/* sbox */	0,
+/* req */	{0, 0, 0},
+/* ins */	FILE_BOX},
+
+/* sign */	{XML_SIGN,
+/* short */	"XML box",
+/* long */	"This box provides a tool by which vendors can add XML formatted information to a JP2 file",
+/* sbox */	0,
+/* req */	{0, 0, 0},
+/* ins */	FILE_BOX},
+
+/* sign */	{UUID_SIGN,
+/* short */	"UUID box",
+/* long */	"This box provides a tool by which vendors can add additional information to a file "
+			"without risking conflict with other vendors",
+/* sbox */	0,
+/* req */	{0, 0, 0},
+/* ins */	FILE_BOX},
+
+/* sign */	{UINF_SIGN,
+/* short */	"UUID Info box",
+/* long */	"This box provides a tool by which a vendor may provide access to additional information associated with a UUID",
+/* sbox */	0,
+/* req */	{0, 0, 0},
+/* ins */	FILE_BOX},
+
+/* sign */	{MOOV_SIGN,
+/* short */	"Movie box",
+/* long */	"This box contains the media data. In video tracks, this box would contain JPEG2000 video frames",
+/* sbox */	1,
+/* req */	{1, 1, 1},
+/* ins */	FILE_BOX},
+
+/* sign */	{MVHD_SIGN,
+/* short */	"Movie Header box",
+/* long */	"This box defines overall information which is media-independent, and relevant to the entire presentation "
+			"considered as a whole",
+/* sbox */	0,
+/* req */	{1, 1, 1},
+/* ins */	MOOV_BOX},
+
+/* sign */	{TRAK_SIGN,
+/* short */	"Track box",
+/* long */	"This is a container box for a single track of a presentation. A presentation may consist of one or more tracks",
+/* sbox */	1,
+/* req */	{1, 1, 1},
+/* ins */	MOOV_BOX},
+
+/* sign */	{TKHD_SIGN,
+/* short */	"Track Header box",
+/* long */	"This box specifies the characteristics of a single track. Exactly one Track Header Box is contained in a track",
+/* sbox */	0,
+/* req */	{1, 1, 1},
+/* ins */	TRAK_BOX},
+
+/* sign */	{MDIA_SIGN,
+/* short */	"Media box",
+/* long */	"The media declaration container contains all the objects which declare information about the media data "
+			"within a track",
+/* sbox */	1,
+/* req */	{1, 1, 1},
+/* ins */	TRAK_BOX},
+
+/* sign */	{MINF_SIGN,
+/* short */	"Media Information box",
+/* long */	"This box contains all the objects which declare characteristic information of the media in the track",
+/* sbox */	1,
+/* req */	{1, 1, 1},
+/* ins */	MDIA_BOX},
+
+/* sign */	{VMHD_SIGN,
+/* short */	"Video Media Header box",
+/* long */	"The video media header contains general presentation information, independent of the coding, for video media",
+/* sbox */	0,
+/* req */	{1, 1, 1},
+/* ins */	MINF_BOX},
+
+/* sign */	{STBL_SIGN,
+/* short */	"Sample Table box",
+/* long */	"The sample table contains all the time and data indexing of the media samples in a track",
+/* sbox */	1,
+/* req */	{1, 1, 1},
+/* ins */	MINF_BOX},
+
+/* sign */	{STSD_SIGN,
+/* short */	"STSD Sample Description box",
+/* long */	"The sample description table gives detailed information about the coding type used, and any initialization "
+			"information needed for that coding",
+/* sbox */	0,
+/* req */	{1, 1, 1},
+/* ins */	MINF_BOX},
+
+/* sign */	{STSZ_SIGN,
+/* short */	"Sample Size box",
+/* long */	"This box contains the sample count and a table giving the size of each sample",
+/* sbox */	0,
+/* req */	{1, 1, 1},
+/* ins */	STBL_BOX},
+
+/* sign */	{MJP2_SIGN,
+/* short */	"MJP2 Sample Description box",
+/* long */	"The MJP2 sample description table gives detailed information about the coding type used, and any initialization "
+			"information needed for that coding",
+/* sbox */	0,
+/* req */	{1, 1, 1},
+/* ins */	MINF_BOX},
+
+/* sign */	{MDAT_SIGN,
+/* short */	"Media Data box",
+/* long */	"The meta-data for a presentation is stored in the single Movie Box which occurs at the top-level of a file",
+/* sbox */	1,
+/* req */	{1, 1, 1},
+/* ins */	FILE_BOX},
+
+/* sign */	{ANY_SIGN,
+/* short */	"Any box",
+/* long */	"All the existing boxes",
+/* sbox */	0,
+/* req */	{0, 0, 0},
+/* ins */	FILE_BOX},
+
+/* sign */	{UNK_SIGN,
+/* short */	"Unknown Type box",
+/* long */	"The signature is not recognised to be that of an existing box",
+/* sbox */	0,
+/* req */	{0, 0, 0},
+/* ins */	ANY_BOX}
+
+};
+
+
+/* macro functions */
+/* From little endian to big endian, 2 and 4 bytes */
+#define	BYTE_SWAP2(X)	((X & 0x00FF) << 8) | ((X & 0xFF00) >> 8)
+#define	BYTE_SWAP4(X)	((X & 0x000000FF) << 24) | ((X & 0x0000FF00) << 8) | ((X & 0x00FF0000) >> 8) | ((X & 0xFF000000) >> 24)
+#define	BYTE_SWAP8(X)	(((X & 0x00000000000000FF) << 56) | ((X & 0x000000000000FF00) << 40) | \
+                        ((X & 0x0000000000FF0000) << 24) | ((X & 0x00000000FF000000) << 8) | \
+						((X & 0x000000FF00000000) >> 8)  | ((X & 0x0000FF0000000000) >> 24) | \
+						((X & 0x00FF000000000000) >> 40) | ((X & 0xFF00000000000000) >> 56))
+
+/* From codestream to int values */
+#define STREAM_TO_UINT32(C, P)	(((unsigned long int) (C)[(P) + 0] << 24) + \
+								((unsigned long int) (C)[(P) + 1] << 16) + \
+								((unsigned long int) (C)[(P) + 2] << 8) + \
+								((unsigned long int) (C)[(P) + 3] << 0))
+
+#define STREAM_TO_UINT16(C, P)	(((unsigned long int) (C)[(P) + 0] << 8) + \
+								((unsigned long int) (C)[(P) + 1] << 0))
+
+#define OPJREAD_LONG(F,L,N) { \
+							if (F->Read(fourbytes, 4) < 4) { \
+								wxLogMessage(wxT("Problem reading " N " from the file (file ended?)")); \
+								return -1; \
+							}; \
+							L = STREAM_TO_UINT32(fourbytes, 0); \
+							}
+
+/* handling functions */
+#define ITEM_PER_ROW	10
+
+//#define indprint	if (0) printf("%.*s", 2 * level + 9, indent), printf
+char    indent[] =  "                                                                   "
+					"                                                                   "
+					"                                                                   "
+					"                                                                   ";
+
+void indprint(wxString printout, int level)
+{
+	wxLogMessage(/*wxString::Format(wxT("%.*s"), 2 * level + 9, indent) + */printout);
+}
+
+/* Box handler function */
+int OPJParseThread::box_handler_function(int boxtype, wxFile *fileid, wxFileOffset filepoint, wxFileOffset filelimit,
+						 wxTreeItemId parentid, int level, char *scansign, unsigned long int *scanpoint)
+{
+	switch ((j22boxtype) boxtype) {
+
+
+	/* JPEG 2000 Signature box */
+	case (JP_BOX): {
+
+			unsigned long int checkdata = 0;
+			fileid->Read(&checkdata, sizeof(unsigned long int));
+			checkdata = BYTE_SWAP4(checkdata);
+
+			// add info
+			wxTreeItemId currid = m_tree->AppendItem(parentid,
+				wxString::Format(wxT("Check data: %X -> %s"), checkdata, (checkdata == 0x0D0A870A) ? wxT("OK") : wxT("KO")),
+				m_tree->TreeCtrlIcon_File, m_tree->TreeCtrlIcon_File + 1,
+				new OPJMarkerData(wxT("INFO"))
+				);
+
+		};
+		break;
+
+
+	/* JPEG 2000 codestream box */
+	case (JP2C_BOX): {
+
+			// add info
+			wxTreeItemId currid = m_tree->AppendItem(parentid,
+				wxString(wxT("Codestream")),
+				m_tree->TreeCtrlIcon_Folder, m_tree->TreeCtrlIcon_Folder + 1,
+				new OPJMarkerData(wxT("INFO-CSTREAM"), m_tree->m_fname.GetFullPath(), filepoint, filelimit)
+				);
+
+			m_tree->SetItemHasChildren(currid);
+
+			// parse the file
+			//ParseJ2KFile(fileid, filepoint, filelimit, currid);
+
+		};
+		break;
+
+
+
+
+
+	/* File Type box */
+	case (FTYP_BOX): {
+
+			char BR[4], CL[4];
+			unsigned long int MinV, numCL, i;
+			fileid->Read(BR, sizeof(char) * 4);
+			fileid->Read(&MinV, sizeof(unsigned long int));
+			MinV = BYTE_SWAP4(MinV);
+			numCL = (filelimit - fileid->Tell()) / 4;				
+
+			// add info
+			wxTreeItemId currid = m_tree->AppendItem(parentid,
+				wxT("Brand/Minor version: ") +
+				wxString::FromAscii(BR).Truncate(4) +
+				wxString::Format(wxT("/%d"), MinV),
+				m_tree->TreeCtrlIcon_File, m_tree->TreeCtrlIcon_File + 1,
+				new OPJMarkerData(wxT("INFO"))
+				);
+
+			currid = m_tree->AppendItem(parentid,
+				wxString::Format(wxT("Compatibility list")),
+				m_tree->TreeCtrlIcon_Folder, m_tree->TreeCtrlIcon_Folder + 1,
+				new OPJMarkerData(wxT("INFO"))
+				);
+
+			for (i = 0; i < numCL; i++) {
+				fileid->Read(CL, sizeof(char) * 4);
+				m_tree->AppendItem(currid,
+					wxString::FromAscii(CL).Truncate(4),
+					m_tree->TreeCtrlIcon_File, m_tree->TreeCtrlIcon_File + 1,
+					new OPJMarkerData(wxT("INFO"))
+					);
+			};
+			
+		};
+		break;
+
+
+
+	/* JP2 Header box */
+	case (IHDR_BOX): {
+
+			unsigned long int height, width;
+			unsigned short int nc;
+			unsigned char bpc, C, UnkC, IPR;
+			fileid->Read(&height, sizeof(unsigned long int));
+			height = BYTE_SWAP4(height);
+			fileid->Read(&width, sizeof(unsigned long int));
+			width = BYTE_SWAP4(width);
+			fileid->Read(&nc, sizeof(unsigned short int));
+			nc = BYTE_SWAP2(nc);
+			fileid->Read(&bpc, sizeof(unsigned char));
+			fileid->Read(&C, sizeof(unsigned char));
+			fileid->Read(&UnkC, sizeof(unsigned char));
+			fileid->Read(&IPR, sizeof(unsigned char));
+			
+			// add info
+			wxTreeItemId currid = m_tree->AppendItem(parentid,
+				wxString::Format(wxT("Dimensions: %d x %d x %d @ %d bpc"), width, height, nc, bpc + 1),
+				m_tree->TreeCtrlIcon_File, m_tree->TreeCtrlIcon_File + 1,
+				new OPJMarkerData(wxT("INFO"))
+				);
+
+			currid = m_tree->AppendItem(parentid,
+				wxString::Format(wxT("Compression type: %d"), C),
+				m_tree->TreeCtrlIcon_File, m_tree->TreeCtrlIcon_File + 1,
+				new OPJMarkerData(wxT("INFO"))
+				);
+
+			currid = m_tree->AppendItem(parentid,
+				wxString::Format(wxT("Colourspace unknown: %d"), UnkC),
+				m_tree->TreeCtrlIcon_File, m_tree->TreeCtrlIcon_File + 1,
+				new OPJMarkerData(wxT("INFO"))
+				);
+
+			currid = m_tree->AppendItem(parentid,
+				wxString::Format(wxT("Intellectual Property Rights: %d"), IPR),
+				m_tree->TreeCtrlIcon_File, m_tree->TreeCtrlIcon_File + 1,
+				new OPJMarkerData(wxT("INFO"))
+				);
+			
+		};
+		break;
+
+
+
+	/* Colour Specification box */
+	case (COLR_BOX): {
+
+			unsigned char METH, PREC, APPROX;
+			char methdescr[80], enumcsdescr[80];
+			unsigned long int EnumCS;
+			fileid->Read(&METH, sizeof(unsigned char));
+			switch (METH) {
+			case 1:
+				strcpy(methdescr, "Enumerated Colourspace");
+				break;
+			case 2:
+				strcpy(methdescr, "Restricted ICC profile");
+				break;
+			default:
+				strcpy(methdescr, "Unknown");
+				break;
+			};
+			fileid->Read(&PREC, sizeof(unsigned char));
+			fileid->Read(&APPROX, sizeof(unsigned char));
+			if (METH != 2) {
+				fileid->Read(&EnumCS, sizeof(unsigned long int));
+				EnumCS = BYTE_SWAP4(EnumCS);
+				switch (EnumCS) {
+				case 16:
+					strcpy(enumcsdescr, "sRGB");
+					break;
+				case 17:
+					strcpy(enumcsdescr, "greyscale");
+					break;
+				case 18:
+					strcpy(enumcsdescr, "sYCC");
+					break;
+				default:
+					strcpy(enumcsdescr, "Unknown");
+					break;
+				};
+			};
+
+			// add info
+			wxTreeItemId currid = m_tree->AppendItem(parentid,
+				wxString::Format(wxT("Specification method: %d ("), METH) +
+				wxString::FromAscii(methdescr) +
+				wxT(")"),
+				m_tree->TreeCtrlIcon_File, m_tree->TreeCtrlIcon_File + 1,
+				new OPJMarkerData(wxT("INFO"))
+				);
+
+			currid = m_tree->AppendItem(parentid,
+				wxString::Format(wxT("Precedence: %d"), PREC),
+				m_tree->TreeCtrlIcon_File, m_tree->TreeCtrlIcon_File + 1,
+				new OPJMarkerData(wxT("INFO"))
+				);
+
+			currid = m_tree->AppendItem(parentid,
+				wxString::Format(wxT("Colourspace approximation: %d"), APPROX),
+				m_tree->TreeCtrlIcon_File, m_tree->TreeCtrlIcon_File + 1,
+				new OPJMarkerData(wxT("INFO"))
+				);
+
+			if (METH != 2)
+				currid = m_tree->AppendItem(parentid,
+					wxString::Format(wxT("Enumerated colourspace: %d ("), EnumCS) +
+					wxString::FromAscii(enumcsdescr) +
+					wxT(")"),
+					m_tree->TreeCtrlIcon_File, m_tree->TreeCtrlIcon_File + 1,
+					new OPJMarkerData(wxT("INFO"))
+					);
+
+			if (METH != 1)
+				currid = m_tree->AppendItem(parentid,
+					wxString::Format(wxT("ICC profile: there is one")),
+					m_tree->TreeCtrlIcon_File, m_tree->TreeCtrlIcon_File + 1,
+					new OPJMarkerData(wxT("INFO"))
+					);
+
+
+		};
+		break;
+
+
+
+
+		
+
+	/* Movie Header Box */
+	case (MVHD_BOX): {
+
+			unsigned long int version, rate, matrix[9], next_track_ID;
+			unsigned short int volume;
+			fileid->Read(&version, sizeof(unsigned long int));
+			version = BYTE_SWAP4(version);
+			if (version == 0) {
+				unsigned long int creation_time, modification_time, timescale, duration;
+				fileid->Read(&creation_time, sizeof(unsigned long int));
+				creation_time = BYTE_SWAP4(creation_time);
+				fileid->Read(&modification_time, sizeof(unsigned long int));
+				modification_time = BYTE_SWAP4(modification_time);
+				fileid->Read(&timescale, sizeof(unsigned long int));
+				timescale = BYTE_SWAP4(timescale);
+				fileid->Read(&duration, sizeof(unsigned long int));
+				duration = BYTE_SWAP4(duration);
+				const long unix_time = creation_time - 2082844800L;
+				wxTreeItemId currid = m_tree->AppendItem(parentid,
+					wxString::Format(wxT("Creation time: %u (%.24s)"), creation_time, ctime(&unix_time)),
+					m_tree->TreeCtrlIcon_File, m_tree->TreeCtrlIcon_File + 1,
+					new OPJMarkerData(wxT("INFO"))
+					);
+				const long unix_time1 = modification_time - 2082844800L;
+				currid = m_tree->AppendItem(parentid,
+					wxString::Format(wxT("Modification time: %u (%.24s)"), modification_time, ctime(&unix_time1)),
+					m_tree->TreeCtrlIcon_File, m_tree->TreeCtrlIcon_File + 1,
+					new OPJMarkerData(wxT("INFO"))
+					);
+				currid = m_tree->AppendItem(parentid,
+					wxString::Format(wxT("Timescale: %u (%.6fs)"), timescale, 1.0 / (float) timescale),
+					m_tree->TreeCtrlIcon_File, m_tree->TreeCtrlIcon_File + 1,
+					new OPJMarkerData(wxT("INFO"))
+					);
+				currid = m_tree->AppendItem(parentid,
+					wxString::Format(wxT("Duration: %u (%.3fs)"), duration, (float) duration / (float) timescale),
+					m_tree->TreeCtrlIcon_File, m_tree->TreeCtrlIcon_File + 1,
+					new OPJMarkerData(wxT("INFO"))
+					);
+			} else {
+				int8byte creation_time, modification_time, duration;
+				unsigned long int timescale;
+				fileid->Read(&creation_time, sizeof(int8byte));
+				creation_time = BYTE_SWAP8(creation_time);
+				fileid->Read(&modification_time, sizeof(int8byte));
+				modification_time = BYTE_SWAP8(modification_time);
+				fileid->Read(&timescale, sizeof(unsigned long int));
+				timescale = BYTE_SWAP4(timescale);
+				fileid->Read(&duration, sizeof(int8byte));
+				duration = BYTE_SWAP8(duration);
+				wxTreeItemId currid = m_tree->AppendItem(parentid,
+					wxString::Format(wxT("Creation time: %u"), creation_time),
+					m_tree->TreeCtrlIcon_File, m_tree->TreeCtrlIcon_File + 1,
+					new OPJMarkerData(wxT("INFO"))
+					);
+				currid = m_tree->AppendItem(parentid,
+					wxString::Format(wxT("Modification time: %u"), modification_time),
+					m_tree->TreeCtrlIcon_File, m_tree->TreeCtrlIcon_File + 1,
+					new OPJMarkerData(wxT("INFO"))
+					);
+				currid = m_tree->AppendItem(parentid,
+					wxString::Format(wxT("Timescale: %u"), timescale),
+					m_tree->TreeCtrlIcon_File, m_tree->TreeCtrlIcon_File + 1,
+					new OPJMarkerData(wxT("INFO"))
+					);
+				currid = m_tree->AppendItem(parentid,
+					wxString::Format(wxT("Duration: %u"), duration),
+					m_tree->TreeCtrlIcon_File, m_tree->TreeCtrlIcon_File + 1,
+					new OPJMarkerData(wxT("INFO"))
+					);
+			};
+			fileid->Read(&rate, sizeof(unsigned long int));
+			rate = BYTE_SWAP4(rate);
+			fileid->Read(&volume, sizeof(unsigned short int));
+			volume = BYTE_SWAP2(volume);
+			fileid->Seek(6, wxFromCurrent);
+			fileid->Read(&matrix, sizeof(unsigned char) * 9);
+			fileid->Seek(4, wxFromCurrent);
+			fileid->Read(&next_track_ID, sizeof(unsigned long int));
+			next_track_ID = BYTE_SWAP4(next_track_ID);
+			wxTreeItemId currid = m_tree->AppendItem(parentid,
+				wxString::Format(wxT("Rate: %d (%d.%d)"), rate, rate >> 16, rate & 0x0000FFFF),
+				m_tree->TreeCtrlIcon_File, m_tree->TreeCtrlIcon_File + 1,
+				new OPJMarkerData(wxT("INFO"))
+				);
+			currid = m_tree->AppendItem(parentid,
+				wxString::Format(wxT("Volume: %d (%d.%d)"), volume, volume >> 8, volume & 0x00FF),
+				m_tree->TreeCtrlIcon_File, m_tree->TreeCtrlIcon_File + 1,
+				new OPJMarkerData(wxT("INFO"))
+				);
+			currid = m_tree->AppendItem(parentid,
+				wxString::Format(wxT("Next track ID: %d"), next_track_ID),
+				m_tree->TreeCtrlIcon_File, m_tree->TreeCtrlIcon_File + 1,
+				new OPJMarkerData(wxT("INFO"))
+				);
+		};
+		break;
+
+
+			/* Sample Description box */
+	case (STSD_BOX): {
+
+			unsigned long int version, entry_count;
+			fileid->Read(&version, sizeof(unsigned long int));
+			version = BYTE_SWAP4(version);
+			fileid->Read(&entry_count, sizeof(unsigned long int));
+			entry_count = BYTE_SWAP4(entry_count);
+			wxTreeItemId currid = m_tree->AppendItem(parentid,
+				wxString::Format(wxT("Entry count: %d"), entry_count),
+				m_tree->TreeCtrlIcon_File, m_tree->TreeCtrlIcon_File + 1,
+				new OPJMarkerData(wxT("INFO"), m_tree->m_fname.GetFullPath(), filepoint, filelimit)
+				);
+			jpeg2000parse(fileid, filepoint + 8, filelimit, parentid, level + 1, scansign, scanpoint);
+		};
+		break;
+
+
+			/* Sample Size box */
+	case (STSZ_BOX): {
+
+			unsigned long int version, sample_size, sample_count, entry_size;
+			
+			fileid->Read(&version, sizeof(unsigned long int));
+			version = BYTE_SWAP4(version);
+			
+			fileid->Read(&sample_size, sizeof(unsigned long int));
+			sample_size = BYTE_SWAP4(sample_size);
+
+			if (sample_size == 0) {
+				fileid->Read(&sample_count, sizeof(unsigned long int));
+				sample_count = BYTE_SWAP4(sample_count);
+
+				wxTreeItemId currid = m_tree->AppendItem(parentid,
+					wxString::Format(wxT("Sample count: %d"), sample_count),
+					m_tree->TreeCtrlIcon_File, m_tree->TreeCtrlIcon_File + 1,
+					new OPJMarkerData(wxT("INFO"), m_tree->m_fname.GetFullPath(), filepoint, filelimit)
+					);
+
+				currid = m_tree->AppendItem(parentid,
+					wxT("Entries size (bytes)"),
+					m_tree->TreeCtrlIcon_Folder, m_tree->TreeCtrlIcon_Folder + 1,
+					new OPJMarkerData(wxT("INFO"), m_tree->m_fname.GetFullPath(), filepoint, filelimit)
+					);
+
+				wxString text;
+				for (unsigned int s = 0; s < sample_count; s++) {
+					fileid->Read(&entry_size, sizeof(unsigned long int));
+					entry_size = BYTE_SWAP4(entry_size);
+					
+					text << wxString::Format(wxT("%d, "), entry_size);
+
+					if (((s % 10) == (ITEM_PER_ROW - 1)) || (s == (sample_count - 1))) {
+						m_tree->AppendItem(currid,
+							text,
+							m_tree->TreeCtrlIcon_File, m_tree->TreeCtrlIcon_File + 1,
+							new OPJMarkerData(wxT("INFO"), m_tree->m_fname.GetFullPath(), filepoint, filelimit)
+							);
+						text = wxT("");
+					}
+
+				}
+				
+			}
+
+		};
+		break;
+
+
+			/* Video Media Header box */
+	case (VMHD_BOX): {
+
+			unsigned long int version;
+			unsigned short int graphicsmode, opcolor[3];
+			char graphicsdescr[100];
+
+			fileid->Read(&version, sizeof(unsigned long int));
+			version = BYTE_SWAP4(version);
+
+			fileid->Read(&graphicsmode, sizeof(unsigned short int));
+			graphicsmode = BYTE_SWAP2(graphicsmode);
+			switch (graphicsmode) {
+			case (0x00):
+					strcpy(graphicsdescr, "copy");
+					break;
+			case (0x24):
+					strcpy(graphicsdescr, "transparent");
+					break;
+			case (0x0100):
+					strcpy(graphicsdescr, "alpha");
+					break;
+			case (0x0101):
+					strcpy(graphicsdescr, "whitealpha");
+					break;
+			case (0x0102):
+					strcpy(graphicsdescr, "blackalpha");
+					break;
+			default:
+					strcpy(graphicsdescr, "unknown");
+					break;
+			};
+
+			fileid->Read(opcolor, 3 * sizeof(unsigned short int));
+			opcolor[0] = BYTE_SWAP2(opcolor[0]);
+			opcolor[1] = BYTE_SWAP2(opcolor[1]);
+			opcolor[2] = BYTE_SWAP2(opcolor[2]);
+
+			wxTreeItemId currid = m_tree->AppendItem(parentid,
+				wxString::Format(wxT("Composition mode: %d (")) + 
+				wxString::FromAscii(graphicsdescr) +
+				wxT(")"),
+				m_tree->TreeCtrlIcon_File, m_tree->TreeCtrlIcon_File + 1,
+				new OPJMarkerData(wxT("INFO"), m_tree->m_fname.GetFullPath(), filepoint, filelimit)
+				);
+
+			currid = m_tree->AppendItem(parentid,
+				wxString::Format(wxT("OP color: %d %d %d"), opcolor[0], opcolor[1], opcolor[2]),
+				m_tree->TreeCtrlIcon_File, m_tree->TreeCtrlIcon_File + 1,
+				new OPJMarkerData(wxT("INFO"), m_tree->m_fname.GetFullPath(), filepoint, filelimit)
+				);
+		};
+		break;
+
+
+
+			/* MJP2 Sample Description box */
+	case (MJP2_BOX): {
+
+			unsigned short int height, width, depth;
+			unsigned long int horizresolution, vertresolution;
+			char compressor_name[32];
+			fileid->Seek(24, wxFromCurrent);
+			fileid->Read(&width, sizeof(unsigned short int));
+			width = BYTE_SWAP2(width);
+			fileid->Read(&height, sizeof(unsigned short int));
+			height = BYTE_SWAP2(height);
+			fileid->Read(&horizresolution, sizeof(unsigned long int));
+			horizresolution = BYTE_SWAP4(horizresolution);
+			fileid->Read(&vertresolution, sizeof(unsigned long int));
+			vertresolution = BYTE_SWAP4(vertresolution);
+			fileid->Seek(6, wxFromCurrent);
+			fileid->Read(compressor_name, sizeof(char) * 32);
+			fileid->Read(&depth, sizeof(unsigned short int));
+			depth = BYTE_SWAP2(depth);
+			wxTreeItemId currid = m_tree->AppendItem(parentid,
+				wxString::Format(wxT("Dimensions: %d x %d @ %d bpp"), width, height, depth),
+				m_tree->TreeCtrlIcon_File, m_tree->TreeCtrlIcon_File + 1,
+				new OPJMarkerData(wxT("INFO"), m_tree->m_fname.GetFullPath(), filepoint, filelimit)
+				);
+			currid = m_tree->AppendItem(parentid,
+				wxString::Format(wxT("Resolution: %d.%d x %d.%d"), horizresolution >> 16, horizresolution & 0x0000FFFF,
+				vertresolution >> 16, vertresolution & 0x0000FFFF),
+				m_tree->TreeCtrlIcon_File, m_tree->TreeCtrlIcon_File + 1,
+				new OPJMarkerData(wxT("INFO"))
+				);
+			currid = m_tree->AppendItem(parentid,
+				wxString::Format(wxT("Compressor: %.32s"), compressor_name),
+				m_tree->TreeCtrlIcon_File, m_tree->TreeCtrlIcon_File + 1,
+				new OPJMarkerData(wxT("INFO"))
+				);
+			jpeg2000parse(fileid, filepoint + 78, filelimit, parentid, level + 1, scansign, scanpoint);
+
+		};
+		break;
+
+		
+	/* not yet implemented */
+	default:
+		break;
+
+	};
+
+	return (0);
+}
+
+
+void OPJParseThread::ParseJP2File(wxFile *fileid, wxFileOffset filepoint, wxFileOffset filelimit, wxTreeItemId parentid)
+{
+	unsigned long int scanpoint;
+
+	jpeg2000parse(fileid, filepoint, filelimit, parentid, 0, NULL, &scanpoint);
+}
+
+/* the parsing function itself */
+/*
+  fileid    = fid of the file to scan (you should open it by yourself)
+  filepoint = first byte where to start to scan from (usually 0)
+  filelimit = first byte where to stop to scan from (usually the file size)
+  level     = set this to 0
+  scansign  = signature to scan for (NULL avoids search, returns "    " if successful)
+  scanpoint = point where the scan signature lies
+*/
+int OPJParseThread::jpeg2000parse(wxFile *fileid, wxFileOffset filepoint, wxFileOffset filelimit,
+								  wxTreeItemId parentid, int level, char *scansign, unsigned long int *scanpoint)
+{
+	unsigned long int       LBox = 0x00000000;
+	//int                     LBox_read;
+	char                    TBox[5] = "\0\0\0\0";
+	//int                     TBox_read;
+	int8byte				XLBox = 0x0000000000000000;
+	//int                     XLBox_read;
+	unsigned long int       box_length = 0;
+	int                     last_box = 0, box_num = 0;
+	int                     box_type = ANY_BOX;
+	unsigned char           /*onebyte[1], twobytes[2],*/ fourbytes[4];
+
+	/* cycle all over the file */
+	box_num = 0;
+	last_box = 0;
+	while (!last_box) {
+
+		/* do not exceed file limit */
+		if (filepoint >= filelimit)
+			return (0);
+
+		/* seek on file */
+		if (fileid->Seek(filepoint, wxFromStart) == wxInvalidOffset)
+			return (-1);
+
+		/* read the mandatory LBox, 4 bytes */
+		if (fileid->Read(fourbytes, 4) < 4) {
+			WriteText(wxT("Problem reading LBox from the file (file ended?)"));
+			return -1;
+		};
+		LBox = STREAM_TO_UINT32(fourbytes, 0);
+
+		/* read the mandatory TBox, 4 bytes */
+		if (fileid->Read(TBox, 4) < 4) {
+			WriteText(wxT("Problem reading TBox from the file (file ended?)"));
+			return -1;
+		};
+
+		/* look if scansign is got */
+		if ((scansign != NULL) && (memcmp(TBox, scansign, 4) == 0)) {
+			memcpy(scansign, "    ", 4);
+			*scanpoint = filepoint;
+
+			/* hack/exploit */
+			// stop as soon as you find the codebox
+			return (0);
+
+		};
+
+		/* determine the box type */
+		for (box_type = JP_BOX; box_type < UNK_BOX; box_type++)
+			if (memcmp(TBox, j22box[box_type].value, 4) == 0)
+				break;	
+
+		/* read the optional XLBox, 8 bytes */
+		if (LBox == 1) {
+
+			if (fileid->Read(&XLBox, 8) < 8) {
+				WriteText(wxT("Problem reading XLBox from the file (file ended?)"));
+				return -1;
+			};
+			box_length = (unsigned long int) BYTE_SWAP8(XLBox);
+
+		} else if (LBox == 0x00000000) {
+
+			/* last box in file */
+			last_box = 1; 
+			box_length = filelimit - filepoint;
+
+		} else
+
+			box_length = LBox;
+
+		/* show box info */
+
+		// append the marker
+		int image, imageSel;
+		image = m_tree->TreeCtrlIcon_Folder;
+		imageSel = image + 1;
+		wxTreeItemId currid = m_tree->AppendItem(parentid,
+			wxString::Format(wxT("%03d: "), box_num) +
+			wxString::FromAscii(TBox) +
+			wxString::Format(wxT(" (0x%04X)"),
+				((unsigned long int) TBox[3]) + ((unsigned long int) TBox[2] << 8) +
+				((unsigned long int) TBox[1] << 16) + ((unsigned long int) TBox[0] << 24)
+			),
+			image, imageSel,
+			new OPJMarkerData(wxT("BOX"), m_tree->m_fname.GetFullPath(), filepoint, filepoint + box_length)
+			);
+
+		// append some info
+		image = m_tree->TreeCtrlIcon_File;
+		imageSel = image + 1;
+
+		// box name
+		wxTreeItemId subcurrid1 = m_tree->AppendItem(currid,
+			wxT("*** ") + wxString::FromAscii(j22box[box_type].name) + wxT(" ***"),
+			image, imageSel,
+			new OPJMarkerData(wxT("INFO"))
+			);
+		m_tree->SetItemFont(subcurrid1, *wxITALIC_FONT);
+
+		// position and length
+		wxTreeItemId subcurrid2 = m_tree->AppendItem(currid,
+			wxLongLong(filepoint).ToString() + wxT(" > ") + wxLongLong(filepoint + box_length - 1).ToString() + 
+			wxT(", ") + wxString::Format(wxT("%d + 8 (%d)"), box_length, box_length + 8),
+			image, imageSel,
+			new OPJMarkerData(wxT("INFO"))
+			);
+
+		/* go deep in the box */
+		box_handler_function((int) box_type, fileid, (LBox == 1) ? (filepoint + 16) : (filepoint + 8), filepoint + box_length,
+			currid, level, scansign, scanpoint);
+
+		/* if it's a superbox go inside it */
+		if (j22box[box_type].sbox)
+			jpeg2000parse(fileid, (LBox == 1) ? (filepoint + 16) : (filepoint + 8), filepoint + box_length,
+				currid, level + 1, scansign, scanpoint);
+
+		/* increment box number and filepoint*/
+		box_num++;
+		filepoint += box_length;
+
+	};
+
+	/* all good */
+	return (0);
+}
+

README.cmake

@@ -0,0 +1,9 @@
+Basic instructions on how to build using CMake (CMake 2.4.5 or newer is required)
+
+  svn co http://www.openjpeg.org/svn/trunk
+  cd trunk
+  mkdir bin
+  cd bin
+  cmake .. -DBUILD_EXAMPLES:BOOL=ON
+  make
+  ./codec/j2k_to_image 

README.linux

@@ -13,7 +13,8 @@ Please let us know how this works for you under other Linux distributions or any
 
 Installation
 ------------
-Note: You will need to have root privileges in order to install the library in the /usr/lib directory.
+Note: You will need to have root privileges in order to install the library in
+/usr/include and /usr/lib directories.
 The installation process is as simple as this : 
 1) Enter the OpenJPEG directory
 2) Build the distribution : 
@@ -26,7 +27,7 @@ Simple codec compilation
 ------------------------
 Once you've built the library, you might want to test it with a basic codec. To do this, go to the codec directory and use one of the following commands to build an encoder and decoder respectively:
 
-gcc convert.c image_to_j2k.c -o image_to_j2k -lopenjpeg -I ../libopenjpeg/ -lm
-gcc convert.c j2k_to_image.c -o j2k_to_image -lopenjpeg -I ../libopenjpeg/ -lm
+gcc convert.c image_to_j2k.c -o image_to_j2k -lopenjpeg -I ../libopenjpeg/ -lm -ltiff
+gcc convert.c j2k_to_image.c -o j2k_to_image -lopenjpeg -I ../libopenjpeg/ -lm -ltiff
 
 You should add '-L..' to those lines if you did not use the 'install' target (and the 'clean' target neither...).

README.osx

@@ -6,7 +6,8 @@ While the makefiles will make a .dylib and a .a, it is recommended to simply sta
 
 Installation
 ------------
-Note: You will need to have root privileges in order to install the library in the /usr/lib directory.
+Note: You will need to have root privileges in order to install the library in
+/usr/include and /usr/lib directories.
 The installation process is as simple as this : 
 1) Enter the OpenJPEG directory
 2) Build the distribution : 
@@ -19,7 +20,7 @@ Simple codec compilation
 ------------------------
 Once you've built the library, you might want to test it with a basic codec. To do this, go to the codec directory and use one of the following commands to build an encoder and decoder respectively:
 
-gcc convert.c image_to_j2k.c -o image_to_j2k -lopenjpeg -I ../libopenjpeg/ -lm
-gcc convert.c j2k_to_image.c -o j2k_to_image -lopenjpeg -I ../libopenjpeg/ -lm
+gcc convert.c image_to_j2k.c -o image_to_j2k -lopenjpeg -I ../libopenjpeg/ -lm -ltiff
+gcc convert.c j2k_to_image.c -o j2k_to_image -lopenjpeg -I ../libopenjpeg/ -lm -ltiff
 
-You should add '-L..' to those lines if you did not use the 'osxinstall' target (and the 'osxclean' target neither...).
+You should add '-L..' and to those lines if you did not use the 'install' target (and the 'clean' target neither...).

codec/CMakeLists.txt

@@ -36,10 +36,12 @@ IF(NOT BUILD_SHARED_LIBS)
   ADD_DEFINITIONS(-DOPJ_STATIC)
 ENDIF(NOT BUILD_SHARED_LIBS)
 
+FIND_PACKAGE(TIFF REQUIRED)
+
 # Loop over all executables:
 FOREACH(exe j2k_to_image image_to_j2k)
   ADD_EXECUTABLE(${exe} ${exe}.c ${common_SRCS})
-  TARGET_LINK_LIBRARIES(${exe} ${OPJ_PREFIX}openjpeg)
+  TARGET_LINK_LIBRARIES(${exe} ${OPJ_PREFIX}openjpeg ${TIFF_LIBRARIES})
   # On unix you need to link to the math library:
   IF(UNIX)
     TARGET_LINK_LIBRARIES(${exe} -lm)

codec/Makefile

@@ -5,10 +5,10 @@ CFLAGS = -O3 -lstdc++ # -g -p -pg
 all: j2k_to_image image_to_j2k
 
 j2k_to_image: j2k_to_image.c ../libopenjpeg.a
-	gcc $(CFLAGS) convert.c j2k_to_image.c -o j2k_to_image -L.. -lopenjpeg -I ../libopenjpeg/ -lm
+	gcc $(CFLAGS) compat/getopt.c convert.c j2k_to_image.c -o j2k_to_image -L.. -lopenjpeg -I ../libopenjpeg/ -lm -ltiff
 
 image_to_j2k: image_to_j2k.c ../libopenjpeg.a
-	gcc $(CFLAGS) convert.c image_to_j2k.c -o image_to_j2k -L.. -lopenjpeg -I ../libopenjpeg/ -lm
+	gcc $(CFLAGS) compat/getopt.c convert.c image_to_j2k.c -o image_to_j2k -L.. -lopenjpeg -I ../libopenjpeg/ -lm -ltiff
 
 clean:
 	rm -f j2k_to_image image_to_j2k

codec/compat/getopt.c

@@ -47,10 +47,20 @@ int opterr = 1,			/* if error message should be printed */
  optreset;			/* reset getopt */
 const char *optarg;			/* argument associated with option */
 
+typedef struct option
+{
+	char *name;
+	int has_arg;
+	int *flag;
+	int val;
+}option_t;
+
 #define	BADCH	(int)'?'
 #define	BADARG	(int)':'
 #define	EMSG	""
 
+
+
 /*
  * getopt --
  *	Parse argc/argv argument vector.
@@ -82,10 +92,11 @@ int getopt(int nargc, char *const *nargv, const char *ostr) {
       return (-1);
     if (!*place)
       ++optind;
-    if (opterr && *ostr != ':')
-      (void) fprintf(stderr,
+		if (opterr && *ostr != ':') {
+      fprintf(stderr,
 		     "%s: illegal option -- %c\n", __progname, optopt);
-    return (BADCH);
+			return (BADCH);
+		}
   }
   if (*++oli != ':') {		/* don't need argument */
     optarg = NULL;
@@ -98,11 +109,12 @@ int getopt(int nargc, char *const *nargv, const char *ostr) {
       place = EMSG;
       if (*ostr == ':')
 	return (BADARG);
-      if (opterr)
-	(void) fprintf(stderr,
+			if (opterr) {
+				fprintf(stderr,
 		       "%s: option requires an argument -- %c\n",
 		       __progname, optopt);
-      return (BADCH);
+				return (BADCH);
+			}
     } else			/* white space */
       optarg = nargv[optind];
     place = EMSG;
@@ -110,3 +122,136 @@ int getopt(int nargc, char *const *nargv, const char *ostr) {
   }
   return (optopt);		/* dump back option letter */
 }
+
+
+int getopt_long(int argc, char * const argv[], const char *optstring,
+struct option *longopts, int totlen) {
+	static int lastidx,lastofs;
+	char *tmp;
+	int i,len;
+	char param = 1;
+
+again:
+	if (optind>argc || !argv[optind] || *argv[optind]!='-')
+		return -1;
+
+	if (argv[optind][0]=='-' && argv[optind][1]==0) {
+		if(optind >= (argc - 1)){ /* no more input parameters */
+			param = 0;
+		}
+		else{ /* more input parameters */
+			if(argv[optind + 1][0] == '-'){
+				param = 0; /* Missing parameter after '-' */
+			}
+			else{
+				param = 2;
+			}
+		}
+	}
+
+	if (param == 0) {
+		++optind;
+		return (BADCH);
+	}
+
+	if (argv[optind][0]=='-') {	/* long option */
+		char* arg=argv[optind]+1;
+		const struct option* o;
+		o=longopts;
+		len=sizeof(longopts[0]);
+
+		if (param > 1){
+			arg = argv[optind+1];
+			optind++;
+		}
+		else
+			arg = argv[optind]+1;
+
+		if(strlen(arg)>1){
+			for (i=0;i<totlen;i=i+len,o++) {
+				if (!strcmp(o->name,arg)) {	/* match */
+					if (o->has_arg == 0) {
+						if ((argv[optind+1])&&(!(argv[optind+1][0]=='-'))){
+							fprintf(stderr,"%s: option does not require an argument. Ignoring %s\n",arg,argv[optind+1]);
+							++optind;
+						}
+					}else{ 
+						optarg=argv[optind+1];
+						if(optarg){
+							if (optarg[0] == '-'){ /* Has read next input parameter: No arg for current parameter */								
+								if (opterr) {
+									fprintf(stderr,"%s: option requires an argument\n",arg);
+									return (BADCH);
+								}
+							}
+						}
+						if (!optarg && o->has_arg==1) {	/* no argument there */
+							if (opterr) {
+								fprintf(stderr,"%s: option requires an argument \n",arg);
+								return (BADCH);
+							}
+						}
+						++optind;
+					}
+					++optind;
+					if (o->flag)
+						*(o->flag)=o->val;
+					else
+						return o->val;
+					return 0;
+				}
+			}//(end for)String not found in the list
+			fprintf(stderr,"Invalid option %s\n",arg);
+			++optind;
+			return (BADCH);
+		}else{ /*Single character input parameter*/
+			if (*optstring==':') return ':';
+			if (lastidx!=optind) {
+				lastidx=optind; lastofs=0;
+			}
+			optopt=argv[optind][lastofs+1];
+			if ((tmp=strchr(optstring,optopt))) {/*Found input parameter in list*/
+				if (*tmp==0) {	/* apparently, we looked for \0, i.e. end of argument */
+					++optind;
+					goto again;
+				}
+				if (tmp[1]==':') {	/* argument expected */
+					if (tmp[2]==':' || argv[optind][lastofs+2]) {	/* "-foo", return "oo" as optarg */
+						if (!*(optarg=argv[optind]+lastofs+2)) optarg=0;
+						goto found;
+					}
+					optarg=argv[optind+1];
+					if(optarg){
+						if (optarg[0] == '-'){ /* Has read next input parameter: No arg for current parameter */
+							if (opterr) {
+								fprintf(stderr,"%s: option requires an argument\n",arg);
+								return (BADCH);
+							}
+						}
+					}
+					if (!optarg) {	/* missing argument */
+						if (opterr) {
+							fprintf(stderr,"%s: option requires an argument\n",arg);
+							return (BADCH);
+						}
+					}
+					++optind;
+				}else {/*Argument not expected*/
+					++lastofs;
+					return optopt;
+				}
+found:
+				++optind;
+				return optopt;
+			}	else {	/* not found */
+				fprintf(stderr,"Invalid option %s\n",arg);
+				++optind;
+				return (BADCH);
+			}//end of not found
+		
+		}// end of single character
+	}//end '-'
+	fprintf(stderr,"Invalid option %s\n");
+	++optind;
+	return (BADCH);;
+}//end function

codec/compat/getopt.h

@@ -3,6 +3,18 @@
 #ifndef _GETOPT_H_
 #define _GETOPT_H_
 
+typedef struct option
+{
+	char *name;
+	int has_arg;
+	int *flag;
+	int val;
+}option_t;
+
+#define	NO_ARG	0
+#define REQ_ARG	1
+#define OPT_ARG	2
+
 extern int opterr;
 extern int optind;
 extern int optopt;
@@ -10,5 +22,8 @@ extern int optreset;
 extern char *optarg;
 
 extern int getopt(int nargc, char *const *nargv, const char *ostr);
+extern int getopt_long(int argc, char * const argv[], const char *optstring,
+			const struct option *longopts, int totlen);
+
 
 #endif				/* _GETOPT_H_ */

codec/convert.c

@@ -5,6 +5,7 @@
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * Copyright (c) 2006-2007, Parvatha Elangovan
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -32,6 +33,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "openjpeg.h"
+#include "../libs/libtiff/tiffio.h"
 
 /*
  * Get logarithm of an integer and round downwards.
@@ -1063,4 +1065,374 @@ int imagetopnm(opj_image_t * image, const char *outfile) {
 	return 0;
 }
 
+/* -->> -->> -->> -->>
 
+	TIFF IMAGE FORMAT
+
+ <<-- <<-- <<-- <<-- */
+
+typedef struct tiff_infoheader{
+	DWORD tiWidth;  // Width of Image in pixel
+	DWORD tiHeight; // Height of Image in pixel
+	DWORD tiPhoto;	// Photometric
+	WORD  tiBps;	// Bits per sample
+	WORD  tiSf;		// Sample Format
+	WORD  tiSpp;	// Sample per pixel 1-bilevel,gray scale , 2- RGB
+	WORD  tiPC;	// Planar config (1-Interleaved, 2-Planarcomp)
+}tiff_infoheader_t;
+
+int imagetotif(opj_image_t * image, const char *outfile) {
+	int width, height;
+	int bps,index;
+	TIFF *tif;
+	tdata_t buf;
+	tstrip_t strip;
+	tsize_t strip_size;
+
+	if (image->numcomps == 3 && image->comps[0].dx == image->comps[1].dx
+		&& image->comps[1].dx == image->comps[2].dx
+		&& image->comps[0].dy == image->comps[1].dy
+		&& image->comps[1].dy == image->comps[2].dy
+		&& image->comps[0].prec == image->comps[1].prec
+		&& image->comps[1].prec == image->comps[2].prec) {
+
+			/* -->> -->> -->>    
+			RGB color	    
+			<<-- <<-- <<-- */
+
+			tif = TIFFOpen(outfile, "wb"); 
+			if (!tif) {
+				fprintf(stderr, "ERROR -> failed to open %s for writing\n", outfile);
+				return 1;
+			}
+
+			width	= image->comps[0].w;
+			height= image->comps[0].h;
+			bps		= image->comps[0].prec;
+			/* Set tags */
+			TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, width);
+			TIFFSetField(tif, TIFFTAG_IMAGELENGTH, height);
+			TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, 3);
+			TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, bps);
+			TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
+			TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
+			TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB);
+			TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP, 1);
+
+			/* Get a buffer for the data */
+			buf = _TIFFmalloc(TIFFStripSize(tif));
+			index=0;
+			strip_size=0;
+			strip_size=TIFFStripSize(tif);
+			for (strip = 0; strip < TIFFNumberOfStrips(tif); strip++) {
+				unsigned char *dat8;
+				int i;
+				dat8 = buf;
+				if (image->comps[0].prec == 8){
+					for (i=0; i<TIFFStripSize(tif); i+=3) {	// 8 bits per pixel 
+						dat8[i+0] = image->comps[0].data[index] ;	// R 
+						dat8[i+1] = image->comps[1].data[index] ;	// G 
+						dat8[i+2] = image->comps[2].data[index] ;	// B 
+						index++;
+					}
+				}else if (image->comps[0].prec == 12){
+					for (i=0; i<TIFFStripSize(tif); i+=9) {	// 12 bits per pixel 
+						dat8[i+0] = (image->comps[0].data[index]>>8)<<4 | (image->comps[0].data[index]>>4);
+						dat8[i+1] = (image->comps[0].data[index]<<4)|((image->comps[1].data[index]>>8)& 0x0f);
+						dat8[i+2] = (image->comps[1].data[index]);
+						dat8[i+3] = (image->comps[2].data[index]>>8)<<4 | (image->comps[2].data[index]>>4);
+						dat8[i+4] = (image->comps[2].data[index]<<4)|((image->comps[1].data[index+1]>>8)& 0x0f);
+						dat8[i+5] = (image->comps[0].data[index+1]);
+						dat8[i+6] = (image->comps[1].data[index+1]>>8)<<4 | (image->comps[1].data[index+1]>>4);
+						dat8[i+7] = (image->comps[1].data[index+1]<<4)|((image->comps[2].data[index+1]>>8)& 0x0f);
+						dat8[i+8] = (image->comps[2].data[index+1]);
+						index+=2;
+					}
+				}else if (image->comps[0].prec == 16){
+					for (i=0; i<TIFFStripSize(tif); i+=6) {	// 16 bits per pixel 
+						dat8[i+0] =  image->comps[0].data[index];//LSB
+						dat8[i+1] = (image->comps[0].data[index]>> 8);//MSB	 
+						dat8[i+2] =  image->comps[1].data[index]; 
+						dat8[i+3] = (image->comps[1].data[index]>> 8);	
+						dat8[i+4] =  image->comps[2].data[index];	 
+						dat8[i+5] = (image->comps[2].data[index]>> 8); 
+						index++;
+					}
+				}else{
+					fprintf(stderr,"Bits=%d, Only 8,12,16 bits implemented\n",image->comps[0].prec);
+					fprintf(stderr,"Aborting\n");
+					return 1;
+				}
+				TIFFWriteEncodedStrip(tif, strip, buf, strip_size);
+			}
+			_TIFFfree(buf);
+			TIFFClose(tif);
+		}else if (image->numcomps == 1){
+			/* -->> -->> -->>    
+			Black and White	    
+			<<-- <<-- <<-- */
+
+			tif = TIFFOpen(outfile, "wb"); 
+			if (!tif) {
+				fprintf(stderr, "ERROR -> failed to open %s for writing\n", outfile);
+				return 1;
+			}
+
+			width	= image->comps[0].w;
+			height= image->comps[0].h;
+			bps		= image->comps[0].prec;
+
+			/* Set tags */
+			TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, width);
+			TIFFSetField(tif, TIFFTAG_IMAGELENGTH, height);
+			TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, 1);
+			TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, bps);
+			TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
+			TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
+			TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISBLACK);
+			TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP, 1);
+
+			/* Get a buffer for the data */
+			buf = _TIFFmalloc(TIFFStripSize(tif));
+			index = 0;
+			strip_size = 0;
+			strip_size = TIFFStripSize(tif);
+			for (strip = 0; strip < TIFFNumberOfStrips(tif); strip++) {
+				unsigned char *dat8;
+				int i;
+				dat8 = buf;
+				if (image->comps[0].prec == 8){
+					for (i=0; i<TIFFStripSize(tif); i+=1) {	// 8 bits per pixel 
+						dat8[i+0] = image->comps[0].data[index] ;
+						index++;
+					}
+				}else if (image->comps[0].prec == 12){
+					for (i = 0; i<TIFFStripSize(tif); i+=3) {	// 12 bits per pixel 
+						dat8[i+0] = (image->comps[0].data[index]>>8)<<4 | (image->comps[0].data[index]>>4);
+						dat8[i+1] = (image->comps[0].data[index]<<4)|((image->comps[0].data[index+1]>>8)& 0x0f);
+						dat8[i+2] = (image->comps[0].data[index+1]);
+						index+=2;
+					}
+				}else if (image->comps[0].prec == 16){
+					for (i=0; i<TIFFStripSize(tif); i+=2) {	// 16 bits per pixel 
+						dat8[i+0] =  image->comps[0].data[index];
+						dat8[i+1] = (image->comps[0].data[index]>> 8);
+						index++;
+					}
+				}else{
+					fprintf(stderr,"Bits=%d, Only 8,12,16 bits implemented\n",image->comps[0].prec);
+					fprintf(stderr,"Aborting\n");
+					return 1;
+				}
+				TIFFWriteEncodedStrip(tif, strip, buf, strip_size);
+			}
+			_TIFFfree(buf);
+			TIFFClose(tif);
+		}else{
+			fprintf(stderr,"False color format. Only RGB & Grayscale has been implemented\n");
+			fprintf(stderr,"Aborting\n");
+			return 1;
+		}
+		return 0;
+}
+
+opj_image_t* tiftoimage(char *filename, opj_cparameters_t *parameters)
+{
+	int subsampling_dx = parameters->subsampling_dx;
+	int subsampling_dy = parameters->subsampling_dy;
+	TIFF *tif;
+	tiff_infoheader_t Info;
+	tdata_t buf;
+	tstrip_t strip;
+	tsize_t strip_size;
+	int j, numcomps, w, h,index;
+	OPJ_COLOR_SPACE color_space;
+	opj_image_cmptparm_t cmptparm[3];
+	opj_image_t * image = NULL;
+
+	tif = TIFFOpen(filename, "r");
+
+	if (!tif) {
+		fprintf(stderr, "Failed to open %s for reading\n", filename);
+		return 0;
+	}
+
+	TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, &Info.tiWidth);
+	TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &Info.tiHeight);
+	TIFFGetField(tif, TIFFTAG_BITSPERSAMPLE, &Info.tiBps);
+	TIFFGetField(tif, TIFFTAG_SAMPLEFORMAT, &Info.tiSf);
+	TIFFGetField(tif, TIFFTAG_SAMPLESPERPIXEL, &Info.tiSpp);
+	Info.tiPhoto = 0;
+	TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &Info.tiPhoto);
+	TIFFGetField(tif, TIFFTAG_PLANARCONFIG, &Info.tiPC);
+	w= Info.tiWidth;
+	h= Info.tiHeight;
+	
+	if (Info.tiPhoto == 2) { 
+		/* -->> -->> -->>    
+		RGB color	    
+		<<-- <<-- <<-- */
+
+		numcomps = 3;
+		color_space = CLRSPC_SRGB;
+		/* initialize image components*/ 
+		memset(&cmptparm[0], 0, 3 * sizeof(opj_image_cmptparm_t));
+		for(j = 0; j < numcomps; j++) {
+			if (parameters->cp_cinema) {
+				cmptparm[j].prec = 12;
+				cmptparm[j].bpp = 12;
+			}else{
+				cmptparm[j].prec = Info.tiBps;
+				cmptparm[j].bpp = Info.tiBps;
+			}
+			cmptparm[j].sgnd = 0;
+			cmptparm[j].dx = subsampling_dx;
+			cmptparm[j].dy = subsampling_dy;
+			cmptparm[j].w = w;
+			cmptparm[j].h = h;
+		}
+		/* create the image*/ 
+		image = opj_image_create(numcomps, &cmptparm[0], color_space);
+		if(!image) {
+			TIFFClose(tif);
+			return NULL;
+		}
+
+		/* set image offset and reference grid */
+		image->x0 = parameters->image_offset_x0;
+		image->y0 = parameters->image_offset_y0;
+		image->x1 =	!image->x0 ? (w - 1) * subsampling_dx + 1 : image->x0 + (w - 1) * subsampling_dx + 1;
+		image->y1 =	!image->y0 ? (h - 1) * subsampling_dy + 1 : image->y0 + (h - 1) * subsampling_dy + 1;
+
+		buf = _TIFFmalloc(TIFFStripSize(tif));
+		strip_size=0;
+		strip_size=TIFFStripSize(tif);
+		index = 0;
+		/* Read the Image components*/
+		for (strip = 0; strip < TIFFNumberOfStrips(tif); strip++) {
+			unsigned char *dat8;
+			int i, ssize;
+			ssize = TIFFReadEncodedStrip(tif, strip, buf, strip_size);
+			dat8 = buf;
+
+			if (Info.tiBps==12){
+				for (i=0; i<ssize; i+=9) {	/*12 bits per pixel*/
+					image->comps[0].data[index]   = ( dat8[i+0]<<4 )		|(dat8[i+1]>>4);
+					image->comps[1].data[index]   = ((dat8[i+1]& 0x0f)<< 8)	| dat8[i+2];
+					image->comps[2].data[index]   = ( dat8[i+3]<<4)			|(dat8[i+4]>>4);
+					image->comps[0].data[index+1] = ((dat8[i+4]& 0x0f)<< 8)	| dat8[i+5];
+					image->comps[1].data[index+1] = ( dat8[i+6] <<4)		|(dat8[i+7]>>4);
+					image->comps[2].data[index+1] = ((dat8[i+7]& 0x0f)<< 8)	| dat8[i+8];
+					index+=2;
+				}
+			}
+			else if( Info.tiBps==16){
+				for (i=0; i<ssize; i+=6) {	/* 16 bits per pixel */
+					image->comps[0].data[index] = ( dat8[i+1] << 8 ) | dat8[i+0];	// R 
+					image->comps[1].data[index] = ( dat8[i+3] << 8 ) | dat8[i+2];	// G 
+					image->comps[2].data[index] = ( dat8[i+5] << 8 ) | dat8[i+4];	// B 
+					if(parameters->cp_cinema){/* Rounding to 12 bits*/
+						image->comps[0].data[index] = (image->comps[0].data[index] + 0x08) >> 4 ;
+						image->comps[1].data[index] = (image->comps[1].data[index] + 0x08) >> 4 ;
+						image->comps[2].data[index] = (image->comps[2].data[index] + 0x08) >> 4 ;
+					}
+					index++;
+				}
+			}
+			else if ( Info.tiBps==8){
+				for (i=0; i<ssize; i+=3) {	/* 8 bits per pixel */
+					image->comps[0].data[index] = dat8[i+0];	// R 
+					image->comps[1].data[index] = dat8[i+1];	// G 
+					image->comps[2].data[index] = dat8[i+2];	// B 
+					if(parameters->cp_cinema){/* Rounding to 12 bits*/
+						image->comps[0].data[index] = image->comps[0].data[index] << 4 ;
+						image->comps[1].data[index] = image->comps[1].data[index] << 4 ;
+						image->comps[2].data[index] = image->comps[2].data[index] << 4 ;
+					}
+					index++;
+				}
+			}
+			else{
+				fprintf(stderr,"Bits=%d, Only 8,12,16 bits implemented\n",Info.tiBps);
+				fprintf(stderr,"Aborting\n");
+				return NULL;
+			}
+		}
+
+		_TIFFfree(buf);
+		TIFFClose(tif);
+	}else if(Info.tiPhoto == 1) { 
+		/* -->> -->> -->>    
+		Black and White
+		<<-- <<-- <<-- */
+
+		numcomps = 1;
+		color_space = CLRSPC_GRAY;
+		/* initialize image components*/ 
+		memset(&cmptparm[0], 0, sizeof(opj_image_cmptparm_t));
+		cmptparm[0].prec = Info.tiBps;
+		cmptparm[0].bpp = Info.tiBps;
+		cmptparm[0].sgnd = 0;
+		cmptparm[0].dx = subsampling_dx;
+		cmptparm[0].dy = subsampling_dy;
+		cmptparm[0].w = w;
+		cmptparm[0].h = h;
+
+		/* create the image*/ 
+		image = opj_image_create(numcomps, &cmptparm[0], color_space);
+		if(!image) {
+			TIFFClose(tif);
+			return NULL;
+		}
+		/* set image offset and reference grid */
+		image->x0 = parameters->image_offset_x0;
+		image->y0 = parameters->image_offset_y0;
+		image->x1 =	!image->x0 ? (w - 1) * subsampling_dx + 1 : image->x0 + (w - 1) * subsampling_dx + 1;
+		image->y1 =	!image->y0 ? (h - 1) * subsampling_dy + 1 : image->y0 + (h - 1) * subsampling_dy + 1;
+
+		buf = _TIFFmalloc(TIFFStripSize(tif));
+		strip_size = 0;
+		strip_size = TIFFStripSize(tif);
+		index = 0;
+		/* Read the Image components*/
+		for (strip = 0; strip < TIFFNumberOfStrips(tif); strip++) {
+			unsigned char *dat8;
+			int i, ssize;
+			ssize = TIFFReadEncodedStrip(tif, strip, buf, strip_size);
+			dat8 = buf;
+
+			if (Info.tiBps==12){
+				for (i=0; i<ssize; i+=3) {	/* 12 bits per pixel*/
+					image->comps[0].data[index] = ( dat8[i+0]<<4 )				|(dat8[i+1]>>4) ;
+					image->comps[0].data[index] = ((dat8[i+1]& 0x0f)<< 8)	| dat8[i+2];
+					index+=2;
+				}
+			}
+			else if( Info.tiBps==16){
+				for (i=0; i<ssize; i+=2) {	/* 16 bits per pixel */
+					image->comps[0].data[index] = ( dat8[i+1] << 8 ) | dat8[i+0];
+					index++;
+				}
+			}
+			else if ( Info.tiBps==8){
+				for (i=0; i<ssize; i+=1) {	/* 8 bits per pixel */
+					image->comps[0].data[index] = dat8[i+0];
+					index++;
+				}
+			}
+			else{
+				fprintf(stderr,"Bits=%d, Only 8,12,16 bits implemented\n",Info.tiBps);
+				fprintf(stderr,"Aborting\n");
+				return NULL;
+			}
+		}
+
+		_TIFFfree(buf);
+		TIFFClose(tif);
+	}else{
+		fprintf(stderr,"False color format. Only RGB & Grayscale has been implemented\n");
+		fprintf(stderr,"Aborting\n");
+		return NULL;
+	}
+	return image;
+}

codec/convert.h

@@ -35,6 +35,9 @@ opj_image_t* bmptoimage(const char *filename, opj_cparameters_t *parameters);
 
 int imagetobmp(opj_image_t *image, const char *outfile);
 
+/* TIFF to image conversion*/
+opj_image_t* tiftoimage(const char *filename, opj_cparameters_t *parameters);
+int imagetotif(opj_image_t *image, const char *outfile);
 /**
 Load a single image component encoded in PGX file format
 @param filename Name of the PGX file to load

codec/dirent.h

@@ -0,0 +1,677 @@
+
+/*
+ * uce-dirent.h - operating system independent dirent implementation
+ * 
+ * Copyright (C) 1998-2002  Toni Ronkko
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * ``Software''), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL TONI RONKKO BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ * 
+ * May 28 1998, Toni Ronkko <tronkko@messi.uku.fi>
+ *
+ * $Id: uce-dirent.h,v 1.7 2002/05/13 10:48:35 tr Exp $
+ *
+ * $Log: uce-dirent.h,v $
+ * Revision 1.7  2002/05/13 10:48:35  tr
+ * embedded some source code directly to the header so that no source
+ * modules need to be included in the MS Visual C project using the
+ * interface, removed all the dependencies to other headers of the `uce'
+ * library so that the header can be made public
+ *
+ * Revision 1.6  2002/04/12 16:22:04  tr
+ * Unified Compiling Environment (UCE) replaced `std' library
+ *
+ * Revision 1.5  2001/07/20 16:33:40  tr
+ * moved to `std' library and re-named defines accordingly
+ *
+ * Revision 1.4  2001/07/10 16:47:18  tronkko
+ * revised comments
+ *
+ * Revision 1.3  2001/01/11 13:16:43  tr
+ * using ``uce-machine.h'' for finding out defines such as `FREEBSD'
+ *
+ * Revision 1.2  2000/10/08 16:00:41  tr
+ * copy of FreeBSD man page
+ *
+ * Revision 1.1  2000/07/10 05:53:16  tr
+ * Initial revision
+ *
+ * Revision 1.2  1998/07/19 18:29:14  tr
+ * Added error reporting capabilities and some asserts.
+ *
+ * Revision 1.1  1998/07/04 16:27:51  tr
+ * Initial revision
+ *
+ * 
+ * MSVC 1.0 scans automatic dependencies incorrectly when your project
+ * contains this very header.  The problem is that MSVC cannot handle
+ * include directives inside #if..#endif block those are never entered.
+ * Since this header ought to compile in many different operating systems,
+ * there had to be several conditional blocks that are compiled only in
+ * operating systems for what they were designed for.  MSVC 1.0 cannot
+ * handle inclusion of sys/dir.h in a part that is compiled only in Apollo
+ * operating system.  To fix the problem you need to insert DIR.H into
+ * SYSINCL.DAT located in MSVC\BIN directory and restart visual C++.
+ * Consult manuals for more informaton about the problem.
+ *
+ * Since many UNIX systems have dirent.h we assume to have one also.
+ * However, if your UNIX system does not have dirent.h you can download one
+ * for example at: http://ftp.uni-mannheim.de/ftp/GNU/dirent/dirent.tar.gz.
+ * You can also see if you have one of dirent.h, direct.h, dir.h, ndir.h,
+ * sys/dir.h and sys/ndir.h somewhere.  Try defining HAVE_DIRENT_H,
+ * HAVE_DIRECT_H, HAVE_DIR_H, HAVE_NDIR_H, HAVE_SYS_DIR_H and
+ * HAVE_SYS_NDIR_H according to the files found.
+ */
+#ifndef DIRENT_H
+#define DIRENT_H
+#define DIRENT_H_INCLUDED
+
+/* find out platform */
+#if defined(MSDOS)                             /* MS-DOS */
+#elif defined(__MSDOS__)                       /* Turbo C/Borland */
+# define MSDOS
+#elif defined(__DOS__)                         /* Watcom */
+# define MSDOS
+#endif
+
+#if defined(WIN32)                             /* MS-Windows */
+#elif defined(__NT__)                          /* Watcom */
+# define WIN32
+#elif defined(_WIN32)                          /* Microsoft */
+# define WIN32
+#elif defined(__WIN32__)                       /* Borland */
+# define WIN32
+#endif
+
+/*
+ * See what kind of dirent interface we have unless autoconf has already
+ * determinated that.
+ */
+#if !defined(HAVE_DIRENT_H) && !defined(HAVE_DIRECT_H) && !defined(HAVE_SYS_DIR_H) && !defined(HAVE_NDIR_H) && !defined(HAVE_SYS_NDIR_H) && !defined(HAVE_DIR_H)
+# if defined(_MSC_VER)                         /* Microsoft C/C++ */
+    /* no dirent.h */
+# elif defined(__BORLANDC__)                   /* Borland C/C++ */
+#   define HAVE_DIRENT_H
+#   define VOID_CLOSEDIR
+# elif defined(__TURBOC__)                     /* Borland Turbo C */
+    /* no dirent.h */
+# elif defined(__WATCOMC__)                    /* Watcom C/C++ */
+#   define HAVE_DIRECT_H
+# elif defined(__apollo)                       /* Apollo */
+#   define HAVE_SYS_DIR_H
+# elif defined(__hpux)                         /* HP-UX */
+#   define HAVE_DIRENT_H
+# elif defined(__alpha) || defined(__alpha__)  /* Alpha OSF1 */
+#   error "not implemented"
+# elif defined(__sgi)                          /* Silicon Graphics */
+#   define HAVE_DIRENT_H
+# elif defined(sun) || defined(_sun)           /* Sun Solaris */
+#   define HAVE_DIRENT_H
+# elif defined(__FreeBSD__)                    /* FreeBSD */
+#   define HAVE_DIRENT_H
+# elif defined(__linux__)                      /* Linux */
+#   define HAVE_DIRENT_H
+# elif defined(__GNUC__)                       /* GNU C/C++ */
+#   define HAVE_DIRENT_H
+# else
+#   error "not implemented"
+# endif
+#endif
+
+/* include proper interface headers */
+#if defined(HAVE_DIRENT_H)
+# include <dirent.h>
+# ifdef FREEBSD
+#   define NAMLEN(dp) ((int)((dp)->d_namlen))
+# else
+#   define NAMLEN(dp) ((int)(strlen((dp)->d_name)))
+# endif
+
+#elif defined(HAVE_NDIR_H)
+# include <ndir.h>
+# define NAMLEN(dp) ((int)((dp)->d_namlen))
+
+#elif defined(HAVE_SYS_NDIR_H)
+# include <sys/ndir.h>
+# define NAMLEN(dp) ((int)((dp)->d_namlen))
+
+#elif defined(HAVE_DIRECT_H)
+# include <direct.h>
+# define NAMLEN(dp) ((int)((dp)->d_namlen))
+
+#elif defined(HAVE_DIR_H)
+# include <dir.h>
+# define NAMLEN(dp) ((int)((dp)->d_namlen))
+
+#elif defined(HAVE_SYS_DIR_H)
+# include <sys/types.h>
+# include <sys/dir.h>
+# ifndef dirent
+#   define dirent direct
+# endif
+# define NAMLEN(dp) ((int)((dp)->d_namlen))
+
+#elif defined(MSDOS) || defined(WIN32)
+
+  /* figure out type of underlaying directory interface to be used */
+# if defined(WIN32)
+#   define DIRENT_WIN32_INTERFACE
+# elif defined(MSDOS)
+#   define DIRENT_MSDOS_INTERFACE
+# else
+#   error "missing native dirent interface"
+# endif
+
+  /*** WIN32 specifics ***/
+# if defined(DIRENT_WIN32_INTERFACE)
+#   include <windows.h>
+#   if !defined(DIRENT_MAXNAMLEN)
+#     define DIRENT_MAXNAMLEN (MAX_PATH)
+#   endif
+
+
+  /*** MS-DOS specifics ***/
+# elif defined(DIRENT_MSDOS_INTERFACE)
+#   include <dos.h>
+
+    /* Borland defines file length macros in dir.h */
+#   if defined(__BORLANDC__)
+#     include <dir.h>
+#     if !defined(DIRENT_MAXNAMLEN)
+#       define DIRENT_MAXNAMLEN ((MAXFILE)+(MAXEXT))
+#     endif
+#     if !defined(_find_t)
+#       define _find_t find_t
+#     endif
+
+    /* Turbo C defines ffblk structure in dir.h */
+#   elif defined(__TURBOC__)
+#     include <dir.h>
+#     if !defined(DIRENT_MAXNAMLEN)
+#       define DIRENT_MAXNAMLEN ((MAXFILE)+(MAXEXT))
+#     endif
+#     define DIRENT_USE_FFBLK
+
+    /* MSVC */
+#   elif defined(_MSC_VER)
+#     if !defined(DIRENT_MAXNAMLEN)
+#       define DIRENT_MAXNAMLEN (12)
+#     endif
+
+    /* Watcom */
+#   elif defined(__WATCOMC__)
+#     if !defined(DIRENT_MAXNAMLEN)
+#       if defined(__OS2__) || defined(__NT__)
+#         define DIRENT_MAXNAMLEN (255)
+#       else
+#         define DIRENT_MAXNAMLEN (12)
+#       endif
+#     endif
+
+#   endif
+# endif
+
+  /*** generic MS-DOS and MS-Windows stuff ***/
+# if !defined(NAME_MAX) && defined(DIRENT_MAXNAMLEN)
+#   define NAME_MAX DIRENT_MAXNAMLEN
+# endif
+# if NAME_MAX < DIRENT_MAXNAMLEN
+#   error "assertion failed: NAME_MAX >= DIRENT_MAXNAMLEN"
+# endif
+
+
+  /*
+   * Substitute for real dirent structure.  Note that `d_name' field is a
+   * true character array although we have it copied in the implementation
+   * dependent data.  We could save some memory if we had declared `d_name'
+   * as a pointer refering the name within implementation dependent data.
+   * We have not done that since some code may rely on sizeof(d_name) to be
+   * something other than four.  Besides, directory entries are typically so
+   * small that it takes virtually no time to copy them from place to place.
+   */
+  typedef struct dirent {
+    char d_name[NAME_MAX + 1];
+
+    /*** Operating system specific part ***/
+# if defined(DIRENT_WIN32_INTERFACE)       /*WIN32*/
+    WIN32_FIND_DATA data;
+# elif defined(DIRENT_MSDOS_INTERFACE)     /*MSDOS*/
+#   if defined(DIRENT_USE_FFBLK)
+    struct ffblk data;
+#   else
+    struct _find_t data;
+#   endif
+# endif
+  } dirent;
+
+  /* DIR substitute structure containing directory name.  The name is
+   * essential for the operation of ``rewinndir'' function. */
+  typedef struct DIR {
+    char          *dirname;                    /* directory being scanned */
+    dirent        current;                     /* current entry */
+    int           dirent_filled;               /* is current un-processed? */
+
+  /*** Operating system specific part ***/
+#  if defined(DIRENT_WIN32_INTERFACE)
+    HANDLE        search_handle;
+#  elif defined(DIRENT_MSDOS_INTERFACE)
+#  endif
+  } DIR;
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+/* supply prototypes for dirent functions */
+static DIR *opendir (const char *dirname);
+static struct dirent *readdir (DIR *dirp);
+static int closedir (DIR *dirp);
+static void rewinddir (DIR *dirp);
+
+/*
+ * Implement dirent interface as static functions so that the user does not
+ * need to change his project in any way to use dirent function.  With this
+ * it is sufficient to include this very header from source modules using
+ * dirent functions and the functions will be pulled in automatically.
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <errno.h>
+
+/* use ffblk instead of _find_t if requested */
+#if defined(DIRENT_USE_FFBLK)
+# define _A_ARCH   (FA_ARCH)
+# define _A_HIDDEN (FA_HIDDEN)
+# define _A_NORMAL (0)
+# define _A_RDONLY (FA_RDONLY)
+# define _A_SUBDIR (FA_DIREC)
+# define _A_SYSTEM (FA_SYSTEM)
+# define _A_VOLID  (FA_LABEL)
+# define _dos_findnext(dest) findnext(dest)
+# define _dos_findfirst(name,flags,dest) findfirst(name,dest,flags)
+#endif
+
+static int _initdir (DIR *p);
+static const char *_getdirname (const struct dirent *dp);
+static void _setdirname (struct DIR *dirp);
+
+/*
+ * <function name="opendir">
+ * <intro>open directory stream for reading
+ * <syntax>DIR *opendir (const char *dirname);
+ *
+ * <desc>Open named directory stream for read and return pointer to the
+ * internal working area that is used for retrieving individual directory
+ * entries.  The internal working area has no fields of your interest.
+ *
+ * <ret>Returns a pointer to the internal working area or NULL in case the 
+ * directory stream could not be opened.  Global `errno' variable will set
+ * in case of error as follows:
+ *
+ * <table>
+ * [EACESS  |Permission denied.
+ * [EMFILE  |Too many open files used by the process.
+ * [ENFILE  |Too many open files in system.
+ * [ENOENT  |Directory does not exist.
+ * [ENOMEM  |Insufficient memory.
+ * [ENOTDIR |dirname does not refer to directory.  This value is not
+ *           reliable on MS-DOS and MS-Windows platforms.  Many
+ *           implementations return ENOENT even when the name refers to a
+ *           file.]
+ * </table>
+ * </function>
+ */
+static DIR *opendir(const char *dirname)
+{
+  DIR *dirp;
+  assert (dirname != NULL);
+  
+  dirp = (DIR*)malloc (sizeof (struct DIR));
+  if (dirp != NULL) {
+    char *p;
+    
+    /* allocate room for directory name */
+    dirp->dirname = (char*) malloc (strlen (dirname) + 1 + strlen ("\\*.*"));
+    if (dirp->dirname == NULL) {
+      /* failed to duplicate directory name.  errno set by malloc() */
+      free (dirp);
+      return NULL;
+    }
+    /* Copy directory name while appending directory separator and "*.*".
+     * Directory separator is not appended if the name already ends with
+     * drive or directory separator.  Directory separator is assumed to be
+     * '/' or '\' and drive separator is assumed to be ':'. */
+    strcpy (dirp->dirname, dirname);
+    p = strchr (dirp->dirname, '\0');
+    if (dirp->dirname < p  &&
+        *(p - 1) != '\\'  &&  *(p - 1) != '/'  &&  *(p - 1) != ':')
+    {
+      strcpy (p++, "\\");
+    }
+# ifdef DIRENT_WIN32_INTERFACE
+    strcpy (p, "*"); /*scan files with and without extension in win32*/
+# else
+    strcpy (p, "*.*"); /*scan files with and without extension in DOS*/
+# endif
+
+    /* open stream */
+    if (_initdir (dirp) == 0) {
+      /* initialization failed */
+      free (dirp->dirname);
+      free (dirp);
+      return NULL;
+    }
+  }
+  return dirp;
+}
+
+
+/*
+ * <function name="readdir">
+ * <intro>read a directory entry
+ * <syntax>struct dirent *readdir (DIR *dirp);
+ *
+ * <desc>Read individual directory entry and return pointer to a structure
+ * containing the name of the entry.  Individual directory entries returned
+ * include normal files, sub-directories, pseudo-directories "." and ".."
+ * and also volume labels, hidden files and system files in MS-DOS and
+ * MS-Windows.   You might want to use stat(2) function to determinate which
+ * one are you dealing with.  Many dirent implementations already contain
+ * equivalent information in dirent structure but you cannot depend on
+ * this.
+ *
+ * The dirent structure contains several system dependent fields that
+ * generally have no interest to you.  The only interesting one is char
+ * d_name[] that is also portable across different systems.  The d_name
+ * field contains the name of the directory entry without leading path.
+ * While d_name is portable across different systems the actual storage
+ * capacity of d_name varies from system to system and there is no portable
+ * way to find out it at compile time as different systems define the
+ * capacity of d_name with different macros and some systems do not define
+ * capacity at all (besides actual declaration of the field). If you really
+ * need to find out storage capacity of d_name then you might want to try
+ * NAME_MAX macro. The NAME_MAX is defined in POSIX standard althought
+ * there are many MS-DOS and MS-Windows implementations those do not define
+ * it.  There are also systems that declare d_name as "char d_name[1]" and
+ * then allocate suitable amount of memory at run-time.  Thanks to Alain
+ * Decamps (Alain.Decamps@advalvas.be) for pointing it out to me.
+ *
+ * This all leads to the fact that it is difficult to allocate space
+ * for the directory names when the very same program is being compiled on
+ * number of operating systems.  Therefore I suggest that you always
+ * allocate space for directory names dynamically.
+ *
+ * <ret>
+ * Returns a pointer to a structure containing name of the directory entry
+ * in `d_name' field or NULL if there was an error.  In case of an error the
+ * global `errno' variable will set as follows:
+ *
+ * <table>
+ * [EBADF  |dir parameter refers to an invalid directory stream.  This value
+ *          is not set reliably on all implementations.]
+ * </table>
+ * </function>
+ */
+static struct dirent *
+readdir (DIR *dirp)
+{
+  assert(dirp != NULL);
+  if (dirp == NULL) {
+    errno = EBADF;
+    return NULL;
+  }
+
+#if defined(DIRENT_WIN32_INTERFACE)
+  if (dirp->search_handle == INVALID_HANDLE_VALUE) {
+    /* directory stream was opened/rewound incorrectly or it ended normally */
+    errno = EBADF;
+    return NULL;
+  }
+#endif
+
+  if (dirp->dirent_filled != 0) {
+    /*
+     * Directory entry has already been retrieved and there is no need to
+     * retrieve a new one.  Directory entry will be retrieved in advance
+     * when the user calls readdir function for the first time.  This is so
+     * because real dirent has separate functions for opening and reading
+     * the stream whereas Win32 and DOS dirents open the stream
+     * automatically when we retrieve the first file.  Therefore, we have to
+     * save the first file when opening the stream and later we have to
+     * return the saved entry when the user tries to read the first entry.
+     */
+    dirp->dirent_filled = 0;
+  } else {
+    /* fill in entry and return that */
+#if defined(DIRENT_WIN32_INTERFACE)
+    if (FindNextFile (dirp->search_handle, &dirp->current.data) == FALSE) {
+      /* Last file has been processed or an error occured */
+      FindClose (dirp->search_handle);
+      dirp->search_handle = INVALID_HANDLE_VALUE;
+      errno = ENOENT;
+      return NULL;
+    }
+
+# elif defined(DIRENT_MSDOS_INTERFACE)
+    if (_dos_findnext (&dirp->current.data) != 0) {
+      /* _dos_findnext and findnext will set errno to ENOENT when no
+       * more entries could be retrieved. */
+      return NULL;
+    }
+# endif
+
+    _setdirname (dirp);
+    assert (dirp->dirent_filled == 0);
+  }
+  return &dirp->current;
+}
+
+
+/*
+ * <function name="closedir">
+ * <intro>close directory stream.
+ * <syntax>int closedir (DIR *dirp);
+ *
+ * <desc>Close directory stream opened by the `opendir' function.  Close of
+ * directory stream invalidates the DIR structure as well as previously read
+ * dirent entry.
+ *
+ * <ret>The function typically returns 0 on success and -1 on failure but
+ * the function may be declared to return void on same systems.  At least
+ * Borland C/C++ and some UNIX implementations use void as a return type.
+ * The dirent wrapper tries to define VOID_CLOSEDIR whenever closedir is
+ * known to return nothing.  The very same definition is made by the GNU
+ * autoconf if you happen to use it.
+ *
+ * The global `errno' variable will set to EBADF in case of error.
+ * </function>
+ */
+static int
+closedir (DIR *dirp)
+{   
+  int retcode = 0;
+
+  /* make sure that dirp points to legal structure */
+  assert (dirp != NULL);
+  if (dirp == NULL) {
+    errno = EBADF;
+    return -1;
+  }
+ 
+  /* free directory name and search handles */
+  if (dirp->dirname != NULL) free (dirp->dirname);
+
+#if defined(DIRENT_WIN32_INTERFACE)
+  if (dirp->search_handle != INVALID_HANDLE_VALUE) {
+    if (FindClose (dirp->search_handle) == FALSE) {
+      /* Unknown error */
+      retcode = -1;
+      errno = EBADF;
+    }
+  }
+#endif                     
+
+  /* clear dirp structure to make sure that it cannot be used anymore*/
+  memset (dirp, 0, sizeof (*dirp));
+# if defined(DIRENT_WIN32_INTERFACE)
+  dirp->search_handle = INVALID_HANDLE_VALUE;
+# endif
+
+  free (dirp);
+  return retcode;
+}
+
+
+/*
+ * <function name="rewinddir">
+ * <intro>rewind directory stream to the beginning
+ * <syntax>void rewinddir (DIR *dirp);
+ *
+ * <desc>Rewind directory stream to the beginning so that the next call of
+ * readdir() returns the very first directory entry again.  However, note
+ * that next call of readdir() may not return the same directory entry as it
+ * did in first time.  The directory stream may have been affected by newly
+ * created files.
+ *
+ * Almost every dirent implementation ensure that rewinddir will update
+ * the directory stream to reflect any changes made to the directory entries
+ * since the previous ``opendir'' or ``rewinddir'' call.  Keep an eye on
+ * this if your program depends on the feature.  I know at least one dirent
+ * implementation where you are required to close and re-open the stream to
+ * see the changes.
+ *
+ * <ret>Returns nothing.  If something went wrong while rewinding, you will
+ * notice it later when you try to retrieve the first directory entry.
+ */
+static void
+rewinddir (DIR *dirp)
+{   
+  /* make sure that dirp is legal */
+  assert (dirp != NULL);
+  if (dirp == NULL) {
+    errno = EBADF;
+    return;
+  }
+  assert (dirp->dirname != NULL);
+  
+  /* close previous stream */
+#if defined(DIRENT_WIN32_INTERFACE)
+  if (dirp->search_handle != INVALID_HANDLE_VALUE) {
+    if (FindClose (dirp->search_handle) == FALSE) {
+      /* Unknown error */
+      errno = EBADF;
+    }
+  }
+#endif
+
+  /* re-open previous stream */
+  if (_initdir (dirp) == 0) {
+    /* initialization failed but we cannot deal with error.  User will notice
+     * error later when she tries to retrieve first directory enty. */
+    /*EMPTY*/;
+  }
+}
+
+
+/*
+ * Open native directory stream object and retrieve first file.
+ * Be sure to close previous stream before opening new one.
+ */
+static int
+_initdir (DIR *dirp)
+{ 
+  assert (dirp != NULL);
+  assert (dirp->dirname != NULL);
+  dirp->dirent_filled = 0;
+
+# if defined(DIRENT_WIN32_INTERFACE)
+  /* Open stream and retrieve first file */
+  dirp->search_handle = FindFirstFile (dirp->dirname, &dirp->current.data);
+  if (dirp->search_handle == INVALID_HANDLE_VALUE) {
+    /* something went wrong but we don't know what.  GetLastError() could
+     * give us more information about the error, but then we should map
+     * the error code into errno. */
+    errno = ENOENT;
+    return 0;
+  }
+
+# elif defined(DIRENT_MSDOS_INTERFACE)
+  if (_dos_findfirst (dirp->dirname,
+          _A_SUBDIR | _A_RDONLY | _A_ARCH | _A_SYSTEM | _A_HIDDEN,
+          &dirp->current.data) != 0)
+  {
+    /* _dos_findfirst and findfirst will set errno to ENOENT when no 
+     * more entries could be retrieved. */
+    return 0;
+  }
+# endif
+
+  /* initialize DIR and it's first entry */
+  _setdirname (dirp);
+  dirp->dirent_filled = 1;
+  return 1;
+}
+
+
+/*
+ * Return implementation dependent name of the current directory entry.
+ */
+static const char *
+_getdirname (const struct dirent *dp)
+{
+#if defined(DIRENT_WIN32_INTERFACE)
+  return dp->data.cFileName;
+  
+#elif defined(DIRENT_USE_FFBLK)
+  return dp->data.ff_name;
+  
+#else
+  return dp->data.name;
+#endif  
+}
+
+
+/*
+ * Copy name of implementation dependent directory entry to the d_name field.
+ */
+static void
+_setdirname (struct DIR *dirp) {
+  /* make sure that d_name is long enough */
+  assert (strlen (_getdirname (&dirp->current)) <= NAME_MAX);
+  
+  strncpy (dirp->current.d_name,
+      _getdirname (&dirp->current),
+      NAME_MAX);
+  dirp->current.d_name[NAME_MAX] = '\0'; /*char d_name[NAME_MAX+1]*/
+}
+  
+# ifdef __cplusplus
+}
+# endif
+# define NAMLEN(dp) ((int)(strlen((dp)->d_name)))
+
+#else
+# error "missing dirent interface"
+#endif
+
+
+#endif /*DIRENT_H*/

codec/image_to_j2k.c

@@ -5,6 +5,7 @@
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team 
+ * Copyright (c) 2006-2007, Parvatha Elangovan
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,6 +36,7 @@
 #include "openjpeg.h"
 #include "compat/getopt.h"
 #include "convert.h"
+#include "dirent.h"
 
 #ifndef WIN32
 #define stricmp strcasecmp
@@ -46,13 +48,37 @@
 #define J2K_CFMT 0
 #define JP2_CFMT 1
 #define JPT_CFMT 2
-#define MJ2_CFMT 3
-#define PXM_DFMT 0
-#define PGX_DFMT 1
-#define BMP_DFMT 2
-#define YUV_DFMT 3
+
+#define PXM_DFMT 10
+#define PGX_DFMT 11
+#define BMP_DFMT 12
+#define YUV_DFMT 13
+#define TIF_DFMT 14
 
 /* ----------------------------------------------------------------------- */
+#define CINEMA_24_CS 1302083	/*Codestream length for 24fps*/
+#define CINEMA_48_CS 651041		/*Codestream length for 48fps*/
+#define COMP_24_CS 1041666		/*Maximum size per color component for 2K & 4K @ 24fps*/
+#define COMP_48_CS 520833		/*Maximum size per color component for 2K @ 48fps*/
+
+typedef struct dircnt{
+	/** Buffer for holding images read from Directory*/
+	char *filename_buf;
+	/** Pointer to the buffer*/
+	char **filename;
+}dircnt_t;
+
+typedef struct img_folder{
+	/** The directory path of the folder containing input images*/
+	char *imgdirpath;
+	/** Output format*/
+	char *out_format;
+	/** Enable option*/
+	char set_imgdir;
+	/** Enable Cod Format for output*/
+	char set_out_format;
+
+}img_fol_t;
 
 void encode_help_display() {
 	fprintf(stdout,"HELP\n----\n\n");
@@ -104,8 +130,18 @@ void encode_help_display() {
 	fprintf(stdout,"------------\n");
 	fprintf(stdout,"\n");
 	fprintf(stdout,"Required Parameters (except with -h):\n");
+	fprintf(stdout,"One of the two options -ImgDir or -i must be used\n");
+	fprintf(stdout,"\n");
+	fprintf(stdout,"-ImgDir      : Image file Directory path (example ../Images) \n");
+	fprintf(stdout,"    When using this option -OutFor must be used\n");
+	fprintf(stdout,"\n");
+	fprintf(stdout,"-OutFor \n");
+	fprintf(stdout,"    REQUIRED only if -ImgDir is used\n");
+	fprintf(stdout,"	  Need to specify only format without filename <BMP>  \n");
+	fprintf(stdout,"    Currently accepts PGM, PPM, PNM, PGX, BMP format\n");
 	fprintf(stdout,"\n");
 	fprintf(stdout,"-i           : source file  (-i source.pnm also *.pgm, *.ppm) \n");
+	fprintf(stdout,"    When using this option -o must be used\n");
 	fprintf(stdout,"\n");
 	fprintf(stdout,"-o           : destination file (-o dest.j2k or .jp2) \n");
 	fprintf(stdout,"\n");
@@ -113,6 +149,12 @@ void encode_help_display() {
 	fprintf(stdout,"\n");
 	fprintf(stdout,"-h           : display the help information \n ");
 	fprintf(stdout,"\n");
+	fprintf(stdout,"-cinema2k    : Digital Cinema 2K profile compliant codestream for 2K resolution.(-cinema2k 24 or 48) \n");
+  fprintf(stdout,"	  Need to specify the frames per second for a 2K resolution. Only 24 or 48 fps is allowed\n"); 
+	fprintf(stdout,"\n");
+	fprintf(stdout,"-cinema4k    : Digital Cinema 4K profile compliant codestream for 4K resolution \n");
+	fprintf(stdout,"	  Frames per second not required. Default value is 24fps\n"); 
+	fprintf(stdout,"\n");
 	fprintf(stdout,"-r           : different compression ratios for successive layers (-r 20,10,5)\n ");
 	fprintf(stdout,"	         - The rate specified for each quality level is the desired \n");
 	fprintf(stdout,"	           compression factor.\n");
@@ -140,6 +182,10 @@ void encode_help_display() {
 	fprintf(stdout,"-s           : subsampling factor (-s 2,2) [-s X,Y] \n");
 	fprintf(stdout,"	     Remark: subsampling bigger than 2 can produce error\n");
 	fprintf(stdout,"\n");
+	fprintf(stdout,"-POC         : Progression order change (-POC T1=0,0,1,5,3,CPRL/T1=5,0,1,6,3,CPRL) \n");
+	fprintf(stdout,"      Example: T1=0,0,1,5,3,CPRL \n");
+	fprintf(stdout,"			 : Ttilenumber=Resolution num start,Component num start,Layer num end,Resolution num end,Component num end,Progression order\n");
+	fprintf(stdout,"\n");
 	fprintf(stdout,"-SOP         : write SOP marker before each packet \n");
 	fprintf(stdout,"\n");
 	fprintf(stdout,"-EPH         : write EPH marker after each header packet \n");
@@ -279,15 +325,65 @@ OPJ_PROG_ORDER give_progression(char progression[4]) {
 	return PROG_UNKNOWN;
 }
 
+int get_num_images(char *imgdirpath){
+	DIR *dir;
+	struct dirent* content;	
+	int num_images = 0;
+
+	/*Reading the input images from given input directory*/
+
+	dir= opendir(imgdirpath);
+	if(!dir){
+		fprintf(stderr,"Could not open Folder %s\n",imgdirpath);
+		return 0;
+	}
+
+	num_images=0;
+	while((content=readdir(dir))!=NULL){
+		if(strcmp(".",content->d_name)==0 || strcmp("..",content->d_name)==0 )
+			continue;
+		num_images++;
+	}
+	return num_images;
+}
+
+int load_images(dircnt_t *dirptr, char *imgdirpath){
+	DIR *dir;
+	struct dirent* content;	
+	int i = 0;
+
+	/*Reading the input images from given input directory*/
+
+	dir= opendir(imgdirpath);
+	if(!dir){
+		fprintf(stderr,"Could not open Folder %s\n",imgdirpath);
+		return 1;
+	}else	{
+		fprintf(stderr,"Folder opened successfully\n");
+	}
+
+	while((content=readdir(dir))!=NULL){
+		if(strcmp(".",content->d_name)==0 || strcmp("..",content->d_name)==0 )
+			continue;
+
+		strcpy(dirptr->filename[i],content->d_name);
+		i++;
+	}
+	return 0;	
+}
+
 int get_file_format(char *filename) {
 	unsigned int i;
 	static const char *extension[] = {
-    "pgx", "pnm", "pgm", "ppm", "bmp", "j2k", "jp2"
+    "pgx", "pnm", "pgm", "ppm", "bmp","tif", "j2k", "jp2", "j2c"
     };
 	static const int format[] = {
-    PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, J2K_CFMT, JP2_CFMT
+    PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT,TIF_DFMT, J2K_CFMT, JP2_CFMT, J2K_CFMT
     };
-	char * ext = strrchr(filename, '.') + 1;
+	char * ext = strrchr(filename, '.');
+	if (ext == NULL)
+		return -1;
+	ext++;
 	for(i = 0; i < sizeof(format)/sizeof(*format); i++) {
 		if(strnicmp(ext, extension[i], 3) == 0) {
 			return format[i];
@@ -297,10 +393,170 @@ int get_file_format(char *filename) {
 	return -1;
 }
 
-/* -------------------------------------------------------------------------*/
+char * get_file_name(char *name){
+	char *fname;
+	fname= (char*)malloc(OPJ_PATH_LEN*sizeof(char));
+	fname= strtok(name,".");
+	return fname;
+}
 
-int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters) {
-	int i, j;
+char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_cparameters_t *parameters){
+	char image_filename[OPJ_PATH_LEN], infilename[OPJ_PATH_LEN],outfilename[OPJ_PATH_LEN],temp_ofname[OPJ_PATH_LEN];
+
+	strcpy(image_filename,dirptr->filename[imageno]);
+	fprintf(stderr,"File Number %d \"%s\"\n",imageno,image_filename);
+	parameters->decod_format = get_file_format(image_filename);
+	if (parameters->decod_format == -1)
+		return 1;
+	sprintf(infilename,"%s/%s",img_fol->imgdirpath,image_filename);
+	strncpy(parameters->infile, infilename, sizeof(infilename));
+
+	//Set output file
+	strcpy(temp_ofname,get_file_name(image_filename));
+	if(img_fol->set_out_format==1){
+		sprintf(outfilename,"%s/%s.%s",img_fol->imgdirpath,temp_ofname,img_fol->out_format);
+		strncpy(parameters->outfile, outfilename, sizeof(outfilename));
+	}
+ return 0;
+}
+
+static int initialise_4K_poc(opj_poc_t *POC, int numres){
+	POC[0].tile  = 1; 
+	POC[0].resno0  = 0; 
+	POC[0].compno0 = 0;
+	POC[0].layno1  = 1;
+	POC[0].resno1  = numres-1;
+	POC[0].compno1 = 3;
+	POC[0].prg1 = CPRL;
+	POC[1].tile  = 1;
+	POC[1].resno0  = numres-1; 
+	POC[1].compno0 = 0;
+	POC[1].layno1  = 1;
+	POC[1].resno1  = numres;
+	POC[1].compno1 = 3;
+	POC[1].prg1 = CPRL;
+	return 2;
+}
+
+void cinema_parameters(opj_cparameters_t *parameters){
+	parameters->tile_size_on = false;
+	parameters->cp_tdx=1;
+	parameters->cp_tdy=1;
+	
+	/*Tile part*/
+	parameters->tp_flag = 'C';
+	parameters->tp_on = 1;
+
+	/*Tile and Image shall be at (0,0)*/
+	parameters->cp_tx0 = 0;
+	parameters->cp_ty0 = 0;
+	parameters->image_offset_x0 = 0;
+	parameters->image_offset_y0 = 0;
+
+	/*Codeblock size= 32*32*/
+	parameters->cblockw_init = 32;	
+	parameters->cblockh_init = 32;
+	parameters->csty |= 0x01;
+
+	/*The progression order shall be CPRL*/
+	parameters->prog_order = CPRL;
+
+	/* No ROI */
+	parameters->roi_compno = -1;
+
+	parameters->subsampling_dx = 1;		parameters->subsampling_dy = 1;
+
+	/* 9-7 transform */
+	parameters->irreversible = 1;
+
+}
+
+void cinema_setup_encoder(opj_cparameters_t *parameters,opj_image_t *image){
+	int i;
+	float temp_rate;
+	opj_poc_t *POC = NULL;
+
+	switch (parameters->cp_cinema){
+	case CINEMA2K_24:
+	case CINEMA2K_48:
+		if(parameters->numresolution > 6){
+			parameters->numresolution = 6;
+		}
+		if (!((image->comps[0].w == 2048) | (image->comps[0].h == 1080))){
+			fprintf(stdout,"Image coordinates %d x %d is not 2K compliant.\nJPEG Digital Cinema Profile-3 (2K profile) compliance requires that at least one of coordinates match 2048 x 1080\n",image->comps[0].w,image->comps[0].h);
+			parameters->cp_rsiz = STD_RSIZ;
+		}
+	break;
+	
+	case CINEMA4K_24:
+		if(parameters->numresolution < 1){
+				parameters->numresolution = 1;
+			}else if(parameters->numresolution > 7){
+				parameters->numresolution = 7;
+			}
+		if (!((image->comps[0].w == 4096) | (image->comps[0].h == 2160))){
+			fprintf(stdout,"Image coordinates %d x %d is not 4K compliant.\nJPEG Digital Cinema Profile-4 (4K profile) compliance requires that atleast one of coordinates match 4096 x 2160\n",image->comps[0].w,image->comps[0].h);
+			parameters->cp_rsiz = STD_RSIZ;
+		}
+		parameters->numpocs = initialise_4K_poc(parameters->POC,parameters->numresolution);
+		break;
+	}
+
+	switch (parameters->cp_cinema){
+		case CINEMA2K_24:
+		case CINEMA4K_24:
+			for(i=0;i<parameters->tcp_numlayers;i++){
+				temp_rate = 0 ;
+				if (parameters->tcp_rates[i]== 0){
+					parameters->tcp_rates[0]= ((float) (image->numcomps * image->comps[0].w * image->comps[0].h * image->comps[0].prec))/ 
+					(CINEMA_24_CS * 8 * image->comps[0].dx * image->comps[0].dy);
+				}else{
+					temp_rate =((float) (image->numcomps * image->comps[0].w * image->comps[0].h * image->comps[0].prec))/ 
+						(parameters->tcp_rates[i] * 8 * image->comps[0].dx * image->comps[0].dy);
+					if (temp_rate > CINEMA_24_CS ){
+						parameters->tcp_rates[i]= ((float) (image->numcomps * image->comps[0].w * image->comps[0].h * image->comps[0].prec))/ 
+																				(CINEMA_24_CS * 8 * image->comps[0].dx * image->comps[0].dy);
+					}
+				}
+			}
+			parameters->max_comp_size = COMP_24_CS;
+			break;
+		
+		case CINEMA2K_48:
+     	for(i=0;i<parameters->tcp_numlayers;i++){
+				temp_rate = 0 ;
+				if (parameters->tcp_rates[i]== 0){
+					parameters->tcp_rates[0]= ((float) (image->numcomps * image->comps[0].w * image->comps[0].h * image->comps[0].prec))/ 
+					(CINEMA_48_CS * 8 * image->comps[0].dx * image->comps[0].dy);
+				}else{
+					temp_rate =((float) (image->numcomps * image->comps[0].w * image->comps[0].h * image->comps[0].prec))/ 
+						(parameters->tcp_rates[i] * 8 * image->comps[0].dx * image->comps[0].dy);
+					if (temp_rate > CINEMA_48_CS ){
+						parameters->tcp_rates[0]= ((float) (image->numcomps * image->comps[0].w * image->comps[0].h * image->comps[0].prec))/ 
+																				(CINEMA_48_CS * 8 * image->comps[0].dx * image->comps[0].dy);
+					}
+				}
+			}
+			parameters->max_comp_size = COMP_48_CS;
+			break;
+	}
+	parameters->cp_disto_alloc = 1;
+}
+
+/* ------------------------------------------------------------------------------------ */
+
+int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,img_fol_t *img_fol) {
+	int i, j,totlen;
+	option_t long_option[]={
+		{"cinema2K",REQ_ARG, NULL ,'w'},
+		{"cinema4K",NO_ARG, NULL ,'y'},
+		{"ImgDir",REQ_ARG, NULL ,'z'},
+		{"TP",REQ_ARG, NULL ,'v'},
+		{"SOP",NO_ARG, NULL ,'S'},
+		{"EPH",NO_ARG, NULL ,'E'},
+		{"OutFor",REQ_ARG, NULL ,'O'},
+		{"POC",REQ_ARG, NULL ,'P'},
+	};
 
 	/* parse the command line */
 /* UniPG>> */
@@ -310,8 +566,11 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
 #endif /* USE_JPWL */
 		;
 
+	totlen=sizeof(long_option);
+	img_fol->set_out_format=0;
+
 	while (1) {
-		int c = getopt(argc, argv, optlist);
+    int c = getopt_long(argc, argv, optlist,long_option,totlen);
 /* <<UniPG */
 		if (c == -1)
 			break;
@@ -324,15 +583,16 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
 					case PGX_DFMT:
 					case PXM_DFMT:
 					case BMP_DFMT:
+					case TIF_DFMT:
 						break;
 					default:
 						fprintf(stderr,
 							"!! Unrecognized format for infile : %s "
-              "[accept only *.pnm, *.pgm, *.ppm, *.pgx or *.bmp] !!\n\n", 
+              "[accept only *.pnm, *.pgm, *.ppm, *.pgx, *.bmp or *.tif] !!\n\n", 
 							infile);
 						return 1;
 				}
-				strncpy(parameters->infile, infile, OPJ_PATH_LEN);
+				strncpy(parameters->infile, infile, sizeof(parameters->infile)-1);
 			}
 			break;
 
@@ -350,11 +610,33 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
 						fprintf(stderr, "Unknown output format image %s [only *.j2k, *.jp2]!! \n", outfile);
 						return 1;
 				}
-				strncpy(parameters->outfile, outfile, OPJ_PATH_LEN);
+				strncpy(parameters->outfile, outfile, sizeof(parameters->outfile)-1);
 			}
 			break;
 
 				/* ----------------------------------------------------- */
+			case 'O':			/* output format */
+				{
+					char outformat[50];
+					char *of = optarg;
+					sprintf(outformat,".%s",of);
+					img_fol->set_out_format = 1;
+					parameters->cod_format = get_file_format(outformat);
+					switch(parameters->cod_format) {
+						case J2K_CFMT:
+						case JP2_CFMT:
+							img_fol->out_format = optarg;
+							break;
+						default:
+							fprintf(stderr, "Unknown output format image [only j2k, jp2]!! \n");
+							return 1;
+					}
+				}
+				break;
+
+
+				/* ----------------------------------------------------- */
+
 
 			case 'r':			/* rates rates/distorsion */
 			{
@@ -498,7 +780,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
 			case 'x':			/* creation of index file */
 			{
 				char *index = optarg;
-				strncpy(parameters->index, index, OPJ_PATH_LEN);
+				strncpy(parameters->index, index, sizeof(parameters->index)-1);
 				parameters->index_on = 1;
 			}
 			break;
@@ -560,16 +842,11 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
 				char *s = optarg;
 				POC = parameters->POC;
 
-				fprintf(stderr, "/----------------------------------\\\n");
-				fprintf(stderr, "|  POC option not fully tested !!  |\n");
-				fprintf(stderr, "\\----------------------------------/\n");
-
-				while (sscanf(s, "T%d=%d,%d,%d,%d,%d,%s", &POC[numpocs].tile,
+				while (sscanf(s, "T%d=%d,%d,%d,%d,%d,%4s", &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; */
+					&POC[numpocs].compno1, &POC[numpocs].progorder) == 7) {
+					POC[numpocs].prg1 = give_progression(POC[numpocs].progorder);
 					numpocs++;
 					while (*s && *s != '/') {
 						s++;
@@ -657,6 +934,57 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
 			}
 			break;
 
+			/* ------------------------------------------------------ */
+			
+			case 'v':			/* Tile part generation*/
+			{
+				parameters->tp_flag = optarg[0];
+				parameters->tp_on = 1;
+			}
+			break;	
+
+				/* ------------------------------------------------------ */
+			
+			case 'z':			/* Image Directory path */
+			{
+				img_fol->imgdirpath = (char*)malloc(strlen(optarg) + 1);
+				strcpy(img_fol->imgdirpath,optarg);
+				img_fol->set_imgdir=1;
+			}
+			break;
+
+				/* ------------------------------------------------------ */
+			
+			case 'w':			/* Digital Cinema 2K profile compliance*/
+			{
+				int fps=0;
+				sscanf(optarg,"%d",&fps);
+				if(fps == 24){
+					parameters->cp_cinema = CINEMA2K_24;
+				}else if(fps == 48 ){
+					parameters->cp_cinema = CINEMA2K_48;
+				}else {
+					fprintf(stderr,"Incorrect value!! must be 24 or 48\n");
+					return 1;
+				}
+				fprintf(stdout,"CINEMA 2K compliant codestream\n");
+				parameters->cp_rsiz = CINEMA2K;
+				
+			}
+			break;
+				
+				/* ------------------------------------------------------ */
+			
+			case 'y':			/* Digital Cinema 4K profile compliance*/
+			{
+				parameters->cp_cinema = CINEMA4K_24;
+				fprintf(stdout,"CINEMA 4K compliant codestream\n");
+				parameters->cp_rsiz = CINEMA4K;
+			}
+			break;
+				
+				/* ------------------------------------------------------ */
+
 /* UniPG>> */
 #ifdef USE_JPWL
 				/* ------------------------------------------------------ */
@@ -668,7 +996,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
 
 				/* we need to enable indexing */
 				if (!parameters->index_on) {
-					strncpy(parameters->index, JPWL_PRIVATEINDEX_NAME, OPJ_PATH_LEN);
+					strncpy(parameters->index, JPWL_PRIVATEINDEX_NAME, sizeof(parameters->index)-1);
 					parameters->index_on = 1;
 				}
 
@@ -978,22 +1306,46 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
 
 			}
 			break;
-#endif USE_JPWL
+#endif /* USE_JPWL */
 /* <<UniPG */
 
 				/* ------------------------------------------------------ */
 
 			default:
-				fprintf(stderr, "ERROR -> this option is not valid \"-%c %s\"\n", c, optarg);
+				fprintf(stderr, "ERROR -> Command line not valid\n");
 				return 1;
 		}
 	}
 
 	/* check for possible errors */
-
-	if((parameters->infile[0] == 0) || (parameters->outfile[0] == 0)) {
-		fprintf(stderr, "usage: image_to_j2k -i image-file -o j2k/jp2-file (+ options)\n");
-		return 1;
+	if (parameters->cp_cinema){
+		if(parameters->tcp_numlayers > 1){
+			parameters->cp_rsiz = STD_RSIZ;
+     	fprintf(stdout,"Warning: DC profiles do not allow more than one quality layer. The codestream created will not be compliant with the DC profile\n");
+		}
+	}
+	if(img_fol->set_imgdir == 1){
+		if(!(parameters->infile[0] == 0)){
+			fprintf(stderr, "Error: options -ImgDir and -i cannot be used together !!\n");
+			return 1;
+		}
+		if(img_fol->set_out_format == 0){
+			fprintf(stderr, "Error: When -ImgDir is used, -OutFor <FORMAT> must be used !!\n");
+			fprintf(stderr, "Only one format allowed! Valid formats are j2k and jp2!!\n");
+			return 1;
+		}
+		if(!((parameters->outfile[0] == 0))){
+			fprintf(stderr, "Error: options -ImgDir and -o cannot be used together !!\n");
+			fprintf(stderr, "Specify OutputFormat using -OutFor<FORMAT> !!\n");
+			return 1;
+		}
+	}else{
+		if((parameters->infile[0] == 0) || (parameters->outfile[0] == 0)) {
+			fprintf(stderr, "Error: One of the options; -i or -ImgDir must be specified\n");
+			fprintf(stderr, "Error: When using -i; -o must be used\n");
+			fprintf(stderr, "usage: image_to_j2k -i image-file -o j2k/jp2-file (+ options)\n");
+			return 1;
+		}
 	}
 
 	if ((parameters->cp_disto_alloc || parameters->cp_fixed_alloc || parameters->cp_fixed_quality)
@@ -1056,8 +1408,12 @@ void info_callback(const char *msg, void *client_data) {
 int main(int argc, char **argv) {
 	bool bSuccess;
 	opj_cparameters_t parameters;	/* compression parameters */
+	img_fol_t img_fol;
 	opj_event_mgr_t event_mgr;		/* event manager */
 	opj_image_t *image = NULL;
+	int i,num_images;
+	int imageno;
+	dircnt_t *dirptr;
 
 	/*
 	configure the event callbacks (not required)
@@ -1072,10 +1428,16 @@ int main(int argc, char **argv) {
 	opj_set_default_encoder_parameters(&parameters);
 
 	/* parse input and get user encoding parameters */
-	if(parse_cmdline_encoder(argc, argv, &parameters) == 1) {
+	if(parse_cmdline_encoder(argc, argv, &parameters,&img_fol) == 1) {
 		return 0;
 	}
 	
+	if (parameters.cp_cinema){
+		cinema_parameters(&parameters);
+	}
+				
+
+	/* Create comment for codestream */
 	if(parameters.cp_comment == NULL) {
     const char comment[] = "Created by OpenJPEG version ";
 		const size_t clen = strlen(comment);
@@ -1092,131 +1454,203 @@ int main(int argc, char **argv) {
 
 	}
 
-	/* decode the source image */
-	/* ----------------------- */
+	/* Read directory if necessary */
 
-	switch (parameters.decod_format) {
-		case PGX_DFMT:
-			image = pgxtoimage(parameters.infile, &parameters);
-			if (!image) {
-				fprintf(stderr, " unable to load pgx file\n");
-				return 1;
-			}
-			break;
+	if(img_fol.set_imgdir==1){
+		num_images=get_num_images(img_fol.imgdirpath);
 
-		case PXM_DFMT:
-			image = pnmtoimage(parameters.infile, &parameters);
-			if (!image) {
-				fprintf(stderr, " not a pnm file\n");
-				return 1;
-			}
-			break;
+		dirptr=(dircnt_t*)malloc(sizeof(dircnt_t));
+		if(dirptr){
+			dirptr->filename_buf = (char*)malloc(num_images*OPJ_PATH_LEN*sizeof(char));	// Stores at max 10 image file names
+			dirptr->filename = (char**) malloc(num_images*sizeof(char*));
 
-		case BMP_DFMT:
-			image = bmptoimage(parameters.infile, &parameters);
-			if (!image) {
-				fprintf(stderr, " not a bmp file\n");
-				return 1;
+			if(!dirptr->filename_buf){
+				return 0;
 			}
-			break;
+			for(i=0;i<num_images;i++){
+				dirptr->filename[i] = dirptr->filename_buf + i*OPJ_PATH_LEN;
+			}
+		}
+		if(load_images(dirptr,img_fol.imgdirpath)==1){
+			return 0;
+		}
+		if (num_images==0){
+			fprintf(stdout,"Folder is empty\n");
+			return 0;
+		}
+	}else{
+		num_images=1;
 	}
+	/*Encoding image one by one*/
+	for(imageno=0;imageno<num_images;imageno++)
+	{
 
-	/* encode the destination image */
-	/* ---------------------------- */
+		image = NULL;
+		fprintf(stderr,"\n");
 		
-	if (parameters.cod_format == J2K_CFMT) {	/* J2K format output */
-		int codestream_length;
-		opj_cio_t *cio = NULL;
-		FILE *f = NULL;
 
-		/* get a J2K compressor handle */
-		opj_cinfo_t* cinfo = opj_create_compress(CODEC_J2K);
-
-		/* catch events using our callbacks and give a local context */
-		opj_set_event_mgr((opj_common_ptr)cinfo, &event_mgr, stderr);
-
-		/* setup the encoder parameters using the current image and user parameters */
-		opj_setup_encoder(cinfo, &parameters, image);
-
-		/* open a byte stream for writing */
-		/* allocate memory for all tiles */
-		cio = opj_cio_open((opj_common_ptr)cinfo, NULL, 0);
-
-		/* encode the image */
-		bSuccess = opj_encode(cinfo, cio, image, parameters.index);
-		if (!bSuccess) {
-			opj_cio_close(cio);
-			fprintf(stderr, "failed to encode image\n");
-			return 1;
+		if(img_fol.set_imgdir==1){
+			if (get_next_file(imageno, dirptr,&img_fol, &parameters)) {
+				fprintf(stderr,"skipping file...\n");
+				continue;
+			}
 		}
-		codestream_length = cio_tell(cio);
+		switch(parameters.decod_format) {
+			case PGX_DFMT:
+				break;
+			case PXM_DFMT:
+				break;
+			case BMP_DFMT:
+				break;
+			case TIF_DFMT:
+				break;
 		
-		/* write the buffer to disk */
-		f = fopen(parameters.outfile, "wb");
-		if (!f) {
-			fprintf(stderr, "failed to open %s for writing\n", parameters.outfile);
-			return 1;
+			default:
+				fprintf(stderr,"skipping file...\n");
+				continue;			
 		}
-		fwrite(cio->buffer, 1, codestream_length, f);
-		fclose(f);
 
-		/* close and free the byte stream */
-		opj_cio_close(cio);
+			/* decode the source image */
+			/* ----------------------- */
 
-		/* free remaining compression structures */
-		opj_destroy_compress(cinfo);
+			switch (parameters.decod_format) {
+				case PGX_DFMT:
+					image = pgxtoimage(parameters.infile, &parameters);
+					if (!image) {
+						fprintf(stderr, "Unable to load pgx file\n");
+						return 1; 
+					}
+					break;
 
-	} else {			/* JP2 format output */
-		int codestream_length;
-		opj_cio_t *cio = NULL;
-		FILE *f = NULL;
+				case PXM_DFMT:
+					image = pnmtoimage(parameters.infile, &parameters);
+					if (!image) {
+						fprintf(stderr, "Unable to load pnm file\n");
+						return 1;
+					}
+					break;
 
-		/* get a JP2 compressor handle */
-		opj_cinfo_t* cinfo = opj_create_compress(CODEC_JP2);
+				case BMP_DFMT:
+					image = bmptoimage(parameters.infile, &parameters);
+					if (!image) {
+						fprintf(stderr, "Unable to load bmp file\n");
+						return 1;
+					}
+					break;
 			
-		/* catch events using our callbacks and give a local context */
-		opj_set_event_mgr((opj_common_ptr)cinfo, &event_mgr, stderr);			
-
-		/* setup the encoder parameters using the current image and using user parameters */
-		opj_setup_encoder(cinfo, &parameters, image);
-
-		/* open a byte stream for writing */
-		/* allocate memory for all tiles */
-		cio = opj_cio_open((opj_common_ptr)cinfo, NULL, 0);
-
-		/* encode the image */
-		bSuccess = opj_encode(cinfo, cio, image, parameters.index);
-		if (!bSuccess) {
-			opj_cio_close(cio);
-			fprintf(stderr, "failed to encode image\n");
-			return 1;
+				case TIF_DFMT:
+					image = tiftoimage(parameters.infile, &parameters);
+					if (!image) {
+						fprintf(stderr, "Unable to load tiff file\n");
+						return 1;
+					}
+				break;
 		}
-		codestream_length = cio_tell(cio);
+			/* Decide if MCT should be used */
+			parameters.tcp_mct = image->numcomps == 3 ? 1 : 0;
 
-		/* write the buffer to disk */
-		f = fopen(parameters.outfile, "wb");
-		if (!f) {
-			fprintf(stderr, "failed to open %s for writing\n", parameters.outfile);
-			return 1;
-		}
-		fwrite(cio->buffer, 1, codestream_length, f);
-		fclose(f);
+			if(parameters.cp_cinema){
+				cinema_setup_encoder(&parameters,image);
+			}
 
-		/* close and free the byte stream */
-		opj_cio_close(cio);
+			/* encode the destination image */
+			/* ---------------------------- */
 
-		/* free remaining compression structures */
-		opj_destroy_compress(cinfo);
+			if (parameters.cod_format == J2K_CFMT) {	/* J2K format output */
+				int codestream_length;
+				opj_cio_t *cio = NULL;
+				FILE *f = NULL;
 
+				/* get a J2K compressor handle */
+				opj_cinfo_t* cinfo = opj_create_compress(CODEC_J2K);
+
+				/* catch events using our callbacks and give a local context */
+				opj_set_event_mgr((opj_common_ptr)cinfo, &event_mgr, stderr);
+
+				/* setup the encoder parameters using the current image and user parameters */
+				opj_setup_encoder(cinfo, &parameters, image);
+
+				/* open a byte stream for writing */
+				/* allocate memory for all tiles */
+				cio = opj_cio_open((opj_common_ptr)cinfo, NULL, 0);
+
+				/* encode the image */
+				bSuccess = opj_encode(cinfo, cio, image, parameters.index);
+				if (!bSuccess) {
+					opj_cio_close(cio);
+					fprintf(stderr, "failed to encode image\n");
+					return 1;
+				}
+				codestream_length = cio_tell(cio);
+
+				/* write the buffer to disk */
+				f = fopen(parameters.outfile, "wb");
+				if (!f) {
+					fprintf(stderr, "failed to open %s for writing\n", parameters.outfile);
+					return 1;
+				}
+				fwrite(cio->buffer, 1, codestream_length, f);
+				fclose(f);
+
+				fprintf(stderr,"Generated outfile %s\n",parameters.outfile);
+				/* close and free the byte stream */
+				opj_cio_close(cio);
+
+				/* free remaining compression structures */
+				opj_destroy_compress(cinfo);
+
+			} else {			/* JP2 format output */
+				int codestream_length;
+				opj_cio_t *cio = NULL;
+				FILE *f = NULL;
+
+				/* get a JP2 compressor handle */
+				opj_cinfo_t* cinfo = opj_create_compress(CODEC_JP2);
+
+				/* catch events using our callbacks and give a local context */
+				opj_set_event_mgr((opj_common_ptr)cinfo, &event_mgr, stderr);			
+
+				/* setup the encoder parameters using the current image and using user parameters */
+				opj_setup_encoder(cinfo, &parameters, image);
+
+				/* open a byte stream for writing */
+				/* allocate memory for all tiles */
+				cio = opj_cio_open((opj_common_ptr)cinfo, NULL, 0);
+
+				/* encode the image */
+				bSuccess = opj_encode(cinfo, cio, image, parameters.index);
+				if (!bSuccess) {
+					opj_cio_close(cio);
+					fprintf(stderr, "failed to encode image\n");
+					return 1;
+				}
+				codestream_length = cio_tell(cio);
+
+				/* write the buffer to disk */
+				f = fopen(parameters.outfile, "wb");
+				if (!f) {
+					fprintf(stderr, "failed to open %s for writing\n", parameters.outfile);
+					return 1;
+				}
+				fwrite(cio->buffer, 1, codestream_length, f);
+				fclose(f);
+				fprintf(stderr,"Generated outfile %s\n",parameters.outfile);
+				/* close and free the byte stream */
+				opj_cio_close(cio);
+
+				/* free remaining compression structures */
+				opj_destroy_compress(cinfo);
+
+			}
+	
+			/* free image data */
+			opj_image_destroy(image);
 	}
 
 	/* free user parameters structure */
   if(parameters.cp_comment) free(parameters.cp_comment);
 	if(parameters.cp_matrice) free(parameters.cp_matrice);
 
-	/* free image data */
-	opj_image_destroy(image);
-
 	return 0;
 }
 

codec/image_to_j2k.dsp

@@ -51,7 +51,8 @@ BSC32=bscmake.exe
 # 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 /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 /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 ../libs/libtiff/libtiff.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libc"
+# SUBTRACT LINK32 /pdb:none
 
 !ELSEIF  "$(CFG)" == "image_to_j2k - Win32 Debug"
 
@@ -64,6 +65,7 @@ LINK32=link.exe
 # 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 /MTd /W3 /Gm /GX /ZI /Od /I "../libopenjpeg" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "OPJ_STATIC" /FD /GZ /c
@@ -75,7 +77,8 @@ BSC32=bscmake.exe
 # 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 /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 /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 ../libs/libtiff/libtiff.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc" /pdbtype:sept
+# SUBTRACT LINK32 /pdb:none
 
 !ENDIF 
 

codec/j2k_to_image.c

@@ -5,6 +5,7 @@
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * Copyright (c) 2006-2007, Parvatha Elangovan
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,6 +36,7 @@
 #include "openjpeg.h"
 #include "compat/getopt.h"
 #include "convert.h"
+#include "dirent.h"
 
 #ifndef WIN32
 #define stricmp strcasecmp
@@ -46,14 +48,35 @@
 #define J2K_CFMT 0
 #define JP2_CFMT 1
 #define JPT_CFMT 2
-#define MJ2_CFMT 3
-#define PXM_DFMT 0
-#define PGX_DFMT 1
-#define BMP_DFMT 2
-#define YUV_DFMT 3
+
+#define PXM_DFMT 10
+#define PGX_DFMT 11
+#define BMP_DFMT 12
+#define YUV_DFMT 13
+#define TIF_DFMT 14
 
 /* ----------------------------------------------------------------------- */
 
+typedef struct dircnt{
+	/** Buffer for holding images read from Directory*/
+	char *filename_buf;
+	/** Pointer to the buffer*/
+	char **filename;
+}dircnt_t;
+
+
+typedef struct img_folder{
+	/** The directory path of the folder containing input images*/
+	char *imgdirpath;
+	/** Output format*/
+	char *out_format;
+	/** Enable option*/
+	char set_imgdir;
+	/** Enable Cod Format for output*/
+	char set_out_format;
+
+}img_fol_t;
+
 void decode_help_display() {
 	fprintf(stdout,"HELP\n----\n\n");
 	fprintf(stdout,"- the -h option displays this help information on screen\n\n");
@@ -66,8 +89,15 @@ void decode_help_display() {
 		"decoder:\n");
 /* <<UniPG */
 	fprintf(stdout,"\n");
+	fprintf(stdout,"\n");
+	fprintf(stdout,"  -ImgDir \n");
+	fprintf(stdout,"	Image file Directory path \n");
+	fprintf(stdout,"  -OutFor \n");
+	fprintf(stdout,"    REQUIRED only if -ImgDir is used\n");
+	fprintf(stdout,"	  Need to specify only format without filename <BMP>  \n");
+	fprintf(stdout,"    Currently accepts PGM, PPM, PNM, PGX, BMP format\n");
 	fprintf(stdout,"  -i <compressed file>\n");
-	fprintf(stdout,"    REQUIRED\n");
+	fprintf(stdout,"    REQUIRED only if an Input image directory not specified\n");
 	fprintf(stdout,"    Currently accepts J2K-files, JP2-files and JPT-files. The file type\n");
 	fprintf(stdout,"    is identified based on its suffix.\n");
 	fprintf(stdout,"  -o <decompressed file>\n");
@@ -103,11 +133,60 @@ void decode_help_display() {
 
 /* -------------------------------------------------------------------------- */
 
+int get_num_images(char *imgdirpath){
+	DIR *dir;
+	struct dirent* content;	
+	int num_images = 0;
+
+	/*Reading the input images from given input directory*/
+
+	dir= opendir(imgdirpath);
+	if(!dir){
+		fprintf(stderr,"Could not open Folder %s\n",imgdirpath);
+		return 0;
+	}
+	
+	while((content=readdir(dir))!=NULL){
+		if(strcmp(".",content->d_name)==0 || strcmp("..",content->d_name)==0 )
+			continue;
+		num_images++;
+	}
+	return num_images;
+}
+
+int load_images(dircnt_t *dirptr, char *imgdirpath){
+	DIR *dir;
+	struct dirent* content;	
+	int i = 0;
+
+	/*Reading the input images from given input directory*/
+
+	dir= opendir(imgdirpath);
+	if(!dir){
+		fprintf(stderr,"Could not open Folder %s\n",imgdirpath);
+		return 1;
+	}else	{
+		fprintf(stderr,"Folder opened successfully\n");
+	}
+	
+	while((content=readdir(dir))!=NULL){
+		if(strcmp(".",content->d_name)==0 || strcmp("..",content->d_name)==0 )
+			continue;
+
+		strcpy(dirptr->filename[i],content->d_name);
+		i++;
+	}
+	return 0;	
+}
+
 int get_file_format(char *filename) {
 	unsigned int i;
-	static const char *extension[] = {"pgx", "pnm", "pgm", "ppm", "bmp", "j2k", "jp2", "jpt" };
-	static const int format[] = { PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, J2K_CFMT, JP2_CFMT, JPT_CFMT };
-	char * ext = strrchr(filename, '.') + 1;
+	static const char *extension[] = {"pgx", "pnm", "pgm", "ppm", "bmp","tif", "j2k", "jp2", "jpt", "j2c" };
+	static const int format[] = { PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, TIF_DFMT, J2K_CFMT, JP2_CFMT, JPT_CFMT, J2K_CFMT };
+	char * ext = strrchr(filename, '.');
+	if (ext == NULL)
+		return -1;
+	ext++;
 	if(ext) {
 		for(i = 0; i < sizeof(format)/sizeof(*format); i++) {
 			if(strnicmp(ext, extension[i], 3) == 0) {
@@ -119,10 +198,36 @@ int get_file_format(char *filename) {
 	return -1;
 }
 
+char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_dparameters_t *parameters){
+	char image_filename[OPJ_PATH_LEN], infilename[OPJ_PATH_LEN],outfilename[OPJ_PATH_LEN],temp_ofname[OPJ_PATH_LEN];
+
+	strcpy(image_filename,dirptr->filename[imageno]);
+	fprintf(stderr,"File Number %d \"%s\"\n",imageno,image_filename);
+	parameters->decod_format = get_file_format(image_filename);
+	if (parameters->decod_format == -1)
+		return 1;
+	sprintf(infilename,"%s/%s",img_fol->imgdirpath,image_filename);
+	strncpy(parameters->infile, infilename, sizeof(infilename));
+
+	//Set output file
+	strcpy(temp_ofname,strtok(image_filename,"."));
+	if(img_fol->set_out_format==1){
+		sprintf(outfilename,"%s/%s.%s",img_fol->imgdirpath,temp_ofname,img_fol->out_format);
+		strncpy(parameters->outfile, outfilename, sizeof(outfilename));
+	}
+	return 0;
+}
+
+
 /* -------------------------------------------------------------------------- */
 
-int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters) {
+int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,img_fol_t *img_fol) {
 	/* parse the command line */
+	int totlen;
+	option_t long_option[]={
+		{"ImgDir",REQ_ARG, NULL ,'y'},
+		{"OutFor",REQ_ARG, NULL ,'O'},
+	};
 
 /* UniPG>> */
 	const char optlist[] = "i:o:r:l:h"
@@ -132,9 +237,10 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters)
 #endif /* USE_JPWL */
 					;
 /* <<UniPG */
-
+	totlen=sizeof(long_option);
+	img_fol->set_out_format = 0;
 	while (1) {
-		int c = getopt(argc, argv, optlist); /* >>JPWL<< */
+		int c = getopt_long(argc, argv,optlist,long_option,totlen);
 		if (c == -1)
 			break;
 		switch (c) {
@@ -153,7 +259,7 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters)
 							infile);
 						return 1;
 				}
-				strncpy(parameters->infile, infile, OPJ_PATH_LEN);
+				strncpy(parameters->infile, infile, sizeof(parameters->infile)-1);
 			}
 			break;
 				
@@ -167,12 +273,43 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters)
 					case PGX_DFMT:
 					case PXM_DFMT:
 					case BMP_DFMT:
+					case TIF_DFMT:
 						break;
 					default:
 						fprintf(stderr, "Unknown output format image %s [only *.pnm, *.pgm, *.ppm, *.pgx or *.bmp]!! \n", outfile);
 						return 1;
 				}
-				strncpy(parameters->outfile, outfile, OPJ_PATH_LEN);
+				strncpy(parameters->outfile, outfile, sizeof(parameters->outfile)-1);
+			}
+			break;
+			
+				/* ----------------------------------------------------- */
+
+			case 'O':			/* output format */
+			{
+				char outformat[50];
+				char *of = optarg;
+				sprintf(outformat,".%s",of);
+				img_fol->set_out_format = 1;
+				parameters->cod_format = get_file_format(outformat);
+				switch(parameters->cod_format) {
+					case PGX_DFMT:
+						img_fol->out_format = "pgx";
+						break;
+					case PXM_DFMT:
+						img_fol->out_format = "ppm";
+						break;
+					case BMP_DFMT:
+						img_fol->out_format = "bmp";
+						break;
+					case TIF_DFMT:
+						img_fol->out_format = "tif";
+						break;
+					default:
+						fprintf(stderr, "Unknown output format image %s [only *.pnm, *.pgm, *.ppm, *.pgx or *.bmp]!! \n");
+						return 1;
+						break;
+				}
 			}
 			break;
 
@@ -200,9 +337,18 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters)
 				decode_help_display();
 				return 1;				
 
+				/* ------------------------------------------------------ */
+
+			case 'y':			/* Image Directory path */
+				{
+					img_fol->imgdirpath = (char*)malloc(strlen(optarg) + 1);
+					strcpy(img_fol->imgdirpath,optarg);
+					img_fol->set_imgdir=1;
+				}
+				break;
+				/* ----------------------------------------------------- */
 /* UniPG>> */
 #ifdef USE_JPWL
-				/* ----------------------------------------------------- */	
 			
 			case 'W': 			/* activate JPWL correction */
 			{
@@ -281,10 +427,27 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters)
 	}
 
 	/* check for possible errors */
-
-	if((parameters->infile[0] == 0) || (parameters->outfile[0] == 0)) {
-		fprintf(stderr,"ERROR -> At least one required argument is missing\nCheck j2k_to_image -h for usage information\n");
-		return 1;
+	if(img_fol->set_imgdir==1){
+		if(!(parameters->infile[0]==0)){
+			fprintf(stderr, "Error: options -ImgDir and -i cannot be used together !!\n");
+			return 1;
+		}
+		if(img_fol->set_out_format == 0){
+			fprintf(stderr, "Error: When -ImgDir is used, -OutFor <FORMAT> must be used !!\n");
+			fprintf(stderr, "Only one format allowed! Valid format PGM, PPM, PNM, PGX,BMP!!\n");
+			return 1;
+		}
+		if(!((parameters->outfile[0] == 0))){
+			fprintf(stderr, "Error: options -ImgDir and -o cannot be used together !!\n");
+			return 1;
+		}
+	}else{
+		if((parameters->infile[0] == 0) || (parameters->outfile[0] == 0)) {
+			fprintf(stderr, "Error: One of option; -i or -ImgDir must be specified\n");
+			fprintf(stderr, "Error: When using -i; -o must be used\n");
+			fprintf(stderr, "usage: image_to_j2k -i *.j2k/jp2 -o *.pgm/ppm/pnm/pgx/bmp(+ options)\n");
+			return 1;
+		}
 	}
 
 	return 0;
@@ -318,12 +481,15 @@ void info_callback(const char *msg, void *client_data) {
 
 int main(int argc, char **argv) {
 	opj_dparameters_t parameters;	/* decompression parameters */
+	img_fol_t img_fol;
 	opj_event_mgr_t event_mgr;		/* event manager */
 	opj_image_t *image = NULL;
 	FILE *fsrc = NULL;
 	unsigned char *src = NULL;
 	int file_length;
-
+	int num_images;
+	int i,imageno;
+	dircnt_t *dirptr;
 	opj_dinfo_t* dinfo = NULL;	/* handle to a decompressor */
 	opj_cio_t *cio = NULL;
 
@@ -336,29 +502,74 @@ int main(int argc, char **argv) {
 	/* set decoding parameters to default values */
 	opj_set_default_decoder_parameters(&parameters);
 
-	/* parse input and get user decoding parameters */
-	if(parse_cmdline_decoder(argc, argv, &parameters) == 1) {
+
+	/* parse input and get user encoding parameters */
+	if(parse_cmdline_decoder(argc, argv, &parameters,&img_fol) == 1) {
 		return 0;
 	}
 
-	/* read the input file and put it in memory */
-	/* ---------------------------------------- */
-	fsrc = fopen(parameters.infile, "rb");
-	if (!fsrc) {
-		fprintf(stderr, "ERROR -> failed to open %s for reading\n", parameters.infile);
-		return 1;
+	if(img_fol.set_imgdir==1){	
+		num_images=get_num_images(img_fol.imgdirpath);
+
+		dirptr=(dircnt_t*)malloc(sizeof(dircnt_t));
+		if(dirptr){
+			dirptr->filename_buf = (char*)malloc(num_images*OPJ_PATH_LEN*sizeof(char));	// Stores at max 10 image file names
+			dirptr->filename = (char**) malloc(num_images*sizeof(char*));
+
+			if(!dirptr->filename_buf){
+				return 0;
+			}
+			for(i=0;i<num_images;i++){
+				dirptr->filename[i] = dirptr->filename_buf + i*OPJ_PATH_LEN;
+			}
+		}
+		if(load_images(dirptr,img_fol.imgdirpath)==1){
+			return 0;
+		}
+		if (num_images==0){
+			fprintf(stdout,"Folder is empty\n");
+			return 0;
+		}
+	}else{
+		num_images=1;
 	}
-	fseek(fsrc, 0, SEEK_END);
-	file_length = ftell(fsrc);
-	fseek(fsrc, 0, SEEK_SET);
-	src = (unsigned char *) malloc(file_length);
-	fread(src, 1, file_length, fsrc);
-	fclose(fsrc);
 
-	/* decode the code-stream */
-	/* ---------------------- */
+	/*Encoding image one by one*/
+	for(imageno = 0; imageno < num_images ; imageno++)
+	{
 
-    switch(parameters.decod_format) {
+		image = NULL;
+		fprintf(stderr,"\n");
+
+		if(img_fol.set_imgdir==1){
+			if (get_next_file(imageno, dirptr,&img_fol, &parameters)) {
+				fprintf(stderr,"skipping file...\n");
+				continue;
+			}
+
+		}
+
+
+		/* read the input file and put it in memory */
+		/* ---------------------------------------- */
+		fsrc = fopen(parameters.infile, "rb");
+		if (!fsrc) {
+			fprintf(stderr, "ERROR -> failed to open %s for reading\n", parameters.infile);
+			return 1;
+		}
+		fseek(fsrc, 0, SEEK_END);
+		file_length = ftell(fsrc);
+		fseek(fsrc, 0, SEEK_SET);
+		src = (unsigned char *) malloc(file_length);
+		fread(src, 1, file_length, fsrc);
+		fclose(fsrc);
+
+
+
+		/* decode the code-stream */
+		/* ---------------------- */
+
+		switch(parameters.decod_format) {
 		case J2K_CFMT:
 		{
 			/* JPEG-2000 codestream */
@@ -451,39 +662,63 @@ int main(int argc, char **argv) {
 		break;
 
 		default:
-			fprintf(stderr, "ERROR -> j2k_to_image : Unknown input image format\n");
-			return 1;
+			fprintf(stderr, "skipping file..\n");
+			continue;
 	}
 
-	/* free the memory containing the code-stream */
-	free(src);
-	src = NULL;
+		/* free the memory containing the code-stream */
+		free(src);
+		src = NULL;
 
-	/* create output image */
-	/* ------------------- */
-
-	switch (parameters.cod_format) {
+		/* create output image */
+		/* ------------------- */
+		switch (parameters.cod_format) {
 		case PXM_DFMT:			/* PNM PGM PPM */
-			imagetopnm(image, parameters.outfile);
+			if (imagetopnm(image, parameters.outfile)) {
+				fprintf(stdout,"Outfile %s not generated\n",parameters.outfile);
+			}
+			else {
+				fprintf(stdout,"Generated Outfile %s\n",parameters.outfile);
+			}
 			break;
 
 		case PGX_DFMT:			/* PGX */
-			imagetopgx(image, parameters.outfile);
+			if(imagetopgx(image, parameters.outfile)){
+				fprintf(stdout,"Outfile %s not generated\n",parameters.outfile);
+			}
+			else {
+				fprintf(stdout,"Generated Outfile %s\n",parameters.outfile);
+			}
 			break;
 
 		case BMP_DFMT:			/* BMP */
-			imagetobmp(image, parameters.outfile);
+			if(imagetobmp(image, parameters.outfile)){
+				fprintf(stdout,"Outfile %s not generated\n",parameters.outfile);
+			}
+			else {
+				fprintf(stdout,"Generated Outfile %s\n",parameters.outfile);
+			}
 			break;
+
+		case TIF_DFMT:			/* TIFF */
+			if(imagetotif(image, parameters.outfile)){
+				fprintf(stdout,"Outfile %s not generated\n",parameters.outfile);
+			}
+			else {
+				fprintf(stdout,"Generated Outfile %s\n",parameters.outfile);
+			}
+			break;
+		}
+
+		/* free remaining structures */
+		if(dinfo) {
+			opj_destroy_decompress(dinfo);
+		}
+		/* free image data structure */
+		opj_image_destroy(image);
+
 	}
-
-	/* free remaining structures */
-	if(dinfo) {
-		opj_destroy_decompress(dinfo);
-	}
-
-	/* free image data structure */
-	opj_image_destroy(image);
-
 	return 0;
 }
+//end main
 

codec/j2k_to_image.dsp

@@ -51,7 +51,8 @@ BSC32=bscmake.exe
 # 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 /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 /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 ../libs/libtiff/libtiff.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libc"
+# SUBTRACT LINK32 /pdb:none
 
 !ELSEIF  "$(CFG)" == "j2k_to_image - Win32 Debug"
 
@@ -64,6 +65,7 @@ LINK32=link.exe
 # 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 /MTd /W3 /Gm /GX /ZI /Od /I "../libopenjpeg" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "OPJ_STATIC" /YX /FD /GZ /c
@@ -74,7 +76,8 @@ BSC32=bscmake.exe
 # 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 /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 /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 ../libs/libtiff/libtiff.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc" /pdbtype:sept
+# SUBTRACT LINK32 /pdb:none
 
 !ENDIF 
 

jp3d/bin/openjpeg.h

@@ -1,715 +0,0 @@
-/*
- * Copyright (c) 2001-2003, David Janssens
- * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Herv<72> Drolon, FreeImage Team
- * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
- * Copyright (c) 2006, M<>nica D<>ez Garc<72>a, Image Processing Laboratory, University of Valladolid, Spain
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef OPENJPEG_H
-#define OPENJPEG_H
-
-#define OPENJPEG_VERSION "1.0.0"
-
-/* 
-==========================================================
-   Compiler directives
-==========================================================
-*/
-
-#if defined(OPJ_STATIC) || !(defined(WIN32) || defined(__WIN32__))
-#define OPJ_API
-#define OPJ_CALLCONV
-#else
-#define OPJ_CALLCONV __stdcall
-/*
-The following ifdef block is the standard way of creating macros which make exporting 
-from a DLL simpler. All files within this DLL are compiled with the OPJ_EXPORTS
-symbol defined on the command line. this symbol should not be defined on any project
-that uses this DLL. This way any other project whose source files include this file see 
-OPJ_API functions as being imported from a DLL, wheras this DLL sees symbols
-defined with this macro as being exported.
-*/
-#ifdef OPJ_EXPORTS
-#define OPJ_API __declspec(dllexport)
-#else
-#define OPJ_API __declspec(dllimport)
-#endif /* OPJ_EXPORTS */
-#endif /* !OPJ_STATIC || !WIN32 */
-
-#ifndef __cplusplus
-#if defined(HAVE_STDBOOL_H)
-/*
-The C language implementation does correctly provide the standard header
-file "stdbool.h".
- */
-#include <stdbool.h>
-#else
-/*
-The C language implementation does not provide the standard header file
-"stdbool.h" as required by ISO/IEC 9899:1999.  Try to compensate for this
-braindamage below.
-*/
-#if !defined(bool)
-#define	bool	int
-#endif
-#if !defined(true)
-#define true	1
-#endif
-#if !defined(false)
-#define	false	0
-#endif
-#endif
-#endif /* __cplusplus */
-
-/* 
-==========================================================
-   Useful constant definitions
-==========================================================
-*/
-#ifndef MAX_SLICES
-#define MAX_SLICES 300	/**< Maximum allowed size for slices */
-#endif /* MAX_PATH */
-
-#ifndef MAX_PATH
-#define MAX_PATH 260	/**< Maximum allowed size for filenames */
-#endif /* MAX_PATH */
-
-#define J3D_MAXRLVLS 32					/**< Number of maximum resolution level authorized */
-#define J3D_MAXBANDS (7*J3D_MAXRLVLS + 1)	/**< Number of maximum sub-band linked to number of resolution level */
-
-#define TINY 1.0E-20
-/* 
-==========================================================
-   enum definitions
-==========================================================
-*/
-
-#define J2K_CFMT 0
-#define J3D_CFMT 1
-#define LSE_CFMT 2
-
-#define BIN_DFMT 0
-#define PGX_DFMT 1
-#define IMG_DFMT 2
-/* ----------------------------------------------------------------------- */
-
-/** Progression order */
-typedef enum PROG_ORDER {
-/**< place-holder */	
-	PROG_UNKNOWN = -1,	
-/**< layer-resolution-component-precinct order */	
-	LRCP = 0,		
-/**< resolution-layer-component-precinct order */	
-	RLCP = 1,		
-/**< resolution-precinct-component-layer order */	
-	RPCL = 2,		
-/**< precinct-component-resolution-layer order */	
-	PCRL = 3,		
-/**< component-precinct-resolution-layer order */	
-	CPRL = 4		
-} OPJ_PROG_ORDER;
-
-/**
-Supported volume color spaces
-*/
-typedef enum COLOR_SPACE {
-/**< place-holder */	
-	CLRSPC_UNKNOWN = -1,	
-/**< sRGB */	
-	CLRSPC_SRGB = 1,		
-/**< grayscale */	
-	CLRSPC_GRAY = 2,		
-/**< YUV */	
-	CLRSPC_SYCC = 3			
-} OPJ_COLOR_SPACE;
-
-/**
-Supported codec
-*/
-typedef enum CODEC_FORMAT {
-	/**< place-holder */
-	CODEC_UNKNOWN = -1,
-/**< JPEG-2000 codestream : read/write */
-	CODEC_J2K = 0,		
-/**< JPEG-2000 Part 10 file format : read/write */
-	CODEC_J3D = 1		
-} OPJ_CODEC_FORMAT;
-
-/**
-Supported entropy coding algorithms
-*/
-typedef enum ENTROPY_CODING {
-/**< place-holder */
-	ENCOD_UNKNOWN = -1,
-/**< 2D EBCOT encoding */
-	ENCOD_2EB = 0,		
-/**< 3D EBCOT encoding */
-	ENCOD_3EB = 1,		
-/**< Golomb-Rice coding with 2D context */
-	ENCOD_2GR = 2,		
-/**< Golomb-Rice coding with 3D context  */
-	ENCOD_3GR = 3		
-} OPJ_ENTROPY_CODING;
-
-/**
-Supported transforms
-*/
-typedef enum TRANSFORM {
-/**< place-holder */
-	TRF_UNKNOWN = -1,	
-/**< 2D DWT, no transform in axial dim */
-	TRF_2D_DWT = 0,		
-/**< 3D DWT */
-	TRF_3D_DWT = 1,		
-/**< 3D prediction*/
-	TRF_3D_RLS = 2,		
-	TRF_3D_LSE = 3
-} OPJ_TRANSFORM;
-/* 
-==========================================================
-   event manager typedef definitions
-==========================================================
-*/
-
-/**
-Callback function prototype for events
-@param msg Event message
-@param client_data 
-*/
-typedef void (*opj_msg_callback) (const char *msg, void *client_data);
-
-/**
-Message handler object
-used for 
-<ul>
-<li>Error messages
-<li>Warning messages
-<li>Debugging messages
-</ul>
-*/
-typedef struct opj_event_mgr {
-	/** Error message callback if available, NULL otherwise */
-	opj_msg_callback error_handler;
-	/** Warning message callback if available, NULL otherwise */
-	opj_msg_callback warning_handler;
-	/** Debug message callback if available, NULL otherwise */
-	opj_msg_callback info_handler;
-} opj_event_mgr_t;
-
-
-/* 
-==========================================================
-   codec typedef definitions
-==========================================================
-*/
-
-/**
-Progression order changes
-*/
-typedef struct opj_poc {
-  int resno0, compno0;
-  int layno1, resno1, compno1;
-  OPJ_PROG_ORDER prg;
-  int tile;
-  char progorder[4];
-} opj_poc_t;
-
-
-/**
-Compression parameters
-*/
-typedef struct opj_cparameters {
-/** size of tile: tile_size_on = false (not in argument) or = true (in argument) */
-	bool tile_size_on;	
-/** XTOsiz */
-	int cp_tx0;
-/** YTOsiz */
-	int cp_ty0;	
-/** ZTOsiz */
-	int cp_tz0;		
-
-/** XTsiz */
-	int cp_tdx;	
-/** YTsiz */
-	int cp_tdy;	
-/** ZTsiz */
-	int cp_tdz;		
-							
-/** allocation by rate/distortion */
-	int cp_disto_alloc;		
-/** allocation by fixed layer */		
-	int cp_fixed_alloc;		
-/** add fixed_quality */	
-	int cp_fixed_quality;	
-/** fixed layer */
-	int *cp_matrice;
-/** number of layers */
-	int tcp_numlayers;
-/** rates for successive layers */
-	float tcp_rates[100];
-/** psnr's for successive layers */
-	float tcp_distoratio[100];	
-/** comment for coding */
-	char *cp_comment;
-/** csty : coding style */
-	int csty;					
-/** DC offset (DCO) */
-	int dcoffset;
-/** progression order (default LRCP) */
-	OPJ_PROG_ORDER prog_order;	
-/** progression order changes */
-	opj_poc_t POC[J3D_MAXRLVLS-1];	
-/** number of progression order changes (POC), default to 0 */
-	int numpocs;				
-
-/** number of resolutions */
-	int numresolution[3];		
-/** initial code block width, height and depth, default to 64 */
- 	int cblock_init[3];			
-/** mode switch (1=BYPASS(LAZY) 2=RESET 4=RESTART(TERMALL) 8=VSC 16=ERTERM(SEGTERM) 32=SEGMARK(SEGSYM)) */
-	int mode;					
-
-/** 1 : use the irreversible DWT 9-7, 0 : use lossless compression (default) */
-	int irreversible;			
-/** WT from ATK, default to 0 (false), no of atk used */
-	int atk_wt[3];
-/** region of interest: affected component in [0..3], -1 means no ROI */
-	int roi_compno;				
-/** region of interest: upshift value */
-	int roi_shift;				
-
-/* number of precinct size specifications */
-	int res_spec;				
-/** initial precinct width */
-	int prct_init[3][J3D_MAXRLVLS];	
-
-/** transform format 0: 0: 2DWT, 1: 2D1P, 2: 3DWT, 3: 3RLS */
-	OPJ_TRANSFORM transform_format;	
-/** output file format 0: 2EB, 1: 3EB, 2: 2GR, 3: 3GR, 4: GRI */
-	OPJ_ENTROPY_CODING encoding_format;	
-
-	/**@name command line encoder parameters (not used inside the library) */
-	/*@{*/
-	char infile[MAX_PATH];		/** input file name */
-	char outfile[MAX_PATH];		/** output file name */
-	char imgfile[MAX_PATH];		/** IMG file name for BIN volumes*/
-	int index_on;				/** creation of an index file, default to 0 (false) */
-	char index[MAX_PATH];		/** index file name */
-	
-	int volume_offset_x0;		/** subvolume encoding: origin volume offset in x, y and z direction */
-	int volume_offset_y0;
-	int volume_offset_z0;
-	
-	int subsampling_dx;			/** subsampling value for dx */
-	int subsampling_dy;
-	int subsampling_dz;
-	
-	int decod_format;			/** input file format 0: BIN, 1: PGX */
-	int cod_format;				/** output file format 0: JP3D */
-	/*@}*/
-} opj_cparameters_t;
-
-/**
-Decompression parameters
-*/
-typedef struct opj_dparameters {
-/** Set the number of highest resolution levels to be discarded. if != 0, then original dimension divided by 2^(reduce); if == 0 or not used, volume is decoded to the full resolution */
-	int cp_reduce[3];		
-/** Set the maximum number of quality layers to decode. if != 0, then only the first "layer" layers are decoded; if == 0 or not used, all the quality layers are decoded 	*/
-	int cp_layer;	
-	int bigendian;
-	
-	/**@name command line encoder parameters (not used inside the library) */
-	/*@{*/
-/** input file name */
-	char infile[MAX_PATH];	
-/** output file name */
-	char outfile[MAX_PATH];	
-/** IMG file name for BIN volumes*/
-	char imgfile[MAX_PATH];
-/** Original file name for PSNR measures*/
-	char original[MAX_PATH];
-/** input file format 0: J2K, 1: JP3D */
-	int decod_format;		
-/** input file format 0: BIN, 1: PGM */
-	int cod_format;
-/** original file format 0: BIN, 1: PGM */
-	int orig_format;	
-	/*@}*/
-} opj_dparameters_t;
-
-/** Common fields between JPEG-2000 compression and decompression master structs. */
-#define opj_common_fields \
-	opj_event_mgr_t *event_mgr;	/**< pointer to the event manager */\
-	void * client_data;			/**< Available for use by application */\
-	bool is_decompressor;		/**< So common code can tell which is which */\
-	OPJ_CODEC_FORMAT codec_format;		/**< selected codec */\
-	OPJ_ENTROPY_CODING encoding_format;	/**< selected entropy coding */\
-	OPJ_TRANSFORM transform_format;		/**< selected transform */\
-	void *j3d_handle			/**< pointer to the J3D codec */
-	
-/* Routines that are to be used by both halves of the library are declared
- * to receive a pointer to this structure.  There are no actual instances of
- * opj_common_struct_t, only of opj_cinfo_t and opj_dinfo_t.
- */
-typedef struct opj_common_struct {
-  opj_common_fields;		/* Fields common to both master struct types */
-  /* Additional fields follow in an actual opj_cinfo_t or
-   * opj_dinfo_t.  All three structs must agree on these
-   * initial fields!  (This would be a lot cleaner in C++.)
-   */
-} opj_common_struct_t;
-
-typedef opj_common_struct_t * opj_common_ptr;
-
-/**
-Compression context info
-*/
-typedef struct opj_cinfo {
-	/** Fields shared with opj_dinfo_t */
-	opj_common_fields;	
-	/* other specific fields go here */
-} opj_cinfo_t;
-
-/**
-Decompression context info
-*/
-typedef struct opj_dinfo {
-	/** Fields shared with opj_cinfo_t */
-	opj_common_fields;	
-	/* other specific fields go here */
-} opj_dinfo_t;
-
-/* 
-==========================================================
-   I/O stream typedef definitions
-==========================================================
-*/
-
-/*
- * Stream open flags.
- */
-/** The stream was opened for reading. */
-#define OPJ_STREAM_READ	0x0001
-/** The stream was opened for writing. */
-#define OPJ_STREAM_WRITE 0x0002
-
-/**
-Byte input-output stream (CIO)
-*/
-typedef struct opj_cio {
-/** codec context */
-	opj_common_ptr cinfo;	
-/** open mode (read/write) either OPJ_STREAM_READ or OPJ_STREAM_WRITE */
-	int openmode;			
-/** pointer to the start of the buffer */
-	unsigned char *buffer;	
-/** buffer size in bytes */
-	int length;				
-/** pointer to the start of the stream */
-	unsigned char *start;		
-/** pointer to the end of the stream */
-	unsigned char *end;			
-/** pointer to the current position */
-	unsigned char *bp;			
-} opj_cio_t;
-
-/* 
-==========================================================
-   volume typedef definitions
-==========================================================
-*/
-
-/**
-Defines a single volume component
-*/
-typedef struct opj_volume_comp {
-/** XRsiz: horizontal separation of a sample of ith component with respect to the reference grid */
-	int dx;	
-/** YRsiz: vertical separation of a sample of ith component with respect to the reference grid */
-	int dy;	
-/** ZRsiz: vertical separation of a sample of ith component with respect to the reference grid */
-	int dz;
-/** data width */
-	int w;	
-	/** data height */
-	int h;	
-	/** data length : no of slices */
-	int l;	
-	/** x component offset compared to the whole volume */
-	int x0;	
-	/** y component offset compared to the whole volume */
-	int y0;	
-	/** z component offset compared to the whole volume */
-	int z0;	
-	/** precision */
-	int prec;	
-	/** volume depth in bits */
-	int bpp;	
-	/** DC offset (15444-2) */
-	int dcoffset;
-	/** signed (1) / unsigned (0) */
-	int sgnd;		
-	/** BE byte order (1) / LE byte order  (0) */
-	int bigendian;
-	/** number of decoded resolution */
-	int resno_decoded[3];	
-	/** number of division by 2 of the out volume compared to the original size of volume */
-	int factor[3];	
-	/** volume component data */
-	int *data;				
-} opj_volume_comp_t;
-
-/** 
-Defines volume data and characteristics
-*/
-typedef struct opj_volume {
-/** XOsiz: horizontal offset from the origin of the reference grid to the left side of the volume area */
-	int x0;	
-/** YOsiz: vertical offset from the origin of the reference grid to the top side of the volume area */
-	int y0;	
-/** ZOsiz: vertical offset from the origin of the reference grid to the top side of the volume area */
-	int z0;	
-/** Xsiz: width of the reference grid */
-	int x1;	
-/** Ysiz: height of the reference grid */
-	int y1;	
-/** Zsiz: length of the reference grid */
-	int z1;	
-/** number of components in the volume */
-	int numcomps;	
-/** number of slices in the volume */
-	int numslices;	
-/** color space: sRGB, Greyscale or YUV */
-	OPJ_COLOR_SPACE color_space;
-/** volume components */
-	opj_volume_comp_t *comps;	
-} opj_volume_t;
-
-/**
-Component parameters structure used by the opj_volume_create function
-*/
-typedef struct opj_volume_comptparm {
-	/** XRsiz: horizontal separation of a sample of ith component with respect to the reference grid */
-	int dx;	
-	/** YRsiz: vertical separation of a sample of ith component with respect to the reference grid */
-	int dy;	
-	/** ZRsiz: axial separation of a sample of ith component with respect to the reference grid */
-	int dz;	
-	/** data width */
-	int w;	
-	/** data height */
-	int h;	
-	/** data length */
-	int l;	
-	/** x component offset compared to the whole volume */
-	int x0;	
-	/** y component offset compared to the whole volume */
-	int y0;
-	/** z component offset compared to the whole volume */
-	int z0;	
-	/** precision */
-	int prec;
-	/** volume depth in bits */
-	int bpp;	
-	/** signed (1) / unsigned (0) */
-	int sgnd;
-	/** DC offset*/
-	int dcoffset;
-	/** BE byte order (1) / LE byte order  (0) */
-	int bigendian;
-} opj_volume_cmptparm_t;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* 
-==========================================================
-   openjpeg version
-==========================================================
-*/
-
-OPJ_API const char * OPJ_CALLCONV opj_version();
-
-/* 
-==========================================================
-   volume functions definitions
-==========================================================
-*/
-
-/**
-Create an volume
-@param numcmpts number of components
-@param cmptparms components parameters
-@param clrspc volume color space
-@return returns a new volume structure if successful, returns NULL otherwise
-*/
-OPJ_API opj_volume_t* OPJ_CALLCONV opj_volume_create(int numcmpts, opj_volume_cmptparm_t *cmptparms, OPJ_COLOR_SPACE clrspc);
-
-/**
-Deallocate any resources associated with an volume
-@param volume volume to be destroyed
-*/
-OPJ_API void OPJ_CALLCONV opj_volume_destroy(opj_volume_t *volume);
-
-/* 
-==========================================================
-   stream functions definitions
-==========================================================
-*/
-
-/**
-Open and allocate a memory stream for read / write. 
-On reading, the user must provide a buffer containing encoded data. The buffer will be 
-wrapped by the returned CIO handle. 
-On writing, buffer parameters must be set to 0: a buffer will be allocated by the library 
-to contain encoded data. 
-@param cinfo Codec context info
-@param buffer Reading: buffer address. Writing: NULL
-@param length Reading: buffer length. Writing: 0
-@return Returns a CIO handle if successful, returns NULL otherwise
-*/
-OPJ_API opj_cio_t* OPJ_CALLCONV opj_cio_open(opj_common_ptr cinfo, unsigned char *buffer, int length);
-
-/**
-Close and free a CIO handle
-@param cio CIO handle to free
-*/
-OPJ_API void OPJ_CALLCONV opj_cio_close(opj_cio_t *cio);
-
-/**
-Get position in byte stream
-@param cio CIO handle
-@return Returns the position in bytes
-*/
-OPJ_API int OPJ_CALLCONV cio_tell(opj_cio_t *cio);
-/**
-Set position in byte stream
-@param cio CIO handle
-@param pos Position, in number of bytes, from the beginning of the stream
-*/
-OPJ_API void OPJ_CALLCONV cio_seek(opj_cio_t *cio, int pos);
-
-/* 
-==========================================================
-   event manager functions definitions
-==========================================================
-*/
-
-OPJ_API opj_event_mgr_t* OPJ_CALLCONV opj_set_event_mgr(opj_common_ptr cinfo, opj_event_mgr_t *event_mgr, void *context);
-
-/* 
-==========================================================
-   codec functions definitions
-==========================================================
-*/
-/**
-Creates a J3D decompression structure
-@param format Decoder to select
-@return Returns a handle to a decompressor if successful, returns NULL otherwise
-*/
-OPJ_API opj_dinfo_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT format);
-/**
-Destroy a decompressor handle
-@param dinfo decompressor handle to destroy
-*/
-OPJ_API void OPJ_CALLCONV opj_destroy_decompress(opj_dinfo_t *dinfo);
-/**
-Set decoding parameters to default values
-@param parameters Decompression parameters
-*/
-OPJ_API void OPJ_CALLCONV opj_set_default_decoder_parameters(opj_dparameters_t *parameters);
-/**
-Setup the decoder decoding parameters using user parameters.
-Decoding parameters are returned in j3d->cp. 
-@param dinfo decompressor handle
-@param parameters decompression parameters
-*/
-OPJ_API void OPJ_CALLCONV opj_setup_decoder(opj_dinfo_t *dinfo, opj_dparameters_t *parameters);
-/**
-Decode an volume from a JPEG-2000 codestream
-@param dinfo decompressor handle
-@param cio Input buffer stream
-@return Returns a decoded volume if successful, returns NULL otherwise
-*/
-OPJ_API opj_volume_t* OPJ_CALLCONV opj_decode(opj_dinfo_t *dinfo, opj_cio_t *cio);
-/**
-Creates a J3D/JP2 compression structure
-@param format Coder to select
-@return Returns a handle to a compressor if successful, returns NULL otherwise
-*/
-OPJ_API opj_cinfo_t* OPJ_CALLCONV opj_create_compress(OPJ_CODEC_FORMAT format);
-/**
-Destroy a compressor handle
-@param cinfo compressor handle to destroy
-*/
-OPJ_API void OPJ_CALLCONV opj_destroy_compress(opj_cinfo_t *cinfo);
-/**
-Set encoding parameters to default values, that means : 
-<ul>
-<li>Lossless
-<li>1 tile
-<li>Size of precinct : 2^15 x 2^15 (means 1 precinct)
-<li>Size of code-block : 64 x 64
-<li>Number of resolutions: 6
-<li>No SOP marker in the codestream
-<li>No EPH marker in the codestream
-<li>No sub-sampling in x or y direction
-<li>No mode switch activated
-<li>Progression order: LRCP
-<li>No index file
-<li>No ROI upshifted
-<li>No offset of the origin of the volume
-<li>No offset of the origin of the tiles
-<li>Reversible DWT 5-3
-</ul>
-@param parameters Compression parameters
-*/
-OPJ_API void OPJ_CALLCONV opj_set_default_encoder_parameters(opj_cparameters_t *parameters);
-/**
-Setup the encoder parameters using the current volume and using user parameters. 
-@param cinfo compressor handle
-@param parameters compression parameters
-@param volume input filled volume
-*/
-OPJ_API void OPJ_CALLCONV opj_setup_encoder(opj_cinfo_t *cinfo, opj_cparameters_t *parameters, opj_volume_t *volume);
-/**
-Encode an volume into a JPEG-2000 codestream
-@param cinfo compressor handle
-@param cio Output buffer stream
-@param volume Volume to encode
-@param index Name of the index file if required, NULL otherwise
-@return Returns true if successful, returns false otherwise
-*/
-OPJ_API bool OPJ_CALLCONV opj_encode(opj_cinfo_t *cinfo, opj_cio_t *cio, opj_volume_t *volume, char *index);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* OPENJPEG_H */

jpwl/JPWL_image_to_j2k.dsp

@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../libopenjpeg" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "OPJ_STATIC" /D "USE_JPWL" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../libopenjpeg" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "OPJ_STATIC" /D "USE_JPWL" /FR /YX /FD /c
 # ADD BASE RSC /l 0x80c /d "NDEBUG"
 # ADD RSC /l 0x80c /d "NDEBUG"
 BSC32=bscmake.exe
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # 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
+# 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 LibOpenJPEG_JPWL.lib ../libs/libtiff/libtiff.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcmt.lib" /libpath:"Release"
 
 !ELSEIF  "$(CFG)" == "JPWL_image_to_j2k - Win32 Debug"
 
@@ -74,7 +74,7 @@ BSC32=bscmake.exe
 # 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
+# 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 LibOpenJPEG_JPWLd.lib ../libs/libtiff/libtiff.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmtd.lib" /pdbtype:sept /libpath:"Debug"
 
 !ENDIF 
 
@@ -91,28 +91,12 @@ SOURCE=..\codec\convert.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\crc.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\codec\compat\getopt.c
 # End Source File
 # Begin Source File
 
 SOURCE=..\codec\image_to_j2k.c
 # End Source File
-# Begin Source File
-
-SOURCE=.\jpwl.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jpwl_lib.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\rs.c
-# End Source File
 # End Group
 # Begin Group "Header Files"
 
@@ -123,24 +107,12 @@ SOURCE=..\codec\convert.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\crc.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\codec\compat\getopt.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\jpwl.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\libopenjpeg\openjpeg.h
 # End Source File
-# Begin Source File
-
-SOURCE=.\rs.h
-# End Source File
 # End Group
 # End Target
 # End Project

jpwl/JPWL_j2k_to_image.dsp

@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # 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
+# 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  ../libs/libtiff/libtiff.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcmt.lib"
 
 !ELSEIF  "$(CFG)" == "JPWL_j2k_to_image - Win32 Debug"
 
@@ -74,7 +74,7 @@ BSC32=bscmake.exe
 # 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
+# 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  ../libs/libtiff/libtiff.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcmtd.lib" /pdbtype:sept
 
 !ENDIF 
 

jpwl/LibOpenJPEG_JPWL.dsp

@@ -37,11 +37,11 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "LibOpenJPEG_JPWL___Win32_Release"
-# PROP Intermediate_Dir "LibOpenJPEG_JPWL___Win32_Release"
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "OPJ_STATIC" /D "USE_JPWL" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "OPJ_STATIC" /D "USE_JPWL" /D "USE_JPSEC" /YX /FD /c
 # ADD BASE RSC /l 0x80c /d "NDEBUG"
 # ADD RSC /l 0x80c /d "NDEBUG"
 BSC32=bscmake.exe
@@ -60,11 +60,11 @@ LIB32=link.exe -lib
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "LibOpenJPEG_JPWL___Win32_Debug"
-# PROP Intermediate_Dir "LibOpenJPEG_JPWL___Win32_Debug"
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "OPJ_STATIC" /D "USE_JPWL" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "OPJ_STATIC" /D "USE_JPWL" /D "USE_JPSEC" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x80c /d "_DEBUG"
 # ADD RSC /l 0x80c /d "_DEBUG"
 BSC32=bscmake.exe
@@ -72,7 +72,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
+# ADD LIB32 /nologo /out:"Debug\LibOpenJPEG_JPWLd.lib"
 
 !ENDIF 
 
@@ -93,6 +93,10 @@ SOURCE=..\libopenjpeg\cio.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\crc.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\libopenjpeg\dwt.c
 # End Source File
 # Begin Source File
@@ -121,6 +125,14 @@ SOURCE=..\libopenjpeg\jpt.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\jpwl.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\jpwl_lib.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\libopenjpeg\mct.c
 # End Source File
 # Begin Source File
@@ -141,6 +153,10 @@ SOURCE=..\libopenjpeg\raw.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\rs.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\libopenjpeg\t1.c
 # End Source File
 # Begin Source File
@@ -169,6 +185,10 @@ SOURCE=..\libopenjpeg\cio.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\crc.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\libopenjpeg\dwt.h
 # End Source File
 # Begin Source File
@@ -205,6 +225,10 @@ SOURCE=..\libopenjpeg\jpt.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\jpwl.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\libopenjpeg\mct.h
 # End Source File
 # Begin Source File
@@ -229,6 +253,10 @@ SOURCE=..\libopenjpeg\raw.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\rs.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\libopenjpeg\t1.h
 # End Source File
 # Begin Source File

jpwl/Makefile

@@ -0,0 +1,33 @@
+# Makefile for the main JPWL OpenJPEG codecs: JPWL_ j2k_to_image and JPWL_image_to_j2k
+
+# General configuration variables:
+CC = gcc
+AR = ar
+
+CFLAGS = -O3 -DUSE_JPWL # -g -p -pg -DUSE_JPWL
+
+OPJ_SRCS = ../libopenjpeg/bio.c ../libopenjpeg/cio.c ../libopenjpeg/dwt.c ../libopenjpeg/event.c ../libopenjpeg/image.c ../libopenjpeg/j2k.c ../libopenjpeg/j2k_lib.c ../libopenjpeg/jp2.c ../libopenjpeg/jpt.c ../libopenjpeg/mct.c ../libopenjpeg/mqc.c ../libopenjpeg/openjpeg.c ../libopenjpeg/pi.c ../libopenjpeg/raw.c ../libopenjpeg/t1.c ../libopenjpeg/t2.c ../libopenjpeg/tcd.c ../libopenjpeg/tgt.c
+JPWL_SRCS = crc.c jpwl.c jpwl_lib.c rs.c
+
+TARGET  = openjpeg_JPWL
+STATICLIB = lib$(TARGET).a
+
+MODULES = $(OPJ_SRCS:.c=.o) $(JPWL_SRCS:.c=.o)
+
+all: JPWL_image_to_j2k JPWL_j2k_to_image
+
+.c.o:
+	$(CC) $(CFLAGS) -c $< -o $@
+
+$(STATICLIB): $(MODULES)
+	$(AR) r $@ $(MODULES)
+
+JPWL_j2k_to_image: ../codec/j2k_to_image.c $(STATICLIB)
+	gcc $(CFLAGS) ../codec/convert.c ../codec/j2k_to_image.c -o JPWL_j2k_to_image -I ../libopenjpeg/ -L . -lopenjpeg_JPWL -lm -lstdc++ 
+
+JPWL_image_to_j2k: ../codec/image_to_j2k.c $(STATICLIB)
+	gcc $(CFLAGS) ../codec/convert.c ../codec/image_to_j2k.c -o JPWL_image_to_j2k -I ../libopenjpeg/ -L . -lopenjpeg_JPWL -lm -lstdc++ 
+
+clean:
+	rm -f JPWL_j2k_to_image JPWL_image_to_j2k *.o *.a
+	cd ../libopenjpeg; rm -f *.o

jpwl/README.txt

@@ -36,7 +36,7 @@ The "jpwl" directory is already populated with a couple of Visual C++ 6.0 worksp
 2.2. Compiling the source code in Unix-like systems
 -----------------------------------------------------
 
-The code has been proven to compile under Linux and MacOS X.
+Under linux, enter the jpwl directory and type "make clean" and "make".
 
 
 3. Running the JPWL software

jpwl/jpwl.h

@@ -380,3 +380,4 @@ Computes the minimum between two integers
 #endif /* USE_JPWL */
 
 #endif /* __JPWL_H */
+

jpwl/jpwl_lib.c

@@ -1483,7 +1483,7 @@ bool jpwl_esd_fill(opj_j2k_t *j2k, jpwl_esd_ms_t *esd, unsigned char *buf) {
 			else
 				/* packet: first is most important, and then in decreasing order
 				down to the last, which counts for 1 */
-				dvalue = jpwl_pfp_to_double(j2k->image_info->num - thispacket, esd->se_size);
+				dvalue = jpwl_pfp_to_double((unsigned short) (j2k->image_info->num - thispacket), esd->se_size);
 			break;
 
 		/* MSE */

jpwl/rs.h

@@ -104,7 +104,7 @@ Computes the minimum between two integers
 #define min(a,b)    (((a) < (b)) ? (a) : (b))
 #endif /* min */
 
-#endif /* __CRC32_HEADER__ */
+#endif /* __RS_HEADER__ */
 
 
 #endif /* USE_JPWL */

libopenjpeg/cio.c

@@ -58,7 +58,7 @@ opj_cio_t* OPJ_CALLCONV opj_cio_open(opj_common_ptr cinfo, unsigned char *buffer
 				opj_free(cio);
 				return NULL;
 		}
-		cio->length = cp->tdx * cp->tdy * cp->tw * cp->th * 4;
+		cio->length = (int) (1.3 * cp->img_size);
 		cio->buffer = (unsigned char *)opj_malloc(cio->length);
 		if(!cio->buffer) {
 			opj_free(cio);

libopenjpeg/dwt.c

@@ -29,33 +29,32 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*
- *  NOTE:
- *  This is a modified version of the openjpeg dwt.c file.
- *  Average speed improvement compared to the original file (measured on
- *  my own machine, a P4 running at 3.0 GHz):
- *  5x3 wavelets about 2 times faster
- *  9x7 wavelets about 3 times faster
- *  for both, encoding and decoding.
- *
- *  The better performance is caused by doing the 1-dimensional DWT
- *  within a temporary buffer where the data can be accessed sequential
- *  for both directions, horizontal and vertical. The 2d vertical DWT was
- *  the major bottleneck in the former version.
- *
- *  I have also removed the "Add Patrick" part because it is not longer
- *  needed.  
- *
- *  6/6/2005
- *  -Ive (aka Reiner Wahler)
- *  mail: ive@lilysoft.com
- */
 
 #include "opj_includes.h"
 
 /** @defgroup DWT DWT - Implementation of a discrete wavelet transform */
 /*@{*/
 
+#define WS(i) v->mem[(i)*2]
+#define WD(i) v->mem[(1+(i)*2)]
+
+/** @name Local data structures */
+/*@{*/
+
+typedef struct dwt_local{
+	int *	mem ;
+	int		dn ;
+	int		sn ;
+	int		cas ;
+	} dwt_t ; 
+
+/*@}*/
+
+/**
+Virtual function type for wavelet transform in 1-D 
+*/
+typedef void (*DWT1DFN)(dwt_t* v);
+
 /** @name Local static functions */
 /*@{*/
 
@@ -70,11 +69,11 @@ static void dwt_deinterleave_v(int *a, int *b, int dn, int sn, int x, int cas);
 /**
 Inverse lazy transform (horizontal)
 */
-static void dwt_interleave_h(int *a, int *b, int dn, int sn, int cas);
+static void dwt_interleave_h(dwt_t* h, int *a);
 /**
 Inverse lazy transform (vertical)
 */
-static void dwt_interleave_v(int *a, int *b, int dn, int sn, int x, int cas);
+static void dwt_interleave_v(dwt_t* v, int *a, int x);
 /**
 Forward 5-3 wavelet tranform in 1-D
 */
@@ -82,7 +81,7 @@ static void dwt_encode_1(int *a, int dn, int sn, int cas);
 /**
 Inverse 5-3 wavelet tranform in 1-D
 */
-static void dwt_decode_1(int *a, int dn, int sn, int cas);
+static void dwt_decode_1(dwt_t *v);
 /**
 Forward 9-7 wavelet transform in 1-D
 */
@@ -90,11 +89,15 @@ static void dwt_encode_1_real(int *a, int dn, int sn, int cas);
 /**
 Inverse 9-7 wavelet transform in 1-D
 */
-static void dwt_decode_1_real(int *a, int dn, int sn, int cas);
+static void dwt_decode_1_real(dwt_t *v);
 /**
 FIXME : comment ???
 */
 static void dwt_encode_stepsize(int stepsize, int numbps, opj_stepsize_t *bandno_stepsize);
+/**
+Inverse wavelet tranform in 2-D.
+*/
+static void dwt_decode_tile(opj_tcd_tilecomp_t * tilec, int stop , DWT1DFN fn);
 
 /*@}*/
 
@@ -155,43 +158,39 @@ static void dwt_deinterleave_v(int *a, int *b, int dn, int sn, int x, int cas) {
 /* <summary>                             */
 /* Inverse lazy transform (horizontal).  */
 /* </summary>                            */
-static void dwt_interleave_h(int *a, int *b, int dn, int sn, int cas) {
-    int i;
-    int *ai = NULL;
-    int *bi = NULL;
-    ai = a;
-    bi = b + cas;
-    for (i = 0; i < sn; i++) {
-      *bi = *ai;  
+static void dwt_interleave_h(dwt_t* h, int *a) {
+    int *ai = a;
+    int *bi = h->mem + h->cas;
+    int  i	= h->sn;
+    while( i-- ) {
+      *bi = *(ai++);
 	  bi += 2;
-	  ai++;
     }
-    ai = a + sn;
-    bi = b + 1 - cas;
-    for (i = 0; i < dn; i++) {
-      *bi = *ai;
+    ai	= a + h->sn;
+    bi	= h->mem + 1 - h->cas;
+    i	= h->dn ;
+    while( i-- ) {
+      *bi = *(ai++);
 	  bi += 2;
-	  ai++;
     }
 }
 
 /* <summary>                             */  
 /* Inverse lazy transform (vertical).    */
 /* </summary>                            */ 
-static void dwt_interleave_v(int *a, int *b, int dn, int sn, int x, int cas) {
-    int i;
-    int *ai = NULL;
-    int *bi = NULL;
-    ai = a;
-    bi = b + cas;
-    for (i = 0; i < sn; i++) {
+static void dwt_interleave_v(dwt_t* v, int *a, int x) {
+    int *ai = a;
+    int *bi = v->mem + v->cas;
+    int  i = v->sn;
+    while( i-- ) {
       *bi = *ai;
 	  bi += 2;
 	  ai += x;
     }
-    ai = a + (sn * x);
-    bi = b + 1 - cas;
-    for (i = 0; i < dn; i++) {
+    ai = a + (v->sn * x);
+    bi = v->mem + 1 - v->cas;
+    i = v->dn ;
+    while( i-- ) {
       *bi = *ai;
 	  bi += 2;  
 	  ai += x;
@@ -223,7 +222,7 @@ static void dwt_encode_1(int *a, int dn, int sn, int cas) {
 /* <summary>                            */
 /* Inverse 5-3 wavelet tranform in 1-D. */
 /* </summary>                           */ 
-static void dwt_decode_1(int *a, int dn, int sn, int cas) {
+static void dwt_decode_1_(int *a, int dn, int sn, int cas) {
 	int i;
 	
 	if (!cas) {
@@ -241,6 +240,13 @@ static void dwt_decode_1(int *a, int dn, int sn, int cas) {
 	}
 }
 
+/* <summary>                            */
+/* Inverse 5-3 wavelet tranform in 1-D. */
+/* </summary>                           */ 
+static void dwt_decode_1(dwt_t *v) {
+	dwt_decode_1_(v->mem, v->dn, v->sn, v->cas);
+}
+
 /* <summary>                             */
 /* Forward 9-7 wavelet transform in 1-D. */
 /* </summary>                            */
@@ -279,40 +285,98 @@ static void dwt_encode_1_real(int *a, int dn, int sn, int cas) {
 	}
 }
 
+static void dwt_decode_sm(dwt_t* v, int k, int n, int x) {
+	int m = k > n ? n : k;
+	int l = v->mem[1];			//D(0);
+	int j;
+	int i;
+	for (i = 0; i < m; i++) {
+		j = l;
+		WS(i) -= fix_mul( ( l = WD(i) ) + j , x);
+	}
+	if( i < k ) {
+		l = fix_mul( l + l , x );
+		for (; i < k; i++)
+			WS(i) -= l;
+	}
+}
+
+static void dwt_decode_sp(dwt_t* v, int k, int n, int x) {
+	int m = k > n ? n : k;
+	int l = v->mem[1];			//D(0);
+	int j;
+	int i;
+	for (i = 0; i < m; i++) {
+		j = l;
+		WS(i) += fix_mul( ( l = WD(i) ) + j , x);
+	}
+	if( i < k ) {
+		l = fix_mul( l + l , x );
+		for (; i < k; i++)
+			WS(i) += l;
+	}
+}
+
+static void dwt_decode_dm(dwt_t* v, int k, int n, int x) {
+	int m = k >= n ? n-1 : k;
+	int l = v->mem[0];				//S(0);
+	int i;
+	int j;
+	for (i = 0; i < m; i++) {
+		j = l;
+		WD(i) -=  fix_mul( ( l = WS(i+1) ) + j , x);
+	}
+	if( i < k ) {
+		l = fix_mul( l + l , x );
+		for (; i < k; i++)
+			WD(i) -= l;
+	}
+}
+
+static void dwt_decode_dp(dwt_t* v, int k, int n, int x) {
+	int m = k >= n ? n-1 : k;
+	int l = v->mem[0];				//S(0);
+	int i;
+	int j;
+	for (i = 0; i < m; i++) {
+		j = l;
+		WD(i) +=  fix_mul( ( l = WS(i+1) ) + j , x);
+	}
+
+	if( i < k ) {
+		l = fix_mul( l + l , x );
+		for (; i < k; i++)
+			WD(i) += l;
+	}
+}
+
+
 /* <summary>                             */
 /* Inverse 9-7 wavelet transform in 1-D. */
 /* </summary>                            */
-static void dwt_decode_1_real(int *a, int dn, int sn, int cas) {
+static void dwt_decode_1_real(dwt_t* v) {
 	int i;
-	if (!cas) {
-		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), 12994);	/* 12993 */
+	if (!v->cas) {
+		if ((v->dn > 0) || (v->sn > 1)) {	/* NEW :  CASE ONE ELEMENT */
+			for (i = 0; i < v->sn; i++)
+				WS(i) = fix_mul(WS(i), 10078);	/* 10076 */
+			for (i = 0; i < v->dn; i++)
+				WD(i) = fix_mul(WD(i), 13318);	/* 13320 */
+			dwt_decode_sm(v, v->sn, v->dn, 3633);
+			dwt_decode_dm(v, v->dn, v->sn, 7233);
+			dwt_decode_sp(v, v->sn, v->dn, 434);
+			dwt_decode_dp(v, v->dn, v->sn, 12994);
 		}
 	} else {
-		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), 12994);	/* 12993 */
+		if ((v->sn > 0) || (v->dn > 1)) {	/* NEW :  CASE ONE ELEMENT */
+			for (i = 0; i < v->sn; i++)
+				WD(i) = fix_mul(WD(i), 10078);	/* 10076 */
+			for (i = 0; i < v->dn; i++)
+				WS(i) = fix_mul(WS(i), 13318);	/* 13320 */
+			dwt_decode_dm(v, v->sn, v->dn, 3633);
+			dwt_decode_sm(v, v->dn, v->sn, 7233);
+			dwt_decode_dp(v, v->sn, v->dn, 434);
+			dwt_decode_sp(v, v->dn, v->sn, 12994);
 		}
 	}
 }
@@ -391,55 +455,7 @@ void dwt_encode(opj_tcd_tilecomp_t * tilec) {
 /* Inverse 5-3 wavelet tranform in 2-D. */
 /* </summary>                           */
 void dwt_decode(opj_tcd_tilecomp_t * tilec, int stop) {
-	int i, j, k;
-	int *a = NULL;
-	int *aj = NULL;
-	int *bj = NULL;
-	int w, l;
-	
-	w = tilec->x1-tilec->x0;
-	l = tilec->numresolutions-1;
-	a = tilec->data;
-	
-	for (i = l - 1; i >= stop; i--) {
-		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                                      */
-		int cas_col;	/* 0 = non inversion on horizontal filtering 1 = inversion between low-pass and high-pass filtering */
-		int cas_row;	/* 0 = non inversion on vertical filtering 1 = inversion between low-pass and high-pass filtering   */
-		int dn, sn;
-		
-		rw = tilec->resolutions[l - i].x1 - tilec->resolutions[l - i].x0;
-		rh = tilec->resolutions[l - i].y1 - tilec->resolutions[l - i].y0;
-		rw1= tilec->resolutions[l - i - 1].x1 - tilec->resolutions[l - i - 1].x0;
-		rh1= tilec->resolutions[l - i - 1].y1 - tilec->resolutions[l - i - 1].y0;
-		
-		cas_row = tilec->resolutions[l - i].x0 % 2;
-		cas_col = tilec->resolutions[l - i].y0 % 2;
-		
-		sn = rw1;
-		dn = rw - rw1;
-		bj = (int*)opj_malloc(rw * sizeof(int));
-		for (j = 0; j < rh; j++) {
-			aj = a + j*w;
-			dwt_interleave_h(aj, bj, dn, sn, cas_row);
-			dwt_decode_1(bj, dn, sn, cas_row);
-			for (k = 0; k < rw; k++)  aj[k] = bj[k];
-		}
-		opj_free(bj);
-		
-		sn = rh1;
-		dn = rh - rh1;
-		bj = (int*)opj_malloc(rh * sizeof(int));
-		for (j = 0; j < rw; j++) {
-			aj = a + j;
-			dwt_interleave_v(aj, bj, dn, sn, w, cas_col);
-			dwt_decode_1(bj, dn, sn, cas_col);
-			for (k = 0; k < rh; k++)  aj[k * w] = bj[k];
-		}
-		opj_free(bj);
-	}
+	dwt_decode_tile(tilec, stop, &dwt_decode_1);
 }
 
 
@@ -522,55 +538,7 @@ void dwt_encode_real(opj_tcd_tilecomp_t * tilec) {
 /* Inverse 9-7 wavelet transform in 2-D. */
 /* </summary>                            */
 void dwt_decode_real(opj_tcd_tilecomp_t * tilec, int stop) {
-	int i, j, k;
-	int *a = NULL;
-	int *aj = NULL;
-	int *bj = NULL;
-	int w, l;
-	
-	w = tilec->x1-tilec->x0;
-	l = tilec->numresolutions-1;
-	a = tilec->data;
-	
-	for (i = l-1; i >= stop; i--) {
-		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  */
-		int cas_col;	/* 0 = non inversion on horizontal filtering 1 = inversion between low-pass and high-pass filtering */
-		int cas_row;	/* 0 = non inversion on vertical filtering 1 = inversion between low-pass and high-pass filtering   */
-		int dn, sn;
-		
-		rw = tilec->resolutions[l - i].x1 - tilec->resolutions[l - i].x0;
-		rh = tilec->resolutions[l - i].y1 - tilec->resolutions[l - i].y0;
-		rw1= tilec->resolutions[l - i - 1].x1 - tilec->resolutions[l - i - 1].x0;
-		rh1= tilec->resolutions[l - i - 1].y1 - tilec->resolutions[l - i - 1].y0;
-		
-		cas_col = tilec->resolutions[l - i].x0 % 2; /* 0 = non inversion on horizontal filtering 1 = inversion between low-pass and high-pass filtering */
-		cas_row = tilec->resolutions[l - i].y0 % 2; /* 0 = non inversion on vertical filtering 1 = inversion between low-pass and high-pass filtering   */
-        
-		sn = rw1;
-		dn = rw-rw1;
-		bj = (int*)opj_malloc(rw * sizeof(int));
-		for (j = 0; j < rh; j++) {
-			aj = a + j * w;
-			dwt_interleave_h(aj, bj, dn, sn, cas_col);
-			dwt_decode_1_real(bj, dn, sn, cas_col);
-			for (k = 0; k < rw; k++)  aj[k] = bj[k];
-		}
-		opj_free(bj);
-		
-		sn = rh1;
-		dn = rh-rh1;
-		bj = (int*)opj_malloc(rh * sizeof(int));
-		for (j = 0; j < rw; j++) {
-			aj = a + j;
-			dwt_interleave_v(aj, bj, dn, sn, w, cas_row);
-			dwt_decode_1_real(bj, dn, sn, cas_row);
-			for (k = 0; k < rh; k++)  aj[k * w] = bj[k];
-		}
-		opj_free(bj);
-	}
+	dwt_decode_tile(tilec, stop, dwt_decode_1_real);
 }
 
 
@@ -609,3 +577,85 @@ void dwt_calc_explicit_stepsizes(opj_tccp_t * tccp, int prec) {
 		dwt_encode_stepsize((int) floor(stepsize * 8192.0), prec + gain, &tccp->stepsizes[bandno]);
 	}
 }
+
+
+/* <summary>                             */
+/* Determine maximum computed resolution level for inverse wavelet transform */
+/* </summary>                            */
+static int dwt_decode_max_resolution(opj_tcd_resolution_t* r, int i) {
+	int mr	= 1;
+	int w;
+	while( --i ) {
+		r++;
+		if( mr < ( w = r->x1 - r->x0 ) )
+			mr = w ;
+		if( mr < ( w = r->y1 - r->y0 ) )
+			mr = w ;
+	}
+	return mr ;
+}
+
+
+/* <summary>                            */
+/* Inverse wavelet tranform in 2-D.     */
+/* </summary>                           */
+static void dwt_decode_tile(opj_tcd_tilecomp_t * tilec, int stop, DWT1DFN dwt_1D) {
+	opj_tcd_resolution_t* tr;
+	int i, j, k;
+	int *a = NULL;
+	int *aj = NULL;
+	int *m;
+	int w; //, l;
+	int rw;			/* width of the resolution level computed  */
+	int rh;			/* heigth of the resolution level computed  */
+	dwt_t h;
+	dwt_t v;
+	
+	if( 1 > ( i = tilec->numresolutions - stop ) )
+		return ;
+
+	tr = tilec->resolutions;
+
+	w = tilec->x1-tilec->x0;
+	a = tilec->data;
+
+	m = (int*)opj_malloc(sizeof(int) * (dwt_decode_max_resolution(tr, i)+5));
+	h.mem = v.mem = (int*)( (unsigned)m + 16 - ( (unsigned)m % 16 ) ) ;
+
+	rw = tr->x1 - tr->x0;
+	rh = tr->y1 - tr->y0;
+
+	while( --i ) {
+		tr++;
+		h.sn = rw;
+		v.sn = rh;
+		h.dn = ( rw = tr->x1 - tr->x0 ) - h.sn;
+		v.dn = ( rh = tr->y1 - tr->y0 ) - v.sn;
+				
+		h.cas = tr->x0 % 2;
+		v.cas = tr->y0 % 2;
+
+		aj = a;
+		j = rh;
+		while( j-- ) {		
+			dwt_interleave_h(&h, aj);
+			(dwt_1D)(&h);
+			k = rw;
+			while( k-- )
+				aj[k] = h.mem[k];
+			aj += w;
+		}
+
+		aj = a;
+		j = rw;
+		while( j-- ) {
+			dwt_interleave_v(&v, aj, w);
+			(dwt_1D)(&v);
+			k = rh;
+			while( k-- )
+				aj[k * w] = v.mem[k];
+			aj++;
+		}
+	}
+	opj_free(m);
+}

libopenjpeg/fix.h

@@ -54,8 +54,9 @@ Multiply two fixed-precision rational numbers.
 @return Returns a * b
 */
 static INLINE int fix_mul(int a, int b) {
-    int64 temp = (int64) a * (int64) b >> 12;
-    return (int) ((temp >> 1) + (temp & 1)) ;
+    int64 temp = (int64) a * (int64) b ;
+    temp += temp & 4096;
+    return (int) (temp >> 13) ;
 }
 
 /*@}*/

libopenjpeg/j2k.h

@@ -5,6 +5,7 @@
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * Copyright (c) 2006-2007, Parvatha Elangovan
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -103,6 +104,14 @@ typedef enum J2K_STATUS {
 
 /* ----------------------------------------------------------------------- */
 
+/** 
+T2 encoding mode 
+*/
+typedef enum T2_MODE {
+	THRESH_CALC = 0,	/** Function called in Rate allocation process*/
+	FINAL_PASS = 1		/** Function called in Tier 2 process*/
+}J2K_T2_MODE;
+
 /**
 Quantization stepsize
 */
@@ -187,6 +196,20 @@ typedef struct opj_tcp {
 Coding parameters
 */
 typedef struct opj_cp {
+	/** Digital cinema profile*/
+	OPJ_CINEMA_MODE cinema;
+	/** Maximum rate for each component. If == 0, component size limitation is not considered */
+	int max_comp_size;
+	/** Size of the image in bits*/
+	int img_size;
+	/** Rsiz*/
+	OPJ_RSIZ_CAPABILITIES rsiz;
+	/** Enabling Tile part generation*/
+	char tp_on;
+	/** Flag determining tile part generation*/
+	char tp_flag;
+	/** Position of tile part flag in progression order*/
+	int tp_pos;
 	/** allocation by rate/distortion */
 	int disto_alloc;
 	/** allocation by fixed layer */
@@ -197,6 +220,8 @@ typedef struct opj_cp {
 	int reduce;
 	/** if != 0, then only the first "layer" layers are decoded; if == 0 or not used, all the quality layers are decoded */
 	int layer;
+	/** if == NO_LIMITATION, decode entire codestream; if == LIMIT_TO_MAIN_HEADER then only decode the main header */
+	OPJ_LIMIT_DECODING limit_decoding;
 	/** 0 = no index || 1 = index */
 	int index_on;
 	/** XTOsiz */
@@ -376,6 +401,20 @@ typedef struct opj_j2k {
 	int state;
 	/** number of the tile curently concern by coding/decoding */
 	int curtileno;
+	/** Tile part number*/
+	int tp_num;
+	/** Tilepart number currently coding*/
+	int cur_tp_num;
+	/** Total number of tileparts of the current tile*/
+	int *cur_totnum_tp;
+	/**
+	locate the start position of the TLM marker  
+	after encoding the tilepart, a jump (in j2k_write_sod) is done to the TLM marker to store the value of its length. 
+	*/
+	int tlm_start;
+	/** Total num of tile parts in whole image = num tiles* num tileparts in each tile*/
+	/** used in TLMmarker*/
+	int totnum_tp;	
 	/** 
 	locate the position of the end of the tile in the codestream, 
 	used to detect a truncated codestream (in j2k_read_sod)
@@ -466,6 +505,10 @@ Coding parameters are returned in j2k->cp.
 */
 void j2k_setup_encoder(opj_j2k_t *j2k, opj_cparameters_t *parameters, opj_image_t *image);
 /**
+Converts an enum type progression order to string type
+*/
+char *j2k_convert_progression_order(OPJ_PROG_ORDER prg_order);
+/**
 Encode an image into a JPEG-2000 codestream
 @param j2k J2K compressor handle
 @param cio Output buffer stream

libopenjpeg/jp2.c

@@ -59,19 +59,6 @@ static bool jp2_read_bpcc(opj_jp2_t *jp2, opj_cio_t *cio);
 static void jp2_write_colr(opj_jp2_t *jp2, opj_cio_t *cio);
 static bool jp2_read_colr(opj_jp2_t *jp2, opj_cio_t *cio);
 /**
-Write the JP2H box - JP2 Header box
-@param jp2 JP2 handle
-@param cio Output buffer stream
-*/
-static void jp2_write_jp2h(opj_jp2_t *jp2, opj_cio_t *cio);
-/**
-Read the JP2H box - JP2 Header box
-@param jp2 JP2 handle
-@param cio Input buffer stream
-@return Returns true if successful, returns false otherwise
-*/
-static bool jp2_read_jp2h(opj_jp2_t *jp2, opj_cio_t *cio);
-/**
 Write the FTYP box - File type box
 @param jp2 JP2 handle
 @param cio Output buffer stream
@@ -308,7 +295,7 @@ static bool jp2_read_colr(opj_jp2_t *jp2, opj_cio_t *cio) {
 	return true;
 }
 
-static void jp2_write_jp2h(opj_jp2_t *jp2, opj_cio_t *cio) {
+void jp2_write_jp2h(opj_jp2_t *jp2, opj_cio_t *cio) {
 	opj_jp2_box_t box;
 
 	box.init_pos = cio_tell(cio);
@@ -328,7 +315,7 @@ static void jp2_write_jp2h(opj_jp2_t *jp2, opj_cio_t *cio) {
 	cio_seek(cio, box.init_pos + box.length);
 }
 
-static bool jp2_read_jp2h(opj_jp2_t *jp2, opj_cio_t *cio) {
+bool jp2_read_jp2h(opj_jp2_t *jp2, opj_cio_t *cio) {
 	opj_jp2_box_t box;
 	int skip_len;
 

libopenjpeg/jp2.h

@@ -102,6 +102,19 @@ typedef struct opj_jp2_box {
 /*@{*/
 /* ----------------------------------------------------------------------- */
 /**
+Write the JP2H box - JP2 Header box (used in MJ2)
+@param jp2 JP2 handle
+@param cio Output buffer stream
+*/
+void jp2_write_jp2h(opj_jp2_t *jp2, opj_cio_t *cio);
+/**
+Read the JP2H box - JP2 Header box (used in MJ2)
+@param jp2 JP2 handle
+@param cio Input buffer stream
+@return Returns true if successful, returns false otherwise
+*/
+bool jp2_read_jp2h(opj_jp2_t *jp2, opj_cio_t *cio);
+/**
 Creates a JP2 decompression structure
 @param cinfo Codec context info
 @return Returns a handle to a JP2 decompressor if successful, returns NULL otherwise

libopenjpeg/mqc.c

@@ -439,9 +439,9 @@ int mqc_bypass_flush_enc(opj_mqc_t *mqc) {
 
 void mqc_reset_enc(opj_mqc_t *mqc) {
 	mqc_resetstates(mqc);
-	mqc_setstate(mqc, 18, 0, 46);
-	mqc_setstate(mqc, 0, 0, 3);
-	mqc_setstate(mqc, 1, 0, 4);
+	mqc_setstate(mqc, T1_CTXNO_UNI, 0, 46);
+	mqc_setstate(mqc, T1_CTXNO_AGG, 0, 3);
+	mqc_setstate(mqc, T1_CTXNO_ZC, 0, 4);
 }
 
 int mqc_restart_enc(opj_mqc_t *mqc) {

libopenjpeg/openjpeg.c

@@ -116,6 +116,7 @@ void OPJ_CALLCONV opj_set_default_decoder_parameters(opj_dparameters_t *paramete
 		/* default decoding parameters */
 		parameters->cp_layer = 0;
 		parameters->cp_reduce = 0;
+		parameters->cp_limit_decoding = NO_LIMITATION;
 
 		parameters->decod_format = -1;
 		parameters->cod_format = -1;
@@ -221,14 +222,17 @@ void OPJ_CALLCONV opj_set_default_encoder_parameters(opj_cparameters_t *paramete
 	if(parameters) {
 		memset(parameters, 0, sizeof(opj_cparameters_t));
 		/* default coding parameters */
+		parameters->cp_cinema = OFF; 
+		parameters->max_comp_size = 0;
 		parameters->numresolution = 6;
+		parameters->cp_rsiz = STD_RSIZ;
 		parameters->cblockw_init = 64;
 		parameters->cblockh_init = 64;
 		parameters->prog_order = LRCP;
 		parameters->roi_compno = -1;		/* no ROI */
 		parameters->subsampling_dx = 1;
 		parameters->subsampling_dy = 1;
-
+		parameters->tp_on = 0;
 		parameters->decod_format = -1;
 		parameters->cod_format = -1;
 /* UniPG>> */
@@ -261,7 +265,7 @@ void OPJ_CALLCONV opj_set_default_encoder_parameters(opj_cparameters_t *paramete
 				parameters->jpwl_sens_TPH[i] = -1; /* absent */
 			}
 		};
-#endif USE_JPWL
+#endif /* USE_JPWL */
 /* <<UniPG */
 	}
 }

libopenjpeg/openjpeg.h

@@ -5,6 +5,7 @@
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * Copyright (c) 2006-2007, Parvatha Elangovan
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -31,7 +32,7 @@
 #ifndef OPENJPEG_H
 #define OPENJPEG_H
 
-#define OPENJPEG_VERSION "1.1.0"
+#define OPENJPEG_VERSION "1.2.0"
 
 /* 
 ==========================================================
@@ -96,7 +97,6 @@ braindamage below.
 #define J2K_MAXBANDS (3*J2K_MAXRLVLS-2)	/**< Number of maximum sub-band linked to number of resolution level */
 
 /* UniPG>> */
-#ifdef USE_JPWL
 #define JPWL_MAX_NO_TILESPECS	16 /**< Maximum number of tile parts expected by JPWL: increase at your will */
 #define JPWL_MAX_NO_PACKSPECS	16 /**< Maximum number of packet parts expected by JPWL: increase at your will */
 #define JPWL_MAX_NO_MARKERS	512 /**< Maximum number of JPWL markers: increase at your will */
@@ -104,7 +104,6 @@ braindamage below.
 #define JPWL_EXPECTED_COMPONENTS 3 /**< Expect this number of components, so you'll find better the first EPB */
 #define JPWL_MAXIMUM_TILES 8192 /**< Expect this maximum number of tiles, to avoid some crashes */
 #define JPWL_MAXIMUM_HAMMING 2 /**< Expect this maximum number of bit errors in marker id's */
-#endif /* USE_JPWL */
 /* <<UniPG */
 
 /* 
@@ -112,8 +111,28 @@ braindamage below.
    enum definitions
 ==========================================================
 */
+/** 
+Rsiz Capabilities
+*/
+typedef enum RSIZ_CAPABILITIES {
+	STD_RSIZ = 0,		/** Standard JPEG2000 profile*/
+	CINEMA2K = 3,		/** Profile name for a 2K image*/
+	CINEMA4K = 4		/** Profile name for a 4K image*/
+} OPJ_RSIZ_CAPABILITIES;
 
-/** Progression order */
+/** 
+Digital cinema operation mode 
+*/
+typedef enum CINEMA_MODE {
+	OFF = 0,					/** Not Digital Cinema*/
+	CINEMA2K_24 = 1,	/** 2K Digital Cinema at 24 fps*/
+	CINEMA2K_48 = 2,	/** 2K Digital Cinema at 48 fps*/
+	CINEMA4K_24 = 3		/** 4K Digital Cinema at 24 fps*/
+}OPJ_CINEMA_MODE;
+
+/** 
+Progression order 
+*/
 typedef enum PROG_ORDER {
 	PROG_UNKNOWN = -1,	/**< place-holder */
 	LRCP = 0,		/**< layer-resolution-component-precinct order */
@@ -143,6 +162,15 @@ typedef enum CODEC_FORMAT {
 	CODEC_JP2 = 2		/**< JPEG-2000 file format : read/write */
 } OPJ_CODEC_FORMAT;
 
+/** 
+Limit decoding to certain portions of the codestream. 
+*/
+typedef enum LIMIT_DECODING {
+	NO_LIMITATION = 0,				  /**< No limitation for the decoding. The entire codestream will de decoded */
+	LIMIT_TO_MAIN_HEADER = 1,		/**< The decoding is limited to the Main Header */
+	DECODE_ALL_BUT_PACKETS = 2	/**< Decode everything except the JPEG 2000 packets */
+} OPJ_LIMIT_DECODING;
+
 /* 
 ==========================================================
    event manager typedef definitions
@@ -185,11 +213,28 @@ typedef struct opj_event_mgr {
 Progression order changes
 */
 typedef struct opj_poc {
-  int resno0, compno0;
-  int layno1, resno1, compno1;
-  OPJ_PROG_ORDER prg;
-  int tile;
-  char progorder[4];
+	/** Resolution num start, Component num start, given by POC */
+	int resno0, compno0;
+	/** Layer num end,Resolution num end, Component num end, given by POC */
+	int layno1, resno1, compno1;
+	/** Layer num start,Precinct num start, Precinct num end */
+	int layno0, precno0, precno1;
+	/** Progression order enum*/
+	OPJ_PROG_ORDER prg1,prg;
+	/** Progression order string*/
+	char progorder[5];
+	/** Tile number */
+	int tile;
+	/** Start and end values for Tile width and height*/
+	int tx0,tx1,ty0,ty1;
+	/** Start value, initialised in pi_initialise_encode*/
+	int layS, resS, compS, prcS;
+	/** End value, initialised in pi_initialise_encode */
+	int layE, resE, compE, prcE;
+	/** Start and end values of Tile width and height, initialised in pi_initialise_encode*/
+	int txS,txE,tyS,tyE,dx,dy;
+	/** Temporary values for Tile parts, initialised in pi_create_encode */
+	int lay_t, res_t, comp_t, prc_t,tx0_t,ty0_t;
 } opj_poc_t;
 
 /**
@@ -269,14 +314,13 @@ typedef struct opj_cparameters {
 	int subsampling_dx;
 	/** subsampling value for dy */
 	int subsampling_dy;
-	/** input file format 0: PGX, 1: PxM, 2: BMP */
+	/** input file format 0: PGX, 1: PxM, 2: BMP 3:TIF*/
 	int decod_format;
 	/** output file format 0: J2K, 1: JP2, 2: JPT */
 	int cod_format;
 	/*@}*/
 
 /* UniPG>> */
-#ifdef USE_JPWL
 	/**@name JPWL encoding parameters */
 	/*@{*/
 	/** enables writing of EPC in MH, thus activating JPWL */
@@ -306,9 +350,20 @@ typedef struct opj_cparameters {
 	/** sensitivity methods for TPHs (-1=no,0-7) */
 	int jpwl_sens_TPH[JPWL_MAX_NO_TILESPECS];
 	/*@}*/
-#endif /* USE_JPWL */
 /* <<UniPG */
 
+	/** Digital Cinema compliance 0-not compliant, 1-compliant*/
+	OPJ_CINEMA_MODE cp_cinema;
+	/** Maximum rate for each component. If == 0, component size limitation is not considered */
+	int max_comp_size;
+	/** Profile name*/
+	OPJ_RSIZ_CAPABILITIES cp_rsiz;
+	/** Tile part generation*/
+	char tp_on;
+	/** Flag for Tile part generation*/
+	char tp_flag;
+	/** MCT (multiple component transform) */
+	char tcp_mct;
 } opj_cparameters_t;
 
 /**
@@ -344,18 +399,25 @@ typedef struct opj_dparameters {
 	/*@}*/
 
 /* UniPG>> */
-#ifdef USE_JPWL
 	/**@name JPWL decoding parameters */
 	/*@{*/
 	/** activates the JPWL correction capabilities */
 	bool jpwl_correct;
 	/** expected number of components */
-	bool jpwl_exp_comps;
+	int jpwl_exp_comps;
 	/** maximum number of tiles */
-	bool jpwl_max_tiles;
+	int jpwl_max_tiles;
 	/*@}*/
-#endif /* USE_JPWL */
 /* <<UniPG */
+
+	/** 
+	Specify whether the decoding should be done on the entire codestream, or be limited to the main header
+	Limiting the decoding to the main header makes it possible to extract the characteristics of the codestream
+	if == NO_LIMITATION, the entire codestream is decoded; 
+	if == LIMIT_TO_MAIN_HEADER, only the main header is decoded; 
+	*/
+	OPJ_LIMIT_DECODING cp_limit_decoding;
+
 } opj_dparameters_t;
 
 /** Common fields between JPEG-2000 compression and decompression master structs. */
@@ -366,7 +428,8 @@ typedef struct opj_dparameters {
 	bool is_decompressor;		/**< So common code can tell which is which */\
 	OPJ_CODEC_FORMAT codec_format;	/**< selected codec */\
 	void *j2k_handle;			/**< pointer to the J2K codec */\
-	void *jp2_handle			/**< pointer to the JP2 codec */
+	void *jp2_handle;			/**< pointer to the JP2 codec */\
+	void *mj2_handle			/**< pointer to the MJ2 codec */
 	
 /* Routines that are to be used by both halves of the library are declared
  * to receive a pointer to this structure.  There are no actual instances of

libopenjpeg/opj_includes.h

@@ -84,10 +84,10 @@ Most compilers implement their own version of this keyword ...
 #include "raw.h"
 #include "bio.h"
 #include "tgt.h"
+#include "pi.h"
 #include "tcd.h"
 #include "t1.h"
 #include "dwt.h"
-#include "pi.h"
 #include "t2.h"
 #include "mct.h"
 #include "int.h"

libopenjpeg/pi.c

@@ -5,6 +5,7 @@
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * Copyright (c) 2006-2007, Parvatha Elangovan
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -91,7 +92,7 @@ static bool pi_next_lrcp(opj_pi_iterator_t * pi) {
 		pi->first = 0;
 	}
 
-	for (pi->layno = 0; pi->layno < pi->poc.layno1; pi->layno++) {
+	for (pi->layno = pi->poc.layno0; pi->layno < pi->poc.layno1; pi->layno++) {
 		for (pi->resno = pi->poc.resno0; pi->resno < pi->poc.resno1;
 		pi->resno++) {
 			for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1; pi->compno++) {
@@ -100,7 +101,10 @@ static bool pi_next_lrcp(opj_pi_iterator_t * pi) {
 					continue;
 				}
 				res = &comp->resolutions[pi->resno];
-				for (pi->precno = 0; pi->precno < res->pw * res->ph; pi->precno++) {
+				if (!pi->tp_on){
+					pi->poc.precno1 = res->pw * res->ph;
+				}
+				for (pi->precno = pi->poc.precno0; pi->precno < pi->poc.precno1; pi->precno++) {
 					index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p;
 					if (!pi->include[index]) {
 						pi->include[index] = 1;
@@ -129,14 +133,17 @@ static bool pi_next_rlcp(opj_pi_iterator_t * pi) {
 	}
 
 	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->layno = pi->poc.layno0; pi->layno < pi->poc.layno1; pi->layno++) {
 			for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1; pi->compno++) {
 				comp = &pi->comps[pi->compno];
 				if (pi->resno >= comp->numresolutions) {
 					continue;
 				}
 				res = &comp->resolutions[pi->resno];
-				for (pi->precno = 0; pi->precno < res->pw * res->ph; pi->precno++) {
+				if(!pi->tp_on){
+					pi->poc.precno1 = res->pw * res->ph;
+				}
+				for (pi->precno = pi->poc.precno0; pi->precno < pi->poc.precno1; pi->precno++) {
 					index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p;
 					if (!pi->include[index]) {
 						pi->include[index] = 1;
@@ -175,10 +182,15 @@ static bool pi_next_rpcl(opj_pi_iterator_t * pi) {
 			}
 		}
 	}
-
+if (!pi->tp_on){
+			pi->poc.ty0 = pi->ty0;
+			pi->poc.tx0 = pi->tx0;
+			pi->poc.ty1 = pi->ty1;
+			pi->poc.tx1 = pi->tx1;
+		}
 	for (pi->resno = pi->poc.resno0; pi->resno < pi->poc.resno1; pi->resno++) {
-		for (pi->y = pi->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->y = pi->poc.ty0; pi->y < pi->poc.ty1; pi->y += pi->dy - (pi->y % pi->dy)) {
+			for (pi->x = pi->poc.tx0; pi->x < pi->poc.tx1; pi->x += pi->dx - (pi->x % pi->dx)) {
 				for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1; pi->compno++) {
 					int levelno;
 					int trx0, try0;
@@ -197,10 +209,10 @@ static bool pi_next_rpcl(opj_pi_iterator_t * pi) {
 					try1 = int_ceildiv(pi->ty1, 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)))) {
+					if (!((pi->y % (comp->dy << rpy) == 0) || ((pi->y == pi->ty0) && ((try0 << levelno) % (1 << rpx))))){
 						continue;	
 					}
-					if ((!(pi->y % (comp->dy << rpy) == 0) || (pi->y == pi->ty0 && (try0 << levelno) % (1 << rpx)))) {
+					if (!((pi->x % (comp->dx << rpx) == 0) || ((pi->x == pi->tx0) && ((trx0 << levelno) % (1 << rpx))))){
 						continue; 
 					}
 					
@@ -213,7 +225,7 @@ static bool pi_next_rpcl(opj_pi_iterator_t * pi) {
 					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++) {
+					for (pi->layno = pi->poc.layno0; pi->layno < pi->poc.layno1; pi->layno++) {
 						index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p;
 						if (!pi->include[index]) {
 							pi->include[index] = 1;
@@ -254,9 +266,14 @@ static bool pi_next_pcrl(opj_pi_iterator_t * pi) {
 			}
 		}
 	}
-
-	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)) {
+	if (!pi->tp_on){
+			pi->poc.ty0 = pi->ty0;
+			pi->poc.tx0 = pi->tx0;
+			pi->poc.ty1 = pi->ty1;
+			pi->poc.tx1 = pi->tx1;
+		}
+	for (pi->y = pi->poc.ty0; pi->y < pi->poc.ty1; pi->y += pi->dy - (pi->y % pi->dy)) {
+		for (pi->x = pi->poc.tx0; pi->x < pi->poc.tx1; pi->x += pi->dx - (pi->x % pi->dx)) {
 			for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1; pi->compno++) {
 				comp = &pi->comps[pi->compno];
 				for (pi->resno = pi->poc.resno0; pi->resno < int_min(pi->poc.resno1, comp->numresolutions); pi->resno++) {
@@ -273,10 +290,10 @@ static bool pi_next_pcrl(opj_pi_iterator_t * pi) {
 					try1 = int_ceildiv(pi->ty1, 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)))) {
+					if (!((pi->y % (comp->dy << rpy) == 0) || ((pi->y == pi->ty0) && ((try0 << levelno) % (1 << rpx))))){
 						continue;	
 					}
-					if ((!(pi->y % (comp->dy << rpy) == 0) || (pi->y == pi->ty0 && (try0 << levelno) % (1 << rpx)))) {
+					if (!((pi->x % (comp->dx << rpx) == 0) || ((pi->x == pi->tx0) && ((trx0 << levelno) % (1 << rpx))))){
 						continue; 
 					}
 					
@@ -289,7 +306,7 @@ static bool pi_next_pcrl(opj_pi_iterator_t * pi) {
 					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++) {
+					for (pi->layno = pi->poc.layno0; pi->layno < pi->poc.layno1; pi->layno++) {
 						index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p;
 						if (!pi->include[index]) {
 							pi->include[index] = 1;
@@ -330,8 +347,14 @@ static bool pi_next_cprl(opj_pi_iterator_t * pi) {
 			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)) {
+		if (!pi->tp_on){
+			pi->poc.ty0 = pi->ty0;
+			pi->poc.tx0 = pi->tx0;
+			pi->poc.ty1 = pi->ty1;
+			pi->poc.tx1 = pi->tx1;
+		}
+		for (pi->y = pi->poc.ty0; pi->y < pi->poc.ty1; pi->y += pi->dy - (pi->y % pi->dy)) {
+			for (pi->x = pi->poc.tx0; pi->x < pi->poc.tx1; pi->x += pi->dx - (pi->x % pi->dx)) {
 				for (pi->resno = pi->poc.resno0; pi->resno < int_min(pi->poc.resno1, comp->numresolutions); pi->resno++) {
 					int levelno;
 					int trx0, try0;
@@ -346,10 +369,10 @@ static bool pi_next_cprl(opj_pi_iterator_t * pi) {
 					try1 = int_ceildiv(pi->ty1, 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)))) {
+					if (!((pi->y % (comp->dy << rpy) == 0) || ((pi->y == pi->ty0) && ((try0 << levelno) % (1 << rpx))))){
 						continue;	
 					}
-					if ((!(pi->y % (comp->dy << rpy) == 0) || (pi->y == pi->ty0 && (try0 << levelno) % (1 << rpx)))) {
+					if (!((pi->x % (comp->dx << rpx) == 0) || ((pi->x == pi->tx0) && ((trx0 << levelno) % (1 << rpx))))){
 						continue; 
 					}
 					
@@ -362,7 +385,7 @@ static bool pi_next_cprl(opj_pi_iterator_t * pi) {
 					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++) {
+					for (pi->layno = pi->poc.layno0; pi->layno < pi->poc.layno1; pi->layno++) {
 						index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p;
 						if (!pi->include[index]) {
 							pi->include[index] = 1;
@@ -384,7 +407,7 @@ LABEL_SKIP:;
 ==========================================================
 */
 
-opj_pi_iterator_t *pi_create(opj_image_t *image, opj_cp_t *cp, int tileno) {
+opj_pi_iterator_t *pi_create_decode(opj_image_t *image, opj_cp_t *cp, int tileno) {
 	int p, q;
 	int compno, resno, pino;
 	opj_pi_iterator_t *pi = NULL;
@@ -513,11 +536,167 @@ opj_pi_iterator_t *pi_create(opj_image_t *image, opj_cp_t *cp, int tileno) {
 			pi[pino].poc.compno1 = tcp->pocs[pino].compno1;
 			pi[pino].poc.prg = tcp->pocs[pino].prg;
 		}
+		pi[pino].poc.layno0  = 0;
+		pi[pino].poc.precno0 = 0; 
+		pi[pino].poc.precno1 = maxprec;
+			
 	}
 	
 	return pi;
 }
 
+
+opj_pi_iterator_t *pi_initialise_encode(opj_image_t *image, opj_cp_t *cp, int tileno, J2K_T2_MODE t2_mode){ 
+	int p, q, pino;
+	int compno, resno;
+	int maxres = 0;
+	int maxprec = 0;
+	opj_pi_iterator_t *pi = NULL;
+	opj_tcp_t *tcp = NULL;
+	opj_tccp_t *tccp = NULL;
+	size_t array_size;
+	
+	tcp = &cp->tcps[tileno];
+
+	array_size = (tcp->numpocs + 1) * sizeof(opj_pi_iterator_t);
+	pi = (opj_pi_iterator_t *) opj_malloc(array_size);
+	if(!pi) {	return NULL;}
+	pi->tp_on = cp->tp_on;
+	
+	for(pino = 0;pino < tcp->numpocs+1 ; pino ++){
+		p = tileno % cp->tw;
+		q = tileno / cp->tw;
+
+		pi[pino].tx0 = int_max(cp->tx0 + p * cp->tdx, image->x0);
+		pi[pino].ty0 = int_max(cp->ty0 + q * cp->tdy, image->y0);
+		pi[pino].tx1 = int_min(cp->tx0 + (p + 1) * cp->tdx, image->x1);
+		pi[pino].ty1 = int_min(cp->ty0 + (q + 1) * cp->tdy, image->y1);
+		pi[pino].numcomps = image->numcomps;
+		
+		array_size = image->numcomps * sizeof(opj_pi_comp_t);
+		pi[pino].comps = (opj_pi_comp_t *) opj_malloc(array_size);
+		if(!pi[pino].comps) {
+			pi_destroy(pi, cp, tileno);
+			return NULL;
+		}
+		memset(pi[pino].comps, 0, array_size);
+		
+		for (compno = 0; compno < pi[pino].numcomps; compno++) {
+			int tcx0, tcy0, tcx1, tcy1;
+			opj_pi_comp_t *comp = &pi[pino].comps[compno];
+			tccp = &tcp->tccps[compno];
+			comp->dx = image->comps[compno].dx;
+			comp->dy = image->comps[compno].dy;
+			comp->numresolutions = tccp->numresolutions;
+
+			array_size = comp->numresolutions * sizeof(opj_pi_resolution_t);
+			comp->resolutions =	(opj_pi_resolution_t *) opj_malloc(array_size);
+			if(!comp->resolutions) {
+				pi_destroy(pi, cp, tileno);
+				return NULL;
+			}
+
+			tcx0 = int_ceildiv(pi[pino].tx0, comp->dx);
+			tcy0 = int_ceildiv(pi[pino].ty0, comp->dy);
+			tcx1 = int_ceildiv(pi[pino].tx1, comp->dx);
+			tcy1 = int_ceildiv(pi[pino].ty1, comp->dy);
+			if (comp->numresolutions > maxres) {
+				maxres = comp->numresolutions;
+			}
+
+			for (resno = 0; resno < comp->numresolutions; resno++) {
+				int levelno;
+				int rx0, ry0, rx1, ry1;
+				int px0, py0, px1, py1;
+				opj_pi_resolution_t *res = &comp->resolutions[resno];
+				if (tccp->csty & J2K_CCP_CSTY_PRT) {
+					res->pdx = tccp->prcw[resno];
+					res->pdy = tccp->prch[resno];
+				} else {
+					res->pdx = 15;
+					res->pdy = 15;
+				}
+				levelno = comp->numresolutions - 1 - resno;
+				rx0 = int_ceildivpow2(tcx0, levelno);
+				ry0 = int_ceildivpow2(tcy0, levelno);
+				rx1 = int_ceildivpow2(tcx1, levelno);
+				ry1 = int_ceildivpow2(tcy1, levelno);
+				px0 = int_floordivpow2(rx0, res->pdx) << res->pdx;
+				py0 = int_floordivpow2(ry0, res->pdy) << res->pdy;
+				px1 = int_ceildivpow2(rx1, res->pdx) << res->pdx;
+				py1 = int_ceildivpow2(ry1, res->pdy) << res->pdy;
+				res->pw = (rx0==rx1)?0:((px1 - px0) >> res->pdx);
+				res->ph = (ry0==ry1)?0:((py1 - py0) >> res->pdy);
+
+				if (res->pw*res->ph > maxprec) {
+					maxprec = res->pw * res->ph;
+				}
+			}
+		}
+		
+		tccp = &tcp->tccps[0];
+		pi[pino].step_p = 1;
+		pi[pino].step_c = maxprec * pi[pino].step_p;
+		pi[pino].step_r = image->numcomps * pi[pino].step_c;
+		pi[pino].step_l = maxres * pi[pino].step_r;
+		
+		for (compno = 0; compno < pi->numcomps; compno++) {
+			opj_pi_comp_t *comp = &pi->comps[compno];
+			for (resno = 0; resno < comp->numresolutions; resno++) {
+				int dx, dy;
+				opj_pi_resolution_t *res = &comp->resolutions[resno];
+				dx = comp->dx * (1 << (res->pdx + comp->numresolutions - 1 - resno));
+				dy = comp->dy * (1 << (res->pdy + comp->numresolutions - 1 - resno));
+				pi[pino].dx = !pi->dx ? dx : int_min(pi->dx, dx);
+				pi[pino].dy = !pi->dy ? dy : int_min(pi->dy, dy);
+			}
+		}
+
+		if (pino == 0) {
+			array_size = tcp->numlayers * pi[pino].step_l * sizeof(short int);
+			pi[pino].include = (short int *) opj_malloc(array_size);
+			if(!pi[pino].include) {
+				pi_destroy(pi, cp, tileno);
+				return NULL;
+			}
+		}
+		else {
+			pi[pino].include = pi[pino - 1].include;
+		}
+		
+		/* Generation of boundaries for each prog flag*/
+			if(tcp->POC & (t2_mode == FINAL_PASS)){
+				tcp->pocs[pino].compS= tcp->pocs[pino].compno0;
+				tcp->pocs[pino].compE= tcp->pocs[pino].compno1;
+				tcp->pocs[pino].resS = tcp->pocs[pino].resno0;
+				tcp->pocs[pino].resE = tcp->pocs[pino].resno1;
+				tcp->pocs[pino].layE = tcp->pocs[pino].layno1;
+				tcp->pocs[pino].prg  = tcp->pocs[pino].prg1;
+				if (pino > 0)
+					tcp->pocs[pino].layS = (tcp->pocs[pino].layE > tcp->pocs[pino - 1].layE) ? tcp->pocs[pino - 1].layE : 0;
+			}else {
+				tcp->pocs[pino].compS= 0;
+				tcp->pocs[pino].compE= image->numcomps;
+				tcp->pocs[pino].resS = 0;
+				tcp->pocs[pino].resE = maxres;
+				tcp->pocs[pino].layS = 0;
+				tcp->pocs[pino].layE = tcp->numlayers;
+				tcp->pocs[pino].prg  = tcp->prg;
+			}
+			tcp->pocs[pino].prcS = 0;
+			tcp->pocs[pino].prcE = maxprec;;
+			tcp->pocs[pino].txS = pi[pino].tx0;
+			tcp->pocs[pino].txE = pi[pino].tx1;
+			tcp->pocs[pino].tyS = pi[pino].ty0;
+			tcp->pocs[pino].tyE = pi[pino].ty1;
+			tcp->pocs[pino].dx = pi[pino].dx;
+			tcp->pocs[pino].dy = pi[pino].dy;
+		}
+			return pi;
+	}
+
+
+
 void pi_destroy(opj_pi_iterator_t *pi, opj_cp_t *cp, int tileno) {
 	int compno, pino;
 	opj_tcp_t *tcp = &cp->tcps[tileno];
@@ -559,3 +738,341 @@ bool pi_next(opj_pi_iterator_t * pi) {
 	return false;
 }
 
+int pi_check_next_level(int pos,opj_cp_t *cp,int tileno, int pino, char *prog){
+	int i,l;
+	opj_tcp_t *tcps =&cp->tcps[tileno];
+	opj_poc_t *tcp = &tcps->pocs[pino];
+	if(pos>=0){
+		for(i=pos;pos>=0;i--){
+			switch(prog[i]){
+		case 'R':
+			if(tcp->res_t==tcp->resE){
+				l=pi_check_next_level(pos-1,cp,tileno,pino,prog);
+				if(l==1){
+					return 1;
+				}else{
+					return 0;
+				}
+			}else{
+				return 1;
+			}
+			break;
+		case 'C':
+			if(tcp->comp_t==tcp->compE){
+				l=pi_check_next_level(pos-1,cp,tileno,pino,prog);
+				if(l==1){
+					return 1;
+				}else{
+					return 0;
+				}
+			}else{
+				return 1;
+			}
+			break;
+		case 'L':
+			if(tcp->lay_t==tcp->layE){
+				l=pi_check_next_level(pos-1,cp,tileno,pino,prog);
+				if(l==1){
+					return 1;
+				}else{
+					return 0;
+				}
+			}else{
+				return 1;
+			}
+			break;
+		case 'P':
+			switch(tcp->prg){
+				case LRCP||RLCP:
+					if(tcp->prc_t == tcp->prcE){
+						l=pi_check_next_level(i-1,cp,tileno,pino,prog);
+						if(l==1){
+							return 1;
+						}else{
+							return 0;
+						}
+					}else{
+						return 1;
+					}
+					break;
+			default:
+				if(tcp->tx0_t == tcp->txE){
+					//TY 
+					if(tcp->ty0_t == tcp->tyE){
+						l=pi_check_next_level(i-1,cp,tileno,pino,prog);
+						if(l==1){
+							return 1;
+						}else{
+							return 0;
+						}
+					}else{
+						return 1;
+					}//TY
+				}else{
+					return 1;
+				}
+				break;
+			}//end case P
+		}//end switch
+		}//end for
+	}//end if
+	return 0;
+}
+
+
+void pi_create_encode( opj_pi_iterator_t *pi, opj_cp_t *cp,int tileno, int pino,int tpnum, int tppos){
+	char *prog;
+	int i,l;
+	int incr_top=1,resetX=0;
+	opj_tcp_t *tcps =&cp->tcps[tileno];
+	opj_poc_t *tcp= &tcps->pocs[pino];
+	prog = j2k_convert_progression_order(tcp->prg);
+
+	pi[pino].first = 1;
+	pi[pino].poc.prg = tcp->prg;	
+	
+	if(!(cp->tp_on)){
+		pi[pino].poc.resno0 = tcp->resS;
+		pi[pino].poc.resno1 = tcp->resE;
+		pi[pino].poc.compno0 = tcp->compS;
+		pi[pino].poc.compno1 = tcp->compE;
+		pi[pino].poc.layno0 = tcp->layS;
+		pi[pino].poc.layno1 = tcp->layE;
+		pi[pino].poc.precno0 = tcp->prcS;
+		pi[pino].poc.precno1 = tcp->prcE;
+		pi[pino].poc.tx0 = tcp->txS;
+		pi[pino].poc.ty0 = tcp->tyS;
+		pi[pino].poc.tx1 = tcp->txE;
+		pi[pino].poc.ty1 = tcp->tyE;
+	}else {
+		for(i=tppos+1;i<4;i++){
+			switch(prog[i]){
+			case 'R':
+				pi[pino].poc.resno0 = tcp->resS;
+				pi[pino].poc.resno1 = tcp->resE;
+				break;
+			case 'C':
+				pi[pino].poc.compno0 = tcp->compS;
+				pi[pino].poc.compno1 = tcp->compE;
+				break;
+			case 'L':
+				pi[pino].poc.layno0 = tcp->layS;
+				pi[pino].poc.layno1 = tcp->layE;
+				break;
+			case 'P':
+				switch(tcp->prg){
+					case LRCP:
+					case RLCP:
+						pi[pino].poc.precno0 = tcp->prcS;
+						pi[pino].poc.precno1 = tcp->prcE;
+						break;
+					default:
+						pi[pino].poc.tx0 = tcp->txS;
+						pi[pino].poc.ty0 = tcp->tyS;
+						pi[pino].poc.tx1 = tcp->txE;
+						pi[pino].poc.ty1 = tcp->tyE;
+						break;
+				}
+				break;
+			}
+		}
+
+		if(tpnum==0){
+			for(i=tppos;i>=0;i--){
+				switch(prog[i]){
+						case 'C':
+							tcp->comp_t = tcp->compS;
+							pi[pino].poc.compno0 = tcp->comp_t;
+							pi[pino].poc.compno1 = tcp->comp_t+1;
+							tcp->comp_t+=1;
+							break;
+						case 'R':
+							tcp->res_t = tcp->resS;
+							pi[pino].poc.resno0 = tcp->res_t;
+							pi[pino].poc.resno1 = tcp->res_t+1;
+							tcp->res_t+=1;
+							break;
+						case 'L':
+							tcp->lay_t = tcp->layS;
+							pi[pino].poc.layno0 = tcp->lay_t;
+							pi[pino].poc.layno1 = tcp->lay_t+1;
+							tcp->lay_t+=1;
+							break;
+						case 'P':
+							switch(tcp->prg){
+								case LRCP:
+								case RLCP:
+									tcp->prc_t = tcp->prcS;
+									pi[pino].poc.precno0 = tcp->prc_t;
+									pi[pino].poc.precno1 = tcp->prc_t+1;
+									tcp->prc_t+=1; 
+									break;
+								default:
+									tcp->tx0_t = tcp->txS;
+									tcp->ty0_t = tcp->tyS;
+									pi[pino].poc.tx0 = tcp->tx0_t;
+									pi[pino].poc.tx1 = tcp->tx0_t + tcp->dx - (tcp->tx0_t % tcp->dx);
+									pi[pino].poc.ty0 = tcp->ty0_t;
+									pi[pino].poc.ty1 = tcp->ty0_t + tcp->dy - (tcp->ty0_t % tcp->dy);
+									tcp->tx0_t = pi[pino].poc.tx1;
+									tcp->ty0_t = pi[pino].poc.ty1;
+									break;
+							}
+							break;
+				}
+			}
+			incr_top=1;
+		}else{
+			for(i=tppos;i>=0;i--){
+				switch(prog[i]){
+						case 'C':
+							pi[pino].poc.compno0 = tcp->comp_t-1;
+							pi[pino].poc.compno1 = tcp->comp_t;
+							break;
+						case 'R':
+							pi[pino].poc.resno0 = tcp->res_t-1;
+							pi[pino].poc.resno1 = tcp->res_t;
+							break;
+						case 'L':
+							pi[pino].poc.layno0 = tcp->lay_t-1;
+							pi[pino].poc.layno1 = tcp->lay_t;
+							break;
+						case 'P':
+							switch(tcp->prg){
+								case LRCP:
+								case RLCP:
+									pi[pino].poc.precno0 = tcp->prc_t-1;
+									pi[pino].poc.precno1 = tcp->prc_t;
+									break;
+								default:
+									pi[pino].poc.tx0 = tcp->tx0_t - tcp->dx - (tcp->tx0_t % tcp->dx);
+									pi[pino].poc.tx1 = tcp->tx0_t ;
+									pi[pino].poc.ty0 = tcp->ty0_t - tcp->dy - (tcp->ty0_t % tcp->dy);
+									pi[pino].poc.ty1 = tcp->ty0_t ;
+									break;
+							}
+							break;
+				}
+				if(incr_top==1){
+					switch(prog[i]){
+							case 'R':
+								if(tcp->res_t==tcp->resE){
+									l=pi_check_next_level(i-1,cp,tileno,pino,prog);
+									if(l==1){
+										tcp->res_t = tcp->resS;
+										pi[pino].poc.resno0 = tcp->res_t;
+										pi[pino].poc.resno1 = tcp->res_t+1;
+										tcp->res_t+=1;
+										incr_top=1;
+									}else{
+										incr_top=0;
+									}
+								}else{
+									pi[pino].poc.resno0 = tcp->res_t;
+									pi[pino].poc.resno1 = tcp->res_t+1;
+									tcp->res_t+=1;
+									incr_top=0;
+								}
+								break;
+							case 'C':
+								if(tcp->comp_t ==tcp->compE){
+									l=pi_check_next_level(i-1,cp,tileno,pino,prog);
+									if(l==1){
+										tcp->comp_t = tcp->compS;
+										pi[pino].poc.compno0 = tcp->comp_t;
+										pi[pino].poc.compno1 = tcp->comp_t+1;
+										tcp->comp_t+=1;
+										incr_top=1;
+									}else{
+										incr_top=0;
+									}
+								}else{
+									pi[pino].poc.compno0 = tcp->comp_t;
+									pi[pino].poc.compno1 = tcp->comp_t+1;
+									tcp->comp_t+=1;
+									incr_top=0;
+								}
+								break;	
+							case 'L':
+								if(tcp->lay_t == tcp->layE){
+									l=pi_check_next_level(i-1,cp,tileno,pino,prog);
+									if(l==1){
+										tcp->lay_t = tcp->layS;
+										pi[pino].poc.layno0 = tcp->lay_t;
+										pi[pino].poc.layno1 = tcp->lay_t+1;
+										tcp->lay_t+=1;
+										incr_top=1;
+									}else{
+										incr_top=0;
+									}
+								}else{
+									pi[pino].poc.layno0 = tcp->lay_t;
+									pi[pino].poc.layno1 = tcp->lay_t+1;
+									tcp->lay_t+=1;
+									incr_top=0;
+								}
+								break;
+							case 'P':
+								switch(tcp->prg){
+									case LRCP:
+									case RLCP:
+										if(tcp->prc_t == tcp->prcE){
+											l=pi_check_next_level(i-1,cp,tileno,pino,prog);
+											if(l==1){
+												tcp->prc_t = tcp->prcS;
+												pi[pino].poc.precno0 = tcp->prc_t;
+												pi[pino].poc.precno1 = tcp->prc_t+1;
+												tcp->prc_t+=1;
+												incr_top=1;
+											}else{
+												incr_top=0;
+											}
+										}else{
+											pi[pino].poc.precno0 = tcp->prc_t;
+											pi[pino].poc.precno1 = tcp->prc_t+1;
+											tcp->prc_t+=1;
+											incr_top=0;
+										}
+										break;
+									default:
+										if(tcp->tx0_t >= tcp->txE){
+											if(tcp->ty0_t >= tcp->tyE){
+												l=pi_check_next_level(i-1,cp,tileno,pino,prog);
+												if(l==1){
+													tcp->ty0_t = tcp->tyS;
+													pi[pino].poc.ty0 = tcp->ty0_t;
+													pi[pino].poc.ty1 = tcp->ty0_t + tcp->dy - (tcp->ty0_t % tcp->dy);
+													tcp->ty0_t = pi[pino].poc.ty1;
+													incr_top=1;resetX=1;
+												}else{
+													incr_top=0;resetX=0;
+												}
+											}else{
+												pi[pino].poc.ty0 = tcp->ty0_t;
+												pi[pino].poc.ty1 = tcp->ty0_t + tcp->dy - (tcp->ty0_t % tcp->dy);
+												tcp->ty0_t = pi[pino].poc.ty1;
+												incr_top=0;resetX=1;
+											}
+											if(resetX==1){
+												tcp->tx0_t = tcp->txS;
+												pi[pino].poc.tx0 = tcp->tx0_t;
+												pi[pino].poc.tx1 = tcp->tx0_t + tcp->dx- (tcp->tx0_t % tcp->dx);
+												tcp->tx0_t = pi[pino].poc.tx1;
+											}
+										}else{
+											pi[pino].poc.tx0 = tcp->tx0_t;
+											pi[pino].poc.tx1 = tcp->tx0_t + tcp->dx- (tcp->tx0_t % tcp->dx);
+											tcp->tx0_t = pi[pino].poc.tx1;
+											incr_top=0;
+										}
+										break;
+								}
+								break;
+					}
+				}
+			}
+		}
+	}
+}
+
+

libopenjpeg/pi.h

@@ -65,6 +65,8 @@ typedef struct opj_pi_comp {
 Packet iterator 
 */
 typedef struct opj_pi_iterator {
+	/** Enabling Tile part generation*/
+	char tp_on;
 	/** precise if the packet has been already used (usefull for progression order change) */
 	short int *include;
 	/** layer step used to localize the packet in the include vector */
@@ -87,9 +89,9 @@ typedef struct opj_pi_iterator {
 	int first;
 	/** progression order change information */
 	opj_poc_t poc;
-	/** */
+	/** number of components in the image */
 	int numcomps;
-	/** */
+	/** Components*/
 	opj_pi_comp_t *comps;
 	int tx0, ty0, tx1, ty1;
 	int x, y, dx, dy;
@@ -99,14 +101,33 @@ typedef struct opj_pi_iterator {
 /*@{*/
 /* ----------------------------------------------------------------------- */
 /**
-Create a packet iterator
+Create a packet iterator for Encoder
+@param image Raw image for which the packets will be listed
+@param cp Coding parameters
+@param tileno Number that identifies the tile for which to list the packets
+@param t2_mode If == 0 In Threshold calculation ,If == 1 Final pass
+@return Returns a packet iterator that points to the first packet of the tile
+@see pi_destroy
+*/
+opj_pi_iterator_t *pi_initialise_encode(opj_image_t *image, opj_cp_t *cp, int tileno,J2K_T2_MODE t2_mode);
+/**
+Modify the packet iterator for enabling tile part generation
+@param pi Handle to the packet iterator generated in pi_initialise_encode  
+@param cp Coding parameters
+@param tileno Number that identifies the tile for which to list the packets
+@param tpnum Tile part number of the current tile
+@param tppos The position of the tile part flag in the progression order
+*/
+void pi_create_encode( opj_pi_iterator_t *pi, opj_cp_t *cp,int tileno, int pino,int tpnum, int tppos);
+/**
+Create a packet iterator for Decoder
 @param image Raw image for which the packets will be listed
 @param cp Coding parameters
 @param tileno Number that identifies the tile for which to list the packets
 @return Returns a packet iterator that points to the first packet of the tile
 @see pi_destroy
 */
-opj_pi_iterator_t *pi_create(opj_image_t * image, opj_cp_t * cp, int tileno);
+opj_pi_iterator_t *pi_create_decode(opj_image_t * image, opj_cp_t * cp, int tileno);
 
 /**
 Destroy a packet iterator

libopenjpeg/t1.h

@@ -44,9 +44,6 @@ in T1.C are used by some function in TCD.C.
 /* ----------------------------------------------------------------------- */
 #define T1_NMSEDEC_BITS 7
 
-#define T1_MAXCBLKW 1024	/**< Maximum size of code-block (width) */
-#define T1_MAXCBLKH 1024	/**< Maximum size of code-block (heigth) */
-
 #define T1_SIG_NE 0x0001	/**< Context orientation : North-East direction */
 #define T1_SIG_SE 0x0002	/**< Context orientation : South-East direction */
 #define T1_SIG_SW 0x0004	/**< Context orientation : South-West direction */
@@ -88,6 +85,8 @@ in T1.C are used by some function in TCD.C.
 
 /* ----------------------------------------------------------------------- */
 
+typedef short flag_t;
+
 /**
 Tier-1 coding (coding of code-block coefficients)
 */
@@ -100,20 +99,17 @@ typedef struct opj_t1 {
 	/** RAW component */
 	opj_raw_t *raw;
 
-	int lut_ctxno_zc[1024];
-	int lut_ctxno_sc[256];
-	int lut_ctxno_mag[4096];
-	int lut_spb[256];
-	int lut_nmsedec_sig[1 << T1_NMSEDEC_BITS];
-	int lut_nmsedec_sig0[1 << T1_NMSEDEC_BITS];
-	int lut_nmsedec_ref[1 << T1_NMSEDEC_BITS];
-	int lut_nmsedec_ref0[1 << T1_NMSEDEC_BITS];
-
-	int data[T1_MAXCBLKH][T1_MAXCBLKW];
-	int flags[T1_MAXCBLKH + 2][T1_MAXCBLKH + 2];
-
+	int *data;
+	flag_t *flags;
+	int w;
+	int h;
+	int datasize;
+	int flagssize;
+	int flags_stride;
 } opj_t1_t;
 
+#define MACRO_t1_flags(x,y) t1->flags[((x)*(t1->flags_stride))+(y)]
+
 /** @name Exported functions */
 /*@{*/
 /* ----------------------------------------------------------------------- */

libopenjpeg/t1_generate_luts.c

@@ -0,0 +1,295 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * Copyright (c) 2007, Callum Lerwick <seg@haxxed.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "opj_includes.h"
+#include <math.h>
+
+static int t1_init_ctxno_zc(int f, int orient) {
+	int h, v, d, n, t, hv;
+	n = 0;
+	h = ((f & T1_SIG_W) != 0) + ((f & T1_SIG_E) != 0);
+	v = ((f & T1_SIG_N) != 0) + ((f & T1_SIG_S) != 0);
+	d = ((f & T1_SIG_NW) != 0) + ((f & T1_SIG_NE) != 0) + ((f & T1_SIG_SE) != 0) + ((f & T1_SIG_SW) != 0);
+
+	switch (orient) {
+		case 2:
+			t = h;
+			h = v;
+			v = t;
+		case 0:
+		case 1:
+			if (!h) {
+				if (!v) {
+					if (!d)
+						n = 0;
+					else if (d == 1)
+						n = 1;
+					else
+						n = 2;
+				} else if (v == 1) {
+					n = 3;
+				} else {
+					n = 4;
+				}
+			} else if (h == 1) {
+				if (!v) {
+					if (!d)
+						n = 5;
+					else
+						n = 6;
+				} else {
+					n = 7;
+				}
+			} else
+				n = 8;
+			break;
+		case 3:
+			hv = h + v;
+			if (!d) {
+				if (!hv) {
+					n = 0;
+				} else if (hv == 1) {
+					n = 1;
+				} else {
+					n = 2;
+				}
+			} else if (d == 1) {
+				if (!hv) {
+					n = 3;
+				} else if (hv == 1) {
+					n = 4;
+				} else {
+					n = 5;
+				}
+			} else if (d == 2) {
+				if (!hv) {
+					n = 6;
+				} else {
+					n = 7;
+				}
+			} else {
+				n = 8;
+			}
+			break;
+	}
+
+	return (T1_CTXNO_ZC + n);
+}
+
+static int t1_init_ctxno_sc(int f) {
+	int hc, vc, n;
+	n = 0;
+
+	hc = int_min(((f & (T1_SIG_E | T1_SGN_E)) ==
+				T1_SIG_E) + ((f & (T1_SIG_W | T1_SGN_W)) == T1_SIG_W),
+			1) - int_min(((f & (T1_SIG_E | T1_SGN_E)) ==
+					(T1_SIG_E | T1_SGN_E)) +
+				((f & (T1_SIG_W | T1_SGN_W)) ==
+				 (T1_SIG_W | T1_SGN_W)), 1);
+
+	vc = int_min(((f & (T1_SIG_N | T1_SGN_N)) ==
+				T1_SIG_N) + ((f & (T1_SIG_S | T1_SGN_S)) == T1_SIG_S),
+			1) - int_min(((f & (T1_SIG_N | T1_SGN_N)) ==
+					(T1_SIG_N | T1_SGN_N)) +
+				((f & (T1_SIG_S | T1_SGN_S)) ==
+				 (T1_SIG_S | T1_SGN_S)), 1);
+
+	if (hc < 0) {
+		hc = -hc;
+		vc = -vc;
+	}
+	if (!hc) {
+		if (vc == -1)
+			n = 1;
+		else if (!vc)
+			n = 0;
+		else
+			n = 1;
+	} else if (hc == 1) {
+		if (vc == -1)
+			n = 2;
+		else if (!vc)
+			n = 3;
+		else
+			n = 4;
+	}
+
+	return (T1_CTXNO_SC + n);
+}
+
+static int t1_init_ctxno_mag(int f) {
+	int n;
+	if (!(f & T1_REFINE))
+		n = (f & (T1_SIG_OTH)) ? 1 : 0;
+	else
+		n = 2;
+
+	return (T1_CTXNO_MAG + n);
+}
+
+static int t1_init_spb(int f) {
+	int hc, vc, n;
+
+	hc = int_min(((f & (T1_SIG_E | T1_SGN_E)) ==
+				T1_SIG_E) + ((f & (T1_SIG_W | T1_SGN_W)) == T1_SIG_W),
+			1) - int_min(((f & (T1_SIG_E | T1_SGN_E)) ==
+					(T1_SIG_E | T1_SGN_E)) +
+				((f & (T1_SIG_W | T1_SGN_W)) ==
+				 (T1_SIG_W | T1_SGN_W)), 1);
+
+	vc = int_min(((f & (T1_SIG_N | T1_SGN_N)) ==
+				T1_SIG_N) + ((f & (T1_SIG_S | T1_SGN_S)) == T1_SIG_S),
+			1) - int_min(((f & (T1_SIG_N | T1_SGN_N)) ==
+					(T1_SIG_N | T1_SGN_N)) +
+				((f & (T1_SIG_S | T1_SGN_S)) ==
+				 (T1_SIG_S | T1_SGN_S)), 1);
+
+	if (!hc && !vc)
+		n = 0;
+	else
+		n = (!(hc > 0 || (!hc && vc > 0)));
+
+	return n;
+}
+
+void dump_array16(int array[],int size){
+	int i;
+	--size;
+	for (i = 0; i < size; ++i) {
+		printf("0x%04x, ", array[i]);
+		if(!((i+1)&0x7))
+			printf("\n  ");
+	}
+	printf("0x%04x\n};\n\n", array[size]);
+}
+
+int main(){
+	int i, j;
+	double u, v, t;
+
+	int lut_ctxno_zc[1024];
+	int lut_ctxno_mag[4096];
+	int lut_nmsedec_sig[1 << T1_NMSEDEC_BITS];
+	int lut_nmsedec_sig0[1 << T1_NMSEDEC_BITS];
+	int lut_nmsedec_ref[1 << T1_NMSEDEC_BITS];
+	int lut_nmsedec_ref0[1 << T1_NMSEDEC_BITS];
+
+	printf("/* This file was automatically generated by t1_generate_luts.c */\n\n");
+
+	// lut_ctxno_zc
+	for (j = 0; j < 4; ++j) {
+		for (i = 0; i < 256; ++i) {
+			lut_ctxno_zc[(j << 8) | i] = t1_init_ctxno_zc(i, j);
+		}
+	}
+
+	printf("static int8_t lut_ctxno_zc[1024] = {\n  ");
+	for (i = 0; i < 1023; ++i) {
+		printf("%i, ", lut_ctxno_zc[i]);
+		if(!((i+1)&0x1f))
+			printf("\n  ");
+	}
+	printf("%i\n};\n\n", lut_ctxno_zc[1023]);
+
+	// lut_ctxno_sc
+	printf("static int8_t lut_ctxno_sc[256] = {\n  ");
+	for (i = 0; i < 255; ++i) {
+		printf("0x%x, ", t1_init_ctxno_sc(i << 4));
+		if(!((i+1)&0xf))
+			printf("\n  ");
+	}
+	printf("0x%x\n};\n\n", t1_init_ctxno_sc(255 << 4));
+
+	// lut_ctxno_mag
+	for (j = 0; j < 2; ++j) {
+		for (i = 0; i < 2048; ++i) {
+			lut_ctxno_mag[(j << 11) + i] = t1_init_ctxno_mag((j ? T1_REFINE : 0) | i);
+		}
+	}
+
+	printf("static int8_t lut_ctxno_mag[4096] = {\n  ");
+	for (i = 0; i < 4095; ++i) {
+		printf("%i, ", lut_ctxno_mag[i]);
+		if(!((i+1)&0xf))
+			printf("\n  ");
+	}
+	printf("%i\n};\n\n", lut_ctxno_mag[4095]);
+
+	// lut_spb
+	printf("static int8_t lut_spb[256] = {\n  ");
+	for (i = 0; i < 255; ++i) {
+		printf("%i, ", t1_init_spb(i << 4));
+		if(!((i+1)&0x1f))
+			printf("\n  ");
+	}
+	printf("%i\n};\n\n", t1_init_spb(255 << 4));
+
+	/* FIXME FIXME FIXME */
+	/* fprintf(stdout,"nmsedec luts:\n"); */
+	for (i = 0; i < (1 << T1_NMSEDEC_BITS); ++i) {
+		t = i / pow(2, T1_NMSEDEC_FRACBITS);
+		u = t;
+		v = t - 1.5;
+		lut_nmsedec_sig[i] = 
+			int_max(0, 
+					(int) (floor((u * u - v * v) * pow(2, T1_NMSEDEC_FRACBITS) + 0.5) / pow(2, T1_NMSEDEC_FRACBITS) * 8192.0));
+		lut_nmsedec_sig0[i] =
+			int_max(0,
+					(int) (floor((u * u) * pow(2, T1_NMSEDEC_FRACBITS) + 0.5) / pow(2, T1_NMSEDEC_FRACBITS) * 8192.0));
+		u = t - 1.0;
+		if (i & (1 << (T1_NMSEDEC_BITS - 1))) {
+			v = t - 1.5;
+		} else {
+			v = t - 0.5;
+		}
+		lut_nmsedec_ref[i] =
+			int_max(0,
+					(int) (floor((u * u - v * v) * pow(2, T1_NMSEDEC_FRACBITS) + 0.5) / pow(2, T1_NMSEDEC_FRACBITS) * 8192.0));
+		lut_nmsedec_ref0[i] =
+			int_max(0,
+					(int) (floor((u * u) * pow(2, T1_NMSEDEC_FRACBITS) + 0.5) / pow(2, T1_NMSEDEC_FRACBITS) * 8192.0));
+	}
+
+	printf("static int16_t lut_nmsedec_sig[1 << T1_NMSEDEC_BITS] = {\n  ");
+	dump_array16(&lut_nmsedec_sig, 1 << T1_NMSEDEC_BITS);
+
+	printf("static int16_t lut_nmsedec_sig0[1 << T1_NMSEDEC_BITS] = {\n  ");
+	dump_array16(&lut_nmsedec_sig0, 1 << T1_NMSEDEC_BITS);
+
+	printf("static int16_t lut_nmsedec_ref[1 << T1_NMSEDEC_BITS] = {\n  ");
+	dump_array16(&lut_nmsedec_ref, 1 << T1_NMSEDEC_BITS);
+
+	printf("static int16_t lut_nmsedec_ref0[1 << T1_NMSEDEC_BITS] = {\n  ");
+	dump_array16(&lut_nmsedec_ref0, 1 << T1_NMSEDEC_BITS);
+
+	return 0;
+}

libopenjpeg/t1_luts.h

@@ -0,0 +1,402 @@
+/* This file was automatically generated by t1_generate_luts.c */
+
+static char lut_ctxno_zc[1024] = {
+  0, 1, 1, 2, 1, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
+  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
+  5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
+  8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
+  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
+  8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
+  0, 1, 1, 2, 1, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
+  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
+  5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
+  8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
+  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
+  8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
+  0, 1, 1, 2, 1, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
+  5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
+  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
+  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
+  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
+  0, 3, 3, 6, 3, 6, 6, 8, 3, 6, 6, 8, 6, 8, 8, 8, 1, 4, 4, 7, 4, 7, 7, 8, 4, 7, 7, 8, 7, 8, 8, 8, 
+  1, 4, 4, 7, 4, 7, 7, 8, 4, 7, 7, 8, 7, 8, 8, 8, 2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 
+  1, 4, 4, 7, 4, 7, 7, 8, 4, 7, 7, 8, 7, 8, 8, 8, 2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 
+  2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 
+  1, 4, 4, 7, 4, 7, 7, 8, 4, 7, 7, 8, 7, 8, 8, 8, 2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 
+  2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 
+  2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 
+  2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8
+};
+
+static char lut_ctxno_sc[256] = {
+  0x9, 0xa, 0xc, 0xd, 0xa, 0xa, 0xd, 0xd, 0xc, 0xd, 0xc, 0xd, 0xd, 0xd, 0xd, 0xd, 
+  0x9, 0xa, 0xc, 0xb, 0xa, 0x9, 0xd, 0xc, 0xc, 0xb, 0xc, 0xb, 0xd, 0xc, 0xd, 0xc, 
+  0x9, 0xa, 0xc, 0xb, 0xa, 0xa, 0xb, 0xb, 0xc, 0xd, 0x9, 0xa, 0xd, 0xd, 0xa, 0xa, 
+  0x9, 0xa, 0xc, 0xd, 0xa, 0x9, 0xb, 0xc, 0xc, 0xb, 0x9, 0xa, 0xd, 0xc, 0xa, 0x9, 
+  0x9, 0xa, 0xc, 0xd, 0xa, 0x9, 0xb, 0xc, 0xc, 0xd, 0xc, 0xd, 0xb, 0xc, 0xb, 0xc, 
+  0x9, 0xa, 0xc, 0xb, 0xa, 0xa, 0xb, 0xb, 0xc, 0xb, 0xc, 0xb, 0xb, 0xb, 0xb, 0xb, 
+  0x9, 0xa, 0xc, 0xb, 0xa, 0x9, 0xd, 0xc, 0xc, 0xd, 0x9, 0xa, 0xb, 0xc, 0xa, 0x9, 
+  0x9, 0xa, 0xc, 0xd, 0xa, 0xa, 0xd, 0xd, 0xc, 0xb, 0x9, 0xa, 0xb, 0xb, 0xa, 0xa, 
+  0x9, 0xa, 0xc, 0xd, 0xa, 0xa, 0xd, 0xd, 0xc, 0xb, 0x9, 0xa, 0xb, 0xb, 0xa, 0xa, 
+  0x9, 0xa, 0xc, 0xb, 0xa, 0x9, 0xd, 0xc, 0xc, 0xd, 0x9, 0xa, 0xb, 0xc, 0xa, 0x9, 
+  0x9, 0xa, 0xc, 0xb, 0xa, 0xa, 0xb, 0xb, 0xc, 0xb, 0xc, 0xb, 0xb, 0xb, 0xb, 0xb, 
+  0x9, 0xa, 0xc, 0xd, 0xa, 0x9, 0xb, 0xc, 0xc, 0xd, 0xc, 0xd, 0xb, 0xc, 0xb, 0xc, 
+  0x9, 0xa, 0xc, 0xd, 0xa, 0x9, 0xb, 0xc, 0xc, 0xb, 0x9, 0xa, 0xd, 0xc, 0xa, 0x9, 
+  0x9, 0xa, 0xc, 0xb, 0xa, 0xa, 0xb, 0xb, 0xc, 0xd, 0x9, 0xa, 0xd, 0xd, 0xa, 0xa, 
+  0x9, 0xa, 0xc, 0xb, 0xa, 0x9, 0xd, 0xc, 0xc, 0xb, 0xc, 0xb, 0xd, 0xc, 0xd, 0xc, 
+  0x9, 0xa, 0xc, 0xd, 0xa, 0xa, 0xd, 0xd, 0xc, 0xd, 0xc, 0xd, 0xd, 0xd, 0xd, 0xd
+};
+
+static char lut_ctxno_mag[4096] = {
+  14, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  14, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  14, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  14, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  14, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  14, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  14, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  14, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 
+  16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16
+};
+
+static char lut_spb[256] = {
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 
+  0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 
+  0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 
+  0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
+  0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 
+  0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+};
+
+static short lut_nmsedec_sig[1 << T1_NMSEDEC_BITS] = {
+  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+  0x0000, 0x0180, 0x0300, 0x0480, 0x0600, 0x0780, 0x0900, 0x0a80, 
+  0x0c00, 0x0d80, 0x0f00, 0x1080, 0x1200, 0x1380, 0x1500, 0x1680, 
+  0x1800, 0x1980, 0x1b00, 0x1c80, 0x1e00, 0x1f80, 0x2100, 0x2280, 
+  0x2400, 0x2580, 0x2700, 0x2880, 0x2a00, 0x2b80, 0x2d00, 0x2e80, 
+  0x3000, 0x3180, 0x3300, 0x3480, 0x3600, 0x3780, 0x3900, 0x3a80, 
+  0x3c00, 0x3d80, 0x3f00, 0x4080, 0x4200, 0x4380, 0x4500, 0x4680, 
+  0x4800, 0x4980, 0x4b00, 0x4c80, 0x4e00, 0x4f80, 0x5100, 0x5280, 
+  0x5400, 0x5580, 0x5700, 0x5880, 0x5a00, 0x5b80, 0x5d00, 0x5e80, 
+  0x6000, 0x6180, 0x6300, 0x6480, 0x6600, 0x6780, 0x6900, 0x6a80, 
+  0x6c00, 0x6d80, 0x6f00, 0x7080, 0x7200, 0x7380, 0x7500, 0x7680
+};
+
+static short lut_nmsedec_sig0[1 << T1_NMSEDEC_BITS] = {
+  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0080, 0x0080, 
+  0x0080, 0x0080, 0x0100, 0x0100, 0x0100, 0x0180, 0x0180, 0x0200, 
+  0x0200, 0x0280, 0x0280, 0x0300, 0x0300, 0x0380, 0x0400, 0x0400, 
+  0x0480, 0x0500, 0x0580, 0x0580, 0x0600, 0x0680, 0x0700, 0x0780, 
+  0x0800, 0x0880, 0x0900, 0x0980, 0x0a00, 0x0a80, 0x0b80, 0x0c00, 
+  0x0c80, 0x0d00, 0x0e00, 0x0e80, 0x0f00, 0x1000, 0x1080, 0x1180, 
+  0x1200, 0x1300, 0x1380, 0x1480, 0x1500, 0x1600, 0x1700, 0x1780, 
+  0x1880, 0x1980, 0x1a80, 0x1b00, 0x1c00, 0x1d00, 0x1e00, 0x1f00, 
+  0x2000, 0x2100, 0x2200, 0x2300, 0x2400, 0x2500, 0x2680, 0x2780, 
+  0x2880, 0x2980, 0x2b00, 0x2c00, 0x2d00, 0x2e80, 0x2f80, 0x3100, 
+  0x3200, 0x3380, 0x3480, 0x3600, 0x3700, 0x3880, 0x3a00, 0x3b00, 
+  0x3c80, 0x3e00, 0x3f80, 0x4080, 0x4200, 0x4380, 0x4500, 0x4680, 
+  0x4800, 0x4980, 0x4b00, 0x4c80, 0x4e00, 0x4f80, 0x5180, 0x5300, 
+  0x5480, 0x5600, 0x5800, 0x5980, 0x5b00, 0x5d00, 0x5e80, 0x6080, 
+  0x6200, 0x6400, 0x6580, 0x6780, 0x6900, 0x6b00, 0x6d00, 0x6e80, 
+  0x7080, 0x7280, 0x7480, 0x7600, 0x7800, 0x7a00, 0x7c00, 0x7e00
+};
+
+static short lut_nmsedec_ref[1 << T1_NMSEDEC_BITS] = {
+  0x1800, 0x1780, 0x1700, 0x1680, 0x1600, 0x1580, 0x1500, 0x1480, 
+  0x1400, 0x1380, 0x1300, 0x1280, 0x1200, 0x1180, 0x1100, 0x1080, 
+  0x1000, 0x0f80, 0x0f00, 0x0e80, 0x0e00, 0x0d80, 0x0d00, 0x0c80, 
+  0x0c00, 0x0b80, 0x0b00, 0x0a80, 0x0a00, 0x0980, 0x0900, 0x0880, 
+  0x0800, 0x0780, 0x0700, 0x0680, 0x0600, 0x0580, 0x0500, 0x0480, 
+  0x0400, 0x0380, 0x0300, 0x0280, 0x0200, 0x0180, 0x0100, 0x0080, 
+  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+  0x0000, 0x0080, 0x0100, 0x0180, 0x0200, 0x0280, 0x0300, 0x0380, 
+  0x0400, 0x0480, 0x0500, 0x0580, 0x0600, 0x0680, 0x0700, 0x0780, 
+  0x0800, 0x0880, 0x0900, 0x0980, 0x0a00, 0x0a80, 0x0b00, 0x0b80, 
+  0x0c00, 0x0c80, 0x0d00, 0x0d80, 0x0e00, 0x0e80, 0x0f00, 0x0f80, 
+  0x1000, 0x1080, 0x1100, 0x1180, 0x1200, 0x1280, 0x1300, 0x1380, 
+  0x1400, 0x1480, 0x1500, 0x1580, 0x1600, 0x1680, 0x1700, 0x1780
+};
+
+static short lut_nmsedec_ref0[1 << T1_NMSEDEC_BITS] = {
+  0x2000, 0x1f00, 0x1e00, 0x1d00, 0x1c00, 0x1b00, 0x1a80, 0x1980, 
+  0x1880, 0x1780, 0x1700, 0x1600, 0x1500, 0x1480, 0x1380, 0x1300, 
+  0x1200, 0x1180, 0x1080, 0x1000, 0x0f00, 0x0e80, 0x0e00, 0x0d00, 
+  0x0c80, 0x0c00, 0x0b80, 0x0a80, 0x0a00, 0x0980, 0x0900, 0x0880, 
+  0x0800, 0x0780, 0x0700, 0x0680, 0x0600, 0x0580, 0x0580, 0x0500, 
+  0x0480, 0x0400, 0x0400, 0x0380, 0x0300, 0x0300, 0x0280, 0x0280, 
+  0x0200, 0x0200, 0x0180, 0x0180, 0x0100, 0x0100, 0x0100, 0x0080, 
+  0x0080, 0x0080, 0x0080, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0080, 0x0080, 
+  0x0080, 0x0080, 0x0100, 0x0100, 0x0100, 0x0180, 0x0180, 0x0200, 
+  0x0200, 0x0280, 0x0280, 0x0300, 0x0300, 0x0380, 0x0400, 0x0400, 
+  0x0480, 0x0500, 0x0580, 0x0580, 0x0600, 0x0680, 0x0700, 0x0780, 
+  0x0800, 0x0880, 0x0900, 0x0980, 0x0a00, 0x0a80, 0x0b80, 0x0c00, 
+  0x0c80, 0x0d00, 0x0e00, 0x0e80, 0x0f00, 0x1000, 0x1080, 0x1180, 
+  0x1200, 0x1300, 0x1380, 0x1480, 0x1500, 0x1600, 0x1700, 0x1780, 
+  0x1880, 0x1980, 0x1a80, 0x1b00, 0x1c00, 0x1d00, 0x1e00, 0x1f00
+};
+

libopenjpeg/t2.c

@@ -521,24 +521,25 @@ static int t2_decode_packet(opj_t2_t* t2, unsigned char *src, int len, opj_tcd_t
 					return -999;
 				}
 
-/* UniPG>> */
 #ifdef USE_JPWL
 			/* we need here a j2k handle to verify if making a check to
 			the validity of cblocks parameters is selected from user (-W) */
 
 				/* let's check that we are not exceeding */
 				if ((cblk->len + seg->newlen) > 8192) {
-					fprintf(stderr, "JPWL: segment too long (%d) for codeblock %d (p=%d, b=%d, r=%d, c=%d)\n",
+					opj_event_msg(t2->cinfo, EVT_WARNING,
+						"JPWL: segment too long (%d) for codeblock %d (p=%d, b=%d, r=%d, c=%d)\n",
 						seg->newlen, cblkno, precno, bandno, resno, compno);
-					if (!JPWL_ASSUME)
-						exit(-1);
+					if (!JPWL_ASSUME) {
+						opj_event_msg(t2->cinfo, EVT_ERROR, "JPWL: giving up\n");
+						return -999;
+					}
 					seg->newlen = 8192 - cblk->len;
-					fprintf(stderr, "      - truncating segment to %d\n", seg->newlen);
+					opj_event_msg(t2->cinfo, EVT_WARNING, "      - truncating segment to %d\n", seg->newlen);
 					break;
 				};
 
 #endif /* USE_JPWL */
-/* <<UniPG */
 				
 				memcpy(cblk->data + cblk->len, c, seg->newlen);
 				if (seg->numpasses == 0) {
@@ -562,17 +563,19 @@ static int t2_decode_packet(opj_t2_t* t2, unsigned char *src, int len, opj_tcd_t
 
 /* ----------------------------------------------------------------------- */
 
-int t2_encode_packets(opj_t2_t* t2, int tileno, opj_tcd_tile_t *tile, int maxlayers, unsigned char *dest, int len, opj_image_info_t *image_info) {
+int t2_encode_packets(opj_t2_t* t2,int tileno, opj_tcd_tile_t *tile, int maxlayers, unsigned char *dest, int len, opj_image_info_t *image_info,int tpnum, int tppos,int pino, J2K_T2_MODE t2_mode){
 	unsigned char *c = dest;
 	int e = 0;
+	int compno;
+	int comp_len = 0;
 	opj_pi_iterator_t *pi = NULL;
-	int pino;
-
+	int poc;
 	opj_image_t *image = t2->image;
 	opj_cp_t *cp = t2->cp;
+	int pocno = cp->cinema == CINEMA4K_24? 2: 1;
+	int maxcomp = cp->max_comp_size > 0 ? image->numcomps : 1;
 	
-	/* create a packet iterator */
-	pi = pi_create(image, cp, tileno);
+	pi = pi_initialise_encode(image, cp, tileno, t2_mode);
 	if(!pi) {
 		/* TODO: throw an error */
 		return -999;
@@ -582,7 +585,35 @@ int t2_encode_packets(opj_t2_t* t2, int tileno, opj_tcd_tile_t *tile, int maxlay
 		image_info->num = 0;
 	}
 	
-	for (pino = 0; pino <= cp->tcps[tileno].numpocs; pino++) {
+	if(t2_mode == THRESH_CALC ){
+		for(compno = 0; compno < maxcomp; compno++ ){
+			for(poc = 0; poc < pocno ; poc++){
+				int comp_len = 0;
+				int tpnum = compno;
+				pi_create_encode(pi, cp,tileno,poc,tpnum,tppos); 
+				while (pi_next(&pi[poc])) {
+					if (pi[poc].layno < maxlayers) {
+						e = t2_encode_packet(tile, &cp->tcps[tileno], &pi[poc], c, dest + len - c, image_info, tileno);
+						comp_len = comp_len + e;
+						if (e == -999) {
+							break;
+						} else {
+							c += e;
+						}
+					}
+				}
+				if (e == -999) break;
+				if (cp->max_comp_size){
+					if (comp_len > cp->max_comp_size){
+								e = -999;
+								break;
+					}
+				}
+			}
+			if (e == -999)  break;
+		}
+	}else{
+		pi_create_encode(pi, cp,tileno,pino,tpnum,tppos); 
 		while (pi_next(&pi[pino])) {
 			if (pi[pino].layno < maxlayers) {
 				e = t2_encode_packet(tile, &cp->tcps[tileno], &pi[pino], c, dest + len - c, image_info, tileno);
@@ -591,29 +622,27 @@ int t2_encode_packets(opj_t2_t* t2, int tileno, opj_tcd_tile_t *tile, int maxlay
 				} else {
 					c += e;
 				}
-				
-				/* INDEX >> */
-				if(image_info && image_info->index_on) {
-					if(image_info->index_write) {
-						opj_tile_info_t *info_TL = &image_info->tile[tileno];
-						opj_packet_info_t *info_PK = &info_TL->packet[image_info->num];
-						if (!image_info->num) {
-							info_PK->start_pos = info_TL->end_header + 1;
-						} else {
-							info_PK->start_pos = info_TL->packet[image_info->num - 1].end_pos + 1;
-						}
-						info_PK->end_pos = info_PK->start_pos + e - 1;
-					}
-
-					image_info->num++;
-				}
-				/* << INDEX */
 			}
 		}
 	}
 
-	/* don't forget to release pi */
-	pi_destroy(pi, cp, tileno);
+		/* INDEX >> */
+		if(image_info && image_info->index_on) {
+				if(image_info->index_write) {
+					opj_tile_info_t *info_TL = &image_info->tile[tileno];
+					opj_packet_info_t *info_PK = &info_TL->packet[image_info->num];
+					if (!image_info->num) {
+						info_PK->start_pos = info_TL->end_header + 1;
+					} else {
+						info_PK->start_pos = info_TL->packet[image_info->num - 1].end_pos + 1;
+					}
+					info_PK->end_pos = info_PK->start_pos + e - 1;
+				}
+
+				image_info->num++;
+			}
+		/* << INDEX */
+		pi_destroy(pi, cp, tileno);
 	
 	if (e == -999) {
 		return e;
@@ -632,7 +661,7 @@ int t2_decode_packets(opj_t2_t *t2, unsigned char *src, int len, int tileno, opj
 	opj_cp_t *cp = t2->cp;
 	
 	/* create a packet iterator */
-	pi = pi_create(image, cp, tileno);
+	pi = pi_create_decode(image, cp, tileno);
 	if(!pi) {
 		/* TODO: throw an error */
 		return -999;

libopenjpeg/t2.h

@@ -65,9 +65,11 @@ Encode the packets of a tile to a destination buffer
 @param dest the destination buffer
 @param len the length of the destination buffer
 @param image_info structure to create an index file
+@param tpnum Tile part number of the current tile
+@param tppos The position of the tile part flag in the progression order
+@param t2_mode If == 0 In Threshold calculation ,If == 1 Final pass
 */
-int t2_encode_packets(opj_t2_t* t2, int tileno, opj_tcd_tile_t *tile, int maxlayers, unsigned char *dest, int len, opj_image_info_t *image_info);
-
+int t2_encode_packets(opj_t2_t* t2,int tileno, opj_tcd_tile_t *tile, int maxlayers, unsigned char *dest, int len, opj_image_info_t *image_info,int tpnum, int tppos,int pino,J2K_T2_MODE t2_mode);
 /**
 Decode the packets of a tile from a source buffer
 @param t2 T2 handle

libopenjpeg/tcd.c

@@ -5,6 +5,7 @@
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * Copyright (c) 2006-2007, Parvatha Elangovan
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -1023,6 +1024,7 @@ bool tcd_rateallocate(opj_tcd_t *tcd, unsigned char *dest, int len, opj_image_in
 		/* TODO: remove maxlen */
 		int maxlen = tcd_tcp->rates[layno] ? int_min(((int) ceil(tcd_tcp->rates[layno])), len) : len;
 		double goodthresh = 0;
+		double stable_thresh = 0;
 		int i;
 		double distotarget;		/* fixed_quality */
 		
@@ -1040,15 +1042,34 @@ bool tcd_rateallocate(opj_tcd_t *tcd, unsigned char *dest, int len, opj_image_in
 				tcd_makelayer(tcd, layno, thresh, 0);
 				
 				if (cp->fixed_quality) {	/* fixed_quality */
-					distoachieved =	(layno == 0) ? 
-						tcd_tile->distolayer[0]	: (cumdisto[layno - 1] + tcd_tile->distolayer[layno]);
-					if (distoachieved < distotarget) {
-						hi = thresh;
-						continue;
+					if(cp->cinema){
+						l = t2_encode_packets(t2,tcd->tcd_tileno, tcd_tile, layno + 1, dest, maxlen, image_info,tcd->cur_tp_num,tcd->tp_pos,tcd->cur_pino,THRESH_CALC);
+						if (l == -999) {
+							lo = thresh;
+							continue;
+						}else{
+           		distoachieved =	layno == 0 ? 
+							tcd_tile->distolayer[0]	: cumdisto[layno - 1] + tcd_tile->distolayer[layno];
+							if (distoachieved < distotarget) {
+								hi=thresh; 
+								stable_thresh = thresh;
+								continue;
+							}else{
+								lo=thresh;
+							}
+						}
+					}else{
+						distoachieved =	(layno == 0) ? 
+							tcd_tile->distolayer[0]	: (cumdisto[layno - 1] + tcd_tile->distolayer[layno]);
+						if (distoachieved < distotarget) {
+							hi = thresh;
+							stable_thresh = thresh;
+							continue;
+						}
+						lo = thresh;
 					}
-					lo = thresh;
 				} else {
-					l = t2_encode_packets(t2, tcd->tcd_tileno, tcd_tile, layno + 1, dest, maxlen, image_info);
+					l = t2_encode_packets(t2, tcd->tcd_tileno, tcd_tile, layno + 1, dest, maxlen, image_info,tcd->cur_tp_num,tcd->tp_pos,tcd->cur_pino,THRESH_CALC);
 					/* TODO: what to do with l ??? seek / tell ??? */
 					/* opj_event_msg(tcd->cinfo, EVT_INFO, "rate alloc: len=%d, max=%d\n", l, maxlen); */
 					if (l == -999) {
@@ -1056,11 +1077,11 @@ bool tcd_rateallocate(opj_tcd_t *tcd, unsigned char *dest, int len, opj_image_in
 						continue;
 					}
 					hi = thresh;
+					stable_thresh = thresh;
 				}
-				
-				success = 1;
-				goodthresh = thresh;
 			}
+			success = 1;
+			goodthresh = stable_thresh;
 			t2_destroy(t2);
 		} else {
 			success = 1;
@@ -1086,7 +1107,6 @@ bool tcd_rateallocate(opj_tcd_t *tcd, unsigned char *dest, int len, opj_image_in
 int tcd_encode_tile(opj_tcd_t *tcd, int tileno, unsigned char *dest, int len, opj_image_info_t * image_info) {
 	int compno;
 	int l, i, npck = 0;
-	double encoding_time;
 	opj_tcd_tile_t *tile = NULL;
 	opj_tcp_t *tcd_tcp = NULL;
 	opj_cp_t *cp = NULL;
@@ -1106,103 +1126,105 @@ int tcd_encode_tile(opj_tcd_t *tcd, int tileno, unsigned char *dest, int len, op
 	tcd_tcp = tcd->tcp;
 	cp = tcd->cp;
 
-	/* INDEX >> "Precinct_nb_X et Precinct_nb_Y" */
-	if(image_info && image_info->index_on) {
-		opj_tcd_tilecomp_t *tilec_idx = &tile->comps[0];	/* based on component 0 */
-		for (i = 0; i < tilec_idx->numresolutions; i++) {
-			opj_tcd_resolution_t *res_idx = &tilec_idx->resolutions[i];
+	if(tcd->cur_tp_num == 0){
+		tcd->encoding_time = opj_clock();	/* time needed to encode a tile */
+		/* INDEX >> "Precinct_nb_X et Precinct_nb_Y" */
+		if(image_info && image_info->index_on) {
+			opj_tcd_tilecomp_t *tilec_idx = &tile->comps[0];	/* based on component 0 */
+			for (i = 0; i < tilec_idx->numresolutions; i++) {
+				opj_tcd_resolution_t *res_idx = &tilec_idx->resolutions[i];
 				
-			image_info->tile[tileno].pw[i] = res_idx->pw;
-			image_info->tile[tileno].ph[i] = res_idx->ph;
+				image_info->tile[tileno].pw[i] = res_idx->pw;
+				image_info->tile[tileno].ph[i] = res_idx->ph;
 				
-			npck += res_idx->pw * res_idx->ph;
+				npck += res_idx->pw * res_idx->ph;
 				
-			image_info->tile[tileno].pdx[i] = tccp->prcw[i];
-			image_info->tile[tileno].pdy[i] = tccp->prch[i];
-		}
-		image_info->tile[tileno].packet = (opj_packet_info_t *) opj_malloc(image_info->comp * image_info->layer * npck * sizeof(opj_packet_info_t));
-	}
-	/* << INDEX */
-	
-	/*---------------TILE-------------------*/
-	encoding_time = opj_clock();	/* time needed to encode a tile */
-	
-	for (compno = 0; compno < tile->numcomps; compno++) {
-		int x, y;
-
-		int adjust = image->comps[compno].sgnd ? 0 : 1 << (image->comps[compno].prec - 1);
-		int offset_x = int_ceildiv(image->x0, image->comps[compno].dx);
-		int offset_y = int_ceildiv(image->y0, image->comps[compno].dy);
-		
-		opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
-		int tw = tilec->x1 - tilec->x0;
-		int w = int_ceildiv(image->x1 - image->x0, image->comps[compno].dx);
-
-		/* extract tile data */
-
-		if (tcd_tcp->tccps[compno].qmfbid == 1) {
-			for (y = tilec->y0; y < tilec->y1; y++) {
-				/* start of the src tile scanline */
-				int *data = &image->comps[compno].data[(tilec->x0 - offset_x) + (y - offset_y) * w];
-				/* start of the dst tile scanline */
-				int *tile_data = &tilec->data[(y - tilec->y0) * tw];
-				for (x = tilec->x0; x < tilec->x1; x++) {
-					*tile_data++ = *data++ - adjust;
-				}
+				image_info->tile[tileno].pdx[i] = tccp->prcw[i];
+				image_info->tile[tileno].pdy[i] = tccp->prch[i];
 			}
-		} else if (tcd_tcp->tccps[compno].qmfbid == 0) {
-			for (y = tilec->y0; y < tilec->y1; y++) {
-				/* start of the src tile scanline */
-				int *data = &image->comps[compno].data[(tilec->x0 - offset_x) + (y - offset_y) * w];
-				/* start of the dst tile scanline */
-				int *tile_data = &tilec->data[(y - tilec->y0) * tw];
-				for (x = tilec->x0; x < tilec->x1; x++) {
-					*tile_data++ = (*data++ - adjust) << 13;
+			image_info->tile[tileno].packet = (opj_packet_info_t *) opj_malloc(image_info->comp * image_info->layer * npck * sizeof(opj_packet_info_t));
+		}
+		/* << INDEX */
+		
+		/*---------------TILE-------------------*/
+		
+		for (compno = 0; compno < tile->numcomps; compno++) {
+			int x, y;
+			
+			int adjust = image->comps[compno].sgnd ? 0 : 1 << (image->comps[compno].prec - 1);
+			int offset_x = int_ceildiv(image->x0, image->comps[compno].dx);
+			int offset_y = int_ceildiv(image->y0, image->comps[compno].dy);
+			
+			opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
+			int tw = tilec->x1 - tilec->x0;
+			int w = int_ceildiv(image->x1 - image->x0, image->comps[compno].dx);
+			
+			/* extract tile data */
+			
+			if (tcd_tcp->tccps[compno].qmfbid == 1) {
+				for (y = tilec->y0; y < tilec->y1; y++) {
+					/* start of the src tile scanline */
+					int *data = &image->comps[compno].data[(tilec->x0 - offset_x) + (y - offset_y) * w];
+					/* start of the dst tile scanline */
+					int *tile_data = &tilec->data[(y - tilec->y0) * tw];
+					for (x = tilec->x0; x < tilec->x1; x++) {
+						*tile_data++ = *data++ - adjust;
+					}
+				}
+			} else if (tcd_tcp->tccps[compno].qmfbid == 0) {
+				for (y = tilec->y0; y < tilec->y1; y++) {
+					/* start of the src tile scanline */
+					int *data = &image->comps[compno].data[(tilec->x0 - offset_x) + (y - offset_y) * w];
+					/* start of the dst tile scanline */
+					int *tile_data = &tilec->data[(y - tilec->y0) * tw];
+					for (x = tilec->x0; x < tilec->x1; x++) {
+						*tile_data++ = (*data++ - adjust) << 11;
+					}
+					
 				}
 			}
 		}
-	}
 		
-	/*----------------MCT-------------------*/
-	if (tcd_tcp->mct) {
-		int samples = (tile->comps[0].x1 - tile->comps[0].x0) * (tile->comps[0].y1 - tile->comps[0].y0);
-		if (tcd_tcp->tccps[0].qmfbid == 0) {
-			mct_encode_real(tile->comps[0].data, tile->comps[1].data, tile->comps[2].data, samples);
+		/*----------------MCT-------------------*/
+		if (tcd_tcp->mct) {
+			int samples = (tile->comps[0].x1 - tile->comps[0].x0) * (tile->comps[0].y1 - tile->comps[0].y0);
+			if (tcd_tcp->tccps[0].qmfbid == 0) {
+				mct_encode_real(tile->comps[0].data, tile->comps[1].data, tile->comps[2].data, samples);
+			} else {
+				mct_encode(tile->comps[0].data, tile->comps[1].data, tile->comps[2].data, samples);
+			}
+		}
+		
+		/*----------------DWT---------------------*/
+		
+		for (compno = 0; compno < tile->numcomps; compno++) {
+			opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
+			if (tcd_tcp->tccps[compno].qmfbid == 1) {
+				dwt_encode(tilec);
+			} else if (tcd_tcp->tccps[compno].qmfbid == 0) {
+				dwt_encode_real(tilec);
+			}
+		}
+		
+		/*------------------TIER1-----------------*/
+		t1 = t1_create(tcd->cinfo);
+		t1_encode_cblks(t1, tile, tcd_tcp);
+		t1_destroy(t1);
+		
+		/*-----------RATE-ALLOCATE------------------*/
+		
+		/* INDEX */
+		if(image_info) {
+			image_info->index_write = 0;
+		}
+		if (cp->disto_alloc || cp->fixed_quality) {	/* fixed_quality */
+			/* Normal Rate/distortion allocation */
+			tcd_rateallocate(tcd, dest, len, image_info);
 		} else {
-			mct_encode(tile->comps[0].data, tile->comps[1].data, tile->comps[2].data, samples);
+			/* Fixed layer allocation */
+			tcd_rateallocate_fixed(tcd);
 		}
 	}
-	
-	/*----------------DWT---------------------*/
-
-	for (compno = 0; compno < tile->numcomps; compno++) {
-		opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
-		if (tcd_tcp->tccps[compno].qmfbid == 1) {
-			dwt_encode(tilec);
-		} else if (tcd_tcp->tccps[compno].qmfbid == 0) {
-			dwt_encode_real(tilec);
-		}
-	}
-
-	/*------------------TIER1-----------------*/
-	t1 = t1_create(tcd->cinfo);
-	t1_encode_cblks(t1, tile, tcd_tcp);
-	t1_destroy(t1);
-	
-	/*-----------RATE-ALLOCATE------------------*/
-
-	/* INDEX */
-	if(image_info) {
-		image_info->index_write = 0;
-	}
-	if (cp->disto_alloc || cp->fixed_quality) {	/* fixed_quality */
-		/* Normal Rate/distortion allocation */
-		tcd_rateallocate(tcd, dest, len, image_info);
-	} else {
-		/* Fixed layer allocation */
-		tcd_rateallocate_fixed(tcd);
-	}
-	
 	/*--------------TIER2------------------*/
 
 	/* INDEX */
@@ -1211,18 +1233,21 @@ int tcd_encode_tile(opj_tcd_t *tcd, int tileno, unsigned char *dest, int len, op
 	}
 
 	t2 = t2_create(tcd->cinfo, image, cp);
-	l = t2_encode_packets(t2, tileno, tile, tcd_tcp->numlayers, dest, len, image_info);
+	l = t2_encode_packets(t2,tileno, tile, tcd_tcp->numlayers, dest, len, image_info,tcd->tp_num,tcd->tp_pos,tcd->cur_pino,FINAL_PASS);
 	t2_destroy(t2);
 	
 	/*---------------CLEAN-------------------*/
 
-	encoding_time = opj_clock() - encoding_time;
-	opj_event_msg(tcd->cinfo, EVT_INFO, "- tile encoded in %f s\n", encoding_time);
 	
-	/* cleaning memory */
-	for (compno = 0; compno < tile->numcomps; compno++) {
-		opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
-		opj_free(tilec->data);
+	if(tcd->cur_tp_num == tcd->cur_totnum_tp - 1){
+		tcd->encoding_time = opj_clock() - tcd->encoding_time;
+		opj_event_msg(tcd->cinfo, EVT_INFO, "- tile encoded in %f s\n", tcd->encoding_time);
+	
+		/* cleaning memory */
+		for (compno = 0; compno < tile->numcomps; compno++) {
+			opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
+			opj_free(tilec->data);
+		}
 	}
 	
 	return l;

libopenjpeg/tcd.h

@@ -158,6 +158,16 @@ typedef struct opj_tcd_image {
 Tile coder/decoder
 */
 typedef struct opj_tcd {
+	/** Position of the tilepart flag in Progression order*/
+	int tp_pos;
+	/** Tile part number*/
+	int tp_num;
+	/** Current tile part number*/
+	int cur_tp_num;
+	/** Total number of tileparts of the current tile*/
+	int cur_totnum_tp;
+	/** Current Packet iterator number */
+	int cur_pino;
 	/** codec context */
 	opj_common_ptr cinfo;
 
@@ -173,6 +183,8 @@ typedef struct opj_tcd {
 	opj_tcp_t *tcp;
 	/** current encoded/decoded tile */
 	int tcd_tileno;
+	/** Time taken to encode a tile*/
+	double encoding_time;
 } opj_tcd_t;
 
 /** @name Exported functions */

libs/libtiff/Tiffcomp.h

@@ -0,0 +1,214 @@
+/* $Header: /usr/people/sam/tiff/libtiff/RCS/tiffcomp.h,v 1.49 1996/04/29 21:56:21 sam Rel $ */
+
+/*
+ * Copyright (c) 1990-1996 Sam Leffler
+ * Copyright (c) 1991-1996 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and 
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
+ * 
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF 
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
+ * OF THIS SOFTWARE.
+ */
+
+#ifndef _COMPAT_
+#define	_COMPAT_
+/*
+ * This file contains a hodgepodge of definitions and
+ * declarations that are needed to provide compatibility
+ * between the native system and the base implementation
+ * that the library assumes.
+ *
+ * NB: This file is a mess.
+ */
+
+/*
+ * Setup basic type definitions and function declaratations.
+ */
+
+/*
+ * Simplify Acorn RISC OS identifier (to avoid confusion with Acorn RISC iX
+ * and with defunct Unix Risc OS)
+ * No need to specify __arm - hey, Acorn might port the OS, no problem here!
+ */
+#ifdef __acornriscos
+#undef __acornriscos
+#endif
+#if defined(__acorn) && defined(__riscos)
+#define __acornriscos
+#endif
+
+#if defined(__MWERKS__) || defined(THINK_C)
+#include <unix.h>
+#include <math.h>
+#endif
+
+#include <stdio.h>
+
+#if defined(__PPCC__) || defined(__SC__) || defined(__MRC__)
+#include <types.h>
+#elif !defined(__MWERKS__) && !defined(THINK_C) && !defined(__acornriscos) && !defined(applec)
+#include <sys/types.h>
+#endif
+
+#if defined(VMS)
+#include <file.h>
+#include <unixio.h>
+#elif !defined(__acornriscos)
+#include <fcntl.h>
+#endif
+
+/*
+ * This maze of checks controls defines or not the
+ * target system has BSD-style typdedefs declared in
+ * an include file and/or whether or not to include
+ * <unistd.h> to get the SEEK_* definitions.  Some
+ * additional includes are also done to pull in the
+ * appropriate definitions we're looking for.
+ */
+#if defined(__MWERKS__) || defined(THINK_C) || defined(__PPCC__) || defined(__SC__) || defined(__MRC__)
+#include <stdlib.h>
+#define	BSDTYPES
+#define	HAVE_UNISTD_H	0
+#elif defined(_WINDOWS) || defined(__WIN32__) || defined(_Windows)
+#define	BSDTYPES
+#elif defined(OS2_16) || defined(OS2_32)
+#define	BSDTYPES
+#elif defined(__acornriscos)
+#include <stdlib.h>
+#define	BSDTYPES
+#define	HAVE_UNISTD_H	0
+#elif defined(VMS)
+#define	HAVE_UNISTD_H	0
+#else
+#define	HAVE_UNISTD_H	1
+#endif
+
+/*
+ * The library uses the ANSI C/POSIX SEEK_*
+ * definitions that should be defined in unistd.h
+ * (except on system where they are in stdio.h and
+ * there is no unistd.h).
+ */
+#if !defined(SEEK_SET) && HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+/*
+ * The library uses memset, memcpy, and memcmp.
+ * ANSI C and System V define these in string.h.
+ */
+#include <string.h>
+
+/*
+ * The BSD typedefs are used throughout the library.
+ * If your system doesn't have them in <sys/types.h>,
+ * then define BSDTYPES in your Makefile.
+ */
+#if defined(BSDTYPES)
+typedef	unsigned char u_char;
+typedef	unsigned short u_short;
+typedef	unsigned int u_int;
+typedef	unsigned long u_long;
+#endif
+
+/*
+ * dblparam_t is the type that a double precision
+ * floating point value will have on the parameter
+ * stack (when coerced by the compiler).
+ */
+/* Note: on MacPowerPC "extended" is undefined. So only use it for 68K-Macs */
+#if defined(__SC__) || defined(THINK_C)
+typedef extended dblparam_t;
+#else
+typedef double dblparam_t;
+#endif
+
+/*
+ * If your compiler supports inline functions, then
+ * set INLINE appropriately to get the known hotspots
+ * in the library expanded inline.
+ */
+#if defined(__GNUC__)
+#if defined(__STRICT_ANSI__)
+#define	INLINE	__inline__
+#else
+#define	INLINE	inline
+#endif
+#else /* !__GNUC__ */
+#define	INLINE
+#endif
+
+/*
+ * GLOBALDATA is a macro that is used to define global variables
+ * private to the library.  We use this indirection to hide
+ * brain-damage in VAXC (and GCC) under VAX/VMS.  In these
+ * environments the macro places the variable in a non-shareable
+ * program section, which ought to be done by default (sigh!)
+ *
+ * Apparently DEC are aware of the problem as this behaviour is the
+ * default under VMS on AXP.
+ *
+ * The GNU C variant is untested.
+ */
+#if defined(VAX) && defined(VMS)
+#if defined(VAXC)
+#define GLOBALDATA(TYPE,NAME)	extern noshare TYPE NAME
+#endif
+#if defined(__GNUC__)
+#define GLOBALDATA(TYPE,NAME)	extern TYPE NAME \
+	asm("_$$PsectAttributes_NOSHR$$" #NAME)
+#endif
+#else	/* !VAX/VMS */
+#define GLOBALDATA(TYPE,NAME)	extern TYPE NAME
+#endif
+
+#if defined(__acornriscos)
+/*
+ * osfcn.h is part of C++Lib on Acorn C/C++, and as such can't be used
+ * on C alone. For that reason, the relevant functions are
+ * implemented in tif_acorn.c, and the elements from the header
+ * file are included here.
+ */
+#if defined(__cplusplus)
+#include <osfcn.h>
+#else
+#define	O_RDONLY	0
+#define	O_WRONLY	1
+#define	O_RDWR		2
+#define	O_APPEND	8
+#define	O_CREAT		0x200
+#define	O_TRUNC		0x400
+typedef long off_t;
+extern int open(const char *name, int flags, int mode);
+extern int close(int fd);
+extern int write(int fd, const char *buf, int nbytes);
+extern int read(int fd, char *buf, int nbytes);
+extern off_t lseek(int fd, off_t offset, int whence);
+extern int creat(const char *path, int mode);
+#endif /* __cplusplus */
+#endif /* __acornriscos */
+
+/* Bit and byte order, the default is MSB to LSB */
+#ifdef VMS
+#undef HOST_FILLORDER
+#undef HOST_BIGENDIAN
+#define HOST_FILLORDER FILLORDER_LSB2MSB
+#define HOST_BIGENDIAN	0
+#endif
+
+
+#endif /* _COMPAT_ */

libs/libtiff/Tiffconf.h

@@ -0,0 +1,131 @@
+/* $Header: /usr/people/sam/tiff/libtiff/RCS/tiffconf.h,v 1.13 1996/04/05 17:36:53 sam Rel $ */
+/*
+ * Copyright (c) 1988-1996 Sam Leffler
+ * Copyright (c) 1991-1996 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and 
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
+ * 
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF 
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
+ * OF THIS SOFTWARE.
+ */
+
+#ifndef _TIFFCONF_
+#define	_TIFFCONF_
+/*
+ * Library Configuration Definitions.
+ *
+ * This file defines the default configuration for the library.
+ * If the target system does not have make or a way to specify
+ * #defines on the command line, this file can be edited to
+ * configure the library.  Otherwise, one can override portability
+ * and configuration-related definitions from a Makefile or command
+ * line by defining FEATURE_SUPPORT and COMPRESSION_SUPPORT (see below).
+ */
+
+/*
+ * General portability-related defines:
+ *
+ * HAVE_IEEEFP		define as 0 or 1 according to the floating point
+ *			format suported by the machine
+ * BSDTYPES		define this if your system does NOT define the
+ *			usual 4BSD typedefs u_int et. al.
+ * HAVE_MMAP		enable support for memory mapping read-only files;
+ *			this is typically deduced by the configure script
+ * HOST_FILLORDER	native cpu bit order: one of FILLORDER_MSB2LSB
+ *			or FILLODER_LSB2MSB; this is typically set by the
+ *			configure script
+ * HOST_BIGENDIAN	native cpu byte order: 1 if big-endian (Motorola)
+ *			or 0 if little-endian (Intel); this may be used
+ *			in codecs to optimize code
+ */
+#ifndef HAVE_IEEEFP
+#define	HAVE_IEEEFP	1
+#endif
+#ifndef HOST_FILLORDER
+#define	HOST_FILLORDER	FILLORDER_MSB2LSB
+#endif
+#ifndef	HOST_BIGENDIAN
+#define	HOST_BIGENDIAN	1
+#endif
+
+#ifndef FEATURE_SUPPORT
+/*
+ * Feature support definitions:
+ *
+ *    COLORIMETRY_SUPPORT enable support for 6.0 colorimetry tags
+ *    YCBCR_SUPPORT	enable support for 6.0 YCbCr tags
+ *    CMYK_SUPPORT	enable support for 6.0 CMYK tags
+ */
+#define	COLORIMETRY_SUPPORT
+#define	YCBCR_SUPPORT
+#define	CMYK_SUPPORT
+#endif /* FEATURE_SUPPORT */
+
+#ifndef COMPRESSION_SUPPORT
+/*
+ * Compression support defines:
+ *
+ *    CCITT_SUPPORT	enable support for CCITT Group 3 & 4 algorithms
+ *    PACKBITS_SUPPORT	enable support for Macintosh PackBits algorithm
+ *    LZW_SUPPORT	enable support for LZW algorithm
+ *    THUNDER_SUPPORT	enable support for ThunderScan 4-bit RLE algorithm
+ *    NEXT_SUPPORT	enable support for NeXT 2-bit RLE algorithm
+ *    OJPEG_SUPPORT	enable support for 6.0-style JPEG DCT algorithms
+ *			(no builtin support, only a codec hook)
+ *    JPEG_SUPPORT	enable support for post-6.0-style JPEG DCT algorithms
+ *			(requires freely available IJG software, see tif_jpeg.c)
+ *    ZIP_SUPPORT	enable support for Deflate algorithm
+ *			(requires freely available zlib software, see tif_zip.c)
+ *    PIXARLOG_SUPPORT	enable support for Pixar log-format algorithm
+ */
+/* doesn't work with Windows makefile??? */
+#if 0
+#define	CCITT_SUPPORT
+#endif
+#define	PACKBITS_SUPPORT
+#define	LZW_SUPPORT
+#define	THUNDER_SUPPORT
+#define	NEXT_SUPPORT
+#endif /* COMPRESSION_SUPPORT */
+
+/*
+ * If JPEG compression is enabled then we must also include
+ * support for the colorimetry and YCbCr-related tags.
+ */
+#ifdef JPEG_SUPPORT
+#ifndef YCBCR_SUPPORT
+#define	YCBCR_SUPPORT
+#endif
+#ifndef COLORIMETRY_SUPPORT
+#define	COLORIMETRY_SUPPORT
+#endif
+#endif /* JPEG_SUPPORT */
+
+/*
+ * ``Orthogonal Features''
+ *
+ * STRIPCHOP_SUPPORT	automatically convert single-strip uncompressed images
+ *			to mutiple strips of ~8Kb (for reducing memory use)
+ * SUBIFD_SUPPORT	enable support for SubIFD tag (thumbnails and such)
+ */
+#ifndef STRIPCHOP_SUPPORT
+#define	STRIPCHOP_SUPPORT	1	/* enable strip chopping */
+#endif
+#ifndef SUBIFD_SUPPORT
+#define	SUBIFD_SUPPORT		1	/* enable SubIFD tag (330) support */
+#endif
+#endif /* _TIFFCONF_ */

libs/libtiff/Tiffiop.h

@@ -0,0 +1,287 @@
+/* $Header: /usr/people/sam/tiff/libtiff/RCS/tiffiop.h,v 1.80 1996/04/05 17:36:53 sam Rel $ */
+
+/*
+ * Copyright (c) 1988-1996 Sam Leffler
+ * Copyright (c) 1991-1996 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and 
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
+ * 
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF 
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
+ * OF THIS SOFTWARE.
+ */
+
+#ifndef _TIFFIOP_
+#define	_TIFFIOP_
+/*
+ * ``Library-private'' definitions.
+ */
+/*
+ * UNIX systems should run the configure script to generate
+ * a port.h file that reflects the system capabilities.
+ * Doing this obviates all the dreck done in tiffcomp.h.
+ */
+#if defined(unix) || defined(__unix)
+#include "port.h"
+#include "tiffconf.h"
+#else
+#include "tiffconf.h"
+#include "tiffcomp.h"
+#endif
+#include "tiffio.h"
+#include "tif_dir.h"
+
+#ifndef TRUE
+#define	TRUE	1
+#define	FALSE	0
+#endif
+
+/*
+ * Typedefs for ``method pointers'' used internally.
+ */
+typedef	unsigned char tidataval_t;	/* internal image data value type */
+typedef	tidataval_t* tidata_t;		/* reference to internal image data */
+
+typedef	void (*TIFFVoidMethod)(TIFF*);
+typedef	int (*TIFFBoolMethod)(TIFF*);
+typedef	int (*TIFFPreMethod)(TIFF*, tsample_t);
+typedef	int (*TIFFCodeMethod)(TIFF*, tidata_t, tsize_t, tsample_t);
+typedef	int (*TIFFSeekMethod)(TIFF*, uint32);
+typedef	void (*TIFFPostMethod)(TIFF*, tidata_t, tsize_t);
+typedef	int (*TIFFVSetMethod)(TIFF*, ttag_t, va_list);
+typedef	int (*TIFFVGetMethod)(TIFF*, ttag_t, va_list);
+typedef	void (*TIFFPrintMethod)(TIFF*, FILE*, long);
+typedef	uint32 (*TIFFStripMethod)(TIFF*, uint32);
+typedef	void (*TIFFTileMethod)(TIFF*, uint32*, uint32*);
+
+struct tiff {
+	char*		tif_name;	/* name of open file */
+	int		tif_fd;		/* open file descriptor */
+	int		tif_mode;	/* open mode (O_*) */
+	uint32		tif_flags;
+#define	TIFF_FILLORDER		0x0003	/* natural bit fill order for machine */
+#define	TIFF_DIRTYHEADER	0x0004	/* header must be written on close */
+#define	TIFF_DIRTYDIRECT	0x0008	/* current directory must be written */
+#define	TIFF_BUFFERSETUP	0x0010	/* data buffers setup */
+#define	TIFF_CODERSETUP		0x0020	/* encoder/decoder setup done */
+#define	TIFF_BEENWRITING	0x0040	/* written 1+ scanlines to file */
+#define	TIFF_SWAB		0x0080	/* byte swap file information */
+#define	TIFF_NOBITREV		0x0100	/* inhibit bit reversal logic */
+#define	TIFF_MYBUFFER		0x0200	/* my raw data buffer; free on close */
+#define	TIFF_ISTILED		0x0400	/* file is tile, not strip- based */
+#define	TIFF_MAPPED		0x0800	/* file is mapped into memory */
+#define	TIFF_POSTENCODE		0x1000	/* need call to postencode routine */
+#define	TIFF_INSUBIFD		0x2000	/* currently writing a subifd */
+#define	TIFF_UPSAMPLED		0x4000	/* library is doing data up-sampling */ 
+#define	TIFF_STRIPCHOP		0x8000	/* enable strip chopping support */
+	toff_t		tif_diroff;	/* file offset of current directory */
+	toff_t		tif_nextdiroff;	/* file offset of following directory */
+	TIFFDirectory	tif_dir;	/* internal rep of current directory */
+	TIFFHeader	tif_header;	/* file's header block */
+        tidata_t        tif_clientdir;  /* client TIFF directory */
+	const int*	tif_typeshift;	/* data type shift counts */
+	const long*	tif_typemask;	/* data type masks */
+	uint32		tif_row;	/* current scanline */
+	tdir_t		tif_curdir;	/* current directory (index) */
+	tstrip_t	tif_curstrip;	/* current strip for read/write */
+	toff_t		tif_curoff;	/* current offset for read/write */
+	toff_t		tif_dataoff;	/* current offset for writing dir */
+#if SUBIFD_SUPPORT
+	uint16		tif_nsubifd;	/* remaining subifds to write */
+	toff_t		tif_subifdoff;	/* offset for patching SubIFD link */
+#endif
+/* tiling support */
+	uint32 		tif_col;	/* current column (offset by row too) */
+	ttile_t		tif_curtile;	/* current tile for read/write */
+	tsize_t		tif_tilesize;	/* # of bytes in a tile */
+/* compression scheme hooks */
+	TIFFBoolMethod	tif_setupdecode;/* called once before predecode */
+	TIFFPreMethod	tif_predecode;	/* pre- row/strip/tile decoding */
+	TIFFBoolMethod	tif_setupencode;/* called once before preencode */
+	TIFFPreMethod	tif_preencode;	/* pre- row/strip/tile encoding */
+	TIFFBoolMethod	tif_postencode;	/* post- row/strip/tile encoding */
+	TIFFCodeMethod	tif_decoderow;	/* scanline decoding routine */
+	TIFFCodeMethod	tif_encoderow;	/* scanline encoding routine */
+	TIFFCodeMethod	tif_decodestrip;/* strip decoding routine */
+	TIFFCodeMethod	tif_encodestrip;/* strip encoding routine */
+	TIFFCodeMethod	tif_decodetile;	/* tile decoding routine */
+	TIFFCodeMethod	tif_encodetile;	/* tile encoding routine */
+	TIFFVoidMethod	tif_close;	/* cleanup-on-close routine */
+	TIFFSeekMethod	tif_seek;	/* position within a strip routine */
+	TIFFVoidMethod	tif_cleanup;	/* cleanup state routine */
+	TIFFStripMethod	tif_defstripsize;/* calculate/constrain strip size */
+	TIFFTileMethod	tif_deftilesize;/* calculate/constrain tile size */
+	tidata_t	tif_data;	/* compression scheme private data */
+/* input/output buffering */
+	tsize_t		tif_scanlinesize;/* # of bytes in a scanline */
+	tsize_t		tif_scanlineskew;/* scanline skew for reading strips */
+	tidata_t	tif_rawdata;	/* raw data buffer */
+	tsize_t		tif_rawdatasize;/* # of bytes in raw data buffer */
+	tidata_t	tif_rawcp;	/* current spot in raw buffer */
+	tsize_t		tif_rawcc;	/* bytes unread from raw buffer */
+/* memory-mapped file support */
+	tidata_t	tif_base;	/* base of mapped file */
+#ifdef __WIN32__
+	void*		pv_map_handle;	/* WIN32 file mapping handle;
+					 * must be contiguous with tif_base
+					 * since map & unmap only get tif_base
+					 * and assume 4 byte offset to
+					 * pv_map_handle. */
+#endif
+	toff_t		tif_size;	/* size of mapped file region (bytes) */
+	TIFFMapFileProc	tif_mapproc;	/* map file method */
+	TIFFUnmapFileProc tif_unmapproc;/* unmap file method */
+/* input/output callback methods */
+	thandle_t	tif_clientdata;	/* callback parameter */
+	TIFFReadWriteProc tif_readproc;	/* read method */
+	TIFFReadWriteProc tif_writeproc;/* write method */
+	TIFFSeekProc	tif_seekproc;	/* lseek method */
+	TIFFCloseProc	tif_closeproc;	/* close method */
+	TIFFSizeProc	tif_sizeproc;	/* filesize method */
+/* post-decoding support */
+	TIFFPostMethod	tif_postdecode;	/* post decoding routine */
+/* tag support */
+	TIFFFieldInfo**	tif_fieldinfo;	/* sorted table of registered tags */
+	int		tif_nfields;	/* # entries in registered tag table */
+	TIFFVSetMethod	tif_vsetfield;	/* tag set routine */
+	TIFFVGetMethod	tif_vgetfield;	/* tag get routine */
+	TIFFPrintMethod	tif_printdir;	/* directory print routine */
+};
+
+#define	isPseudoTag(t)	(t > 0xffff)	/* is tag value normal or pseudo */
+
+#define	isTiled(tif)	(((tif)->tif_flags & TIFF_ISTILED) != 0)
+#define	isMapped(tif)	(((tif)->tif_flags & TIFF_MAPPED) != 0)
+#define	isFillOrder(tif, o)	(((tif)->tif_flags & (o)) != 0)
+#define	isUpSampled(tif)	(((tif)->tif_flags & TIFF_UPSAMPLED) != 0)
+#define	TIFFReadFile(tif, buf, size) \
+	((*(tif)->tif_readproc)((tif)->tif_clientdata,buf,size))
+#define	TIFFWriteFile(tif, buf, size) \
+	((*(tif)->tif_writeproc)((tif)->tif_clientdata,buf,size))
+#define	TIFFSeekFile(tif, off, whence) \
+	((*(tif)->tif_seekproc)((tif)->tif_clientdata,(toff_t)(off),whence))
+#define	TIFFCloseFile(tif) \
+	((*(tif)->tif_closeproc)((tif)->tif_clientdata))
+#define	TIFFGetFileSize(tif) \
+	((*(tif)->tif_sizeproc)((tif)->tif_clientdata))
+#define	TIFFMapFileContents(tif, paddr, psize) \
+	((*(tif)->tif_mapproc)((tif)->tif_clientdata,paddr,psize))
+#ifdef __WIN32__
+#define	TIFFUnmapFileContents(tif, addr, dummy) \
+	((*(tif)->tif_unmapproc)((tif)->tif_clientdata,addr,\
+	    (toff_t)(tif)->pv_map_handle))
+#else
+#define	TIFFUnmapFileContents(tif, addr, size) \
+	((*(tif)->tif_unmapproc)((tif)->tif_clientdata,addr,size))
+#endif
+
+/*
+ * Default Read/Seek/Write definitions.
+ */
+#ifndef ReadOK
+#define	ReadOK(tif, buf, size) \
+	(TIFFReadFile(tif, (tdata_t) buf, (tsize_t) size) == (tsize_t) size)
+#endif
+#ifndef SeekOK
+#define	SeekOK(tif, off) \
+	(TIFFSeekFile(tif, (toff_t) off, SEEK_SET) == (toff_t) off)
+#endif
+#ifndef WriteOK
+#define	WriteOK(tif, buf, size) \
+	(TIFFWriteFile(tif, (tdata_t) buf, (tsize_t) size) == (tsize_t) size)
+#endif
+
+/* NB: the uint32 casts are to silence certain ANSI-C compilers */
+#define	TIFFhowmany(x, y) ((((uint32)(x))+(((uint32)(y))-1))/((uint32)(y)))
+#define	TIFFroundup(x, y) (TIFFhowmany(x,y)*((uint32)(y)))
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+extern	int _TIFFgetMode(const char*, const char*);
+extern	int _TIFFNoRowEncode(TIFF*, tidata_t, tsize_t, tsample_t);
+extern	int _TIFFNoStripEncode(TIFF*, tidata_t, tsize_t, tsample_t);
+extern	int _TIFFNoTileEncode(TIFF*, tidata_t, tsize_t, tsample_t);
+extern	int _TIFFNoRowDecode(TIFF*, tidata_t, tsize_t, tsample_t);
+extern	int _TIFFNoStripDecode(TIFF*, tidata_t, tsize_t, tsample_t);
+extern	int _TIFFNoTileDecode(TIFF*, tidata_t, tsize_t, tsample_t);
+extern	void _TIFFNoPostDecode(TIFF*, tidata_t, tsize_t);
+extern	int _TIFFNoSeek(TIFF*, uint32);
+extern	void _TIFFSwab16BitData(TIFF*, tidata_t, tsize_t);
+extern	void _TIFFSwab32BitData(TIFF*, tidata_t, tsize_t);
+extern	void _TIFFSwab64BitData(TIFF*, tidata_t, tsize_t);
+extern	int TIFFFlushData1(TIFF*);
+extern	void TIFFFreeDirectory(TIFF*);
+extern	int TIFFDefaultDirectory(TIFF*);
+extern	int TIFFSetCompressionScheme(TIFF*, int);
+extern	uint32 _TIFFDefaultStripSize(TIFF*, uint32);
+extern	void _TIFFDefaultTileSize(TIFF*, uint32*, uint32*);
+
+extern	void _TIFFsetByteArray(void**, void*, long);
+extern	void _TIFFsetString(char**, char*);
+extern	void _TIFFsetShortArray(uint16**, uint16*, long);
+extern	void _TIFFsetLongArray(uint32**, uint32*, long);
+extern	void _TIFFsetFloatArray(float**, float*, long);
+extern	void _TIFFsetDoubleArray(double**, double*, long);
+
+extern	void _TIFFprintAscii(FILE*, const char*);
+extern	void _TIFFprintAsciiTag(FILE*, const char*, const char*);
+
+GLOBALDATA(TIFFErrorHandler,_TIFFwarningHandler);
+GLOBALDATA(TIFFErrorHandler,_TIFFerrorHandler);
+
+extern	int TIFFInitDumpMode(TIFF*, int);
+#ifdef PACKBITS_SUPPORT
+extern	int TIFFInitPackBits(TIFF*, int);
+#endif
+#ifdef CCITT_SUPPORT
+extern	int TIFFInitCCITTRLE(TIFF*, int), TIFFInitCCITTRLEW(TIFF*, int);
+extern	int TIFFInitCCITTFax3(TIFF*, int), TIFFInitCCITTFax4(TIFF*, int);
+#endif
+#ifdef THUNDER_SUPPORT
+extern	int TIFFInitThunderScan(TIFF*, int);
+#endif
+#ifdef NEXT_SUPPORT
+extern	int TIFFInitNeXT(TIFF*, int);
+#endif
+#ifdef LZW_SUPPORT
+extern	int TIFFInitLZW(TIFF*, int);
+#endif
+#ifdef OJPEG_SUPPORT
+extern	int TIFFInitOJPEG(TIFF*, int);
+#endif
+#ifdef JPEG_SUPPORT
+extern	int TIFFInitJPEG(TIFF*, int);
+#endif
+#ifdef JBIG_SUPPORT
+extern	int TIFFInitJBIG(TIFF*, int);
+#endif
+#ifdef ZIP_SUPPORT
+extern	int TIFFInitZIP(TIFF*, int);
+#endif
+#ifdef PIXARLOG_SUPPORT
+extern	int TIFFInitPixarLog(TIFF*, int);
+#endif
+#ifdef VMS
+extern	const TIFFCodec _TIFFBuiltinCODECS[];
+#else
+extern	TIFFCodec _TIFFBuiltinCODECS[];
+#endif
+
+#if defined(__cplusplus)
+}
+#endif
+#endif /* _TIFFIOP_ */

libs/libtiff/Version.h

@@ -0,0 +1 @@
+#define VERSION "LIBTIFF, Version 3.4beta024\nCopyright (c) 1988-1995 Sam Leffler\nCopyright (c) 1991-1995 Silicon Graphics, Inc."

libs/libtiff/tiff.h

@@ -0,0 +1,380 @@
+/* $Header: /usr/people/sam/tiff/libtiff/RCS/tiff.h,v 1.71 1996/04/29 22:16:05 sam Rel $ */
+
+/*
+ * Copyright (c) 1988-1996 Sam Leffler
+ * Copyright (c) 1991-1996 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and 
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
+ * 
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF 
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
+ * OF THIS SOFTWARE.
+ */
+
+#ifndef _TIFF_
+#define	_TIFF_
+/*
+ * Tag Image File Format (TIFF)
+ *
+ * Based on Rev 6.0 from:
+ *    Developer's Desk
+ *    Aldus Corporation
+ *    411 First Ave. South
+ *    Suite 200
+ *    Seattle, WA  98104
+ *    206-622-5500
+ */
+#define	TIFF_VERSION	42
+
+#define	TIFF_BIGENDIAN		0x4d4d
+#define	TIFF_LITTLEENDIAN	0x4949
+
+#ifndef _TIFF_DATA_TYPEDEFS_
+#define _TIFF_DATA_TYPEDEFS_
+/*
+ * Intrinsic data types required by the file format:
+ *
+ * 8-bit quantities	int8/uint8
+ * 16-bit quantities	int16/uint16
+ * 32-bit quantities	int32/uint32
+ * strings		unsigned char*
+ */
+#ifdef __STDC__
+typedef	signed char int8;	/* NB: non-ANSI compilers may not grok */
+#else
+typedef	char int8;
+#endif
+typedef	unsigned char uint8;
+typedef	short int16;
+typedef	unsigned short uint16;	/* sizeof (uint16) must == 2 */
+#if defined(__alpha) || (defined(_MIPS_SZLONG) && _MIPS_SZLONG == 64)
+typedef	int int32;
+typedef	unsigned int uint32;	/* sizeof (uint32) must == 4 */
+#else
+typedef	long int32;
+typedef	unsigned long uint32;	/* sizeof (uint32) must == 4 */
+#endif
+#endif /* _TIFF_DATA_TYPEDEFS_ */
+
+typedef	struct {
+	uint16	tiff_magic;	/* magic number (defines byte order) */
+	uint16	tiff_version;	/* TIFF version number */
+	uint32	tiff_diroff;	/* byte offset to first directory */
+} TIFFHeader;
+
+/*
+ * TIFF Image File Directories are comprised of
+ * a table of field descriptors of the form shown
+ * below.  The table is sorted in ascending order
+ * by tag.  The values associated with each entry
+ * are disjoint and may appear anywhere in the file
+ * (so long as they are placed on a word boundary).
+ *
+ * If the value is 4 bytes or less, then it is placed
+ * in the offset field to save space.  If the value
+ * is less than 4 bytes, it is left-justified in the
+ * offset field.
+ */
+typedef	struct {
+	uint16	tdir_tag;	/* see below */
+	uint16	tdir_type;	/* data type; see below */
+	uint32  tdir_count;	/* number of items; length in spec */
+	uint32  tdir_offset;	/* byte offset to field data */
+} TIFFDirEntry;
+
+/*
+ * NB: In the comments below,
+ *  - items marked with a + are obsoleted by revision 5.0,
+ *  - items marked with a ! are introduced in revision 6.0.
+ *  - items marked with a % are introduced post revision 6.0.
+ *  - items marked with a $ are obsoleted by revision 6.0.
+ */
+
+/*
+ * Tag data type information.
+ *
+ * Note: RATIONALs are the ratio of two 32-bit integer values.
+ */
+typedef	enum {
+	TIFF_NOTYPE	= 0,	/* placeholder */
+	TIFF_BYTE	= 1,	/* 8-bit unsigned integer */
+	TIFF_ASCII	= 2,	/* 8-bit bytes w/ last byte null */
+	TIFF_SHORT	= 3,	/* 16-bit unsigned integer */
+	TIFF_LONG	= 4,	/* 32-bit unsigned integer */
+	TIFF_RATIONAL	= 5,	/* 64-bit unsigned fraction */
+	TIFF_SBYTE	= 6,	/* !8-bit signed integer */
+	TIFF_UNDEFINED	= 7,	/* !8-bit untyped data */
+	TIFF_SSHORT	= 8,	/* !16-bit signed integer */
+	TIFF_SLONG	= 9,	/* !32-bit signed integer */
+	TIFF_SRATIONAL	= 10,	/* !64-bit signed fraction */
+	TIFF_FLOAT	= 11,	/* !32-bit IEEE floating point */
+	TIFF_DOUBLE	= 12	/* !64-bit IEEE floating point */
+} TIFFDataType;
+
+/*
+ * TIFF Tag Definitions.
+ */
+#define	TIFFTAG_SUBFILETYPE		254	/* subfile data descriptor */
+#define	    FILETYPE_REDUCEDIMAGE	0x1	/* reduced resolution version */
+#define	    FILETYPE_PAGE		0x2	/* one page of many */
+#define	    FILETYPE_MASK		0x4	/* transparency mask */
+#define	TIFFTAG_OSUBFILETYPE		255	/* +kind of data in subfile */
+#define	    OFILETYPE_IMAGE		1	/* full resolution image data */
+#define	    OFILETYPE_REDUCEDIMAGE	2	/* reduced size image data */
+#define	    OFILETYPE_PAGE		3	/* one page of many */
+#define	TIFFTAG_IMAGEWIDTH		256	/* image width in pixels */
+#define	TIFFTAG_IMAGELENGTH		257	/* image height in pixels */
+#define	TIFFTAG_BITSPERSAMPLE		258	/* bits per channel (sample) */
+#define	TIFFTAG_COMPRESSION		259	/* data compression technique */
+#define	    COMPRESSION_NONE		1	/* dump mode */
+#define	    COMPRESSION_CCITTRLE	2	/* CCITT modified Huffman RLE */
+#define	    COMPRESSION_CCITTFAX3	3	/* CCITT Group 3 fax encoding */
+#define	    COMPRESSION_CCITTFAX4	4	/* CCITT Group 4 fax encoding */
+#define	    COMPRESSION_LZW		5	/* Lempel-Ziv  & Welch */
+#define	    COMPRESSION_OJPEG		6	/* !6.0 JPEG */
+#define	    COMPRESSION_JPEG		7	/* %JPEG DCT compression */
+#define	    COMPRESSION_NEXT		32766	/* NeXT 2-bit RLE */
+#define	    COMPRESSION_CCITTRLEW	32771	/* #1 w/ word alignment */
+#define	    COMPRESSION_PACKBITS	32773	/* Macintosh RLE */
+#define	    COMPRESSION_THUNDERSCAN	32809	/* ThunderScan RLE */
+/* compression codes 32908-32911 are reserved for Pixar */
+#define     COMPRESSION_PIXARFILM	32908   /* Pixar companded 10bit LZW */
+#define	    COMPRESSION_PIXARLOG	32909   /* Pixar companded 11bit ZIP */
+#define	    COMPRESSION_DEFLATE		32946	/* Deflate compression */
+/* compression code 32947 is reserved for Oceana Matrix <dev@oceana.com> */
+#define     COMPRESSION_DCS             32947   /* Kodak DCS encoding */
+#define	    COMPRESSION_JBIG		34661	/* ISO JBIG */
+#define	TIFFTAG_PHOTOMETRIC		262	/* photometric interpretation */
+#define	    PHOTOMETRIC_MINISWHITE	0	/* min value is white */
+#define	    PHOTOMETRIC_MINISBLACK	1	/* min value is black */
+#define	    PHOTOMETRIC_RGB		2	/* RGB color model */
+#define	    PHOTOMETRIC_PALETTE		3	/* color map indexed */
+#define	    PHOTOMETRIC_MASK		4	/* $holdout mask */
+#define	    PHOTOMETRIC_SEPARATED	5	/* !color separations */
+#define	    PHOTOMETRIC_YCBCR		6	/* !CCIR 601 */
+#define	    PHOTOMETRIC_CIELAB		8	/* !1976 CIE L*a*b* */
+#define	TIFFTAG_THRESHHOLDING		263	/* +thresholding used on data */
+#define	    THRESHHOLD_BILEVEL		1	/* b&w art scan */
+#define	    THRESHHOLD_HALFTONE		2	/* or dithered scan */
+#define	    THRESHHOLD_ERRORDIFFUSE	3	/* usually floyd-steinberg */
+#define	TIFFTAG_CELLWIDTH		264	/* +dithering matrix width */
+#define	TIFFTAG_CELLLENGTH		265	/* +dithering matrix height */
+#define	TIFFTAG_FILLORDER		266	/* data order within a byte */
+#define	    FILLORDER_MSB2LSB		1	/* most significant -> least */
+#define	    FILLORDER_LSB2MSB		2	/* least significant -> most */
+#define	TIFFTAG_DOCUMENTNAME		269	/* name of doc. image is from */
+#define	TIFFTAG_IMAGEDESCRIPTION	270	/* info about image */
+#define	TIFFTAG_MAKE			271	/* scanner manufacturer name */
+#define	TIFFTAG_MODEL			272	/* scanner model name/number */
+#define	TIFFTAG_STRIPOFFSETS		273	/* offsets to data strips */
+#define	TIFFTAG_ORIENTATION		274	/* +image orientation */
+#define	    ORIENTATION_TOPLEFT		1	/* row 0 top, col 0 lhs */
+#define	    ORIENTATION_TOPRIGHT	2	/* row 0 top, col 0 rhs */
+#define	    ORIENTATION_BOTRIGHT	3	/* row 0 bottom, col 0 rhs */
+#define	    ORIENTATION_BOTLEFT		4	/* row 0 bottom, col 0 lhs */
+#define	    ORIENTATION_LEFTTOP		5	/* row 0 lhs, col 0 top */
+#define	    ORIENTATION_RIGHTTOP	6	/* row 0 rhs, col 0 top */
+#define	    ORIENTATION_RIGHTBOT	7	/* row 0 rhs, col 0 bottom */
+#define	    ORIENTATION_LEFTBOT		8	/* row 0 lhs, col 0 bottom */
+#define	TIFFTAG_SAMPLESPERPIXEL		277	/* samples per pixel */
+#define	TIFFTAG_ROWSPERSTRIP		278	/* rows per strip of data */
+#define	TIFFTAG_STRIPBYTECOUNTS		279	/* bytes counts for strips */
+#define	TIFFTAG_MINSAMPLEVALUE		280	/* +minimum sample value */
+#define	TIFFTAG_MAXSAMPLEVALUE		281	/* +maximum sample value */
+#define	TIFFTAG_XRESOLUTION		282	/* pixels/resolution in x */
+#define	TIFFTAG_YRESOLUTION		283	/* pixels/resolution in y */
+#define	TIFFTAG_PLANARCONFIG		284	/* storage organization */
+#define	    PLANARCONFIG_CONTIG		1	/* single image plane */
+#define	    PLANARCONFIG_SEPARATE	2	/* separate planes of data */
+#define	TIFFTAG_PAGENAME		285	/* page name image is from */
+#define	TIFFTAG_XPOSITION		286	/* x page offset of image lhs */
+#define	TIFFTAG_YPOSITION		287	/* y page offset of image lhs */
+#define	TIFFTAG_FREEOFFSETS		288	/* +byte offset to free block */
+#define	TIFFTAG_FREEBYTECOUNTS		289	/* +sizes of free blocks */
+#define	TIFFTAG_GRAYRESPONSEUNIT	290	/* $gray scale curve accuracy */
+#define	    GRAYRESPONSEUNIT_10S	1	/* tenths of a unit */
+#define	    GRAYRESPONSEUNIT_100S	2	/* hundredths of a unit */
+#define	    GRAYRESPONSEUNIT_1000S	3	/* thousandths of a unit */
+#define	    GRAYRESPONSEUNIT_10000S	4	/* ten-thousandths of a unit */
+#define	    GRAYRESPONSEUNIT_100000S	5	/* hundred-thousandths */
+#define	TIFFTAG_GRAYRESPONSECURVE	291	/* $gray scale response curve */
+#define	TIFFTAG_GROUP3OPTIONS		292	/* 32 flag bits */
+#define	    GROUP3OPT_2DENCODING	0x1	/* 2-dimensional coding */
+#define	    GROUP3OPT_UNCOMPRESSED	0x2	/* data not compressed */
+#define	    GROUP3OPT_FILLBITS		0x4	/* fill to byte boundary */
+#define	TIFFTAG_GROUP4OPTIONS		293	/* 32 flag bits */
+#define	    GROUP4OPT_UNCOMPRESSED	0x2	/* data not compressed */
+#define	TIFFTAG_RESOLUTIONUNIT		296	/* units of resolutions */
+#define	    RESUNIT_NONE		1	/* no meaningful units */
+#define	    RESUNIT_INCH		2	/* english */
+#define	    RESUNIT_CENTIMETER		3	/* metric */
+#define	TIFFTAG_PAGENUMBER		297	/* page numbers of multi-page */
+#define	TIFFTAG_COLORRESPONSEUNIT	300	/* $color curve accuracy */
+#define	    COLORRESPONSEUNIT_10S	1	/* tenths of a unit */
+#define	    COLORRESPONSEUNIT_100S	2	/* hundredths of a unit */
+#define	    COLORRESPONSEUNIT_1000S	3	/* thousandths of a unit */
+#define	    COLORRESPONSEUNIT_10000S	4	/* ten-thousandths of a unit */
+#define	    COLORRESPONSEUNIT_100000S	5	/* hundred-thousandths */
+#define	TIFFTAG_TRANSFERFUNCTION	301	/* !colorimetry info */
+#define	TIFFTAG_SOFTWARE		305	/* name & release */
+#define	TIFFTAG_DATETIME		306	/* creation date and time */
+#define	TIFFTAG_ARTIST			315	/* creator of image */
+#define	TIFFTAG_HOSTCOMPUTER		316	/* machine where created */
+#define	TIFFTAG_PREDICTOR		317	/* prediction scheme w/ LZW */
+#define	TIFFTAG_WHITEPOINT		318	/* image white point */
+#define	TIFFTAG_PRIMARYCHROMATICITIES	319	/* !primary chromaticities */
+#define	TIFFTAG_COLORMAP		320	/* RGB map for pallette image */
+#define	TIFFTAG_HALFTONEHINTS		321	/* !highlight+shadow info */
+#define	TIFFTAG_TILEWIDTH		322	/* !rows/data tile */
+#define	TIFFTAG_TILELENGTH		323	/* !cols/data tile */
+#define TIFFTAG_TILEOFFSETS		324	/* !offsets to data tiles */
+#define TIFFTAG_TILEBYTECOUNTS		325	/* !byte counts for tiles */
+#define	TIFFTAG_BADFAXLINES		326	/* lines w/ wrong pixel count */
+#define	TIFFTAG_CLEANFAXDATA		327	/* regenerated line info */
+#define	    CLEANFAXDATA_CLEAN		0	/* no errors detected */
+#define	    CLEANFAXDATA_REGENERATED	1	/* receiver regenerated lines */
+#define	    CLEANFAXDATA_UNCLEAN	2	/* uncorrected errors exist */
+#define	TIFFTAG_CONSECUTIVEBADFAXLINES	328	/* max consecutive bad lines */
+#define	TIFFTAG_SUBIFD			330	/* subimage descriptors */
+#define	TIFFTAG_INKSET			332	/* !inks in separated image */
+#define	    INKSET_CMYK			1	/* !cyan-magenta-yellow-black */
+#define	TIFFTAG_INKNAMES		333	/* !ascii names of inks */
+#define	TIFFTAG_DOTRANGE		336	/* !0% and 100% dot codes */
+#define	TIFFTAG_TARGETPRINTER		337	/* !separation target */
+#define	TIFFTAG_EXTRASAMPLES		338	/* !info about extra samples */
+#define	    EXTRASAMPLE_UNSPECIFIED	0	/* !unspecified data */
+#define	    EXTRASAMPLE_ASSOCALPHA	1	/* !associated alpha data */
+#define	    EXTRASAMPLE_UNASSALPHA	2	/* !unassociated alpha data */
+#define	TIFFTAG_SAMPLEFORMAT		339	/* !data sample format */
+#define	    SAMPLEFORMAT_UINT		1	/* !unsigned integer data */
+#define	    SAMPLEFORMAT_INT		2	/* !signed integer data */
+#define	    SAMPLEFORMAT_IEEEFP		3	/* !IEEE floating point data */
+#define	    SAMPLEFORMAT_VOID		4	/* !untyped data */
+#define	TIFFTAG_SMINSAMPLEVALUE		340	/* !variable MinSampleValue */
+#define	TIFFTAG_SMAXSAMPLEVALUE		341	/* !variable MaxSampleValue */
+#define	TIFFTAG_JPEGTABLES		347	/* %JPEG table stream */
+/*
+ * Tags 512-521 are obsoleted by Technical Note #2
+ * which specifies a revised JPEG-in-TIFF scheme.
+ */
+#define	TIFFTAG_JPEGPROC		512	/* !JPEG processing algorithm */
+#define	    JPEGPROC_BASELINE		1	/* !baseline sequential */
+#define	    JPEGPROC_LOSSLESS		14	/* !Huffman coded lossless */
+#define	TIFFTAG_JPEGIFOFFSET		513	/* !pointer to SOI marker */
+#define	TIFFTAG_JPEGIFBYTECOUNT		514	/* !JFIF stream length */
+#define	TIFFTAG_JPEGRESTARTINTERVAL	515	/* !restart interval length */
+#define	TIFFTAG_JPEGLOSSLESSPREDICTORS	517	/* !lossless proc predictor */
+#define	TIFFTAG_JPEGPOINTTRANSFORM	518	/* !lossless point transform */
+#define	TIFFTAG_JPEGQTABLES		519	/* !Q matrice offsets */
+#define	TIFFTAG_JPEGDCTABLES		520	/* !DCT table offsets */
+#define	TIFFTAG_JPEGACTABLES		521	/* !AC coefficient offsets */
+#define	TIFFTAG_YCBCRCOEFFICIENTS	529	/* !RGB -> YCbCr transform */
+#define	TIFFTAG_YCBCRSUBSAMPLING	530	/* !YCbCr subsampling factors */
+#define	TIFFTAG_YCBCRPOSITIONING	531	/* !subsample positioning */
+#define	    YCBCRPOSITION_CENTERED	1	/* !as in PostScript Level 2 */
+#define	    YCBCRPOSITION_COSITED	2	/* !as in CCIR 601-1 */
+#define	TIFFTAG_REFERENCEBLACKWHITE	532	/* !colorimetry info */
+/* tags 32952-32956 are private tags registered to Island Graphics */
+#define TIFFTAG_REFPTS			32953	/* image reference points */
+#define TIFFTAG_REGIONTACKPOINT		32954	/* region-xform tack point */
+#define TIFFTAG_REGIONWARPCORNERS	32955	/* warp quadrilateral */
+#define TIFFTAG_REGIONAFFINE		32956	/* affine transformation mat */
+/* tags 32995-32999 are private tags registered to SGI */
+#define	TIFFTAG_MATTEING		32995	/* $use ExtraSamples */
+#define	TIFFTAG_DATATYPE		32996	/* $use SampleFormat */
+#define	TIFFTAG_IMAGEDEPTH		32997	/* z depth of image */
+#define	TIFFTAG_TILEDEPTH		32998	/* z depth/data tile */
+/* tags 33300-33309 are private tags registered to Pixar */
+/*
+ * TIFFTAG_PIXAR_IMAGEFULLWIDTH and TIFFTAG_PIXAR_IMAGEFULLLENGTH
+ * are set when an image has been cropped out of a larger image.  
+ * They reflect the size of the original uncropped image.
+ * The TIFFTAG_XPOSITION and TIFFTAG_YPOSITION can be used
+ * to determine the position of the smaller image in the larger one.
+ */
+#define TIFFTAG_PIXAR_IMAGEFULLWIDTH    33300   /* full image size in x */
+#define TIFFTAG_PIXAR_IMAGEFULLLENGTH   33301   /* full image size in y */
+/* tag 33405 is a private tag registered to Eastman Kodak */
+#define TIFFTAG_WRITERSERIALNUMBER      33405   /* device serial number */
+/* tag 33432 is listed in the 6.0 spec w/ unknown ownership */
+#define	TIFFTAG_COPYRIGHT		33432	/* copyright string */
+/* tags 34232-34236 are private tags registered to Texas Instruments */
+#define TIFFTAG_FRAMECOUNT              34232   /* Sequence Frame Count */
+/* tag 34750 is a private tag registered to Pixel Magic */
+#define	TIFFTAG_JBIGOPTIONS		34750	/* JBIG options */
+/* tags 34908-34914 are private tags registered to SGI */
+#define	TIFFTAG_FAXRECVPARAMS		34908	/* encoded Class 2 ses. parms */
+#define	TIFFTAG_FAXSUBADDRESS		34909	/* received SubAddr string */
+#define	TIFFTAG_FAXRECVTIME		34910	/* receive time (secs) */
+/* tag 65535 is an undefined tag used by Eastman Kodak */
+#define TIFFTAG_DCSHUESHIFTVALUES       65535   /* hue shift correction data */
+
+/*
+ * The following are ``pseudo tags'' that can be
+ * used to control codec-specific functionality.
+ * These tags are not written to file.  Note that
+ * these values start at 0xffff+1 so that they'll
+ * never collide with Aldus-assigned tags.
+ *
+ * If you want your private pseudo tags ``registered''
+ * (i.e. added to this file), send mail to sam@sgi.com
+ * with the appropriate C definitions to add.
+ */
+#define	TIFFTAG_FAXMODE			65536	/* Group 3/4 format control */
+#define	    FAXMODE_CLASSIC	0x0000		/* default, include RTC */
+#define	    FAXMODE_NORTC	0x0001		/* no RTC at end of data */
+#define	    FAXMODE_NOEOL	0x0002		/* no EOL code at end of row */
+#define	    FAXMODE_BYTEALIGN	0x0004		/* byte align row */
+#define	    FAXMODE_WORDALIGN	0x0008		/* word align row */
+#define	    FAXMODE_CLASSF	FAXMODE_NORTC	/* TIFF Class F */
+#define	TIFFTAG_JPEGQUALITY		65537	/* Compression quality level */
+/* Note: quality level is on the IJG 0-100 scale.  Default value is 75 */
+#define	TIFFTAG_JPEGCOLORMODE		65538	/* Auto RGB<=>YCbCr convert? */
+#define	    JPEGCOLORMODE_RAW	0x0000		/* no conversion (default) */
+#define	    JPEGCOLORMODE_RGB	0x0001		/* do auto conversion */
+#define	TIFFTAG_JPEGTABLESMODE		65539	/* What to put in JPEGTables */
+#define	    JPEGTABLESMODE_QUANT 0x0001		/* include quantization tbls */
+#define	    JPEGTABLESMODE_HUFF	0x0002		/* include Huffman tbls */
+/* Note: default is JPEGTABLESMODE_QUANT | JPEGTABLESMODE_HUFF */
+#define	TIFFTAG_FAXFILLFUNC		65540	/* G3/G4 fill function */
+#define	TIFFTAG_PIXARLOGDATAFMT		65549	/* PixarLogCodec I/O data sz */
+#define	    PIXARLOGDATAFMT_8BIT	0	/* regular u_char samples */
+#define	    PIXARLOGDATAFMT_8BITABGR	1	/* ABGR-order u_chars */
+#define	    PIXARLOGDATAFMT_11BITLOG	2	/* 11-bit log-encoded (raw) */
+#define	    PIXARLOGDATAFMT_12BITPICIO	3	/* as per PICIO (1.0==2048) */
+#define	    PIXARLOGDATAFMT_16BIT	4	/* signed short samples */
+#define	    PIXARLOGDATAFMT_FLOAT	5	/* IEEE float samples */
+/* 65550-65556 are allocated to Oceana Matrix <dev@oceana.com> */
+#define TIFFTAG_DCSIMAGERTYPE           65550   /* imager model & filter */
+#define     DCSIMAGERMODEL_M3           0       /* M3 chip (1280 x 1024) */
+#define     DCSIMAGERMODEL_M5           1       /* M5 chip (1536 x 1024) */
+#define     DCSIMAGERMODEL_M6           2       /* M6 chip (3072 x 2048) */
+#define     DCSIMAGERFILTER_IR          0       /* infrared filter */
+#define     DCSIMAGERFILTER_MONO        1       /* monochrome filter */
+#define     DCSIMAGERFILTER_CFA         2       /* color filter array */
+#define     DCSIMAGERFILTER_OTHER       3       /* other filter */
+#define TIFFTAG_DCSINTERPMODE           65551   /* interpolation mode */
+#define     DCSINTERPMODE_NORMAL        0x0     /* whole image, default */
+#define     DCSINTERPMODE_PREVIEW       0x1     /* preview of image (384x256) */
+#define TIFFTAG_DCSBALANCEARRAY         65552   /* color balance values */
+#define TIFFTAG_DCSCORRECTMATRIX        65553   /* color correction values */
+#define TIFFTAG_DCSGAMMA                65554   /* gamma value */
+#define TIFFTAG_DCSTOESHOULDERPTS       65555   /* toe & shoulder points */
+#define TIFFTAG_DCSCALIBRATIONFD        65556   /* calibration file desc */
+/* Note: quality level is on the ZLIB 1-9 scale. Default value is -1 */
+#define	TIFFTAG_ZIPQUALITY		65557	/* compression quality level */
+#define	TIFFTAG_PIXARLOGQUALITY		65558	/* PixarLog uses same scale */
+#endif /* _TIFF_ */

libs/libtiff/tiffio.h

@@ -0,0 +1,311 @@
+/* $Header: /usr/people/sam/tiff/libtiff/RCS/tiffio.h,v 1.93 1996/03/07 17:00:14 sam Rel $ */
+
+/*
+ * Copyright (c) 1988-1996 Sam Leffler
+ * Copyright (c) 1991-1996 Silicon Graphics, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and 
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that (i) the above copyright notices and this permission notice appear in
+ * all copies of the software and related documentation, and (ii) the names of
+ * Sam Leffler and Silicon Graphics may not be used in any advertising or
+ * publicity relating to the software without the specific, prior written
+ * permission of Sam Leffler and Silicon Graphics.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
+ * 
+ * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+ * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF 
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
+ * OF THIS SOFTWARE.
+ */
+
+#ifndef _TIFFIO_
+#define	_TIFFIO_
+
+/*
+ * TIFF I/O Library Definitions.
+ */
+#include "tiff.h"
+
+/*
+ * This define can be used in code that requires
+ * compilation-related definitions specific to a
+ * version or versions of the library.  Runtime
+ * version checking should be done based on the
+ * string returned by TIFFGetVersion.
+ */
+#define	TIFFLIB_VERSION	19960307	/* March 7, 1996 */
+
+/*
+ * TIFF is defined as an incomplete type to hide the
+ * library's internal data structures from clients.
+ */
+typedef	struct tiff TIFF;
+
+/*
+ * The following typedefs define the intrinsic size of
+ * data types used in the *exported* interfaces.  These
+ * definitions depend on the proper definition of types
+ * in tiff.h.  Note also that the varargs interface used
+ * pass tag types and values uses the types defined in
+ * tiff.h directly.
+ *
+ * NB: ttag_t is unsigned int and not unsigned short because
+ *     ANSI C requires that the type before the ellipsis be a
+ *     promoted type (i.e. one of int, unsigned int, pointer,
+ *     or double) and because we defined pseudo-tags that are
+ *     outside the range of legal Aldus-assigned tags.
+ * NB: tsize_t is int32 and not uint32 because some functions
+ *     return -1.
+ * NB: toff_t is not off_t for many reasons; TIFFs max out at
+ *     32-bit file offsets being the most important
+ */
+typedef	unsigned int ttag_t;	/* directory tag */
+typedef	uint16 tdir_t;		/* directory index */
+typedef	uint16 tsample_t;	/* sample number */
+typedef	uint32 tstrip_t;	/* strip number */
+typedef uint32 ttile_t;		/* tile number */
+typedef	int32 tsize_t;		/* i/o size in bytes */
+#if defined(_WINDOWS) || defined(__WIN32__) || defined(_Windows)
+#include <windows.h>
+#ifdef __WIN32__
+DECLARE_HANDLE(thandle_t);	/* Win32 file handle */
+#else
+typedef	HFILE thandle_t;	/* client data handle */
+#endif
+#else
+typedef	void* thandle_t;	/* client data handle */
+#endif
+typedef	void* tdata_t;		/* image data ref */
+typedef	int32 toff_t;		/* file offset */
+
+#ifndef NULL
+#define	NULL	0
+#endif
+
+/*
+ * Flags to pass to TIFFPrintDirectory to control
+ * printing of data structures that are potentially
+ * very large.   Bit-or these flags to enable printing
+ * multiple items.
+ */
+#define	TIFFPRINT_NONE		0x0		/* no extra info */
+#define	TIFFPRINT_STRIPS	0x1		/* strips/tiles info */
+#define	TIFFPRINT_CURVES	0x2		/* color/gray response curves */
+#define	TIFFPRINT_COLORMAP	0x4		/* colormap */
+#define	TIFFPRINT_JPEGQTABLES	0x100		/* JPEG Q matrices */
+#define	TIFFPRINT_JPEGACTABLES	0x200		/* JPEG AC tables */
+#define	TIFFPRINT_JPEGDCTABLES	0x200		/* JPEG DC tables */
+
+/*
+ * RGBA-style image support.
+ */
+typedef	unsigned char TIFFRGBValue;		/* 8-bit samples */
+typedef struct _TIFFRGBAImage TIFFRGBAImage;
+/*
+ * The image reading and conversion routines invoke
+ * ``put routines'' to copy/image/whatever tiles of
+ * raw image data.  A default set of routines are 
+ * provided to convert/copy raw image data to 8-bit
+ * packed ABGR format rasters.  Applications can supply
+ * alternate routines that unpack the data into a
+ * different format or, for example, unpack the data
+ * and draw the unpacked raster on the display.
+ */
+typedef void (*tileContigRoutine)
+    (TIFFRGBAImage*, uint32*, uint32, uint32, uint32, uint32, int32, int32,
+	unsigned char*);
+typedef void (*tileSeparateRoutine)
+    (TIFFRGBAImage*, uint32*, uint32, uint32, uint32, uint32, int32, int32,
+	unsigned char*, unsigned char*, unsigned char*, unsigned char*);
+/*
+ * RGBA-reader state.
+ */
+typedef struct {				/* YCbCr->RGB support */
+	TIFFRGBValue* clamptab;			/* range clamping table */
+	int*	Cr_r_tab;
+	int*	Cb_b_tab;
+	int32*	Cr_g_tab;
+	int32*	Cb_g_tab;
+	float	coeffs[3];			/* cached for repeated use */
+} TIFFYCbCrToRGB;
+
+struct _TIFFRGBAImage {
+	TIFF*	tif;				/* image handle */
+	int	stoponerr;			/* stop on read error */
+	int	isContig;			/* data is packed/separate */
+	int	alpha;				/* type of alpha data present */
+	uint32	width;				/* image width */
+	uint32	height;				/* image height */
+	uint16	bitspersample;			/* image bits/sample */
+	uint16	samplesperpixel;		/* image samples/pixel */
+	uint16	orientation;			/* image orientation */
+	uint16	photometric;			/* image photometric interp */
+	uint16*	redcmap;			/* colormap pallete */
+	uint16*	greencmap;
+	uint16*	bluecmap;
+						/* get image data routine */
+	int	(*get)(TIFFRGBAImage*, uint32*, uint32, uint32);
+	union {
+	    void (*any)(TIFFRGBAImage*);
+	    tileContigRoutine	contig;
+	    tileSeparateRoutine	separate;
+	} put;					/* put decoded strip/tile */
+	TIFFRGBValue* Map;			/* sample mapping array */
+	uint32** BWmap;				/* black&white map */
+	uint32** PALmap;			/* palette image map */
+	TIFFYCbCrToRGB* ycbcr;			/* YCbCr conversion state */
+};
+
+/*
+ * Macros for extracting components from the
+ * packed ABGR form returned by TIFFReadRGBAImage.
+ */
+#define	TIFFGetR(abgr)	((abgr) & 0xff)
+#define	TIFFGetG(abgr)	(((abgr) >> 8) & 0xff)
+#define	TIFFGetB(abgr)	(((abgr) >> 16) & 0xff)
+#define	TIFFGetA(abgr)	(((abgr) >> 24) & 0xff)
+
+/*
+ * A CODEC is a software package that implements decoding,
+ * encoding, or decoding+encoding of a compression algorithm.
+ * The library provides a collection of builtin codecs.
+ * More codecs may be registered through calls to the library
+ * and/or the builtin implementations may be overridden.
+ */
+typedef	int (*TIFFInitMethod)(TIFF*, int);
+typedef struct {
+	char*		name;
+	uint16		scheme;
+	TIFFInitMethod	init;
+} TIFFCodec;
+
+#include <stdio.h>
+#include <stdarg.h>
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+typedef	void (*TIFFErrorHandler)(const char*, const char*, va_list);
+typedef	tsize_t (*TIFFReadWriteProc)(thandle_t, tdata_t, tsize_t);
+typedef	toff_t (*TIFFSeekProc)(thandle_t, toff_t, int);
+typedef	int (*TIFFCloseProc)(thandle_t);
+typedef	toff_t (*TIFFSizeProc)(thandle_t);
+typedef	int (*TIFFMapFileProc)(thandle_t, tdata_t*, toff_t*);
+typedef	void (*TIFFUnmapFileProc)(thandle_t, tdata_t, toff_t);
+typedef	void (*TIFFExtendProc)(TIFF*); 
+
+extern	const char* TIFFGetVersion(void);
+
+extern	const TIFFCodec* TIFFFindCODEC(uint16);
+extern	TIFFCodec* TIFFRegisterCODEC(uint16, const char*, TIFFInitMethod);
+extern	void TIFFUnRegisterCODEC(TIFFCodec*);
+
+extern	tdata_t _TIFFmalloc(tsize_t);
+extern	tdata_t _TIFFrealloc(tdata_t, tsize_t);
+extern	void _TIFFmemset(tdata_t, int, tsize_t);
+extern	void _TIFFmemcpy(tdata_t, const tdata_t, tsize_t);
+extern	int _TIFFmemcmp(const tdata_t, const tdata_t, tsize_t);
+extern	void _TIFFfree(tdata_t);
+
+extern	void TIFFClose(TIFF*);
+extern	int TIFFFlush(TIFF*);
+extern	int TIFFFlushData(TIFF*);
+extern	int TIFFGetField(TIFF*, ttag_t, ...);
+extern	int TIFFVGetField(TIFF*, ttag_t, va_list);
+extern	int TIFFGetFieldDefaulted(TIFF*, ttag_t, ...);
+extern	int TIFFVGetFieldDefaulted(TIFF*, ttag_t, va_list);
+extern	int TIFFReadDirectory(TIFF*);
+extern	tsize_t TIFFScanlineSize(TIFF*);
+extern	tsize_t TIFFRasterScanlineSize(TIFF*);
+extern	tsize_t TIFFStripSize(TIFF*);
+extern	tsize_t TIFFVStripSize(TIFF*, uint32);
+extern	tsize_t TIFFTileRowSize(TIFF*);
+extern	tsize_t TIFFTileSize(TIFF*);
+extern	tsize_t TIFFVTileSize(TIFF*, uint32);
+extern	uint32 TIFFDefaultStripSize(TIFF*, uint32);
+extern	void TIFFDefaultTileSize(TIFF*, uint32*, uint32*);
+extern	int TIFFFileno(TIFF*);
+extern	int TIFFGetMode(TIFF*);
+extern	int TIFFIsTiled(TIFF*);
+extern	int TIFFIsByteSwapped(TIFF*);
+extern	int TIFFIsUpSampled(TIFF*);
+extern	int TIFFIsMSB2LSB(TIFF*);
+extern	uint32 TIFFCurrentRow(TIFF*);
+extern	tdir_t TIFFCurrentDirectory(TIFF*);
+extern	uint32 TIFFCurrentDirOffset(TIFF*);
+extern	tstrip_t TIFFCurrentStrip(TIFF*);
+extern	ttile_t TIFFCurrentTile(TIFF*);
+extern	int TIFFReadBufferSetup(TIFF*, tdata_t, tsize_t);
+extern	int TIFFWriteBufferSetup(TIFF*, tdata_t, tsize_t);
+extern	int TIFFLastDirectory(TIFF*);
+extern	int TIFFSetDirectory(TIFF*, tdir_t);
+extern	int TIFFSetSubDirectory(TIFF*, uint32);
+extern	int TIFFUnlinkDirectory(TIFF*, tdir_t);
+extern	int TIFFSetField(TIFF*, ttag_t, ...);
+extern	int TIFFVSetField(TIFF*, ttag_t, va_list);
+extern	int TIFFWriteDirectory(TIFF *);
+#if defined(c_plusplus) || defined(__cplusplus)
+extern	void TIFFPrintDirectory(TIFF*, FILE*, long = 0);
+extern	int TIFFReadScanline(TIFF*, tdata_t, uint32, tsample_t = 0);
+extern	int TIFFWriteScanline(TIFF*, tdata_t, uint32, tsample_t = 0);
+extern	int TIFFReadRGBAImage(TIFF*, uint32, uint32, uint32*, int = 0);
+#else
+extern	void TIFFPrintDirectory(TIFF*, FILE*, long);
+extern	int TIFFReadScanline(TIFF*, tdata_t, uint32, tsample_t);
+extern	int TIFFWriteScanline(TIFF*, tdata_t, uint32, tsample_t);
+extern	int TIFFReadRGBAImage(TIFF*, uint32, uint32, uint32*, int);
+#endif
+extern	int TIFFRGBAImageOK(TIFF*, char [1024]);
+extern	int TIFFRGBAImageBegin(TIFFRGBAImage*, TIFF*, int, char [1024]);
+extern	int TIFFRGBAImageGet(TIFFRGBAImage*, uint32*, uint32, uint32);
+extern	void TIFFRGBAImageEnd(TIFFRGBAImage*);
+extern	TIFF* TIFFOpen(const char*, const char*);
+extern	TIFF* TIFFFdOpen(int, const char*, const char*);
+extern	TIFF* TIFFClientOpen(const char*, const char*,
+	    thandle_t,
+	    TIFFReadWriteProc, TIFFReadWriteProc,
+	    TIFFSeekProc, TIFFCloseProc,
+	    TIFFSizeProc,
+	    TIFFMapFileProc, TIFFUnmapFileProc);
+extern	const char* TIFFFileName(TIFF*);
+extern	void TIFFError(const char*, const char*, ...);
+extern	void TIFFWarning(const char*, const char*, ...);
+extern	TIFFErrorHandler TIFFSetErrorHandler(TIFFErrorHandler);
+extern	TIFFErrorHandler TIFFSetWarningHandler(TIFFErrorHandler);
+extern	TIFFExtendProc TIFFSetTagExtender(TIFFExtendProc);
+extern	ttile_t TIFFComputeTile(TIFF*, uint32, uint32, uint32, tsample_t);
+extern	int TIFFCheckTile(TIFF*, uint32, uint32, uint32, tsample_t);
+extern	ttile_t TIFFNumberOfTiles(TIFF*);
+extern	tsize_t TIFFReadTile(TIFF*,
+	    tdata_t, uint32, uint32, uint32, tsample_t);
+extern	tsize_t TIFFWriteTile(TIFF*,
+	    tdata_t, uint32, uint32, uint32, tsample_t);
+extern	tstrip_t TIFFComputeStrip(TIFF*, uint32, tsample_t);
+extern	tstrip_t TIFFNumberOfStrips(TIFF*);
+extern	tsize_t TIFFReadEncodedStrip(TIFF*, tstrip_t, tdata_t, tsize_t);
+extern	tsize_t TIFFReadRawStrip(TIFF*, tstrip_t, tdata_t, tsize_t);
+extern	tsize_t TIFFReadEncodedTile(TIFF*, ttile_t, tdata_t, tsize_t);
+extern	tsize_t TIFFReadRawTile(TIFF*, ttile_t, tdata_t, tsize_t);
+extern	tsize_t TIFFWriteEncodedStrip(TIFF*, tstrip_t, tdata_t, tsize_t);
+extern	tsize_t TIFFWriteRawStrip(TIFF*, tstrip_t, tdata_t, tsize_t);
+extern	tsize_t TIFFWriteEncodedTile(TIFF*, ttile_t, tdata_t, tsize_t);
+extern	tsize_t TIFFWriteRawTile(TIFF*, ttile_t, tdata_t, tsize_t);
+extern	void TIFFSetWriteOffset(TIFF*, toff_t);
+extern	void TIFFSwabShort(uint16*);
+extern	void TIFFSwabLong(uint32*);
+extern	void TIFFSwabDouble(double*);
+extern	void TIFFSwabArrayOfShort(uint16*, unsigned long);
+extern	void TIFFSwabArrayOfLong(uint32*, unsigned long);
+extern	void TIFFSwabArrayOfDouble(double*, unsigned long);
+extern	void TIFFReverseBits(unsigned char *, unsigned long);
+extern	const unsigned char* TIFFGetBitRevTable(int);
+#if defined(__cplusplus)
+}
+#endif
+#endif /* _TIFFIO_ */

license.txt

@@ -0,0 +1 @@
+/*

mj2/MJ2_Extractor.dsp

@@ -39,9 +39,10 @@ RSC=rc.exe
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "Release"
 # PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
 # 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_097" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "../libopenjpeg" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "OPJ_STATIC" /YX /FD /c
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
 # ADD RSC /l 0x809 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -49,7 +50,8 @@ BSC32=bscmake.exe
 # 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
+# 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 /nodefaultlib:"libcmt"
+# SUBTRACT LINK32 /pdb:none
 
 !ELSEIF  "$(CFG)" == "MJ2_Extractor - Win32 Debug"
 
@@ -62,9 +64,10 @@ LINK32=link.exe
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "MJ2_Extractor___Win32_Debug"
 # PROP Intermediate_Dir "MJ2_Extractor___Win32_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_097" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MT /W3 /Gm /GX /ZI /Od /I "../libopenjpeg" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "OPJ_STATIC" /FR /YX /FD /GZ /c
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
 # ADD RSC /l 0x809 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -72,7 +75,8 @@ BSC32=bscmake.exe
 # 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
+# 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 /nodefaultlib:"libcmt" /pdbtype:sept
+# SUBTRACT LINK32 /pdb:none
 
 !ENDIF 
 
@@ -85,18 +89,10 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\libopenjpeg_097\cio.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\extract_j2k_from_mj2.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg_097\jp2.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\mj2.c
 # End Source File
 # End Group
@@ -105,24 +101,96 @@ SOURCE=.\mj2.c
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE=..\libopenjpeg_097\cio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg_097\j2k.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg_097\jp2.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\mj2.h
 # End Source File
 # End Group
-# Begin Group "Resource Files"
+# Begin Group "OpenJPEG Header Files"
 
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# PROP Default_Filter ""
+# 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\event.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libopenjpeg\fix.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libopenjpeg\image.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\j2k_lib.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\opj_includes.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
 # End Target
 # End Project

mj2/MJ2_Extractor.dsw

@@ -0,0 +1,44 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "LibOpenJPEG"="..\LibOpenJPEG.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "MJ2_Extractor"=".\MJ2_Extractor.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name LibOpenJPEG
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+

mj2/MJ2_Wrapper.dsp

@@ -39,9 +39,10 @@ RSC=rc.exe
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "Release"
 # PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
 # 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_097" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../libopenjpeg" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "OPJ_STATIC" /FR /YX /FD /c
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
 # ADD RSC /l 0x809 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -62,9 +63,10 @@ LINK32=link.exe
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "MJ2_Wrapper___Win32_Debug"
 # PROP Intermediate_Dir "MJ2_Wrapper___Win32_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_097" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MT /W3 /Gm /GX /ZI /Od /I "../libopenjpeg" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "OPJ_STATIC" /FR /YX /FD /GZ /c
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
 # ADD RSC /l 0x809 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -72,7 +74,8 @@ BSC32=bscmake.exe
 # 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
+# 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 /nodefaultlib:"libcmt" /pdbtype:sept
+# SUBTRACT LINK32 /pdb:none
 
 !ENDIF 
 
@@ -85,18 +88,6 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\libopenjpeg_097\cio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg_097\int.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg_097\jp2.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\mj2.c
 # End Source File
 # Begin Source File
@@ -109,28 +100,96 @@ SOURCE=.\wrap_j2k_in_mj2.c
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE=..\libopenjpeg_097\cio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg_097\int.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg_097\j2k.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\libopenjpeg_097\jp2.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\mj2.h
 # End Source File
 # End Group
-# Begin Group "Resource Files"
+# Begin Group "OpenJPEG Header Files"
 
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# PROP Default_Filter ""
+# 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\event.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libopenjpeg\fix.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\libopenjpeg\image.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\j2k_lib.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\opj_includes.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
 # End Target
 # End Project