[trunk] FolderReorgProposal task: rename cli tools
authorMathieu Malaterre <mathieu.malaterre@gmail.com>
Fri, 28 Sep 2012 09:12:22 +0000 (09:12 +0000)
committerMathieu Malaterre <mathieu.malaterre@gmail.com>
Fri, 28 Sep 2012 09:12:22 +0000 (09:12 +0000)
Update issue 177

15 files changed:
CMakeLists.txt
doc/man/man1/image_to_j2k.1 [deleted file]
doc/man/man1/j2k_dump.1 [deleted file]
doc/man/man1/j2k_to_image.1 [deleted file]
doc/man/man1/opj_compress.1 [new file with mode: 0644]
doc/man/man1/opj_decompress.1 [new file with mode: 0644]
doc/man/man1/opj_dump.1 [new file with mode: 0644]
src/bin/jp2/CMakeLists.txt
src/bin/jp2/README [deleted file]
src/bin/jp2/image_to_j2k.c [deleted file]
src/bin/jp2/j2k_dump.c [deleted file]
src/bin/jp2/j2k_to_image.c [deleted file]
src/bin/jp2/opj_compress.c [new file with mode: 0644]
src/bin/jp2/opj_decompress.c [new file with mode: 0644]
src/bin/jp2/opj_dump.c [new file with mode: 0644]

index b2fbaaa8d370ecb92b05aada8b1553606100d3d9..1978a71af505c88943065aafe3503dc1fbd48b09 100644 (file)
@@ -18,7 +18,8 @@ if(NOT OPENJPEG_NAMESPACE)
   set(OPENJPEG_STANDALONE 1)
 endif()
 # In all cases:
-string(TOLOWER ${OPENJPEG_NAMESPACE} OPENJPEG_LIBRARY_NAME)
+#string(TOLOWER ${OPENJPEG_NAMESPACE} OPENJPEG_LIBRARY_NAME)
+set(OPENJPEG_LIBRARY_NAME openjp2)
 
 project(${OPENJPEG_NAMESPACE} C)
 
diff --git a/doc/man/man1/image_to_j2k.1 b/doc/man/man1/image_to_j2k.1
deleted file mode 100644 (file)
index 331af0e..0000000
+++ /dev/null
@@ -1,222 +0,0 @@
-'\" t
-'\" The line above instructs most `man' programs to invoke tbl
-'\"
-'\" Separate paragraphs; not the same as PP which resets indent level.
-.de SP
-.if t .sp .5
-.if n .sp
-..
-'\"
-'\" Replacement em-dash for nroff (default is too short).
-.ie n .ds m " -
-.el .ds m \(em
-'\"
-'\" Placeholder macro for if longer nroff arrow is needed.
-.ds RA \(->
-'\"
-'\" Decimal point set slightly raised
-.if t .ds d \v'-.15m'.\v'+.15m'
-.if n .ds d .
-'\"
-'\" Enclosure macro for examples
-.de EX
-.SP
-.nf
-.ft CW
-..
-.de EE
-.ft R
-.SP
-.fi
-..
-.TH image_to_j2k 1 "Version 1.4.0" "image_to_j2k" "converts to jpeg2000 files"
-.P
-.SH NAME
-image_to_j2k - 
-This program reads in an image of a certain type and converts it to a
-jpeg2000 file. It is part of the OpenJPEG library.
-.SP
-Valid input image extensions are
-.B .bmp, .pgm, .pgx, .png, .pnm, .ppm, .raw, .tga, .tif \fR. For PNG resp. TIF it needs libpng resp. libtiff .
-.SP
-Valid output image extensions are
-.B .j2k, .jp2
-.SH SYNOPSIS
-.P
-.B image_to_j2k -i \fRinfile.bmp \fB-o \fRoutfile.j2k
-.P
-.B image_to_j2k -ImgDir \fRdirectory_name \fB-OutFor \fRjp2
-.P
-.B image_to_j2k -h \fRPrint a help message and exit.
-.P
-.R See JPWL OPTIONS for special options
-.SH OPTIONS
-.TP
-.B \-\^b " n,n"
-(Size of code block (e.g. -b 32,32). Default: 64 x 64)
-.TP
-.B \-\^c " n"
-(Size of precinct (e.g. -c 128,128). Default: 2^15 x 2^15)
-.TP
-.B \-\^cinema2K " fps"
-Digital Cinema 2K profile compliant codestream. Valid \fBfps\fR values are 24 or 48.
-.TP
-.B \-\^cinema4K
-Digital Cinema 4K profile compliant codestream. Does not need an fps: default is 24 fps.
-.TP
-.B \-\^d " X,Y"
-(Offset of image origin (e.g. -d 150,300))
-.TP
-.B \-\^h
-Print a help message and exit.
-.TP
-.B \-\^i " name"
-(input file name)
-.TP
-.B \-\^n " n"
-(Number of resolutions. Default: 6)
-.TP
-.B \-\^o " name"
-(output file name)
-.TP
-.B \-\^p " name"
-Progression order. \fBname\fR can be one out of:LRCP, RLCP, RPCL, PCRL, CPRL. Default: LRCP.
-.TP
-.B \-\^q " n"
-different psnr for successive layers
-.br
-.B Note: \fR(options -r and -q cannot be used together)
-.TP
-.B \-\^r " n"
-different compression ratio(s) for successive layers. The rate specified for each quality level is the desired compression factor.
-.br
-.B Note: \fR(options -r and -q cannot be used together)
-.TP
-.B \-\^s " X,Y"
-sub-sampling factor (e.g. -s 2,2). Default: No sub-sampling in x or y direction.
-.br
-.B Remark: \fRsub-sampling bigger than 2 can produce errors.
-.TP
-.B \-\^t " W,H"
-(Size of tile (e.g. -t 512,512) )
-.TP
-.B \-\^x " name"
-(Create index file and fill it. Default: no index file)
-.TP
-.B \-\^EPH
-(Write EPH marker after each header packet. Default:no EPH)
-.TP
-.B \-\^F " rawWidth,rawHeight,rawComp,rawBitDepth,s_or_u"
-characteristics of the raw input image
-.TP
-.B \-\^I
-(Use the irreversible DWT 9-7. Default: Reversible DWT 5-3)
-.TP
-.B \-\^ImgDir " directory_name"
-(directory containing input files)
-.TP
-.B \-\^M " n"
-mode switch with values: 1, 2, 4, 8, 16, 32. Default:No mode switch activated. 
-.br
-\fIMeaning:\fR
-.br
-BYPASS(1) 
-.br
-RESET(2) 
-.br
-RESTART(4) 
-.br
-VSC(8) 
-.br
-ERTERM(16) 
-.br
-SEGMARK(32)
-.br
-Values can be added: RESTART(4) + RESET(2) + SEGMARK(32) = -M 38
-.TP
-.B \-\^OutFor "ext"
-(extension for output files)
-.TP
-.B \-\^POC "TtileNr=resolutionStart, componentStart, layerEnd, resolutionEnd, componentEnd, progressionOrder"
-(see Examples)
-.TP
-.B \-\^ROI "c=n,U=n"
-quantization indices upshifted for component c (0 or 1 or 2) with a value of U (>= 0 and <= 37)
-.br
-e.g. \fB-ROI c=0,U=25\fR
-.TP
-.B \-\^SOP
-(Write SOP marker before each packet. Default: No SOP marker in the codestream.)
-.TP
-.B \-\^T "X,Y"
-(Offset of the origin of the tiles (e.g. -T 100,75) )
-.TP
-.B \-\^W
-(see JPWL OPTIONS)
-.P
-.SH JPWL OPTIONS
-Options usable only if the library has been compiled with \fB-DUSE_JPWL\fR
-.P
-.B      -W h<tilepart><=type>, s<tilepart><=method>, a=<addr>, z=<size>, g=<range>, p<tilepart:pack><=type>
-.P
-.B h\fR selects the header error protection (EPB): \fBtype\fR can be
-   [0=none 1,absent=predefined 16=CRC-16 32=CRC-32 37-128=RS]
-   if \fBtilepart\fR is absent, it is for main and tile headers
-   if \fBtilepart\fR is present, it applies from that tile
-     onwards, up to the next h<> spec, or to the last tilepart
-     in the codestream (max. 16 specs)
-.P
-.B p \fRselects the packet error protection (EEP/UEP with EPBs)
-  to be applied to raw data: \fBtype\fR can be
-   [0=none 1,absent=predefined 16=CRC-16 32=CRC-32 37-128=RS]
-   if \fBtilepart:pack\fR is absent, it is from tile 0, packet 0
-   if \fBtilepart:pack\fR is present, it applies from that tile
-     and that packet onwards, up to the next packet spec
-     or to the last packet in the last tilepart in the stream
-     (max. 16 specs)
-.P
-.B s \fRenables sensitivity data insertion (ESD): \fBmethod\fR can be
-   [-1=NO ESD 0=RELATIVE ERROR 1=MSE 2=MSE REDUCTION 3=PSNR
-    4=PSNR INCREMENT 5=MAXERR 6=TSE 7=RESERVED]
-   if \fBtilepart\fR is absent, it is for main header only
-   if \fBtilepart\fR is present, it applies from that tile
-     onwards, up to the next s<> spec, or to the last tilepart
-     in the codestream (max. 16 specs)
-.P
-.B g \fRdetermines the addressing mode: \fBrange\fR can be
-   [0=PACKET 1=BYTE RANGE 2=PACKET RANGE]
-.P
-.B a \fRdetermines the size of data addressing: \fBaddr\fR can be
-   2/4 bytes (small/large codestreams). If not set, auto-mode
-.P
-.B z \fRdetermines the size of sensitivity values: \fBsize\fR can be
-   1/2 bytes, for the transformed pseudo-floating point value
-.P
-.SH EXAMPLES
-.P
-.B image_to_j2k -i \fRfile.bmp \fB-o \fRfile.j2k \fB-r \fR20,10,1 (compress 20x, then 10x, then lossless).
-.P
-.B image_to_j2k -i \fRfile.ppm \fB-o \fRfile.j2k \fB-q \fR30,40,50
-.P
-.B image_to_j2k -i \fRfile.pgx \fB-o \fRfile.j2k \fB-POC \fRT1=0,0,1,5,3,CPRL
-.P
-.B image_to_j2k -i \fRlena.raw \fB-o \fRlena.j2k \fB-F \fR512,512,3,8,u
-.P
-.SH AUTHORS
-Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
-.br
-Copyright (c) 2002-2007, Professor Benoit Macq
-.br
-Copyright (c) 2001-2003, David Janssens
-.br
-Copyright (c) 2002-2003, Yannick Verschueren
-.br
-Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
-.br
-Copyright (c) 2005, Herve Drolon, FreeImage Team
-.br
-Copyright (c) 2006-2007, Parvatha Elangovan
-.P
-.SH "SEE ALSO"
-j2k_to_image(1) j2k_dump(1)
-
diff --git a/doc/man/man1/j2k_dump.1 b/doc/man/man1/j2k_dump.1
deleted file mode 100644 (file)
index c45e9f4..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-'\" t
-'\" The line above instructs most `man' programs to invoke tbl
-'\"
-'\" Separate paragraphs; not the same as PP which resets indent level.
-.de SP
-.if t .sp .5
-.if n .sp
-..
-'\"
-'\" Replacement em-dash for nroff (default is too short).
-.ie n .ds m " -
-.el .ds m \(em
-'\"
-'\" Placeholder macro for if longer nroff arrow is needed.
-.ds RA \(->
-'\"
-'\" Decimal point set slightly raised
-.if t .ds d \v'-.15m'.\v'+.15m'
-.if n .ds d .
-'\"
-'\" Enclosure macro for examples
-.de EX
-.SP
-.nf
-.ft CW
-..
-.de EE
-.ft R
-.SP
-.fi
-..
-.TH j2k_dump 1 "Version 1.4.0" "j2k_dump" "dumps jpeg2000 files"
-.P
-.SH NAME
-j2k_dump - 
-This program reads in a jpeg2000 image and dumps the contents to stdout. It is part of the OpenJPEG library.
-.SP
-Valid input image extensions are
-.B .j2k, .jp2, .jpt
-.SP
-.SH SYNOPSIS
-.P
-.B j2k_dump -i \fRinfile.j2k 
-.P
-.B j2k_dump -ImgDir \fRimages/ \fRDump all files in images/
-.P
-.B j2k_dump -h  \fRPrint help message and exit
-.P
-.SH OPTIONS
-.TP
-.B \-\^i "name"
-(jpeg2000 input file name)
-.TP
-.B \-\^ImgDir "directory_name"
-(directory containing jpeg2000 input files)
-.P
-'\".SH BUGS
-.SH AUTHORS
-Copyright (c) 20010, Mathieu Malaterre
-.P
-.SH "SEE ALSO"
-image_to_j2k(1) j2k_to_image(1)
diff --git a/doc/man/man1/j2k_to_image.1 b/doc/man/man1/j2k_to_image.1
deleted file mode 100644 (file)
index 733a37d..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-'\" t
-'\" The line above instructs most `man' programs to invoke tbl
-'\"
-'\" Separate paragraphs; not the same as PP which resets indent level.
-.de SP
-.if t .sp .5
-.if n .sp
-..
-'\"
-'\" Replacement em-dash for nroff (default is too short).
-.ie n .ds m " -
-.el .ds m \(em
-'\"
-'\" Placeholder macro for if longer nroff arrow is needed.
-.ds RA \(->
-'\"
-'\" Decimal point set slightly raised
-.if t .ds d \v'-.15m'.\v'+.15m'
-.if n .ds d .
-'\"
-'\" Enclosure macro for examples
-.de EX
-.SP
-.nf
-.ft CW
-..
-.de EE
-.ft R
-.SP
-.fi
-..
-.TH j2k_to_image 1 "Version 1.4.0" "j2k_to_image" "converts jpeg2000 files"
-.P
-.SH NAME
-j2k_to_image - 
-This program reads in a jpeg2000 image and converts it to another 
-image type. It is part of the OpenJPEG library.
-.SP
-Valid input image extensions are
-.B .j2k, .jp2, .j2c, .jpt
-.SP
-Valid output image extensions are
-.B .bmp, .pgm, .pgx, .png, .pnm, .ppm, .raw, .tga, .tif \fR. For PNG resp. TIF it needs libpng resp. libtiff .
-.SH SYNOPSIS
-.P
-.B j2k_to_image -i \fRinfile.j2k \fB-o \fRoutfile.png
-.P
-.B j2k_to_image -ImgDir \fRimages/ \fB-OutFor \fRbmp
-.P
-.B j2k_to_image -h  \fRPrint help message and exit
-.P
-.R See JPWL OPTIONS for special options
-.SH OPTIONS
-.TP
-.B \-\^i "name"
-(jpeg2000 input file name)
-.TP
-.B \-\^l "n"
-n is the maximum number of quality layers to decode. See LAYERS below)
-.TP
-.B \-\^o "name"
-(output file name with extension)
-.TP
-.B \-\^r "n"
-(n is the highest resolution level to be discarded. See REDUCTION below)
-.TP
-.B \-\^x "name"
-(use name as index file and fill it)
-.TP
-.B \-\^ImgDir "directory_name"
-(directory containing input files)
-.TP
-.B \-\^OutFor "ext"
-(extension for output files)
-.P
-.SH JPWL OPTIONS
-Options usable only if the library has been compiled with
-.B -DUSE_JPWL
-.TP
-.B -W c\fR[=Nc] (Nc is the  number of expected components in the codestream; default:3)
-.TP
-.B -W t\fR[=Nt] (Nt is the maximum number of tiles in the codestream; default:8192)
-.TP
-.B -W c\fR[=Nc]\fB, t\fR[=Nt] \fR(same as above)
-.P
-.SH REDUCTION
-Set the number of highest resolution levels to be discarded.
-The image resolution is effectively divided by 2 to the power of the number of discarded levels. The reduce factor is limited by the smallest total number of decomposition levels among tiles.
-.SH TILES
-Set the maximum number of quality layers to decode. If there are less quality layers than the specified number, all the quality layers are decoded.
-.P
-'\".SH BUGS
-.SH AUTHORS
-Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
-.br
-Copyright (c) 2002-2007, Professor Benoit Macq
-.br
-Copyright (c) 2001-2003, David Janssens
-.br
-Copyright (c) 2002-2003, Yannick Verschueren
-.br
-Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
-.br
-Copyright (c) 2005, Herve Drolon, FreeImage Team
-.br
-Copyright (c) 2006-2007, Parvatha Elangovan
-.P
-.SH "SEE ALSO"
-image_to_j2k(1) j2k_dump(1)
diff --git a/doc/man/man1/opj_compress.1 b/doc/man/man1/opj_compress.1
new file mode 100644 (file)
index 0000000..d7e4111
--- /dev/null
@@ -0,0 +1,222 @@
+'\" t
+'\" The line above instructs most `man' programs to invoke tbl
+'\"
+'\" Separate paragraphs; not the same as PP which resets indent level.
+.de SP
+.if t .sp .5
+.if n .sp
+..
+'\"
+'\" Replacement em-dash for nroff (default is too short).
+.ie n .ds m " -
+.el .ds m \(em
+'\"
+'\" Placeholder macro for if longer nroff arrow is needed.
+.ds RA \(->
+'\"
+'\" Decimal point set slightly raised
+.if t .ds d \v'-.15m'.\v'+.15m'
+.if n .ds d .
+'\"
+'\" Enclosure macro for examples
+.de EX
+.SP
+.nf
+.ft CW
+..
+.de EE
+.ft R
+.SP
+.fi
+..
+.TH opj_compress 1 "Version 1.4.0" "opj_compress" "converts to jpeg2000 files"
+.P
+.SH NAME
+opj_compress - 
+This program reads in an image of a certain type and converts it to a
+jpeg2000 file. It is part of the OpenJPEG library.
+.SP
+Valid input image extensions are
+.B .bmp, .pgm, .pgx, .png, .pnm, .ppm, .raw, .tga, .tif \fR. For PNG resp. TIF it needs libpng resp. libtiff .
+.SP
+Valid output image extensions are
+.B .j2k, .jp2
+.SH SYNOPSIS
+.P
+.B opj_compress -i \fRinfile.bmp \fB-o \fRoutfile.j2k
+.P
+.B opj_compress -ImgDir \fRdirectory_name \fB-OutFor \fRjp2
+.P
+.B opj_compress -h \fRPrint a help message and exit.
+.P
+.R See JPWL OPTIONS for special options
+.SH OPTIONS
+.TP
+.B \-\^b " n,n"
+(Size of code block (e.g. -b 32,32). Default: 64 x 64)
+.TP
+.B \-\^c " n"
+(Size of precinct (e.g. -c 128,128). Default: 2^15 x 2^15)
+.TP
+.B \-\^cinema2K " fps"
+Digital Cinema 2K profile compliant codestream. Valid \fBfps\fR values are 24 or 48.
+.TP
+.B \-\^cinema4K
+Digital Cinema 4K profile compliant codestream. Does not need an fps: default is 24 fps.
+.TP
+.B \-\^d " X,Y"
+(Offset of image origin (e.g. -d 150,300))
+.TP
+.B \-\^h
+Print a help message and exit.
+.TP
+.B \-\^i " name"
+(input file name)
+.TP
+.B \-\^n " n"
+(Number of resolutions. Default: 6)
+.TP
+.B \-\^o " name"
+(output file name)
+.TP
+.B \-\^p " name"
+Progression order. \fBname\fR can be one out of:LRCP, RLCP, RPCL, PCRL, CPRL. Default: LRCP.
+.TP
+.B \-\^q " n"
+different psnr for successive layers
+.br
+.B Note: \fR(options -r and -q cannot be used together)
+.TP
+.B \-\^r " n"
+different compression ratio(s) for successive layers. The rate specified for each quality level is the desired compression factor.
+.br
+.B Note: \fR(options -r and -q cannot be used together)
+.TP
+.B \-\^s " X,Y"
+sub-sampling factor (e.g. -s 2,2). Default: No sub-sampling in x or y direction.
+.br
+.B Remark: \fRsub-sampling bigger than 2 can produce errors.
+.TP
+.B \-\^t " W,H"
+(Size of tile (e.g. -t 512,512) )
+.TP
+.B \-\^x " name"
+(Create index file and fill it. Default: no index file)
+.TP
+.B \-\^EPH
+(Write EPH marker after each header packet. Default:no EPH)
+.TP
+.B \-\^F " rawWidth,rawHeight,rawComp,rawBitDepth,s_or_u"
+characteristics of the raw input image
+.TP
+.B \-\^I
+(Use the irreversible DWT 9-7. Default: Reversible DWT 5-3)
+.TP
+.B \-\^ImgDir " directory_name"
+(directory containing input files)
+.TP
+.B \-\^M " n"
+mode switch with values: 1, 2, 4, 8, 16, 32. Default:No mode switch activated. 
+.br
+\fIMeaning:\fR
+.br
+BYPASS(1) 
+.br
+RESET(2) 
+.br
+RESTART(4) 
+.br
+VSC(8) 
+.br
+ERTERM(16) 
+.br
+SEGMARK(32)
+.br
+Values can be added: RESTART(4) + RESET(2) + SEGMARK(32) = -M 38
+.TP
+.B \-\^OutFor "ext"
+(extension for output files)
+.TP
+.B \-\^POC "TtileNr=resolutionStart, componentStart, layerEnd, resolutionEnd, componentEnd, progressionOrder"
+(see Examples)
+.TP
+.B \-\^ROI "c=n,U=n"
+quantization indices upshifted for component c (0 or 1 or 2) with a value of U (>= 0 and <= 37)
+.br
+e.g. \fB-ROI c=0,U=25\fR
+.TP
+.B \-\^SOP
+(Write SOP marker before each packet. Default: No SOP marker in the codestream.)
+.TP
+.B \-\^T "X,Y"
+(Offset of the origin of the tiles (e.g. -T 100,75) )
+.TP
+.B \-\^W
+(see JPWL OPTIONS)
+.P
+.SH JPWL OPTIONS
+Options usable only if the library has been compiled with \fB-DUSE_JPWL\fR
+.P
+.B      -W h<tilepart><=type>, s<tilepart><=method>, a=<addr>, z=<size>, g=<range>, p<tilepart:pack><=type>
+.P
+.B h\fR selects the header error protection (EPB): \fBtype\fR can be
+   [0=none 1,absent=predefined 16=CRC-16 32=CRC-32 37-128=RS]
+   if \fBtilepart\fR is absent, it is for main and tile headers
+   if \fBtilepart\fR is present, it applies from that tile
+     onwards, up to the next h<> spec, or to the last tilepart
+     in the codestream (max. 16 specs)
+.P
+.B p \fRselects the packet error protection (EEP/UEP with EPBs)
+  to be applied to raw data: \fBtype\fR can be
+   [0=none 1,absent=predefined 16=CRC-16 32=CRC-32 37-128=RS]
+   if \fBtilepart:pack\fR is absent, it is from tile 0, packet 0
+   if \fBtilepart:pack\fR is present, it applies from that tile
+     and that packet onwards, up to the next packet spec
+     or to the last packet in the last tilepart in the stream
+     (max. 16 specs)
+.P
+.B s \fRenables sensitivity data insertion (ESD): \fBmethod\fR can be
+   [-1=NO ESD 0=RELATIVE ERROR 1=MSE 2=MSE REDUCTION 3=PSNR
+    4=PSNR INCREMENT 5=MAXERR 6=TSE 7=RESERVED]
+   if \fBtilepart\fR is absent, it is for main header only
+   if \fBtilepart\fR is present, it applies from that tile
+     onwards, up to the next s<> spec, or to the last tilepart
+     in the codestream (max. 16 specs)
+.P
+.B g \fRdetermines the addressing mode: \fBrange\fR can be
+   [0=PACKET 1=BYTE RANGE 2=PACKET RANGE]
+.P
+.B a \fRdetermines the size of data addressing: \fBaddr\fR can be
+   2/4 bytes (small/large codestreams). If not set, auto-mode
+.P
+.B z \fRdetermines the size of sensitivity values: \fBsize\fR can be
+   1/2 bytes, for the transformed pseudo-floating point value
+.P
+.SH EXAMPLES
+.P
+.B opj_compress -i \fRfile.bmp \fB-o \fRfile.j2k \fB-r \fR20,10,1 (compress 20x, then 10x, then lossless).
+.P
+.B opj_compress -i \fRfile.ppm \fB-o \fRfile.j2k \fB-q \fR30,40,50
+.P
+.B opj_compress -i \fRfile.pgx \fB-o \fRfile.j2k \fB-POC \fRT1=0,0,1,5,3,CPRL
+.P
+.B opj_compress -i \fRlena.raw \fB-o \fRlena.j2k \fB-F \fR512,512,3,8,u
+.P
+.SH AUTHORS
+Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+.br
+Copyright (c) 2002-2007, Professor Benoit Macq
+.br
+Copyright (c) 2001-2003, David Janssens
+.br
+Copyright (c) 2002-2003, Yannick Verschueren
+.br
+Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+.br
+Copyright (c) 2005, Herve Drolon, FreeImage Team
+.br
+Copyright (c) 2006-2007, Parvatha Elangovan
+.P
+.SH "SEE ALSO"
+opj_decompress(1) opj_dump(1)
+
diff --git a/doc/man/man1/opj_decompress.1 b/doc/man/man1/opj_decompress.1
new file mode 100644 (file)
index 0000000..e276b42
--- /dev/null
@@ -0,0 +1,109 @@
+'\" t
+'\" The line above instructs most `man' programs to invoke tbl
+'\"
+'\" Separate paragraphs; not the same as PP which resets indent level.
+.de SP
+.if t .sp .5
+.if n .sp
+..
+'\"
+'\" Replacement em-dash for nroff (default is too short).
+.ie n .ds m " -
+.el .ds m \(em
+'\"
+'\" Placeholder macro for if longer nroff arrow is needed.
+.ds RA \(->
+'\"
+'\" Decimal point set slightly raised
+.if t .ds d \v'-.15m'.\v'+.15m'
+.if n .ds d .
+'\"
+'\" Enclosure macro for examples
+.de EX
+.SP
+.nf
+.ft CW
+..
+.de EE
+.ft R
+.SP
+.fi
+..
+.TH opj_decompress 1 "Version 1.4.0" "opj_decompress" "converts jpeg2000 files"
+.P
+.SH NAME
+opj_decompress - 
+This program reads in a jpeg2000 image and converts it to another 
+image type. It is part of the OpenJPEG library.
+.SP
+Valid input image extensions are
+.B .j2k, .jp2, .j2c, .jpt
+.SP
+Valid output image extensions are
+.B .bmp, .pgm, .pgx, .png, .pnm, .ppm, .raw, .tga, .tif \fR. For PNG resp. TIF it needs libpng resp. libtiff .
+.SH SYNOPSIS
+.P
+.B opj_decompress -i \fRinfile.j2k \fB-o \fRoutfile.png
+.P
+.B opj_decompress -ImgDir \fRimages/ \fB-OutFor \fRbmp
+.P
+.B opj_decompress -h  \fRPrint help message and exit
+.P
+.R See JPWL OPTIONS for special options
+.SH OPTIONS
+.TP
+.B \-\^i "name"
+(jpeg2000 input file name)
+.TP
+.B \-\^l "n"
+n is the maximum number of quality layers to decode. See LAYERS below)
+.TP
+.B \-\^o "name"
+(output file name with extension)
+.TP
+.B \-\^r "n"
+(n is the highest resolution level to be discarded. See REDUCTION below)
+.TP
+.B \-\^x "name"
+(use name as index file and fill it)
+.TP
+.B \-\^ImgDir "directory_name"
+(directory containing input files)
+.TP
+.B \-\^OutFor "ext"
+(extension for output files)
+.P
+.SH JPWL OPTIONS
+Options usable only if the library has been compiled with
+.B -DUSE_JPWL
+.TP
+.B -W c\fR[=Nc] (Nc is the  number of expected components in the codestream; default:3)
+.TP
+.B -W t\fR[=Nt] (Nt is the maximum number of tiles in the codestream; default:8192)
+.TP
+.B -W c\fR[=Nc]\fB, t\fR[=Nt] \fR(same as above)
+.P
+.SH REDUCTION
+Set the number of highest resolution levels to be discarded.
+The image resolution is effectively divided by 2 to the power of the number of discarded levels. The reduce factor is limited by the smallest total number of decomposition levels among tiles.
+.SH TILES
+Set the maximum number of quality layers to decode. If there are less quality layers than the specified number, all the quality layers are decoded.
+.P
+'\".SH BUGS
+.SH AUTHORS
+Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+.br
+Copyright (c) 2002-2007, Professor Benoit Macq
+.br
+Copyright (c) 2001-2003, David Janssens
+.br
+Copyright (c) 2002-2003, Yannick Verschueren
+.br
+Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+.br
+Copyright (c) 2005, Herve Drolon, FreeImage Team
+.br
+Copyright (c) 2006-2007, Parvatha Elangovan
+.P
+.SH "SEE ALSO"
+opj_compress(1) opj_dump(1)
diff --git a/doc/man/man1/opj_dump.1 b/doc/man/man1/opj_dump.1
new file mode 100644 (file)
index 0000000..87ec648
--- /dev/null
@@ -0,0 +1,62 @@
+'\" t
+'\" The line above instructs most `man' programs to invoke tbl
+'\"
+'\" Separate paragraphs; not the same as PP which resets indent level.
+.de SP
+.if t .sp .5
+.if n .sp
+..
+'\"
+'\" Replacement em-dash for nroff (default is too short).
+.ie n .ds m " -
+.el .ds m \(em
+'\"
+'\" Placeholder macro for if longer nroff arrow is needed.
+.ds RA \(->
+'\"
+'\" Decimal point set slightly raised
+.if t .ds d \v'-.15m'.\v'+.15m'
+.if n .ds d .
+'\"
+'\" Enclosure macro for examples
+.de EX
+.SP
+.nf
+.ft CW
+..
+.de EE
+.ft R
+.SP
+.fi
+..
+.TH opj_dump 1 "Version 1.4.0" "opj_dump" "dumps jpeg2000 files"
+.P
+.SH NAME
+opj_dump - 
+This program reads in a jpeg2000 image and dumps the contents to stdout. It is part of the OpenJPEG library.
+.SP
+Valid input image extensions are
+.B .j2k, .jp2, .jpt
+.SP
+.SH SYNOPSIS
+.P
+.B opj_dump -i \fRinfile.j2k 
+.P
+.B opj_dump -ImgDir \fRimages/ \fRDump all files in images/
+.P
+.B opj_dump -h  \fRPrint help message and exit
+.P
+.SH OPTIONS
+.TP
+.B \-\^i "name"
+(jpeg2000 input file name)
+.TP
+.B \-\^ImgDir "directory_name"
+(directory containing jpeg2000 input files)
+.P
+'\".SH BUGS
+.SH AUTHORS
+Copyright (c) 20010, Mathieu Malaterre
+.P
+.SH "SEE ALSO"
+opj_compress(1) opj_decompress(1)
index 5e77765e98cf38a8b76d6da81bd46f02b84d47b6..f25b8470c4de1cbb02d225d124ce4eba5b9c2530 100644 (file)
@@ -27,7 +27,7 @@ if(WIN32)
 endif()
 
 # Loop over all executables:
-foreach(exe j2k_to_image image_to_j2k j2k_dump)
+foreach(exe opj_decompress opj_compress opj_dump)
   add_executable(${exe} ${exe}.c ${common_SRCS})
   target_link_libraries(${exe} ${OPENJPEG_LIBRARY_NAME}
     ${PNG_LIBNAME} ${TIFF_LIBNAME} ${LCMS_LIBNAME}
@@ -52,9 +52,9 @@ endforeach()
 
 # Install man pages
 install(
-  FILES       ${OPENJPEG_SOURCE_DIR}/doc/man/man1/image_to_j2k.1
-              ${OPENJPEG_SOURCE_DIR}/doc/man/man1/j2k_dump.1
-              ${OPENJPEG_SOURCE_DIR}/doc/man/man1/j2k_to_image.1
+  FILES       ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_compress.1
+              ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_decompress.1
+              ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_dump.1
   DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man1)
 #
 
diff --git a/src/bin/jp2/README b/src/bin/jp2/README
deleted file mode 100644 (file)
index 8004998..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-Simple codec compilation
-------------------------
-Once you've built the library, you might want to test it with a basic codec. To do this, go to the codec directory and either use the provided Makefile or use one of the following commands to build an encoder and decoder respectively:
-
-gcc index.c convert.c image_to_j2k.c -o image_to_j2k -lopenjpeg -I ../libopenjpeg/ -lm -ltiff
-gcc index.c convert.c j2k_to_image.c -o j2k_to_image -lopenjpeg -I ../libopenjpeg/ -lm -ltiff
-
-You should add '-L..' to those lines if you did not use the 'install' target when building the library.
\ No newline at end of file
diff --git a/src/bin/jp2/image_to_j2k.c b/src/bin/jp2/image_to_j2k.c
deleted file mode 100644 (file)
index 343ea55..0000000
+++ /dev/null
@@ -1,1901 +0,0 @@
-/*
- * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2007, Professor Benoit Macq
- * Copyright (c) 2001-2003, David Janssens
- * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
- * Copyright (c) 2005, Herve Drolon, FreeImage Team
- * Copyright (c) 2006-2007, Parvatha Elangovan
- * Copyright (c) 2008, Jerome Fimes, Communications & Systemes <jerome.fimes@c-s.fr>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
-#include <assert.h>
-
-#ifdef _WIN32
-#include "windirent.h"
-#else
-#include <dirent.h>
-#endif /* _WIN32 */
-
-#ifdef _WIN32
-#include <windows.h>
-#define strcasecmp _stricmp
-#define strncasecmp _strnicmp
-#else
-#include <strings.h>
-#endif /* _WIN32 */
-
-#include "opj_config.h"
-#include "openjpeg.h"
-#include "opj_getopt.h"
-#include "convert.h"
-#include "index.h"
-
-#include "format_defs.h"
-
-#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;
-       /** User specified rate stored in case of cinema option*/
-       float *rates;
-}img_fol_t;
-
-void encode_help_display(void) {
-       fprintf(stdout,"HELP for image_to_j2k\n----\n\n");
-       fprintf(stdout,"- the -h option displays this help information on screen\n\n");
-
-/* UniPG>> */
-       fprintf(stdout,"List of parameters for the JPEG 2000 "
-#ifdef USE_JPWL
-               "+ JPWL "
-#endif /* USE_JPWL */
-               "encoder:\n");
-/* <<UniPG */
-       fprintf(stdout,"\n");
-       fprintf(stdout,"REMARKS:\n");
-       fprintf(stdout,"---------\n");
-       fprintf(stdout,"\n");
-       fprintf(stdout,"The markers written to the main_header are : SOC SIZ COD QCD COM.\n");
-       fprintf(stdout,"COD and QCD never appear in the tile_header.\n");
-       fprintf(stdout,"\n");
-       fprintf(stdout,"By default:\n");
-       fprintf(stdout,"------------\n");
-       fprintf(stdout,"\n");
-       fprintf(stdout," * Lossless\n");
-       fprintf(stdout," * 1 tile\n");
-       fprintf(stdout," * Size of precinct : 2^15 x 2^15 (means 1 precinct)\n");
-       fprintf(stdout," * Size of code-block : 64 x 64\n");
-       fprintf(stdout," * Number of resolutions: 6\n");
-       fprintf(stdout," * No SOP marker in the codestream\n");
-       fprintf(stdout," * No EPH marker in the codestream\n");
-       fprintf(stdout," * No sub-sampling in x or y direction\n");
-       fprintf(stdout," * No mode switch activated\n");
-       fprintf(stdout," * Progression order: LRCP\n");
-       fprintf(stdout," * No index file\n");
-       fprintf(stdout," * No ROI upshifted\n");
-       fprintf(stdout," * No offset of the origin of the image\n");
-       fprintf(stdout," * No offset of the origin of the tiles\n");
-       fprintf(stdout," * Reversible DWT 5-3\n");
-/* UniPG>> */
-#ifdef USE_JPWL
-       fprintf(stdout," * No JPWL protection\n");
-#endif /* USE_JPWL */
-/* <<UniPG */
-       fprintf(stdout,"\n");
-       fprintf(stdout,"Parameters:\n");
-       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 PBM, PGM, PPM, PNM, PAM, PGX, PNG, BMP, TIF, RAW, RAWL and TGA formats\n");
-       fprintf(stdout,"\n");
-       fprintf(stdout,"-i           : source file  (-i source.pnm also *pbm, *.pgm, *.ppm, *.pam, *.pgx, *png, *.bmp, *.tif, *.raw, *.tga) \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");
-       fprintf(stdout,"Optional Parameters:\n");
-       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");
-       fprintf(stdout,"                   Example: -r 20,10,1 means quality 1: compress 20x, \n");
-       fprintf(stdout,"                     quality 2: compress 10x and quality 3: compress lossless\n");
-       fprintf(stdout,"\n");
-       fprintf(stdout,"               (options -r and -q cannot be used together)\n ");
-       fprintf(stdout,"\n");
-
-       fprintf(stdout,"-q           : different psnr for successive layers (-q 30,40,50) \n ");
-
-       fprintf(stdout,"               (options -r and -q cannot be used together)\n ");
-
-       fprintf(stdout,"\n");
-       fprintf(stdout,"-n           : number of resolutions (-n 3) \n");
-       fprintf(stdout,"\n");
-       fprintf(stdout,"-b           : size of code block (-b 32,32) \n");
-       fprintf(stdout,"\n");
-       fprintf(stdout,"-c           : size of precinct (-c 128,128) \n");
-       fprintf(stdout,"\n");
-       fprintf(stdout,"-t           : size of tile (-t 512,512) \n");
-       fprintf(stdout,"\n");
-       fprintf(stdout,"-p           : progression order (-p LRCP) [LRCP, RLCP, RPCL, PCRL, CPRL] \n");
-       fprintf(stdout,"\n");
-       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");
-       fprintf(stdout,"\n");
-       fprintf(stdout,"-M           : mode switch (-M 3) [1=BYPASS(LAZY) 2=RESET 4=RESTART(TERMALL)\n");
-       fprintf(stdout,"                 8=VSC 16=ERTERM(SEGTERM) 32=SEGMARK(SEGSYM)] \n");
-       fprintf(stdout,"                 Indicate multiple modes by adding their values. \n");
-       fprintf(stdout,"                 ex: RESTART(4) + RESET(2) + SEGMARK(32) = -M 38\n");
-       fprintf(stdout,"\n");
-       fprintf(stdout,"-TP          : devide packets of every tile into tile-parts (-TP R) [R, L, C]\n");
-       fprintf(stdout,"\n");
-       fprintf(stdout,"-x           : create an index file *.Idx (-x index_name.Idx) \n");
-       fprintf(stdout,"\n");
-       fprintf(stdout,"-ROI         : c=%%d,U=%%d : quantization indices upshifted \n");
-       fprintf(stdout,"               for component c=%%d [%%d = 0,1,2]\n");
-       fprintf(stdout,"               with a value of U=%%d [0 <= %%d <= 37] (i.e. -ROI c=0,U=25) \n");
-       fprintf(stdout,"\n");
-       fprintf(stdout,"-d           : offset of the origin of the image (-d 150,300) \n");
-       fprintf(stdout,"\n");
-       fprintf(stdout,"-T           : offset of the origin of the tiles (-T 100,75) \n");
-       fprintf(stdout,"\n");
-       fprintf(stdout,"-I           : use the irreversible DWT 9-7 (-I) \n");
-       fprintf(stdout,"\n");
-       fprintf(stdout,"-F           : characteristics of the raw input image\n");
-       fprintf(stdout,"               -F rawWidth,rawHeight,rawComp,rawBitDepth,s/u (Signed/Unsigned)\n");
-       fprintf(stdout,"               Example: -i lena.raw -o lena.j2k -F 512,512,3,8,u\n");
-       fprintf(stdout,"\n");
-       fprintf(stdout,"-m           : use array-based MCT, values are coma separated, line by line\n");
-       fprintf(stdout,"                           no specific separators between lines, no space allowed between values\n");
-       fprintf(stdout,"-jpip        : write jpip codestream index box in JP2 output file\n");
-       fprintf(stdout,"               NOTICE: currently supports only RPCL order\n");
-       fprintf(stdout,"\n");
-/* UniPG>> */
-#ifdef USE_JPWL
-       fprintf(stdout,"-W           : adoption of JPWL (Part 11) capabilities (-W params)\n");
-       fprintf(stdout,"               The parameters can be written and repeated in any order:\n");
-       fprintf(stdout,"               [h<tilepart><=type>,s<tilepart><=method>,a=<addr>,...\n");
-       fprintf(stdout,"                ...,z=<size>,g=<range>,p<tilepart:pack><=type>]\n");
-       fprintf(stdout,"\n");
-       fprintf(stdout,"                 h selects the header error protection (EPB): 'type' can be\n");
-       fprintf(stdout,"                   [0=none 1,absent=predefined 16=CRC-16 32=CRC-32 37-128=RS]\n");
-       fprintf(stdout,"                   if 'tilepart' is absent, it is for main and tile headers\n");
-       fprintf(stdout,"                   if 'tilepart' is present, it applies from that tile\n");
-       fprintf(stdout,"                     onwards, up to the next h<> spec, or to the last tilepart\n");
-       fprintf(stdout,"                     in the codestream (max. %d specs)\n", JPWL_MAX_NO_TILESPECS);
-       fprintf(stdout,"\n");
-       fprintf(stdout,"                 p selects the packet error protection (EEP/UEP with EPBs)\n");
-       fprintf(stdout,"                  to be applied to raw data: 'type' can be\n");
-       fprintf(stdout,"                   [0=none 1,absent=predefined 16=CRC-16 32=CRC-32 37-128=RS]\n");
-       fprintf(stdout,"                   if 'tilepart:pack' is absent, it is from tile 0, packet 0\n");
-       fprintf(stdout,"                   if 'tilepart:pack' is present, it applies from that tile\n");
-       fprintf(stdout,"                     and that packet onwards, up to the next packet spec\n");
-       fprintf(stdout,"                     or to the last packet in the last tilepart in the stream\n");
-       fprintf(stdout,"                     (max. %d specs)\n", JPWL_MAX_NO_PACKSPECS);
-       fprintf(stdout,"\n");
-       fprintf(stdout,"                 s enables sensitivity data insertion (ESD): 'method' can be\n");
-       fprintf(stdout,"                   [-1=NO ESD 0=RELATIVE ERROR 1=MSE 2=MSE REDUCTION 3=PSNR\n");
-       fprintf(stdout,"                    4=PSNR INCREMENT 5=MAXERR 6=TSE 7=RESERVED]\n");
-       fprintf(stdout,"                   if 'tilepart' is absent, it is for main header only\n");
-       fprintf(stdout,"                   if 'tilepart' is present, it applies from that tile\n");
-       fprintf(stdout,"                     onwards, up to the next s<> spec, or to the last tilepart\n");
-       fprintf(stdout,"                     in the codestream (max. %d specs)\n", JPWL_MAX_NO_TILESPECS);
-       fprintf(stdout,"\n");
-       fprintf(stdout,"                 g determines the addressing mode: <range> can be\n");
-       fprintf(stdout,"                   [0=PACKET 1=BYTE RANGE 2=PACKET RANGE]\n");
-       fprintf(stdout,"\n");
-       fprintf(stdout,"                 a determines the size of data addressing: <addr> can be\n");
-       fprintf(stdout,"                   2/4 bytes (small/large codestreams). If not set, auto-mode\n");
-       fprintf(stdout,"\n");
-       fprintf(stdout,"                 z determines the size of sensitivity values: <size> can be\n");
-       fprintf(stdout,"                   1/2 bytes, for the transformed pseudo-floating point value\n");
-       fprintf(stdout,"\n");
-       fprintf(stdout,"                 ex.:\n");
-       fprintf(stdout,"                   h,h0=64,h3=16,h5=32,p0=78,p0:24=56,p1,p3:0=0,p3:20=32,s=0,\n");
-       fprintf(stdout,"                     s0=6,s3=-1,a=0,g=1,z=1\n");
-       fprintf(stdout,"                 means\n");
-       fprintf(stdout,"                   predefined EPB in MH, rs(64,32) from TPH 0 to TPH 2,\n");
-       fprintf(stdout,"                   CRC-16 in TPH 3 and TPH 4, CRC-32 in remaining TPHs,\n");
-       fprintf(stdout,"                   UEP rs(78,32) for packets 0 to 23 of tile 0,\n");
-       fprintf(stdout,"                   UEP rs(56,32) for packs. 24 to the last of tilepart 0,\n");
-       fprintf(stdout,"                   UEP rs default for packets of tilepart 1,\n");
-       fprintf(stdout,"                   no UEP for packets 0 to 19 of tilepart 3,\n");
-       fprintf(stdout,"                   UEP CRC-32 for packs. 20 of tilepart 3 to last tilepart,\n");
-       fprintf(stdout,"                   relative sensitivity ESD for MH,\n");
-       fprintf(stdout,"                   TSE ESD from TPH 0 to TPH 2, byte range with automatic\n");
-       fprintf(stdout,"                   size of addresses and 1 byte for each sensitivity value\n");
-       fprintf(stdout,"\n");
-       fprintf(stdout,"                 ex.:\n");
-       fprintf(stdout,"                       h,s,p\n");
-       fprintf(stdout,"                 means\n");
-       fprintf(stdout,"                   default protection to headers (MH and TPHs) as well as\n");
-       fprintf(stdout,"                   data packets, one ESD in MH\n");
-       fprintf(stdout,"\n");
-       fprintf(stdout,"                 N.B.: use the following recommendations when specifying\n");
-       fprintf(stdout,"                       the JPWL parameters list\n");
-       fprintf(stdout,"                   - when you use UEP, always pair the 'p' option with 'h'\n");
-       fprintf(stdout,"                 \n");
-#endif /* USE_JPWL */
-/* <<UniPG */
-       fprintf(stdout,"IMPORTANT:\n");
-       fprintf(stdout,"-----------\n");
-       fprintf(stdout,"\n");
-       fprintf(stdout,"The index file has the structure below:\n");
-       fprintf(stdout,"---------------------------------------\n");
-       fprintf(stdout,"\n");
-       fprintf(stdout,"Image_height Image_width\n");
-       fprintf(stdout,"progression order\n");
-       fprintf(stdout,"Tiles_size_X Tiles_size_Y\n");
-       fprintf(stdout,"Tiles_nb_X Tiles_nb_Y\n");
-       fprintf(stdout,"Components_nb\n");
-       fprintf(stdout,"Layers_nb\n");
-       fprintf(stdout,"decomposition_levels\n");
-       fprintf(stdout,"[Precincts_size_X_res_Nr Precincts_size_Y_res_Nr]...\n");
-       fprintf(stdout,"   [Precincts_size_X_res_0 Precincts_size_Y_res_0]\n");
-       fprintf(stdout,"Main_header_start_position\n");
-       fprintf(stdout,"Main_header_end_position\n");
-       fprintf(stdout,"Codestream_size\n");
-       fprintf(stdout,"\n");
-       fprintf(stdout,"INFO ON TILES\n");
-       fprintf(stdout,"tileno start_pos end_hd end_tile nbparts disto nbpix disto/nbpix\n");
-       fprintf(stdout,"Tile_0 start_pos end_Theader end_pos NumParts TotalDisto NumPix MaxMSE\n");
-       fprintf(stdout,"Tile_1   ''           ''        ''        ''       ''    ''      ''\n");
-       fprintf(stdout,"...\n");
-       fprintf(stdout,"Tile_Nt   ''           ''        ''        ''       ''    ''     ''\n");
-       fprintf(stdout,"...\n");
-       fprintf(stdout,"TILE 0 DETAILS\n");
-       fprintf(stdout,"part_nb tileno num_packs start_pos end_tph_pos end_pos\n");
-       fprintf(stdout,"...\n");
-       fprintf(stdout,"Progression_string\n");
-       fprintf(stdout,"pack_nb tileno layno resno compno precno start_pos end_ph_pos end_pos disto\n");
-       fprintf(stdout,"Tpacket_0 Tile layer res. comp. prec. start_pos end_pos disto\n");
-       fprintf(stdout,"...\n");
-       fprintf(stdout,"Tpacket_Np ''   ''    ''   ''    ''       ''       ''     ''\n");
-
-       fprintf(stdout,"MaxDisto\n");
-
-       fprintf(stdout,"TotalDisto\n\n");
-}
-
-OPJ_PROG_ORDER give_progression(char progression[4]) {
-       if(strncmp(progression, "LRCP", 4) == 0) {
-               return LRCP;
-       }
-       if(strncmp(progression, "RLCP", 4) == 0) {
-               return RLCP;
-       }
-       if(strncmp(progression, "RPCL", 4) == 0) {
-               return RPCL;
-       }
-       if(strncmp(progression, "PCRL", 4) == 0) {
-               return PCRL;
-       }
-       if(strncmp(progression, "CPRL", 4) == 0) {
-               return CPRL;
-       }
-
-       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", "pbm", "pam", "bmp", "tif", "raw", "rawl", "tga", "png", "j2k", "jp2", "j2c", "jpc"
-    };
-       static const int format[] = {
-    PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, TIF_DFMT, RAW_DFMT, RAWL_DFMT, TGA_DFMT, PNG_DFMT, J2K_CFMT, JP2_CFMT, J2K_CFMT, J2K_CFMT
-    };
-       char * ext = strrchr(filename, '.');
-       if (ext == NULL)
-               return -1;
-       ext++;
-       for(i = 0; i < sizeof(format)/sizeof(*format); i++) {
-               if(strcasecmp(ext, extension[i]) == 0) {
-                       return format[i];
-               }
-       }
-       return -1;
-}
-
-char * get_file_name(char *name){
-       char *fname;
-       fname= (char*)malloc(OPJ_PATH_LEN*sizeof(char));
-       fname= strtok(name,".");
-       return fname;
-}
-
-char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_cparameters_t *parameters){
-       char image_filename[OPJ_PATH_LEN], infilename[OPJ_PATH_LEN],outfilename[OPJ_PATH_LEN],temp_ofname[OPJ_PATH_LEN];
-  char *temp_p, temp1[OPJ_PATH_LEN]="";
-
-       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));
-       while((temp_p = strtok(NULL,".")) != NULL){
-               strcat(temp_ofname,temp1);
-               sprintf(temp1,".%s",temp_p);
-       }
-       if(img_fol->set_out_format==1){
-               sprintf(outfilename,"%s/%s.%s",img_fol->imgdirpath,temp_ofname,img_fol->out_format);
-               strncpy(parameters->outfile, outfilename, sizeof(outfilename));
-       }
- return 0;
-}
-
-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 = OPJ_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, img_fol_t *img_fol){
-       int i;
-       float temp_rate;
-
-       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 at least 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;
-       default :
-               break;
-       }
-
-       switch (parameters->cp_cinema){
-               case CINEMA2K_24:
-               case CINEMA4K_24:
-                       for(i=0 ; i<parameters->tcp_numlayers ; i++){
-                               temp_rate = 0 ;
-                               if (img_fol->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))/
-                                               (img_fol->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);
-                                       }else{
-                                               parameters->tcp_rates[i]= img_fol->rates[i];
-                                       }
-                               }
-                       }
-                       parameters->max_comp_size = COMP_24_CS;
-                       break;
-
-               case CINEMA2K_48:
-                       for(i=0 ; i<parameters->tcp_numlayers ; i++){
-                               temp_rate = 0 ;
-                               if (img_fol->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))/
-                                               (img_fol->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);
-                                       }else{
-                                               parameters->tcp_rates[i]= img_fol->rates[i];
-                                       }
-                               }
-                       }
-                       parameters->max_comp_size = COMP_48_CS;
-                       break;
-               default:
-                       break;
-       }
-       parameters->cp_disto_alloc = 1;
-}
-
-/* ------------------------------------------------------------------------------------ */
-
-int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
-                                                                                                       img_fol_t *img_fol, raw_cparameters_t *raw_cp, char *indexfilename) {
-       int i, j, totlen, c;
-       opj_option_t long_option[]={
-               {"cinema2K",REQ_ARG, NULL ,'w'},
-               {"cinema4K",NO_ARG, NULL ,'y'},
-               {"ImgDir",REQ_ARG, NULL ,'z'},
-               {"TP",REQ_ARG, NULL ,'u'},
-               {"SOP",NO_ARG, NULL ,'S'},
-               {"EPH",NO_ARG, NULL ,'E'},
-               {"OutFor",REQ_ARG, NULL ,'O'},
-               {"POC",REQ_ARG, NULL ,'P'},
-               {"ROI",REQ_ARG, NULL ,'R'},
-               {"jpip",NO_ARG, NULL, 'J'}
-       };
-
-       /* parse the command line */
-       const char optlist[] = "i:o:r:q:n:b:c:t:p:s:SEM:x:R:d:T:If:P:C:F:u:J"
-#ifdef USE_JPWL
-               "W:"
-#endif /* USE_JPWL */
-               "h";
-
-       totlen=sizeof(long_option);
-       img_fol->set_out_format=0;
-       raw_cp->rawWidth = 0;
-
-       do{
-               c = opj_getopt_long(argc, argv, optlist,long_option,totlen);
-               if (c == -1)
-                       break;
-               switch (c) {
-                       case 'i':                       /* input file */
-                       {
-                               char *infile = opj_optarg;
-                               parameters->decod_format = get_file_format(infile);
-                               switch(parameters->decod_format) {
-                                       case PGX_DFMT:
-                                       case PXM_DFMT:
-                                       case BMP_DFMT:
-                                       case TIF_DFMT:
-                                       case RAW_DFMT:
-                                       case RAWL_DFMT:
-                                       case TGA_DFMT:
-                                       case PNG_DFMT:
-                                               break;
-                                       default:
-                                               fprintf(stderr,
-                                                       "!! Unrecognized format for infile : %s "
-              "[accept only *.pnm, *.pgm, *.ppm, *.pgx, *png, *.bmp, *.tif, *.raw or *.tga] !!\n\n",
-                                                       infile);
-                                               return 1;
-                               }
-                               strncpy(parameters->infile, infile, sizeof(parameters->infile)-1);
-                       }
-                       break;
-
-                               /* ----------------------------------------------------- */
-
-                       case 'o':                       /* output file */
-                       {
-                               char *outfile = opj_optarg;
-                               parameters->cod_format = get_file_format(outfile);
-                               switch(parameters->cod_format) {
-                                       case J2K_CFMT:
-                                       case JP2_CFMT:
-                                               break;
-                                       default:
-                                               fprintf(stderr, "Unknown output format image %s [only *.j2k, *.j2c or *.jp2]!! \n", outfile);
-                                               return 1;
-                               }
-                               strncpy(parameters->outfile, outfile, sizeof(parameters->outfile)-1);
-                       }
-                       break;
-
-                               /* ----------------------------------------------------- */
-                       case 'O':                       /* output format */
-                               {
-                                       char outformat[50];
-                                       char *of = opj_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 = opj_optarg;
-                                                       break;
-                                               default:
-                                                       fprintf(stderr, "Unknown output format image [only j2k, j2c, jp2]!! \n");
-                                                       return 1;
-                                       }
-                               }
-                               break;
-
-
-                               /* ----------------------------------------------------- */
-
-
-                       case 'r':                       /* rates rates/distorsion */
-                       {
-                               char *s = opj_optarg;
-                               parameters->tcp_numlayers = 0;
-                               while (sscanf(s, "%f", &parameters->tcp_rates[parameters->tcp_numlayers]) == 1) {
-                                       parameters->tcp_numlayers++;
-                                       while (*s && *s != ',') {
-                                               s++;
-                                       }
-                                       if (!*s)
-                                               break;
-                                       s++;
-                               }
-                               parameters->cp_disto_alloc = 1;
-                       }
-                       break;
-
-                               /* ----------------------------------------------------- */
-
-
-                       case 'F':                       /* Raw image format parameters */
-                       {
-                               char signo;
-                               char *s = opj_optarg;
-                               if (sscanf(s, "%d,%d,%d,%d,%c", &raw_cp->rawWidth, &raw_cp->rawHeight, &raw_cp->rawComp, &raw_cp->rawBitDepth, &signo) == 5) {
-                                       if (signo == 's') {
-                                               raw_cp->rawSigned = OPJ_TRUE;
-                                               fprintf(stdout,"\nRaw file parameters: %d,%d,%d,%d Signed\n", raw_cp->rawWidth, raw_cp->rawHeight, raw_cp->rawComp, raw_cp->rawBitDepth);
-                                       }
-                                       else if (signo == 'u') {
-                                               raw_cp->rawSigned = OPJ_FALSE;
-                                               fprintf(stdout,"\nRaw file parameters: %d,%d,%d,%d Unsigned\n", raw_cp->rawWidth, raw_cp->rawHeight, raw_cp->rawComp, raw_cp->rawBitDepth);
-                                       }
-                                       else {
-                                               fprintf(stderr,"\nError: invalid raw image parameters: Unknown sign of raw file\n");
-                                               fprintf(stderr,"Please use the Format option -F:\n");
-                                               fprintf(stderr,"-F rawWidth,rawHeight,rawComp,rawBitDepth,s/u (Signed/Unsigned)\n");
-                                               fprintf(stderr,"Example: -i lena.raw -o lena.j2k -F 512,512,3,8,u\n");
-                                               fprintf(stderr,"Aborting\n");
-                                       }
-                               }
-                               else {
-                                       fprintf(stderr,"\nError: invalid raw image parameters\n");
-                                       fprintf(stderr,"Please use the Format option -F:\n");
-                                       fprintf(stderr,"-F rawWidth,rawHeight,rawComp,rawBitDepth,s/u (Signed/Unsigned)\n");
-                                               fprintf(stderr,"Example: -i lena.raw -o lena.j2k -F 512,512,3,8,u\n");
-                                       fprintf(stderr,"Aborting\n");
-                                       return 1;
-                               }
-                       }
-                       break;
-
-                               /* ----------------------------------------------------- */
-
-                       case 'q':                       /* add fixed_quality */
-                       {
-                               char *s = opj_optarg;
-                               while (sscanf(s, "%f", &parameters->tcp_distoratio[parameters->tcp_numlayers]) == 1) {
-                                       parameters->tcp_numlayers++;
-                                       while (*s && *s != ',') {
-                                               s++;
-                                       }
-                                       if (!*s)
-                                               break;
-                                       s++;
-                               }
-                               parameters->cp_fixed_quality = 1;
-                       }
-                       break;
-
-                               /* dda */
-                               /* ----------------------------------------------------- */
-
-                       case 'f':                       /* mod fixed_quality (before : -q) */
-                       {
-                               int *row = NULL, *col = NULL;
-                               int numlayers = 0, numresolution = 0, matrix_width = 0;
-
-                               char *s = opj_optarg;
-                               sscanf(s, "%d", &numlayers);
-                               s++;
-                               if (numlayers > 9)
-                                       s++;
-
-                               parameters->tcp_numlayers = numlayers;
-                               numresolution = parameters->numresolution;
-                               matrix_width = numresolution * 3;
-                               parameters->cp_matrice = (int *) malloc(numlayers * matrix_width * sizeof(int));
-                               s = s + 2;
-
-                               for (i = 0; i < numlayers; i++) {
-                                       row = &parameters->cp_matrice[i * matrix_width];
-                                       col = row;
-                                       parameters->tcp_rates[i] = 1;
-                                       sscanf(s, "%d,", &col[0]);
-                                       s += 2;
-                                       if (col[0] > 9)
-                                               s++;
-                                       col[1] = 0;
-                                       col[2] = 0;
-                                       for (j = 1; j < numresolution; j++) {
-                                               col += 3;
-                                               sscanf(s, "%d,%d,%d", &col[0], &col[1], &col[2]);
-                                               s += 6;
-                                               if (col[0] > 9)
-                                                       s++;
-                                               if (col[1] > 9)
-                                                       s++;
-                                               if (col[2] > 9)
-                                                       s++;
-                                       }
-                                       if (i < numlayers - 1)
-                                               s++;
-                               }
-                               parameters->cp_fixed_alloc = 1;
-                       }
-                       break;
-
-                               /* ----------------------------------------------------- */
-
-                       case 't':                       /* tiles */
-                       {
-                               sscanf(opj_optarg, "%d,%d", &parameters->cp_tdx, &parameters->cp_tdy);
-                               parameters->tile_size_on = OPJ_TRUE;
-                       }
-                       break;
-
-                               /* ----------------------------------------------------- */
-
-                       case 'n':                       /* resolution */
-                       {
-                               sscanf(opj_optarg, "%d", &parameters->numresolution);
-                       }
-                       break;
-
-                               /* ----------------------------------------------------- */
-                       case 'c':                       /* precinct dimension */
-                       {
-                               char sep;
-                               int res_spec = 0;
-
-                               char *s = opj_optarg;
-                               do {
-                                       sep = 0;
-                                       sscanf(s, "[%d,%d]%c", &parameters->prcw_init[res_spec],
-                                 &parameters->prch_init[res_spec], &sep);
-                                       parameters->csty |= 0x01;
-                                       res_spec++;
-                                       s = strpbrk(s, "]") + 2;
-                               }
-                               while (sep == ',');
-                               parameters->res_spec = res_spec;
-                       }
-                       break;
-
-                               /* ----------------------------------------------------- */
-
-                       case 'b':                       /* code-block dimension */
-                       {
-                               int cblockw_init = 0, cblockh_init = 0;
-                               sscanf(opj_optarg, "%d,%d", &cblockw_init, &cblockh_init);
-                               if (cblockw_init * cblockh_init > 4096 || cblockw_init > 1024
-                                       || cblockw_init < 4 || cblockh_init > 1024 || cblockh_init < 4) {
-                                       fprintf(stderr,
-                                               "!! Size of code_block error (option -b) !!\n\nRestriction :\n"
-            "    * width*height<=4096\n    * 4<=width,height<= 1024\n\n");
-                                       return 1;
-                               }
-                               parameters->cblockw_init = cblockw_init;
-                               parameters->cblockh_init = cblockh_init;
-                       }
-                       break;
-
-                               /* ----------------------------------------------------- */
-
-                       case 'x':                       /* creation of index file */
-                       {
-                               char *index = opj_optarg;
-                               strncpy(indexfilename, index, OPJ_PATH_LEN);
-                       }
-                       break;
-
-                               /* ----------------------------------------------------- */
-
-                       case 'p':                       /* progression order */
-                       {
-                               char progression[4];
-
-                               strncpy(progression, opj_optarg, 4);
-                               parameters->prog_order = give_progression(progression);
-                               if (parameters->prog_order == -1) {
-                                       fprintf(stderr, "Unrecognized progression order "
-            "[LRCP, RLCP, RPCL, PCRL, CPRL] !!\n");
-                                       return 1;
-                               }
-                       }
-                       break;
-
-                               /* ----------------------------------------------------- */
-
-                       case 's':                       /* subsampling factor */
-                       {
-                               if (sscanf(opj_optarg, "%d,%d", &parameters->subsampling_dx,
-                                    &parameters->subsampling_dy) != 2) {
-                                       fprintf(stderr, "'-s' sub-sampling argument error !  [-s dx,dy]\n");
-                                       return 1;
-                               }
-                       }
-                       break;
-
-                               /* ----------------------------------------------------- */
-
-                       case 'd':                       /* coordonnate of the reference grid */
-                       {
-                               if (sscanf(opj_optarg, "%d,%d", &parameters->image_offset_x0,
-                                    &parameters->image_offset_y0) != 2) {
-                                       fprintf(stderr, "-d 'coordonnate of the reference grid' argument "
-            "error !! [-d x0,y0]\n");
-                                       return 1;
-                               }
-                       }
-                       break;
-
-                               /* ----------------------------------------------------- */
-
-                       case 'h':                       /* display an help description */
-                               encode_help_display();
-                               return 1;
-
-                               /* ----------------------------------------------------- */
-
-                       case 'P':                       /* POC */
-                       {
-                               int numpocs = 0;                /* number of progression order change (POC) default 0 */
-                               opj_poc_t *POC = NULL;  /* POC : used in case of Progression order change */
-
-                               char *s = opj_optarg;
-                               POC = parameters->POC;
-
-                               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].prg1 = give_progression(POC[numpocs].progorder);
-                                       numpocs++;
-                                       while (*s && *s != '/') {
-                                               s++;
-                                       }
-                                       if (!*s) {
-                                               break;
-                                       }
-                                       s++;
-                               }
-                               parameters->numpocs = numpocs;
-                       }
-                       break;
-
-                               /* ------------------------------------------------------ */
-
-                       case 'S':                       /* SOP marker */
-                       {
-                               parameters->csty |= 0x02;
-                       }
-                       break;
-
-                               /* ------------------------------------------------------ */
-
-                       case 'E':                       /* EPH marker */
-                       {
-                               parameters->csty |= 0x04;
-                       }
-                       break;
-
-                               /* ------------------------------------------------------ */
-
-                       case 'M':                       /* Mode switch pas tous au point !! */
-                       {
-                               int value = 0;
-                               if (sscanf(opj_optarg, "%d", &value) == 1) {
-                                       for (i = 0; i <= 5; i++) {
-                                               int cache = value & (1 << i);
-                                               if (cache)
-                                                       parameters->mode |= (1 << i);
-                                       }
-                               }
-                       }
-                       break;
-
-                               /* ------------------------------------------------------ */
-
-                       case 'R':                       /* ROI */
-                       {
-                               if (sscanf(opj_optarg, "c=%d,U=%d", &parameters->roi_compno,
-                                           &parameters->roi_shift) != 2) {
-                                       fprintf(stderr, "ROI error !! [-ROI c='compno',U='shift']\n");
-                                       return 1;
-                               }
-                       }
-                       break;
-
-                               /* ------------------------------------------------------ */
-
-                       case 'T':                       /* Tile offset */
-                       {
-                               if (sscanf(opj_optarg, "%d,%d", &parameters->cp_tx0, &parameters->cp_ty0) != 2) {
-                                       fprintf(stderr, "-T 'tile offset' argument error !! [-T X0,Y0]");
-                                       return 1;
-                               }
-                       }
-                       break;
-
-                               /* ------------------------------------------------------ */
-
-                       case 'C':                       /* add a comment */
-                       {
-                               parameters->cp_comment = (char*)malloc(strlen(opj_optarg) + 1);
-                               if(parameters->cp_comment) {
-                                       strcpy(parameters->cp_comment, opj_optarg);
-                               }
-                       }
-                       break;
-
-
-                               /* ------------------------------------------------------ */
-
-                       case 'I':                       /* reversible or not */
-                       {
-                               parameters->irreversible = 1;
-                       }
-                       break;
-
-                       /* ------------------------------------------------------ */
-
-                       case 'u':                       /* Tile part generation*/
-                       {
-                               parameters->tp_flag = opj_optarg[0];
-                               parameters->tp_on = 1;
-                       }
-                       break;
-
-                               /* ------------------------------------------------------ */
-
-                       case 'z':                       /* Image Directory path */
-                       {
-                               img_fol->imgdirpath = (char*)malloc(strlen(opj_optarg) + 1);
-                               strcpy(img_fol->imgdirpath,opj_optarg);
-                               img_fol->set_imgdir=1;
-                       }
-                       break;
-
-                               /* ------------------------------------------------------ */
-
-                       case 'w':                       /* Digital Cinema 2K profile compliance*/
-                       {
-                               int fps=0;
-                               sscanf(opj_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;
-
-                               /* ------------------------------------------------------ */
-                       case 'm':                       /* mct input file */
-                       {
-                               char *lFilename = opj_optarg;
-                               char *lMatrix;
-                               char *lCurrentPtr ;
-                               float *lCurrentDoublePtr;
-                               float *lSpace;
-                               int *l_int_ptr;
-                               int lNbComp = 0, lTotalComp, lMctComp, i, lStrLen;
-
-                               /* Open file */
-                               FILE * lFile = fopen(lFilename,"r");
-                               if (lFile == NULL) {
-                                       return 1;
-                               }
-
-                               /* Set size of file and read its content*/
-                               fseek(lFile,0,SEEK_END);
-                               lStrLen = ftell(lFile);
-                               fseek(lFile,0,SEEK_SET);
-                               lMatrix = (char *) malloc(lStrLen + 1);
-                               fread(lMatrix, lStrLen, 1, lFile);
-                               fclose(lFile);
-
-                               lMatrix[lStrLen] = 0;
-                               lCurrentPtr = lMatrix;
-
-                               /* replace ',' by 0 */
-                               while (*lCurrentPtr != 0 ) {
-                                       if (*lCurrentPtr == ' ') {
-                                               *lCurrentPtr = 0;
-                                               ++lNbComp;
-                                       }
-                                       ++lCurrentPtr;
-                               }
-                               ++lNbComp;
-                               lCurrentPtr = lMatrix;
-
-                               lNbComp = (int) (sqrt(4*lNbComp + 1)/2. - 0.5);
-                               lMctComp = lNbComp * lNbComp;
-                               lTotalComp = lMctComp + lNbComp;
-                               lSpace = (float *) malloc(lTotalComp * sizeof(float));
-                               lCurrentDoublePtr = lSpace;
-                               for (i=0;i<lMctComp;++i) {
-                                       lStrLen = strlen(lCurrentPtr) + 1;
-                                       *lCurrentDoublePtr++ = (float) atof(lCurrentPtr);
-                                       lCurrentPtr += lStrLen;
-                               }
-
-                               l_int_ptr = (int*) lCurrentDoublePtr;
-                               for (i=0;i<lNbComp;++i) {
-                                       lStrLen = strlen(lCurrentPtr) + 1;
-                                       *l_int_ptr++ = atoi(lCurrentPtr);
-                                       lCurrentPtr += lStrLen;
-                               }
-
-                               /* TODO should not be here ! */
-                               opj_set_MCT(parameters, lSpace, (int *)(lSpace + lMctComp), lNbComp);
-
-                               /* Free memory*/
-                               free(lSpace);
-                               free(lMatrix);
-                       }
-                       break;
-
-
-                               /* ------------------------------------------------------ */
-
-/* UniPG>> */
-#ifdef USE_JPWL
-                               /* ------------------------------------------------------ */
-
-                       case 'W':                       /* JPWL capabilities switched on */
-                       {
-                               char *token = NULL;
-                               int hprot, pprot, sens, addr, size, range;
-
-                               /* we need to enable indexing */
-                               if (!indexfilename || !*indexfilename) {
-                                       strncpy(indexfilename, JPWL_PRIVATEINDEX_NAME, OPJ_PATH_LEN);
-                               }
-
-                               /* search for different protection methods */
-
-                               /* break the option in comma points and parse the result */
-                               token = strtok(opj_optarg, ",");
-                               while(token != NULL) {
-
-                                       /* search header error protection method */
-                                       if (*token == 'h') {
-
-                                               static int tile = 0, tilespec = 0, lasttileno = 0;
-
-                                               hprot = 1; /* predefined method */
-
-                                               if(sscanf(token, "h=%d", &hprot) == 1) {
-                                                       /* Main header, specified */
-                                                       if (!((hprot == 0) || (hprot == 1) || (hprot == 16) || (hprot == 32) ||
-                                                               ((hprot >= 37) && (hprot <= 128)))) {
-                                                               fprintf(stderr, "ERROR -> invalid main header protection method h = %d\n", hprot);
-                                                               return 1;
-                                                       }
-                                                       parameters->jpwl_hprot_MH = hprot;
-
-                                               } else if(sscanf(token, "h%d=%d", &tile, &hprot) == 2) {
-                                                       /* Tile part header, specified */
-                                                       if (!((hprot == 0) || (hprot == 1) || (hprot == 16) || (hprot == 32) ||
-                                                               ((hprot >= 37) && (hprot <= 128)))) {
-                                                               fprintf(stderr, "ERROR -> invalid tile part header protection method h = %d\n", hprot);
-                                                               return 1;
-                                                       }
-                                                       if (tile < 0) {
-                                                               fprintf(stderr, "ERROR -> invalid tile part number on protection method t = %d\n", tile);
-                                                               return 1;
-                                                       }
-                                                       if (tilespec < JPWL_MAX_NO_TILESPECS) {
-                                                               parameters->jpwl_hprot_TPH_tileno[tilespec] = lasttileno = tile;
-                                                               parameters->jpwl_hprot_TPH[tilespec++] = hprot;
-                                                       }
-
-                                               } else if(sscanf(token, "h%d", &tile) == 1) {
-                                                       /* Tile part header, unspecified */
-                                                       if (tile < 0) {
-                                                               fprintf(stderr, "ERROR -> invalid tile part number on protection method t = %d\n", tile);
-                                                               return 1;
-                                                       }
-                                                       if (tilespec < JPWL_MAX_NO_TILESPECS) {
-                                                               parameters->jpwl_hprot_TPH_tileno[tilespec] = lasttileno = tile;
-                                                               parameters->jpwl_hprot_TPH[tilespec++] = hprot;
-                                                       }
-
-
-                                               } else if (!strcmp(token, "h")) {
-                                                       /* Main header, unspecified */
-                                                       parameters->jpwl_hprot_MH = hprot;
-
-                                               } else {
-                                                       fprintf(stderr, "ERROR -> invalid protection method selection = %s\n", token);
-                                                       return 1;
-                                               };
-
-                                       }
-
-                                       /* search packet error protection method */
-                                       if (*token == 'p') {
-
-                                               static int pack = 0, tile = 0, packspec = 0;
-
-                                               pprot = 1; /* predefined method */
-
-                                               if (sscanf(token, "p=%d", &pprot) == 1) {
-                                                       /* Method for all tiles and all packets */
-                                                       if (!((pprot == 0) || (pprot == 1) || (pprot == 16) || (pprot == 32) ||
-                                                               ((pprot >= 37) && (pprot <= 128)))) {
-                                                               fprintf(stderr, "ERROR -> invalid default packet protection method p = %d\n", pprot);
-                                                               return 1;
-                                                       }
-                                                       parameters->jpwl_pprot_tileno[0] = 0;
-                                                       parameters->jpwl_pprot_packno[0] = 0;
-                                                       parameters->jpwl_pprot[0] = pprot;
-
-                                               } else if (sscanf(token, "p%d=%d", &tile, &pprot) == 2) {
-                                                       /* method specified from that tile on */
-                                                       if (!((pprot == 0) || (pprot == 1) || (pprot == 16) || (pprot == 32) ||
-                                                               ((pprot >= 37) && (pprot <= 128)))) {
-                                                               fprintf(stderr, "ERROR -> invalid packet protection method p = %d\n", pprot);
-                                                               return 1;
-                                                       }
-                                                       if (tile < 0) {
-                                                               fprintf(stderr, "ERROR -> invalid tile part number on protection method p = %d\n", tile);
-                                                               return 1;
-                                                       }
-                                                       if (packspec < JPWL_MAX_NO_PACKSPECS) {
-                                                               parameters->jpwl_pprot_tileno[packspec] = tile;
-                                                               parameters->jpwl_pprot_packno[packspec] = 0;
-                                                               parameters->jpwl_pprot[packspec++] = pprot;
-                                                       }
-
-                                               } else if (sscanf(token, "p%d:%d=%d", &tile, &pack, &pprot) == 3) {
-                                                       /* method fully specified from that tile and that packet on */
-                                                       if (!((pprot == 0) || (pprot == 1) || (pprot == 16) || (pprot == 32) ||
-                                                               ((pprot >= 37) && (pprot <= 128)))) {
-                                                               fprintf(stderr, "ERROR -> invalid packet protection method p = %d\n", pprot);
-                                                               return 1;
-                                                       }
-                                                       if (tile < 0) {
-                                                               fprintf(stderr, "ERROR -> invalid tile part number on protection method p = %d\n", tile);
-                                                               return 1;
-                                                       }
-                                                       if (pack < 0) {
-                                                               fprintf(stderr, "ERROR -> invalid packet number on protection method p = %d\n", pack);
-                                                               return 1;
-                                                       }
-                                                       if (packspec < JPWL_MAX_NO_PACKSPECS) {
-                                                               parameters->jpwl_pprot_tileno[packspec] = tile;
-                                                               parameters->jpwl_pprot_packno[packspec] = pack;
-                                                               parameters->jpwl_pprot[packspec++] = pprot;
-                                                       }
-
-                                               } else if (sscanf(token, "p%d:%d", &tile, &pack) == 2) {
-                                                       /* default method from that tile and that packet on */
-                                                       if (!((pprot == 0) || (pprot == 1) || (pprot == 16) || (pprot == 32) ||
-                                                               ((pprot >= 37) && (pprot <= 128)))) {
-                                                               fprintf(stderr, "ERROR -> invalid packet protection method p = %d\n", pprot);
-                                                               return 1;
-                                                       }
-                                                       if (tile < 0) {
-                                                               fprintf(stderr, "ERROR -> invalid tile part number on protection method p = %d\n", tile);
-                                                               return 1;
-                                                       }
-                                                       if (pack < 0) {
-                                                               fprintf(stderr, "ERROR -> invalid packet number on protection method p = %d\n", pack);
-                                                               return 1;
-                                                       }
-                                                       if (packspec < JPWL_MAX_NO_PACKSPECS) {
-                                                               parameters->jpwl_pprot_tileno[packspec] = tile;
-                                                               parameters->jpwl_pprot_packno[packspec] = pack;
-                                                               parameters->jpwl_pprot[packspec++] = pprot;
-                                                       }
-
-                                               } else if (sscanf(token, "p%d", &tile) == 1) {
-                                                       /* default from a tile on */
-                                                       if (tile < 0) {
-                                                               fprintf(stderr, "ERROR -> invalid tile part number on protection method p = %d\n", tile);
-                                                               return 1;
-                                                       }
-                                                       if (packspec < JPWL_MAX_NO_PACKSPECS) {
-                                                               parameters->jpwl_pprot_tileno[packspec] = tile;
-                                                               parameters->jpwl_pprot_packno[packspec] = 0;
-                                                               parameters->jpwl_pprot[packspec++] = pprot;
-                                                       }
-
-
-                                               } else if (!strcmp(token, "p")) {
-                                                       /* all default */
-                                                       parameters->jpwl_pprot_tileno[0] = 0;
-                                                       parameters->jpwl_pprot_packno[0] = 0;
-                                                       parameters->jpwl_pprot[0] = pprot;
-
-                                               } else {
-                                                       fprintf(stderr, "ERROR -> invalid protection method selection = %s\n", token);
-                                                       return 1;
-                                               };
-
-                                       }
-
-                                       /* search sensitivity method */
-                                       if (*token == 's') {
-
-                                               static int tile = 0, tilespec = 0, lasttileno = 0;
-
-                                               sens = 0; /* predefined: relative error */
-
-                                               if(sscanf(token, "s=%d", &sens) == 1) {
-                                                       /* Main header, specified */
-                                                       if ((sens < -1) || (sens > 7)) {
-                                                               fprintf(stderr, "ERROR -> invalid main header sensitivity method s = %d\n", sens);
-                                                               return 1;
-                                                       }
-                                                       parameters->jpwl_sens_MH = sens;
-
-                                               } else if(sscanf(token, "s%d=%d", &tile, &sens) == 2) {
-                                                       /* Tile part header, specified */
-                                                       if ((sens < -1) || (sens > 7)) {
-                                                               fprintf(stderr, "ERROR -> invalid tile part header sensitivity method s = %d\n", sens);
-                                                               return 1;
-                                                       }
-                                                       if (tile < 0) {
-                                                               fprintf(stderr, "ERROR -> invalid tile part number on sensitivity method t = %d\n", tile);
-                                                               return 1;
-                                                       }
-                                                       if (tilespec < JPWL_MAX_NO_TILESPECS) {
-                                                               parameters->jpwl_sens_TPH_tileno[tilespec] = lasttileno = tile;
-                                                               parameters->jpwl_sens_TPH[tilespec++] = sens;
-                                                       }
-
-                                               } else if(sscanf(token, "s%d", &tile) == 1) {
-                                                       /* Tile part header, unspecified */
-                                                       if (tile < 0) {
-                                                               fprintf(stderr, "ERROR -> invalid tile part number on sensitivity method t = %d\n", tile);
-                                                               return 1;
-                                                       }
-                                                       if (tilespec < JPWL_MAX_NO_TILESPECS) {
-                                                               parameters->jpwl_sens_TPH_tileno[tilespec] = lasttileno = tile;
-                                                               parameters->jpwl_sens_TPH[tilespec++] = hprot;
-                                                       }
-
-                                               } else if (!strcmp(token, "s")) {
-                                                       /* Main header, unspecified */
-                                                       parameters->jpwl_sens_MH = sens;
-
-                                               } else {
-                                                       fprintf(stderr, "ERROR -> invalid sensitivity method selection = %s\n", token);
-                                                       return 1;
-                                               };
-
-                                               parameters->jpwl_sens_size = 2; /* 2 bytes for default size */
-                                       }
-
-                                       /* search addressing size */
-                                       if (*token == 'a') {
-
-
-                                               addr = 0; /* predefined: auto */
-
-                                               if(sscanf(token, "a=%d", &addr) == 1) {
-                                                       /* Specified */
-                                                       if ((addr != 0) && (addr != 2) && (addr != 4)) {
-                                                               fprintf(stderr, "ERROR -> invalid addressing size a = %d\n", addr);
-                                                               return 1;
-                                                       }
-                                                       parameters->jpwl_sens_addr = addr;
-
-                                               } else if (!strcmp(token, "a")) {
-                                                       /* default */
-                                                       parameters->jpwl_sens_addr = addr; /* auto for default size */
-
-                                               } else {
-                                                       fprintf(stderr, "ERROR -> invalid addressing selection = %s\n", token);
-                                                       return 1;
-                                               };
-
-                                       }
-
-                                       /* search sensitivity size */
-                                       if (*token == 'z') {
-
-
-                                               size = 1; /* predefined: 1 byte */
-
-                                               if(sscanf(token, "z=%d", &size) == 1) {
-                                                       /* Specified */
-                                                       if ((size != 0) && (size != 1) && (size != 2)) {
-                                                               fprintf(stderr, "ERROR -> invalid sensitivity size z = %d\n", size);
-                                                               return 1;
-                                                       }
-                                                       parameters->jpwl_sens_size = size;
-
-                                               } else if (!strcmp(token, "a")) {
-                                                       /* default */
-                                                       parameters->jpwl_sens_size = size; /* 1 for default size */
-
-                                               } else {
-                                                       fprintf(stderr, "ERROR -> invalid size selection = %s\n", token);
-                                                       return 1;
-                                               };
-
-                                       }
-
-                                       /* search range method */
-                                       if (*token == 'g') {
-
-
-                                               range = 0; /* predefined: 0 (packet) */
-
-                                               if(sscanf(token, "g=%d", &range) == 1) {
-                                                       /* Specified */
-                                                       if ((range < 0) || (range > 3)) {
-                                                               fprintf(stderr, "ERROR -> invalid sensitivity range method g = %d\n", range);
-                                                               return 1;
-                                                       }
-                                                       parameters->jpwl_sens_range = range;
-
-                                               } else if (!strcmp(token, "g")) {
-                                                       /* default */
-                                                       parameters->jpwl_sens_range = range;
-
-                                               } else {
-                                                       fprintf(stderr, "ERROR -> invalid range selection = %s\n", token);
-                                                       return 1;
-                                               };
-
-                                       }
-
-                                       /* next token or bust */
-                                       token = strtok(NULL, ",");
-                               };
-
-
-                               /* some info */
-                               fprintf(stdout, "Info: JPWL capabilities enabled\n");
-                               parameters->jpwl_epc_on = OPJ_TRUE;
-
-                       }
-                       break;
-#endif /* USE_JPWL */
-/* <<UniPG */
-/* ------------------------------------------------------ */
-                       
-                       case 'J':                       /* jpip on */
-                       {
-                         parameters->jpip_on = OPJ_TRUE;
-                       }
-                       break;
-                               /* ------------------------------------------------------ */
-
-
-                       default:
-                               fprintf(stderr, "ERROR -> Command line not valid\n");
-                               return 1;
-               }
-       }while(c != -1);
-
-       /* check for possible errors */
-       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, "Example: %s -i image.ppm  -o image.j2k\n",argv[0]);
-                       fprintf(stderr, "    Try: %s -h\n",argv[0]);
-                       return 1;
-               }
-       }
-
-       if ( (parameters->decod_format == RAW_DFMT && raw_cp->rawWidth == 0)
-       || (parameters->decod_format == RAWL_DFMT && raw_cp->rawWidth == 0)) {
-                       fprintf(stderr,"\nError: invalid raw image parameters\n");
-                       fprintf(stderr,"Please use the Format option -F:\n");
-                       fprintf(stderr,"-F rawWidth,rawHeight,rawComp,rawBitDepth,s/u (Signed/Unsigned)\n");
-                                               fprintf(stderr,"Example: -i lena.raw -o lena.j2k -F 512,512,3,8,u\n");
-                       fprintf(stderr,"Aborting\n");
-                       return 1;
-       }
-
-       if ((parameters->cp_disto_alloc || parameters->cp_fixed_alloc || parameters->cp_fixed_quality)
-               && (!(parameters->cp_disto_alloc ^ parameters->cp_fixed_alloc ^ parameters->cp_fixed_quality))) {
-               fprintf(stderr, "Error: options -r -q and -f cannot be used together !!\n");
-               return 1;
-       }                               /* mod fixed_quality */
-
-       /* if no rate entered, lossless by default */
-       if (parameters->tcp_numlayers == 0) {
-               parameters->tcp_rates[0] = 0;   /* MOD antonin : losslessbug */
-               parameters->tcp_numlayers++;
-               parameters->cp_disto_alloc = 1;
-       }
-
-       if((parameters->cp_tx0 > parameters->image_offset_x0) || (parameters->cp_ty0 > parameters->image_offset_y0)) {
-               fprintf(stderr,
-                       "Error: Tile offset dimension is unnappropriate --> TX0(%d)<=IMG_X0(%d) TYO(%d)<=IMG_Y0(%d) \n",
-                       parameters->cp_tx0, parameters->image_offset_x0, parameters->cp_ty0, parameters->image_offset_y0);
-               return 1;
-       }
-
-       for (i = 0; i < parameters->numpocs; i++) {
-               if (parameters->POC[i].prg == -1) {
-                       fprintf(stderr,
-                               "Unrecognized progression order in option -P (POC n %d) [LRCP, RLCP, RPCL, PCRL, CPRL] !!\n",
-                               i + 1);
-               }
-       }
-
-       return 0;
-}
-
-/* -------------------------------------------------------------------------- */
-
-/**
-sample error callback expecting a FILE* client object
-*/
-void error_file_callback(const char *msg, void *client_data) {
-       FILE *stream = (FILE*)client_data;
-       fprintf(stream, "[ERROR] %s", msg);
-}
-/**
-sample warning callback expecting a FILE* client object
-*/
-void warning_file_callback(const char *msg, void *client_data) {
-       FILE *stream = (FILE*)client_data;
-       fprintf(stream, "[WARNING] %s", msg);
-}
-/**
-sample debug callback expecting a FILE* client object
-*/
-void info_file_callback(const char *msg, void *client_data) {
-       FILE *stream = (FILE*)client_data;
-       fprintf(stream, "[INFO] %s", msg);
-}
-
-/**
-sample error debug callback expecting no client object
-*/
-void error_callback(const char *msg, void *client_data) {
-       (void)client_data;
-       fprintf(stdout, "[ERROR] %s", msg);
-}
-/**
-sample warning debug callback expecting no client object
-*/
-void warning_callback(const char *msg, void *client_data) {
-       (void)client_data;
-       fprintf(stdout, "[WARNING] %s", msg);
-}
-/**
-sample debug callback expecting no client object
-*/
-void info_callback(const char *msg, void *client_data) {
-       (void)client_data;
-       fprintf(stdout, "[INFO] %s", msg);
-}
-
-/* -------------------------------------------------------------------------- */
-/**
- * IMAGE_TO_J2K MAIN
- */
-/* -------------------------------------------------------------------------- */
-int main(int argc, char **argv) {
-       FILE *fout = NULL;
-
-       opj_cparameters_t parameters;   /* compression parameters */
-
-       opj_stream_t *l_stream = 00;
-       opj_codec_t* l_codec = 00;
-       opj_image_t *image = NULL;
-       raw_cparameters_t raw_cp;
-
-       char indexfilename[OPJ_PATH_LEN];       /* index file name */
-
-       int i, num_images, imageno;
-       img_fol_t img_fol;
-       dircnt_t *dirptr = NULL;
-
-       opj_bool bSuccess;
-  opj_bool bUseTiles = OPJ_FALSE; /* OPJ_TRUE */
-       OPJ_UINT32 l_nb_tiles = 4;
-
-       /* set encoding parameters to default values */
-       opj_set_default_encoder_parameters(&parameters);
-
-       /* Initialize indexfilename and img_fol */
-       *indexfilename = 0;
-       memset(&img_fol,0,sizeof(img_fol_t));
-
-       /* parse input and get user encoding parameters */
-       if(parse_cmdline_encoder(argc, argv, &parameters,&img_fol, &raw_cp, indexfilename) == 1) {
-               return 1;
-       }
-
-       if (parameters.cp_cinema){
-               img_fol.rates = (float*)malloc(parameters.tcp_numlayers * sizeof(float));
-               for(i=0; i< parameters.tcp_numlayers; i++){
-                       img_fol.rates[i] = parameters.tcp_rates[i];
-               }
-               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);
-    const char *version = opj_version();
-/* UniPG>> */
-#ifdef USE_JPWL
-               parameters.cp_comment = (char*)malloc(clen+strlen(version)+11);
-               sprintf(parameters.cp_comment,"%s%s with JPWL", comment, version);
-#else
-               parameters.cp_comment = (char*)malloc(clen+strlen(version)+1);
-               sprintf(parameters.cp_comment,"%s%s", comment, version);
-#endif
-/* <<UniPG */
-       }
-
-       /* Read directory if necessary */
-       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;
-       }
-       /*Encoding image one by one*/
-       for(imageno=0;imageno<num_images;imageno++)     {
-               image = NULL;
-               fprintf(stderr,"\n");
-
-               if(img_fol.set_imgdir==1){
-                       if (get_next_file(imageno, dirptr,&img_fol, &parameters)) {
-                               fprintf(stderr,"skipping file...\n");
-                               continue;
-                       }
-               }
-
-               switch(parameters.decod_format) {
-                       case PGX_DFMT:
-                               break;
-                       case PXM_DFMT:
-                               break;
-                       case BMP_DFMT:
-                               break;
-                       case TIF_DFMT:
-                               break;
-                       case RAW_DFMT:
-                       case RAWL_DFMT:
-                               break;
-                       case TGA_DFMT:
-                               break;
-                       case PNG_DFMT:
-                               break;
-                       default:
-                               fprintf(stderr,"skipping file...\n");
-                               continue;
-               }
-
-               /* decode the source image */
-               /* ----------------------- */
-
-               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;
-
-                       case PXM_DFMT:
-                               image = pnmtoimage(parameters.infile, &parameters);
-                               if (!image) {
-                                       fprintf(stderr, "Unable to load pnm file\n");
-                                       return 1;
-                               }
-                               break;
-
-                       case BMP_DFMT:
-                               image = bmptoimage(parameters.infile, &parameters);
-                               if (!image) {
-                                       fprintf(stderr, "Unable to load bmp file\n");
-                                       return 1;
-                               }
-                               break;
-
-#ifdef HAVE_LIBTIFF
-                       case TIF_DFMT:
-                               image = tiftoimage(parameters.infile, &parameters);
-                               if (!image) {
-                                       fprintf(stderr, "Unable to load tiff file\n");
-                                       return 1;
-                               }
-                       break;
-#endif /* HAVE_LIBTIFF */
-
-                       case RAW_DFMT:
-                               image = rawtoimage(parameters.infile, &parameters, &raw_cp);
-                               if (!image) {
-                                       fprintf(stderr, "Unable to load raw file\n");
-                                       return 1;
-                               }
-                       break;
-
-                       case RAWL_DFMT:
-                               image = rawltoimage(parameters.infile, &parameters, &raw_cp);
-                               if (!image) {
-                                       fprintf(stderr, "Unable to load raw file\n");
-                                       return 1;
-                               }
-                       break;
-
-                       case TGA_DFMT:
-                               image = tgatoimage(parameters.infile, &parameters);
-                               if (!image) {
-                                       fprintf(stderr, "Unable to load tga file\n");
-                                       return 1;
-                               }
-                       break;
-
-#ifdef HAVE_LIBPNG
-                       case PNG_DFMT:
-                               image = pngtoimage(parameters.infile, &parameters);
-                               if (!image) {
-                                       fprintf(stderr, "Unable to load png file\n");
-                                       return 1;
-                               }
-                               break;
-#endif /* HAVE_LIBPNG */
-               }
-
-/* Can happen if input file is TIFF or PNG 
- * and HAVE_LIBTIF or HAVE_LIBPNG is undefined
-*/
-               if( !image) {
-                       fprintf(stderr, "Unable to load file: got no image\n");
-                       return 1;
-               }
-
-               /* Decide if MCT should be used */
-               parameters.tcp_mct = image->numcomps == 3 ? 1 : 0;
-
-               if(parameters.cp_cinema){
-                       cinema_setup_encoder(&parameters,image,&img_fol);
-               }
-
-               /* encode the destination image */
-               /* ---------------------------- */
-
-               switch(parameters.cod_format) {
-                       case J2K_CFMT:  /* JPEG-2000 codestream */
-                       {
-                               /* Get a decoder handle */
-                               l_codec = opj_create_compress(CODEC_J2K);
-                               break;
-                       }
-                       case JP2_CFMT:  /* JPEG 2000 compressed image data */
-                       {
-                               /* Get a decoder handle */
-                               l_codec = opj_create_compress(CODEC_JP2);
-                               break;
-                       }
-                       default:
-                               fprintf(stderr, "skipping file..\n");
-                               opj_stream_destroy(l_stream);
-                               continue;
-               }
-               
-               /* catch events using our callbacks and give a local context */         
-               opj_set_info_handler(l_codec, info_callback,00);
-               opj_set_warning_handler(l_codec, warning_callback,00);
-               opj_set_error_handler(l_codec, error_callback,00);
-
-    if( bUseTiles ) {
-      parameters.cp_tx0 = 0;
-      parameters.cp_ty0 = 0;
-      parameters.tile_size_on = OPJ_TRUE;
-      parameters.cp_tdx = 512;
-      parameters.cp_tdy = 512;
-    }
-               opj_setup_encoder(l_codec, &parameters, image);
-
-               /* Open the output file*/
-               fout = fopen(parameters.outfile, "wb");
-               if (! fout) {
-                       fprintf(stderr, "Not enable to create output file!\n");
-                       opj_stream_destroy(l_stream);
-                       return 1;
-               }
-
-               /* open a byte stream for writing and allocate memory for all tiles */
-               l_stream = opj_stream_create_default_file_stream(fout,OPJ_FALSE);
-               if (! l_stream){
-                       return 1;
-               }
-
-               /* encode the image */
-    bSuccess = opj_start_compress(l_codec,image,l_stream);
-    if (!bSuccess)  {
-      fprintf(stderr, "failed to encode image: opj_start_compress\n");
-    }
-    if( bUseTiles ) {
-      OPJ_BYTE *l_data;
-      OPJ_UINT32 l_data_size = 512*512*3;
-      l_data = (OPJ_BYTE*) malloc( l_data_size * sizeof(OPJ_BYTE));
-      memset(l_data, 0, l_data_size );
-      assert( l_data );
-      for (i=0;i<l_nb_tiles;++i) {
-        if (! opj_write_tile(l_codec,i,l_data,l_data_size,l_stream)) {
-          fprintf(stderr, "ERROR -> test_tile_encoder: failed to write the tile %d!\n",i);
-          opj_stream_destroy(l_stream);
-          fclose(fout);
-          opj_destroy_codec(l_codec);
-          opj_image_destroy(image);
-          return 1;
-        }
-      }
-      free(l_data);
-    }
-    else {
-      bSuccess = bSuccess && opj_encode(l_codec, l_stream);
-      if (!bSuccess)  {
-        fprintf(stderr, "failed to encode image: opj_encode\n");
-      }
-    }
-               bSuccess = bSuccess && opj_end_compress(l_codec, l_stream);
-               if (!bSuccess)  {
-                       fprintf(stderr, "failed to encode image: opj_end_compress\n");
-               }
-
-               if (!bSuccess)  {
-                       opj_stream_destroy(l_stream);
-                       fclose(fout);
-      opj_destroy_codec(l_codec);
-      opj_image_destroy(image);
-                       fprintf(stderr, "failed to encode image\n");
-                       return 1;
-               }
-
-               fprintf(stderr,"Generated outfile %s\n",parameters.outfile);
-               /* close and free the byte stream */
-               opj_stream_destroy(l_stream);
-               fclose(fout);
-
-               /* free remaining compression structures */
-               opj_destroy_codec(l_codec);
-
-               /* 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);
-    if(parameters.cp_cinema)    free(img_fol.rates);
-
-       return 0;
-}
diff --git a/src/bin/jp2/j2k_dump.c b/src/bin/jp2/j2k_dump.c
deleted file mode 100644 (file)
index 6c63c2c..0000000
+++ /dev/null
@@ -1,585 +0,0 @@
-/*
- * Copyright (c) 2010, Mathieu Malaterre, GDCM
- * Copyright (c) 2011, Mickael Savinaud, Communications & Systemes <mickael.savinaud@c-s.fr>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include "opj_config.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
-
-#ifdef _WIN32
-#include "windirent.h"
-#else
-#include <dirent.h>
-#endif /* _WIN32 */
-
-#ifdef _WIN32
-#include <windows.h>
-#else
-#include <strings.h>
-#define _stricmp strcasecmp
-#define _strnicmp strncasecmp
-#endif /* _WIN32 */
-
-#include "openjpeg.h"
-#include "opj_getopt.h"
-#include "convert.h"
-#include "index.h"
-
-#include "format_defs.h"
-
-typedef struct dircnt{
-       /** Buffer for holding images read from Directory*/
-       char *filename_buf;
-       /** Pointer to the buffer*/
-       char **filename;
-}dircnt_t;
-
-
-typedef struct img_folder{
-       /** The directory path of the folder containing input images*/
-       char *imgdirpath;
-       /** Output format*/
-       const char *out_format;
-       /** Enable option*/
-       char set_imgdir;
-       /** Enable Cod Format for output*/
-       char set_out_format;
-
-}img_fol_t;
-
-/* -------------------------------------------------------------------------- */
-/* Declarations                                                               */
-int get_num_images(char *imgdirpath);
-int load_images(dircnt_t *dirptr, char *imgdirpath);
-int get_file_format(const char *filename);
-char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_dparameters_t *parameters);
-static int infile_format(const char *fname);
-
-int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,img_fol_t *img_fol);
-int parse_DA_values( char* inArg, unsigned int *DA_x0, unsigned int *DA_y0, unsigned int *DA_x1, unsigned int *DA_y1);
-
-/* -------------------------------------------------------------------------- */
-void decode_help_display(void) {
-       fprintf(stdout,"HELP for j2k_dump\n----\n\n");
-       fprintf(stdout,"- the -h option displays this help information on screen\n\n");
-
-/* UniPG>> */
-       fprintf(stdout,"List of parameters for the JPEG 2000 "
-#ifdef USE_JPWL
-               "+ JPWL "
-#endif /* USE_JPWL */
-               "decoder:\n");
-/* <<UniPG */
-       fprintf(stdout,"\n");
-       fprintf(stdout,"\n");
-       fprintf(stdout,"  -ImgDir \n");
-       fprintf(stdout,"        Image file Directory path \n");
-       fprintf(stdout,"  -i <compressed file>\n");
-       fprintf(stdout,"    REQUIRED only if an Input image directory not specified\n");
-       fprintf(stdout,"    Currently accepts J2K-files, JP2-files and JPT-files. The file type\n");
-       fprintf(stdout,"    is identified based on its suffix.\n");
-       fprintf(stdout,"  -o <output file>\n");
-       fprintf(stdout,"    OPTIONAL\n");
-       fprintf(stdout,"    Output file where file info will be dump.\n");
-       fprintf(stdout,"    By default it will be in the stdout.\n");
-       fprintf(stdout,"  -v "); /* FIXME WIP_MSD */
-       fprintf(stdout,"    OPTIONAL\n");
-       fprintf(stdout,"    Activate or not the verbose mode (display info and warning message)\n");
-       fprintf(stdout,"    By default verbose mode is off.\n");
-       fprintf(stdout,"\n");
-}
-
-/* -------------------------------------------------------------------------- */
-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(const char *filename) {
-       unsigned int i;
-       static const char *extension[] = {"pgx", "pnm", "pgm", "ppm", "bmp","tif", "raw", "tga", "png", "j2k", "jp2", "jpt", "j2c", "jpc"  };
-       static const int format[] = { PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, TIF_DFMT, RAW_DFMT, TGA_DFMT, PNG_DFMT, J2K_CFMT, JP2_CFMT, JPT_CFMT, J2K_CFMT, J2K_CFMT };
-       char * ext = strrchr(filename, '.');
-       if (ext == NULL)
-               return -1;
-       ext++;
-       if(ext) {
-               for(i = 0; i < sizeof(format)/sizeof(*format); i++) {
-                       if(_strnicmp(ext, extension[i], 3) == 0) {
-                               return format[i];
-                       }
-               }
-       }
-
-       return -1;
-}
-
-/* -------------------------------------------------------------------------- */
-char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_dparameters_t *parameters){
-       char image_filename[OPJ_PATH_LEN], infilename[OPJ_PATH_LEN],outfilename[OPJ_PATH_LEN],temp_ofname[OPJ_PATH_LEN];
-       char *temp_p, temp1[OPJ_PATH_LEN]="";
-
-       strcpy(image_filename,dirptr->filename[imageno]);
-       fprintf(stderr,"File Number %d \"%s\"\n",imageno,image_filename);
-       parameters->decod_format = get_file_format(image_filename);
-       if (parameters->decod_format == -1)
-               return 1;
-       sprintf(infilename,"%s/%s",img_fol->imgdirpath,image_filename);
-       strncpy(parameters->infile, infilename, sizeof(infilename));
-
-       /*Set output file*/
-       strcpy(temp_ofname,strtok(image_filename,"."));
-       while((temp_p = strtok(NULL,".")) != NULL){
-               strcat(temp_ofname,temp1);
-               sprintf(temp1,".%s",temp_p);
-       }
-       if(img_fol->set_out_format==1){
-               sprintf(outfilename,"%s/%s.%s",img_fol->imgdirpath,temp_ofname,img_fol->out_format);
-               strncpy(parameters->outfile, outfilename, sizeof(outfilename));
-       }
-       return 0;
-}
-
-/* -------------------------------------------------------------------------- */
-#define JP2_RFC3745_MAGIC "\x00\x00\x00\x0c\x6a\x50\x20\x20\x0d\x0a\x87\x0a"
-#define JP2_MAGIC "\x0d\x0a\x87\x0a"
-/* position 45: "\xff\x52" */
-#define J2K_CODESTREAM_MAGIC "\xff\x4f\xff\x51"
-
-static int infile_format(const char *fname)
-{
-       FILE *reader;
-       const char *s, *magic_s;
-       int ext_format, magic_format;
-       unsigned char buf[12];
-       unsigned int l_nb_read; 
-
-       reader = fopen(fname, "rb");
-
-       if (reader == NULL)
-               return -1;
-
-       memset(buf, 0, 12);
-       l_nb_read = fread(buf, 1, 12, reader);
-       fclose(reader);
-       if (l_nb_read != 12)
-               return -1;
-
-
-
-       ext_format = get_file_format(fname);
-
-       if (ext_format == JPT_CFMT)
-               return JPT_CFMT;
-
-       if (memcmp(buf, JP2_RFC3745_MAGIC, 12) == 0 || memcmp(buf, JP2_MAGIC, 4) == 0) {
-               magic_format = JP2_CFMT;
-               magic_s = ".jp2";
-       }
-       else if (memcmp(buf, J2K_CODESTREAM_MAGIC, 4) == 0) {
-               magic_format = J2K_CFMT;
-               magic_s = ".j2k or .jpc or .j2c";
-       }
-       else
-               return -1;
-
-       if (magic_format == ext_format)
-               return ext_format;
-
-       s = fname + strlen(fname) - 4;
-
-       fputs("\n===========================================\n", stderr);
-       fprintf(stderr, "The extension of this file is incorrect.\n"
-                                       "FOUND %s. SHOULD BE %s\n", s, magic_s);
-       fputs("===========================================\n", stderr);
-
-       return magic_format;
-}
-/* -------------------------------------------------------------------------- */
-/**
- * Parse the command line
- */
-/* -------------------------------------------------------------------------- */
-int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,img_fol_t *img_fol) {
-       int totlen, c;
-       opj_option_t long_option[]={
-               {"ImgDir",REQ_ARG, NULL ,'y'},
-       };
-       const char optlist[] = "i:o:hv";
-
-       totlen=sizeof(long_option);
-       img_fol->set_out_format = 0;
-       do {
-               c = opj_getopt_long(argc, argv,optlist,long_option,totlen);
-               if (c == -1)
-                       break;
-               switch (c) {
-                       case 'i':                       /* input file */
-                       {
-                               char *infile = opj_optarg;
-                               parameters->decod_format = infile_format(infile);
-                               switch(parameters->decod_format) {
-                                       case J2K_CFMT:
-                                               break;
-                                       case JP2_CFMT:
-                                               break;
-                                       case JPT_CFMT:
-                                               break;
-                                       default:
-                                               fprintf(stderr, 
-                                                       "!! Unrecognized format for infile : %s [accept only *.j2k, *.jp2, *.jpc or *.jpt] !!\n\n", 
-                                                       infile);
-                                               return 1;
-                               }
-                               strncpy(parameters->infile, infile, sizeof(parameters->infile)-1);
-                       }
-                       break;
-
-                               /* ------------------------------------------------------ */
-
-                       case 'o':     /* output file */
-                       {
-                         char *outfile = opj_optarg;
-                         strncpy(parameters->outfile, outfile, sizeof(parameters->outfile)-1);
-                       }
-                       break;
-                               
-                               /* ----------------------------------------------------- */
-
-                       case 'h':                       /* display an help description */
-                               decode_help_display();
-                               return 1;                               
-
-                               /* ------------------------------------------------------ */
-
-                       case 'y':                       /* Image Directory path */
-                       {
-                               img_fol->imgdirpath = (char*)malloc(strlen(opj_optarg) + 1);
-                               strcpy(img_fol->imgdirpath,opj_optarg);
-                               img_fol->set_imgdir=1;
-                       }
-                       break;
-
-                       /* ----------------------------------------------------- */
-
-                       case 'v':               /* Verbose mode */
-                       {
-                               parameters->m_verbose = 1;
-                       }
-                       break;
-                       
-                               /* ----------------------------------------------------- */
-                       default:
-                               fprintf(stderr,"WARNING -> this option is not valid \"-%c %s\"\n",c, opj_optarg);
-                               break;
-               }
-       }while(c != -1);
-
-       /* check for possible errors */
-       if(img_fol->set_imgdir==1){
-               if(!(parameters->infile[0]==0)){
-                       fprintf(stderr, "Error: options -ImgDir and -i cannot be used together !!\n");
-                       return 1;
-               }
-               if(img_fol->set_out_format == 0){
-                       fprintf(stderr, "Error: When -ImgDir is used, -OutFor <FORMAT> must be used !!\n");
-                       fprintf(stderr, "Only one format allowed! Valid format PGM, PPM, PNM, PGX, BMP, TIF, RAW and TGA!!\n");
-                       return 1;
-               }
-               if(!(parameters->outfile[0] == 0)){
-                       fprintf(stderr, "Error: options -ImgDir and -o cannot be used together !!\n");
-                       return 1;
-               }
-       }else{
-               if(parameters->infile[0] == 0) {
-                       fprintf(stderr, "Example: %s -i image.j2k\n",argv[0]);
-                       fprintf(stderr, "    Try: %s -h\n",argv[0]);
-                       return 1;
-               }
-       }
-
-       return 0;
-}
-
-/* -------------------------------------------------------------------------- */
-
-/**
-sample error debug callback expecting no client object
-*/
-void error_callback(const char *msg, void *client_data) {
-       (void)client_data;
-       fprintf(stdout, "[ERROR] %s", msg);
-}
-/**
-sample warning debug callback expecting no client object
-*/
-void warning_callback(const char *msg, void *client_data) {
-       (void)client_data;
-       fprintf(stdout, "[WARNING] %s", msg);
-}
-/**
-sample debug callback expecting no client object
-*/
-void info_callback(const char *msg, void *client_data) {
-       (void)client_data;
-       fprintf(stdout, "[INFO] %s", msg);
-}
-
-/* -------------------------------------------------------------------------- */
-/**
- * J2K_DUMP MAIN
- */
-/* -------------------------------------------------------------------------- */
-int main(int argc, char *argv[])
-{
-       FILE *fsrc = NULL, *fout = NULL;
-
-       opj_dparameters_t parameters;                   /* Decompression parameters */
-       opj_image_t* image = NULL;                                      /* Image structure */
-       opj_codec_t* l_codec = NULL;                            /* Handle to a decompressor */
-       opj_stream_t *l_stream = NULL;                          /* Stream */
-       opj_codestream_info_v2_t* cstr_info = NULL;
-       opj_codestream_index_t* cstr_index = NULL;
-
-       OPJ_INT32 num_images, imageno;
-       img_fol_t img_fol;
-       dircnt_t *dirptr = NULL;
-
-#ifdef MSD
-       opj_bool l_go_on = OPJ_TRUE;
-       OPJ_UINT32 l_max_data_size = 1000;
-       OPJ_BYTE * l_data = (OPJ_BYTE *) malloc(1000);
-#endif
-
-       /* Set decoding parameters to default values */
-       opj_set_default_decoder_parameters(&parameters);
-
-       /* Initialize img_fol */
-       memset(&img_fol,0,sizeof(img_fol_t));
-
-       /* Parse input and get user encoding parameters */
-       if(parse_cmdline_decoder(argc, argv, &parameters,&img_fol) == 1) {
-               return EXIT_FAILURE;
-       }
-
-       /* Initialize reading of directory */
-       if(img_fol.set_imgdir==1){      
-               int it_image;
-               num_images=get_num_images(img_fol.imgdirpath);
-
-               dirptr=(dircnt_t*)malloc(sizeof(dircnt_t));
-               if(dirptr){
-                       dirptr->filename_buf = (char*)malloc(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 EXIT_FAILURE;
-                       }
-
-                       for(it_image=0;it_image<num_images;it_image++){
-                               dirptr->filename[it_image] = dirptr->filename_buf + it_image*OPJ_PATH_LEN;
-                       }
-               }
-               if(load_images(dirptr,img_fol.imgdirpath)==1){
-                       return EXIT_FAILURE;
-               }
-
-               if (num_images==0){
-                       fprintf(stdout,"Folder is empty\n");
-                       return EXIT_FAILURE;
-               }
-       }else{
-               num_images=1;
-       }
-
-       /* Try to open for writing the output file if necessary */
-       if (parameters.outfile[0] != 0){
-               fout = fopen(parameters.outfile,"w");
-               if (!fout){
-                       fprintf(stderr, "ERROR -> failed to open %s for writing\n", parameters.outfile);
-                       return EXIT_FAILURE;
-               }
-       }
-       else
-               fout = stdout;
-
-       /* Read the header of each image one by one */
-       for(imageno = 0; imageno < num_images ; imageno++){
-
-               fprintf(stderr,"\n");
-
-               if(img_fol.set_imgdir==1){
-                       if (get_next_file(imageno, dirptr,&img_fol, &parameters)) {
-                               fprintf(stderr,"skipping file...\n");
-                               continue;
-                       }
-               }
-
-               /* Read the input file and put it in memory */
-               /* ---------------------------------------- */
-               fsrc = fopen(parameters.infile, "rb");
-               if (!fsrc) {
-                       fprintf(stderr, "ERROR -> failed to open %s for reading\n", parameters.infile);
-                       return EXIT_FAILURE;
-               }
-
-               l_stream = opj_stream_create_default_file_stream(fsrc,1);
-               if (!l_stream){
-                       fclose(fsrc);
-                       fprintf(stderr, "ERROR -> failed to create the stream from the file\n");
-                       return EXIT_FAILURE;
-               }
-
-               /* Read the JPEG2000 stream */
-               /* ------------------------ */
-
-               switch(parameters.decod_format) {
-                       case J2K_CFMT:  /* JPEG-2000 codestream */
-                       {
-                               /* Get a decoder handle */
-                               l_codec = opj_create_decompress(CODEC_J2K);
-                               break;
-                       }
-                       case JP2_CFMT:  /* JPEG 2000 compressed image data */
-                       {
-                               /* Get a decoder handle */
-                               l_codec = opj_create_decompress(CODEC_JP2);
-                               break;
-                       }
-                       case JPT_CFMT:  /* JPEG 2000, JPIP */
-                       {
-                               /* Get a decoder handle */
-                               l_codec = opj_create_decompress(CODEC_JPT);
-                               break;
-                       }
-                       default:
-                               fprintf(stderr, "skipping file..\n");
-                               opj_stream_destroy(l_stream);
-                               continue;
-               }
-
-               /* catch events using our callbacks and give a local context */         
-               opj_set_info_handler(l_codec, info_callback,00);
-               opj_set_warning_handler(l_codec, warning_callback,00);
-               opj_set_error_handler(l_codec, error_callback,00);
-
-               /* Setup the decoder decoding parameters using user parameters */
-               if ( !opj_setup_decoder(l_codec, &parameters) ){
-                       fprintf(stderr, "ERROR -> j2k_dump: failed to setup the decoder\n");
-                       opj_stream_destroy(l_stream);
-                       fclose(fsrc);
-                       opj_destroy_codec(l_codec);
-                       fclose(fout);
-                       return EXIT_FAILURE;
-               }
-
-               /* Read the main header of the codestream and if necessary the JP2 boxes*/
-               if(! opj_read_header(l_stream, l_codec, &image)){
-                       fprintf(stderr, "ERROR -> j2k_dump: failed to read the header\n");
-                       opj_stream_destroy(l_stream);
-                       fclose(fsrc);
-                       opj_destroy_codec(l_codec);
-                       opj_image_destroy(image);
-                       fclose(fout);
-                       return EXIT_FAILURE;
-               }
-
-               opj_dump_codec(l_codec, OPJ_IMG_INFO | OPJ_J2K_MH_INFO | OPJ_J2K_MH_IND, fout );
-
-               cstr_info = opj_get_cstr_info(l_codec);
-
-               cstr_index = opj_get_cstr_index(l_codec);
-
-               /* close the byte stream */
-               opj_stream_destroy(l_stream);
-               fclose(fsrc);
-
-               /* free remaining structures */
-               if (l_codec) {
-                       opj_destroy_codec(l_codec);
-               }
-
-               /* destroy the image header */
-               opj_image_destroy(image);
-
-               /* destroy the codestream index */
-               opj_destroy_cstr_index(&cstr_index);
-
-               /* destroy the codestream info */
-               opj_destroy_cstr_info(&cstr_info);
-
-       }
-
-       /* Close the output file */
-       fclose(fout);
-
-  return EXIT_SUCCESS;
-}
diff --git a/src/bin/jp2/j2k_to_image.c b/src/bin/jp2/j2k_to_image.c
deleted file mode 100644 (file)
index 7edb3c9..0000000
+++ /dev/null
@@ -1,975 +0,0 @@
-/*
- * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2007, Professor Benoit Macq
- * Copyright (c) 2001-2003, David Janssens
- * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
- * Copyright (c) 2005, Herve Drolon, FreeImage Team
- * Copyright (c) 2006-2007, Parvatha Elangovan
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include "opj_config.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
-
-#ifdef _WIN32
-#include "windirent.h"
-#else
-#include <dirent.h>
-#endif /* _WIN32 */
-
-#ifdef _WIN32
-#include <windows.h>
-#define strcasecmp _stricmp
-#define strncasecmp _strnicmp
-#else
-#include <strings.h>
-#endif /* _WIN32 */
-
-#include "openjpeg.h"
-#include "opj_getopt.h"
-#include "convert.h"
-#include "index.h"
-
-#ifdef HAVE_LIBLCMS2
-#include <lcms2.h>
-#endif
-#ifdef HAVE_LIBLCMS1
-#include <lcms.h>
-#endif
-#include "color.h"
-
-#include "format_defs.h"
-
-typedef struct dircnt{
-       /** Buffer for holding images read from Directory*/
-       char *filename_buf;
-       /** Pointer to the buffer*/
-       char **filename;
-}dircnt_t;
-
-
-typedef struct img_folder{
-       /** The directory path of the folder containing input images*/
-       char *imgdirpath;
-       /** Output format*/
-       const char *out_format;
-       /** Enable option*/
-       char set_imgdir;
-       /** Enable Cod Format for output*/
-       char set_out_format;
-
-}img_fol_t;
-
-/* -------------------------------------------------------------------------- */
-/* Declarations                                                               */
-int get_num_images(char *imgdirpath);
-int load_images(dircnt_t *dirptr, char *imgdirpath);
-int get_file_format(const char *filename);
-char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_dparameters_t *parameters);
-static int infile_format(const char *fname);
-
-int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,img_fol_t *img_fol, char *indexfilename);
-int parse_DA_values( char* inArg, unsigned int *DA_x0, unsigned int *DA_y0, unsigned int *DA_x1, unsigned int *DA_y1);
-
-/* -------------------------------------------------------------------------- */
-void decode_help_display(void) {
-       fprintf(stdout,"HELP for j2k_to_image\n----\n\n");
-       fprintf(stdout,"- the -h option displays this help information on screen\n\n");
-
-/* UniPG>> */
-       fprintf(stdout,"List of parameters for the JPEG 2000 "
-#ifdef USE_JPWL
-               "+ JPWL "
-#endif /* USE_JPWL */
-               "decoder:\n");
-/* <<UniPG */
-       fprintf(stdout,"\n");
-       fprintf(stdout,"\n");
-       fprintf(stdout,"  -ImgDir \n");
-       fprintf(stdout,"        Image file Directory path \n");
-       fprintf(stdout,"  -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, PNG, BMP, TIF, RAW and TGA formats\n");
-       fprintf(stdout,"  -i <compressed file>\n");
-       fprintf(stdout,"    REQUIRED only if an Input image directory not specified\n");
-       fprintf(stdout,"    Currently accepts J2K-files, JP2-files and JPT-files. The file type\n");
-       fprintf(stdout,"    is identified based on its suffix.\n");
-       fprintf(stdout,"  -o <decompressed file>\n");
-       fprintf(stdout,"    REQUIRED\n");
-       fprintf(stdout,"    Currently accepts PGM, PPM, PNM, PGX, PNG, BMP, TIF, RAW and TGA files\n");
-       fprintf(stdout,"    Binary data is written to the file (not ascii). If a PGX\n");
-       fprintf(stdout,"    filename is given, there will be as many output files as there are\n");
-       fprintf(stdout,"    components: an indice starting from 0 will then be appended to the\n");
-       fprintf(stdout,"    output filename, just before the \"pgx\" extension. If a PGM filename\n");
-       fprintf(stdout,"    is given and there are more than one component, only the first component\n");
-       fprintf(stdout,"    will be written to the file.\n");
-       fprintf(stdout,"  -r <reduce factor>\n");
-       fprintf(stdout,"    Set the number of highest resolution levels to be discarded. The\n");
-       fprintf(stdout,"    image resolution is effectively divided by 2 to the power of the\n");
-       fprintf(stdout,"    number of discarded levels. The reduce factor is limited by the\n");
-       fprintf(stdout,"    smallest total number of decomposition levels among tiles.\n");
-       fprintf(stdout,"  -l <number of quality layers to decode>\n");
-       fprintf(stdout,"    Set the maximum number of quality layers to decode. If there are\n");
-       fprintf(stdout,"    less quality layers than the specified number, all the quality layers\n");
-       fprintf(stdout,"    are decoded.\n");
-       fprintf(stdout,"  -x  \n"); 
-       fprintf(stdout,"    Create an index file *.Idx (-x index_name.Idx) \n");
-       fprintf(stdout,"  -d <x0,y0,x1,y1>\n");
-       fprintf(stdout,"    OPTIONAL\n");
-       fprintf(stdout,"    Decoding area\n");
-       fprintf(stdout,"    By default all the image is decoded.\n");
-       fprintf(stdout,"  -t <tile_number>\n");
-       fprintf(stdout,"    OPTIONAL\n");
-       fprintf(stdout,"    Set the tile number of the decoded tile. Follow the JPEG2000 convention from left-up to bottom-up\n");
-       fprintf(stdout,"    By default all tiles are decoded.\n");
-       fprintf(stdout,"\n");
-/* UniPG>> */
-#ifdef USE_JPWL
-       fprintf(stdout,"  -W <options>\n");
-       fprintf(stdout,"    Activates the JPWL correction capability, if the codestream complies.\n");
-       fprintf(stdout,"    Options can be a comma separated list of <param=val> tokens:\n");
-       fprintf(stdout,"    c, c=numcomps\n");
-       fprintf(stdout,"       numcomps is the number of expected components in the codestream\n");
-       fprintf(stdout,"       (search of first EPB rely upon this, default is %d)\n", JPWL_EXPECTED_COMPONENTS);
-#endif /* USE_JPWL */
-/* <<UniPG */
-       fprintf(stdout,"\n");
-}
-
-/* -------------------------------------------------------------------------- */
-
-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(const char *filename) {
-       unsigned int i;
-       static const char *extension[] = {"pgx", "pnm", "pgm", "ppm", "bmp","tif", "raw", "rawl", "tga", "png", "j2k", "jp2", "jpt", "j2c", "jpc" };
-       static const int format[] = { PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, TIF_DFMT, RAW_DFMT, RAWL_DFMT, TGA_DFMT, PNG_DFMT, J2K_CFMT, JP2_CFMT, JPT_CFMT, J2K_CFMT, J2K_CFMT };
-       char * ext = strrchr(filename, '.');
-       if (ext == NULL)
-               return -1;
-       ext++;
-       if(ext) {
-               for(i = 0; i < sizeof(format)/sizeof(*format); i++) {
-                       if(strcasecmp(ext, extension[i]) == 0) {
-                               return format[i];
-                       }
-               }
-       }
-
-       return -1;
-}
-
-/* -------------------------------------------------------------------------- */
-char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_dparameters_t *parameters){
-       char image_filename[OPJ_PATH_LEN], infilename[OPJ_PATH_LEN],outfilename[OPJ_PATH_LEN],temp_ofname[OPJ_PATH_LEN];
-       char *temp_p, temp1[OPJ_PATH_LEN]="";
-
-       strcpy(image_filename,dirptr->filename[imageno]);
-       fprintf(stderr,"File Number %d \"%s\"\n",imageno,image_filename);
-       parameters->decod_format = infile_format(image_filename);
-       if (parameters->decod_format == -1)
-               return 1;
-       sprintf(infilename,"%s/%s",img_fol->imgdirpath,image_filename);
-       strncpy(parameters->infile, infilename, sizeof(infilename));
-
-       /*Set output file*/
-       strcpy(temp_ofname,strtok(image_filename,"."));
-       while((temp_p = strtok(NULL,".")) != NULL){
-               strcat(temp_ofname,temp1);
-               sprintf(temp1,".%s",temp_p);
-       }
-       if(img_fol->set_out_format==1){
-               sprintf(outfilename,"%s/%s.%s",img_fol->imgdirpath,temp_ofname,img_fol->out_format);
-               strncpy(parameters->outfile, outfilename, sizeof(outfilename));
-       }
-       return 0;
-}
-
-/* -------------------------------------------------------------------------- */
-#define JP2_RFC3745_MAGIC "\x00\x00\x00\x0c\x6a\x50\x20\x20\x0d\x0a\x87\x0a"
-#define JP2_MAGIC "\x0d\x0a\x87\x0a"
-/* position 45: "\xff\x52" */
-#define J2K_CODESTREAM_MAGIC "\xff\x4f\xff\x51"
-
-static int infile_format(const char *fname)
-{
-       FILE *reader;
-       const char *s, *magic_s;
-       int ext_format, magic_format;
-       unsigned char buf[12];
-       unsigned int l_nb_read;
-
-       reader = fopen(fname, "rb");
-
-       if (reader == NULL)
-               return -2;
-
-       memset(buf, 0, 12);
-       l_nb_read = fread(buf, 1, 12, reader);
-       fclose(reader);
-       if (l_nb_read != 12)
-               return -1;
-
-
-
-       ext_format = get_file_format(fname);
-
-       if (ext_format == JPT_CFMT)
-               return JPT_CFMT;
-
-       if (memcmp(buf, JP2_RFC3745_MAGIC, 12) == 0 || memcmp(buf, JP2_MAGIC, 4) == 0) {
-               magic_format = JP2_CFMT;
-               magic_s = ".jp2";
-       }
-       else if (memcmp(buf, J2K_CODESTREAM_MAGIC, 4) == 0) {
-               magic_format = J2K_CFMT;
-               magic_s = ".j2k or .jpc or .j2c";
-       }
-       else
-               return -1;
-
-       if (magic_format == ext_format)
-               return ext_format;
-
-       s = fname + strlen(fname) - 4;
-
-       fputs("\n===========================================\n", stderr);
-       fprintf(stderr, "The extension of this file is incorrect.\n"
-                                       "FOUND %s. SHOULD BE %s\n", s, magic_s);
-       fputs("===========================================\n", stderr);
-
-       return magic_format;
-}
-
-/* -------------------------------------------------------------------------- */
-/**
- * Parse the command line
- */
-/* -------------------------------------------------------------------------- */
-int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,img_fol_t *img_fol, char *indexfilename) {
-       /* parse the command line */
-       int totlen, c;
-       opj_option_t long_option[]={
-               {"ImgDir",REQ_ARG, NULL ,'y'},
-               {"OutFor",REQ_ARG, NULL ,'O'},
-       };
-
-       const char optlist[] = "i:o:r:l:x:d:t:"
-
-/* UniPG>> */
-#ifdef USE_JPWL
-                                       "W:"
-#endif /* USE_JPWL */
-/* <<UniPG */
-                       "h"             ;
-       totlen=sizeof(long_option);
-       img_fol->set_out_format = 0;
-       do {
-               c = opj_getopt_long(argc, argv,optlist,long_option,totlen);
-               if (c == -1)
-                       break;
-               switch (c) {
-                       case 'i':                       /* input file */
-                       {
-                               char *infile = opj_optarg;
-                               parameters->decod_format = infile_format(infile);
-                               switch(parameters->decod_format) {
-                                       case J2K_CFMT:
-                                               break;
-                                       case JP2_CFMT:
-                                               break;
-                                       case JPT_CFMT:
-                                               break;
-                                        case -2:
-                                               fprintf(stderr, 
-                                                       "!! infile cannot be read: %s !!\n\n", 
-                                                       infile);
-                                               return 1;
-                                       default:
-                                               fprintf(stderr, 
-                                                       "!! Unrecognized format for infile: %s [accept only *.j2k, *.jp2, *.jpc or *.jpt] !!\n\n", 
-                                                       infile);
-                                               return 1;
-                               }
-                               strncpy(parameters->infile, infile, sizeof(parameters->infile)-1);
-                       }
-                       break;
-                               
-                               /* ----------------------------------------------------- */
-
-                       case 'o':                       /* output file */
-                       {
-                               char *outfile = opj_optarg;
-                               parameters->cod_format = get_file_format(outfile);
-                               switch(parameters->cod_format) {
-                                       case PGX_DFMT:
-                                               break;
-                                       case PXM_DFMT:
-                                               break;
-                                       case BMP_DFMT:
-                                               break;
-                                       case TIF_DFMT:
-                                               break;
-                                       case RAW_DFMT:
-                                               break;
-                                       case RAWL_DFMT:
-                                               break;
-                                       case TGA_DFMT:
-                                               break;
-                                       case PNG_DFMT:
-                                               break;
-                                       default:
-                                               fprintf(stderr, "Unknown output format image %s [only *.pnm, *.pgm, *.ppm, *.pgx, *.bmp, *.tif, *.raw or *.tga]!! \n", outfile);
-                                               return 1;
-                               }
-                               strncpy(parameters->outfile, outfile, sizeof(parameters->outfile)-1);
-                       }
-                       break;
-                       
-                               /* ----------------------------------------------------- */
-
-                       case 'O':                       /* output format */
-                       {
-                               char outformat[50];
-                               char *of = opj_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;
-                                       case RAW_DFMT:
-                                               img_fol->out_format = "raw";
-                                               break;
-                                       case RAWL_DFMT:
-                                               img_fol->out_format = "rawl";
-                                               break;
-                                       case TGA_DFMT:
-                                               img_fol->out_format = "raw";
-                                               break;
-                                       case PNG_DFMT:
-                                               img_fol->out_format = "png";
-                                               break;
-                                       default:
-                                               fprintf(stderr, "Unknown output format image %s [only *.pnm, *.pgm, *.ppm, *.pgx, *.bmp, *.tif, *.raw or *.tga]!! \n", outformat);
-                                               return 1;
-                                               break;
-                               }
-                       }
-                       break;
-
-                               /* ----------------------------------------------------- */
-
-
-                       case 'r':               /* reduce option */
-                       {
-                               sscanf(opj_optarg, "%d", &parameters->cp_reduce);
-                       }
-                       break;
-                       
-                               /* ----------------------------------------------------- */
-      
-
-                       case 'l':               /* layering option */
-                       {
-                               sscanf(opj_optarg, "%d", &parameters->cp_layer);
-                       }
-                       break;
-                       
-                               /* ----------------------------------------------------- */
-
-                       case 'h':                       /* display an help description */
-                               decode_help_display();
-                               return 1;                               
-
-                               /* ------------------------------------------------------ */
-
-                       case 'y':                       /* Image Directory path */
-                               {
-                                       img_fol->imgdirpath = (char*)malloc(strlen(opj_optarg) + 1);
-                                       strcpy(img_fol->imgdirpath,opj_optarg);
-                                       img_fol->set_imgdir=1;
-                               }
-                               break;
-
-                               /* ----------------------------------------------------- */
-
-                       case 'd':               /* Input decode ROI */
-                       {
-                               int size_optarg = (int)strlen(opj_optarg) + 1;
-                               char *ROI_values = (char*) malloc(size_optarg);
-                               ROI_values[0] = '\0';
-                               strncpy(ROI_values, opj_optarg, strlen(opj_optarg));
-                               ROI_values[strlen(opj_optarg)] = '\0';
-                               /*printf("ROI_values = %s [%d / %d]\n", ROI_values, strlen(ROI_values), size_optarg ); */
-                               parse_DA_values( ROI_values, &parameters->DA_x0, &parameters->DA_y0, &parameters->DA_x1, &parameters->DA_y1);
-
-                               free(ROI_values);
-                       }
-                       break;
-
-                       /* ----------------------------------------------------- */
-
-                       case 't':               /* Input tile index */
-                       {
-                               sscanf(opj_optarg, "%d", &parameters->tile_index);
-                               parameters->nb_tile_to_decode = 1;
-                       }
-                       break;
-
-                               /* ----------------------------------------------------- */                                                             
-
-                       case 'x':                       /* Creation of index file */
-                               {
-                                       char *index = opj_optarg;
-                                       strncpy(indexfilename, index, OPJ_PATH_LEN);
-                               }
-                               break;
-                               /* ----------------------------------------------------- */
-                               /* UniPG>> */
-#ifdef USE_JPWL
-                       
-                       case 'W':                       /* activate JPWL correction */
-                       {
-                               char *token = NULL;
-
-                               token = strtok(opj_optarg, ",");
-                               while(token != NULL) {
-
-                                       /* search expected number of components */
-                                       if (*token == 'c') {
-
-                                               static int compno;
-
-                                               compno = JPWL_EXPECTED_COMPONENTS; /* predefined no. of components */
-
-                                               if(sscanf(token, "c=%d", &compno) == 1) {
-                                                       /* Specified */
-                                                       if ((compno < 1) || (compno > 256)) {
-                                                               fprintf(stderr, "ERROR -> invalid number of components c = %d\n", compno);
-                                                               return 1;
-                                                       }
-                                                       parameters->jpwl_exp_comps = compno;
-
-                                               } else if (!strcmp(token, "c")) {
-                                                       /* default */
-                                                       parameters->jpwl_exp_comps = compno; /* auto for default size */
-
-                                               } else {
-                                                       fprintf(stderr, "ERROR -> invalid components specified = %s\n", token);
-                                                       return 1;
-                                               };
-                                       }
-
-                                       /* search maximum number of tiles */
-                                       if (*token == 't') {
-
-                                               static int tileno;
-
-                                               tileno = JPWL_MAXIMUM_TILES; /* maximum no. of tiles */
-
-                                               if(sscanf(token, "t=%d", &tileno) == 1) {
-                                                       /* Specified */
-                                                       if ((tileno < 1) || (tileno > JPWL_MAXIMUM_TILES)) {
-                                                               fprintf(stderr, "ERROR -> invalid number of tiles t = %d\n", tileno);
-                                                               return 1;
-                                                       }
-                                                       parameters->jpwl_max_tiles = tileno;
-
-                                               } else if (!strcmp(token, "t")) {
-                                                       /* default */
-                                                       parameters->jpwl_max_tiles = tileno; /* auto for default size */
-
-                                               } else {
-                                                       fprintf(stderr, "ERROR -> invalid tiles specified = %s\n", token);
-                                                       return 1;
-                                               };
-                                       }
-
-                                       /* next token or bust */
-                                       token = strtok(NULL, ",");
-                               };
-                               parameters->jpwl_correct = OPJ_TRUE;
-                               fprintf(stdout, "JPWL correction capability activated\n");
-                               fprintf(stdout, "- expecting %d components\n", parameters->jpwl_exp_comps);
-                       }
-                       break;  
-#endif /* USE_JPWL */
-/* <<UniPG */            
-
-                               /* ----------------------------------------------------- */
-                       
-                       default:
-                               fprintf(stderr,"WARNING -> this option is not valid \"-%c %s\"\n",c, opj_optarg);
-                               break;
-               }
-       }while(c != -1);
-
-       /* check for possible errors */
-       if(img_fol->set_imgdir==1){
-               if(!(parameters->infile[0]==0)){
-                       fprintf(stderr, "Error: options -ImgDir and -i cannot be used together !!\n");
-                       return 1;
-               }
-               if(img_fol->set_out_format == 0){
-                       fprintf(stderr, "Error: When -ImgDir is used, -OutFor <FORMAT> must be used !!\n");
-                       fprintf(stderr, "Only one format allowed! Valid format PGM, PPM, PNM, PGX, BMP, TIF, RAW and TGA!!\n");
-                       return 1;
-               }
-               if(!((parameters->outfile[0] == 0))){
-                       fprintf(stderr, "Error: options -ImgDir and -o cannot be used together !!\n");
-                       return 1;
-               }
-       }else{
-               if((parameters->infile[0] == 0) || (parameters->outfile[0] == 0)) {
-                       fprintf(stderr, "Example: %s -i image.j2k -o image.pgm\n",argv[0]);
-                       fprintf(stderr, "    Try: %s -h\n",argv[0]);
-                       return 1;
-               }
-       }
-
-       return 0;
-}
-
-/* -------------------------------------------------------------------------- */
-/**
- * Parse decoding area input values
- * separator = ","
- */
-/* -------------------------------------------------------------------------- */
-int parse_DA_values( char* inArg, unsigned int *DA_x0, unsigned int *DA_y0, unsigned int *DA_x1, unsigned int *DA_y1)
-{
-       int it = 0;
-       int values[4];
-       char delims[] = ",";
-       char *result = NULL;
-       result = strtok( inArg, delims );
-
-       while( (result != NULL) && (it < 4 ) ) {
-               values[it] = atoi(result);
-               result = strtok( NULL, delims );
-               it++;
-       }
-
-       if (it != 4) {
-               return EXIT_FAILURE;
-       }
-       else{
-               *DA_x0 = values[0]; *DA_y0 = values[1];
-               *DA_x1 = values[2]; *DA_y1 = values[3];
-               return EXIT_SUCCESS;
-       }
-}
-
-/* -------------------------------------------------------------------------- */
-
-/**
-sample error callback expecting a FILE* client object
-*/
-void error_callback(const char *msg, void *client_data) {
-       (void)client_data;
-       fprintf(stdout, "[ERROR] %s", msg);
-}
-/**
-sample warning callback expecting a FILE* client object
-*/
-void warning_callback(const char *msg, void *client_data) {
-       (void)client_data;
-       fprintf(stdout, "[WARNING] %s", msg);
-}
-/**
-sample debug callback expecting no client object
-*/
-void info_callback(const char *msg, void *client_data) {
-       (void)client_data;
-       fprintf(stdout, "[INFO] %s", msg);
-}
-
-/* -------------------------------------------------------------------------- */
-/**
- * J2K_TO_IMAGE MAIN
- */
-/* -------------------------------------------------------------------------- */
-int main(int argc, char **argv)
-{
-       FILE *fsrc = NULL;
-
-       opj_dparameters_t parameters;                   /* decompression parameters */
-       opj_image_t* image = NULL;
-       opj_stream_t *l_stream = NULL;                          /* Stream */
-       opj_codec_t* l_codec = NULL;                            /* Handle to a decompressor */
-       opj_codestream_index_t* cstr_index = NULL;
-
-       char indexfilename[OPJ_PATH_LEN];       /* index file name */
-
-       OPJ_INT32 num_images, imageno;
-       img_fol_t img_fol;
-       dircnt_t *dirptr = NULL;
-
-       /* set decoding parameters to default values */
-       opj_set_default_decoder_parameters(&parameters);
-
-       /* FIXME Initialize indexfilename and img_fol */
-       *indexfilename = 0;
-
-       /* Initialize img_fol */
-       memset(&img_fol,0,sizeof(img_fol_t));
-
-       /* parse input and get user encoding parameters */
-       if(parse_cmdline_decoder(argc, argv, &parameters,&img_fol, indexfilename) == 1) {
-               return EXIT_FAILURE;
-       }
-
-       /* Initialize reading of directory */
-       if(img_fol.set_imgdir==1){      
-               int it_image;
-               num_images=get_num_images(img_fol.imgdirpath);
-
-               dirptr=(dircnt_t*)malloc(sizeof(dircnt_t));
-               if(dirptr){
-                       dirptr->filename_buf = (char*)malloc(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 EXIT_FAILURE;
-                       }
-                       for(it_image=0;it_image<num_images;it_image++){
-                               dirptr->filename[it_image] = dirptr->filename_buf + it_image*OPJ_PATH_LEN;
-                       }
-               }
-               if(load_images(dirptr,img_fol.imgdirpath)==1){
-                       return EXIT_FAILURE;
-               }
-               if (num_images==0){
-                       fprintf(stdout,"Folder is empty\n");
-                       return EXIT_FAILURE;
-               }
-       }else{
-               num_images=1;
-       }
-
-       /*Decoding image one by one*/
-       for(imageno = 0; imageno < num_images ; imageno++)      {
-
-               fprintf(stderr,"\n");
-
-               if(img_fol.set_imgdir==1){
-                       if (get_next_file(imageno, dirptr,&img_fol, &parameters)) {
-                               fprintf(stderr,"skipping file...\n");
-                               continue;
-                       }
-               }
-
-               /* read the input file and put it in memory */
-               /* ---------------------------------------- */
-               fsrc = fopen(parameters.infile, "rb");
-               if (!fsrc) {
-                       fprintf(stderr, "ERROR -> failed to open %s for reading\n", parameters.infile);
-                       return EXIT_FAILURE;
-               }
-
-               l_stream = opj_stream_create_default_file_stream(fsrc,1);
-               if (!l_stream){
-                       fclose(fsrc);
-                       fprintf(stderr, "ERROR -> failed to create the stream from the file\n");
-                       return EXIT_FAILURE;
-               }
-
-               /* decode the JPEG2000 stream */
-               /* ---------------------- */
-
-               switch(parameters.decod_format) {
-                       case J2K_CFMT:  /* JPEG-2000 codestream */
-                       {
-                               /* Get a decoder handle */
-                               l_codec = opj_create_decompress(CODEC_J2K);
-                               break;
-                       }
-                       case JP2_CFMT:  /* JPEG 2000 compressed image data */
-                       {
-                               /* Get a decoder handle */
-                               l_codec = opj_create_decompress(CODEC_JP2);
-                               break;
-                       }
-                       case JPT_CFMT:  /* JPEG 2000, JPIP */
-                       {
-                               /* Get a decoder handle */
-                               l_codec = opj_create_decompress(CODEC_JPT);
-                               break;
-                       }
-                       default:
-                               fprintf(stderr, "skipping file..\n");
-                               opj_stream_destroy(l_stream);
-                               continue;
-               }
-
-               /* catch events using our callbacks and give a local context */         
-               opj_set_info_handler(l_codec, info_callback,00);
-               opj_set_warning_handler(l_codec, warning_callback,00);
-               opj_set_error_handler(l_codec, error_callback,00);
-
-               /* Setup the decoder decoding parameters using user parameters */
-               if ( !opj_setup_decoder(l_codec, &parameters) ){
-                       fprintf(stderr, "ERROR -> j2k_dump: failed to setup the decoder\n");
-                       opj_stream_destroy(l_stream);
-                       fclose(fsrc);
-                       opj_destroy_codec(l_codec);
-                       return EXIT_FAILURE;
-               }
-
-
-               /* Read the main header of the codestream and if necessary the JP2 boxes*/
-               if(! opj_read_header(l_stream, l_codec, &image)){
-                       fprintf(stderr, "ERROR -> j2k_to_image: failed to read the header\n");
-                       opj_stream_destroy(l_stream);
-                       fclose(fsrc);
-                       opj_destroy_codec(l_codec);
-                       opj_image_destroy(image);
-                       return EXIT_FAILURE;
-               }
-
-               if (!parameters.nb_tile_to_decode) {
-                       /* Optional if you want decode the entire image */
-                       if (!opj_set_decode_area(l_codec, image, parameters.DA_x0,
-                                       parameters.DA_y0, parameters.DA_x1, parameters.DA_y1)){
-                               fprintf(stderr, "ERROR -> j2k_to_image: failed to set the decoded area\n");
-                               opj_stream_destroy(l_stream);
-                               opj_destroy_codec(l_codec);
-                               opj_image_destroy(image);
-                               fclose(fsrc);
-                               return EXIT_FAILURE;
-                       }
-
-                       /* Get the decoded image */
-                       if (!(opj_decode(l_codec, l_stream, image) && opj_end_decompress(l_codec,       l_stream))) {
-                               fprintf(stderr,"ERROR -> j2k_to_image: failed to decode image!\n");
-                               opj_destroy_codec(l_codec);
-                               opj_stream_destroy(l_stream);
-                               opj_image_destroy(image);
-                               fclose(fsrc);
-                               return EXIT_FAILURE;
-                       }
-               }
-               else {
-
-                       /* It is just here to illustrate how to use the resolution after set parameters */
-                       /*if (!opj_set_decoded_resolution_factor(l_codec, 5)) {
-                               fprintf(stderr, "ERROR -> j2k_to_image: failed to set the resolution factor tile!\n");
-                               opj_destroy_codec(l_codec);
-                               opj_stream_destroy(l_stream);
-                               opj_image_destroy(image);
-                               fclose(fsrc);
-                               return EXIT_FAILURE;
-                       }*/
-
-                       if (!opj_get_decoded_tile(l_codec, l_stream, image, parameters.tile_index)) {
-                               fprintf(stderr, "ERROR -> j2k_to_image: failed to decode tile!\n");
-                               opj_destroy_codec(l_codec);
-                               opj_stream_destroy(l_stream);
-                               opj_image_destroy(image);
-                               fclose(fsrc);
-                               return EXIT_FAILURE;
-                       }
-                       fprintf(stdout, "tile %d is decoded!\n\n", parameters.tile_index);
-               }
-
-               /* Close the byte stream */
-               opj_stream_destroy(l_stream);
-               fclose(fsrc);
-
-               if(image->color_space == CLRSPC_SYCC){
-                       color_sycc_to_rgb(image); /* FIXME */
-               }
-
-               if(image->icc_profile_buf) {
-#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
-                       color_apply_icc_profile(image); /* FIXME */
-#endif
-                       free(image->icc_profile_buf);
-                       image->icc_profile_buf = NULL; image->icc_profile_len = 0;
-               }
-
-               /* create output image */
-               /* ------------------- */
-               switch (parameters.cod_format) {
-               case PXM_DFMT:                  /* PNM PGM PPM */
-                       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 */
-                       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 */
-                       if(imagetobmp(image, parameters.outfile)){
-                               fprintf(stdout,"Outfile %s not generated\n",parameters.outfile);
-                       }
-                       else {
-                               fprintf(stdout,"Generated Outfile %s\n",parameters.outfile);
-                       }
-                       break;
-#ifdef HAVE_LIBTIFF
-               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;
-#endif /* HAVE_LIBTIFF */
-               case RAW_DFMT:                  /* RAW */
-                       if(imagetoraw(image, parameters.outfile)){
-                               fprintf(stdout,"Error generating raw file. Outfile %s not generated\n",parameters.outfile);
-                       }
-                       else {
-                               fprintf(stdout,"Successfully generated Outfile %s\n",parameters.outfile);
-                       }
-                       break;
-
-               case RAWL_DFMT:                 /* RAWL */
-                       if(imagetorawl(image, parameters.outfile)){
-                               fprintf(stdout,"Error generating rawl file. Outfile %s not generated\n",parameters.outfile);
-                       }
-                       else {
-                               fprintf(stdout,"Successfully generated Outfile %s\n",parameters.outfile);
-                       }
-                       break;
-
-               case TGA_DFMT:                  /* TGA */
-                       if(imagetotga(image, parameters.outfile)){
-                               fprintf(stdout,"Error generating tga file. Outfile %s not generated\n",parameters.outfile);
-                       }
-                       else {
-                               fprintf(stdout,"Successfully generated Outfile %s\n",parameters.outfile);
-                       }
-                       break;
-#ifdef HAVE_LIBPNG
-               case PNG_DFMT:                  /* PNG */
-                       if(imagetopng(image, parameters.outfile)){
-                               fprintf(stdout,"Error generating png file. Outfile %s not generated\n",parameters.outfile);
-                       }
-                       else {
-                               fprintf(stdout,"Successfully generated Outfile %s\n",parameters.outfile);
-                       }
-                       break;
-#endif /* HAVE_LIBPNG */
-/* Can happen if output file is TIFF or PNG
- * and HAVE_LIBTIF or HAVE_LIBPNG is undefined
-*/
-                       default:
-                               fprintf(stderr,"Outfile %s not generated\n",parameters.outfile);
-               }
-
-               /* free remaining structures */
-               if (l_codec) {
-                       opj_destroy_codec(l_codec);
-               }
-
-
-               /* free image data structure */
-               opj_image_destroy(image);
-
-               /* destroy the codestream index */
-               opj_destroy_cstr_index(&cstr_index);
-
-       }
-       return EXIT_SUCCESS;
-}
-/*end main*/
-
-
-
-
diff --git a/src/bin/jp2/opj_compress.c b/src/bin/jp2/opj_compress.c
new file mode 100644 (file)
index 0000000..343ea55
--- /dev/null
@@ -0,0 +1,1901 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * Copyright (c) 2006-2007, Parvatha Elangovan
+ * Copyright (c) 2008, Jerome Fimes, Communications & Systemes <jerome.fimes@c-s.fr>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <math.h>
+#include <assert.h>
+
+#ifdef _WIN32
+#include "windirent.h"
+#else
+#include <dirent.h>
+#endif /* _WIN32 */
+
+#ifdef _WIN32
+#include <windows.h>
+#define strcasecmp _stricmp
+#define strncasecmp _strnicmp
+#else
+#include <strings.h>
+#endif /* _WIN32 */
+
+#include "opj_config.h"
+#include "openjpeg.h"
+#include "opj_getopt.h"
+#include "convert.h"
+#include "index.h"
+
+#include "format_defs.h"
+
+#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;
+       /** User specified rate stored in case of cinema option*/
+       float *rates;
+}img_fol_t;
+
+void encode_help_display(void) {
+       fprintf(stdout,"HELP for image_to_j2k\n----\n\n");
+       fprintf(stdout,"- the -h option displays this help information on screen\n\n");
+
+/* UniPG>> */
+       fprintf(stdout,"List of parameters for the JPEG 2000 "
+#ifdef USE_JPWL
+               "+ JPWL "
+#endif /* USE_JPWL */
+               "encoder:\n");
+/* <<UniPG */
+       fprintf(stdout,"\n");
+       fprintf(stdout,"REMARKS:\n");
+       fprintf(stdout,"---------\n");
+       fprintf(stdout,"\n");
+       fprintf(stdout,"The markers written to the main_header are : SOC SIZ COD QCD COM.\n");
+       fprintf(stdout,"COD and QCD never appear in the tile_header.\n");
+       fprintf(stdout,"\n");
+       fprintf(stdout,"By default:\n");
+       fprintf(stdout,"------------\n");
+       fprintf(stdout,"\n");
+       fprintf(stdout," * Lossless\n");
+       fprintf(stdout," * 1 tile\n");
+       fprintf(stdout," * Size of precinct : 2^15 x 2^15 (means 1 precinct)\n");
+       fprintf(stdout," * Size of code-block : 64 x 64\n");
+       fprintf(stdout," * Number of resolutions: 6\n");
+       fprintf(stdout," * No SOP marker in the codestream\n");
+       fprintf(stdout," * No EPH marker in the codestream\n");
+       fprintf(stdout," * No sub-sampling in x or y direction\n");
+       fprintf(stdout," * No mode switch activated\n");
+       fprintf(stdout," * Progression order: LRCP\n");
+       fprintf(stdout," * No index file\n");
+       fprintf(stdout," * No ROI upshifted\n");
+       fprintf(stdout," * No offset of the origin of the image\n");
+       fprintf(stdout," * No offset of the origin of the tiles\n");
+       fprintf(stdout," * Reversible DWT 5-3\n");
+/* UniPG>> */
+#ifdef USE_JPWL
+       fprintf(stdout," * No JPWL protection\n");
+#endif /* USE_JPWL */
+/* <<UniPG */
+       fprintf(stdout,"\n");
+       fprintf(stdout,"Parameters:\n");
+       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 PBM, PGM, PPM, PNM, PAM, PGX, PNG, BMP, TIF, RAW, RAWL and TGA formats\n");
+       fprintf(stdout,"\n");
+       fprintf(stdout,"-i           : source file  (-i source.pnm also *pbm, *.pgm, *.ppm, *.pam, *.pgx, *png, *.bmp, *.tif, *.raw, *.tga) \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");
+       fprintf(stdout,"Optional Parameters:\n");
+       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");
+       fprintf(stdout,"                   Example: -r 20,10,1 means quality 1: compress 20x, \n");
+       fprintf(stdout,"                     quality 2: compress 10x and quality 3: compress lossless\n");
+       fprintf(stdout,"\n");
+       fprintf(stdout,"               (options -r and -q cannot be used together)\n ");
+       fprintf(stdout,"\n");
+
+       fprintf(stdout,"-q           : different psnr for successive layers (-q 30,40,50) \n ");
+
+       fprintf(stdout,"               (options -r and -q cannot be used together)\n ");
+
+       fprintf(stdout,"\n");
+       fprintf(stdout,"-n           : number of resolutions (-n 3) \n");
+       fprintf(stdout,"\n");
+       fprintf(stdout,"-b           : size of code block (-b 32,32) \n");
+       fprintf(stdout,"\n");
+       fprintf(stdout,"-c           : size of precinct (-c 128,128) \n");
+       fprintf(stdout,"\n");
+       fprintf(stdout,"-t           : size of tile (-t 512,512) \n");
+       fprintf(stdout,"\n");
+       fprintf(stdout,"-p           : progression order (-p LRCP) [LRCP, RLCP, RPCL, PCRL, CPRL] \n");
+       fprintf(stdout,"\n");
+       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");
+       fprintf(stdout,"\n");
+       fprintf(stdout,"-M           : mode switch (-M 3) [1=BYPASS(LAZY) 2=RESET 4=RESTART(TERMALL)\n");
+       fprintf(stdout,"                 8=VSC 16=ERTERM(SEGTERM) 32=SEGMARK(SEGSYM)] \n");
+       fprintf(stdout,"                 Indicate multiple modes by adding their values. \n");
+       fprintf(stdout,"                 ex: RESTART(4) + RESET(2) + SEGMARK(32) = -M 38\n");
+       fprintf(stdout,"\n");
+       fprintf(stdout,"-TP          : devide packets of every tile into tile-parts (-TP R) [R, L, C]\n");
+       fprintf(stdout,"\n");
+       fprintf(stdout,"-x           : create an index file *.Idx (-x index_name.Idx) \n");
+       fprintf(stdout,"\n");
+       fprintf(stdout,"-ROI         : c=%%d,U=%%d : quantization indices upshifted \n");
+       fprintf(stdout,"               for component c=%%d [%%d = 0,1,2]\n");
+       fprintf(stdout,"               with a value of U=%%d [0 <= %%d <= 37] (i.e. -ROI c=0,U=25) \n");
+       fprintf(stdout,"\n");
+       fprintf(stdout,"-d           : offset of the origin of the image (-d 150,300) \n");
+       fprintf(stdout,"\n");
+       fprintf(stdout,"-T           : offset of the origin of the tiles (-T 100,75) \n");
+       fprintf(stdout,"\n");
+       fprintf(stdout,"-I           : use the irreversible DWT 9-7 (-I) \n");
+       fprintf(stdout,"\n");
+       fprintf(stdout,"-F           : characteristics of the raw input image\n");
+       fprintf(stdout,"               -F rawWidth,rawHeight,rawComp,rawBitDepth,s/u (Signed/Unsigned)\n");
+       fprintf(stdout,"               Example: -i lena.raw -o lena.j2k -F 512,512,3,8,u\n");
+       fprintf(stdout,"\n");
+       fprintf(stdout,"-m           : use array-based MCT, values are coma separated, line by line\n");
+       fprintf(stdout,"                           no specific separators between lines, no space allowed between values\n");
+       fprintf(stdout,"-jpip        : write jpip codestream index box in JP2 output file\n");
+       fprintf(stdout,"               NOTICE: currently supports only RPCL order\n");
+       fprintf(stdout,"\n");
+/* UniPG>> */
+#ifdef USE_JPWL
+       fprintf(stdout,"-W           : adoption of JPWL (Part 11) capabilities (-W params)\n");
+       fprintf(stdout,"               The parameters can be written and repeated in any order:\n");
+       fprintf(stdout,"               [h<tilepart><=type>,s<tilepart><=method>,a=<addr>,...\n");
+       fprintf(stdout,"                ...,z=<size>,g=<range>,p<tilepart:pack><=type>]\n");
+       fprintf(stdout,"\n");
+       fprintf(stdout,"                 h selects the header error protection (EPB): 'type' can be\n");
+       fprintf(stdout,"                   [0=none 1,absent=predefined 16=CRC-16 32=CRC-32 37-128=RS]\n");
+       fprintf(stdout,"                   if 'tilepart' is absent, it is for main and tile headers\n");
+       fprintf(stdout,"                   if 'tilepart' is present, it applies from that tile\n");
+       fprintf(stdout,"                     onwards, up to the next h<> spec, or to the last tilepart\n");
+       fprintf(stdout,"                     in the codestream (max. %d specs)\n", JPWL_MAX_NO_TILESPECS);
+       fprintf(stdout,"\n");
+       fprintf(stdout,"                 p selects the packet error protection (EEP/UEP with EPBs)\n");
+       fprintf(stdout,"                  to be applied to raw data: 'type' can be\n");
+       fprintf(stdout,"                   [0=none 1,absent=predefined 16=CRC-16 32=CRC-32 37-128=RS]\n");
+       fprintf(stdout,"                   if 'tilepart:pack' is absent, it is from tile 0, packet 0\n");
+       fprintf(stdout,"                   if 'tilepart:pack' is present, it applies from that tile\n");
+       fprintf(stdout,"                     and that packet onwards, up to the next packet spec\n");
+       fprintf(stdout,"                     or to the last packet in the last tilepart in the stream\n");
+       fprintf(stdout,"                     (max. %d specs)\n", JPWL_MAX_NO_PACKSPECS);
+       fprintf(stdout,"\n");
+       fprintf(stdout,"                 s enables sensitivity data insertion (ESD): 'method' can be\n");
+       fprintf(stdout,"                   [-1=NO ESD 0=RELATIVE ERROR 1=MSE 2=MSE REDUCTION 3=PSNR\n");
+       fprintf(stdout,"                    4=PSNR INCREMENT 5=MAXERR 6=TSE 7=RESERVED]\n");
+       fprintf(stdout,"                   if 'tilepart' is absent, it is for main header only\n");
+       fprintf(stdout,"                   if 'tilepart' is present, it applies from that tile\n");
+       fprintf(stdout,"                     onwards, up to the next s<> spec, or to the last tilepart\n");
+       fprintf(stdout,"                     in the codestream (max. %d specs)\n", JPWL_MAX_NO_TILESPECS);
+       fprintf(stdout,"\n");
+       fprintf(stdout,"                 g determines the addressing mode: <range> can be\n");
+       fprintf(stdout,"                   [0=PACKET 1=BYTE RANGE 2=PACKET RANGE]\n");
+       fprintf(stdout,"\n");
+       fprintf(stdout,"                 a determines the size of data addressing: <addr> can be\n");
+       fprintf(stdout,"                   2/4 bytes (small/large codestreams). If not set, auto-mode\n");
+       fprintf(stdout,"\n");
+       fprintf(stdout,"                 z determines the size of sensitivity values: <size> can be\n");
+       fprintf(stdout,"                   1/2 bytes, for the transformed pseudo-floating point value\n");
+       fprintf(stdout,"\n");
+       fprintf(stdout,"                 ex.:\n");
+       fprintf(stdout,"                   h,h0=64,h3=16,h5=32,p0=78,p0:24=56,p1,p3:0=0,p3:20=32,s=0,\n");
+       fprintf(stdout,"                     s0=6,s3=-1,a=0,g=1,z=1\n");
+       fprintf(stdout,"                 means\n");
+       fprintf(stdout,"                   predefined EPB in MH, rs(64,32) from TPH 0 to TPH 2,\n");
+       fprintf(stdout,"                   CRC-16 in TPH 3 and TPH 4, CRC-32 in remaining TPHs,\n");
+       fprintf(stdout,"                   UEP rs(78,32) for packets 0 to 23 of tile 0,\n");
+       fprintf(stdout,"                   UEP rs(56,32) for packs. 24 to the last of tilepart 0,\n");
+       fprintf(stdout,"                   UEP rs default for packets of tilepart 1,\n");
+       fprintf(stdout,"                   no UEP for packets 0 to 19 of tilepart 3,\n");
+       fprintf(stdout,"                   UEP CRC-32 for packs. 20 of tilepart 3 to last tilepart,\n");
+       fprintf(stdout,"                   relative sensitivity ESD for MH,\n");
+       fprintf(stdout,"                   TSE ESD from TPH 0 to TPH 2, byte range with automatic\n");
+       fprintf(stdout,"                   size of addresses and 1 byte for each sensitivity value\n");
+       fprintf(stdout,"\n");
+       fprintf(stdout,"                 ex.:\n");
+       fprintf(stdout,"                       h,s,p\n");
+       fprintf(stdout,"                 means\n");
+       fprintf(stdout,"                   default protection to headers (MH and TPHs) as well as\n");
+       fprintf(stdout,"                   data packets, one ESD in MH\n");
+       fprintf(stdout,"\n");
+       fprintf(stdout,"                 N.B.: use the following recommendations when specifying\n");
+       fprintf(stdout,"                       the JPWL parameters list\n");
+       fprintf(stdout,"                   - when you use UEP, always pair the 'p' option with 'h'\n");
+       fprintf(stdout,"                 \n");
+#endif /* USE_JPWL */
+/* <<UniPG */
+       fprintf(stdout,"IMPORTANT:\n");
+       fprintf(stdout,"-----------\n");
+       fprintf(stdout,"\n");
+       fprintf(stdout,"The index file has the structure below:\n");
+       fprintf(stdout,"---------------------------------------\n");
+       fprintf(stdout,"\n");
+       fprintf(stdout,"Image_height Image_width\n");
+       fprintf(stdout,"progression order\n");
+       fprintf(stdout,"Tiles_size_X Tiles_size_Y\n");
+       fprintf(stdout,"Tiles_nb_X Tiles_nb_Y\n");
+       fprintf(stdout,"Components_nb\n");
+       fprintf(stdout,"Layers_nb\n");
+       fprintf(stdout,"decomposition_levels\n");
+       fprintf(stdout,"[Precincts_size_X_res_Nr Precincts_size_Y_res_Nr]...\n");
+       fprintf(stdout,"   [Precincts_size_X_res_0 Precincts_size_Y_res_0]\n");
+       fprintf(stdout,"Main_header_start_position\n");
+       fprintf(stdout,"Main_header_end_position\n");
+       fprintf(stdout,"Codestream_size\n");
+       fprintf(stdout,"\n");
+       fprintf(stdout,"INFO ON TILES\n");
+       fprintf(stdout,"tileno start_pos end_hd end_tile nbparts disto nbpix disto/nbpix\n");
+       fprintf(stdout,"Tile_0 start_pos end_Theader end_pos NumParts TotalDisto NumPix MaxMSE\n");
+       fprintf(stdout,"Tile_1   ''           ''        ''        ''       ''    ''      ''\n");
+       fprintf(stdout,"...\n");
+       fprintf(stdout,"Tile_Nt   ''           ''        ''        ''       ''    ''     ''\n");
+       fprintf(stdout,"...\n");
+       fprintf(stdout,"TILE 0 DETAILS\n");
+       fprintf(stdout,"part_nb tileno num_packs start_pos end_tph_pos end_pos\n");
+       fprintf(stdout,"...\n");
+       fprintf(stdout,"Progression_string\n");
+       fprintf(stdout,"pack_nb tileno layno resno compno precno start_pos end_ph_pos end_pos disto\n");
+       fprintf(stdout,"Tpacket_0 Tile layer res. comp. prec. start_pos end_pos disto\n");
+       fprintf(stdout,"...\n");
+       fprintf(stdout,"Tpacket_Np ''   ''    ''   ''    ''       ''       ''     ''\n");
+
+       fprintf(stdout,"MaxDisto\n");
+
+       fprintf(stdout,"TotalDisto\n\n");
+}
+
+OPJ_PROG_ORDER give_progression(char progression[4]) {
+       if(strncmp(progression, "LRCP", 4) == 0) {
+               return LRCP;
+       }
+       if(strncmp(progression, "RLCP", 4) == 0) {
+               return RLCP;
+       }
+       if(strncmp(progression, "RPCL", 4) == 0) {
+               return RPCL;
+       }
+       if(strncmp(progression, "PCRL", 4) == 0) {
+               return PCRL;
+       }
+       if(strncmp(progression, "CPRL", 4) == 0) {
+               return CPRL;
+       }
+
+       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", "pbm", "pam", "bmp", "tif", "raw", "rawl", "tga", "png", "j2k", "jp2", "j2c", "jpc"
+    };
+       static const int format[] = {
+    PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, TIF_DFMT, RAW_DFMT, RAWL_DFMT, TGA_DFMT, PNG_DFMT, J2K_CFMT, JP2_CFMT, J2K_CFMT, J2K_CFMT
+    };
+       char * ext = strrchr(filename, '.');
+       if (ext == NULL)
+               return -1;
+       ext++;
+       for(i = 0; i < sizeof(format)/sizeof(*format); i++) {
+               if(strcasecmp(ext, extension[i]) == 0) {
+                       return format[i];
+               }
+       }
+       return -1;
+}
+
+char * get_file_name(char *name){
+       char *fname;
+       fname= (char*)malloc(OPJ_PATH_LEN*sizeof(char));
+       fname= strtok(name,".");
+       return fname;
+}
+
+char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_cparameters_t *parameters){
+       char image_filename[OPJ_PATH_LEN], infilename[OPJ_PATH_LEN],outfilename[OPJ_PATH_LEN],temp_ofname[OPJ_PATH_LEN];
+  char *temp_p, temp1[OPJ_PATH_LEN]="";
+
+       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));
+       while((temp_p = strtok(NULL,".")) != NULL){
+               strcat(temp_ofname,temp1);
+               sprintf(temp1,".%s",temp_p);
+       }
+       if(img_fol->set_out_format==1){
+               sprintf(outfilename,"%s/%s.%s",img_fol->imgdirpath,temp_ofname,img_fol->out_format);
+               strncpy(parameters->outfile, outfilename, sizeof(outfilename));
+       }
+ return 0;
+}
+
+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 = OPJ_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, img_fol_t *img_fol){
+       int i;
+       float temp_rate;
+
+       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 at least 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;
+       default :
+               break;
+       }
+
+       switch (parameters->cp_cinema){
+               case CINEMA2K_24:
+               case CINEMA4K_24:
+                       for(i=0 ; i<parameters->tcp_numlayers ; i++){
+                               temp_rate = 0 ;
+                               if (img_fol->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))/
+                                               (img_fol->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);
+                                       }else{
+                                               parameters->tcp_rates[i]= img_fol->rates[i];
+                                       }
+                               }
+                       }
+                       parameters->max_comp_size = COMP_24_CS;
+                       break;
+
+               case CINEMA2K_48:
+                       for(i=0 ; i<parameters->tcp_numlayers ; i++){
+                               temp_rate = 0 ;
+                               if (img_fol->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))/
+                                               (img_fol->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);
+                                       }else{
+                                               parameters->tcp_rates[i]= img_fol->rates[i];
+                                       }
+                               }
+                       }
+                       parameters->max_comp_size = COMP_48_CS;
+                       break;
+               default:
+                       break;
+       }
+       parameters->cp_disto_alloc = 1;
+}
+
+/* ------------------------------------------------------------------------------------ */
+
+int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
+                                                                                                       img_fol_t *img_fol, raw_cparameters_t *raw_cp, char *indexfilename) {
+       int i, j, totlen, c;
+       opj_option_t long_option[]={
+               {"cinema2K",REQ_ARG, NULL ,'w'},
+               {"cinema4K",NO_ARG, NULL ,'y'},
+               {"ImgDir",REQ_ARG, NULL ,'z'},
+               {"TP",REQ_ARG, NULL ,'u'},
+               {"SOP",NO_ARG, NULL ,'S'},
+               {"EPH",NO_ARG, NULL ,'E'},
+               {"OutFor",REQ_ARG, NULL ,'O'},
+               {"POC",REQ_ARG, NULL ,'P'},
+               {"ROI",REQ_ARG, NULL ,'R'},
+               {"jpip",NO_ARG, NULL, 'J'}
+       };
+
+       /* parse the command line */
+       const char optlist[] = "i:o:r:q:n:b:c:t:p:s:SEM:x:R:d:T:If:P:C:F:u:J"
+#ifdef USE_JPWL
+               "W:"
+#endif /* USE_JPWL */
+               "h";
+
+       totlen=sizeof(long_option);
+       img_fol->set_out_format=0;
+       raw_cp->rawWidth = 0;
+
+       do{
+               c = opj_getopt_long(argc, argv, optlist,long_option,totlen);
+               if (c == -1)
+                       break;
+               switch (c) {
+                       case 'i':                       /* input file */
+                       {
+                               char *infile = opj_optarg;
+                               parameters->decod_format = get_file_format(infile);
+                               switch(parameters->decod_format) {
+                                       case PGX_DFMT:
+                                       case PXM_DFMT:
+                                       case BMP_DFMT:
+                                       case TIF_DFMT:
+                                       case RAW_DFMT:
+                                       case RAWL_DFMT:
+                                       case TGA_DFMT:
+                                       case PNG_DFMT:
+                                               break;
+                                       default:
+                                               fprintf(stderr,
+                                                       "!! Unrecognized format for infile : %s "
+              "[accept only *.pnm, *.pgm, *.ppm, *.pgx, *png, *.bmp, *.tif, *.raw or *.tga] !!\n\n",
+                                                       infile);
+                                               return 1;
+                               }
+                               strncpy(parameters->infile, infile, sizeof(parameters->infile)-1);
+                       }
+                       break;
+
+                               /* ----------------------------------------------------- */
+
+                       case 'o':                       /* output file */
+                       {
+                               char *outfile = opj_optarg;
+                               parameters->cod_format = get_file_format(outfile);
+                               switch(parameters->cod_format) {
+                                       case J2K_CFMT:
+                                       case JP2_CFMT:
+                                               break;
+                                       default:
+                                               fprintf(stderr, "Unknown output format image %s [only *.j2k, *.j2c or *.jp2]!! \n", outfile);
+                                               return 1;
+                               }
+                               strncpy(parameters->outfile, outfile, sizeof(parameters->outfile)-1);
+                       }
+                       break;
+
+                               /* ----------------------------------------------------- */
+                       case 'O':                       /* output format */
+                               {
+                                       char outformat[50];
+                                       char *of = opj_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 = opj_optarg;
+                                                       break;
+                                               default:
+                                                       fprintf(stderr, "Unknown output format image [only j2k, j2c, jp2]!! \n");
+                                                       return 1;
+                                       }
+                               }
+                               break;
+
+
+                               /* ----------------------------------------------------- */
+
+
+                       case 'r':                       /* rates rates/distorsion */
+                       {
+                               char *s = opj_optarg;
+                               parameters->tcp_numlayers = 0;
+                               while (sscanf(s, "%f", &parameters->tcp_rates[parameters->tcp_numlayers]) == 1) {
+                                       parameters->tcp_numlayers++;
+                                       while (*s && *s != ',') {
+                                               s++;
+                                       }
+                                       if (!*s)
+                                               break;
+                                       s++;
+                               }
+                               parameters->cp_disto_alloc = 1;
+                       }
+                       break;
+
+                               /* ----------------------------------------------------- */
+
+
+                       case 'F':                       /* Raw image format parameters */
+                       {
+                               char signo;
+                               char *s = opj_optarg;
+                               if (sscanf(s, "%d,%d,%d,%d,%c", &raw_cp->rawWidth, &raw_cp->rawHeight, &raw_cp->rawComp, &raw_cp->rawBitDepth, &signo) == 5) {
+                                       if (signo == 's') {
+                                               raw_cp->rawSigned = OPJ_TRUE;
+                                               fprintf(stdout,"\nRaw file parameters: %d,%d,%d,%d Signed\n", raw_cp->rawWidth, raw_cp->rawHeight, raw_cp->rawComp, raw_cp->rawBitDepth);
+                                       }
+                                       else if (signo == 'u') {
+                                               raw_cp->rawSigned = OPJ_FALSE;
+                                               fprintf(stdout,"\nRaw file parameters: %d,%d,%d,%d Unsigned\n", raw_cp->rawWidth, raw_cp->rawHeight, raw_cp->rawComp, raw_cp->rawBitDepth);
+                                       }
+                                       else {
+                                               fprintf(stderr,"\nError: invalid raw image parameters: Unknown sign of raw file\n");
+                                               fprintf(stderr,"Please use the Format option -F:\n");
+                                               fprintf(stderr,"-F rawWidth,rawHeight,rawComp,rawBitDepth,s/u (Signed/Unsigned)\n");
+                                               fprintf(stderr,"Example: -i lena.raw -o lena.j2k -F 512,512,3,8,u\n");
+                                               fprintf(stderr,"Aborting\n");
+                                       }
+                               }
+                               else {
+                                       fprintf(stderr,"\nError: invalid raw image parameters\n");
+                                       fprintf(stderr,"Please use the Format option -F:\n");
+                                       fprintf(stderr,"-F rawWidth,rawHeight,rawComp,rawBitDepth,s/u (Signed/Unsigned)\n");
+                                               fprintf(stderr,"Example: -i lena.raw -o lena.j2k -F 512,512,3,8,u\n");
+                                       fprintf(stderr,"Aborting\n");
+                                       return 1;
+                               }
+                       }
+                       break;
+
+                               /* ----------------------------------------------------- */
+
+                       case 'q':                       /* add fixed_quality */
+                       {
+                               char *s = opj_optarg;
+                               while (sscanf(s, "%f", &parameters->tcp_distoratio[parameters->tcp_numlayers]) == 1) {
+                                       parameters->tcp_numlayers++;
+                                       while (*s && *s != ',') {
+                                               s++;
+                                       }
+                                       if (!*s)
+                                               break;
+                                       s++;
+                               }
+                               parameters->cp_fixed_quality = 1;
+                       }
+                       break;
+
+                               /* dda */
+                               /* ----------------------------------------------------- */
+
+                       case 'f':                       /* mod fixed_quality (before : -q) */
+                       {
+                               int *row = NULL, *col = NULL;
+                               int numlayers = 0, numresolution = 0, matrix_width = 0;
+
+                               char *s = opj_optarg;
+                               sscanf(s, "%d", &numlayers);
+                               s++;
+                               if (numlayers > 9)
+                                       s++;
+
+                               parameters->tcp_numlayers = numlayers;
+                               numresolution = parameters->numresolution;
+                               matrix_width = numresolution * 3;
+                               parameters->cp_matrice = (int *) malloc(numlayers * matrix_width * sizeof(int));
+                               s = s + 2;
+
+                               for (i = 0; i < numlayers; i++) {
+                                       row = &parameters->cp_matrice[i * matrix_width];
+                                       col = row;
+                                       parameters->tcp_rates[i] = 1;
+                                       sscanf(s, "%d,", &col[0]);
+                                       s += 2;
+                                       if (col[0] > 9)
+                                               s++;
+                                       col[1] = 0;
+                                       col[2] = 0;
+                                       for (j = 1; j < numresolution; j++) {
+                                               col += 3;
+                                               sscanf(s, "%d,%d,%d", &col[0], &col[1], &col[2]);
+                                               s += 6;
+                                               if (col[0] > 9)
+                                                       s++;
+                                               if (col[1] > 9)
+                                                       s++;
+                                               if (col[2] > 9)
+                                                       s++;
+                                       }
+                                       if (i < numlayers - 1)
+                                               s++;
+                               }
+                               parameters->cp_fixed_alloc = 1;
+                       }
+                       break;
+
+                               /* ----------------------------------------------------- */
+
+                       case 't':                       /* tiles */
+                       {
+                               sscanf(opj_optarg, "%d,%d", &parameters->cp_tdx, &parameters->cp_tdy);
+                               parameters->tile_size_on = OPJ_TRUE;
+                       }
+                       break;
+
+                               /* ----------------------------------------------------- */
+
+                       case 'n':                       /* resolution */
+                       {
+                               sscanf(opj_optarg, "%d", &parameters->numresolution);
+                       }
+                       break;
+
+                               /* ----------------------------------------------------- */
+                       case 'c':                       /* precinct dimension */
+                       {
+                               char sep;
+                               int res_spec = 0;
+
+                               char *s = opj_optarg;
+                               do {
+                                       sep = 0;
+                                       sscanf(s, "[%d,%d]%c", &parameters->prcw_init[res_spec],
+                                 &parameters->prch_init[res_spec], &sep);
+                                       parameters->csty |= 0x01;
+                                       res_spec++;
+                                       s = strpbrk(s, "]") + 2;
+                               }
+                               while (sep == ',');
+                               parameters->res_spec = res_spec;
+                       }
+                       break;
+
+                               /* ----------------------------------------------------- */
+
+                       case 'b':                       /* code-block dimension */
+                       {
+                               int cblockw_init = 0, cblockh_init = 0;
+                               sscanf(opj_optarg, "%d,%d", &cblockw_init, &cblockh_init);
+                               if (cblockw_init * cblockh_init > 4096 || cblockw_init > 1024
+                                       || cblockw_init < 4 || cblockh_init > 1024 || cblockh_init < 4) {
+                                       fprintf(stderr,
+                                               "!! Size of code_block error (option -b) !!\n\nRestriction :\n"
+            "    * width*height<=4096\n    * 4<=width,height<= 1024\n\n");
+                                       return 1;
+                               }
+                               parameters->cblockw_init = cblockw_init;
+                               parameters->cblockh_init = cblockh_init;
+                       }
+                       break;
+
+                               /* ----------------------------------------------------- */
+
+                       case 'x':                       /* creation of index file */
+                       {
+                               char *index = opj_optarg;
+                               strncpy(indexfilename, index, OPJ_PATH_LEN);
+                       }
+                       break;
+
+                               /* ----------------------------------------------------- */
+
+                       case 'p':                       /* progression order */
+                       {
+                               char progression[4];
+
+                               strncpy(progression, opj_optarg, 4);
+                               parameters->prog_order = give_progression(progression);
+                               if (parameters->prog_order == -1) {
+                                       fprintf(stderr, "Unrecognized progression order "
+            "[LRCP, RLCP, RPCL, PCRL, CPRL] !!\n");
+                                       return 1;
+                               }
+                       }
+                       break;
+
+                               /* ----------------------------------------------------- */
+
+                       case 's':                       /* subsampling factor */
+                       {
+                               if (sscanf(opj_optarg, "%d,%d", &parameters->subsampling_dx,
+                                    &parameters->subsampling_dy) != 2) {
+                                       fprintf(stderr, "'-s' sub-sampling argument error !  [-s dx,dy]\n");
+                                       return 1;
+                               }
+                       }
+                       break;
+
+                               /* ----------------------------------------------------- */
+
+                       case 'd':                       /* coordonnate of the reference grid */
+                       {
+                               if (sscanf(opj_optarg, "%d,%d", &parameters->image_offset_x0,
+                                    &parameters->image_offset_y0) != 2) {
+                                       fprintf(stderr, "-d 'coordonnate of the reference grid' argument "
+            "error !! [-d x0,y0]\n");
+                                       return 1;
+                               }
+                       }
+                       break;
+
+                               /* ----------------------------------------------------- */
+
+                       case 'h':                       /* display an help description */
+                               encode_help_display();
+                               return 1;
+
+                               /* ----------------------------------------------------- */
+
+                       case 'P':                       /* POC */
+                       {
+                               int numpocs = 0;                /* number of progression order change (POC) default 0 */
+                               opj_poc_t *POC = NULL;  /* POC : used in case of Progression order change */
+
+                               char *s = opj_optarg;
+                               POC = parameters->POC;
+
+                               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].prg1 = give_progression(POC[numpocs].progorder);
+                                       numpocs++;
+                                       while (*s && *s != '/') {
+                                               s++;
+                                       }
+                                       if (!*s) {
+                                               break;
+                                       }
+                                       s++;
+                               }
+                               parameters->numpocs = numpocs;
+                       }
+                       break;
+
+                               /* ------------------------------------------------------ */
+
+                       case 'S':                       /* SOP marker */
+                       {
+                               parameters->csty |= 0x02;
+                       }
+                       break;
+
+                               /* ------------------------------------------------------ */
+
+                       case 'E':                       /* EPH marker */
+                       {
+                               parameters->csty |= 0x04;
+                       }
+                       break;
+
+                               /* ------------------------------------------------------ */
+
+                       case 'M':                       /* Mode switch pas tous au point !! */
+                       {
+                               int value = 0;
+                               if (sscanf(opj_optarg, "%d", &value) == 1) {
+                                       for (i = 0; i <= 5; i++) {
+                                               int cache = value & (1 << i);
+                                               if (cache)
+                                                       parameters->mode |= (1 << i);
+                                       }
+                               }
+                       }
+                       break;
+
+                               /* ------------------------------------------------------ */
+
+                       case 'R':                       /* ROI */
+                       {
+                               if (sscanf(opj_optarg, "c=%d,U=%d", &parameters->roi_compno,
+                                           &parameters->roi_shift) != 2) {
+                                       fprintf(stderr, "ROI error !! [-ROI c='compno',U='shift']\n");
+                                       return 1;
+                               }
+                       }
+                       break;
+
+                               /* ------------------------------------------------------ */
+
+                       case 'T':                       /* Tile offset */
+                       {
+                               if (sscanf(opj_optarg, "%d,%d", &parameters->cp_tx0, &parameters->cp_ty0) != 2) {
+                                       fprintf(stderr, "-T 'tile offset' argument error !! [-T X0,Y0]");
+                                       return 1;
+                               }
+                       }
+                       break;
+
+                               /* ------------------------------------------------------ */
+
+                       case 'C':                       /* add a comment */
+                       {
+                               parameters->cp_comment = (char*)malloc(strlen(opj_optarg) + 1);
+                               if(parameters->cp_comment) {
+                                       strcpy(parameters->cp_comment, opj_optarg);
+                               }
+                       }
+                       break;
+
+
+                               /* ------------------------------------------------------ */
+
+                       case 'I':                       /* reversible or not */
+                       {
+                               parameters->irreversible = 1;
+                       }
+                       break;
+
+                       /* ------------------------------------------------------ */
+
+                       case 'u':                       /* Tile part generation*/
+                       {
+                               parameters->tp_flag = opj_optarg[0];
+                               parameters->tp_on = 1;
+                       }
+                       break;
+
+                               /* ------------------------------------------------------ */
+
+                       case 'z':                       /* Image Directory path */
+                       {
+                               img_fol->imgdirpath = (char*)malloc(strlen(opj_optarg) + 1);
+                               strcpy(img_fol->imgdirpath,opj_optarg);
+                               img_fol->set_imgdir=1;
+                       }
+                       break;
+
+                               /* ------------------------------------------------------ */
+
+                       case 'w':                       /* Digital Cinema 2K profile compliance*/
+                       {
+                               int fps=0;
+                               sscanf(opj_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;
+
+                               /* ------------------------------------------------------ */
+                       case 'm':                       /* mct input file */
+                       {
+                               char *lFilename = opj_optarg;
+                               char *lMatrix;
+                               char *lCurrentPtr ;
+                               float *lCurrentDoublePtr;
+                               float *lSpace;
+                               int *l_int_ptr;
+                               int lNbComp = 0, lTotalComp, lMctComp, i, lStrLen;
+
+                               /* Open file */
+                               FILE * lFile = fopen(lFilename,"r");
+                               if (lFile == NULL) {
+                                       return 1;
+                               }
+
+                               /* Set size of file and read its content*/
+                               fseek(lFile,0,SEEK_END);
+                               lStrLen = ftell(lFile);
+                               fseek(lFile,0,SEEK_SET);
+                               lMatrix = (char *) malloc(lStrLen + 1);
+                               fread(lMatrix, lStrLen, 1, lFile);
+                               fclose(lFile);
+
+                               lMatrix[lStrLen] = 0;
+                               lCurrentPtr = lMatrix;
+
+                               /* replace ',' by 0 */
+                               while (*lCurrentPtr != 0 ) {
+                                       if (*lCurrentPtr == ' ') {
+                                               *lCurrentPtr = 0;
+                                               ++lNbComp;
+                                       }
+                                       ++lCurrentPtr;
+                               }
+                               ++lNbComp;
+                               lCurrentPtr = lMatrix;
+
+                               lNbComp = (int) (sqrt(4*lNbComp + 1)/2. - 0.5);
+                               lMctComp = lNbComp * lNbComp;
+                               lTotalComp = lMctComp + lNbComp;
+                               lSpace = (float *) malloc(lTotalComp * sizeof(float));
+                               lCurrentDoublePtr = lSpace;
+                               for (i=0;i<lMctComp;++i) {
+                                       lStrLen = strlen(lCurrentPtr) + 1;
+                                       *lCurrentDoublePtr++ = (float) atof(lCurrentPtr);
+                                       lCurrentPtr += lStrLen;
+                               }
+
+                               l_int_ptr = (int*) lCurrentDoublePtr;
+                               for (i=0;i<lNbComp;++i) {
+                                       lStrLen = strlen(lCurrentPtr) + 1;
+                                       *l_int_ptr++ = atoi(lCurrentPtr);
+                                       lCurrentPtr += lStrLen;
+                               }
+
+                               /* TODO should not be here ! */
+                               opj_set_MCT(parameters, lSpace, (int *)(lSpace + lMctComp), lNbComp);
+
+                               /* Free memory*/
+                               free(lSpace);
+                               free(lMatrix);
+                       }
+                       break;
+
+
+                               /* ------------------------------------------------------ */
+
+/* UniPG>> */
+#ifdef USE_JPWL
+                               /* ------------------------------------------------------ */
+
+                       case 'W':                       /* JPWL capabilities switched on */
+                       {
+                               char *token = NULL;
+                               int hprot, pprot, sens, addr, size, range;
+
+                               /* we need to enable indexing */
+                               if (!indexfilename || !*indexfilename) {
+                                       strncpy(indexfilename, JPWL_PRIVATEINDEX_NAME, OPJ_PATH_LEN);
+                               }
+
+                               /* search for different protection methods */
+
+                               /* break the option in comma points and parse the result */
+                               token = strtok(opj_optarg, ",");
+                               while(token != NULL) {
+
+                                       /* search header error protection method */
+                                       if (*token == 'h') {
+
+                                               static int tile = 0, tilespec = 0, lasttileno = 0;
+
+                                               hprot = 1; /* predefined method */
+
+                                               if(sscanf(token, "h=%d", &hprot) == 1) {
+                                                       /* Main header, specified */
+                                                       if (!((hprot == 0) || (hprot == 1) || (hprot == 16) || (hprot == 32) ||
+                                                               ((hprot >= 37) && (hprot <= 128)))) {
+                                                               fprintf(stderr, "ERROR -> invalid main header protection method h = %d\n", hprot);
+                                                               return 1;
+                                                       }
+                                                       parameters->jpwl_hprot_MH = hprot;
+
+                                               } else if(sscanf(token, "h%d=%d", &tile, &hprot) == 2) {
+                                                       /* Tile part header, specified */
+                                                       if (!((hprot == 0) || (hprot == 1) || (hprot == 16) || (hprot == 32) ||
+                                                               ((hprot >= 37) && (hprot <= 128)))) {
+                                                               fprintf(stderr, "ERROR -> invalid tile part header protection method h = %d\n", hprot);
+                                                               return 1;
+                                                       }
+                                                       if (tile < 0) {
+                                                               fprintf(stderr, "ERROR -> invalid tile part number on protection method t = %d\n", tile);
+                                                               return 1;
+                                                       }
+                                                       if (tilespec < JPWL_MAX_NO_TILESPECS) {
+                                                               parameters->jpwl_hprot_TPH_tileno[tilespec] = lasttileno = tile;
+                                                               parameters->jpwl_hprot_TPH[tilespec++] = hprot;
+                                                       }
+
+                                               } else if(sscanf(token, "h%d", &tile) == 1) {
+                                                       /* Tile part header, unspecified */
+                                                       if (tile < 0) {
+                                                               fprintf(stderr, "ERROR -> invalid tile part number on protection method t = %d\n", tile);
+                                                               return 1;
+                                                       }
+                                                       if (tilespec < JPWL_MAX_NO_TILESPECS) {
+                                                               parameters->jpwl_hprot_TPH_tileno[tilespec] = lasttileno = tile;
+                                                               parameters->jpwl_hprot_TPH[tilespec++] = hprot;
+                                                       }
+
+
+                                               } else if (!strcmp(token, "h")) {
+                                                       /* Main header, unspecified */
+                                                       parameters->jpwl_hprot_MH = hprot;
+
+                                               } else {
+                                                       fprintf(stderr, "ERROR -> invalid protection method selection = %s\n", token);
+                                                       return 1;
+                                               };
+
+                                       }
+
+                                       /* search packet error protection method */
+                                       if (*token == 'p') {
+
+                                               static int pack = 0, tile = 0, packspec = 0;
+
+                                               pprot = 1; /* predefined method */
+
+                                               if (sscanf(token, "p=%d", &pprot) == 1) {
+                                                       /* Method for all tiles and all packets */
+                                                       if (!((pprot == 0) || (pprot == 1) || (pprot == 16) || (pprot == 32) ||
+                                                               ((pprot >= 37) && (pprot <= 128)))) {
+                                                               fprintf(stderr, "ERROR -> invalid default packet protection method p = %d\n", pprot);
+                                                               return 1;
+                                                       }
+                                                       parameters->jpwl_pprot_tileno[0] = 0;
+                                                       parameters->jpwl_pprot_packno[0] = 0;
+                                                       parameters->jpwl_pprot[0] = pprot;
+
+                                               } else if (sscanf(token, "p%d=%d", &tile, &pprot) == 2) {
+                                                       /* method specified from that tile on */
+                                                       if (!((pprot == 0) || (pprot == 1) || (pprot == 16) || (pprot == 32) ||
+                                                               ((pprot >= 37) && (pprot <= 128)))) {
+                                                               fprintf(stderr, "ERROR -> invalid packet protection method p = %d\n", pprot);
+                                                               return 1;
+                                                       }
+                                                       if (tile < 0) {
+                                                               fprintf(stderr, "ERROR -> invalid tile part number on protection method p = %d\n", tile);
+                                                               return 1;
+                                                       }
+                                                       if (packspec < JPWL_MAX_NO_PACKSPECS) {
+                                                               parameters->jpwl_pprot_tileno[packspec] = tile;
+                                                               parameters->jpwl_pprot_packno[packspec] = 0;
+                                                               parameters->jpwl_pprot[packspec++] = pprot;
+                                                       }
+
+                                               } else if (sscanf(token, "p%d:%d=%d", &tile, &pack, &pprot) == 3) {
+                                                       /* method fully specified from that tile and that packet on */
+                                                       if (!((pprot == 0) || (pprot == 1) || (pprot == 16) || (pprot == 32) ||
+                                                               ((pprot >= 37) && (pprot <= 128)))) {
+                                                               fprintf(stderr, "ERROR -> invalid packet protection method p = %d\n", pprot);
+                                                               return 1;
+                                                       }
+                                                       if (tile < 0) {
+                                                               fprintf(stderr, "ERROR -> invalid tile part number on protection method p = %d\n", tile);
+                                                               return 1;
+                                                       }
+                                                       if (pack < 0) {
+                                                               fprintf(stderr, "ERROR -> invalid packet number on protection method p = %d\n", pack);
+                                                               return 1;
+                                                       }
+                                                       if (packspec < JPWL_MAX_NO_PACKSPECS) {
+                                                               parameters->jpwl_pprot_tileno[packspec] = tile;
+                                                               parameters->jpwl_pprot_packno[packspec] = pack;
+                                                               parameters->jpwl_pprot[packspec++] = pprot;
+                                                       }
+
+                                               } else if (sscanf(token, "p%d:%d", &tile, &pack) == 2) {
+                                                       /* default method from that tile and that packet on */
+                                                       if (!((pprot == 0) || (pprot == 1) || (pprot == 16) || (pprot == 32) ||
+                                                               ((pprot >= 37) && (pprot <= 128)))) {
+                                                               fprintf(stderr, "ERROR -> invalid packet protection method p = %d\n", pprot);
+                                                               return 1;
+                                                       }
+                                                       if (tile < 0) {
+                                                               fprintf(stderr, "ERROR -> invalid tile part number on protection method p = %d\n", tile);
+                                                               return 1;
+                                                       }
+                                                       if (pack < 0) {
+                                                               fprintf(stderr, "ERROR -> invalid packet number on protection method p = %d\n", pack);
+                                                               return 1;
+                                                       }
+                                                       if (packspec < JPWL_MAX_NO_PACKSPECS) {
+                                                               parameters->jpwl_pprot_tileno[packspec] = tile;
+                                                               parameters->jpwl_pprot_packno[packspec] = pack;
+                                                               parameters->jpwl_pprot[packspec++] = pprot;
+                                                       }
+
+                                               } else if (sscanf(token, "p%d", &tile) == 1) {
+                                                       /* default from a tile on */
+                                                       if (tile < 0) {
+                                                               fprintf(stderr, "ERROR -> invalid tile part number on protection method p = %d\n", tile);
+                                                               return 1;
+                                                       }
+                                                       if (packspec < JPWL_MAX_NO_PACKSPECS) {
+                                                               parameters->jpwl_pprot_tileno[packspec] = tile;
+                                                               parameters->jpwl_pprot_packno[packspec] = 0;
+                                                               parameters->jpwl_pprot[packspec++] = pprot;
+                                                       }
+
+
+                                               } else if (!strcmp(token, "p")) {
+                                                       /* all default */
+                                                       parameters->jpwl_pprot_tileno[0] = 0;
+                                                       parameters->jpwl_pprot_packno[0] = 0;
+                                                       parameters->jpwl_pprot[0] = pprot;
+
+                                               } else {
+                                                       fprintf(stderr, "ERROR -> invalid protection method selection = %s\n", token);
+                                                       return 1;
+                                               };
+
+                                       }
+
+                                       /* search sensitivity method */
+                                       if (*token == 's') {
+
+                                               static int tile = 0, tilespec = 0, lasttileno = 0;
+
+                                               sens = 0; /* predefined: relative error */
+
+                                               if(sscanf(token, "s=%d", &sens) == 1) {
+                                                       /* Main header, specified */
+                                                       if ((sens < -1) || (sens > 7)) {
+                                                               fprintf(stderr, "ERROR -> invalid main header sensitivity method s = %d\n", sens);
+                                                               return 1;
+                                                       }
+                                                       parameters->jpwl_sens_MH = sens;
+
+                                               } else if(sscanf(token, "s%d=%d", &tile, &sens) == 2) {
+                                                       /* Tile part header, specified */
+                                                       if ((sens < -1) || (sens > 7)) {
+                                                               fprintf(stderr, "ERROR -> invalid tile part header sensitivity method s = %d\n", sens);
+                                                               return 1;
+                                                       }
+                                                       if (tile < 0) {
+                                                               fprintf(stderr, "ERROR -> invalid tile part number on sensitivity method t = %d\n", tile);
+                                                               return 1;
+                                                       }
+                                                       if (tilespec < JPWL_MAX_NO_TILESPECS) {
+                                                               parameters->jpwl_sens_TPH_tileno[tilespec] = lasttileno = tile;
+                                                               parameters->jpwl_sens_TPH[tilespec++] = sens;
+                                                       }
+
+                                               } else if(sscanf(token, "s%d", &tile) == 1) {
+                                                       /* Tile part header, unspecified */
+                                                       if (tile < 0) {
+                                                               fprintf(stderr, "ERROR -> invalid tile part number on sensitivity method t = %d\n", tile);
+                                                               return 1;
+                                                       }
+                                                       if (tilespec < JPWL_MAX_NO_TILESPECS) {
+                                                               parameters->jpwl_sens_TPH_tileno[tilespec] = lasttileno = tile;
+                                                               parameters->jpwl_sens_TPH[tilespec++] = hprot;
+                                                       }
+
+                                               } else if (!strcmp(token, "s")) {
+                                                       /* Main header, unspecified */
+                                                       parameters->jpwl_sens_MH = sens;
+
+                                               } else {
+                                                       fprintf(stderr, "ERROR -> invalid sensitivity method selection = %s\n", token);
+                                                       return 1;
+                                               };
+
+                                               parameters->jpwl_sens_size = 2; /* 2 bytes for default size */
+                                       }
+
+                                       /* search addressing size */
+                                       if (*token == 'a') {
+
+
+                                               addr = 0; /* predefined: auto */
+
+                                               if(sscanf(token, "a=%d", &addr) == 1) {
+                                                       /* Specified */
+                                                       if ((addr != 0) && (addr != 2) && (addr != 4)) {
+                                                               fprintf(stderr, "ERROR -> invalid addressing size a = %d\n", addr);
+                                                               return 1;
+                                                       }
+                                                       parameters->jpwl_sens_addr = addr;
+
+                                               } else if (!strcmp(token, "a")) {
+                                                       /* default */
+                                                       parameters->jpwl_sens_addr = addr; /* auto for default size */
+
+                                               } else {
+                                                       fprintf(stderr, "ERROR -> invalid addressing selection = %s\n", token);
+                                                       return 1;
+                                               };
+
+                                       }
+
+                                       /* search sensitivity size */
+                                       if (*token == 'z') {
+
+
+                                               size = 1; /* predefined: 1 byte */
+
+                                               if(sscanf(token, "z=%d", &size) == 1) {
+                                                       /* Specified */
+                                                       if ((size != 0) && (size != 1) && (size != 2)) {
+                                                               fprintf(stderr, "ERROR -> invalid sensitivity size z = %d\n", size);
+                                                               return 1;
+                                                       }
+                                                       parameters->jpwl_sens_size = size;
+
+                                               } else if (!strcmp(token, "a")) {
+                                                       /* default */
+                                                       parameters->jpwl_sens_size = size; /* 1 for default size */
+
+                                               } else {
+                                                       fprintf(stderr, "ERROR -> invalid size selection = %s\n", token);
+                                                       return 1;
+                                               };
+
+                                       }
+
+                                       /* search range method */
+                                       if (*token == 'g') {
+
+
+                                               range = 0; /* predefined: 0 (packet) */
+
+                                               if(sscanf(token, "g=%d", &range) == 1) {
+                                                       /* Specified */
+                                                       if ((range < 0) || (range > 3)) {
+                                                               fprintf(stderr, "ERROR -> invalid sensitivity range method g = %d\n", range);
+                                                               return 1;
+                                                       }
+                                                       parameters->jpwl_sens_range = range;
+
+                                               } else if (!strcmp(token, "g")) {
+                                                       /* default */
+                                                       parameters->jpwl_sens_range = range;
+
+                                               } else {
+                                                       fprintf(stderr, "ERROR -> invalid range selection = %s\n", token);
+                                                       return 1;
+                                               };
+
+                                       }
+
+                                       /* next token or bust */
+                                       token = strtok(NULL, ",");
+                               };
+
+
+                               /* some info */
+                               fprintf(stdout, "Info: JPWL capabilities enabled\n");
+                               parameters->jpwl_epc_on = OPJ_TRUE;
+
+                       }
+                       break;
+#endif /* USE_JPWL */
+/* <<UniPG */
+/* ------------------------------------------------------ */
+                       
+                       case 'J':                       /* jpip on */
+                       {
+                         parameters->jpip_on = OPJ_TRUE;
+                       }
+                       break;
+                               /* ------------------------------------------------------ */
+
+
+                       default:
+                               fprintf(stderr, "ERROR -> Command line not valid\n");
+                               return 1;
+               }
+       }while(c != -1);
+
+       /* check for possible errors */
+       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, "Example: %s -i image.ppm  -o image.j2k\n",argv[0]);
+                       fprintf(stderr, "    Try: %s -h\n",argv[0]);
+                       return 1;
+               }
+       }
+
+       if ( (parameters->decod_format == RAW_DFMT && raw_cp->rawWidth == 0)
+       || (parameters->decod_format == RAWL_DFMT && raw_cp->rawWidth == 0)) {
+                       fprintf(stderr,"\nError: invalid raw image parameters\n");
+                       fprintf(stderr,"Please use the Format option -F:\n");
+                       fprintf(stderr,"-F rawWidth,rawHeight,rawComp,rawBitDepth,s/u (Signed/Unsigned)\n");
+                                               fprintf(stderr,"Example: -i lena.raw -o lena.j2k -F 512,512,3,8,u\n");
+                       fprintf(stderr,"Aborting\n");
+                       return 1;
+       }
+
+       if ((parameters->cp_disto_alloc || parameters->cp_fixed_alloc || parameters->cp_fixed_quality)
+               && (!(parameters->cp_disto_alloc ^ parameters->cp_fixed_alloc ^ parameters->cp_fixed_quality))) {
+               fprintf(stderr, "Error: options -r -q and -f cannot be used together !!\n");
+               return 1;
+       }                               /* mod fixed_quality */
+
+       /* if no rate entered, lossless by default */
+       if (parameters->tcp_numlayers == 0) {
+               parameters->tcp_rates[0] = 0;   /* MOD antonin : losslessbug */
+               parameters->tcp_numlayers++;
+               parameters->cp_disto_alloc = 1;
+       }
+
+       if((parameters->cp_tx0 > parameters->image_offset_x0) || (parameters->cp_ty0 > parameters->image_offset_y0)) {
+               fprintf(stderr,
+                       "Error: Tile offset dimension is unnappropriate --> TX0(%d)<=IMG_X0(%d) TYO(%d)<=IMG_Y0(%d) \n",
+                       parameters->cp_tx0, parameters->image_offset_x0, parameters->cp_ty0, parameters->image_offset_y0);
+               return 1;
+       }
+
+       for (i = 0; i < parameters->numpocs; i++) {
+               if (parameters->POC[i].prg == -1) {
+                       fprintf(stderr,
+                               "Unrecognized progression order in option -P (POC n %d) [LRCP, RLCP, RPCL, PCRL, CPRL] !!\n",
+                               i + 1);
+               }
+       }
+
+       return 0;
+}
+
+/* -------------------------------------------------------------------------- */
+
+/**
+sample error callback expecting a FILE* client object
+*/
+void error_file_callback(const char *msg, void *client_data) {
+       FILE *stream = (FILE*)client_data;
+       fprintf(stream, "[ERROR] %s", msg);
+}
+/**
+sample warning callback expecting a FILE* client object
+*/
+void warning_file_callback(const char *msg, void *client_data) {
+       FILE *stream = (FILE*)client_data;
+       fprintf(stream, "[WARNING] %s", msg);
+}
+/**
+sample debug callback expecting a FILE* client object
+*/
+void info_file_callback(const char *msg, void *client_data) {
+       FILE *stream = (FILE*)client_data;
+       fprintf(stream, "[INFO] %s", msg);
+}
+
+/**
+sample error debug callback expecting no client object
+*/
+void error_callback(const char *msg, void *client_data) {
+       (void)client_data;
+       fprintf(stdout, "[ERROR] %s", msg);
+}
+/**
+sample warning debug callback expecting no client object
+*/
+void warning_callback(const char *msg, void *client_data) {
+       (void)client_data;
+       fprintf(stdout, "[WARNING] %s", msg);
+}
+/**
+sample debug callback expecting no client object
+*/
+void info_callback(const char *msg, void *client_data) {
+       (void)client_data;
+       fprintf(stdout, "[INFO] %s", msg);
+}
+
+/* -------------------------------------------------------------------------- */
+/**
+ * IMAGE_TO_J2K MAIN
+ */
+/* -------------------------------------------------------------------------- */
+int main(int argc, char **argv) {
+       FILE *fout = NULL;
+
+       opj_cparameters_t parameters;   /* compression parameters */
+
+       opj_stream_t *l_stream = 00;
+       opj_codec_t* l_codec = 00;
+       opj_image_t *image = NULL;
+       raw_cparameters_t raw_cp;
+
+       char indexfilename[OPJ_PATH_LEN];       /* index file name */
+
+       int i, num_images, imageno;
+       img_fol_t img_fol;
+       dircnt_t *dirptr = NULL;
+
+       opj_bool bSuccess;
+  opj_bool bUseTiles = OPJ_FALSE; /* OPJ_TRUE */
+       OPJ_UINT32 l_nb_tiles = 4;
+
+       /* set encoding parameters to default values */
+       opj_set_default_encoder_parameters(&parameters);
+
+       /* Initialize indexfilename and img_fol */
+       *indexfilename = 0;
+       memset(&img_fol,0,sizeof(img_fol_t));
+
+       /* parse input and get user encoding parameters */
+       if(parse_cmdline_encoder(argc, argv, &parameters,&img_fol, &raw_cp, indexfilename) == 1) {
+               return 1;
+       }
+
+       if (parameters.cp_cinema){
+               img_fol.rates = (float*)malloc(parameters.tcp_numlayers * sizeof(float));
+               for(i=0; i< parameters.tcp_numlayers; i++){
+                       img_fol.rates[i] = parameters.tcp_rates[i];
+               }
+               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);
+    const char *version = opj_version();
+/* UniPG>> */
+#ifdef USE_JPWL
+               parameters.cp_comment = (char*)malloc(clen+strlen(version)+11);
+               sprintf(parameters.cp_comment,"%s%s with JPWL", comment, version);
+#else
+               parameters.cp_comment = (char*)malloc(clen+strlen(version)+1);
+               sprintf(parameters.cp_comment,"%s%s", comment, version);
+#endif
+/* <<UniPG */
+       }
+
+       /* Read directory if necessary */
+       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;
+       }
+       /*Encoding image one by one*/
+       for(imageno=0;imageno<num_images;imageno++)     {
+               image = NULL;
+               fprintf(stderr,"\n");
+
+               if(img_fol.set_imgdir==1){
+                       if (get_next_file(imageno, dirptr,&img_fol, &parameters)) {
+                               fprintf(stderr,"skipping file...\n");
+                               continue;
+                       }
+               }
+
+               switch(parameters.decod_format) {
+                       case PGX_DFMT:
+                               break;
+                       case PXM_DFMT:
+                               break;
+                       case BMP_DFMT:
+                               break;
+                       case TIF_DFMT:
+                               break;
+                       case RAW_DFMT:
+                       case RAWL_DFMT:
+                               break;
+                       case TGA_DFMT:
+                               break;
+                       case PNG_DFMT:
+                               break;
+                       default:
+                               fprintf(stderr,"skipping file...\n");
+                               continue;
+               }
+
+               /* decode the source image */
+               /* ----------------------- */
+
+               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;
+
+                       case PXM_DFMT:
+                               image = pnmtoimage(parameters.infile, &parameters);
+                               if (!image) {
+                                       fprintf(stderr, "Unable to load pnm file\n");
+                                       return 1;
+                               }
+                               break;
+
+                       case BMP_DFMT:
+                               image = bmptoimage(parameters.infile, &parameters);
+                               if (!image) {
+                                       fprintf(stderr, "Unable to load bmp file\n");
+                                       return 1;
+                               }
+                               break;
+
+#ifdef HAVE_LIBTIFF
+                       case TIF_DFMT:
+                               image = tiftoimage(parameters.infile, &parameters);
+                               if (!image) {
+                                       fprintf(stderr, "Unable to load tiff file\n");
+                                       return 1;
+                               }
+                       break;
+#endif /* HAVE_LIBTIFF */
+
+                       case RAW_DFMT:
+                               image = rawtoimage(parameters.infile, &parameters, &raw_cp);
+                               if (!image) {
+                                       fprintf(stderr, "Unable to load raw file\n");
+                                       return 1;
+                               }
+                       break;
+
+                       case RAWL_DFMT:
+                               image = rawltoimage(parameters.infile, &parameters, &raw_cp);
+                               if (!image) {
+                                       fprintf(stderr, "Unable to load raw file\n");
+                                       return 1;
+                               }
+                       break;
+
+                       case TGA_DFMT:
+                               image = tgatoimage(parameters.infile, &parameters);
+                               if (!image) {
+                                       fprintf(stderr, "Unable to load tga file\n");
+                                       return 1;
+                               }
+                       break;
+
+#ifdef HAVE_LIBPNG
+                       case PNG_DFMT:
+                               image = pngtoimage(parameters.infile, &parameters);
+                               if (!image) {
+                                       fprintf(stderr, "Unable to load png file\n");
+                                       return 1;
+                               }
+                               break;
+#endif /* HAVE_LIBPNG */
+               }
+
+/* Can happen if input file is TIFF or PNG 
+ * and HAVE_LIBTIF or HAVE_LIBPNG is undefined
+*/
+               if( !image) {
+                       fprintf(stderr, "Unable to load file: got no image\n");
+                       return 1;
+               }
+
+               /* Decide if MCT should be used */
+               parameters.tcp_mct = image->numcomps == 3 ? 1 : 0;
+
+               if(parameters.cp_cinema){
+                       cinema_setup_encoder(&parameters,image,&img_fol);
+               }
+
+               /* encode the destination image */
+               /* ---------------------------- */
+
+               switch(parameters.cod_format) {
+                       case J2K_CFMT:  /* JPEG-2000 codestream */
+                       {
+                               /* Get a decoder handle */
+                               l_codec = opj_create_compress(CODEC_J2K);
+                               break;
+                       }
+                       case JP2_CFMT:  /* JPEG 2000 compressed image data */
+                       {
+                               /* Get a decoder handle */
+                               l_codec = opj_create_compress(CODEC_JP2);
+                               break;
+                       }
+                       default:
+                               fprintf(stderr, "skipping file..\n");
+                               opj_stream_destroy(l_stream);
+                               continue;
+               }
+               
+               /* catch events using our callbacks and give a local context */         
+               opj_set_info_handler(l_codec, info_callback,00);
+               opj_set_warning_handler(l_codec, warning_callback,00);
+               opj_set_error_handler(l_codec, error_callback,00);
+
+    if( bUseTiles ) {
+      parameters.cp_tx0 = 0;
+      parameters.cp_ty0 = 0;
+      parameters.tile_size_on = OPJ_TRUE;
+      parameters.cp_tdx = 512;
+      parameters.cp_tdy = 512;
+    }
+               opj_setup_encoder(l_codec, &parameters, image);
+
+               /* Open the output file*/
+               fout = fopen(parameters.outfile, "wb");
+               if (! fout) {
+                       fprintf(stderr, "Not enable to create output file!\n");
+                       opj_stream_destroy(l_stream);
+                       return 1;
+               }
+
+               /* open a byte stream for writing and allocate memory for all tiles */
+               l_stream = opj_stream_create_default_file_stream(fout,OPJ_FALSE);
+               if (! l_stream){
+                       return 1;
+               }
+
+               /* encode the image */
+    bSuccess = opj_start_compress(l_codec,image,l_stream);
+    if (!bSuccess)  {
+      fprintf(stderr, "failed to encode image: opj_start_compress\n");
+    }
+    if( bUseTiles ) {
+      OPJ_BYTE *l_data;
+      OPJ_UINT32 l_data_size = 512*512*3;
+      l_data = (OPJ_BYTE*) malloc( l_data_size * sizeof(OPJ_BYTE));
+      memset(l_data, 0, l_data_size );
+      assert( l_data );
+      for (i=0;i<l_nb_tiles;++i) {
+        if (! opj_write_tile(l_codec,i,l_data,l_data_size,l_stream)) {
+          fprintf(stderr, "ERROR -> test_tile_encoder: failed to write the tile %d!\n",i);
+          opj_stream_destroy(l_stream);
+          fclose(fout);
+          opj_destroy_codec(l_codec);
+          opj_image_destroy(image);
+          return 1;
+        }
+      }
+      free(l_data);
+    }
+    else {
+      bSuccess = bSuccess && opj_encode(l_codec, l_stream);
+      if (!bSuccess)  {
+        fprintf(stderr, "failed to encode image: opj_encode\n");
+      }
+    }
+               bSuccess = bSuccess && opj_end_compress(l_codec, l_stream);
+               if (!bSuccess)  {
+                       fprintf(stderr, "failed to encode image: opj_end_compress\n");
+               }
+
+               if (!bSuccess)  {
+                       opj_stream_destroy(l_stream);
+                       fclose(fout);
+      opj_destroy_codec(l_codec);
+      opj_image_destroy(image);
+                       fprintf(stderr, "failed to encode image\n");
+                       return 1;
+               }
+
+               fprintf(stderr,"Generated outfile %s\n",parameters.outfile);
+               /* close and free the byte stream */
+               opj_stream_destroy(l_stream);
+               fclose(fout);
+
+               /* free remaining compression structures */
+               opj_destroy_codec(l_codec);
+
+               /* 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);
+    if(parameters.cp_cinema)    free(img_fol.rates);
+
+       return 0;
+}
diff --git a/src/bin/jp2/opj_decompress.c b/src/bin/jp2/opj_decompress.c
new file mode 100644 (file)
index 0000000..7edb3c9
--- /dev/null
@@ -0,0 +1,975 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * Copyright (c) 2006-2007, Parvatha Elangovan
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "opj_config.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <math.h>
+
+#ifdef _WIN32
+#include "windirent.h"
+#else
+#include <dirent.h>
+#endif /* _WIN32 */
+
+#ifdef _WIN32
+#include <windows.h>
+#define strcasecmp _stricmp
+#define strncasecmp _strnicmp
+#else
+#include <strings.h>
+#endif /* _WIN32 */
+
+#include "openjpeg.h"
+#include "opj_getopt.h"
+#include "convert.h"
+#include "index.h"
+
+#ifdef HAVE_LIBLCMS2
+#include <lcms2.h>
+#endif
+#ifdef HAVE_LIBLCMS1
+#include <lcms.h>
+#endif
+#include "color.h"
+
+#include "format_defs.h"
+
+typedef struct dircnt{
+       /** Buffer for holding images read from Directory*/
+       char *filename_buf;
+       /** Pointer to the buffer*/
+       char **filename;
+}dircnt_t;
+
+
+typedef struct img_folder{
+       /** The directory path of the folder containing input images*/
+       char *imgdirpath;
+       /** Output format*/
+       const char *out_format;
+       /** Enable option*/
+       char set_imgdir;
+       /** Enable Cod Format for output*/
+       char set_out_format;
+
+}img_fol_t;
+
+/* -------------------------------------------------------------------------- */
+/* Declarations                                                               */
+int get_num_images(char *imgdirpath);
+int load_images(dircnt_t *dirptr, char *imgdirpath);
+int get_file_format(const char *filename);
+char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_dparameters_t *parameters);
+static int infile_format(const char *fname);
+
+int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,img_fol_t *img_fol, char *indexfilename);
+int parse_DA_values( char* inArg, unsigned int *DA_x0, unsigned int *DA_y0, unsigned int *DA_x1, unsigned int *DA_y1);
+
+/* -------------------------------------------------------------------------- */
+void decode_help_display(void) {
+       fprintf(stdout,"HELP for j2k_to_image\n----\n\n");
+       fprintf(stdout,"- the -h option displays this help information on screen\n\n");
+
+/* UniPG>> */
+       fprintf(stdout,"List of parameters for the JPEG 2000 "
+#ifdef USE_JPWL
+               "+ JPWL "
+#endif /* USE_JPWL */
+               "decoder:\n");
+/* <<UniPG */
+       fprintf(stdout,"\n");
+       fprintf(stdout,"\n");
+       fprintf(stdout,"  -ImgDir \n");
+       fprintf(stdout,"        Image file Directory path \n");
+       fprintf(stdout,"  -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, PNG, BMP, TIF, RAW and TGA formats\n");
+       fprintf(stdout,"  -i <compressed file>\n");
+       fprintf(stdout,"    REQUIRED only if an Input image directory not specified\n");
+       fprintf(stdout,"    Currently accepts J2K-files, JP2-files and JPT-files. The file type\n");
+       fprintf(stdout,"    is identified based on its suffix.\n");
+       fprintf(stdout,"  -o <decompressed file>\n");
+       fprintf(stdout,"    REQUIRED\n");
+       fprintf(stdout,"    Currently accepts PGM, PPM, PNM, PGX, PNG, BMP, TIF, RAW and TGA files\n");
+       fprintf(stdout,"    Binary data is written to the file (not ascii). If a PGX\n");
+       fprintf(stdout,"    filename is given, there will be as many output files as there are\n");
+       fprintf(stdout,"    components: an indice starting from 0 will then be appended to the\n");
+       fprintf(stdout,"    output filename, just before the \"pgx\" extension. If a PGM filename\n");
+       fprintf(stdout,"    is given and there are more than one component, only the first component\n");
+       fprintf(stdout,"    will be written to the file.\n");
+       fprintf(stdout,"  -r <reduce factor>\n");
+       fprintf(stdout,"    Set the number of highest resolution levels to be discarded. The\n");
+       fprintf(stdout,"    image resolution is effectively divided by 2 to the power of the\n");
+       fprintf(stdout,"    number of discarded levels. The reduce factor is limited by the\n");
+       fprintf(stdout,"    smallest total number of decomposition levels among tiles.\n");
+       fprintf(stdout,"  -l <number of quality layers to decode>\n");
+       fprintf(stdout,"    Set the maximum number of quality layers to decode. If there are\n");
+       fprintf(stdout,"    less quality layers than the specified number, all the quality layers\n");
+       fprintf(stdout,"    are decoded.\n");
+       fprintf(stdout,"  -x  \n"); 
+       fprintf(stdout,"    Create an index file *.Idx (-x index_name.Idx) \n");
+       fprintf(stdout,"  -d <x0,y0,x1,y1>\n");
+       fprintf(stdout,"    OPTIONAL\n");
+       fprintf(stdout,"    Decoding area\n");
+       fprintf(stdout,"    By default all the image is decoded.\n");
+       fprintf(stdout,"  -t <tile_number>\n");
+       fprintf(stdout,"    OPTIONAL\n");
+       fprintf(stdout,"    Set the tile number of the decoded tile. Follow the JPEG2000 convention from left-up to bottom-up\n");
+       fprintf(stdout,"    By default all tiles are decoded.\n");
+       fprintf(stdout,"\n");
+/* UniPG>> */
+#ifdef USE_JPWL
+       fprintf(stdout,"  -W <options>\n");
+       fprintf(stdout,"    Activates the JPWL correction capability, if the codestream complies.\n");
+       fprintf(stdout,"    Options can be a comma separated list of <param=val> tokens:\n");
+       fprintf(stdout,"    c, c=numcomps\n");
+       fprintf(stdout,"       numcomps is the number of expected components in the codestream\n");
+       fprintf(stdout,"       (search of first EPB rely upon this, default is %d)\n", JPWL_EXPECTED_COMPONENTS);
+#endif /* USE_JPWL */
+/* <<UniPG */
+       fprintf(stdout,"\n");
+}
+
+/* -------------------------------------------------------------------------- */
+
+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(const char *filename) {
+       unsigned int i;
+       static const char *extension[] = {"pgx", "pnm", "pgm", "ppm", "bmp","tif", "raw", "rawl", "tga", "png", "j2k", "jp2", "jpt", "j2c", "jpc" };
+       static const int format[] = { PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, TIF_DFMT, RAW_DFMT, RAWL_DFMT, TGA_DFMT, PNG_DFMT, J2K_CFMT, JP2_CFMT, JPT_CFMT, J2K_CFMT, J2K_CFMT };
+       char * ext = strrchr(filename, '.');
+       if (ext == NULL)
+               return -1;
+       ext++;
+       if(ext) {
+               for(i = 0; i < sizeof(format)/sizeof(*format); i++) {
+                       if(strcasecmp(ext, extension[i]) == 0) {
+                               return format[i];
+                       }
+               }
+       }
+
+       return -1;
+}
+
+/* -------------------------------------------------------------------------- */
+char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_dparameters_t *parameters){
+       char image_filename[OPJ_PATH_LEN], infilename[OPJ_PATH_LEN],outfilename[OPJ_PATH_LEN],temp_ofname[OPJ_PATH_LEN];
+       char *temp_p, temp1[OPJ_PATH_LEN]="";
+
+       strcpy(image_filename,dirptr->filename[imageno]);
+       fprintf(stderr,"File Number %d \"%s\"\n",imageno,image_filename);
+       parameters->decod_format = infile_format(image_filename);
+       if (parameters->decod_format == -1)
+               return 1;
+       sprintf(infilename,"%s/%s",img_fol->imgdirpath,image_filename);
+       strncpy(parameters->infile, infilename, sizeof(infilename));
+
+       /*Set output file*/
+       strcpy(temp_ofname,strtok(image_filename,"."));
+       while((temp_p = strtok(NULL,".")) != NULL){
+               strcat(temp_ofname,temp1);
+               sprintf(temp1,".%s",temp_p);
+       }
+       if(img_fol->set_out_format==1){
+               sprintf(outfilename,"%s/%s.%s",img_fol->imgdirpath,temp_ofname,img_fol->out_format);
+               strncpy(parameters->outfile, outfilename, sizeof(outfilename));
+       }
+       return 0;
+}
+
+/* -------------------------------------------------------------------------- */
+#define JP2_RFC3745_MAGIC "\x00\x00\x00\x0c\x6a\x50\x20\x20\x0d\x0a\x87\x0a"
+#define JP2_MAGIC "\x0d\x0a\x87\x0a"
+/* position 45: "\xff\x52" */
+#define J2K_CODESTREAM_MAGIC "\xff\x4f\xff\x51"
+
+static int infile_format(const char *fname)
+{
+       FILE *reader;
+       const char *s, *magic_s;
+       int ext_format, magic_format;
+       unsigned char buf[12];
+       unsigned int l_nb_read;
+
+       reader = fopen(fname, "rb");
+
+       if (reader == NULL)
+               return -2;
+
+       memset(buf, 0, 12);
+       l_nb_read = fread(buf, 1, 12, reader);
+       fclose(reader);
+       if (l_nb_read != 12)
+               return -1;
+
+
+
+       ext_format = get_file_format(fname);
+
+       if (ext_format == JPT_CFMT)
+               return JPT_CFMT;
+
+       if (memcmp(buf, JP2_RFC3745_MAGIC, 12) == 0 || memcmp(buf, JP2_MAGIC, 4) == 0) {
+               magic_format = JP2_CFMT;
+               magic_s = ".jp2";
+       }
+       else if (memcmp(buf, J2K_CODESTREAM_MAGIC, 4) == 0) {
+               magic_format = J2K_CFMT;
+               magic_s = ".j2k or .jpc or .j2c";
+       }
+       else
+               return -1;
+
+       if (magic_format == ext_format)
+               return ext_format;
+
+       s = fname + strlen(fname) - 4;
+
+       fputs("\n===========================================\n", stderr);
+       fprintf(stderr, "The extension of this file is incorrect.\n"
+                                       "FOUND %s. SHOULD BE %s\n", s, magic_s);
+       fputs("===========================================\n", stderr);
+
+       return magic_format;
+}
+
+/* -------------------------------------------------------------------------- */
+/**
+ * Parse the command line
+ */
+/* -------------------------------------------------------------------------- */
+int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,img_fol_t *img_fol, char *indexfilename) {
+       /* parse the command line */
+       int totlen, c;
+       opj_option_t long_option[]={
+               {"ImgDir",REQ_ARG, NULL ,'y'},
+               {"OutFor",REQ_ARG, NULL ,'O'},
+       };
+
+       const char optlist[] = "i:o:r:l:x:d:t:"
+
+/* UniPG>> */
+#ifdef USE_JPWL
+                                       "W:"
+#endif /* USE_JPWL */
+/* <<UniPG */
+                       "h"             ;
+       totlen=sizeof(long_option);
+       img_fol->set_out_format = 0;
+       do {
+               c = opj_getopt_long(argc, argv,optlist,long_option,totlen);
+               if (c == -1)
+                       break;
+               switch (c) {
+                       case 'i':                       /* input file */
+                       {
+                               char *infile = opj_optarg;
+                               parameters->decod_format = infile_format(infile);
+                               switch(parameters->decod_format) {
+                                       case J2K_CFMT:
+                                               break;
+                                       case JP2_CFMT:
+                                               break;
+                                       case JPT_CFMT:
+                                               break;
+                                        case -2:
+                                               fprintf(stderr, 
+                                                       "!! infile cannot be read: %s !!\n\n", 
+                                                       infile);
+                                               return 1;
+                                       default:
+                                               fprintf(stderr, 
+                                                       "!! Unrecognized format for infile: %s [accept only *.j2k, *.jp2, *.jpc or *.jpt] !!\n\n", 
+                                                       infile);
+                                               return 1;
+                               }
+                               strncpy(parameters->infile, infile, sizeof(parameters->infile)-1);
+                       }
+                       break;
+                               
+                               /* ----------------------------------------------------- */
+
+                       case 'o':                       /* output file */
+                       {
+                               char *outfile = opj_optarg;
+                               parameters->cod_format = get_file_format(outfile);
+                               switch(parameters->cod_format) {
+                                       case PGX_DFMT:
+                                               break;
+                                       case PXM_DFMT:
+                                               break;
+                                       case BMP_DFMT:
+                                               break;
+                                       case TIF_DFMT:
+                                               break;
+                                       case RAW_DFMT:
+                                               break;
+                                       case RAWL_DFMT:
+                                               break;
+                                       case TGA_DFMT:
+                                               break;
+                                       case PNG_DFMT:
+                                               break;
+                                       default:
+                                               fprintf(stderr, "Unknown output format image %s [only *.pnm, *.pgm, *.ppm, *.pgx, *.bmp, *.tif, *.raw or *.tga]!! \n", outfile);
+                                               return 1;
+                               }
+                               strncpy(parameters->outfile, outfile, sizeof(parameters->outfile)-1);
+                       }
+                       break;
+                       
+                               /* ----------------------------------------------------- */
+
+                       case 'O':                       /* output format */
+                       {
+                               char outformat[50];
+                               char *of = opj_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;
+                                       case RAW_DFMT:
+                                               img_fol->out_format = "raw";
+                                               break;
+                                       case RAWL_DFMT:
+                                               img_fol->out_format = "rawl";
+                                               break;
+                                       case TGA_DFMT:
+                                               img_fol->out_format = "raw";
+                                               break;
+                                       case PNG_DFMT:
+                                               img_fol->out_format = "png";
+                                               break;
+                                       default:
+                                               fprintf(stderr, "Unknown output format image %s [only *.pnm, *.pgm, *.ppm, *.pgx, *.bmp, *.tif, *.raw or *.tga]!! \n", outformat);
+                                               return 1;
+                                               break;
+                               }
+                       }
+                       break;
+
+                               /* ----------------------------------------------------- */
+
+
+                       case 'r':               /* reduce option */
+                       {
+                               sscanf(opj_optarg, "%d", &parameters->cp_reduce);
+                       }
+                       break;
+                       
+                               /* ----------------------------------------------------- */
+      
+
+                       case 'l':               /* layering option */
+                       {
+                               sscanf(opj_optarg, "%d", &parameters->cp_layer);
+                       }
+                       break;
+                       
+                               /* ----------------------------------------------------- */
+
+                       case 'h':                       /* display an help description */
+                               decode_help_display();
+                               return 1;                               
+
+                               /* ------------------------------------------------------ */
+
+                       case 'y':                       /* Image Directory path */
+                               {
+                                       img_fol->imgdirpath = (char*)malloc(strlen(opj_optarg) + 1);
+                                       strcpy(img_fol->imgdirpath,opj_optarg);
+                                       img_fol->set_imgdir=1;
+                               }
+                               break;
+
+                               /* ----------------------------------------------------- */
+
+                       case 'd':               /* Input decode ROI */
+                       {
+                               int size_optarg = (int)strlen(opj_optarg) + 1;
+                               char *ROI_values = (char*) malloc(size_optarg);
+                               ROI_values[0] = '\0';
+                               strncpy(ROI_values, opj_optarg, strlen(opj_optarg));
+                               ROI_values[strlen(opj_optarg)] = '\0';
+                               /*printf("ROI_values = %s [%d / %d]\n", ROI_values, strlen(ROI_values), size_optarg ); */
+                               parse_DA_values( ROI_values, &parameters->DA_x0, &parameters->DA_y0, &parameters->DA_x1, &parameters->DA_y1);
+
+                               free(ROI_values);
+                       }
+                       break;
+
+                       /* ----------------------------------------------------- */
+
+                       case 't':               /* Input tile index */
+                       {
+                               sscanf(opj_optarg, "%d", &parameters->tile_index);
+                               parameters->nb_tile_to_decode = 1;
+                       }
+                       break;
+
+                               /* ----------------------------------------------------- */                                                             
+
+                       case 'x':                       /* Creation of index file */
+                               {
+                                       char *index = opj_optarg;
+                                       strncpy(indexfilename, index, OPJ_PATH_LEN);
+                               }
+                               break;
+                               /* ----------------------------------------------------- */
+                               /* UniPG>> */
+#ifdef USE_JPWL
+                       
+                       case 'W':                       /* activate JPWL correction */
+                       {
+                               char *token = NULL;
+
+                               token = strtok(opj_optarg, ",");
+                               while(token != NULL) {
+
+                                       /* search expected number of components */
+                                       if (*token == 'c') {
+
+                                               static int compno;
+
+                                               compno = JPWL_EXPECTED_COMPONENTS; /* predefined no. of components */
+
+                                               if(sscanf(token, "c=%d", &compno) == 1) {
+                                                       /* Specified */
+                                                       if ((compno < 1) || (compno > 256)) {
+                                                               fprintf(stderr, "ERROR -> invalid number of components c = %d\n", compno);
+                                                               return 1;
+                                                       }
+                                                       parameters->jpwl_exp_comps = compno;
+
+                                               } else if (!strcmp(token, "c")) {
+                                                       /* default */
+                                                       parameters->jpwl_exp_comps = compno; /* auto for default size */
+
+                                               } else {
+                                                       fprintf(stderr, "ERROR -> invalid components specified = %s\n", token);
+                                                       return 1;
+                                               };
+                                       }
+
+                                       /* search maximum number of tiles */
+                                       if (*token == 't') {
+
+                                               static int tileno;
+
+                                               tileno = JPWL_MAXIMUM_TILES; /* maximum no. of tiles */
+
+                                               if(sscanf(token, "t=%d", &tileno) == 1) {
+                                                       /* Specified */
+                                                       if ((tileno < 1) || (tileno > JPWL_MAXIMUM_TILES)) {
+                                                               fprintf(stderr, "ERROR -> invalid number of tiles t = %d\n", tileno);
+                                                               return 1;
+                                                       }
+                                                       parameters->jpwl_max_tiles = tileno;
+
+                                               } else if (!strcmp(token, "t")) {
+                                                       /* default */
+                                                       parameters->jpwl_max_tiles = tileno; /* auto for default size */
+
+                                               } else {
+                                                       fprintf(stderr, "ERROR -> invalid tiles specified = %s\n", token);
+                                                       return 1;
+                                               };
+                                       }
+
+                                       /* next token or bust */
+                                       token = strtok(NULL, ",");
+                               };
+                               parameters->jpwl_correct = OPJ_TRUE;
+                               fprintf(stdout, "JPWL correction capability activated\n");
+                               fprintf(stdout, "- expecting %d components\n", parameters->jpwl_exp_comps);
+                       }
+                       break;  
+#endif /* USE_JPWL */
+/* <<UniPG */            
+
+                               /* ----------------------------------------------------- */
+                       
+                       default:
+                               fprintf(stderr,"WARNING -> this option is not valid \"-%c %s\"\n",c, opj_optarg);
+                               break;
+               }
+       }while(c != -1);
+
+       /* check for possible errors */
+       if(img_fol->set_imgdir==1){
+               if(!(parameters->infile[0]==0)){
+                       fprintf(stderr, "Error: options -ImgDir and -i cannot be used together !!\n");
+                       return 1;
+               }
+               if(img_fol->set_out_format == 0){
+                       fprintf(stderr, "Error: When -ImgDir is used, -OutFor <FORMAT> must be used !!\n");
+                       fprintf(stderr, "Only one format allowed! Valid format PGM, PPM, PNM, PGX, BMP, TIF, RAW and TGA!!\n");
+                       return 1;
+               }
+               if(!((parameters->outfile[0] == 0))){
+                       fprintf(stderr, "Error: options -ImgDir and -o cannot be used together !!\n");
+                       return 1;
+               }
+       }else{
+               if((parameters->infile[0] == 0) || (parameters->outfile[0] == 0)) {
+                       fprintf(stderr, "Example: %s -i image.j2k -o image.pgm\n",argv[0]);
+                       fprintf(stderr, "    Try: %s -h\n",argv[0]);
+                       return 1;
+               }
+       }
+
+       return 0;
+}
+
+/* -------------------------------------------------------------------------- */
+/**
+ * Parse decoding area input values
+ * separator = ","
+ */
+/* -------------------------------------------------------------------------- */
+int parse_DA_values( char* inArg, unsigned int *DA_x0, unsigned int *DA_y0, unsigned int *DA_x1, unsigned int *DA_y1)
+{
+       int it = 0;
+       int values[4];
+       char delims[] = ",";
+       char *result = NULL;
+       result = strtok( inArg, delims );
+
+       while( (result != NULL) && (it < 4 ) ) {
+               values[it] = atoi(result);
+               result = strtok( NULL, delims );
+               it++;
+       }
+
+       if (it != 4) {
+               return EXIT_FAILURE;
+       }
+       else{
+               *DA_x0 = values[0]; *DA_y0 = values[1];
+               *DA_x1 = values[2]; *DA_y1 = values[3];
+               return EXIT_SUCCESS;
+       }
+}
+
+/* -------------------------------------------------------------------------- */
+
+/**
+sample error callback expecting a FILE* client object
+*/
+void error_callback(const char *msg, void *client_data) {
+       (void)client_data;
+       fprintf(stdout, "[ERROR] %s", msg);
+}
+/**
+sample warning callback expecting a FILE* client object
+*/
+void warning_callback(const char *msg, void *client_data) {
+       (void)client_data;
+       fprintf(stdout, "[WARNING] %s", msg);
+}
+/**
+sample debug callback expecting no client object
+*/
+void info_callback(const char *msg, void *client_data) {
+       (void)client_data;
+       fprintf(stdout, "[INFO] %s", msg);
+}
+
+/* -------------------------------------------------------------------------- */
+/**
+ * J2K_TO_IMAGE MAIN
+ */
+/* -------------------------------------------------------------------------- */
+int main(int argc, char **argv)
+{
+       FILE *fsrc = NULL;
+
+       opj_dparameters_t parameters;                   /* decompression parameters */
+       opj_image_t* image = NULL;
+       opj_stream_t *l_stream = NULL;                          /* Stream */
+       opj_codec_t* l_codec = NULL;                            /* Handle to a decompressor */
+       opj_codestream_index_t* cstr_index = NULL;
+
+       char indexfilename[OPJ_PATH_LEN];       /* index file name */
+
+       OPJ_INT32 num_images, imageno;
+       img_fol_t img_fol;
+       dircnt_t *dirptr = NULL;
+
+       /* set decoding parameters to default values */
+       opj_set_default_decoder_parameters(&parameters);
+
+       /* FIXME Initialize indexfilename and img_fol */
+       *indexfilename = 0;
+
+       /* Initialize img_fol */
+       memset(&img_fol,0,sizeof(img_fol_t));
+
+       /* parse input and get user encoding parameters */
+       if(parse_cmdline_decoder(argc, argv, &parameters,&img_fol, indexfilename) == 1) {
+               return EXIT_FAILURE;
+       }
+
+       /* Initialize reading of directory */
+       if(img_fol.set_imgdir==1){      
+               int it_image;
+               num_images=get_num_images(img_fol.imgdirpath);
+
+               dirptr=(dircnt_t*)malloc(sizeof(dircnt_t));
+               if(dirptr){
+                       dirptr->filename_buf = (char*)malloc(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 EXIT_FAILURE;
+                       }
+                       for(it_image=0;it_image<num_images;it_image++){
+                               dirptr->filename[it_image] = dirptr->filename_buf + it_image*OPJ_PATH_LEN;
+                       }
+               }
+               if(load_images(dirptr,img_fol.imgdirpath)==1){
+                       return EXIT_FAILURE;
+               }
+               if (num_images==0){
+                       fprintf(stdout,"Folder is empty\n");
+                       return EXIT_FAILURE;
+               }
+       }else{
+               num_images=1;
+       }
+
+       /*Decoding image one by one*/
+       for(imageno = 0; imageno < num_images ; imageno++)      {
+
+               fprintf(stderr,"\n");
+
+               if(img_fol.set_imgdir==1){
+                       if (get_next_file(imageno, dirptr,&img_fol, &parameters)) {
+                               fprintf(stderr,"skipping file...\n");
+                               continue;
+                       }
+               }
+
+               /* read the input file and put it in memory */
+               /* ---------------------------------------- */
+               fsrc = fopen(parameters.infile, "rb");
+               if (!fsrc) {
+                       fprintf(stderr, "ERROR -> failed to open %s for reading\n", parameters.infile);
+                       return EXIT_FAILURE;
+               }
+
+               l_stream = opj_stream_create_default_file_stream(fsrc,1);
+               if (!l_stream){
+                       fclose(fsrc);
+                       fprintf(stderr, "ERROR -> failed to create the stream from the file\n");
+                       return EXIT_FAILURE;
+               }
+
+               /* decode the JPEG2000 stream */
+               /* ---------------------- */
+
+               switch(parameters.decod_format) {
+                       case J2K_CFMT:  /* JPEG-2000 codestream */
+                       {
+                               /* Get a decoder handle */
+                               l_codec = opj_create_decompress(CODEC_J2K);
+                               break;
+                       }
+                       case JP2_CFMT:  /* JPEG 2000 compressed image data */
+                       {
+                               /* Get a decoder handle */
+                               l_codec = opj_create_decompress(CODEC_JP2);
+                               break;
+                       }
+                       case JPT_CFMT:  /* JPEG 2000, JPIP */
+                       {
+                               /* Get a decoder handle */
+                               l_codec = opj_create_decompress(CODEC_JPT);
+                               break;
+                       }
+                       default:
+                               fprintf(stderr, "skipping file..\n");
+                               opj_stream_destroy(l_stream);
+                               continue;
+               }
+
+               /* catch events using our callbacks and give a local context */         
+               opj_set_info_handler(l_codec, info_callback,00);
+               opj_set_warning_handler(l_codec, warning_callback,00);
+               opj_set_error_handler(l_codec, error_callback,00);
+
+               /* Setup the decoder decoding parameters using user parameters */
+               if ( !opj_setup_decoder(l_codec, &parameters) ){
+                       fprintf(stderr, "ERROR -> j2k_dump: failed to setup the decoder\n");
+                       opj_stream_destroy(l_stream);
+                       fclose(fsrc);
+                       opj_destroy_codec(l_codec);
+                       return EXIT_FAILURE;
+               }
+
+
+               /* Read the main header of the codestream and if necessary the JP2 boxes*/
+               if(! opj_read_header(l_stream, l_codec, &image)){
+                       fprintf(stderr, "ERROR -> j2k_to_image: failed to read the header\n");
+                       opj_stream_destroy(l_stream);
+                       fclose(fsrc);
+                       opj_destroy_codec(l_codec);
+                       opj_image_destroy(image);
+                       return EXIT_FAILURE;
+               }
+
+               if (!parameters.nb_tile_to_decode) {
+                       /* Optional if you want decode the entire image */
+                       if (!opj_set_decode_area(l_codec, image, parameters.DA_x0,
+                                       parameters.DA_y0, parameters.DA_x1, parameters.DA_y1)){
+                               fprintf(stderr, "ERROR -> j2k_to_image: failed to set the decoded area\n");
+                               opj_stream_destroy(l_stream);
+                               opj_destroy_codec(l_codec);
+                               opj_image_destroy(image);
+                               fclose(fsrc);
+                               return EXIT_FAILURE;
+                       }
+
+                       /* Get the decoded image */
+                       if (!(opj_decode(l_codec, l_stream, image) && opj_end_decompress(l_codec,       l_stream))) {
+                               fprintf(stderr,"ERROR -> j2k_to_image: failed to decode image!\n");
+                               opj_destroy_codec(l_codec);
+                               opj_stream_destroy(l_stream);
+                               opj_image_destroy(image);
+                               fclose(fsrc);
+                               return EXIT_FAILURE;
+                       }
+               }
+               else {
+
+                       /* It is just here to illustrate how to use the resolution after set parameters */
+                       /*if (!opj_set_decoded_resolution_factor(l_codec, 5)) {
+                               fprintf(stderr, "ERROR -> j2k_to_image: failed to set the resolution factor tile!\n");
+                               opj_destroy_codec(l_codec);
+                               opj_stream_destroy(l_stream);
+                               opj_image_destroy(image);
+                               fclose(fsrc);
+                               return EXIT_FAILURE;
+                       }*/
+
+                       if (!opj_get_decoded_tile(l_codec, l_stream, image, parameters.tile_index)) {
+                               fprintf(stderr, "ERROR -> j2k_to_image: failed to decode tile!\n");
+                               opj_destroy_codec(l_codec);
+                               opj_stream_destroy(l_stream);
+                               opj_image_destroy(image);
+                               fclose(fsrc);
+                               return EXIT_FAILURE;
+                       }
+                       fprintf(stdout, "tile %d is decoded!\n\n", parameters.tile_index);
+               }
+
+               /* Close the byte stream */
+               opj_stream_destroy(l_stream);
+               fclose(fsrc);
+
+               if(image->color_space == CLRSPC_SYCC){
+                       color_sycc_to_rgb(image); /* FIXME */
+               }
+
+               if(image->icc_profile_buf) {
+#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
+                       color_apply_icc_profile(image); /* FIXME */
+#endif
+                       free(image->icc_profile_buf);
+                       image->icc_profile_buf = NULL; image->icc_profile_len = 0;
+               }
+
+               /* create output image */
+               /* ------------------- */
+               switch (parameters.cod_format) {
+               case PXM_DFMT:                  /* PNM PGM PPM */
+                       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 */
+                       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 */
+                       if(imagetobmp(image, parameters.outfile)){
+                               fprintf(stdout,"Outfile %s not generated\n",parameters.outfile);
+                       }
+                       else {
+                               fprintf(stdout,"Generated Outfile %s\n",parameters.outfile);
+                       }
+                       break;
+#ifdef HAVE_LIBTIFF
+               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;
+#endif /* HAVE_LIBTIFF */
+               case RAW_DFMT:                  /* RAW */
+                       if(imagetoraw(image, parameters.outfile)){
+                               fprintf(stdout,"Error generating raw file. Outfile %s not generated\n",parameters.outfile);
+                       }
+                       else {
+                               fprintf(stdout,"Successfully generated Outfile %s\n",parameters.outfile);
+                       }
+                       break;
+
+               case RAWL_DFMT:                 /* RAWL */
+                       if(imagetorawl(image, parameters.outfile)){
+                               fprintf(stdout,"Error generating rawl file. Outfile %s not generated\n",parameters.outfile);
+                       }
+                       else {
+                               fprintf(stdout,"Successfully generated Outfile %s\n",parameters.outfile);
+                       }
+                       break;
+
+               case TGA_DFMT:                  /* TGA */
+                       if(imagetotga(image, parameters.outfile)){
+                               fprintf(stdout,"Error generating tga file. Outfile %s not generated\n",parameters.outfile);
+                       }
+                       else {
+                               fprintf(stdout,"Successfully generated Outfile %s\n",parameters.outfile);
+                       }
+                       break;
+#ifdef HAVE_LIBPNG
+               case PNG_DFMT:                  /* PNG */
+                       if(imagetopng(image, parameters.outfile)){
+                               fprintf(stdout,"Error generating png file. Outfile %s not generated\n",parameters.outfile);
+                       }
+                       else {
+                               fprintf(stdout,"Successfully generated Outfile %s\n",parameters.outfile);
+                       }
+                       break;
+#endif /* HAVE_LIBPNG */
+/* Can happen if output file is TIFF or PNG
+ * and HAVE_LIBTIF or HAVE_LIBPNG is undefined
+*/
+                       default:
+                               fprintf(stderr,"Outfile %s not generated\n",parameters.outfile);
+               }
+
+               /* free remaining structures */
+               if (l_codec) {
+                       opj_destroy_codec(l_codec);
+               }
+
+
+               /* free image data structure */
+               opj_image_destroy(image);
+
+               /* destroy the codestream index */
+               opj_destroy_cstr_index(&cstr_index);
+
+       }
+       return EXIT_SUCCESS;
+}
+/*end main*/
+
+
+
+
diff --git a/src/bin/jp2/opj_dump.c b/src/bin/jp2/opj_dump.c
new file mode 100644 (file)
index 0000000..6c63c2c
--- /dev/null
@@ -0,0 +1,585 @@
+/*
+ * Copyright (c) 2010, Mathieu Malaterre, GDCM
+ * Copyright (c) 2011, Mickael Savinaud, Communications & Systemes <mickael.savinaud@c-s.fr>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "opj_config.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <math.h>
+
+#ifdef _WIN32
+#include "windirent.h"
+#else
+#include <dirent.h>
+#endif /* _WIN32 */
+
+#ifdef _WIN32
+#include <windows.h>
+#else
+#include <strings.h>
+#define _stricmp strcasecmp
+#define _strnicmp strncasecmp
+#endif /* _WIN32 */
+
+#include "openjpeg.h"
+#include "opj_getopt.h"
+#include "convert.h"
+#include "index.h"
+
+#include "format_defs.h"
+
+typedef struct dircnt{
+       /** Buffer for holding images read from Directory*/
+       char *filename_buf;
+       /** Pointer to the buffer*/
+       char **filename;
+}dircnt_t;
+
+
+typedef struct img_folder{
+       /** The directory path of the folder containing input images*/
+       char *imgdirpath;
+       /** Output format*/
+       const char *out_format;
+       /** Enable option*/
+       char set_imgdir;
+       /** Enable Cod Format for output*/
+       char set_out_format;
+
+}img_fol_t;
+
+/* -------------------------------------------------------------------------- */
+/* Declarations                                                               */
+int get_num_images(char *imgdirpath);
+int load_images(dircnt_t *dirptr, char *imgdirpath);
+int get_file_format(const char *filename);
+char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_dparameters_t *parameters);
+static int infile_format(const char *fname);
+
+int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,img_fol_t *img_fol);
+int parse_DA_values( char* inArg, unsigned int *DA_x0, unsigned int *DA_y0, unsigned int *DA_x1, unsigned int *DA_y1);
+
+/* -------------------------------------------------------------------------- */
+void decode_help_display(void) {
+       fprintf(stdout,"HELP for j2k_dump\n----\n\n");
+       fprintf(stdout,"- the -h option displays this help information on screen\n\n");
+
+/* UniPG>> */
+       fprintf(stdout,"List of parameters for the JPEG 2000 "
+#ifdef USE_JPWL
+               "+ JPWL "
+#endif /* USE_JPWL */
+               "decoder:\n");
+/* <<UniPG */
+       fprintf(stdout,"\n");
+       fprintf(stdout,"\n");
+       fprintf(stdout,"  -ImgDir \n");
+       fprintf(stdout,"        Image file Directory path \n");
+       fprintf(stdout,"  -i <compressed file>\n");
+       fprintf(stdout,"    REQUIRED only if an Input image directory not specified\n");
+       fprintf(stdout,"    Currently accepts J2K-files, JP2-files and JPT-files. The file type\n");
+       fprintf(stdout,"    is identified based on its suffix.\n");
+       fprintf(stdout,"  -o <output file>\n");
+       fprintf(stdout,"    OPTIONAL\n");
+       fprintf(stdout,"    Output file where file info will be dump.\n");
+       fprintf(stdout,"    By default it will be in the stdout.\n");
+       fprintf(stdout,"  -v "); /* FIXME WIP_MSD */
+       fprintf(stdout,"    OPTIONAL\n");
+       fprintf(stdout,"    Activate or not the verbose mode (display info and warning message)\n");
+       fprintf(stdout,"    By default verbose mode is off.\n");
+       fprintf(stdout,"\n");
+}
+
+/* -------------------------------------------------------------------------- */
+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(const char *filename) {
+       unsigned int i;
+       static const char *extension[] = {"pgx", "pnm", "pgm", "ppm", "bmp","tif", "raw", "tga", "png", "j2k", "jp2", "jpt", "j2c", "jpc"  };
+       static const int format[] = { PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, TIF_DFMT, RAW_DFMT, TGA_DFMT, PNG_DFMT, J2K_CFMT, JP2_CFMT, JPT_CFMT, J2K_CFMT, J2K_CFMT };
+       char * ext = strrchr(filename, '.');
+       if (ext == NULL)
+               return -1;
+       ext++;
+       if(ext) {
+               for(i = 0; i < sizeof(format)/sizeof(*format); i++) {
+                       if(_strnicmp(ext, extension[i], 3) == 0) {
+                               return format[i];
+                       }
+               }
+       }
+
+       return -1;
+}
+
+/* -------------------------------------------------------------------------- */
+char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_dparameters_t *parameters){
+       char image_filename[OPJ_PATH_LEN], infilename[OPJ_PATH_LEN],outfilename[OPJ_PATH_LEN],temp_ofname[OPJ_PATH_LEN];
+       char *temp_p, temp1[OPJ_PATH_LEN]="";
+
+       strcpy(image_filename,dirptr->filename[imageno]);
+       fprintf(stderr,"File Number %d \"%s\"\n",imageno,image_filename);
+       parameters->decod_format = get_file_format(image_filename);
+       if (parameters->decod_format == -1)
+               return 1;
+       sprintf(infilename,"%s/%s",img_fol->imgdirpath,image_filename);
+       strncpy(parameters->infile, infilename, sizeof(infilename));
+
+       /*Set output file*/
+       strcpy(temp_ofname,strtok(image_filename,"."));
+       while((temp_p = strtok(NULL,".")) != NULL){
+               strcat(temp_ofname,temp1);
+               sprintf(temp1,".%s",temp_p);
+       }
+       if(img_fol->set_out_format==1){
+               sprintf(outfilename,"%s/%s.%s",img_fol->imgdirpath,temp_ofname,img_fol->out_format);
+               strncpy(parameters->outfile, outfilename, sizeof(outfilename));
+       }
+       return 0;
+}
+
+/* -------------------------------------------------------------------------- */
+#define JP2_RFC3745_MAGIC "\x00\x00\x00\x0c\x6a\x50\x20\x20\x0d\x0a\x87\x0a"
+#define JP2_MAGIC "\x0d\x0a\x87\x0a"
+/* position 45: "\xff\x52" */
+#define J2K_CODESTREAM_MAGIC "\xff\x4f\xff\x51"
+
+static int infile_format(const char *fname)
+{
+       FILE *reader;
+       const char *s, *magic_s;
+       int ext_format, magic_format;
+       unsigned char buf[12];
+       unsigned int l_nb_read; 
+
+       reader = fopen(fname, "rb");
+
+       if (reader == NULL)
+               return -1;
+
+       memset(buf, 0, 12);
+       l_nb_read = fread(buf, 1, 12, reader);
+       fclose(reader);
+       if (l_nb_read != 12)
+               return -1;
+
+
+
+       ext_format = get_file_format(fname);
+
+       if (ext_format == JPT_CFMT)
+               return JPT_CFMT;
+
+       if (memcmp(buf, JP2_RFC3745_MAGIC, 12) == 0 || memcmp(buf, JP2_MAGIC, 4) == 0) {
+               magic_format = JP2_CFMT;
+               magic_s = ".jp2";
+       }
+       else if (memcmp(buf, J2K_CODESTREAM_MAGIC, 4) == 0) {
+               magic_format = J2K_CFMT;
+               magic_s = ".j2k or .jpc or .j2c";
+       }
+       else
+               return -1;
+
+       if (magic_format == ext_format)
+               return ext_format;
+
+       s = fname + strlen(fname) - 4;
+
+       fputs("\n===========================================\n", stderr);
+       fprintf(stderr, "The extension of this file is incorrect.\n"
+                                       "FOUND %s. SHOULD BE %s\n", s, magic_s);
+       fputs("===========================================\n", stderr);
+
+       return magic_format;
+}
+/* -------------------------------------------------------------------------- */
+/**
+ * Parse the command line
+ */
+/* -------------------------------------------------------------------------- */
+int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,img_fol_t *img_fol) {
+       int totlen, c;
+       opj_option_t long_option[]={
+               {"ImgDir",REQ_ARG, NULL ,'y'},
+       };
+       const char optlist[] = "i:o:hv";
+
+       totlen=sizeof(long_option);
+       img_fol->set_out_format = 0;
+       do {
+               c = opj_getopt_long(argc, argv,optlist,long_option,totlen);
+               if (c == -1)
+                       break;
+               switch (c) {
+                       case 'i':                       /* input file */
+                       {
+                               char *infile = opj_optarg;
+                               parameters->decod_format = infile_format(infile);
+                               switch(parameters->decod_format) {
+                                       case J2K_CFMT:
+                                               break;
+                                       case JP2_CFMT:
+                                               break;
+                                       case JPT_CFMT:
+                                               break;
+                                       default:
+                                               fprintf(stderr, 
+                                                       "!! Unrecognized format for infile : %s [accept only *.j2k, *.jp2, *.jpc or *.jpt] !!\n\n", 
+                                                       infile);
+                                               return 1;
+                               }
+                               strncpy(parameters->infile, infile, sizeof(parameters->infile)-1);
+                       }
+                       break;
+
+                               /* ------------------------------------------------------ */
+
+                       case 'o':     /* output file */
+                       {
+                         char *outfile = opj_optarg;
+                         strncpy(parameters->outfile, outfile, sizeof(parameters->outfile)-1);
+                       }
+                       break;
+                               
+                               /* ----------------------------------------------------- */
+
+                       case 'h':                       /* display an help description */
+                               decode_help_display();
+                               return 1;                               
+
+                               /* ------------------------------------------------------ */
+
+                       case 'y':                       /* Image Directory path */
+                       {
+                               img_fol->imgdirpath = (char*)malloc(strlen(opj_optarg) + 1);
+                               strcpy(img_fol->imgdirpath,opj_optarg);
+                               img_fol->set_imgdir=1;
+                       }
+                       break;
+
+                       /* ----------------------------------------------------- */
+
+                       case 'v':               /* Verbose mode */
+                       {
+                               parameters->m_verbose = 1;
+                       }
+                       break;
+                       
+                               /* ----------------------------------------------------- */
+                       default:
+                               fprintf(stderr,"WARNING -> this option is not valid \"-%c %s\"\n",c, opj_optarg);
+                               break;
+               }
+       }while(c != -1);
+
+       /* check for possible errors */
+       if(img_fol->set_imgdir==1){
+               if(!(parameters->infile[0]==0)){
+                       fprintf(stderr, "Error: options -ImgDir and -i cannot be used together !!\n");
+                       return 1;
+               }
+               if(img_fol->set_out_format == 0){
+                       fprintf(stderr, "Error: When -ImgDir is used, -OutFor <FORMAT> must be used !!\n");
+                       fprintf(stderr, "Only one format allowed! Valid format PGM, PPM, PNM, PGX, BMP, TIF, RAW and TGA!!\n");
+                       return 1;
+               }
+               if(!(parameters->outfile[0] == 0)){
+                       fprintf(stderr, "Error: options -ImgDir and -o cannot be used together !!\n");
+                       return 1;
+               }
+       }else{
+               if(parameters->infile[0] == 0) {
+                       fprintf(stderr, "Example: %s -i image.j2k\n",argv[0]);
+                       fprintf(stderr, "    Try: %s -h\n",argv[0]);
+                       return 1;
+               }
+       }
+
+       return 0;
+}
+
+/* -------------------------------------------------------------------------- */
+
+/**
+sample error debug callback expecting no client object
+*/
+void error_callback(const char *msg, void *client_data) {
+       (void)client_data;
+       fprintf(stdout, "[ERROR] %s", msg);
+}
+/**
+sample warning debug callback expecting no client object
+*/
+void warning_callback(const char *msg, void *client_data) {
+       (void)client_data;
+       fprintf(stdout, "[WARNING] %s", msg);
+}
+/**
+sample debug callback expecting no client object
+*/
+void info_callback(const char *msg, void *client_data) {
+       (void)client_data;
+       fprintf(stdout, "[INFO] %s", msg);
+}
+
+/* -------------------------------------------------------------------------- */
+/**
+ * J2K_DUMP MAIN
+ */
+/* -------------------------------------------------------------------------- */
+int main(int argc, char *argv[])
+{
+       FILE *fsrc = NULL, *fout = NULL;
+
+       opj_dparameters_t parameters;                   /* Decompression parameters */
+       opj_image_t* image = NULL;                                      /* Image structure */
+       opj_codec_t* l_codec = NULL;                            /* Handle to a decompressor */
+       opj_stream_t *l_stream = NULL;                          /* Stream */
+       opj_codestream_info_v2_t* cstr_info = NULL;
+       opj_codestream_index_t* cstr_index = NULL;
+
+       OPJ_INT32 num_images, imageno;
+       img_fol_t img_fol;
+       dircnt_t *dirptr = NULL;
+
+#ifdef MSD
+       opj_bool l_go_on = OPJ_TRUE;
+       OPJ_UINT32 l_max_data_size = 1000;
+       OPJ_BYTE * l_data = (OPJ_BYTE *) malloc(1000);
+#endif
+
+       /* Set decoding parameters to default values */
+       opj_set_default_decoder_parameters(&parameters);
+
+       /* Initialize img_fol */
+       memset(&img_fol,0,sizeof(img_fol_t));
+
+       /* Parse input and get user encoding parameters */
+       if(parse_cmdline_decoder(argc, argv, &parameters,&img_fol) == 1) {
+               return EXIT_FAILURE;
+       }
+
+       /* Initialize reading of directory */
+       if(img_fol.set_imgdir==1){      
+               int it_image;
+               num_images=get_num_images(img_fol.imgdirpath);
+
+               dirptr=(dircnt_t*)malloc(sizeof(dircnt_t));
+               if(dirptr){
+                       dirptr->filename_buf = (char*)malloc(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 EXIT_FAILURE;
+                       }
+
+                       for(it_image=0;it_image<num_images;it_image++){
+                               dirptr->filename[it_image] = dirptr->filename_buf + it_image*OPJ_PATH_LEN;
+                       }
+               }
+               if(load_images(dirptr,img_fol.imgdirpath)==1){
+                       return EXIT_FAILURE;
+               }
+
+               if (num_images==0){
+                       fprintf(stdout,"Folder is empty\n");
+                       return EXIT_FAILURE;
+               }
+       }else{
+               num_images=1;
+       }
+
+       /* Try to open for writing the output file if necessary */
+       if (parameters.outfile[0] != 0){
+               fout = fopen(parameters.outfile,"w");
+               if (!fout){
+                       fprintf(stderr, "ERROR -> failed to open %s for writing\n", parameters.outfile);
+                       return EXIT_FAILURE;
+               }
+       }
+       else
+               fout = stdout;
+
+       /* Read the header of each image one by one */
+       for(imageno = 0; imageno < num_images ; imageno++){
+
+               fprintf(stderr,"\n");
+
+               if(img_fol.set_imgdir==1){
+                       if (get_next_file(imageno, dirptr,&img_fol, &parameters)) {
+                               fprintf(stderr,"skipping file...\n");
+                               continue;
+                       }
+               }
+
+               /* Read the input file and put it in memory */
+               /* ---------------------------------------- */
+               fsrc = fopen(parameters.infile, "rb");
+               if (!fsrc) {
+                       fprintf(stderr, "ERROR -> failed to open %s for reading\n", parameters.infile);
+                       return EXIT_FAILURE;
+               }
+
+               l_stream = opj_stream_create_default_file_stream(fsrc,1);
+               if (!l_stream){
+                       fclose(fsrc);
+                       fprintf(stderr, "ERROR -> failed to create the stream from the file\n");
+                       return EXIT_FAILURE;
+               }
+
+               /* Read the JPEG2000 stream */
+               /* ------------------------ */
+
+               switch(parameters.decod_format) {
+                       case J2K_CFMT:  /* JPEG-2000 codestream */
+                       {
+                               /* Get a decoder handle */
+                               l_codec = opj_create_decompress(CODEC_J2K);
+                               break;
+                       }
+                       case JP2_CFMT:  /* JPEG 2000 compressed image data */
+                       {
+                               /* Get a decoder handle */
+                               l_codec = opj_create_decompress(CODEC_JP2);
+                               break;
+                       }
+                       case JPT_CFMT:  /* JPEG 2000, JPIP */
+                       {
+                               /* Get a decoder handle */
+                               l_codec = opj_create_decompress(CODEC_JPT);
+                               break;
+                       }
+                       default:
+                               fprintf(stderr, "skipping file..\n");
+                               opj_stream_destroy(l_stream);
+                               continue;
+               }
+
+               /* catch events using our callbacks and give a local context */         
+               opj_set_info_handler(l_codec, info_callback,00);
+               opj_set_warning_handler(l_codec, warning_callback,00);
+               opj_set_error_handler(l_codec, error_callback,00);
+
+               /* Setup the decoder decoding parameters using user parameters */
+               if ( !opj_setup_decoder(l_codec, &parameters) ){
+                       fprintf(stderr, "ERROR -> j2k_dump: failed to setup the decoder\n");
+                       opj_stream_destroy(l_stream);
+                       fclose(fsrc);
+                       opj_destroy_codec(l_codec);
+                       fclose(fout);
+                       return EXIT_FAILURE;
+               }
+
+               /* Read the main header of the codestream and if necessary the JP2 boxes*/
+               if(! opj_read_header(l_stream, l_codec, &image)){
+                       fprintf(stderr, "ERROR -> j2k_dump: failed to read the header\n");
+                       opj_stream_destroy(l_stream);
+                       fclose(fsrc);
+                       opj_destroy_codec(l_codec);
+                       opj_image_destroy(image);
+                       fclose(fout);
+                       return EXIT_FAILURE;
+               }
+
+               opj_dump_codec(l_codec, OPJ_IMG_INFO | OPJ_J2K_MH_INFO | OPJ_J2K_MH_IND, fout );
+
+               cstr_info = opj_get_cstr_info(l_codec);
+
+               cstr_index = opj_get_cstr_index(l_codec);
+
+               /* close the byte stream */
+               opj_stream_destroy(l_stream);
+               fclose(fsrc);
+
+               /* free remaining structures */
+               if (l_codec) {
+                       opj_destroy_codec(l_codec);
+               }
+
+               /* destroy the image header */
+               opj_image_destroy(image);
+
+               /* destroy the codestream index */
+               opj_destroy_cstr_index(&cstr_index);
+
+               /* destroy the codestream info */
+               opj_destroy_cstr_info(&cstr_info);
+
+       }
+
+       /* Close the output file */
+       fclose(fout);
+
+  return EXIT_SUCCESS;
+}