[trunk] Rework r2077
authorMathieu Malaterre <mathieu.malaterre@gmail.com>
Thu, 25 Oct 2012 07:39:59 +0000 (07:39 +0000)
committerMathieu Malaterre <mathieu.malaterre@gmail.com>
Thu, 25 Oct 2012 07:39:59 +0000 (07:39 +0000)
r2077 did expose too much of the detail implementation of OpenJPEG. Rework dependencies in between JPIP file level details and JPIP client/server arch.
Move JPIP file level functionalities back into OpenJP2 as was the case in openjpeg 1.5.x. Use new cio func.

31 files changed:
src/bin/jpip/CMakeLists.txt
src/bin/jpip/opj_jpip_compress.c [deleted file]
src/lib/openjp2/CMakeLists.txt
src/lib/openjp2/cidx_manager.c [new file with mode: 0644]
src/lib/openjp2/cidx_manager.h [new file with mode: 0644]
src/lib/openjp2/cio.c
src/lib/openjp2/cio.h
src/lib/openjp2/event.c
src/lib/openjp2/event.h
src/lib/openjp2/function_list.c
src/lib/openjp2/function_list.h
src/lib/openjp2/indexbox_manager.h [new file with mode: 0644]
src/lib/openjp2/j2k.c
src/lib/openjp2/j2k.h
src/lib/openjp2/jp2.c
src/lib/openjp2/jp2.h
src/lib/openjp2/openjpeg.h
src/lib/openjp2/phix_manager.c [new file with mode: 0644]
src/lib/openjp2/ppix_manager.c [new file with mode: 0644]
src/lib/openjp2/thix_manager.c [new file with mode: 0644]
src/lib/openjp2/tpix_manager.c [new file with mode: 0644]
src/lib/openjpip/CMakeLists.txt
src/lib/openjpip/cidx_manager.c [deleted file]
src/lib/openjpip/cidx_manager.h [deleted file]
src/lib/openjpip/indexbox_manager.h [deleted file]
src/lib/openjpip/openjpip.c
src/lib/openjpip/openjpip.h
src/lib/openjpip/phix_manager.c [deleted file]
src/lib/openjpip/ppix_manager.c [deleted file]
src/lib/openjpip/thix_manager.c [deleted file]
src/lib/openjpip/tpix_manager.c [deleted file]

index 0ba6fa2fce59f8da1e4b3c5fed33be01d67c2b94..507726788515fd328b19682af987d2aa015f8769 100644 (file)
@@ -46,7 +46,6 @@ set(EXES
   opj_dec_server
   opj_jpip_transcode
   opj_jpip_test
-  opj_jpip_compress
   )
 foreach(exe ${EXES})
   if(${exe} STREQUAL "opj_jpip_compress")
diff --git a/src/bin/jpip/opj_jpip_compress.c b/src/bin/jpip/opj_jpip_compress.c
deleted file mode 100644 (file)
index 2ff3809..0000000
+++ /dev/null
@@ -1,1893 +0,0 @@
-/*
- * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2007, Professor Benoit Macq
- * Copyright (c) 2001-2003, David Janssens
- * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
- * Copyright (c) 2005, Herve Drolon, FreeImage Team
- * Copyright (c) 2006-2007, Parvatha Elangovan
- * Copyright (c) 2008, Jerome Fimes, Communications & Systemes <jerome.fimes@c-s.fr>
- * Copyright (c) 2012, Mathieu Malaterre
- * 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 "openjpip.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;
-
-static 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");
-}
-
-static OPJ_PROG_ORDER give_progression(const 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;
-}
-
-static unsigned int get_num_images(char *imgdirpath){
-       DIR *dir;
-       struct dirent* content;
-       unsigned 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;
-}
-
-static 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;
-}
-
-static 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;
-}
-
-static char * get_file_name(char *name){
-       char *fname;
-       fname= (char*)opj_malloc(OPJ_PATH_LEN*sizeof(char));
-       fname= strtok(name,".");
-       return fname;
-}
-
-static char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_cparameters_t *parameters){
-       char 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;
-}
-
-static 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;
-
-}
-
-static 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;
-}
-
-/* ------------------------------------------------------------------------------------ */
-
-static 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:"
-#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 *) opj_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*)opj_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*)opj_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 *) opj_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 *) opj_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*/
-                               opj_free(lSpace);
-                               opj_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 */
-/* ------------------------------------------------------ */
-                       
-                       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
-*/
-static 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
-*/
-static 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
-*/
-static 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
-*/
-static 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
-*/
-static void warning_callback(const char *msg, void *client_data) {
-       (void)client_data;
-       fprintf(stdout, "[WARNING] %s", msg);
-}
-/**
-sample debug callback expecting no client object
-*/
-static 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 */
-
-       unsigned 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*)opj_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*)opj_malloc(clen+strlen(version)+11);
-               sprintf(parameters.cp_comment,"%s%s with JPWL", comment, version);
-#else
-               parameters.cp_comment = (char*)opj_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*)opj_malloc(sizeof(dircnt_t));
-               if(dirptr){
-                       dirptr->filename_buf = (char*)opj_malloc(num_images*OPJ_PATH_LEN*sizeof(char)); /* Stores at max 10 image file names*/
-                       dirptr->filename = (char**) opj_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 JP2_CFMT:  /* JPEG 2000 compressed image data */
-                       {
-                               /* Get a decoder handle */
-                               l_codec = opj_jpip_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*) opj_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;
-        }
-      }
-      opj_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)   opj_free(parameters.cp_comment);
-       if(parameters.cp_matrice)   opj_free(parameters.cp_matrice);
-    if(parameters.cp_cinema)    opj_free(img_fol.rates);
-
-       return 0;
-}
index ed8f681c1a5dabec7fa08291b8badd75be964f15..d1e08cf603e6922a5f5bf5c1dfd67a511ed53b09 100644 (file)
@@ -7,7 +7,6 @@ install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/opj_config.h
 include_directories(
   ${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
 )
-
 # Defines the source code for the library
 set(OPENJPEG_SRCS
   ${CMAKE_CURRENT_SOURCE_DIR}/bio.c
@@ -31,6 +30,17 @@ set(OPENJPEG_SRCS
   ${CMAKE_CURRENT_SOURCE_DIR}/tgt.c
   ${CMAKE_CURRENT_SOURCE_DIR}/function_list.c
 )
+if(BUILD_JPIP)
+  add_definitions(-DUSE_JPIP)
+  set(OPENJPEG_SRCS
+    ${OPENJPEG_SRCS}
+    ${CMAKE_CURRENT_SOURCE_DIR}/cidx_manager.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/phix_manager.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/ppix_manager.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/thix_manager.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/tpix_manager.c
+  )
+endif()
 
 # Build the library
 if(WIN32)
diff --git a/src/lib/openjp2/cidx_manager.c b/src/lib/openjp2/cidx_manager.c
new file mode 100644 (file)
index 0000000..0c6c669
--- /dev/null
@@ -0,0 +1,469 @@
+/*
+ * $Id: cidx_manager.c 897 2011-08-28 21:43:57Z Kaori.Hagihara@gmail.com $
+ *
+ * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2011, Professor Benoit Macq
+ * Copyright (c) 2003-2004, Yannick Verschueren
+ * Copyright (c) 2010-2011, Kaori Hagihara
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "opj_includes.h"
+
+
+/* 
+ * Write CPTR Codestream finder box
+ *
+ * @param[in] coff offset of j2k codestream
+ * @param[in] clen length of j2k codestream
+ * @param[in] cio  file output handle
+ */
+void write_cptr(int coff, int clen, opj_cio_t *cio);
+
+void write_cptr_v2(int coff, int clen, opj_stream_private_t *cio,
+              opj_event_mgr_t * p_manager );
+
+void write_manf_v2(int second, int v, opj_jp2_box_t *box, opj_stream_private_t *cio,
+              opj_event_mgr_t * p_manager );
+
+/* 
+ * Write main header index table (box)
+ *
+ * @param[in] coff offset of j2k codestream
+ * @param[in] cstr_info codestream information
+ * @param[in] cio  file output handle
+ * @return         length of mainmhix box
+ */
+int write_mainmhix( int coff, opj_codestream_info_t cstr_info, opj_cio_t *cio);
+
+
+/* 
+ * Check if EPH option is used
+ *
+ * @param[in] coff    offset of j2k codestream
+ * @param[in] markers marker information
+ * @param[in] marknum number of markers
+ * @param[in] cio     file output handle
+ * @return            true if EPH is used
+ */
+opj_bool check_EPHuse( int coff, opj_marker_info_t *markers, int marknum, opj_cio_t *cio);
+
+
+int write_cidx( int offset, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t cstr_info, int j2klen)
+{
+  int len, i, lenp;
+  opj_jp2_box_t *box;
+  int num_box = 0;
+  opj_bool  EPHused;
+  (void)image; /* unused ? */
+
+  lenp = -1;
+  box = (opj_jp2_box_t *)opj_calloc( 32, sizeof(opj_jp2_box_t));
+
+  for (i=0;i<2;i++){
+  
+    if(i)
+      cio_seek( cio, lenp);
+
+    lenp = cio_tell( cio);
+
+    cio_skip( cio, 4);              /* L [at the end] */
+    cio_write( cio, JPIP_CIDX, 4);  /* CIDX           */
+    write_cptr( offset, cstr_info.codestream_size, cio);
+
+    write_manf( i, num_box, box, cio);
+    
+    num_box = 0;
+    box[num_box].length = write_mainmhix( offset, cstr_info, cio);
+    box[num_box].type = JPIP_MHIX;
+    num_box++;
+
+    box[num_box].length = write_tpix( offset, cstr_info, j2klen, cio);
+    box[num_box].type = JPIP_TPIX;
+    num_box++;
+      
+    box[num_box].length = write_thix( offset, cstr_info, cio);
+    box[num_box].type = JPIP_THIX;
+    num_box++;
+
+    EPHused = check_EPHuse( offset, cstr_info.marker, cstr_info.marknum, cio);
+      
+    box[num_box].length = write_ppix( offset, cstr_info, EPHused, j2klen, cio);
+    box[num_box].type = JPIP_PPIX;
+    num_box++;
+    
+    box[num_box].length = write_phix( offset, cstr_info, EPHused, j2klen, cio);
+    box[num_box].type = JPIP_PHIX;
+    num_box++;
+      
+    len = cio_tell( cio)-lenp;
+    cio_seek( cio, lenp);
+    cio_write( cio, len, 4);        /* L             */
+    cio_seek( cio, lenp+len);
+  }
+
+  opj_free( box);
+  
+  return len;
+}
+
+int write_cidx_v2( int offset, opj_stream_private_t *cio, opj_codestream_info_t cstr_info, int j2klen,
+              opj_event_mgr_t * p_manager )
+{
+  int len, i, lenp;
+  opj_jp2_box_t *box;
+  int num_box = 0;
+  opj_bool  EPHused;
+  OPJ_BYTE l_data_header [4];
+
+  lenp = -1;
+  box = (opj_jp2_box_t *)opj_calloc( 32, sizeof(opj_jp2_box_t));
+
+  for (i=0;i<2;i++){
+  
+    if(i)
+      opj_stream_seek(cio,lenp,p_manager);
+
+
+    lenp = opj_stream_tell (cio);
+
+    opj_stream_skip(cio, 4, p_manager); /* L [at the end] */
+#if 0
+    cio_write( cio, JPIP_CIDX, 4);  /* CIDX           */
+#else
+    opj_write_bytes(l_data_header,JPIP_CIDX,4); /* CIDX */
+    opj_stream_write_data(cio,l_data_header,4,p_manager);
+#endif
+    write_cptr_v2( offset, cstr_info.codestream_size, cio,p_manager);
+
+    write_manf_v2( i, num_box, box, cio,p_manager);
+    
+    num_box = 0;
+    box[num_box].length = write_mainmhix_v2( offset, cstr_info, cio,p_manager);
+    box[num_box].type = JPIP_MHIX;
+    num_box++;
+
+    box[num_box].length = write_tpix_v2( offset, cstr_info, j2klen, cio,p_manager);
+    box[num_box].type = JPIP_TPIX;
+    num_box++;
+      
+    box[num_box].length = write_thix_v2( offset, cstr_info, cio, p_manager);
+    box[num_box].type = JPIP_THIX;
+    num_box++;
+
+    EPHused = check_EPHuse_v2( offset, cstr_info.marker, cstr_info.marknum, cio,p_manager);
+      
+    box[num_box].length = write_ppix_v2( offset, cstr_info, EPHused, j2klen, cio,p_manager);
+    box[num_box].type = JPIP_PPIX;
+    num_box++;
+    
+    box[num_box].length = write_phix_v2( offset, cstr_info, EPHused, j2klen, cio,p_manager);
+    box[num_box].type = JPIP_PHIX;
+    num_box++;
+      
+#if 0
+    len = cio_tell( cio)-lenp;
+    cio_seek( cio, lenp);
+    cio_write( cio, len, 4);        /* L             */
+    cio_seek( cio, lenp+len);
+#else
+    len = opj_stream_tell(cio)-lenp;
+    opj_stream_seek(cio, lenp,p_manager);
+    opj_write_bytes(l_data_header,len,4);/* L  */
+    opj_stream_write_data(cio,l_data_header,4,p_manager);
+    opj_stream_seek(cio, lenp+len,p_manager);
+#endif
+  }
+
+  opj_free( box);
+  
+  return len;
+}
+
+void write_cptr(int coff, int clen, opj_cio_t *cio)
+{
+  int len, lenp;
+
+  lenp = cio_tell( cio);
+  cio_skip( cio, 4);               /* L [at the end]     */
+  cio_write( cio, JPIP_CPTR, 4);   /* T                  */
+  cio_write( cio, 0, 2);           /* DR  A PRECISER !!  */
+  cio_write( cio, 0, 2);           /* CONT               */
+  cio_write( cio, coff, 8);    /* COFF A PRECISER !! */
+  cio_write( cio, clen, 8);    /* CLEN               */
+  len = cio_tell( cio) - lenp;
+  cio_seek( cio, lenp);
+  cio_write( cio, len, 4);         /* L                  */
+  cio_seek( cio, lenp+len);
+}
+
+void write_cptr_v2(int coff, int clen, opj_stream_private_t *cio,
+              opj_event_mgr_t * p_manager )
+{
+  OPJ_BYTE l_data_header [3*8];
+  int len, lenp;
+
+#if 0
+  lenp = cio_tell( cio);
+  cio_skip( cio, 4);               /* L [at the end]     */
+  cio_write( cio, JPIP_CPTR, 4);   /* T                  */
+  cio_write( cio, 0, 2);           /* DR  A PRECISER !!  */
+  cio_write( cio, 0, 2);           /* CONT               */
+  cio_write( cio, coff, 8);    /* COFF A PRECISER !! */
+  cio_write( cio, clen, 8);    /* CLEN               */
+  len = cio_tell( cio) - lenp;
+  cio_seek( cio, lenp);
+  cio_write( cio, len, 4);         /* L                  */
+  cio_seek( cio, lenp+len);
+#else
+  lenp = opj_stream_tell(cio);
+  opj_stream_skip( cio, 4, p_manager);               /* L [at the end]     */
+  opj_write_bytes( l_data_header, JPIP_CPTR, 4);   /* T                  */
+  opj_write_bytes( l_data_header+4, 0, 2);           /* DR  A PRECISER !!  */
+  opj_write_bytes( l_data_header+6, 0, 2);           /* CONT               */
+  opj_write_bytes( l_data_header+8, coff, 8);    /* COFF A PRECISER !! */
+  opj_write_bytes( l_data_header+16, clen, 8);    /* CLEN               */
+  opj_stream_write_data(cio,l_data_header,3*8,p_manager);
+
+  len = opj_stream_tell(cio) - lenp;
+  opj_stream_seek(cio,lenp,p_manager);
+  opj_write_bytes(l_data_header, len, 4);         /* L                  */
+  opj_stream_write_data(cio,l_data_header,4,p_manager);
+  opj_stream_seek(cio, lenp+len,p_manager);
+#endif
+}
+
+void write_manf(int second, int v, opj_jp2_box_t *box, opj_cio_t *cio)
+{
+  int len, lenp, i;
+  
+  lenp = cio_tell( cio); 
+  cio_skip( cio, 4);                         /* L [at the end]                    */
+  cio_write( cio, JPIP_MANF,4);              /* T                                 */
+
+  if (second){                          /* Write only during the second pass */
+    for( i=0; i<v; i++){
+      cio_write( cio, box[i].length, 4);  /* Box length                     */ 
+      cio_write( cio, box[i].type, 4); /* Box type                       */
+    }
+  }
+
+  len = cio_tell( cio) - lenp;
+  cio_seek( cio, lenp);
+  cio_write( cio, len, 4);                   /* L                                 */
+  cio_seek( cio, lenp+len);
+}
+
+void write_manf_v2(int second, int v, opj_jp2_box_t *box, opj_stream_private_t *cio,
+              opj_event_mgr_t * p_manager )
+{
+  OPJ_BYTE l_data_header [4];
+  int len, lenp, i;
+  
+#if 0
+  lenp = cio_tell( cio); 
+  cio_skip( cio, 4);                         /* L [at the end]                    */
+  cio_write( cio, JPIP_MANF,4);              /* T                                 */
+#else
+  lenp = opj_stream_tell(cio);
+  opj_stream_skip( cio, 4, p_manager);             /* L [at the end]     */
+  opj_write_bytes( l_data_header, JPIP_MANF, 4);   /* T                  */
+  opj_stream_write_data(cio,l_data_header,4,p_manager);
+#endif
+
+  if (second){                          /* Write only during the second pass */
+    for( i=0; i<v; i++){
+#if 0
+      cio_write( cio, box[i].length, 4);  /* Box length                     */ 
+      cio_write( cio, box[i].type, 4); /* Box type                       */
+#else
+      opj_write_bytes( l_data_header, box[i].length, 4); /* Box length                     */
+      opj_stream_write_data(cio,l_data_header,4,p_manager);
+      opj_write_bytes( l_data_header, box[i].type, 4); /* Box type                       */
+      opj_stream_write_data(cio,l_data_header,4,p_manager);
+#endif
+    }
+  }
+
+#if 0
+  len = cio_tell( cio) - lenp;
+  cio_seek( cio, lenp);
+  cio_write( cio, len, 4);                   /* L                                 */
+  cio_seek( cio, lenp+len);
+#else
+  len = opj_stream_tell(cio) - lenp;
+  opj_stream_seek(cio,lenp,p_manager);
+  opj_write_bytes(l_data_header, len, 4);/* L                                 */
+  opj_stream_write_data(cio,l_data_header,4,p_manager);
+  opj_stream_seek(cio,lenp+len,p_manager);
+#endif
+}
+
+int write_mainmhix( int coff, opj_codestream_info_t cstr_info, opj_cio_t *cio)
+{
+  int i;
+  int len, lenp;
+  
+  lenp = cio_tell( cio);
+  cio_skip( cio, 4);                               /* L [at the end]                    */
+  cio_write( cio, JPIP_MHIX, 4);                   /* MHIX                              */
+
+  cio_write( cio, cstr_info.main_head_end-cstr_info.main_head_start+1, 8);        /* TLEN                              */
+
+  for(i = 1; i < cstr_info.marknum; i++){    /* Marker restricted to 1 apparition, skip SOC marker */
+    cio_write( cio, cstr_info.marker[i].type, 2);
+    cio_write( cio, 0, 2);
+    cio_write( cio, cstr_info.marker[i].pos-coff, 8);
+    cio_write( cio, cstr_info.marker[i].len, 2);
+  }
+
+  len = cio_tell( cio) - lenp;
+  cio_seek( cio, lenp);
+  cio_write( cio, len, 4);        /* L           */
+  cio_seek( cio, lenp+len);
+  
+  return len;
+}
+
+int write_mainmhix_v2( int coff, opj_codestream_info_t cstr_info, opj_stream_private_t *cio,
+              opj_event_mgr_t * p_manager )
+{
+  OPJ_BYTE l_data_header [8];
+  int i;
+  int len, lenp;
+  
+#if 0
+  lenp = cio_tell( cio);
+  cio_skip( cio, 4);                               /* L [at the end]                    */
+  cio_write( cio, JPIP_MHIX, 4);                   /* MHIX                              */
+#else
+  lenp = opj_stream_tell (cio);
+  opj_stream_skip(cio, 4, p_manager);               /* L [at the end]                    */
+  opj_write_bytes(l_data_header,JPIP_MHIX,4);       /* MHIX                              */
+  opj_stream_write_data(cio,l_data_header,4,p_manager);
+#endif
+
+#if 0
+  cio_write( cio, cstr_info.main_head_end-cstr_info.main_head_start+1, 8);        /* TLEN                              */
+#else
+  opj_write_bytes(l_data_header, cstr_info.main_head_end-cstr_info.main_head_start+1, 8);        /* TLEN                              */
+  opj_stream_write_data(cio,l_data_header,8,p_manager);
+#endif
+
+  for(i = 1; i < cstr_info.marknum; i++){    /* Marker restricted to 1 apparition, skip SOC marker */
+#if 0
+    cio_write( cio, cstr_info.marker[i].type, 2);
+    cio_write( cio, 0, 2);
+    cio_write( cio, cstr_info.marker[i].pos-coff, 8);
+    cio_write( cio, cstr_info.marker[i].len, 2);
+#else
+    opj_write_bytes( l_data_header, cstr_info.marker[i].type, 2);
+    opj_write_bytes( l_data_header+2, 0, 2);
+    opj_stream_write_data(cio,l_data_header,4,p_manager);
+    opj_write_bytes( l_data_header, cstr_info.marker[i].pos-coff, 8);
+    opj_stream_write_data(cio,l_data_header,8,p_manager);
+    opj_write_bytes( l_data_header, cstr_info.marker[i].len, 2);
+    opj_stream_write_data(cio,l_data_header,2,p_manager);
+#endif
+  }
+
+#if 0
+  len = cio_tell( cio) - lenp;
+  cio_seek( cio, lenp);
+  cio_write( cio, len, 4);        /* L           */
+  cio_seek( cio, lenp+len);
+#else
+  len = opj_stream_tell(cio)-lenp;
+  opj_stream_seek(cio, lenp,p_manager);
+  opj_write_bytes(l_data_header,len,4);/* L  */
+  opj_stream_write_data(cio,l_data_header,4,p_manager);
+  opj_stream_seek(cio, lenp+len,p_manager);
+#endif
+  
+  return len;
+}
+
+opj_bool check_EPHuse( int coff, opj_marker_info_t *markers, int marknum, opj_cio_t *cio)
+{
+  opj_bool EPHused = OPJ_FALSE;
+  int i=0;
+  int org_pos;
+  unsigned int Scod;
+
+  for(i = 0; i < marknum; i++){
+    if( markers[i].type == J2K_MS_COD){
+      org_pos = cio_tell( cio);
+      cio_seek( cio, coff+markers[i].pos+2);
+      
+      Scod = cio_read( cio, 1);
+      if( ((Scod >> 2) & 1))
+  EPHused = OPJ_TRUE;
+      cio_seek( cio, org_pos);
+
+      break;
+    }
+  }    
+  return EPHused;
+}
+
+opj_bool check_EPHuse_v2( int coff, opj_marker_info_t *markers, int marknum, opj_stream_private_t *cio,
+              opj_event_mgr_t * p_manager )
+{
+  OPJ_BYTE l_data_header [4];
+  opj_bool EPHused = OPJ_FALSE;
+  int i=0;
+  int org_pos;
+  unsigned int Scod;
+
+  for(i = 0; i < marknum; i++)
+    {
+    if( markers[i].type == J2K_MS_COD)
+      {
+#if 0
+      org_pos = cio_tell( cio);
+      cio_seek( cio, coff+markers[i].pos+2);
+#else
+      org_pos = opj_stream_tell(cio);
+      opj_stream_seek(cio, coff+markers[i].pos+2,p_manager);
+#endif
+
+#if 0
+      Scod = cio_read( cio, 1);
+#else
+      opj_stream_read_data(cio,l_data_header,1,p_manager);
+      opj_read_bytes(l_data_header,&Scod,1);
+#endif
+      if( ((Scod >> 2) & 1))
+        EPHused = OPJ_TRUE;
+#if 0
+      cio_seek( cio, org_pos);
+#else
+      opj_stream_seek( cio, org_pos, p_manager);
+#endif
+
+      break;
+      }
+    }    
+  return EPHused;
+}
diff --git a/src/lib/openjp2/cidx_manager.h b/src/lib/openjp2/cidx_manager.h
new file mode 100644 (file)
index 0000000..1792550
--- /dev/null
@@ -0,0 +1,60 @@
+/*
+ * $Id: cidx_manager.h 897 2011-08-28 21:43:57Z Kaori.Hagihara@gmail.com $
+ *
+ * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2011, Professor Benoit Macq
+ * Copyright (c) 2003-2004, Yannick Verschueren
+ * Copyright (c) 2010-2011, Kaori Hagihara
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*! \file
+ *  \brief Modification of jpip.h from 2KAN indexer
+ */
+
+
+#ifndef  CIDX_MANAGER_H_
+# define CIDX_MANAGER_H_
+
+#include "openjpeg.h"
+
+
+/* 
+ * Write Codestream index box (superbox)
+ *
+ * @param[in] offset    offset of j2k codestream
+ * @param[in] cio       file output handle
+ * @param[in] image     image data
+ * @param[in] cstr_info codestream information
+ * @param[in] j2klen    length of j2k codestream
+ * @return              length of cidx box
+ */
+int write_cidx( int offset, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t cstr_info, int j2klen);
+int write_cidx_v2( int offset, opj_stream_private_t *cio, opj_codestream_info_t cstr_info, int j2klen,
+              opj_event_mgr_t * p_manager );
+
+opj_bool check_EPHuse_v2( int coff, opj_marker_info_t *markers, int marknum, opj_stream_private_t *cio,
+              opj_event_mgr_t * p_manager );
+
+#endif      /* !CIDX_MANAGER_H_ */
index 5b2edd49867669e895c2fbaf3951131339f27937..553809cc3b97abef1607a7485df978a7d82f7ee4 100644 (file)
@@ -33,7 +33,7 @@
 
 /* ----------------------------------------------------------------------- */
 
-opj_cio_t* OPJ_CALLCONV opj_cio_open(opj_common_ptr cinfo, unsigned char *buffer, int length) {
+opj_cio_t* opj_cio_open(opj_common_ptr cinfo, unsigned char *buffer, int length) {
        opj_cp_t *cp = NULL;
        opj_cio_t *cio = (opj_cio_t*)opj_malloc(sizeof(opj_cio_t));
        if(!cio) return NULL;
@@ -80,7 +80,7 @@ opj_cio_t* OPJ_CALLCONV opj_cio_open(opj_common_ptr cinfo, unsigned char *buffer
        return cio;
 }
 
-void OPJ_CALLCONV opj_cio_close(opj_cio_t *cio) {
+void opj_cio_close(opj_cio_t *cio) {
        if(cio) {
                if(cio->openmode == OPJ_STREAM_WRITE) {
                        /* destroy the allocated buffer */
@@ -96,7 +96,7 @@ void OPJ_CALLCONV opj_cio_close(opj_cio_t *cio) {
 /*
  * Get position in byte stream.
  */
-OPJ_OFF_T OPJ_CALLCONV cio_tell(opj_cio_t *cio) {
+OPJ_OFF_T cio_tell(opj_cio_t *cio) {
        return cio->bp - cio->start;
 }
 
@@ -105,7 +105,7 @@ OPJ_OFF_T OPJ_CALLCONV cio_tell(opj_cio_t *cio) {
  *
  * pos : position, in number of bytes, from the beginning of the stream
  */
-void OPJ_CALLCONV cio_seek(opj_cio_t *cio, int pos) {
+void cio_seek(opj_cio_t *cio, int pos) {
        cio->bp = cio->start + pos;
 }
 
@@ -154,7 +154,7 @@ unsigned char cio_bytein(opj_cio_t *cio) {
  * v : value to write
  * n : number of bytes to write
  */
-unsigned int OPJ_CALLCONV cio_write(opj_cio_t *cio, unsigned long long int v, int n) {
+unsigned int cio_write(opj_cio_t *cio, unsigned long long int v, int n) {
        int i;
        for (i = n - 1; i >= 0; i--) {
                if( !cio_byteout(cio, (unsigned char) ((v >> (i << 3)) & 0xff)) )
@@ -171,7 +171,7 @@ unsigned int OPJ_CALLCONV cio_write(opj_cio_t *cio, unsigned long long int v, in
  *
  * return : value of the n bytes read
  */
-unsigned int OPJ_CALLCONV cio_read(opj_cio_t *cio, int n) {
+unsigned int cio_read(opj_cio_t *cio, int n) {
        int i;
        unsigned int v = 0;
        for (i = n - 1; i >= 0; i--) {
@@ -186,13 +186,13 @@ unsigned int OPJ_CALLCONV cio_read(opj_cio_t *cio, int n) {
  *
  * n : number of bytes to skip
  */
-void OPJ_CALLCONV cio_skip(opj_cio_t *cio, int n) {
+void cio_skip(opj_cio_t *cio, int n) {
        cio->bp += n;
 }
 
 /* ----------------------------------------------------------------------- */
 
-void OPJ_CALLCONV opj_write_bytes_BE (OPJ_BYTE * p_buffer, OPJ_UINT32 p_value, OPJ_UINT32 p_nb_bytes)
+void opj_write_bytes_BE (OPJ_BYTE * p_buffer, OPJ_UINT32 p_value, OPJ_UINT32 p_nb_bytes)
 {
        const OPJ_BYTE * l_data_ptr = ((const OPJ_BYTE *) &p_value) + p_nb_bytes;
 
@@ -201,7 +201,7 @@ void OPJ_CALLCONV opj_write_bytes_BE (OPJ_BYTE * p_buffer, OPJ_UINT32 p_value, O
        memcpy(p_buffer,l_data_ptr,p_nb_bytes);
 }
 
-void OPJ_CALLCONV opj_write_bytes_LE (OPJ_BYTE * p_buffer, OPJ_UINT32 p_value, OPJ_UINT32 p_nb_bytes)
+void opj_write_bytes_LE (OPJ_BYTE * p_buffer, OPJ_UINT32 p_value, OPJ_UINT32 p_nb_bytes)
 {
        const OPJ_BYTE * l_data_ptr = ((const OPJ_BYTE *) &p_value) + p_nb_bytes - 1;
        OPJ_UINT32 i;
@@ -213,7 +213,7 @@ void OPJ_CALLCONV opj_write_bytes_LE (OPJ_BYTE * p_buffer, OPJ_UINT32 p_value, O
        }
 }
 
-void OPJ_CALLCONV opj_read_bytes_BE(const OPJ_BYTE * p_buffer, OPJ_UINT32 * p_value, OPJ_UINT32 p_nb_bytes)
+void opj_read_bytes_BE(const OPJ_BYTE * p_buffer, OPJ_UINT32 * p_value, OPJ_UINT32 p_nb_bytes)
 {
        OPJ_BYTE * l_data_ptr = ((OPJ_BYTE *) p_value);
 
@@ -223,7 +223,7 @@ void OPJ_CALLCONV opj_read_bytes_BE(const OPJ_BYTE * p_buffer, OPJ_UINT32 * p_va
        memcpy(l_data_ptr+4-p_nb_bytes,p_buffer,p_nb_bytes);
 }
 
-void OPJ_CALLCONV opj_read_bytes_LE(const OPJ_BYTE * p_buffer, OPJ_UINT32 * p_value, OPJ_UINT32 p_nb_bytes)
+void opj_read_bytes_LE(const OPJ_BYTE * p_buffer, OPJ_UINT32 * p_value, OPJ_UINT32 p_nb_bytes)
 {
        OPJ_BYTE * l_data_ptr = ((OPJ_BYTE *) p_value) + p_nb_bytes-1;
        OPJ_UINT32 i;
@@ -242,7 +242,7 @@ void opj_write_double_BE(OPJ_BYTE * p_buffer, OPJ_FLOAT64 p_value)
        memcpy(p_buffer,l_data_ptr,sizeof(OPJ_FLOAT64));
 }
 
-void OPJ_CALLCONV opj_write_double_LE(OPJ_BYTE * p_buffer, OPJ_FLOAT64 p_value)
+void opj_write_double_LE(OPJ_BYTE * p_buffer, OPJ_FLOAT64 p_value)
 {
        const OPJ_BYTE * l_data_ptr = ((const OPJ_BYTE *) &p_value) + sizeof(OPJ_FLOAT64) - 1;
        OPJ_UINT32 i;
@@ -338,7 +338,7 @@ opj_stream_t* OPJ_CALLCONV opj_stream_default_create(opj_bool l_is_input)
        return opj_stream_create(J2K_STREAM_CHUNK_SIZE,l_is_input);
 }
 
-OPJ_API void OPJ_CALLCONV opj_stream_destroy(opj_stream_t* p_stream)
+void OPJ_CALLCONV opj_stream_destroy(opj_stream_t* p_stream)
 {
        opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
        
@@ -349,7 +349,7 @@ OPJ_API void OPJ_CALLCONV opj_stream_destroy(opj_stream_t* p_stream)
        }
 }
 
-OPJ_API void OPJ_CALLCONV opj_stream_set_read_function(opj_stream_t* p_stream, opj_stream_read_fn p_function)
+void OPJ_CALLCONV opj_stream_set_read_function(opj_stream_t* p_stream, opj_stream_read_fn p_function)
 {
        opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
 
@@ -360,7 +360,7 @@ OPJ_API void OPJ_CALLCONV opj_stream_set_read_function(opj_stream_t* p_stream, o
        l_stream->m_read_fn = p_function;
 }
 
-OPJ_API void OPJ_CALLCONV opj_stream_set_seek_function(opj_stream_t* p_stream, opj_stream_seek_fn p_function)
+void OPJ_CALLCONV opj_stream_set_seek_function(opj_stream_t* p_stream, opj_stream_seek_fn p_function)
 {
        opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
        
@@ -370,7 +370,7 @@ OPJ_API void OPJ_CALLCONV opj_stream_set_seek_function(opj_stream_t* p_stream, o
        l_stream->m_seek_fn = p_function;
 }
 
-OPJ_API void OPJ_CALLCONV opj_stream_set_write_function(opj_stream_t* p_stream, opj_stream_write_fn p_function)
+void OPJ_CALLCONV opj_stream_set_write_function(opj_stream_t* p_stream, opj_stream_write_fn p_function)
 {
        opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
        
@@ -381,7 +381,7 @@ OPJ_API void OPJ_CALLCONV opj_stream_set_write_function(opj_stream_t* p_stream,
        l_stream->m_write_fn = p_function;
 }
 
-OPJ_API void OPJ_CALLCONV opj_stream_set_skip_function(opj_stream_t* p_stream, opj_stream_skip_fn p_function)
+void OPJ_CALLCONV opj_stream_set_skip_function(opj_stream_t* p_stream, opj_stream_skip_fn p_function)
 {
        opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
        
@@ -392,19 +392,19 @@ OPJ_API void OPJ_CALLCONV opj_stream_set_skip_function(opj_stream_t* p_stream, o
        l_stream->m_skip_fn = p_function;
 }
 
-OPJ_API void OPJ_CALLCONV opj_stream_set_user_data(opj_stream_t* p_stream, void * p_data)
+void OPJ_CALLCONV opj_stream_set_user_data(opj_stream_t* p_stream, void * p_data)
 {
        opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
        l_stream->m_user_data = p_data;
 }
 
-OPJ_API void OPJ_CALLCONV opj_stream_set_user_data_length(opj_stream_t* p_stream, OPJ_UINT64 data_length)
+void OPJ_CALLCONV opj_stream_set_user_data_length(opj_stream_t* p_stream, OPJ_UINT64 data_length)
 {
        opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
        l_stream->m_user_data_length = data_length;
 }
 
-OPJ_SIZE_T OPJ_CALLCONV opj_stream_read_data (opj_stream_private_t * p_stream,OPJ_BYTE * p_buffer, OPJ_SIZE_T p_size, opj_event_mgr_t * p_event_mgr)
+OPJ_SIZE_T opj_stream_read_data (opj_stream_private_t * p_stream,OPJ_BYTE * p_buffer, OPJ_SIZE_T p_size, opj_event_mgr_t * p_event_mgr)
 {
        OPJ_SIZE_T l_read_nb_bytes = 0;
        if (p_stream->m_bytes_in_buffer >= p_size) {
@@ -511,7 +511,7 @@ OPJ_SIZE_T OPJ_CALLCONV opj_stream_read_data (opj_stream_private_t * p_stream,OP
        }
 }
 
-OPJ_SIZE_T OPJ_CALLCONV opj_stream_write_data (opj_stream_private_t * p_stream,
+OPJ_SIZE_T opj_stream_write_data (opj_stream_private_t * p_stream,
                                                                  const OPJ_BYTE * p_buffer,
                                                                  OPJ_SIZE_T p_size, 
                                                                  opj_event_mgr_t * p_event_mgr)
@@ -683,7 +683,7 @@ OPJ_OFF_T opj_stream_write_skip (opj_stream_private_t * p_stream, OPJ_OFF_T p_si
        return l_skip_nb_bytes;
 }
 
-OPJ_OFF_T OPJ_CALLCONV opj_stream_tell (const opj_stream_private_t * p_stream)
+OPJ_OFF_T opj_stream_tell (const opj_stream_private_t * p_stream)
 {
        return p_stream->m_byte_offset;
 }
@@ -697,7 +697,7 @@ OPJ_OFF_T opj_stream_get_number_byte_left (const opj_stream_private_t * p_stream
                                0;
 }
 
-OPJ_OFF_T OPJ_CALLCONV opj_stream_skip (opj_stream_private_t * p_stream, OPJ_OFF_T p_size, opj_event_mgr_t * p_event_mgr)
+OPJ_OFF_T opj_stream_skip (opj_stream_private_t * p_stream, OPJ_OFF_T p_size, opj_event_mgr_t * p_event_mgr)
 {
        assert(p_size >= 0);
        return p_stream->m_opj_skip(p_stream,p_size,p_event_mgr);
@@ -744,13 +744,13 @@ opj_bool opj_stream_write_seek (opj_stream_private_t * p_stream, OPJ_OFF_T p_siz
        return OPJ_TRUE;
 }
 
-opj_bool OPJ_CALLCONV opj_stream_seek (opj_stream_private_t * p_stream, OPJ_OFF_T p_size, struct opj_event_mgr * p_event_mgr)
+opj_bool opj_stream_seek (opj_stream_private_t * p_stream, OPJ_OFF_T p_size, struct opj_event_mgr * p_event_mgr)
 {
        assert(p_size >= 0);
        return p_stream->m_opj_seek(p_stream,p_size,p_event_mgr);
 }
 
-opj_bool OPJ_CALLCONV opj_stream_has_seek (const opj_stream_private_t * p_stream)
+opj_bool opj_stream_has_seek (const opj_stream_private_t * p_stream)
 {
        return p_stream->m_seek_fn != opj_stream_default_seek;
 }
index 08063d1dc5335361ab1fb7c3f7c3ed42b94a366f..f5c4a86290ca8f7cfc20f573d2548f7724100360 100644 (file)
@@ -71,20 +71,20 @@ Write some bytes
 @param n Number of bytes to write
 @return Returns the number of bytes written or 0 if an error occured
 */
-OPJ_API unsigned int OPJ_CALLCONV cio_write(opj_cio_t *cio, unsigned long long int v, int n);
+unsigned int cio_write(opj_cio_t *cio, unsigned long long int v, int n);
 /**
 Read some bytes
 @param cio CIO handle
 @param n Number of bytes to read
 @return Returns the value of the n bytes read
 */
-OPJ_API unsigned int OPJ_CALLCONV cio_read(opj_cio_t *cio, int n);
+unsigned int cio_read(opj_cio_t *cio, int n);
 /**
 Skip some bytes
 @param cio CIO handle
 @param n Number of bytes to skip
 */
-OPJ_API void OPJ_CALLCONV cio_skip(opj_cio_t *cio, int n);
+void cio_skip(opj_cio_t *cio, int n);
 /* ----------------------------------------------------------------------- */
 /*@}*/
 
@@ -206,7 +206,7 @@ opj_stream_private_t;
  * @param p_value              the value to write
  * @param p_nb_bytes   the number of bytes to write
 */
-OPJ_API void OPJ_CALLCONV opj_write_bytes_BE (OPJ_BYTE * p_buffer, OPJ_UINT32 p_value, OPJ_UINT32 p_nb_bytes);
+void opj_write_bytes_BE (OPJ_BYTE * p_buffer, OPJ_UINT32 p_value, OPJ_UINT32 p_nb_bytes);
 
 /**
  * Reads some bytes from the given data buffer, this function is used in Big Endian cpus.
@@ -215,7 +215,7 @@ OPJ_API void OPJ_CALLCONV opj_write_bytes_BE (OPJ_BYTE * p_buffer, OPJ_UINT32 p_
  * @param p_nb_bytes   the nb bytes to read.
  * @return                             the number of bytes read or -1 if an error occured.
  */
-OPJ_API void OPJ_CALLCONV opj_read_bytes_BE(const OPJ_BYTE * p_buffer, OPJ_UINT32 * p_value, OPJ_UINT32 p_nb_bytes);
+void opj_read_bytes_BE(const OPJ_BYTE * p_buffer, OPJ_UINT32 * p_value, OPJ_UINT32 p_nb_bytes);
 
 /**
  * Write some bytes to the given data buffer, this function is used in Little Endian cpus.
@@ -224,7 +224,7 @@ OPJ_API void OPJ_CALLCONV opj_read_bytes_BE(const OPJ_BYTE * p_buffer, OPJ_UINT3
  * @param p_nb_bytes   the number of bytes to write
  * @return                             the number of bytes written or -1 if an error occured
 */
-OPJ_API void OPJ_CALLCONV opj_write_bytes_LE (OPJ_BYTE * p_buffer, OPJ_UINT32 p_value, OPJ_UINT32 p_nb_bytes);
+void opj_write_bytes_LE (OPJ_BYTE * p_buffer, OPJ_UINT32 p_value, OPJ_UINT32 p_nb_bytes);
 
 /**
  * Reads some bytes from the given data buffer, this function is used in Little Endian cpus.
@@ -233,7 +233,7 @@ OPJ_API void OPJ_CALLCONV opj_write_bytes_LE (OPJ_BYTE * p_buffer, OPJ_UINT32 p_
  * @param p_nb_bytes   the nb bytes to read.
  * @return                             the number of bytes read or -1 if an error occured.
  */
-OPJ_API void OPJ_CALLCONV opj_read_bytes_LE(const OPJ_BYTE * p_buffer, OPJ_UINT32 * p_value, OPJ_UINT32 p_nb_bytes);
+void opj_read_bytes_LE(const OPJ_BYTE * p_buffer, OPJ_UINT32 * p_value, OPJ_UINT32 p_nb_bytes);
 
 
 /**
@@ -241,7 +241,7 @@ OPJ_API void OPJ_CALLCONV opj_read_bytes_LE(const OPJ_BYTE * p_buffer, OPJ_UINT3
  * @param p_buffer             pointer the data buffer to write data to.
  * @param p_value              the value to write
  */
-OPJ_API void OPJ_CALLCONV opj_write_double_LE(OPJ_BYTE * p_buffer, OPJ_FLOAT64 p_value);
+void opj_write_double_LE(OPJ_BYTE * p_buffer, OPJ_FLOAT64 p_value);
 
 /***
  * Write some bytes to the given data buffer, this function is used in Big Endian cpus.
@@ -300,7 +300,7 @@ void opj_write_float_BE(OPJ_BYTE * p_buffer, OPJ_FLOAT32 p_value);
  * @param              p_event_mgr     the user event manager to be notified of special events.
  * @return             the number of bytes read, or -1 if an error occured or if the stream is at the end.
  */
-OPJ_API OPJ_SIZE_T OPJ_CALLCONV opj_stream_read_data (opj_stream_private_t * p_stream,OPJ_BYTE * p_buffer, OPJ_SIZE_T p_size, struct opj_event_mgr * p_event_mgr);
+OPJ_SIZE_T opj_stream_read_data (opj_stream_private_t * p_stream,OPJ_BYTE * p_buffer, OPJ_SIZE_T p_size, struct opj_event_mgr * p_event_mgr);
 
 /**
  * Writes some bytes to the stream.
@@ -310,7 +310,7 @@ OPJ_API OPJ_SIZE_T OPJ_CALLCONV opj_stream_read_data (opj_stream_private_t * p_s
  * @param              p_event_mgr     the user event manager to be notified of special events.
  * @return             the number of bytes writtent, or -1 if an error occured.
  */
-OPJ_API OPJ_SIZE_T OPJ_CALLCONV opj_stream_write_data (opj_stream_private_t * p_stream,const OPJ_BYTE * p_buffer, OPJ_SIZE_T p_size, struct opj_event_mgr * p_event_mgr);
+OPJ_SIZE_T opj_stream_write_data (opj_stream_private_t * p_stream,const OPJ_BYTE * p_buffer, OPJ_SIZE_T p_size, struct opj_event_mgr * p_event_mgr);
 
 /**
  * Writes the content of the stream buffer to the stream.
@@ -327,7 +327,7 @@ opj_bool opj_stream_flush (opj_stream_private_t * p_stream, struct opj_event_mgr
  * @param              p_event_mgr     the user event manager to be notified of special events.
  * @return             the number of bytes skipped, or -1 if an error occured.
  */
-OPJ_API OPJ_OFF_T OPJ_CALLCONV opj_stream_skip (opj_stream_private_t * p_stream,OPJ_OFF_T p_size, struct opj_event_mgr * p_event_mgr);
+OPJ_OFF_T opj_stream_skip (opj_stream_private_t * p_stream,OPJ_OFF_T p_size, struct opj_event_mgr * p_event_mgr);
 
 /**
  * Tells the byte offset on the stream (similar to ftell).
@@ -336,7 +336,7 @@ OPJ_API OPJ_OFF_T OPJ_CALLCONV opj_stream_skip (opj_stream_private_t * p_stream,
  *
  * @return             the current position o fthe stream.
  */
-OPJ_API OPJ_OFF_T OPJ_CALLCONV opj_stream_tell (const opj_stream_private_t * p_stream);
+OPJ_OFF_T opj_stream_tell (const opj_stream_private_t * p_stream);
 
 
 /**
@@ -391,12 +391,12 @@ opj_bool opj_stream_write_seek (opj_stream_private_t * p_stream, OPJ_OFF_T p_siz
  * @param              p_event_mgr     the user event manager to be notified of special events.
  * @return             true if the stream is seekable.
  */
-OPJ_API opj_bool OPJ_CALLCONV opj_stream_seek (opj_stream_private_t * p_stream, OPJ_OFF_T p_size, struct opj_event_mgr * p_event_mgr);
+opj_bool opj_stream_seek (opj_stream_private_t * p_stream, OPJ_OFF_T p_size, struct opj_event_mgr * p_event_mgr);
 
 /**
  * Tells if the given stream is seekable.
  */
-OPJ_API opj_bool OPJ_CALLCONV opj_stream_has_seek (const opj_stream_private_t * p_stream);
+opj_bool opj_stream_has_seek (const opj_stream_private_t * p_stream);
 
 OPJ_SIZE_T opj_stream_default_read (void * p_buffer, OPJ_SIZE_T p_nb_bytes, void * p_user_data);
 OPJ_SIZE_T opj_stream_default_write (void * p_buffer, OPJ_SIZE_T p_nb_bytes, void * p_user_data);
index cfc68c195f3a788f30492e397040bcf320ed9202..fa5056194ffe8751339eb03e09389a97b4036746 100644 (file)
@@ -117,7 +117,7 @@ opj_bool opj_event_msg(opj_common_ptr cinfo, int event_type, const char *fmt, ..
 }
 
 /* ----------------------------------------------------------------------- */
-opj_bool OPJ_CALLCONV opj_event_msg_v2(opj_event_mgr_t* p_event_mgr, int event_type, const char *fmt, ...) {
+opj_bool opj_event_msg_v2(opj_event_mgr_t* p_event_mgr, int event_type, const char *fmt, ...) {
 #define MSG_SIZE 512 /* 512 bytes should be more than enough for a short message */
        opj_msg_callback msg_handler = 00;
        void * l_data = 00;
@@ -167,7 +167,7 @@ opj_bool OPJ_CALLCONV opj_event_msg_v2(opj_event_mgr_t* p_event_mgr, int event_t
        return OPJ_TRUE;
 }
 
-void OPJ_CALLCONV opj_set_default_event_handler(opj_event_mgr_t * p_manager)
+void opj_set_default_event_handler(opj_event_mgr_t * p_manager)
 {
        p_manager->m_error_data = 00;
        p_manager->m_warning_data = 00;
index 98543b5d50303750fc7f1719beb30191b70ce896..111cea9f1d0ddcd0692d562ffbffaa80fb8fb348 100644 (file)
@@ -89,13 +89,13 @@ opj_bool opj_event_msg(opj_common_ptr cinfo, int event_type, const char *fmt, ..
  *
  * @return Returns true if successful, returns false otherwise
  */
-OPJ_API opj_bool OPJ_CALLCONV opj_event_msg_v2(opj_event_mgr_t* event_mgr, int event_type, const char *fmt, ...);
+opj_bool opj_event_msg_v2(opj_event_mgr_t* event_mgr, int event_type, const char *fmt, ...);
 /* ----------------------------------------------------------------------- */
 
 /**
  * Set the event manager with the default callback function for the 3 levels.
  */
-OPJ_API void OPJ_CALLCONV opj_set_default_event_handler(opj_event_mgr_t * p_manager);
+void opj_set_default_event_handler(opj_event_mgr_t * p_manager);
 
 /*@}*/
 
index 4b4b0a831cb36a8156fe273fd8b0f11cd67de7fc..183525afc00241c03245d9bf441a9d161da9e189 100644 (file)
@@ -67,7 +67,7 @@ void  opj_procedure_list_destroy(opj_procedure_list_t * p_list)
         opj_free(p_list);
 }
 
-opj_bool OPJ_CALLCONV opj_procedure_list_add_procedure (opj_procedure_list_t * p_validation_list, opj_procedure p_procedure)
+opj_bool opj_procedure_list_add_procedure (opj_procedure_list_t * p_validation_list, opj_procedure p_procedure)
 {
         if (p_validation_list->m_nb_max_procedures == p_validation_list->m_nb_procedures)
         {
@@ -98,17 +98,17 @@ opj_bool OPJ_CALLCONV opj_procedure_list_add_procedure (opj_procedure_list_t * p
         return OPJ_TRUE;
 }
 
-OPJ_UINT32 OPJ_CALLCONV opj_procedure_list_get_nb_procedures (opj_procedure_list_t * p_validation_list)
+OPJ_UINT32 opj_procedure_list_get_nb_procedures (opj_procedure_list_t * p_validation_list)
 {
         return p_validation_list->m_nb_procedures;
 }
 
-opj_procedure* OPJ_CALLCONV opj_procedure_list_get_first_procedure (opj_procedure_list_t * p_validation_list)
+opj_procedure* opj_procedure_list_get_first_procedure (opj_procedure_list_t * p_validation_list)
 {
         return p_validation_list->m_procedures;
 }
 
-void OPJ_CALLCONV opj_procedure_list_clear (opj_procedure_list_t * p_validation_list)
+void opj_procedure_list_clear (opj_procedure_list_t * p_validation_list)
 {
         p_validation_list->m_nb_procedures = 0;
 }
index 17a50051e397879ae684d9c0fc277b0e5171e9fc..1c0553d60b8eb60b57a4bffa07af63936b94cba8 100644 (file)
@@ -88,9 +88,9 @@ void  opj_procedure_list_destroy(opj_procedure_list_t * p_list);
  * @param      p_validation_list the list of procedure to modify.
  * @param      p_procedure             the procedure to add.
  *
- * @return     OPJ_FALSE if the procedure could ne added.
+ * @return     OPJ_TRUE if the procedure could be added.
  */
-OPJ_API opj_bool OPJ_CALLCONV opj_procedure_list_add_procedure (opj_procedure_list_t * p_validation_list, opj_procedure p_procedure);
+opj_bool opj_procedure_list_add_procedure (opj_procedure_list_t * p_validation_list, opj_procedure p_procedure);
 
 /**
  * Gets the number of validation procedures.
@@ -99,7 +99,7 @@ OPJ_API opj_bool OPJ_CALLCONV opj_procedure_list_add_procedure (opj_procedure_li
  *
  * @return the number of validation procedures.
  */
-OPJ_API OPJ_UINT32 OPJ_CALLCONV opj_procedure_list_get_nb_procedures (opj_procedure_list_t * p_validation_list);
+OPJ_UINT32 opj_procedure_list_get_nb_procedures (opj_procedure_list_t * p_validation_list);
 
 /**
  * Gets the pointer on the first validation procedure. This function is similar to the C++
@@ -110,7 +110,7 @@ OPJ_API OPJ_UINT32 OPJ_CALLCONV opj_procedure_list_get_nb_procedures (opj_proced
  *
  * @return     a pointer to the first procedure.
  */
-OPJ_API opj_procedure* OPJ_CALLCONV opj_procedure_list_get_first_procedure (opj_procedure_list_t * p_validation_list);
+opj_procedure* opj_procedure_list_get_first_procedure (opj_procedure_list_t * p_validation_list);
 
 
 /**
@@ -119,7 +119,7 @@ OPJ_API opj_procedure* OPJ_CALLCONV opj_procedure_list_get_first_procedure (opj_
  * @param      p_validation_list the list of procedure to clear.
  *
  */
-OPJ_API void OPJ_CALLCONV opj_procedure_list_clear (opj_procedure_list_t * p_validation_list);
+void opj_procedure_list_clear (opj_procedure_list_t * p_validation_list);
 /*@}*/
 
 #endif /* __FUNCTION_LIST_H */
diff --git a/src/lib/openjp2/indexbox_manager.h b/src/lib/openjp2/indexbox_manager.h
new file mode 100644 (file)
index 0000000..d468e72
--- /dev/null
@@ -0,0 +1,139 @@
+/*
+ * $Id: indexbox_manager.h 897 2011-08-28 21:43:57Z Kaori.Hagihara@gmail.com $
+ *
+ * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2011, Professor Benoit Macq
+ * Copyright (c) 2003-2004, Yannick Verschueren
+ * Copyright (c) 2010-2011, Kaori Hagihara
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*! \file
+ *  \brief Modification of jpip.c from 2KAN indexer
+ */
+
+#ifndef  INDEXBOX_MANAGER_H_
+# define INDEXBOX_MANAGER_H_
+
+#include "openjpeg.h"
+#include "j2k.h" /* needed to use jp2.h */
+#include "jp2.h"
+
+#define JPIP_CIDX 0x63696478   /* Codestream index                */
+#define JPIP_CPTR 0x63707472   /* Codestream Finder Box           */
+#define JPIP_MANF 0x6d616e66   /* Manifest Box                    */
+#define JPIP_FAIX 0x66616978   /* Fragment array Index box        */
+#define JPIP_MHIX 0x6d686978   /* Main Header Index Table         */
+#define JPIP_TPIX 0x74706978   /* Tile-part Index Table box       */
+#define JPIP_THIX 0x74686978   /* Tile header Index Table box     */
+#define JPIP_PPIX 0x70706978   /* Precinct Packet Index Table box */
+#define JPIP_PHIX 0x70686978   /* Packet Header index Table       */
+#define JPIP_FIDX 0x66696478   /* File Index                      */
+#define JPIP_FPTR 0x66707472   /* File Finder                     */
+#define JPIP_PRXY 0x70727879   /* Proxy boxes                     */
+#define JPIP_IPTR 0x69707472   /* Index finder box                */
+#define JPIP_PHLD 0x70686c64   /* Place holder                    */
+
+
+/* 
+ * Write tile-part Index table box (superbox)
+ *
+ * @param[in] coff      offset of j2k codestream
+ * @param[in] cstr_info codestream information
+ * @param[in] j2klen    length of j2k codestream
+ * @param[in] cio       file output handle
+ * @return              length of tpix box
+ */
+int write_tpix( int coff, opj_codestream_info_t cstr_info, int j2klen, opj_cio_t *cio);
+int write_tpix_v2( int coff, opj_codestream_info_t cstr_info, int j2klen, opj_stream_private_t *cio,
+              opj_event_mgr_t * p_manager );
+
+
+/* 
+ * Write tile header index table box (superbox)
+ *
+ * @param[in] coff      offset of j2k codestream
+ * @param[in] cstr_info codestream information pointer
+ * @param[in] cio       file output handle
+ * @return              length of thix box
+ */
+int write_thix( int coff, opj_codestream_info_t cstr_info, opj_cio_t *cio);
+int write_thix_v2( int coff, opj_codestream_info_t cstr_info, opj_stream_private_t *cio, opj_event_mgr_t * p_manager );
+
+
+/* 
+ * Write precinct packet index table box (superbox)
+ *
+ * @param[in] coff      offset of j2k codestream
+ * @param[in] cstr_info codestream information
+ * @param[in] EPHused   true if EPH option used
+ * @param[in] j2klen    length of j2k codestream
+ * @param[in] cio       file output handle
+ * @return              length of ppix box
+ */
+int write_ppix( int coff, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_cio_t *cio);
+int write_ppix_v2( int coff, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_stream_private_t *cio,
+              opj_event_mgr_t * p_manager );
+
+
+/* 
+ * Write packet header index table box (superbox)
+ *
+ * @param[in] coff      offset of j2k codestream
+ * @param[in] cstr_info codestream information
+ * @param[in] EPHused   true if EPH option used
+ * @param[in] j2klen    length of j2k codestream
+ * @param[in] cio       file output handle
+ * @return              length of ppix box
+ */
+int write_phix( int coff, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_cio_t *cio);
+int write_phix_v2( int coff, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_stream_private_t *cio,
+              opj_event_mgr_t * p_manager );
+
+/* 
+ * Wriet manifest box (box)
+ *
+ * @param[in] second number to be visited
+ * @param[in] v      number of boxes
+ * @param[in] box    box to be manifested
+ * @param[in] cio    file output handle
+ */
+void write_manf(int second, int v, opj_jp2_box_t *box, opj_cio_t *cio);
+
+int write_mainmhix_v2( int coff, opj_codestream_info_t cstr_info, opj_stream_private_t *cio,
+              opj_event_mgr_t * p_manager );
+
+int write_phixfaix_v2( int coff, int compno, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_stream_private_t *cio,
+              opj_event_mgr_t * p_manager );
+
+int write_ppixfaix_v2( int coff, int compno, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_stream_private_t *cio,
+              opj_event_mgr_t * p_manager );
+
+int write_tilemhix_v2( int coff, opj_codestream_info_t cstr_info, int tileno, opj_stream_private_t *cio,
+              opj_event_mgr_t * p_manager );
+
+int write_tpixfaix_v2( int coff, int compno, opj_codestream_info_t cstr_info, int j2klen, opj_stream_private_t *cio,
+              opj_event_mgr_t * p_manager );
+
+#endif      /* !INDEXBOX_MANAGER_H_ */
index 82bc0627f7b3ab1cdd17640b53a1f072bf497a3e..5d4cd2e896a49907594982070f7248d0e0bd9caa 100644 (file)
@@ -9056,7 +9056,7 @@ opj_bool opj_j2k_encode_v2(     opj_j2k_v2_t * p_j2k,
         return OPJ_TRUE;
 }
 
-opj_bool OPJ_CALLCONV opj_j2k_end_compress(  opj_j2k_v2_t *p_j2k,
+opj_bool opj_j2k_end_compress(  opj_j2k_v2_t *p_j2k,
                                                         opj_stream_private_t *p_stream,
                                                         opj_event_mgr_t * p_manager)
 {
@@ -9071,7 +9071,7 @@ opj_bool OPJ_CALLCONV opj_j2k_end_compress(  opj_j2k_v2_t *p_j2k,
         return OPJ_TRUE;
 }
 
-OPJ_API opj_bool OPJ_CALLCONV opj_j2k_start_compress(opj_j2k_v2_t *p_j2k,
+opj_bool opj_j2k_start_compress(opj_j2k_v2_t *p_j2k,
                                                             opj_stream_private_t *p_stream,
                                                             opj_image_t * p_image,
                                                             opj_event_mgr_t * p_manager)
index 7353071c6dd503fea5b8bda540fd48fca9a50ac1..2782a096a8ec91cab334d5be7e5289e4ef5941db 100644 (file)
@@ -1024,7 +1024,7 @@ opj_bool opj_j2k_encode_v2(       opj_j2k_v2_t * p_j2k,
  *
  * @return true if the codec is valid.
  */
-OPJ_API opj_bool OPJ_CALLCONV opj_j2k_start_compress(opj_j2k_v2_t *p_j2k,
+opj_bool opj_j2k_start_compress(opj_j2k_v2_t *p_j2k,
                                                            opj_stream_private_t *p_stream,
                                                            opj_image_t * p_image,
                                                            opj_event_mgr_t * p_manager);
@@ -1033,7 +1033,7 @@ OPJ_API opj_bool OPJ_CALLCONV opj_j2k_start_compress(opj_j2k_v2_t *p_j2k,
  * Ends the compression procedures and possibiliy add data to be read after the
  * codestream.
  */
-OPJ_API opj_bool OPJ_CALLCONV opj_j2k_end_compress(    opj_j2k_v2_t *p_j2k,
+opj_bool opj_j2k_end_compress(         opj_j2k_v2_t *p_j2k,
                                                            opj_stream_private_t *cio,
                                                            opj_event_mgr_t * p_manager);
 
index be66c29581de5b5e2be58184ab062e1d57471dbc..0f31d38311f6378681ba1ce27a3d2a7b19593246 100644 (file)
@@ -1103,7 +1103,7 @@ opj_bool opj_jp2_decode(opj_jp2_v2_t *jp2,
        return OPJ_TRUE;
 }
 
-opj_bool OPJ_CALLCONV opj_jp2_write_jp2h(opj_jp2_v2_t *jp2,
+opj_bool opj_jp2_write_jp2h(opj_jp2_v2_t *jp2,
                             opj_stream_private_t *stream,
                             opj_event_mgr_t * p_manager
                             )
@@ -1334,7 +1334,7 @@ void opj_jp2_setup_decoder(opj_jp2_v2_t *jp2, opj_dparameters_t *parameters)
 /* JP2 encoder interface                                             */
 /* ----------------------------------------------------------------------- */
 
-void OPJ_CALLCONV opj_jp2_setup_encoder(       opj_jp2_v2_t *jp2,
+void opj_jp2_setup_encoder(    opj_jp2_v2_t *jp2,
                             opj_cparameters_t *parameters,
                             opj_image_t *image,
                             opj_event_mgr_t * p_manager)
@@ -1412,7 +1412,7 @@ void OPJ_CALLCONV opj_jp2_setup_encoder(  opj_jp2_v2_t *jp2,
        jp2->approx = 0;                /* APPROX */
 }
 
-opj_bool OPJ_CALLCONV opj_jp2_encode(opj_jp2_v2_t *jp2,
+opj_bool opj_jp2_encode(opj_jp2_v2_t *jp2,
                                                opj_stream_private_t *stream,
                                                opj_event_mgr_t * p_manager)
 {
@@ -2087,7 +2087,7 @@ opj_bool opj_jp2_read_tile_header ( opj_jp2_v2_t * p_jp2,
                                                                p_manager);
 }
 
-opj_bool OPJ_CALLCONV opj_jp2_write_tile (     opj_jp2_v2_t *p_jp2,
+opj_bool opj_jp2_write_tile (  opj_jp2_v2_t *p_jp2,
                                                            OPJ_UINT32 p_tile_index,
                                                            OPJ_BYTE * p_data,
                                                            OPJ_UINT32 p_data_size,
@@ -2110,7 +2110,7 @@ opj_bool opj_jp2_decode_tile (  opj_jp2_v2_t * p_jp2,
        return opj_j2k_decode_tile (p_jp2->j2k,p_tile_index,p_data,p_data_size,p_stream,p_manager);
 }
 
-void OPJ_CALLCONV opj_jp2_destroy(opj_jp2_v2_t *jp2)
+void opj_jp2_destroy(opj_jp2_v2_t *jp2)
 {
        if (jp2) {
                /* destroy the J2K codec */
@@ -2241,7 +2241,7 @@ opj_bool opj_jp2_get_tile(        opj_jp2_v2_t *p_jp2,
 /* JP2 encoder interface                                             */
 /* ----------------------------------------------------------------------- */
 
-opj_jp2_v2_t* OPJ_CALLCONV opj_jp2_create(opj_bool p_is_decoder)
+opj_jp2_v2_t* opj_jp2_create(opj_bool p_is_decoder)
 {
        opj_jp2_v2_t *jp2 = (opj_jp2_v2_t*)opj_malloc(sizeof(opj_jp2_v2_t));
        if (jp2) {
@@ -2300,7 +2300,7 @@ opj_codestream_index_t* jp2_get_cstr_index(opj_jp2_v2_t* p_jp2)
        return j2k_get_cstr_index(p_jp2->j2k);
 }
 
-opj_codestream_info_v2_t* OPJ_CALLCONV jp2_get_cstr_info(opj_jp2_v2_t* p_jp2)
+opj_codestream_info_v2_t* jp2_get_cstr_info(opj_jp2_v2_t* p_jp2)
 {
        return j2k_get_cstr_info(p_jp2->j2k);
 }
index 24670173b95986a0c742c61f49b5b072ef3a3739..006c4e6dddb65ed963caee6fc6c16a837f8bbdcd 100644 (file)
@@ -265,7 +265,7 @@ opj_jp2_img_header_writer_handler_t;
  *
  * @return true if writing was successful.
 */
-OPJ_API opj_bool OPJ_CALLCONV opj_jp2_write_jp2h(opj_jp2_v2_t *jp2,
+opj_bool opj_jp2_write_jp2h(opj_jp2_v2_t *jp2,
                             opj_stream_private_t *stream,
                             opj_event_mgr_t * p_manager );
 
@@ -300,7 +300,7 @@ opj_bool opj_jp2_decode(opj_jp2_v2_t *jp2,
  * @param image input filled image
  * @param p_manager  FIXME DOC
 */
-OPJ_API void OPJ_CALLCONV opj_jp2_setup_encoder(  opj_jp2_v2_t *jp2, 
+void opj_jp2_setup_encoder(  opj_jp2_v2_t *jp2, 
                             opj_cparameters_t *parameters, 
                             opj_image_t *image, 
                             opj_event_mgr_t * p_manager);
@@ -312,7 +312,7 @@ Encode an image into a JPEG-2000 file stream
 @param p_manager  event manager
 @return Returns true if successful, returns false otherwise
 */
-OPJ_API opj_bool OPJ_CALLCONV opj_jp2_encode(  opj_jp2_v2_t *jp2, 
+opj_bool opj_jp2_encode(  opj_jp2_v2_t *jp2, 
               opj_stream_private_t *stream, 
               opj_event_mgr_t * p_manager);
 
@@ -402,7 +402,7 @@ opj_bool opj_jp2_read_tile_header ( opj_jp2_v2_t * p_jp2,
  * @param  p_stream      the stream to write data to.
  * @param  p_manager  the user event manager.
  */
-OPJ_API opj_bool OPJ_CALLCONV opj_jp2_write_tile (  opj_jp2_v2_t *p_jp2,
+opj_bool opj_jp2_write_tile (  opj_jp2_v2_t *p_jp2,
                     OPJ_UINT32 p_tile_index,
                     OPJ_BYTE * p_data,
                     OPJ_UINT32 p_data_size,
@@ -432,13 +432,13 @@ opj_bool opj_jp2_decode_tile (  opj_jp2_v2_t * p_jp2,
  *
  * @return  an empty jpeg2000 file codec.
  */
-OPJ_API opj_jp2_v2_t* OPJ_CALLCONV opj_jp2_create (opj_bool p_is_decoder);
+opj_jp2_v2_t* opj_jp2_create (opj_bool p_is_decoder);
 
 /**
 Destroy a JP2 decompressor handle
 @param jp2 JP2 decompressor handle to destroy
 */
-OPJ_API void OPJ_CALLCONV opj_jp2_destroy(opj_jp2_v2_t *jp2);
+void opj_jp2_destroy(opj_jp2_v2_t *jp2);
 
 
 /**
@@ -496,7 +496,7 @@ void jp2_dump (opj_jp2_v2_t* p_jp2, OPJ_INT32 flag, FILE* out_stream);
  *
  *@return  the codestream information extract from the jpg2000 codec
  */
-OPJ_API opj_codestream_info_v2_t* OPJ_CALLCONV jp2_get_cstr_info(opj_jp2_v2_t* p_jp2);
+opj_codestream_info_v2_t* jp2_get_cstr_info(opj_jp2_v2_t* p_jp2);
 
 /**
  * Get the codestream index from a JPEG2000 codec.
index c978820413b33f1507f8f64a2dd5782b2df7cff3..581f4bfcb159d7d488ad865c1cabb9ac223691ec 100644 (file)
@@ -1082,26 +1082,26 @@ to contain encoded data.
 @param length Reading: buffer length. Writing: 0
 @return Returns a CIO handle if successful, returns NULL otherwise
 */
-OPJ_API opj_cio_t* OPJ_CALLCONV opj_cio_open(opj_common_ptr cinfo, unsigned char *buffer, int length);
+opj_cio_t* opj_cio_open(opj_common_ptr cinfo, unsigned char *buffer, int length);
 
 /**
 Close and free a CIO handle
 @param cio CIO handle to free
 */
-OPJ_API void OPJ_CALLCONV opj_cio_close(opj_cio_t *cio);
+void opj_cio_close(opj_cio_t *cio);
 
 /**
 Get position in byte stream
 @param cio CIO handle
 @return Returns the position in bytes
 */
-OPJ_API OPJ_OFF_T OPJ_CALLCONV cio_tell(opj_cio_t *cio);
+OPJ_OFF_T cio_tell(opj_cio_t *cio);
 /**
 Set position in byte stream
 @param cio CIO handle
 @param pos Position, in number of bytes, from the beginning of the stream
 */
-OPJ_API void OPJ_CALLCONV cio_seek(opj_cio_t *cio, int pos);
+void cio_seek(opj_cio_t *cio, int pos);
 
 /* <----------- */
 /* V2 framework */
diff --git a/src/lib/openjp2/phix_manager.c b/src/lib/openjp2/phix_manager.c
new file mode 100644 (file)
index 0000000..bb15ed3
--- /dev/null
@@ -0,0 +1,350 @@
+/*
+ * $Id: phix_manager.c 897 2011-08-28 21:43:57Z Kaori.Hagihara@gmail.com $
+ *
+ * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2011, Professor Benoit Macq
+ * Copyright (c) 2003-2004, Yannick Verschueren
+ * Copyright (c) 2010-2011, Kaori Hagihara
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*! \file
+ *  \brief Modification of jpip.c from 2KAN indexer
+ */
+
+#include "opj_includes.h"
+
+
+/* 
+ * Write faix box of phix
+ *
+ * @param[in] coff      offset of j2k codestream
+ * @param[in] compno    component number
+ * @param[in] cstr_info codestream information
+ * @param[in] EPHused   true if if EPH option used
+ * @param[in] j2klen    length of j2k codestream
+ * @param[in] cio       file output handle
+ * @return              length of faix box
+ */
+int write_phixfaix( int coff, int compno, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_cio_t *cio);
+
+int write_phix( int coff, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_cio_t *cio)
+{
+  int len, lenp=0, compno, i;
+  opj_jp2_box_t *box;
+
+  box = (opj_jp2_box_t *)opj_calloc( cstr_info.numcomps, sizeof(opj_jp2_box_t));
+  
+  for( i=0;i<2;i++){
+    if (i) cio_seek( cio, lenp);
+      
+    lenp = cio_tell( cio);
+    cio_skip( cio, 4);              /* L [at the end] */
+    cio_write( cio, JPIP_PHIX, 4);  /* PHIX           */
+      
+    write_manf( i, cstr_info.numcomps, box, cio);
+
+    for( compno=0; compno<cstr_info.numcomps; compno++){       
+      box[compno].length = write_phixfaix( coff, compno, cstr_info, EPHused, j2klen, cio);
+      box[compno].type = JPIP_FAIX;
+    }
+
+    len = cio_tell( cio)-lenp;
+    cio_seek( cio, lenp);
+    cio_write( cio, len, 4);        /* L              */
+    cio_seek( cio, lenp+len);
+  }
+
+  opj_free(box);
+
+  return len;
+}
+
+int write_phix_v2( int coff, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_stream_private_t *cio,
+              opj_event_mgr_t * p_manager )
+{
+  OPJ_BYTE l_data_header [8];
+  int len, lenp=0, compno, i;
+  opj_jp2_box_t *box;
+
+  box = (opj_jp2_box_t *)opj_calloc( cstr_info.numcomps, sizeof(opj_jp2_box_t));
+  
+  for( i=0;i<2;i++){
+    if (i)
+#if 0
+      cio_seek( cio, lenp);
+#else
+      opj_stream_seek( cio, lenp, p_manager);
+#endif
+      
+#if 0
+    lenp = cio_tell( cio);
+    cio_skip( cio, 4);              /* L [at the end] */
+    cio_write( cio, JPIP_PHIX, 4);  /* PHIX           */
+#else
+    lenp = opj_stream_tell(cio);
+    opj_stream_skip(cio, 4, p_manager);         /* L [at the end]      */
+    opj_write_bytes(l_data_header,JPIP_PHIX,4); /* PHIX */
+    opj_stream_write_data(cio,l_data_header,4,p_manager);
+#endif
+      
+    write_manf_v2( i, cstr_info.numcomps, box, cio);
+
+    for( compno=0; compno<cstr_info.numcomps; compno++){       
+      box[compno].length = write_phixfaix_v2( coff, compno, cstr_info, EPHused, j2klen, cio,p_manager);
+      box[compno].type = JPIP_FAIX;
+    }
+
+#if 0
+    len = cio_tell( cio)-lenp;
+    cio_seek( cio, lenp);
+    cio_write( cio, len, 4);        /* L              */
+    cio_seek( cio, lenp+len);
+#else
+    lenp = opj_stream_tell(cio);
+    opj_stream_seek(cio, 4, p_manager);
+    opj_write_bytes(l_data_header,len,4);/* L              */
+    opj_stream_write_data(cio,l_data_header,4,p_manager);
+    opj_stream_seek( cio, lenp+len,p_manager);
+#endif
+  }
+
+  opj_free(box);
+
+  return len;
+}
+
+int write_phixfaix( int coff, int compno, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_cio_t *cio)
+{
+  int len, lenp, tileno, version, i, nmax, size_of_coding; /* 4 or 8 */
+  opj_tile_info_t *tile_Idx;
+  opj_packet_info_t packet;
+  int resno, precno, layno, num_packet;
+  int numOfres, numOfprec, numOflayers;
+  packet.end_ph_pos = packet.start_pos = -1;
+  (void)EPHused; /* unused ? */
+
+  if( j2klen > pow( 2, 32)){
+    size_of_coding =  8;
+    version = 1;
+  }
+  else{
+    size_of_coding = 4;
+    version = 0;
+  }
+
+  lenp = cio_tell( cio);
+  cio_skip( cio, 4);              /* L [at the end]      */
+  cio_write( cio, JPIP_FAIX, 4);  /* FAIX                */ 
+  cio_write( cio, version,1);     /* Version 0 = 4 bytes */
+
+  nmax = 0;
+  for( i=0; i<=cstr_info.numdecompos[compno]; i++)
+    nmax += cstr_info.tile[0].ph[i] * cstr_info.tile[0].pw[i] * cstr_info.numlayers;
+  
+  cio_write( cio, nmax, size_of_coding); /* NMAX */
+  cio_write( cio, cstr_info.tw*cstr_info.th, size_of_coding);      /* M    */
+  
+  for( tileno=0; tileno<cstr_info.tw*cstr_info.th; tileno++){
+    tile_Idx = &cstr_info.tile[ tileno];
+    
+    num_packet = 0;
+    numOfres = cstr_info.numdecompos[compno] + 1;
+
+    for( resno=0; resno<numOfres ; resno++){
+      numOfprec = tile_Idx->pw[resno]*tile_Idx->ph[resno];
+      for( precno=0; precno<numOfprec; precno++){
+       numOflayers = cstr_info.numlayers;
+       for( layno=0; layno<numOflayers; layno++){
+         
+         switch ( cstr_info.prog){
+         case LRCP:
+           packet = tile_Idx->packet[ ((layno*numOfres+resno)*cstr_info.numcomps+compno)*numOfprec+precno];
+           break;
+         case RLCP:
+           packet = tile_Idx->packet[ ((resno*numOflayers+layno)*cstr_info.numcomps+compno)*numOfprec+precno];
+           break;
+         case RPCL:
+           packet = tile_Idx->packet[ ((resno*numOfprec+precno)*cstr_info.numcomps+compno)*numOflayers+layno];
+           break;
+         case PCRL:
+           packet = tile_Idx->packet[ ((precno*cstr_info.numcomps+compno)*numOfres+resno)*numOflayers + layno];
+           break;
+         case CPRL:
+           packet = tile_Idx->packet[ ((compno*numOfprec+precno)*numOfres+resno)*numOflayers + layno];
+           break;
+         default:
+           fprintf( stderr, "failed to ppix indexing\n");
+         }
+
+         cio_write( cio, packet.start_pos-coff, size_of_coding);                /* start position */
+         cio_write( cio, packet.end_ph_pos-packet.start_pos+1, size_of_coding); /* length         */
+         
+         num_packet++;
+       }
+      }
+    }
+
+    /* PADDING */
+    while( num_packet < nmax){
+      cio_write( cio, 0, size_of_coding); /* start position            */
+      cio_write( cio, 0, size_of_coding); /* length                    */
+      num_packet++;
+    }
+  }
+
+  len = cio_tell( cio)-lenp;
+  cio_seek( cio, lenp);
+  cio_write( cio, len, 4);        /* L  */
+  cio_seek( cio, lenp+len);
+
+  return len;
+}
+
+int write_phixfaix_v2( int coff, int compno, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_stream_private_t *cio,
+              opj_event_mgr_t * p_manager )
+{
+  int len, lenp, tileno, version, i, nmax, size_of_coding; /* 4 or 8 */
+  opj_tile_info_t *tile_Idx;
+  opj_packet_info_t packet;
+  int resno, precno, layno, num_packet;
+  int numOfres, numOfprec, numOflayers;
+  OPJ_BYTE l_data_header [8];
+  packet.end_ph_pos = packet.start_pos = -1;
+  (void)EPHused; /* unused ? */
+
+  if( j2klen > pow( 2, 32)){
+    size_of_coding =  8;
+    version = 1;
+  }
+  else{
+    size_of_coding = 4;
+    version = 0;
+  }
+
+#if 0
+  lenp = cio_tell( cio);
+  cio_skip( cio, 4);              /* L [at the end]      */
+  cio_write( cio, JPIP_FAIX, 4);  /* FAIX                */ 
+  cio_write( cio, version,1);     /* Version 0 = 4 bytes */
+#else
+  lenp = opj_stream_tell(cio);
+  opj_stream_skip(cio, 4, p_manager);         /* L [at the end]      */
+  opj_write_bytes(l_data_header,JPIP_FAIX,4); /* FAIX */
+  opj_stream_write_data(cio,l_data_header,4,p_manager);
+  opj_write_bytes(l_data_header,version,1);   /* Version 0 = 4 bytes */
+  opj_stream_write_data(cio,l_data_header,1,p_manager);
+#endif
+
+  nmax = 0;
+  for( i=0; i<=cstr_info.numdecompos[compno]; i++)
+    nmax += cstr_info.tile[0].ph[i] * cstr_info.tile[0].pw[i] * cstr_info.numlayers;
+  
+#if 0
+  cio_write( cio, nmax, size_of_coding); /* NMAX */
+  cio_write( cio, cstr_info.tw*cstr_info.th, size_of_coding);      /* M    */
+#else
+  opj_write_bytes(l_data_header,nmax,size_of_coding);         /* NMAX           */
+  opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
+  opj_write_bytes(l_data_header,cstr_info.tw*cstr_info.th,size_of_coding);  /* M              */
+  opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
+#endif
+  
+  for( tileno=0; tileno<cstr_info.tw*cstr_info.th; tileno++){
+    tile_Idx = &cstr_info.tile[ tileno];
+    
+    num_packet = 0;
+    numOfres = cstr_info.numdecompos[compno] + 1;
+
+    for( resno=0; resno<numOfres ; resno++){
+      numOfprec = tile_Idx->pw[resno]*tile_Idx->ph[resno];
+      for( precno=0; precno<numOfprec; precno++){
+       numOflayers = cstr_info.numlayers;
+       for( layno=0; layno<numOflayers; layno++){
+         
+         switch ( cstr_info.prog){
+         case LRCP:
+           packet = tile_Idx->packet[ ((layno*numOfres+resno)*cstr_info.numcomps+compno)*numOfprec+precno];
+           break;
+         case RLCP:
+           packet = tile_Idx->packet[ ((resno*numOflayers+layno)*cstr_info.numcomps+compno)*numOfprec+precno];
+           break;
+         case RPCL:
+           packet = tile_Idx->packet[ ((resno*numOfprec+precno)*cstr_info.numcomps+compno)*numOflayers+layno];
+           break;
+         case PCRL:
+           packet = tile_Idx->packet[ ((precno*cstr_info.numcomps+compno)*numOfres+resno)*numOflayers + layno];
+           break;
+         case CPRL:
+           packet = tile_Idx->packet[ ((compno*numOfprec+precno)*numOfres+resno)*numOflayers + layno];
+           break;
+         default:
+           fprintf( stderr, "failed to ppix indexing\n");
+         }
+
+#if 0
+         cio_write( cio, packet.start_pos-coff, size_of_coding);                /* start position */
+         cio_write( cio, packet.end_ph_pos-packet.start_pos+1, size_of_coding); /* length         */
+#else
+    opj_write_bytes(l_data_header,packet.start_pos-coff,size_of_coding);            /* start position */
+    opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
+    opj_write_bytes(l_data_header,packet.end_ph_pos-packet.start_pos+1,size_of_coding); /* length         */
+    opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
+#endif
+         
+         num_packet++;
+       }
+      }
+    }
+
+    /* PADDING */
+    while( num_packet < nmax){
+#if 0
+      cio_write( cio, 0, size_of_coding); /* start position            */
+      cio_write( cio, 0, size_of_coding); /* length                    */
+#else
+      opj_write_bytes(l_data_header,0,size_of_coding);/* start position            */
+      opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
+      opj_write_bytes(l_data_header,0,size_of_coding);/* length                    */
+      opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
+#endif
+      num_packet++;
+    }
+  }
+
+#if 0
+  len = cio_tell( cio)-lenp;
+  cio_seek( cio, lenp);
+  cio_write( cio, len, 4);        /* L  */
+  cio_seek( cio, lenp+len);
+#else
+  len = opj_stream_tell(cio)-lenp;
+  opj_stream_seek(cio, lenp,p_manager);
+  opj_write_bytes(l_data_header,len,4);/* L  */
+  opj_stream_write_data(cio,l_data_header,4,p_manager);
+  opj_stream_seek(cio, lenp+len,p_manager);
+#endif
+
+  return len;
+}
diff --git a/src/lib/openjp2/ppix_manager.c b/src/lib/openjp2/ppix_manager.c
new file mode 100644 (file)
index 0000000..ad1d934
--- /dev/null
@@ -0,0 +1,352 @@
+/*
+ * $Id: ppix_manager.c 897 2011-08-28 21:43:57Z Kaori.Hagihara@gmail.com $
+ *
+ * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2011, Professor Benoit Macq
+ * Copyright (c) 2003-2004, Yannick Verschueren
+ * Copyright (c) 2010-2011, Kaori Hagihara
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*! \file
+ *  \brief Modification of jpip.c from 2KAN indexer
+ */
+
+#include "opj_includes.h"
+
+/* 
+ * Write faix box of ppix
+ *
+ * @param[in] coff offset of j2k codestream
+ * @param[in] compno    component number
+ * @param[in] cstr_info codestream information
+ * @param[in] EPHused   true if if EPH option used
+ * @param[in] j2klen    length of j2k codestream
+ * @param[in] cio       file output handle
+ * @return              length of faix box
+ */
+int write_ppixfaix( int coff, int compno, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_cio_t *cio);
+
+int write_ppix( int coff, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_cio_t *cio)
+{
+  int len, lenp, compno, i;
+  opj_jp2_box_t *box;
+
+  /*  printf("cstr_info.packno %d\n", cstr_info.packno); //NMAX? */
+
+  lenp = -1;
+  box = (opj_jp2_box_t *)opj_calloc( cstr_info.numcomps, sizeof(opj_jp2_box_t));
+  
+  for (i=0;i<2;i++){
+    if (i) cio_seek( cio, lenp);
+    
+    lenp = cio_tell( cio);
+    cio_skip( cio, 4);              /* L [at the end] */
+    cio_write( cio, JPIP_PPIX, 4);  /* PPIX           */
+
+    write_manf( i, cstr_info.numcomps, box, cio);
+    
+    for (compno=0; compno<cstr_info.numcomps; compno++){
+      box[compno].length = write_ppixfaix( coff, compno, cstr_info, EPHused, j2klen, cio);
+      box[compno].type = JPIP_FAIX;
+    }
+   
+    len = cio_tell( cio)-lenp;
+    cio_seek( cio, lenp);
+    cio_write( cio, len, 4);        /* L              */
+    cio_seek( cio, lenp+len);
+  }
+  
+  opj_free(box);
+
+  return len;
+}
+
+int write_ppix_v2( int coff, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_stream_private_t *cio,
+              opj_event_mgr_t * p_manager )
+{
+  OPJ_BYTE l_data_header [4];
+  int len, lenp, compno, i;
+  opj_jp2_box_t *box;
+
+  /*  printf("cstr_info.packno %d\n", cstr_info.packno); //NMAX? */
+
+  lenp = -1;
+  box = (opj_jp2_box_t *)opj_calloc( cstr_info.numcomps, sizeof(opj_jp2_box_t));
+  
+  for (i=0;i<2;i++){
+    if (i)
+#if 0
+      cio_seek( cio, lenp);
+#else
+      opj_stream_seek( cio, lenp, p_manager);
+#endif
+    
+#if 0
+    lenp = cio_tell( cio);
+    cio_skip( cio, 4);              /* L [at the end] */
+    cio_write( cio, JPIP_PPIX, 4);  /* PPIX           */
+#else
+    lenp = opj_stream_tell(cio);
+    opj_stream_skip( cio, 4, p_manager);       /* L [at the end] */
+    opj_write_bytes(l_data_header,JPIP_PPIX,4);/* PPIX           */
+    opj_stream_write_data(cio,l_data_header,4,p_manager);
+#endif
+
+    write_manf_v2( i, cstr_info.numcomps, box, cio);
+    
+    for (compno=0; compno<cstr_info.numcomps; compno++){
+      box[compno].length = write_ppixfaix_v2( coff, compno, cstr_info, EPHused, j2klen, cio,p_manager);
+      box[compno].type = JPIP_FAIX;
+    }
+   
+#if 0
+    len = cio_tell( cio)-lenp;
+    cio_seek( cio, lenp);
+    cio_write( cio, len, 4);        /* L              */
+    cio_seek( cio, lenp+len);
+#else
+  len = opj_stream_tell(cio)-lenp;
+  opj_stream_seek(cio, lenp,p_manager);
+  opj_write_bytes(l_data_header,len,4);/* L              */
+  opj_stream_write_data(cio,l_data_header,4,p_manager);
+  opj_stream_seek(cio, lenp+len,p_manager);
+#endif
+  }
+  
+  opj_free(box);
+
+  return len;
+}
+
+int write_ppixfaix( int coff, int compno, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_cio_t *cio)
+{
+  int len, lenp, tileno, version, i, nmax, size_of_coding; /* 4 or 8*/
+  opj_tile_info_t *tile_Idx;
+  opj_packet_info_t packet;
+  int resno, precno, layno, num_packet;
+  int numOfres, numOfprec, numOflayers;
+  packet.end_pos = packet.end_ph_pos = packet.start_pos = -1;
+  (void)EPHused; /* unused ? */
+
+  if( j2klen > pow( 2, 32)){
+    size_of_coding =  8;
+    version = 1;
+  }
+  else{
+    size_of_coding = 4;
+    version = 0;
+  }
+  
+  lenp = cio_tell( cio);
+  cio_skip( cio, 4);              /* L [at the end]      */
+  cio_write( cio, JPIP_FAIX, 4);  /* FAIX                */ 
+  cio_write( cio, version, 1);     /* Version 0 = 4 bytes */
+
+  nmax = 0;
+  for( i=0; i<=cstr_info.numdecompos[compno]; i++)
+    nmax += cstr_info.tile[0].ph[i] * cstr_info.tile[0].pw[i] * cstr_info.numlayers;
+  
+  cio_write( cio, nmax, size_of_coding); /* NMAX */
+  cio_write( cio, cstr_info.tw*cstr_info.th, size_of_coding);      /* M    */
+
+  for( tileno=0; tileno<cstr_info.tw*cstr_info.th; tileno++){
+    tile_Idx = &cstr_info.tile[ tileno];
+    num_packet=0;
+    numOfres = cstr_info.numdecompos[compno] + 1;
+  
+    for( resno=0; resno<numOfres ; resno++){
+      numOfprec = tile_Idx->pw[resno]*tile_Idx->ph[resno];
+      for( precno=0; precno<numOfprec; precno++){
+       numOflayers = cstr_info.numlayers;
+       for( layno=0; layno<numOflayers; layno++){
+
+         switch ( cstr_info.prog){
+         case LRCP:
+           packet = tile_Idx->packet[ ((layno*numOfres+resno)*cstr_info.numcomps+compno)*numOfprec+precno];
+           break;
+         case RLCP:
+           packet = tile_Idx->packet[ ((resno*numOflayers+layno)*cstr_info.numcomps+compno)*numOfprec+precno];
+           break;
+         case RPCL:
+           packet = tile_Idx->packet[ ((resno*numOfprec+precno)*cstr_info.numcomps+compno)*numOflayers+layno];
+           break;
+         case PCRL:
+           packet = tile_Idx->packet[ ((precno*cstr_info.numcomps+compno)*numOfres+resno)*numOflayers + layno];
+           break;
+         case CPRL:
+           packet = tile_Idx->packet[ ((compno*numOfprec+precno)*numOfres+resno)*numOflayers + layno];
+           break;
+         default:
+           fprintf( stderr, "failed to ppix indexing\n");
+         }
+
+         cio_write( cio, packet.start_pos-coff, size_of_coding);             /* start position */
+         cio_write( cio, packet.end_pos-packet.start_pos+1, size_of_coding); /* length         */
+         
+         num_packet++;
+       }
+      }
+    }
+  
+    while( num_packet < nmax){     /* PADDING */
+      cio_write( cio, 0, size_of_coding); /* start position            */
+      cio_write( cio, 0, size_of_coding); /* length                    */
+      num_packet++;
+    }   
+  }
+
+  len = cio_tell( cio)-lenp;
+  cio_seek( cio, lenp);
+  cio_write( cio, len, 4);        /* L  */
+  cio_seek( cio, lenp+len);
+
+  return len;
+}
+
+int write_ppixfaix_v2( int coff, int compno, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_stream_private_t *cio,
+              opj_event_mgr_t * p_manager )
+{
+  OPJ_BYTE l_data_header [8];
+  int len, lenp, tileno, version, i, nmax, size_of_coding; /* 4 or 8*/
+  opj_tile_info_t *tile_Idx;
+  opj_packet_info_t packet;
+  int resno, precno, layno, num_packet;
+  int numOfres, numOfprec, numOflayers;
+  packet.end_pos = packet.end_ph_pos = packet.start_pos = -1;
+  (void)EPHused; /* unused ? */
+
+  if( j2klen > pow( 2, 32)){
+    size_of_coding =  8;
+    version = 1;
+  }
+  else{
+    size_of_coding = 4;
+    version = 0;
+  }
+  
+#if 0
+  lenp = cio_tell( cio);
+  cio_skip( cio, 4);              /* L [at the end]      */
+  cio_write( cio, JPIP_FAIX, 4);  /* FAIX                */ 
+  cio_write( cio, version, 1);     /* Version 0 = 4 bytes */
+#else
+  lenp = opj_stream_tell(cio);
+  opj_stream_skip(cio, 4, p_manager);         /* L [at the end]      */
+  opj_write_bytes(l_data_header,JPIP_FAIX,4); /* FAIX */
+  opj_write_bytes(l_data_header,version,1);
+  opj_stream_write_data(cio,l_data_header,1,p_manager);/* Version 0 = 4 bytes */
+#endif
+
+  nmax = 0;
+  for( i=0; i<=cstr_info.numdecompos[compno]; i++)
+    nmax += cstr_info.tile[0].ph[i] * cstr_info.tile[0].pw[i] * cstr_info.numlayers;
+  
+#if 0
+  cio_write( cio, nmax, size_of_coding); /* NMAX */
+  cio_write( cio, cstr_info.tw*cstr_info.th, size_of_coding);      /* M    */
+#else
+  opj_write_bytes(l_data_header,nmax,size_of_coding);         /* NMAX           */
+  opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
+  opj_write_bytes(l_data_header,cstr_info.tw*cstr_info.th,size_of_coding);  /* M              */
+  opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
+#endif
+
+  for( tileno=0; tileno<cstr_info.tw*cstr_info.th; tileno++){
+    tile_Idx = &cstr_info.tile[ tileno];
+    num_packet=0;
+    numOfres = cstr_info.numdecompos[compno] + 1;
+  
+    for( resno=0; resno<numOfres ; resno++){
+      numOfprec = tile_Idx->pw[resno]*tile_Idx->ph[resno];
+      for( precno=0; precno<numOfprec; precno++){
+       numOflayers = cstr_info.numlayers;
+       for( layno=0; layno<numOflayers; layno++){
+
+         switch ( cstr_info.prog){
+         case LRCP:
+           packet = tile_Idx->packet[ ((layno*numOfres+resno)*cstr_info.numcomps+compno)*numOfprec+precno];
+           break;
+         case RLCP:
+           packet = tile_Idx->packet[ ((resno*numOflayers+layno)*cstr_info.numcomps+compno)*numOfprec+precno];
+           break;
+         case RPCL:
+           packet = tile_Idx->packet[ ((resno*numOfprec+precno)*cstr_info.numcomps+compno)*numOflayers+layno];
+           break;
+         case PCRL:
+           packet = tile_Idx->packet[ ((precno*cstr_info.numcomps+compno)*numOfres+resno)*numOflayers + layno];
+           break;
+         case CPRL:
+           packet = tile_Idx->packet[ ((compno*numOfprec+precno)*numOfres+resno)*numOflayers + layno];
+           break;
+         default:
+           fprintf( stderr, "failed to ppix indexing\n");
+         }
+
+#if 0
+         cio_write( cio, packet.start_pos-coff, size_of_coding);             /* start position */
+         cio_write( cio, packet.end_pos-packet.start_pos+1, size_of_coding); /* length         */
+#else
+    opj_write_bytes(l_data_header,packet.start_pos-coff,size_of_coding);            /* start position */
+    opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
+    opj_write_bytes(l_data_header,packet.end_pos-packet.start_pos+1,size_of_coding); /* length         */
+    opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
+#endif
+         
+         num_packet++;
+       }
+      }
+    }
+  
+    while( num_packet < nmax){     /* PADDING */
+#if 0
+      cio_write( cio, 0, size_of_coding); /* start position            */
+      cio_write( cio, 0, size_of_coding); /* length                    */
+#else
+      opj_write_bytes(l_data_header,0,size_of_coding);/* start position            */
+      opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
+      opj_write_bytes(l_data_header,0,size_of_coding);/* length                    */
+      opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
+#endif
+      num_packet++;
+    }   
+  }
+
+#if 0
+  len = cio_tell( cio)-lenp;
+  cio_seek( cio, lenp);
+  cio_write( cio, len, 4);        /* L  */
+  cio_seek( cio, lenp+len);
+#else
+  len = opj_stream_tell(cio)-lenp;
+  opj_stream_seek(cio, lenp,p_manager);
+  opj_write_bytes(l_data_header,len,4);/* L  */
+  opj_stream_write_data(cio,l_data_header,4,p_manager);
+  opj_stream_seek(cio, lenp+len,p_manager);
+#endif
+
+  return len;
+}
diff --git a/src/lib/openjp2/thix_manager.c b/src/lib/openjp2/thix_manager.c
new file mode 100644 (file)
index 0000000..fe584cb
--- /dev/null
@@ -0,0 +1,242 @@
+/*
+ * $Id: thix_manager.c 897 2011-08-28 21:43:57Z Kaori.Hagihara@gmail.com $
+ *
+ * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2011, Professor Benoit Macq
+ * Copyright (c) 2003-2004, Yannick Verschueren
+ * Copyright (c) 2010-2011, Kaori Hagihara
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*! \file
+ *  \brief Modification of jpip.c from 2KAN indexer
+ */
+
+#include "opj_includes.h"
+
+/* 
+ * Write tile-part headers mhix box
+ *
+ * @param[in] coff      offset of j2k codestream
+ * @param[in] cstr_info codestream information
+ * @param[in] tileno    tile number
+ * @param[in] cio       file output handle
+ * @return              length of mhix box
+ */
+int write_tilemhix( int coff, opj_codestream_info_t cstr_info, int tileno, opj_cio_t *cio);
+
+int write_thix( int coff, opj_codestream_info_t cstr_info, opj_cio_t *cio)
+{
+  int len, lenp, i;
+  int tileno;
+  opj_jp2_box_t *box;
+
+  lenp = 0;
+  box = (opj_jp2_box_t *)opj_calloc( cstr_info.tw*cstr_info.th, sizeof(opj_jp2_box_t));
+
+  for ( i = 0; i < 2 ; i++ ){
+    if (i)
+      cio_seek( cio, lenp);
+
+    lenp = cio_tell( cio);
+    cio_skip( cio, 4);              /* L [at the end] */
+    cio_write( cio, JPIP_THIX, 4);  /* THIX           */
+    write_manf( i, cstr_info.tw*cstr_info.th, box, cio);
+    
+    for (tileno = 0; tileno < cstr_info.tw*cstr_info.th; tileno++){
+      box[tileno].length = write_tilemhix( coff, cstr_info, tileno, cio);
+      box[tileno].type = JPIP_MHIX;
+    }
+    len = cio_tell( cio)-lenp;
+    cio_seek( cio, lenp);
+    cio_write( cio, len, 4);        /* L              */
+    cio_seek( cio, lenp+len);
+  }
+
+  opj_free(box);
+
+  return len;
+}
+
+int write_thix_v2( int coff, opj_codestream_info_t cstr_info, opj_stream_private_t *cio,
+              opj_event_mgr_t * p_manager )
+{
+  OPJ_BYTE l_data_header [4];
+  int len, lenp, i;
+  int tileno;
+  opj_jp2_box_t *box;
+
+  lenp = 0;
+  box = (opj_jp2_box_t *)opj_calloc( cstr_info.tw*cstr_info.th, sizeof(opj_jp2_box_t));
+
+  for ( i = 0; i < 2 ; i++ ){
+    if (i)
+#if 0
+      cio_seek( cio, lenp);
+#else
+      opj_stream_seek( cio, lenp, p_manager);
+#endif
+
+#if 0
+    lenp = cio_tell( cio);
+    cio_skip( cio, 4);              /* L [at the end] */
+    cio_write( cio, JPIP_THIX, 4);  /* THIX           */
+#else
+    lenp = opj_stream_tell(cio);
+    opj_stream_skip(cio, 4, p_manager);             /* L [at the end] */
+    opj_write_bytes(l_data_header,JPIP_THIX,4); /* THIX */
+    opj_stream_write_data(cio,l_data_header,4,p_manager);
+#endif
+    write_manf_v2( i, cstr_info.tw*cstr_info.th, box, cio);
+    
+    for (tileno = 0; tileno < cstr_info.tw*cstr_info.th; tileno++){
+      box[tileno].length = write_tilemhix_v2( coff, cstr_info, tileno, cio,p_manager);
+      box[tileno].type = JPIP_MHIX;
+    }
+#if 0
+    len = cio_tell( cio)-lenp;
+    cio_seek( cio, lenp);
+    cio_write( cio, len, 4);        /* L              */
+    cio_seek( cio, lenp+len);
+#else
+    len = opj_stream_tell(cio)-lenp;
+    opj_stream_seek(cio, lenp, p_manager);
+    opj_write_bytes(l_data_header,len,4); /* L              */
+    opj_stream_write_data(cio,l_data_header,4,p_manager);
+    opj_stream_seek( cio, lenp+len,p_manager);
+#endif
+  }
+
+  opj_free(box);
+
+  return len;
+}
+
+int write_tilemhix( int coff, opj_codestream_info_t cstr_info, int tileno, opj_cio_t *cio)
+{
+  int i;
+  opj_tile_info_t tile;
+  opj_tp_info_t tp;
+  int marknum;
+  int len, lenp;
+  opj_marker_info_t *marker;
+
+  lenp = cio_tell( cio);
+  cio_skip( cio, 4);                               /* L [at the end]                    */
+  cio_write( cio, JPIP_MHIX, 4);                   /* MHIX                              */
+
+  tile = cstr_info.tile[tileno];
+  tp = tile.tp[0];
+
+  cio_write( cio, tp.tp_end_header-tp.tp_start_pos+1, 8);  /* TLEN                              */ 
+
+  marker = cstr_info.tile[tileno].marker;
+
+  for( i=0; i<cstr_info.tile[tileno].marknum; i++){             /* Marker restricted to 1 apparition */
+    cio_write( cio, marker[i].type, 2);
+    cio_write( cio, 0, 2);
+    cio_write( cio, marker[i].pos-coff, 8);
+    cio_write( cio, marker[i].len, 2);
+  }
+     
+  /*  free( marker);*/
+
+  len = cio_tell( cio) - lenp;
+  cio_seek( cio, lenp);
+  cio_write( cio, len, 4);        /* L           */
+  cio_seek( cio, lenp+len);
+
+  return len;
+}
+
+int write_tilemhix_v2( int coff, opj_codestream_info_t cstr_info, int tileno, opj_stream_private_t *cio,
+              opj_event_mgr_t * p_manager )
+{
+  OPJ_BYTE l_data_header [8];
+  int i;
+  opj_tile_info_t tile;
+  opj_tp_info_t tp;
+  int marknum;
+  int len, lenp;
+  opj_marker_info_t *marker;
+
+#if 0
+  lenp = cio_tell( cio);
+  cio_skip( cio, 4);                               /* L [at the end]                    */
+  cio_write( cio, JPIP_MHIX, 4);                   /* MHIX                              */
+#else
+  lenp = opj_stream_tell (cio);
+  opj_stream_skip(cio, 4, p_manager);               /* L [at the end]                    */
+  opj_write_bytes(l_data_header,JPIP_MHIX,4);       /* MHIX                              */
+  opj_stream_write_data(cio,l_data_header,4,p_manager);
+#endif
+
+  tile = cstr_info.tile[tileno];
+  tp = tile.tp[0];
+
+#if 0
+  cio_write( cio, tp.tp_end_header-tp.tp_start_pos+1, 8);  /* TLEN                              */ 
+#else
+  opj_write_bytes(l_data_header,tp.tp_end_header-tp.tp_start_pos+1, 8);        /* TLEN                              */
+  opj_stream_write_data(cio,l_data_header,8,p_manager);
+#endif
+
+  marker = cstr_info.tile[tileno].marker;
+
+  for( i=0; i<cstr_info.tile[tileno].marknum; i++){             /* Marker restricted to 1 apparition */
+#if 0
+    cio_write( cio, marker[i].type, 2);
+    cio_write( cio, 0, 2);
+    cio_write( cio, marker[i].pos-coff, 8);
+    cio_write( cio, marker[i].len, 2);
+#else
+    opj_write_bytes( l_data_header, marker[i].type, 2);
+    opj_write_bytes( l_data_header+2, 0, 2);
+    opj_stream_write_data(cio,l_data_header,4,p_manager);
+    opj_write_bytes( l_data_header, marker[i].pos-coff, 8);
+    opj_stream_write_data(cio,l_data_header,8,p_manager);
+    opj_write_bytes( l_data_header, marker[i].len, 2);
+    opj_stream_write_data(cio,l_data_header,2,p_manager);
+#endif
+  }
+     
+  /*  free( marker);*/
+
+#if 0
+  len = cio_tell( cio) - lenp;
+  cio_seek( cio, lenp);
+  cio_write( cio, len, 4);        /* L           */
+  cio_seek( cio, lenp+len);
+#else
+  len = opj_stream_tell(cio)-lenp;
+  opj_stream_seek(cio, lenp,p_manager);
+  opj_write_bytes(l_data_header,len,4);/* L  */
+  opj_stream_write_data(cio,l_data_header,4,p_manager);
+  opj_stream_seek(cio, lenp+len,p_manager);
+#endif
+
+  return len;
+}
diff --git a/src/lib/openjp2/tpix_manager.c b/src/lib/openjp2/tpix_manager.c
new file mode 100644 (file)
index 0000000..0c58a32
--- /dev/null
@@ -0,0 +1,302 @@
+/*
+ * $Id: tpix_manager.c 897 2011-08-28 21:43:57Z Kaori.Hagihara@gmail.com $
+ *
+ * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2011, Professor Benoit Macq
+ * Copyright (c) 2003-2004, Yannick Verschueren
+ * Copyright (c) 2010-2011, Kaori Hagihara
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*! \file
+ *  \brief Modification of jpip.c from 2KAN indexer
+ */
+
+#include "opj_includes.h"
+
+#define MAX(a,b) ((a)>(b)?(a):(b))
+
+
+/* 
+ * Write faix box of tpix
+ *
+ * @param[in] coff offset of j2k codestream
+ * @param[in] compno    component number
+ * @param[in] cstr_info codestream information
+ * @param[in] j2klen    length of j2k codestream
+ * @param[in] cio       file output handle
+ * @return              length of faix box
+ */
+int write_tpixfaix( int coff, int compno, opj_codestream_info_t cstr_info, int j2klen, opj_cio_t *cio);
+
+
+int write_tpix( int coff, opj_codestream_info_t cstr_info, int j2klen, opj_cio_t *cio)
+{
+  int len, lenp;
+  lenp = cio_tell( cio);
+  cio_skip( cio, 4);              /* L [at the end] */
+  cio_write( cio, JPIP_TPIX, 4);  /* TPIX           */
+  
+  write_tpixfaix( coff, 0, cstr_info, j2klen, cio);
+
+  len = cio_tell( cio)-lenp;
+  cio_seek( cio, lenp);
+  cio_write( cio, len, 4);        /* L              */
+  cio_seek( cio, lenp+len);
+
+  return len;
+}
+
+int write_tpix_v2( int coff, opj_codestream_info_t cstr_info, int j2klen, opj_stream_private_t *cio,
+              opj_event_mgr_t * p_manager )
+{
+  OPJ_BYTE l_data_header [4];
+  int len, lenp;
+#if 0
+  lenp = cio_tell( cio);
+  cio_skip( cio, 4);              /* L [at the end] */
+  cio_write( cio, JPIP_TPIX, 4);  /* TPIX           */
+#else
+  lenp = opj_stream_tell(cio);
+  opj_stream_skip(cio, 4, p_manager);
+  opj_write_bytes(l_data_header,JPIP_TPIX,4); /* TPIX */
+  opj_stream_write_data(cio,l_data_header,4,p_manager);
+#endif
+  
+  write_tpixfaix_v2( coff, 0, cstr_info, j2klen, cio,p_manager);
+
+#if 0
+  len = cio_tell( cio)-lenp;
+  cio_seek( cio, lenp);
+  cio_write( cio, len, 4);        /* L              */
+  cio_seek( cio, lenp+len);
+#else
+  len = opj_stream_tell(cio)-lenp;
+  opj_stream_skip(cio, lenp, p_manager);
+  opj_write_bytes(l_data_header,len,4);/* L              */
+  opj_stream_write_data(cio,l_data_header,4,p_manager);
+  opj_stream_seek(cio, lenp+len,p_manager);
+#endif
+
+  return len;
+}
+
+/* 
+ * Get number of maximum tile parts per tile
+ *
+ * @param[in] cstr_info codestream information
+ * @return              number of maximum tile parts per tile
+ */
+int get_num_max_tile_parts( opj_codestream_info_t cstr_info);
+
+int write_tpixfaix( int coff, int compno, opj_codestream_info_t cstr_info, int j2klen, opj_cio_t *cio)
+{
+  int len, lenp;
+  int i, j;
+  int Aux;
+  int num_max_tile_parts;
+  int size_of_coding; /* 4 or 8 */
+  opj_tp_info_t tp;
+  int version;
+
+  num_max_tile_parts = get_num_max_tile_parts( cstr_info);
+
+  if( j2klen > pow( 2, 32)){
+    size_of_coding =  8;
+    version = num_max_tile_parts == 1 ? 1:3;
+  }
+  else{
+    size_of_coding = 4;
+    version = num_max_tile_parts == 1 ? 0:2;
+  }
+
+  lenp = cio_tell( cio);
+  cio_skip( cio, 4);              /* L [at the end]      */
+  cio_write( cio, JPIP_FAIX, 4);  /* FAIX                */ 
+  cio_write( cio, version, 1);     /* Version 0 = 4 bytes */
+
+  cio_write( cio, num_max_tile_parts, size_of_coding);                      /* NMAX           */
+  cio_write( cio, cstr_info.tw*cstr_info.th, size_of_coding);                               /* M              */
+  for (i = 0; i < cstr_info.tw*cstr_info.th; i++){
+    for (j = 0; j < cstr_info.tile[i].num_tps; j++){
+      tp = cstr_info.tile[i].tp[j];
+      cio_write( cio, tp.tp_start_pos-coff, size_of_coding); /* start position */
+      cio_write( cio, tp.tp_end_pos-tp.tp_start_pos+1, size_of_coding);    /* length         */
+      if (version & 0x02){
+  if( cstr_info.tile[i].num_tps == 1 && cstr_info.numdecompos[compno] > 1)
+    Aux = cstr_info.numdecompos[compno] + 1;
+  else
+    Aux = j + 1;
+      
+  cio_write( cio, Aux,4);
+  /*cio_write(img.tile[i].tile_parts[j].num_reso_AUX,4);*/ /* Aux_i,j : Auxiliary value */
+  /* fprintf(stderr,"AUX value %d\n",Aux);*/
+      }
+      /*cio_write(0,4);*/
+    }
+    /* PADDING */
+    while (j < num_max_tile_parts){
+      cio_write( cio, 0, size_of_coding); /* start position            */
+      cio_write( cio, 0, size_of_coding); /* length                    */
+      if (version & 0x02)
+  cio_write( cio, 0,4);                  /* Aux_i,j : Auxiliary value */
+      j++;
+    }
+  }
+  
+  len = cio_tell( cio)-lenp;
+  cio_seek( cio, lenp);
+  cio_write( cio, len, 4);        /* L  */
+  cio_seek( cio, lenp+len);
+
+  return len;
+
+}
+
+int write_tpixfaix_v2( int coff, int compno, opj_codestream_info_t cstr_info, int j2klen, opj_stream_private_t *cio,
+              opj_event_mgr_t * p_manager )
+{
+  int len, lenp;
+  int i, j;
+  int Aux;
+  int num_max_tile_parts;
+  int size_of_coding; /* 4 or 8 */
+  opj_tp_info_t tp;
+  OPJ_BYTE l_data_header [8];
+  int version;
+
+  num_max_tile_parts = get_num_max_tile_parts( cstr_info);
+
+  if( j2klen > pow( 2, 32)){
+    size_of_coding =  8;
+    version = num_max_tile_parts == 1 ? 1:3;
+  }
+  else{
+    size_of_coding = 4;
+    version = num_max_tile_parts == 1 ? 0:2;
+  }
+
+#if 0
+  lenp = cio_tell( cio);
+  cio_skip( cio, 4);              /* L [at the end]      */
+  cio_write( cio, JPIP_FAIX, 4);  /* FAIX                */ 
+  cio_write( cio, version, 1);     /* Version 0 = 4 bytes */
+#else
+  lenp = opj_stream_tell(cio);
+  opj_stream_skip(cio, 4, p_manager);         /* L [at the end]      */
+  opj_write_bytes(l_data_header,JPIP_FAIX,4); /* FAIX */
+  opj_stream_write_data(cio,l_data_header,4,p_manager);
+  opj_write_bytes(l_data_header,version,1);   /* Version 0 = 4 bytes */
+  opj_stream_write_data(cio,l_data_header,1,p_manager);
+#endif
+
+#if 0
+  cio_write( cio, num_max_tile_parts, size_of_coding);                      /* NMAX           */
+  cio_write( cio, cstr_info.tw*cstr_info.th, size_of_coding);               /* M              */
+#else
+  opj_write_bytes(l_data_header,num_max_tile_parts,size_of_coding);         /* NMAX           */
+  opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
+  opj_write_bytes(l_data_header,cstr_info.tw*cstr_info.th,size_of_coding);  /* M              */
+  opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
+#endif
+  for (i = 0; i < cstr_info.tw*cstr_info.th; i++)
+    {
+    for (j = 0; j < cstr_info.tile[i].num_tps; j++)
+      {
+      tp = cstr_info.tile[i].tp[j];
+#if 0
+      cio_write( cio, tp.tp_start_pos-coff, size_of_coding); /* start position */
+      cio_write( cio, tp.tp_end_pos-tp.tp_start_pos+1, size_of_coding);    /* length         */
+#else
+      opj_write_bytes(l_data_header,tp.tp_start_pos-coff,size_of_coding);            /* start position */
+      opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
+      opj_write_bytes(l_data_header,tp.tp_end_pos-tp.tp_start_pos+1,size_of_coding); /* length         */
+      opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
+#endif
+      if (version & 0x02)
+        {
+        if( cstr_info.tile[i].num_tps == 1 && cstr_info.numdecompos[compno] > 1)
+          Aux = cstr_info.numdecompos[compno] + 1;
+        else
+          Aux = j + 1;
+
+#if 0
+        cio_write( cio, Aux,4);
+#else
+        opj_write_bytes(l_data_header,Aux,4);
+        opj_stream_write_data(cio,l_data_header,4,p_manager);
+#endif
+        /*cio_write(img.tile[i].tile_parts[j].num_reso_AUX,4);*/ /* Aux_i,j : Auxiliary value */
+        /* fprintf(stderr,"AUX value %d\n",Aux);*/
+        }
+      /*cio_write(0,4);*/
+      }
+    /* PADDING */
+    while (j < num_max_tile_parts)
+      {
+#if 0
+      cio_write( cio, 0, size_of_coding); /* start position            */
+      cio_write( cio, 0, size_of_coding); /* length                    */
+#else
+      opj_write_bytes(l_data_header,0,size_of_coding);/* start position            */
+      opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
+      opj_write_bytes(l_data_header,0,size_of_coding);/* length                    */
+      opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
+#endif
+      if (version & 0x02)
+#if 0
+        cio_write( cio, 0,4);                  /* Aux_i,j : Auxiliary value */
+#else
+      opj_write_bytes(l_data_header,0,4);      /* Aux_i,j : Auxiliary value */
+      opj_stream_write_data(cio,l_data_header,4,p_manager);
+#endif
+      j++;
+      }
+    }
+  
+#if 0
+  len = cio_tell( cio)-lenp;
+  cio_seek( cio, lenp);
+  cio_write( cio, len, 4);        /* L  */
+  cio_seek( cio, lenp+len);
+#else
+  len = opj_stream_tell(cio)-lenp;
+  opj_stream_seek(cio, lenp,p_manager);
+  opj_write_bytes(l_data_header,len,4);/* L  */
+  opj_stream_write_data(cio,l_data_header,4,p_manager);
+  opj_stream_seek(cio, lenp+len,p_manager);
+#endif
+
+  return len;
+}
+
+int get_num_max_tile_parts( opj_codestream_info_t cstr_info)
+{
+  int num_max_tp = 0, i;
+
+  for( i=0; i<cstr_info.tw*cstr_info.th; i++)
+    num_max_tp = MAX( cstr_info.tile[i].num_tps, num_max_tp);
+  
+  return num_max_tp;
+}
index 814d2931ada218b555fd961baead8750e7b6179e..c149ef3fafcef7b8b3eaf51cae54f545ec4bdffa 100644 (file)
@@ -36,11 +36,6 @@ set(OPENJPIP_SRCS
   ${CMAKE_CURRENT_SOURCE_DIR}/session_manager.c
   ${CMAKE_CURRENT_SOURCE_DIR}/jpip_parser.c
   ${CMAKE_CURRENT_SOURCE_DIR}/sock_manager.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/cidx_manager.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/phix_manager.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/ppix_manager.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/thix_manager.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/tpix_manager.c
   )
 
 set(SERVER_SRCS
diff --git a/src/lib/openjpip/cidx_manager.c b/src/lib/openjpip/cidx_manager.c
deleted file mode 100644 (file)
index 0c6c669..0000000
+++ /dev/null
@@ -1,469 +0,0 @@
-/*
- * $Id: cidx_manager.c 897 2011-08-28 21:43:57Z Kaori.Hagihara@gmail.com $
- *
- * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2011, Professor Benoit Macq
- * Copyright (c) 2003-2004, Yannick Verschueren
- * Copyright (c) 2010-2011, Kaori Hagihara
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "opj_includes.h"
-
-
-/* 
- * Write CPTR Codestream finder box
- *
- * @param[in] coff offset of j2k codestream
- * @param[in] clen length of j2k codestream
- * @param[in] cio  file output handle
- */
-void write_cptr(int coff, int clen, opj_cio_t *cio);
-
-void write_cptr_v2(int coff, int clen, opj_stream_private_t *cio,
-              opj_event_mgr_t * p_manager );
-
-void write_manf_v2(int second, int v, opj_jp2_box_t *box, opj_stream_private_t *cio,
-              opj_event_mgr_t * p_manager );
-
-/* 
- * Write main header index table (box)
- *
- * @param[in] coff offset of j2k codestream
- * @param[in] cstr_info codestream information
- * @param[in] cio  file output handle
- * @return         length of mainmhix box
- */
-int write_mainmhix( int coff, opj_codestream_info_t cstr_info, opj_cio_t *cio);
-
-
-/* 
- * Check if EPH option is used
- *
- * @param[in] coff    offset of j2k codestream
- * @param[in] markers marker information
- * @param[in] marknum number of markers
- * @param[in] cio     file output handle
- * @return            true if EPH is used
- */
-opj_bool check_EPHuse( int coff, opj_marker_info_t *markers, int marknum, opj_cio_t *cio);
-
-
-int write_cidx( int offset, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t cstr_info, int j2klen)
-{
-  int len, i, lenp;
-  opj_jp2_box_t *box;
-  int num_box = 0;
-  opj_bool  EPHused;
-  (void)image; /* unused ? */
-
-  lenp = -1;
-  box = (opj_jp2_box_t *)opj_calloc( 32, sizeof(opj_jp2_box_t));
-
-  for (i=0;i<2;i++){
-  
-    if(i)
-      cio_seek( cio, lenp);
-
-    lenp = cio_tell( cio);
-
-    cio_skip( cio, 4);              /* L [at the end] */
-    cio_write( cio, JPIP_CIDX, 4);  /* CIDX           */
-    write_cptr( offset, cstr_info.codestream_size, cio);
-
-    write_manf( i, num_box, box, cio);
-    
-    num_box = 0;
-    box[num_box].length = write_mainmhix( offset, cstr_info, cio);
-    box[num_box].type = JPIP_MHIX;
-    num_box++;
-
-    box[num_box].length = write_tpix( offset, cstr_info, j2klen, cio);
-    box[num_box].type = JPIP_TPIX;
-    num_box++;
-      
-    box[num_box].length = write_thix( offset, cstr_info, cio);
-    box[num_box].type = JPIP_THIX;
-    num_box++;
-
-    EPHused = check_EPHuse( offset, cstr_info.marker, cstr_info.marknum, cio);
-      
-    box[num_box].length = write_ppix( offset, cstr_info, EPHused, j2klen, cio);
-    box[num_box].type = JPIP_PPIX;
-    num_box++;
-    
-    box[num_box].length = write_phix( offset, cstr_info, EPHused, j2klen, cio);
-    box[num_box].type = JPIP_PHIX;
-    num_box++;
-      
-    len = cio_tell( cio)-lenp;
-    cio_seek( cio, lenp);
-    cio_write( cio, len, 4);        /* L             */
-    cio_seek( cio, lenp+len);
-  }
-
-  opj_free( box);
-  
-  return len;
-}
-
-int write_cidx_v2( int offset, opj_stream_private_t *cio, opj_codestream_info_t cstr_info, int j2klen,
-              opj_event_mgr_t * p_manager )
-{
-  int len, i, lenp;
-  opj_jp2_box_t *box;
-  int num_box = 0;
-  opj_bool  EPHused;
-  OPJ_BYTE l_data_header [4];
-
-  lenp = -1;
-  box = (opj_jp2_box_t *)opj_calloc( 32, sizeof(opj_jp2_box_t));
-
-  for (i=0;i<2;i++){
-  
-    if(i)
-      opj_stream_seek(cio,lenp,p_manager);
-
-
-    lenp = opj_stream_tell (cio);
-
-    opj_stream_skip(cio, 4, p_manager); /* L [at the end] */
-#if 0
-    cio_write( cio, JPIP_CIDX, 4);  /* CIDX           */
-#else
-    opj_write_bytes(l_data_header,JPIP_CIDX,4); /* CIDX */
-    opj_stream_write_data(cio,l_data_header,4,p_manager);
-#endif
-    write_cptr_v2( offset, cstr_info.codestream_size, cio,p_manager);
-
-    write_manf_v2( i, num_box, box, cio,p_manager);
-    
-    num_box = 0;
-    box[num_box].length = write_mainmhix_v2( offset, cstr_info, cio,p_manager);
-    box[num_box].type = JPIP_MHIX;
-    num_box++;
-
-    box[num_box].length = write_tpix_v2( offset, cstr_info, j2klen, cio,p_manager);
-    box[num_box].type = JPIP_TPIX;
-    num_box++;
-      
-    box[num_box].length = write_thix_v2( offset, cstr_info, cio, p_manager);
-    box[num_box].type = JPIP_THIX;
-    num_box++;
-
-    EPHused = check_EPHuse_v2( offset, cstr_info.marker, cstr_info.marknum, cio,p_manager);
-      
-    box[num_box].length = write_ppix_v2( offset, cstr_info, EPHused, j2klen, cio,p_manager);
-    box[num_box].type = JPIP_PPIX;
-    num_box++;
-    
-    box[num_box].length = write_phix_v2( offset, cstr_info, EPHused, j2klen, cio,p_manager);
-    box[num_box].type = JPIP_PHIX;
-    num_box++;
-      
-#if 0
-    len = cio_tell( cio)-lenp;
-    cio_seek( cio, lenp);
-    cio_write( cio, len, 4);        /* L             */
-    cio_seek( cio, lenp+len);
-#else
-    len = opj_stream_tell(cio)-lenp;
-    opj_stream_seek(cio, lenp,p_manager);
-    opj_write_bytes(l_data_header,len,4);/* L  */
-    opj_stream_write_data(cio,l_data_header,4,p_manager);
-    opj_stream_seek(cio, lenp+len,p_manager);
-#endif
-  }
-
-  opj_free( box);
-  
-  return len;
-}
-
-void write_cptr(int coff, int clen, opj_cio_t *cio)
-{
-  int len, lenp;
-
-  lenp = cio_tell( cio);
-  cio_skip( cio, 4);               /* L [at the end]     */
-  cio_write( cio, JPIP_CPTR, 4);   /* T                  */
-  cio_write( cio, 0, 2);           /* DR  A PRECISER !!  */
-  cio_write( cio, 0, 2);           /* CONT               */
-  cio_write( cio, coff, 8);    /* COFF A PRECISER !! */
-  cio_write( cio, clen, 8);    /* CLEN               */
-  len = cio_tell( cio) - lenp;
-  cio_seek( cio, lenp);
-  cio_write( cio, len, 4);         /* L                  */
-  cio_seek( cio, lenp+len);
-}
-
-void write_cptr_v2(int coff, int clen, opj_stream_private_t *cio,
-              opj_event_mgr_t * p_manager )
-{
-  OPJ_BYTE l_data_header [3*8];
-  int len, lenp;
-
-#if 0
-  lenp = cio_tell( cio);
-  cio_skip( cio, 4);               /* L [at the end]     */
-  cio_write( cio, JPIP_CPTR, 4);   /* T                  */
-  cio_write( cio, 0, 2);           /* DR  A PRECISER !!  */
-  cio_write( cio, 0, 2);           /* CONT               */
-  cio_write( cio, coff, 8);    /* COFF A PRECISER !! */
-  cio_write( cio, clen, 8);    /* CLEN               */
-  len = cio_tell( cio) - lenp;
-  cio_seek( cio, lenp);
-  cio_write( cio, len, 4);         /* L                  */
-  cio_seek( cio, lenp+len);
-#else
-  lenp = opj_stream_tell(cio);
-  opj_stream_skip( cio, 4, p_manager);               /* L [at the end]     */
-  opj_write_bytes( l_data_header, JPIP_CPTR, 4);   /* T                  */
-  opj_write_bytes( l_data_header+4, 0, 2);           /* DR  A PRECISER !!  */
-  opj_write_bytes( l_data_header+6, 0, 2);           /* CONT               */
-  opj_write_bytes( l_data_header+8, coff, 8);    /* COFF A PRECISER !! */
-  opj_write_bytes( l_data_header+16, clen, 8);    /* CLEN               */
-  opj_stream_write_data(cio,l_data_header,3*8,p_manager);
-
-  len = opj_stream_tell(cio) - lenp;
-  opj_stream_seek(cio,lenp,p_manager);
-  opj_write_bytes(l_data_header, len, 4);         /* L                  */
-  opj_stream_write_data(cio,l_data_header,4,p_manager);
-  opj_stream_seek(cio, lenp+len,p_manager);
-#endif
-}
-
-void write_manf(int second, int v, opj_jp2_box_t *box, opj_cio_t *cio)
-{
-  int len, lenp, i;
-  
-  lenp = cio_tell( cio); 
-  cio_skip( cio, 4);                         /* L [at the end]                    */
-  cio_write( cio, JPIP_MANF,4);              /* T                                 */
-
-  if (second){                          /* Write only during the second pass */
-    for( i=0; i<v; i++){
-      cio_write( cio, box[i].length, 4);  /* Box length                     */ 
-      cio_write( cio, box[i].type, 4); /* Box type                       */
-    }
-  }
-
-  len = cio_tell( cio) - lenp;
-  cio_seek( cio, lenp);
-  cio_write( cio, len, 4);                   /* L                                 */
-  cio_seek( cio, lenp+len);
-}
-
-void write_manf_v2(int second, int v, opj_jp2_box_t *box, opj_stream_private_t *cio,
-              opj_event_mgr_t * p_manager )
-{
-  OPJ_BYTE l_data_header [4];
-  int len, lenp, i;
-  
-#if 0
-  lenp = cio_tell( cio); 
-  cio_skip( cio, 4);                         /* L [at the end]                    */
-  cio_write( cio, JPIP_MANF,4);              /* T                                 */
-#else
-  lenp = opj_stream_tell(cio);
-  opj_stream_skip( cio, 4, p_manager);             /* L [at the end]     */
-  opj_write_bytes( l_data_header, JPIP_MANF, 4);   /* T                  */
-  opj_stream_write_data(cio,l_data_header,4,p_manager);
-#endif
-
-  if (second){                          /* Write only during the second pass */
-    for( i=0; i<v; i++){
-#if 0
-      cio_write( cio, box[i].length, 4);  /* Box length                     */ 
-      cio_write( cio, box[i].type, 4); /* Box type                       */
-#else
-      opj_write_bytes( l_data_header, box[i].length, 4); /* Box length                     */
-      opj_stream_write_data(cio,l_data_header,4,p_manager);
-      opj_write_bytes( l_data_header, box[i].type, 4); /* Box type                       */
-      opj_stream_write_data(cio,l_data_header,4,p_manager);
-#endif
-    }
-  }
-
-#if 0
-  len = cio_tell( cio) - lenp;
-  cio_seek( cio, lenp);
-  cio_write( cio, len, 4);                   /* L                                 */
-  cio_seek( cio, lenp+len);
-#else
-  len = opj_stream_tell(cio) - lenp;
-  opj_stream_seek(cio,lenp,p_manager);
-  opj_write_bytes(l_data_header, len, 4);/* L                                 */
-  opj_stream_write_data(cio,l_data_header,4,p_manager);
-  opj_stream_seek(cio,lenp+len,p_manager);
-#endif
-}
-
-int write_mainmhix( int coff, opj_codestream_info_t cstr_info, opj_cio_t *cio)
-{
-  int i;
-  int len, lenp;
-  
-  lenp = cio_tell( cio);
-  cio_skip( cio, 4);                               /* L [at the end]                    */
-  cio_write( cio, JPIP_MHIX, 4);                   /* MHIX                              */
-
-  cio_write( cio, cstr_info.main_head_end-cstr_info.main_head_start+1, 8);        /* TLEN                              */
-
-  for(i = 1; i < cstr_info.marknum; i++){    /* Marker restricted to 1 apparition, skip SOC marker */
-    cio_write( cio, cstr_info.marker[i].type, 2);
-    cio_write( cio, 0, 2);
-    cio_write( cio, cstr_info.marker[i].pos-coff, 8);
-    cio_write( cio, cstr_info.marker[i].len, 2);
-  }
-
-  len = cio_tell( cio) - lenp;
-  cio_seek( cio, lenp);
-  cio_write( cio, len, 4);        /* L           */
-  cio_seek( cio, lenp+len);
-  
-  return len;
-}
-
-int write_mainmhix_v2( int coff, opj_codestream_info_t cstr_info, opj_stream_private_t *cio,
-              opj_event_mgr_t * p_manager )
-{
-  OPJ_BYTE l_data_header [8];
-  int i;
-  int len, lenp;
-  
-#if 0
-  lenp = cio_tell( cio);
-  cio_skip( cio, 4);                               /* L [at the end]                    */
-  cio_write( cio, JPIP_MHIX, 4);                   /* MHIX                              */
-#else
-  lenp = opj_stream_tell (cio);
-  opj_stream_skip(cio, 4, p_manager);               /* L [at the end]                    */
-  opj_write_bytes(l_data_header,JPIP_MHIX,4);       /* MHIX                              */
-  opj_stream_write_data(cio,l_data_header,4,p_manager);
-#endif
-
-#if 0
-  cio_write( cio, cstr_info.main_head_end-cstr_info.main_head_start+1, 8);        /* TLEN                              */
-#else
-  opj_write_bytes(l_data_header, cstr_info.main_head_end-cstr_info.main_head_start+1, 8);        /* TLEN                              */
-  opj_stream_write_data(cio,l_data_header,8,p_manager);
-#endif
-
-  for(i = 1; i < cstr_info.marknum; i++){    /* Marker restricted to 1 apparition, skip SOC marker */
-#if 0
-    cio_write( cio, cstr_info.marker[i].type, 2);
-    cio_write( cio, 0, 2);
-    cio_write( cio, cstr_info.marker[i].pos-coff, 8);
-    cio_write( cio, cstr_info.marker[i].len, 2);
-#else
-    opj_write_bytes( l_data_header, cstr_info.marker[i].type, 2);
-    opj_write_bytes( l_data_header+2, 0, 2);
-    opj_stream_write_data(cio,l_data_header,4,p_manager);
-    opj_write_bytes( l_data_header, cstr_info.marker[i].pos-coff, 8);
-    opj_stream_write_data(cio,l_data_header,8,p_manager);
-    opj_write_bytes( l_data_header, cstr_info.marker[i].len, 2);
-    opj_stream_write_data(cio,l_data_header,2,p_manager);
-#endif
-  }
-
-#if 0
-  len = cio_tell( cio) - lenp;
-  cio_seek( cio, lenp);
-  cio_write( cio, len, 4);        /* L           */
-  cio_seek( cio, lenp+len);
-#else
-  len = opj_stream_tell(cio)-lenp;
-  opj_stream_seek(cio, lenp,p_manager);
-  opj_write_bytes(l_data_header,len,4);/* L  */
-  opj_stream_write_data(cio,l_data_header,4,p_manager);
-  opj_stream_seek(cio, lenp+len,p_manager);
-#endif
-  
-  return len;
-}
-
-opj_bool check_EPHuse( int coff, opj_marker_info_t *markers, int marknum, opj_cio_t *cio)
-{
-  opj_bool EPHused = OPJ_FALSE;
-  int i=0;
-  int org_pos;
-  unsigned int Scod;
-
-  for(i = 0; i < marknum; i++){
-    if( markers[i].type == J2K_MS_COD){
-      org_pos = cio_tell( cio);
-      cio_seek( cio, coff+markers[i].pos+2);
-      
-      Scod = cio_read( cio, 1);
-      if( ((Scod >> 2) & 1))
-  EPHused = OPJ_TRUE;
-      cio_seek( cio, org_pos);
-
-      break;
-    }
-  }    
-  return EPHused;
-}
-
-opj_bool check_EPHuse_v2( int coff, opj_marker_info_t *markers, int marknum, opj_stream_private_t *cio,
-              opj_event_mgr_t * p_manager )
-{
-  OPJ_BYTE l_data_header [4];
-  opj_bool EPHused = OPJ_FALSE;
-  int i=0;
-  int org_pos;
-  unsigned int Scod;
-
-  for(i = 0; i < marknum; i++)
-    {
-    if( markers[i].type == J2K_MS_COD)
-      {
-#if 0
-      org_pos = cio_tell( cio);
-      cio_seek( cio, coff+markers[i].pos+2);
-#else
-      org_pos = opj_stream_tell(cio);
-      opj_stream_seek(cio, coff+markers[i].pos+2,p_manager);
-#endif
-
-#if 0
-      Scod = cio_read( cio, 1);
-#else
-      opj_stream_read_data(cio,l_data_header,1,p_manager);
-      opj_read_bytes(l_data_header,&Scod,1);
-#endif
-      if( ((Scod >> 2) & 1))
-        EPHused = OPJ_TRUE;
-#if 0
-      cio_seek( cio, org_pos);
-#else
-      opj_stream_seek( cio, org_pos, p_manager);
-#endif
-
-      break;
-      }
-    }    
-  return EPHused;
-}
diff --git a/src/lib/openjpip/cidx_manager.h b/src/lib/openjpip/cidx_manager.h
deleted file mode 100644 (file)
index 1792550..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * $Id: cidx_manager.h 897 2011-08-28 21:43:57Z Kaori.Hagihara@gmail.com $
- *
- * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2011, Professor Benoit Macq
- * Copyright (c) 2003-2004, Yannick Verschueren
- * Copyright (c) 2010-2011, Kaori Hagihara
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*! \file
- *  \brief Modification of jpip.h from 2KAN indexer
- */
-
-
-#ifndef  CIDX_MANAGER_H_
-# define CIDX_MANAGER_H_
-
-#include "openjpeg.h"
-
-
-/* 
- * Write Codestream index box (superbox)
- *
- * @param[in] offset    offset of j2k codestream
- * @param[in] cio       file output handle
- * @param[in] image     image data
- * @param[in] cstr_info codestream information
- * @param[in] j2klen    length of j2k codestream
- * @return              length of cidx box
- */
-int write_cidx( int offset, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t cstr_info, int j2klen);
-int write_cidx_v2( int offset, opj_stream_private_t *cio, opj_codestream_info_t cstr_info, int j2klen,
-              opj_event_mgr_t * p_manager );
-
-opj_bool check_EPHuse_v2( int coff, opj_marker_info_t *markers, int marknum, opj_stream_private_t *cio,
-              opj_event_mgr_t * p_manager );
-
-#endif      /* !CIDX_MANAGER_H_ */
diff --git a/src/lib/openjpip/indexbox_manager.h b/src/lib/openjpip/indexbox_manager.h
deleted file mode 100644 (file)
index d468e72..0000000
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * $Id: indexbox_manager.h 897 2011-08-28 21:43:57Z Kaori.Hagihara@gmail.com $
- *
- * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2011, Professor Benoit Macq
- * Copyright (c) 2003-2004, Yannick Verschueren
- * Copyright (c) 2010-2011, Kaori Hagihara
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*! \file
- *  \brief Modification of jpip.c from 2KAN indexer
- */
-
-#ifndef  INDEXBOX_MANAGER_H_
-# define INDEXBOX_MANAGER_H_
-
-#include "openjpeg.h"
-#include "j2k.h" /* needed to use jp2.h */
-#include "jp2.h"
-
-#define JPIP_CIDX 0x63696478   /* Codestream index                */
-#define JPIP_CPTR 0x63707472   /* Codestream Finder Box           */
-#define JPIP_MANF 0x6d616e66   /* Manifest Box                    */
-#define JPIP_FAIX 0x66616978   /* Fragment array Index box        */
-#define JPIP_MHIX 0x6d686978   /* Main Header Index Table         */
-#define JPIP_TPIX 0x74706978   /* Tile-part Index Table box       */
-#define JPIP_THIX 0x74686978   /* Tile header Index Table box     */
-#define JPIP_PPIX 0x70706978   /* Precinct Packet Index Table box */
-#define JPIP_PHIX 0x70686978   /* Packet Header index Table       */
-#define JPIP_FIDX 0x66696478   /* File Index                      */
-#define JPIP_FPTR 0x66707472   /* File Finder                     */
-#define JPIP_PRXY 0x70727879   /* Proxy boxes                     */
-#define JPIP_IPTR 0x69707472   /* Index finder box                */
-#define JPIP_PHLD 0x70686c64   /* Place holder                    */
-
-
-/* 
- * Write tile-part Index table box (superbox)
- *
- * @param[in] coff      offset of j2k codestream
- * @param[in] cstr_info codestream information
- * @param[in] j2klen    length of j2k codestream
- * @param[in] cio       file output handle
- * @return              length of tpix box
- */
-int write_tpix( int coff, opj_codestream_info_t cstr_info, int j2klen, opj_cio_t *cio);
-int write_tpix_v2( int coff, opj_codestream_info_t cstr_info, int j2klen, opj_stream_private_t *cio,
-              opj_event_mgr_t * p_manager );
-
-
-/* 
- * Write tile header index table box (superbox)
- *
- * @param[in] coff      offset of j2k codestream
- * @param[in] cstr_info codestream information pointer
- * @param[in] cio       file output handle
- * @return              length of thix box
- */
-int write_thix( int coff, opj_codestream_info_t cstr_info, opj_cio_t *cio);
-int write_thix_v2( int coff, opj_codestream_info_t cstr_info, opj_stream_private_t *cio, opj_event_mgr_t * p_manager );
-
-
-/* 
- * Write precinct packet index table box (superbox)
- *
- * @param[in] coff      offset of j2k codestream
- * @param[in] cstr_info codestream information
- * @param[in] EPHused   true if EPH option used
- * @param[in] j2klen    length of j2k codestream
- * @param[in] cio       file output handle
- * @return              length of ppix box
- */
-int write_ppix( int coff, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_cio_t *cio);
-int write_ppix_v2( int coff, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_stream_private_t *cio,
-              opj_event_mgr_t * p_manager );
-
-
-/* 
- * Write packet header index table box (superbox)
- *
- * @param[in] coff      offset of j2k codestream
- * @param[in] cstr_info codestream information
- * @param[in] EPHused   true if EPH option used
- * @param[in] j2klen    length of j2k codestream
- * @param[in] cio       file output handle
- * @return              length of ppix box
- */
-int write_phix( int coff, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_cio_t *cio);
-int write_phix_v2( int coff, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_stream_private_t *cio,
-              opj_event_mgr_t * p_manager );
-
-/* 
- * Wriet manifest box (box)
- *
- * @param[in] second number to be visited
- * @param[in] v      number of boxes
- * @param[in] box    box to be manifested
- * @param[in] cio    file output handle
- */
-void write_manf(int second, int v, opj_jp2_box_t *box, opj_cio_t *cio);
-
-int write_mainmhix_v2( int coff, opj_codestream_info_t cstr_info, opj_stream_private_t *cio,
-              opj_event_mgr_t * p_manager );
-
-int write_phixfaix_v2( int coff, int compno, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_stream_private_t *cio,
-              opj_event_mgr_t * p_manager );
-
-int write_ppixfaix_v2( int coff, int compno, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_stream_private_t *cio,
-              opj_event_mgr_t * p_manager );
-
-int write_tilemhix_v2( int coff, opj_codestream_info_t cstr_info, int tileno, opj_stream_private_t *cio,
-              opj_event_mgr_t * p_manager );
-
-int write_tpixfaix_v2( int coff, int compno, opj_codestream_info_t cstr_info, int j2klen, opj_stream_private_t *cio,
-              opj_event_mgr_t * p_manager );
-
-#endif      /* !INDEXBOX_MANAGER_H_ */
index 7682de1a4111b80f88f249750756f4d31e1facd7..8308f3e3df8e1989ad03f2508fae5f937ee3d327 100644 (file)
@@ -209,7 +209,7 @@ void local_log( bool query, bool messages, bool sessions, bool targets, QR_t *qr
 
 #ifndef SERVER
 
-dec_server_record_t * OPJ_CALLCONV init_dec_server( int port)
+dec_server_record_t * init_dec_server( int port)
 {
   dec_server_record_t *record = (dec_server_record_t *)opj_malloc( sizeof(dec_server_record_t));
 
@@ -222,7 +222,7 @@ dec_server_record_t * OPJ_CALLCONV init_dec_server( int port)
   return record;
 }
 
-void OPJ_CALLCONV terminate_dec_server( dec_server_record_t **rec)
+void terminate_dec_server( dec_server_record_t **rec)
 {
   delete_cachelist( &(*rec)->cachelist);  
   opj_free( (*rec)->jpipstream);
@@ -236,7 +236,7 @@ void OPJ_CALLCONV terminate_dec_server( dec_server_record_t **rec)
   opj_free( *rec);
 }
 
-client_t OPJ_CALLCONV accept_connection( dec_server_record_t *rec)
+client_t accept_connection( dec_server_record_t *rec)
 {
   client_t client;
   
@@ -247,7 +247,7 @@ client_t OPJ_CALLCONV accept_connection( dec_server_record_t *rec)
   return client;
 }
 
-bool OPJ_CALLCONV handle_clientreq( client_t client, dec_server_record_t *rec)
+bool handle_clientreq( client_t client, dec_server_record_t *rec)
 {
   bool quit = false;
   msgtype_t msgtype = identify_clientmsg( client);
@@ -306,7 +306,7 @@ bool OPJ_CALLCONV handle_clientreq( client_t client, dec_server_record_t *rec)
 }
 
 
-jpip_dec_param_t * OPJ_CALLCONV init_jpipdecoder( bool jp2)
+jpip_dec_param_t * init_jpipdecoder( bool jp2)
 {
   jpip_dec_param_t *dec;
   
@@ -321,7 +321,7 @@ jpip_dec_param_t * OPJ_CALLCONV init_jpipdecoder( bool jp2)
 }
 
 
-bool OPJ_CALLCONV fread_jpip( const char fname[], jpip_dec_param_t *dec)
+bool fread_jpip( const char fname[], jpip_dec_param_t *dec)
 {
   int infd;
 
@@ -346,7 +346,7 @@ bool OPJ_CALLCONV fread_jpip( const char fname[], jpip_dec_param_t *dec)
   return true;
 }
 
-void OPJ_CALLCONV decode_jpip( jpip_dec_param_t *dec)
+void decode_jpip( jpip_dec_param_t *dec)
 {
   parse_JPIPstream( dec->jpipstream, dec->jpiplen, 0, dec->msgqueue);
 
@@ -361,7 +361,7 @@ void OPJ_CALLCONV decode_jpip( jpip_dec_param_t *dec)
     dec->jp2kstream = recons_j2k( dec->msgqueue, dec->jpipstream, dec->msgqueue->first->csn, 0, 0, &dec->jp2klen);  
 }
 
-bool OPJ_CALLCONV fwrite_jp2k( const char fname[], jpip_dec_param_t *dec)
+bool fwrite_jp2k( const char fname[], jpip_dec_param_t *dec)
 {
   int outfd;
   
@@ -382,7 +382,7 @@ bool OPJ_CALLCONV fwrite_jp2k( const char fname[], jpip_dec_param_t *dec)
  return true;
 }
 
-void OPJ_CALLCONV output_log( bool messages, bool metadata, bool ihdrbox, jpip_dec_param_t *dec)
+void output_log( bool messages, bool metadata, bool ihdrbox, jpip_dec_param_t *dec)
 {
   if( messages)
     print_msgqueue( dec->msgqueue);
@@ -396,7 +396,7 @@ void OPJ_CALLCONV output_log( bool messages, bool metadata, bool ihdrbox, jpip_d
   }
 }
 
-void OPJ_CALLCONV destroy_jpipdecoder( jpip_dec_param_t **dec)
+void destroy_jpipdecoder( jpip_dec_param_t **dec)
 {
   opj_free( (*dec)->jpipstream);
   delete_msgqueue( &(*dec)->msgqueue);
@@ -409,7 +409,7 @@ void OPJ_CALLCONV destroy_jpipdecoder( jpip_dec_param_t **dec)
   opj_free( *dec);
 }
 
-index_t * OPJ_CALLCONV get_index_from_JP2file( int fd)
+index_t * get_index_from_JP2file( int fd)
 {
   char *data;
  
@@ -437,744 +437,14 @@ index_t * OPJ_CALLCONV get_index_from_JP2file( int fd)
   return parse_jp2file( fd);
 }
 
-void OPJ_CALLCONV destroy_index( index_t **idx)
+void destroy_index( index_t **idx)
 {
   delete_index( idx);
 }
 
-void OPJ_CALLCONV output_index( index_t *index)
+void output_index( index_t *index)
 {
   print_index( *index);
 }
 
-/* ---------------------------------------------------------------------- */
-/* COMPRESSION FUNCTIONS*/
-typedef struct opj_decompression
-{
-       /** Main header reading function handler*/
-       opj_bool (*opj_read_header) (   struct opj_stream_private * cio,
-                                                                       void * p_codec,
-                                                                       opj_image_t **p_image,
-                                                                       struct opj_event_mgr * p_manager);
-       /** Decoding function */
-       opj_bool (*opj_decode) (        void * p_codec,
-                                                               struct opj_stream_private *p_cio,
-                                                               opj_image_t *p_image,
-                                                               struct opj_event_mgr * p_manager);
-       /** FIXME DOC */
-       opj_bool (*opj_read_tile_header)(       void * p_codec,
-                                                                               OPJ_UINT32 * p_tile_index,
-                                                                               OPJ_UINT32* p_data_size,
-                                                                               OPJ_INT32 * p_tile_x0, OPJ_INT32 * p_tile_y0,
-                                                                               OPJ_INT32 * p_tile_x1, OPJ_INT32 * p_tile_y1,
-                                                                               OPJ_UINT32 * p_nb_comps,
-                                                                               opj_bool * p_should_go_on,
-                                                                               struct opj_stream_private *p_cio,
-                                                                               struct opj_event_mgr * p_manager);
-       /** FIXME DOC */
-       opj_bool (*opj_decode_tile_data)(       void * p_codec,
-                                                                               OPJ_UINT32 p_tile_index,
-                                                                               OPJ_BYTE * p_data,
-                                                                               OPJ_UINT32 p_data_size,
-                                                                               struct opj_stream_private *p_cio,
-                                                                               struct opj_event_mgr * p_manager);
-       /** Reading function used after codestream if necessary */
-       opj_bool (* opj_end_decompress) (       void *p_codec,
-                                                                               struct opj_stream_private *cio,
-                                                                               struct opj_event_mgr * p_manager);
-       /** Codec destroy function handler*/
-       void (*opj_destroy) (void * p_codec);
-       /** Setup decoder function handler */
-       void (*opj_setup_decoder) (void * p_codec, opj_dparameters_t * p_param);
-       /** Set decode area function handler */
-       opj_bool (*opj_set_decode_area) (       void * p_codec,
-                                                                               opj_image_t* p_image,
-                                                                               OPJ_INT32 p_start_x, OPJ_INT32 p_end_x,
-                                                                               OPJ_INT32 p_start_y, OPJ_INT32 p_end_y,
-                                                                               struct opj_event_mgr * p_manager);
-
-       /** Get tile function */
-       opj_bool (*opj_get_decoded_tile) (      void *p_codec,
-                                                                               opj_stream_private_t *p_cio,
-                                                                               opj_image_t *p_image,
-                                                                               struct opj_event_mgr * p_manager,
-                                                                               OPJ_UINT32 tile_index);
-
-       /** Set the decoded resolution factor */
-       opj_bool (*opj_set_decoded_resolution_factor) ( void * p_codec, 
-                                                    OPJ_UINT32 res_factor, 
-                                                    opj_event_mgr_t * p_manager);
-
-}opj_decompression_t;
-
-typedef struct opj_compression
-{
-       opj_bool (* opj_start_compress) (       void *p_codec,
-                                                                               struct opj_stream_private *cio,
-                                                                               struct opj_image * p_image,
-                                                                               struct opj_event_mgr * p_manager);
-
-       opj_bool (* opj_encode) (       void * p_codec,
-                                                               struct opj_stream_private *p_cio,
-                                                               struct opj_event_mgr * p_manager);
-
-       opj_bool (* opj_write_tile) (   void * p_codec,
-                                                                       OPJ_UINT32 p_tile_index,
-                                                                       OPJ_BYTE * p_data,
-                                                                       OPJ_UINT32 p_data_size,
-                                                                       struct opj_stream_private * p_cio,
-                                                                       struct opj_event_mgr * p_manager);
-
-       opj_bool (* opj_end_compress) ( void * p_codec,
-                                                                       struct opj_stream_private *p_cio,
-                                                                       struct opj_event_mgr * p_manager);
-
-       void (* opj_destroy) (void * p_codec);
-
-       void (*opj_setup_encoder) (     void * p_codec,
-                                                               opj_cparameters_t * p_param,
-                                                               struct opj_image * p_image,
-                                                               struct opj_event_mgr * p_manager);
-
-}opj_compression_t;
-
-typedef struct opj_codec_private
-{
-       /** FIXME DOC */
-       union 
-    {
-        opj_decompression_t m_decompression;
-        opj_compression_t m_compression;
-    } m_codec_data;
-    /** FIXME DOC*/
-       void * m_codec;
-       /** Event handler */
-       opj_event_mgr_t m_event_mgr;
-       /** Flag to indicate if the codec is used to decode or encode*/
-       opj_bool is_decompressor;
-       void (*opj_dump_codec) (void * p_codec, OPJ_INT32 info_flag, FILE* output_stream);
-       opj_codestream_info_v2_t* (*opj_get_codec_info)(void* p_codec);
-       opj_codestream_index_t* (*opj_get_codec_index)(void* p_codec);
-}
-opj_codec_private_t;
-
-static opj_bool opj_jp2_write_jp(      opj_jp2_v2_t *jp2,
-                                           opj_stream_private_t *cio,
-                                               opj_event_mgr_t * p_manager )
-{
-       /* 12 bytes will be read */
-       unsigned char l_signature_data [12];
-
-       /* preconditions */
-       assert(cio != 00);
-       assert(jp2 != 00);
-       assert(p_manager != 00);
-
-       /* write box length */
-       opj_write_bytes(l_signature_data,12,4);
-       /* writes box type */
-       opj_write_bytes(l_signature_data+4,JP2_JP,4);
-       /* writes magic number*/
-       opj_write_bytes(l_signature_data+8,0x0d0a870a,4);
-       
-       if (opj_stream_write_data(cio,l_signature_data,12,p_manager) != 12) {
-               return OPJ_FALSE;
-       }
-
-       return OPJ_TRUE;
-}
-
-static opj_bool opj_jp2_write_ftyp(opj_jp2_v2_t *jp2,
-                                                       opj_stream_private_t *cio,
-                                                       opj_event_mgr_t * p_manager )
-{
-       unsigned int i;
-       unsigned int l_ftyp_size = 16 + 4 * jp2->numcl;
-       unsigned char * l_ftyp_data, * l_current_data_ptr;
-       opj_bool l_result;
-
-       /* preconditions */
-       assert(cio != 00);
-       assert(jp2 != 00);
-       assert(p_manager != 00);
-
-       l_ftyp_data = (unsigned char *) opj_malloc(l_ftyp_size);
-       
-       if (l_ftyp_data == 00) {
-               opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory to handle ftyp data\n");
-               return OPJ_FALSE;
-       }
-
-       memset(l_ftyp_data,0,l_ftyp_size);
-
-       l_current_data_ptr = l_ftyp_data;
-
-       opj_write_bytes(l_current_data_ptr, l_ftyp_size,4); /* box size */
-       l_current_data_ptr += 4;
-
-       opj_write_bytes(l_current_data_ptr, JP2_FTYP,4); /* FTYP */
-       l_current_data_ptr += 4;
-
-       opj_write_bytes(l_current_data_ptr, jp2->brand,4); /* BR */
-       l_current_data_ptr += 4;
-
-       opj_write_bytes(l_current_data_ptr, jp2->minversion,4); /* MinV */
-       l_current_data_ptr += 4;
-
-       for (i = 0; i < jp2->numcl; i++)  {
-               opj_write_bytes(l_current_data_ptr, jp2->cl[i],4);      /* CL */
-       }
-       
-       l_result = (opj_stream_write_data(cio,l_ftyp_data,l_ftyp_size,p_manager) == l_ftyp_size);
-       if (! l_result)
-       {
-               opj_event_msg_v2(p_manager, EVT_ERROR, "Error while writing ftyp data to stream\n");
-       }
-
-       opj_free(l_ftyp_data);
-       
-       return l_result;
-}
-
-static opj_bool opj_jp2_default_validation (   opj_jp2_v2_t * jp2,
-                                        opj_stream_private_t *cio,
-                                        opj_event_mgr_t * p_manager
-                                        )
-{
-       opj_bool l_is_valid = OPJ_TRUE;
-       unsigned int i;
-
-       /* preconditions */
-       assert(jp2 != 00);
-       assert(cio != 00);
-       assert(p_manager != 00);
-
-       /* JPEG2000 codec validation */
-       /*TODO*/
-
-       /* STATE checking */
-       /* make sure the state is at 0 */
-       l_is_valid &= (jp2->jp2_state == JP2_STATE_NONE);
-
-       /* make sure not reading a jp2h ???? WEIRD */
-       l_is_valid &= (jp2->jp2_img_state == JP2_IMG_STATE_NONE);
-
-       /* POINTER validation */
-       /* make sure a j2k codec is present */
-       l_is_valid &= (jp2->j2k != 00);
-
-       /* make sure a procedure list is present */
-       l_is_valid &= (jp2->m_procedure_list != 00);
-
-       /* make sure a validation list is present */
-       l_is_valid &= (jp2->m_validation_list != 00);
-
-       /* PARAMETER VALIDATION */
-       /* number of components */
-       l_is_valid &= (jp2->numcl > 0);
-       /* width */
-       l_is_valid &= (jp2->h > 0);
-       /* height */
-       l_is_valid &= (jp2->w > 0);
-       /* precision */
-       for (i = 0; i < jp2->numcomps; ++i)     {
-               l_is_valid &= (jp2->comps[i].bpcc > 0);
-       }
-
-       /* METH */
-       l_is_valid &= ((jp2->meth > 0) && (jp2->meth < 3));
-
-       /* stream validation */
-       /* back and forth is needed */
-       l_is_valid &= opj_stream_has_seek(cio);
-
-       return l_is_valid;
-}
-
-static void opj_jp2_setup_encoding_validation (opj_jp2_v2_t *jp2)
-{
-       /* preconditions */
-       assert(jp2 != 00);
-
-       opj_procedure_list_add_procedure(jp2->m_validation_list, (opj_procedure)opj_jp2_default_validation);
-       /* DEVELOPER CORNER, add your custom validation procedure */
-}
-
-static opj_bool opj_jp2_skip_jp2c(     opj_jp2_v2_t *jp2,
-                                               opj_stream_private_t *stream,
-                                               opj_event_mgr_t * p_manager )
-{
-       /* preconditions */
-       assert(jp2 != 00);
-       assert(stream != 00);
-       assert(p_manager != 00);
-
-       jp2->j2k_codestream_offset = opj_stream_tell(stream);
-
-       if (opj_stream_skip(stream,8,p_manager) != 8) {
-               return OPJ_FALSE;
-       }
-
-       return OPJ_TRUE;
-}
-
-static opj_bool opj_jpip_skip_iptr(    opj_jp2_v2_t *jp2,
-                                               opj_stream_private_t *stream,
-                                               opj_event_mgr_t * p_manager )
-{
-       /* preconditions */
-       assert(jp2 != 00);
-       assert(stream != 00);
-       assert(p_manager != 00);
-
-       jp2->jpip_iptr_offset = opj_stream_tell(stream);
-
-       if (opj_stream_skip(stream,24,p_manager) != 24) {
-               return OPJ_FALSE;
-       }
-
-       return OPJ_TRUE;
-}
-
-static void opj_jpip_setup_header_writing (opj_jp2_v2_t *jp2)
-{
-       /* preconditions */
-       assert(jp2 != 00);
-
-       opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jp2_write_jp );
-       opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jp2_write_ftyp );
-       opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jp2_write_jp2h );
-       opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jpip_skip_iptr );
-       opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jp2_skip_jp2c );
-
-       /* DEVELOPER CORNER, insert your custom procedures */
-
-}
-
-static opj_bool opj_jp2_exec (  opj_jp2_v2_t * jp2,
-                                opj_procedure_list_t * p_procedure_list,
-                                opj_stream_private_t *stream,
-                                opj_event_mgr_t * p_manager
-                                )
-
-{
-       opj_bool (** l_procedure) (opj_jp2_v2_t * jp2, opj_stream_private_t *, opj_event_mgr_t *) = 00;
-       opj_bool l_result = OPJ_TRUE;
-       OPJ_UINT32 l_nb_proc, i;
-
-       /* preconditions */
-       assert(p_procedure_list != 00);
-       assert(jp2 != 00);
-       assert(stream != 00);
-       assert(p_manager != 00);
-
-       l_nb_proc = opj_procedure_list_get_nb_procedures(p_procedure_list);
-       l_procedure = (opj_bool (**) (opj_jp2_v2_t * jp2, opj_stream_private_t *, opj_event_mgr_t *)) opj_procedure_list_get_first_procedure(p_procedure_list);
-
-       for     (i=0;i<l_nb_proc;++i) {
-               l_result = l_result && (*l_procedure) (jp2,stream,p_manager);
-               ++l_procedure;
-       }
-
-       /* and clear the procedure list at the end. */
-       opj_procedure_list_clear(p_procedure_list);
-       return l_result;
-}
-
-static opj_bool opj_jpip_start_compress(opj_jp2_v2_t *jp2,
-                                opj_stream_private_t *stream,
-                                opj_image_t * p_image,
-                                opj_event_mgr_t * p_manager
-                                )
-{
-       /* preconditions */
-       assert(jp2 != 00);
-       assert(stream != 00);
-       assert(p_manager != 00);
-
-       /* customization of the validation */
-       opj_jp2_setup_encoding_validation (jp2);
-
-       /* validation of the parameters codec */
-       if (! opj_jp2_exec(jp2,jp2->m_validation_list,stream,p_manager)) {
-               return OPJ_FALSE;
-       }
-
-       /* customization of the encoding */
-       opj_jpip_setup_header_writing(jp2);
-
-       /* write header */
-       if (! opj_jp2_exec (jp2,jp2->m_procedure_list,stream,p_manager)) {
-               return OPJ_FALSE;
-       }
-
-       return opj_j2k_start_compress(jp2->j2k,stream,p_image,p_manager);
-}
-
-static opj_bool opj_jpip_write_iptr(opj_jp2_v2_t *jp2,
-                                                       opj_stream_private_t *cio,
-                                                       opj_event_mgr_t * p_manager )
-{
-       OPJ_OFF_T j2k_codestream_exit;
-       OPJ_BYTE l_data_header [24];
-       
-       /* preconditions */
-       assert(jp2 != 00);
-       assert(cio != 00);
-       assert(p_manager != 00);
-       assert(opj_stream_has_seek(cio));
-       
-       j2k_codestream_exit = opj_stream_tell(cio);
-       opj_write_bytes(l_data_header, 24, 4); /* size of iptr */
-       opj_write_bytes(l_data_header + 4,JPIP_IPTR,4);                                                                    /* IPTR */
-#if 0
-       opj_write_bytes(l_data_header + 4 + 4, 0, 8); /* offset */
-       opj_write_bytes(l_data_header + 8 + 8, 0, 8); /* length */
-#else
-  opj_write_double(l_data_header + 4 + 4, 0); /* offset */
-  opj_write_double(l_data_header + 8 + 8, 0); /* length */
-#endif
-
-       if (! opj_stream_seek(cio,jp2->jpip_iptr_offset,p_manager)) {
-               opj_event_msg_v2(p_manager, EVT_ERROR, "Failed to seek in the stream.\n");
-               return OPJ_FALSE;
-       }
-       
-       if (opj_stream_write_data(cio,l_data_header,24,p_manager) != 24) {
-               opj_event_msg_v2(p_manager, EVT_ERROR, "Failed to seek in the stream.\n");
-               return OPJ_FALSE;
-       }
-
-       if (! opj_stream_seek(cio,j2k_codestream_exit,p_manager)) {
-               opj_event_msg_v2(p_manager, EVT_ERROR, "Failed to seek in the stream.\n");
-               return OPJ_FALSE;
-       }
-
-       return OPJ_TRUE;
-}
-
-static opj_bool opj_jpip_write_fidx(opj_jp2_v2_t *jp2,
-                                                       opj_stream_private_t *cio,
-                                                       opj_event_mgr_t * p_manager )
-{
-       OPJ_OFF_T j2k_codestream_exit;
-       OPJ_BYTE l_data_header [24];
-       
-       /* preconditions */
-       assert(jp2 != 00);
-       assert(cio != 00);
-       assert(p_manager != 00);
-       assert(opj_stream_has_seek(cio));
-       
-       opj_write_bytes(l_data_header, 24, 4); /* size of iptr */
-       opj_write_bytes(l_data_header + 4,JPIP_FIDX,4);                                                                    /* IPTR */
-  opj_write_double(l_data_header + 4 + 4, 0); /* offset */
-  opj_write_double(l_data_header + 8 + 8, 0); /* length */
-
-       if (opj_stream_write_data(cio,l_data_header,24,p_manager) != 24) {
-               opj_event_msg_v2(p_manager, EVT_ERROR, "Failed to seek in the stream.\n");
-               return OPJ_FALSE;
-       }
-
-       j2k_codestream_exit = opj_stream_tell(cio);
-       if (! opj_stream_seek(cio,j2k_codestream_exit,p_manager)) {
-               opj_event_msg_v2(p_manager, EVT_ERROR, "Failed to seek in the stream.\n");
-               return OPJ_FALSE;
-       }
-
-       return OPJ_TRUE;
-}
-
-static opj_bool opj_jpip_write_cidx(opj_jp2_v2_t *jp2,
-                                                       opj_stream_private_t *cio,
-                                                       opj_event_mgr_t * p_manager )
-{
-       OPJ_OFF_T j2k_codestream_exit;
-       OPJ_BYTE l_data_header [24];
-       
-       /* preconditions */
-       assert(jp2 != 00);
-       assert(cio != 00);
-       assert(p_manager != 00);
-       assert(opj_stream_has_seek(cio));
-       
-       j2k_codestream_exit = opj_stream_tell(cio);
-       opj_write_bytes(l_data_header, 24, 4); /* size of iptr */
-       opj_write_bytes(l_data_header + 4,JPIP_CIDX,4);                                                                    /* IPTR */
-#if 0
-       opj_write_bytes(l_data_header + 4 + 4, 0, 8); /* offset */
-       opj_write_bytes(l_data_header + 8 + 8, 0, 8); /* length */
-#else
-  opj_write_double(l_data_header + 4 + 4, 0); /* offset */
-  opj_write_double(l_data_header + 8 + 8, 0); /* length */
-#endif
-
-       if (! opj_stream_seek(cio,j2k_codestream_exit,p_manager)) {
-               opj_event_msg_v2(p_manager, EVT_ERROR, "Failed to seek in the stream.\n");
-               return OPJ_FALSE;
-       }
-       
-       if (opj_stream_write_data(cio,l_data_header,24,p_manager) != 24) {
-               opj_event_msg_v2(p_manager, EVT_ERROR, "Failed to seek in the stream.\n");
-               return OPJ_FALSE;
-       }
-
-       j2k_codestream_exit = opj_stream_tell(cio);
-       if (! opj_stream_seek(cio,j2k_codestream_exit,p_manager)) {
-               opj_event_msg_v2(p_manager, EVT_ERROR, "Failed to seek in the stream.\n");
-               return OPJ_FALSE;
-       }
-
-       return OPJ_TRUE;
-}
-
-static void write_prxy_v2( int offset_jp2c, int length_jp2c, int offset_idx, int length_idx, opj_stream_private_t *cio,
-              opj_event_mgr_t * p_manager )
-{
-  OPJ_BYTE l_data_header [8];
-  int len, lenp;
-
-#if 0
-  lenp = cio_tell( cio);
-  cio_skip( cio, 4);              /* L [at the end] */
-  cio_write( cio, JPIP_PRXY, 4);  /* IPTR           */
-#else
-  lenp = opj_stream_tell(cio);
-  opj_stream_skip(cio, 4, p_manager);         /* L [at the end] */
-  opj_write_bytes(l_data_header,JPIP_PRXY,4); /* IPTR           */
-  opj_stream_write_data(cio,l_data_header,4,p_manager);
-#endif
-  
-#if 0
-  cio_write( cio, offset_jp2c, 8); /* OOFF           */
-  cio_write( cio, length_jp2c, 4); /* OBH part 1     */
-  cio_write( cio, JP2_JP2C, 4);    /* OBH part 2     */
-#else
-  opj_write_bytes( l_data_header, offset_jp2c, 8); /* OOFF           */
-  opj_stream_write_data(cio,l_data_header,8,p_manager);
-  opj_write_bytes( l_data_header, length_jp2c, 4); /* OBH part 1     */
-  opj_write_bytes( l_data_header+4, JP2_JP2C, 4);  /* OBH part 2     */
-  opj_stream_write_data(cio,l_data_header,8,p_manager);
-#endif
-  
-#if 0
-  cio_write( cio, 1,1);           /* NI             */
-#else
-  opj_write_bytes( l_data_header, 1, 1);/* NI             */
-  opj_stream_write_data(cio,l_data_header,1,p_manager);
-#endif
-
-#if 0
-  cio_write( cio, offset_idx, 8);  /* IOFF           */
-  cio_write( cio, length_idx, 4);  /* IBH part 1     */
-  cio_write( cio, JPIP_CIDX, 4);   /* IBH part 2     */
-#else
-  opj_write_bytes( l_data_header, offset_idx, 8);  /* IOFF           */
-  opj_stream_write_data(cio,l_data_header,8,p_manager);
-  opj_write_bytes( l_data_header, length_idx, 4);  /* IBH part 1     */
-  opj_write_bytes( l_data_header+4, JPIP_CIDX, 4);   /* IBH part 2     */
-  opj_stream_write_data(cio,l_data_header,8,p_manager);
-#endif
-
-#if 0
-  len = cio_tell( cio)-lenp;
-  cio_seek( cio, lenp);
-  cio_write( cio, len, 4);        /* L              */
-  cio_seek( cio, lenp+len);
-#else
-  len = opj_stream_tell(cio)-lenp;
-  opj_stream_skip(cio, lenp, p_manager);
-  opj_write_bytes(l_data_header,len,4);/* L              */
-  opj_stream_write_data(cio,l_data_header,4,p_manager);
-  opj_stream_seek(cio, lenp+len,p_manager);
-#endif
-}
-
-
-static int write_fidx_v2( int offset_jp2c, int length_jp2c, int offset_idx, int length_idx, opj_stream_private_t *cio,
-              opj_event_mgr_t * p_manager )
-{  
-  OPJ_BYTE l_data_header [4];
-  int len, lenp;
-  
-#if 0
-  lenp = cio_tell( cio);
-  cio_skip( cio, 4);              /* L [at the end] */
-  cio_write( cio, JPIP_FIDX, 4);  /* IPTR           */
-#else
-  lenp = opj_stream_tell(cio);
-  opj_stream_skip(cio, 4, p_manager);
-  opj_write_bytes(l_data_header,JPIP_FIDX,4); /* FIDX */
-  opj_stream_write_data(cio,l_data_header,4,p_manager);
-#endif
-  
-  write_prxy_v2( offset_jp2c, length_jp2c, offset_idx, length_idx, cio,p_manager);
-
-#if 0
-  len = cio_tell( cio)-lenp;
-  cio_seek( cio, lenp);
-  cio_write( cio, len, 4);        /* L              */
-  cio_seek( cio, lenp+len);  
-#else
-  len = opj_stream_tell(cio)-lenp;
-  opj_stream_skip(cio, lenp, p_manager);
-  opj_write_bytes(l_data_header,len,4);/* L              */
-  opj_stream_write_data(cio,l_data_header,4,p_manager);
-  opj_stream_seek(cio, lenp+len,p_manager);
-#endif
-
-  return len;
-}
-
-static opj_bool opj_jpip_write_jp2c(opj_jp2_v2_t *jp2,
-                                                       opj_stream_private_t *cio,
-                                                       opj_event_mgr_t * p_manager )
-{
-       OPJ_OFF_T j2k_codestream_exit;
-  opj_codestream_info_t cstr_info;
-       OPJ_BYTE l_data_header [8];
-  OPJ_UINT32 len_jp2c;
-  int len_cidx;
-  int len_fidx;
-  int pos_jp2c;
-  int pos_fidx;
-  int pos_cidx;
-       
-       /* preconditions */
-       assert(jp2 != 00);
-       assert(cio != 00);
-       assert(p_manager != 00);
-       assert(opj_stream_has_seek(cio));
-       
-       j2k_codestream_exit = opj_stream_tell(cio);
-  len_jp2c = j2k_codestream_exit - jp2->j2k_codestream_offset;
-  pos_jp2c = jp2->j2k_codestream_offset;
-       opj_write_bytes(l_data_header, len_jp2c, 4); /* size of codestream */
-       opj_write_bytes(l_data_header + 4,JP2_JP2C,4);                                                                     /* JP2C */
-
-       if (! opj_stream_seek(cio,jp2->j2k_codestream_offset,p_manager)) {
-               opj_event_msg_v2(p_manager, EVT_ERROR, "Failed to seek in the stream.\n");
-               return OPJ_FALSE;
-       }
-       
-       if (opj_stream_write_data(cio,l_data_header,8,p_manager) != 8) {
-               opj_event_msg_v2(p_manager, EVT_ERROR, "Failed to seek in the stream.\n");
-               return OPJ_FALSE;
-       }
-
-       if (! opj_stream_seek(cio,j2k_codestream_exit,p_manager)) {
-               opj_event_msg_v2(p_manager, EVT_ERROR, "Failed to seek in the stream.\n");
-               return OPJ_FALSE;
-       }
-
-  /* CIDX */
-  pos_cidx = opj_stream_tell( cio);
-  /*cinfo = jp2_get_cstr_info(jp2);*/
-  assert( 0 ); /* MM: FIXME */
-  len_cidx = write_cidx_v2( pos_jp2c+8, cio, cstr_info, len_jp2c-8,p_manager);
-
-  /* FIDX */
-  pos_fidx = opj_stream_tell( cio);
-  len_fidx = write_fidx_v2( pos_jp2c, len_jp2c, pos_cidx, len_cidx, cio, p_manager);
-
-       return OPJ_TRUE;
-}
-
-static void opj_jp2_setup_end_header_writing (opj_jp2_v2_t *jp2)
-{
-       /* preconditions */
-       assert(jp2 != 00);
-
-       opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jpip_write_iptr );
-       opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jpip_write_jp2c );
-#if 0
-  opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jpip_write_cidx );
-  opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jpip_write_fidx );
-#endif
-       /* DEVELOPER CORNER, add your custom procedures */
-}
-
-static opj_bool opj_jpip_end_compress( opj_jp2_v2_t *jp2,
-                                                           opj_stream_private_t *cio,
-                                                           opj_event_mgr_t * p_manager
-                                )
-{
-       /* preconditions */
-       assert(jp2 != 00);
-       assert(cio != 00);
-       assert(p_manager != 00);
-
-       /* customization of the end encoding */
-       opj_jp2_setup_end_header_writing(jp2);
-
-       if (! opj_j2k_end_compress(jp2->j2k,cio,p_manager)) {
-               return OPJ_FALSE;
-       }
-
-       /* write header */
-       return opj_jp2_exec(jp2,jp2->m_procedure_list,cio,p_manager);
-}
-
-
-opj_codec_t* OPJ_CALLCONV opj_jpip_create_compress(OPJ_CODEC_FORMAT p_format)
-{
-       opj_codec_private_t *l_codec = 00;
-
-       l_codec = (opj_codec_private_t*)opj_calloc(1, sizeof(opj_codec_private_t));
-       if (!l_codec) {
-               return 00;
-       }
-       memset(l_codec, 0, sizeof(opj_codec_private_t));
-       
-       l_codec->is_decompressor = 0;
-
-       switch(p_format) {
-               case CODEC_JP2:
-                       /* get a JP2 decoder handle */
-                       l_codec->m_codec_data.m_compression.opj_encode = (opj_bool (*) (void *,
-                                                                                                                                                       struct opj_stream_private *,
-                                                                                                                                                       struct opj_event_mgr * )) opj_jp2_encode;
-
-                       l_codec->m_codec_data.m_compression.opj_end_compress = (opj_bool (*) (  void *,
-                                                                                                                                                                       struct opj_stream_private *,
-                                                                                                                                                                       struct opj_event_mgr *)) opj_jpip_end_compress;
-
-                       l_codec->m_codec_data.m_compression.opj_start_compress = (opj_bool (*) (void *,
-                                                                                                                                                                       struct opj_stream_private *,
-                                                                                                                                                                       struct opj_image * ,
-                                                                                                                                                                       struct opj_event_mgr *))  opj_jpip_start_compress;
-
-                       l_codec->m_codec_data.m_compression.opj_write_tile = (opj_bool (*) (void *,
-                                                                                                                                                               OPJ_UINT32,
-                                                                                                                                                               OPJ_BYTE*,
-                                                                                                                                                               OPJ_UINT32,
-                                                                                                                                                               struct opj_stream_private *,
-                                                                                                                                                               struct opj_event_mgr *)) opj_jp2_write_tile;
-
-                       l_codec->m_codec_data.m_compression.opj_destroy = (void (*) (void *)) opj_jp2_destroy;
-
-                       l_codec->m_codec_data.m_compression.opj_setup_encoder = (void (*) (     void *,
-                                                                                                                                                               opj_cparameters_t *,
-                                                                                                                                                               struct opj_image *,
-                                                                                                                                                               struct opj_event_mgr * )) opj_jp2_setup_encoder;
-
-                       l_codec->m_codec = opj_jp2_create(OPJ_FALSE);
-                       if (! l_codec->m_codec) {
-                               opj_free(l_codec);
-                               return 00;
-                       }
-
-                       break;
-
-               case CODEC_UNKNOWN:
-               case CODEC_JPT:
-               default:
-                       opj_free(l_codec);
-                       return 00;
-       }
-
-       opj_set_default_event_handler(&(l_codec->m_event_mgr));
-       return (opj_codec_t*) l_codec;
-}
-
 #endif /*SERVER*/
index 584a69b36b9f281a31986852b63fba462da362ef..c08c3d8648c8ed38b27178960617f5adeb03e2ca 100644 (file)
@@ -172,14 +172,14 @@ typedef SOCKET client_t;
  * @param[in] port opening tcp port (valid No. 49152-65535)
  * @return         intialized decoding server record pointer
  */
-OPJ_API dec_server_record_t * OPJ_CALLCONV init_dec_server( int port);
+dec_server_record_t * init_dec_server( int port);
 
 /**
  * Terminate the  image decoding server
  *
  * @param[in] rec address of deleting decoding server static record pointer
  */
-OPJ_API void OPJ_CALLCONV terminate_dec_server( dec_server_record_t **rec);
+void terminate_dec_server( dec_server_record_t **rec);
 
 /**
  * Accept client connection
@@ -187,7 +187,7 @@ OPJ_API void OPJ_CALLCONV terminate_dec_server( dec_server_record_t **rec);
  * @param[in] rec decoding server static record pointer
  * @return        client socket ID, -1 if failed
  */
-OPJ_API client_t OPJ_CALLCONV accept_connection( dec_server_record_t *rec);
+client_t accept_connection( dec_server_record_t *rec);
 
  /**
   * Handle client request
@@ -196,7 +196,7 @@ OPJ_API client_t OPJ_CALLCONV accept_connection( dec_server_record_t *rec);
   * @param[in] rec    decoding server static record pointer
   * @return           true if succeed
   */
-OPJ_API bool OPJ_CALLCONV handle_clientreq( client_t client, dec_server_record_t *rec);
+bool handle_clientreq( client_t client, dec_server_record_t *rec);
 
 #endif /*SERVER*/
 
@@ -229,14 +229,14 @@ typedef struct jpip_dec_param{
  * @param[in] jp2 true in case of jp2 file encoding, else j2k file encoding
  * @return        JPIP decoding parameters pointer
  */
-OPJ_API jpip_dec_param_t * OPJ_CALLCONV init_jpipdecoder( bool jp2);
+jpip_dec_param_t * init_jpipdecoder( bool jp2);
 
 /**
  * Destroy jpip decoding parameters
  *
  * @param[in]  dec  address of JPIP decoding parameters pointer
  */
-OPJ_API void OPJ_CALLCONV destroy_jpipdecoder( jpip_dec_param_t **dec);
+void destroy_jpipdecoder( jpip_dec_param_t **dec);
 
 /**
  * Read jpip codestream from a file
@@ -245,14 +245,14 @@ OPJ_API void OPJ_CALLCONV destroy_jpipdecoder( jpip_dec_param_t **dec);
  * @param[in]  dec   JPIP decoding parameters pointer
  * @return           true if succeed
  */
-OPJ_API bool OPJ_CALLCONV fread_jpip( const char fname[], jpip_dec_param_t *dec);
+bool fread_jpip( const char fname[], jpip_dec_param_t *dec);
 
 /**
  * Decode jpip codestream
  *
  * @param[in]  dec   JPIP decoding parameters pointer
  */
-OPJ_API void OPJ_CALLCONV decode_jpip( jpip_dec_param_t *dec);
+void decode_jpip( jpip_dec_param_t *dec);
 
 /**
  * Write J2K/JP2 codestream to a file
@@ -261,7 +261,7 @@ OPJ_API void OPJ_CALLCONV decode_jpip( jpip_dec_param_t *dec);
  * @param[in]  dec   JPIP decoding parameters pointer
  * @return           true if succeed
  */
-OPJ_API bool OPJ_CALLCONV fwrite_jp2k( const char fname[], jpip_dec_param_t *dec);
+bool fwrite_jp2k( const char fname[], jpip_dec_param_t *dec);
 
 /**
  * Option; print out parameter values to stderr
@@ -271,7 +271,7 @@ OPJ_API bool OPJ_CALLCONV fwrite_jp2k( const char fname[], jpip_dec_param_t *dec
  * @param[in]  ihdrbox  true if image header data is to be printed out
  * @param[in]  dec   JPIP decoding parameters pointer
  */
-OPJ_API void OPJ_CALLCONV output_log( bool messages, bool metadata, bool ihdrbox, jpip_dec_param_t *dec);
+void output_log( bool messages, bool metadata, bool ihdrbox, jpip_dec_param_t *dec);
 
 /*
  *  test the format of index (cidx) box in JP2 file
@@ -286,14 +286,14 @@ typedef index_param_t index_t;
  * @param[in] fd file descriptor of the JP2 file
  * @return       pointer to the generated structure of index parameters
  */
-OPJ_API index_t * OPJ_CALLCONV get_index_from_JP2file( int fd);
+index_t * get_index_from_JP2file( int fd);
 
 /**
  * Destroy index parameters
  *
  * @param[in,out] idx addressof the index pointer
  */
-OPJ_API void OPJ_CALLCONV destroy_index( index_t **idx);
+void destroy_index( index_t **idx);
 
 
 /**
@@ -301,9 +301,7 @@ OPJ_API void OPJ_CALLCONV destroy_index( index_t **idx);
  *
  * @param[in] index index parameters
  */
-OPJ_API void OPJ_CALLCONV output_index( index_t *index);
-
-OPJ_API opj_codec_t* OPJ_CALLCONV opj_jpip_create_compress(OPJ_CODEC_FORMAT format);
+void output_index( index_t *index);
 
 #endif /*SERVER*/
 
diff --git a/src/lib/openjpip/phix_manager.c b/src/lib/openjpip/phix_manager.c
deleted file mode 100644 (file)
index bb15ed3..0000000
+++ /dev/null
@@ -1,350 +0,0 @@
-/*
- * $Id: phix_manager.c 897 2011-08-28 21:43:57Z Kaori.Hagihara@gmail.com $
- *
- * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2011, Professor Benoit Macq
- * Copyright (c) 2003-2004, Yannick Verschueren
- * Copyright (c) 2010-2011, Kaori Hagihara
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*! \file
- *  \brief Modification of jpip.c from 2KAN indexer
- */
-
-#include "opj_includes.h"
-
-
-/* 
- * Write faix box of phix
- *
- * @param[in] coff      offset of j2k codestream
- * @param[in] compno    component number
- * @param[in] cstr_info codestream information
- * @param[in] EPHused   true if if EPH option used
- * @param[in] j2klen    length of j2k codestream
- * @param[in] cio       file output handle
- * @return              length of faix box
- */
-int write_phixfaix( int coff, int compno, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_cio_t *cio);
-
-int write_phix( int coff, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_cio_t *cio)
-{
-  int len, lenp=0, compno, i;
-  opj_jp2_box_t *box;
-
-  box = (opj_jp2_box_t *)opj_calloc( cstr_info.numcomps, sizeof(opj_jp2_box_t));
-  
-  for( i=0;i<2;i++){
-    if (i) cio_seek( cio, lenp);
-      
-    lenp = cio_tell( cio);
-    cio_skip( cio, 4);              /* L [at the end] */
-    cio_write( cio, JPIP_PHIX, 4);  /* PHIX           */
-      
-    write_manf( i, cstr_info.numcomps, box, cio);
-
-    for( compno=0; compno<cstr_info.numcomps; compno++){       
-      box[compno].length = write_phixfaix( coff, compno, cstr_info, EPHused, j2klen, cio);
-      box[compno].type = JPIP_FAIX;
-    }
-
-    len = cio_tell( cio)-lenp;
-    cio_seek( cio, lenp);
-    cio_write( cio, len, 4);        /* L              */
-    cio_seek( cio, lenp+len);
-  }
-
-  opj_free(box);
-
-  return len;
-}
-
-int write_phix_v2( int coff, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_stream_private_t *cio,
-              opj_event_mgr_t * p_manager )
-{
-  OPJ_BYTE l_data_header [8];
-  int len, lenp=0, compno, i;
-  opj_jp2_box_t *box;
-
-  box = (opj_jp2_box_t *)opj_calloc( cstr_info.numcomps, sizeof(opj_jp2_box_t));
-  
-  for( i=0;i<2;i++){
-    if (i)
-#if 0
-      cio_seek( cio, lenp);
-#else
-      opj_stream_seek( cio, lenp, p_manager);
-#endif
-      
-#if 0
-    lenp = cio_tell( cio);
-    cio_skip( cio, 4);              /* L [at the end] */
-    cio_write( cio, JPIP_PHIX, 4);  /* PHIX           */
-#else
-    lenp = opj_stream_tell(cio);
-    opj_stream_skip(cio, 4, p_manager);         /* L [at the end]      */
-    opj_write_bytes(l_data_header,JPIP_PHIX,4); /* PHIX */
-    opj_stream_write_data(cio,l_data_header,4,p_manager);
-#endif
-      
-    write_manf_v2( i, cstr_info.numcomps, box, cio);
-
-    for( compno=0; compno<cstr_info.numcomps; compno++){       
-      box[compno].length = write_phixfaix_v2( coff, compno, cstr_info, EPHused, j2klen, cio,p_manager);
-      box[compno].type = JPIP_FAIX;
-    }
-
-#if 0
-    len = cio_tell( cio)-lenp;
-    cio_seek( cio, lenp);
-    cio_write( cio, len, 4);        /* L              */
-    cio_seek( cio, lenp+len);
-#else
-    lenp = opj_stream_tell(cio);
-    opj_stream_seek(cio, 4, p_manager);
-    opj_write_bytes(l_data_header,len,4);/* L              */
-    opj_stream_write_data(cio,l_data_header,4,p_manager);
-    opj_stream_seek( cio, lenp+len,p_manager);
-#endif
-  }
-
-  opj_free(box);
-
-  return len;
-}
-
-int write_phixfaix( int coff, int compno, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_cio_t *cio)
-{
-  int len, lenp, tileno, version, i, nmax, size_of_coding; /* 4 or 8 */
-  opj_tile_info_t *tile_Idx;
-  opj_packet_info_t packet;
-  int resno, precno, layno, num_packet;
-  int numOfres, numOfprec, numOflayers;
-  packet.end_ph_pos = packet.start_pos = -1;
-  (void)EPHused; /* unused ? */
-
-  if( j2klen > pow( 2, 32)){
-    size_of_coding =  8;
-    version = 1;
-  }
-  else{
-    size_of_coding = 4;
-    version = 0;
-  }
-
-  lenp = cio_tell( cio);
-  cio_skip( cio, 4);              /* L [at the end]      */
-  cio_write( cio, JPIP_FAIX, 4);  /* FAIX                */ 
-  cio_write( cio, version,1);     /* Version 0 = 4 bytes */
-
-  nmax = 0;
-  for( i=0; i<=cstr_info.numdecompos[compno]; i++)
-    nmax += cstr_info.tile[0].ph[i] * cstr_info.tile[0].pw[i] * cstr_info.numlayers;
-  
-  cio_write( cio, nmax, size_of_coding); /* NMAX */
-  cio_write( cio, cstr_info.tw*cstr_info.th, size_of_coding);      /* M    */
-  
-  for( tileno=0; tileno<cstr_info.tw*cstr_info.th; tileno++){
-    tile_Idx = &cstr_info.tile[ tileno];
-    
-    num_packet = 0;
-    numOfres = cstr_info.numdecompos[compno] + 1;
-
-    for( resno=0; resno<numOfres ; resno++){
-      numOfprec = tile_Idx->pw[resno]*tile_Idx->ph[resno];
-      for( precno=0; precno<numOfprec; precno++){
-       numOflayers = cstr_info.numlayers;
-       for( layno=0; layno<numOflayers; layno++){
-         
-         switch ( cstr_info.prog){
-         case LRCP:
-           packet = tile_Idx->packet[ ((layno*numOfres+resno)*cstr_info.numcomps+compno)*numOfprec+precno];
-           break;
-         case RLCP:
-           packet = tile_Idx->packet[ ((resno*numOflayers+layno)*cstr_info.numcomps+compno)*numOfprec+precno];
-           break;
-         case RPCL:
-           packet = tile_Idx->packet[ ((resno*numOfprec+precno)*cstr_info.numcomps+compno)*numOflayers+layno];
-           break;
-         case PCRL:
-           packet = tile_Idx->packet[ ((precno*cstr_info.numcomps+compno)*numOfres+resno)*numOflayers + layno];
-           break;
-         case CPRL:
-           packet = tile_Idx->packet[ ((compno*numOfprec+precno)*numOfres+resno)*numOflayers + layno];
-           break;
-         default:
-           fprintf( stderr, "failed to ppix indexing\n");
-         }
-
-         cio_write( cio, packet.start_pos-coff, size_of_coding);                /* start position */
-         cio_write( cio, packet.end_ph_pos-packet.start_pos+1, size_of_coding); /* length         */
-         
-         num_packet++;
-       }
-      }
-    }
-
-    /* PADDING */
-    while( num_packet < nmax){
-      cio_write( cio, 0, size_of_coding); /* start position            */
-      cio_write( cio, 0, size_of_coding); /* length                    */
-      num_packet++;
-    }
-  }
-
-  len = cio_tell( cio)-lenp;
-  cio_seek( cio, lenp);
-  cio_write( cio, len, 4);        /* L  */
-  cio_seek( cio, lenp+len);
-
-  return len;
-}
-
-int write_phixfaix_v2( int coff, int compno, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_stream_private_t *cio,
-              opj_event_mgr_t * p_manager )
-{
-  int len, lenp, tileno, version, i, nmax, size_of_coding; /* 4 or 8 */
-  opj_tile_info_t *tile_Idx;
-  opj_packet_info_t packet;
-  int resno, precno, layno, num_packet;
-  int numOfres, numOfprec, numOflayers;
-  OPJ_BYTE l_data_header [8];
-  packet.end_ph_pos = packet.start_pos = -1;
-  (void)EPHused; /* unused ? */
-
-  if( j2klen > pow( 2, 32)){
-    size_of_coding =  8;
-    version = 1;
-  }
-  else{
-    size_of_coding = 4;
-    version = 0;
-  }
-
-#if 0
-  lenp = cio_tell( cio);
-  cio_skip( cio, 4);              /* L [at the end]      */
-  cio_write( cio, JPIP_FAIX, 4);  /* FAIX                */ 
-  cio_write( cio, version,1);     /* Version 0 = 4 bytes */
-#else
-  lenp = opj_stream_tell(cio);
-  opj_stream_skip(cio, 4, p_manager);         /* L [at the end]      */
-  opj_write_bytes(l_data_header,JPIP_FAIX,4); /* FAIX */
-  opj_stream_write_data(cio,l_data_header,4,p_manager);
-  opj_write_bytes(l_data_header,version,1);   /* Version 0 = 4 bytes */
-  opj_stream_write_data(cio,l_data_header,1,p_manager);
-#endif
-
-  nmax = 0;
-  for( i=0; i<=cstr_info.numdecompos[compno]; i++)
-    nmax += cstr_info.tile[0].ph[i] * cstr_info.tile[0].pw[i] * cstr_info.numlayers;
-  
-#if 0
-  cio_write( cio, nmax, size_of_coding); /* NMAX */
-  cio_write( cio, cstr_info.tw*cstr_info.th, size_of_coding);      /* M    */
-#else
-  opj_write_bytes(l_data_header,nmax,size_of_coding);         /* NMAX           */
-  opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
-  opj_write_bytes(l_data_header,cstr_info.tw*cstr_info.th,size_of_coding);  /* M              */
-  opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
-#endif
-  
-  for( tileno=0; tileno<cstr_info.tw*cstr_info.th; tileno++){
-    tile_Idx = &cstr_info.tile[ tileno];
-    
-    num_packet = 0;
-    numOfres = cstr_info.numdecompos[compno] + 1;
-
-    for( resno=0; resno<numOfres ; resno++){
-      numOfprec = tile_Idx->pw[resno]*tile_Idx->ph[resno];
-      for( precno=0; precno<numOfprec; precno++){
-       numOflayers = cstr_info.numlayers;
-       for( layno=0; layno<numOflayers; layno++){
-         
-         switch ( cstr_info.prog){
-         case LRCP:
-           packet = tile_Idx->packet[ ((layno*numOfres+resno)*cstr_info.numcomps+compno)*numOfprec+precno];
-           break;
-         case RLCP:
-           packet = tile_Idx->packet[ ((resno*numOflayers+layno)*cstr_info.numcomps+compno)*numOfprec+precno];
-           break;
-         case RPCL:
-           packet = tile_Idx->packet[ ((resno*numOfprec+precno)*cstr_info.numcomps+compno)*numOflayers+layno];
-           break;
-         case PCRL:
-           packet = tile_Idx->packet[ ((precno*cstr_info.numcomps+compno)*numOfres+resno)*numOflayers + layno];
-           break;
-         case CPRL:
-           packet = tile_Idx->packet[ ((compno*numOfprec+precno)*numOfres+resno)*numOflayers + layno];
-           break;
-         default:
-           fprintf( stderr, "failed to ppix indexing\n");
-         }
-
-#if 0
-         cio_write( cio, packet.start_pos-coff, size_of_coding);                /* start position */
-         cio_write( cio, packet.end_ph_pos-packet.start_pos+1, size_of_coding); /* length         */
-#else
-    opj_write_bytes(l_data_header,packet.start_pos-coff,size_of_coding);            /* start position */
-    opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
-    opj_write_bytes(l_data_header,packet.end_ph_pos-packet.start_pos+1,size_of_coding); /* length         */
-    opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
-#endif
-         
-         num_packet++;
-       }
-      }
-    }
-
-    /* PADDING */
-    while( num_packet < nmax){
-#if 0
-      cio_write( cio, 0, size_of_coding); /* start position            */
-      cio_write( cio, 0, size_of_coding); /* length                    */
-#else
-      opj_write_bytes(l_data_header,0,size_of_coding);/* start position            */
-      opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
-      opj_write_bytes(l_data_header,0,size_of_coding);/* length                    */
-      opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
-#endif
-      num_packet++;
-    }
-  }
-
-#if 0
-  len = cio_tell( cio)-lenp;
-  cio_seek( cio, lenp);
-  cio_write( cio, len, 4);        /* L  */
-  cio_seek( cio, lenp+len);
-#else
-  len = opj_stream_tell(cio)-lenp;
-  opj_stream_seek(cio, lenp,p_manager);
-  opj_write_bytes(l_data_header,len,4);/* L  */
-  opj_stream_write_data(cio,l_data_header,4,p_manager);
-  opj_stream_seek(cio, lenp+len,p_manager);
-#endif
-
-  return len;
-}
diff --git a/src/lib/openjpip/ppix_manager.c b/src/lib/openjpip/ppix_manager.c
deleted file mode 100644 (file)
index ad1d934..0000000
+++ /dev/null
@@ -1,352 +0,0 @@
-/*
- * $Id: ppix_manager.c 897 2011-08-28 21:43:57Z Kaori.Hagihara@gmail.com $
- *
- * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2011, Professor Benoit Macq
- * Copyright (c) 2003-2004, Yannick Verschueren
- * Copyright (c) 2010-2011, Kaori Hagihara
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*! \file
- *  \brief Modification of jpip.c from 2KAN indexer
- */
-
-#include "opj_includes.h"
-
-/* 
- * Write faix box of ppix
- *
- * @param[in] coff offset of j2k codestream
- * @param[in] compno    component number
- * @param[in] cstr_info codestream information
- * @param[in] EPHused   true if if EPH option used
- * @param[in] j2klen    length of j2k codestream
- * @param[in] cio       file output handle
- * @return              length of faix box
- */
-int write_ppixfaix( int coff, int compno, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_cio_t *cio);
-
-int write_ppix( int coff, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_cio_t *cio)
-{
-  int len, lenp, compno, i;
-  opj_jp2_box_t *box;
-
-  /*  printf("cstr_info.packno %d\n", cstr_info.packno); //NMAX? */
-
-  lenp = -1;
-  box = (opj_jp2_box_t *)opj_calloc( cstr_info.numcomps, sizeof(opj_jp2_box_t));
-  
-  for (i=0;i<2;i++){
-    if (i) cio_seek( cio, lenp);
-    
-    lenp = cio_tell( cio);
-    cio_skip( cio, 4);              /* L [at the end] */
-    cio_write( cio, JPIP_PPIX, 4);  /* PPIX           */
-
-    write_manf( i, cstr_info.numcomps, box, cio);
-    
-    for (compno=0; compno<cstr_info.numcomps; compno++){
-      box[compno].length = write_ppixfaix( coff, compno, cstr_info, EPHused, j2klen, cio);
-      box[compno].type = JPIP_FAIX;
-    }
-   
-    len = cio_tell( cio)-lenp;
-    cio_seek( cio, lenp);
-    cio_write( cio, len, 4);        /* L              */
-    cio_seek( cio, lenp+len);
-  }
-  
-  opj_free(box);
-
-  return len;
-}
-
-int write_ppix_v2( int coff, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_stream_private_t *cio,
-              opj_event_mgr_t * p_manager )
-{
-  OPJ_BYTE l_data_header [4];
-  int len, lenp, compno, i;
-  opj_jp2_box_t *box;
-
-  /*  printf("cstr_info.packno %d\n", cstr_info.packno); //NMAX? */
-
-  lenp = -1;
-  box = (opj_jp2_box_t *)opj_calloc( cstr_info.numcomps, sizeof(opj_jp2_box_t));
-  
-  for (i=0;i<2;i++){
-    if (i)
-#if 0
-      cio_seek( cio, lenp);
-#else
-      opj_stream_seek( cio, lenp, p_manager);
-#endif
-    
-#if 0
-    lenp = cio_tell( cio);
-    cio_skip( cio, 4);              /* L [at the end] */
-    cio_write( cio, JPIP_PPIX, 4);  /* PPIX           */
-#else
-    lenp = opj_stream_tell(cio);
-    opj_stream_skip( cio, 4, p_manager);       /* L [at the end] */
-    opj_write_bytes(l_data_header,JPIP_PPIX,4);/* PPIX           */
-    opj_stream_write_data(cio,l_data_header,4,p_manager);
-#endif
-
-    write_manf_v2( i, cstr_info.numcomps, box, cio);
-    
-    for (compno=0; compno<cstr_info.numcomps; compno++){
-      box[compno].length = write_ppixfaix_v2( coff, compno, cstr_info, EPHused, j2klen, cio,p_manager);
-      box[compno].type = JPIP_FAIX;
-    }
-   
-#if 0
-    len = cio_tell( cio)-lenp;
-    cio_seek( cio, lenp);
-    cio_write( cio, len, 4);        /* L              */
-    cio_seek( cio, lenp+len);
-#else
-  len = opj_stream_tell(cio)-lenp;
-  opj_stream_seek(cio, lenp,p_manager);
-  opj_write_bytes(l_data_header,len,4);/* L              */
-  opj_stream_write_data(cio,l_data_header,4,p_manager);
-  opj_stream_seek(cio, lenp+len,p_manager);
-#endif
-  }
-  
-  opj_free(box);
-
-  return len;
-}
-
-int write_ppixfaix( int coff, int compno, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_cio_t *cio)
-{
-  int len, lenp, tileno, version, i, nmax, size_of_coding; /* 4 or 8*/
-  opj_tile_info_t *tile_Idx;
-  opj_packet_info_t packet;
-  int resno, precno, layno, num_packet;
-  int numOfres, numOfprec, numOflayers;
-  packet.end_pos = packet.end_ph_pos = packet.start_pos = -1;
-  (void)EPHused; /* unused ? */
-
-  if( j2klen > pow( 2, 32)){
-    size_of_coding =  8;
-    version = 1;
-  }
-  else{
-    size_of_coding = 4;
-    version = 0;
-  }
-  
-  lenp = cio_tell( cio);
-  cio_skip( cio, 4);              /* L [at the end]      */
-  cio_write( cio, JPIP_FAIX, 4);  /* FAIX                */ 
-  cio_write( cio, version, 1);     /* Version 0 = 4 bytes */
-
-  nmax = 0;
-  for( i=0; i<=cstr_info.numdecompos[compno]; i++)
-    nmax += cstr_info.tile[0].ph[i] * cstr_info.tile[0].pw[i] * cstr_info.numlayers;
-  
-  cio_write( cio, nmax, size_of_coding); /* NMAX */
-  cio_write( cio, cstr_info.tw*cstr_info.th, size_of_coding);      /* M    */
-
-  for( tileno=0; tileno<cstr_info.tw*cstr_info.th; tileno++){
-    tile_Idx = &cstr_info.tile[ tileno];
-    num_packet=0;
-    numOfres = cstr_info.numdecompos[compno] + 1;
-  
-    for( resno=0; resno<numOfres ; resno++){
-      numOfprec = tile_Idx->pw[resno]*tile_Idx->ph[resno];
-      for( precno=0; precno<numOfprec; precno++){
-       numOflayers = cstr_info.numlayers;
-       for( layno=0; layno<numOflayers; layno++){
-
-         switch ( cstr_info.prog){
-         case LRCP:
-           packet = tile_Idx->packet[ ((layno*numOfres+resno)*cstr_info.numcomps+compno)*numOfprec+precno];
-           break;
-         case RLCP:
-           packet = tile_Idx->packet[ ((resno*numOflayers+layno)*cstr_info.numcomps+compno)*numOfprec+precno];
-           break;
-         case RPCL:
-           packet = tile_Idx->packet[ ((resno*numOfprec+precno)*cstr_info.numcomps+compno)*numOflayers+layno];
-           break;
-         case PCRL:
-           packet = tile_Idx->packet[ ((precno*cstr_info.numcomps+compno)*numOfres+resno)*numOflayers + layno];
-           break;
-         case CPRL:
-           packet = tile_Idx->packet[ ((compno*numOfprec+precno)*numOfres+resno)*numOflayers + layno];
-           break;
-         default:
-           fprintf( stderr, "failed to ppix indexing\n");
-         }
-
-         cio_write( cio, packet.start_pos-coff, size_of_coding);             /* start position */
-         cio_write( cio, packet.end_pos-packet.start_pos+1, size_of_coding); /* length         */
-         
-         num_packet++;
-       }
-      }
-    }
-  
-    while( num_packet < nmax){     /* PADDING */
-      cio_write( cio, 0, size_of_coding); /* start position            */
-      cio_write( cio, 0, size_of_coding); /* length                    */
-      num_packet++;
-    }   
-  }
-
-  len = cio_tell( cio)-lenp;
-  cio_seek( cio, lenp);
-  cio_write( cio, len, 4);        /* L  */
-  cio_seek( cio, lenp+len);
-
-  return len;
-}
-
-int write_ppixfaix_v2( int coff, int compno, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_stream_private_t *cio,
-              opj_event_mgr_t * p_manager )
-{
-  OPJ_BYTE l_data_header [8];
-  int len, lenp, tileno, version, i, nmax, size_of_coding; /* 4 or 8*/
-  opj_tile_info_t *tile_Idx;
-  opj_packet_info_t packet;
-  int resno, precno, layno, num_packet;
-  int numOfres, numOfprec, numOflayers;
-  packet.end_pos = packet.end_ph_pos = packet.start_pos = -1;
-  (void)EPHused; /* unused ? */
-
-  if( j2klen > pow( 2, 32)){
-    size_of_coding =  8;
-    version = 1;
-  }
-  else{
-    size_of_coding = 4;
-    version = 0;
-  }
-  
-#if 0
-  lenp = cio_tell( cio);
-  cio_skip( cio, 4);              /* L [at the end]      */
-  cio_write( cio, JPIP_FAIX, 4);  /* FAIX                */ 
-  cio_write( cio, version, 1);     /* Version 0 = 4 bytes */
-#else
-  lenp = opj_stream_tell(cio);
-  opj_stream_skip(cio, 4, p_manager);         /* L [at the end]      */
-  opj_write_bytes(l_data_header,JPIP_FAIX,4); /* FAIX */
-  opj_write_bytes(l_data_header,version,1);
-  opj_stream_write_data(cio,l_data_header,1,p_manager);/* Version 0 = 4 bytes */
-#endif
-
-  nmax = 0;
-  for( i=0; i<=cstr_info.numdecompos[compno]; i++)
-    nmax += cstr_info.tile[0].ph[i] * cstr_info.tile[0].pw[i] * cstr_info.numlayers;
-  
-#if 0
-  cio_write( cio, nmax, size_of_coding); /* NMAX */
-  cio_write( cio, cstr_info.tw*cstr_info.th, size_of_coding);      /* M    */
-#else
-  opj_write_bytes(l_data_header,nmax,size_of_coding);         /* NMAX           */
-  opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
-  opj_write_bytes(l_data_header,cstr_info.tw*cstr_info.th,size_of_coding);  /* M              */
-  opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
-#endif
-
-  for( tileno=0; tileno<cstr_info.tw*cstr_info.th; tileno++){
-    tile_Idx = &cstr_info.tile[ tileno];
-    num_packet=0;
-    numOfres = cstr_info.numdecompos[compno] + 1;
-  
-    for( resno=0; resno<numOfres ; resno++){
-      numOfprec = tile_Idx->pw[resno]*tile_Idx->ph[resno];
-      for( precno=0; precno<numOfprec; precno++){
-       numOflayers = cstr_info.numlayers;
-       for( layno=0; layno<numOflayers; layno++){
-
-         switch ( cstr_info.prog){
-         case LRCP:
-           packet = tile_Idx->packet[ ((layno*numOfres+resno)*cstr_info.numcomps+compno)*numOfprec+precno];
-           break;
-         case RLCP:
-           packet = tile_Idx->packet[ ((resno*numOflayers+layno)*cstr_info.numcomps+compno)*numOfprec+precno];
-           break;
-         case RPCL:
-           packet = tile_Idx->packet[ ((resno*numOfprec+precno)*cstr_info.numcomps+compno)*numOflayers+layno];
-           break;
-         case PCRL:
-           packet = tile_Idx->packet[ ((precno*cstr_info.numcomps+compno)*numOfres+resno)*numOflayers + layno];
-           break;
-         case CPRL:
-           packet = tile_Idx->packet[ ((compno*numOfprec+precno)*numOfres+resno)*numOflayers + layno];
-           break;
-         default:
-           fprintf( stderr, "failed to ppix indexing\n");
-         }
-
-#if 0
-         cio_write( cio, packet.start_pos-coff, size_of_coding);             /* start position */
-         cio_write( cio, packet.end_pos-packet.start_pos+1, size_of_coding); /* length         */
-#else
-    opj_write_bytes(l_data_header,packet.start_pos-coff,size_of_coding);            /* start position */
-    opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
-    opj_write_bytes(l_data_header,packet.end_pos-packet.start_pos+1,size_of_coding); /* length         */
-    opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
-#endif
-         
-         num_packet++;
-       }
-      }
-    }
-  
-    while( num_packet < nmax){     /* PADDING */
-#if 0
-      cio_write( cio, 0, size_of_coding); /* start position            */
-      cio_write( cio, 0, size_of_coding); /* length                    */
-#else
-      opj_write_bytes(l_data_header,0,size_of_coding);/* start position            */
-      opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
-      opj_write_bytes(l_data_header,0,size_of_coding);/* length                    */
-      opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
-#endif
-      num_packet++;
-    }   
-  }
-
-#if 0
-  len = cio_tell( cio)-lenp;
-  cio_seek( cio, lenp);
-  cio_write( cio, len, 4);        /* L  */
-  cio_seek( cio, lenp+len);
-#else
-  len = opj_stream_tell(cio)-lenp;
-  opj_stream_seek(cio, lenp,p_manager);
-  opj_write_bytes(l_data_header,len,4);/* L  */
-  opj_stream_write_data(cio,l_data_header,4,p_manager);
-  opj_stream_seek(cio, lenp+len,p_manager);
-#endif
-
-  return len;
-}
diff --git a/src/lib/openjpip/thix_manager.c b/src/lib/openjpip/thix_manager.c
deleted file mode 100644 (file)
index fe584cb..0000000
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * $Id: thix_manager.c 897 2011-08-28 21:43:57Z Kaori.Hagihara@gmail.com $
- *
- * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2011, Professor Benoit Macq
- * Copyright (c) 2003-2004, Yannick Verschueren
- * Copyright (c) 2010-2011, Kaori Hagihara
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*! \file
- *  \brief Modification of jpip.c from 2KAN indexer
- */
-
-#include "opj_includes.h"
-
-/* 
- * Write tile-part headers mhix box
- *
- * @param[in] coff      offset of j2k codestream
- * @param[in] cstr_info codestream information
- * @param[in] tileno    tile number
- * @param[in] cio       file output handle
- * @return              length of mhix box
- */
-int write_tilemhix( int coff, opj_codestream_info_t cstr_info, int tileno, opj_cio_t *cio);
-
-int write_thix( int coff, opj_codestream_info_t cstr_info, opj_cio_t *cio)
-{
-  int len, lenp, i;
-  int tileno;
-  opj_jp2_box_t *box;
-
-  lenp = 0;
-  box = (opj_jp2_box_t *)opj_calloc( cstr_info.tw*cstr_info.th, sizeof(opj_jp2_box_t));
-
-  for ( i = 0; i < 2 ; i++ ){
-    if (i)
-      cio_seek( cio, lenp);
-
-    lenp = cio_tell( cio);
-    cio_skip( cio, 4);              /* L [at the end] */
-    cio_write( cio, JPIP_THIX, 4);  /* THIX           */
-    write_manf( i, cstr_info.tw*cstr_info.th, box, cio);
-    
-    for (tileno = 0; tileno < cstr_info.tw*cstr_info.th; tileno++){
-      box[tileno].length = write_tilemhix( coff, cstr_info, tileno, cio);
-      box[tileno].type = JPIP_MHIX;
-    }
-    len = cio_tell( cio)-lenp;
-    cio_seek( cio, lenp);
-    cio_write( cio, len, 4);        /* L              */
-    cio_seek( cio, lenp+len);
-  }
-
-  opj_free(box);
-
-  return len;
-}
-
-int write_thix_v2( int coff, opj_codestream_info_t cstr_info, opj_stream_private_t *cio,
-              opj_event_mgr_t * p_manager )
-{
-  OPJ_BYTE l_data_header [4];
-  int len, lenp, i;
-  int tileno;
-  opj_jp2_box_t *box;
-
-  lenp = 0;
-  box = (opj_jp2_box_t *)opj_calloc( cstr_info.tw*cstr_info.th, sizeof(opj_jp2_box_t));
-
-  for ( i = 0; i < 2 ; i++ ){
-    if (i)
-#if 0
-      cio_seek( cio, lenp);
-#else
-      opj_stream_seek( cio, lenp, p_manager);
-#endif
-
-#if 0
-    lenp = cio_tell( cio);
-    cio_skip( cio, 4);              /* L [at the end] */
-    cio_write( cio, JPIP_THIX, 4);  /* THIX           */
-#else
-    lenp = opj_stream_tell(cio);
-    opj_stream_skip(cio, 4, p_manager);             /* L [at the end] */
-    opj_write_bytes(l_data_header,JPIP_THIX,4); /* THIX */
-    opj_stream_write_data(cio,l_data_header,4,p_manager);
-#endif
-    write_manf_v2( i, cstr_info.tw*cstr_info.th, box, cio);
-    
-    for (tileno = 0; tileno < cstr_info.tw*cstr_info.th; tileno++){
-      box[tileno].length = write_tilemhix_v2( coff, cstr_info, tileno, cio,p_manager);
-      box[tileno].type = JPIP_MHIX;
-    }
-#if 0
-    len = cio_tell( cio)-lenp;
-    cio_seek( cio, lenp);
-    cio_write( cio, len, 4);        /* L              */
-    cio_seek( cio, lenp+len);
-#else
-    len = opj_stream_tell(cio)-lenp;
-    opj_stream_seek(cio, lenp, p_manager);
-    opj_write_bytes(l_data_header,len,4); /* L              */
-    opj_stream_write_data(cio,l_data_header,4,p_manager);
-    opj_stream_seek( cio, lenp+len,p_manager);
-#endif
-  }
-
-  opj_free(box);
-
-  return len;
-}
-
-int write_tilemhix( int coff, opj_codestream_info_t cstr_info, int tileno, opj_cio_t *cio)
-{
-  int i;
-  opj_tile_info_t tile;
-  opj_tp_info_t tp;
-  int marknum;
-  int len, lenp;
-  opj_marker_info_t *marker;
-
-  lenp = cio_tell( cio);
-  cio_skip( cio, 4);                               /* L [at the end]                    */
-  cio_write( cio, JPIP_MHIX, 4);                   /* MHIX                              */
-
-  tile = cstr_info.tile[tileno];
-  tp = tile.tp[0];
-
-  cio_write( cio, tp.tp_end_header-tp.tp_start_pos+1, 8);  /* TLEN                              */ 
-
-  marker = cstr_info.tile[tileno].marker;
-
-  for( i=0; i<cstr_info.tile[tileno].marknum; i++){             /* Marker restricted to 1 apparition */
-    cio_write( cio, marker[i].type, 2);
-    cio_write( cio, 0, 2);
-    cio_write( cio, marker[i].pos-coff, 8);
-    cio_write( cio, marker[i].len, 2);
-  }
-     
-  /*  free( marker);*/
-
-  len = cio_tell( cio) - lenp;
-  cio_seek( cio, lenp);
-  cio_write( cio, len, 4);        /* L           */
-  cio_seek( cio, lenp+len);
-
-  return len;
-}
-
-int write_tilemhix_v2( int coff, opj_codestream_info_t cstr_info, int tileno, opj_stream_private_t *cio,
-              opj_event_mgr_t * p_manager )
-{
-  OPJ_BYTE l_data_header [8];
-  int i;
-  opj_tile_info_t tile;
-  opj_tp_info_t tp;
-  int marknum;
-  int len, lenp;
-  opj_marker_info_t *marker;
-
-#if 0
-  lenp = cio_tell( cio);
-  cio_skip( cio, 4);                               /* L [at the end]                    */
-  cio_write( cio, JPIP_MHIX, 4);                   /* MHIX                              */
-#else
-  lenp = opj_stream_tell (cio);
-  opj_stream_skip(cio, 4, p_manager);               /* L [at the end]                    */
-  opj_write_bytes(l_data_header,JPIP_MHIX,4);       /* MHIX                              */
-  opj_stream_write_data(cio,l_data_header,4,p_manager);
-#endif
-
-  tile = cstr_info.tile[tileno];
-  tp = tile.tp[0];
-
-#if 0
-  cio_write( cio, tp.tp_end_header-tp.tp_start_pos+1, 8);  /* TLEN                              */ 
-#else
-  opj_write_bytes(l_data_header,tp.tp_end_header-tp.tp_start_pos+1, 8);        /* TLEN                              */
-  opj_stream_write_data(cio,l_data_header,8,p_manager);
-#endif
-
-  marker = cstr_info.tile[tileno].marker;
-
-  for( i=0; i<cstr_info.tile[tileno].marknum; i++){             /* Marker restricted to 1 apparition */
-#if 0
-    cio_write( cio, marker[i].type, 2);
-    cio_write( cio, 0, 2);
-    cio_write( cio, marker[i].pos-coff, 8);
-    cio_write( cio, marker[i].len, 2);
-#else
-    opj_write_bytes( l_data_header, marker[i].type, 2);
-    opj_write_bytes( l_data_header+2, 0, 2);
-    opj_stream_write_data(cio,l_data_header,4,p_manager);
-    opj_write_bytes( l_data_header, marker[i].pos-coff, 8);
-    opj_stream_write_data(cio,l_data_header,8,p_manager);
-    opj_write_bytes( l_data_header, marker[i].len, 2);
-    opj_stream_write_data(cio,l_data_header,2,p_manager);
-#endif
-  }
-     
-  /*  free( marker);*/
-
-#if 0
-  len = cio_tell( cio) - lenp;
-  cio_seek( cio, lenp);
-  cio_write( cio, len, 4);        /* L           */
-  cio_seek( cio, lenp+len);
-#else
-  len = opj_stream_tell(cio)-lenp;
-  opj_stream_seek(cio, lenp,p_manager);
-  opj_write_bytes(l_data_header,len,4);/* L  */
-  opj_stream_write_data(cio,l_data_header,4,p_manager);
-  opj_stream_seek(cio, lenp+len,p_manager);
-#endif
-
-  return len;
-}
diff --git a/src/lib/openjpip/tpix_manager.c b/src/lib/openjpip/tpix_manager.c
deleted file mode 100644 (file)
index 0c58a32..0000000
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
- * $Id: tpix_manager.c 897 2011-08-28 21:43:57Z Kaori.Hagihara@gmail.com $
- *
- * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2011, Professor Benoit Macq
- * Copyright (c) 2003-2004, Yannick Verschueren
- * Copyright (c) 2010-2011, Kaori Hagihara
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*! \file
- *  \brief Modification of jpip.c from 2KAN indexer
- */
-
-#include "opj_includes.h"
-
-#define MAX(a,b) ((a)>(b)?(a):(b))
-
-
-/* 
- * Write faix box of tpix
- *
- * @param[in] coff offset of j2k codestream
- * @param[in] compno    component number
- * @param[in] cstr_info codestream information
- * @param[in] j2klen    length of j2k codestream
- * @param[in] cio       file output handle
- * @return              length of faix box
- */
-int write_tpixfaix( int coff, int compno, opj_codestream_info_t cstr_info, int j2klen, opj_cio_t *cio);
-
-
-int write_tpix( int coff, opj_codestream_info_t cstr_info, int j2klen, opj_cio_t *cio)
-{
-  int len, lenp;
-  lenp = cio_tell( cio);
-  cio_skip( cio, 4);              /* L [at the end] */
-  cio_write( cio, JPIP_TPIX, 4);  /* TPIX           */
-  
-  write_tpixfaix( coff, 0, cstr_info, j2klen, cio);
-
-  len = cio_tell( cio)-lenp;
-  cio_seek( cio, lenp);
-  cio_write( cio, len, 4);        /* L              */
-  cio_seek( cio, lenp+len);
-
-  return len;
-}
-
-int write_tpix_v2( int coff, opj_codestream_info_t cstr_info, int j2klen, opj_stream_private_t *cio,
-              opj_event_mgr_t * p_manager )
-{
-  OPJ_BYTE l_data_header [4];
-  int len, lenp;
-#if 0
-  lenp = cio_tell( cio);
-  cio_skip( cio, 4);              /* L [at the end] */
-  cio_write( cio, JPIP_TPIX, 4);  /* TPIX           */
-#else
-  lenp = opj_stream_tell(cio);
-  opj_stream_skip(cio, 4, p_manager);
-  opj_write_bytes(l_data_header,JPIP_TPIX,4); /* TPIX */
-  opj_stream_write_data(cio,l_data_header,4,p_manager);
-#endif
-  
-  write_tpixfaix_v2( coff, 0, cstr_info, j2klen, cio,p_manager);
-
-#if 0
-  len = cio_tell( cio)-lenp;
-  cio_seek( cio, lenp);
-  cio_write( cio, len, 4);        /* L              */
-  cio_seek( cio, lenp+len);
-#else
-  len = opj_stream_tell(cio)-lenp;
-  opj_stream_skip(cio, lenp, p_manager);
-  opj_write_bytes(l_data_header,len,4);/* L              */
-  opj_stream_write_data(cio,l_data_header,4,p_manager);
-  opj_stream_seek(cio, lenp+len,p_manager);
-#endif
-
-  return len;
-}
-
-/* 
- * Get number of maximum tile parts per tile
- *
- * @param[in] cstr_info codestream information
- * @return              number of maximum tile parts per tile
- */
-int get_num_max_tile_parts( opj_codestream_info_t cstr_info);
-
-int write_tpixfaix( int coff, int compno, opj_codestream_info_t cstr_info, int j2klen, opj_cio_t *cio)
-{
-  int len, lenp;
-  int i, j;
-  int Aux;
-  int num_max_tile_parts;
-  int size_of_coding; /* 4 or 8 */
-  opj_tp_info_t tp;
-  int version;
-
-  num_max_tile_parts = get_num_max_tile_parts( cstr_info);
-
-  if( j2klen > pow( 2, 32)){
-    size_of_coding =  8;
-    version = num_max_tile_parts == 1 ? 1:3;
-  }
-  else{
-    size_of_coding = 4;
-    version = num_max_tile_parts == 1 ? 0:2;
-  }
-
-  lenp = cio_tell( cio);
-  cio_skip( cio, 4);              /* L [at the end]      */
-  cio_write( cio, JPIP_FAIX, 4);  /* FAIX                */ 
-  cio_write( cio, version, 1);     /* Version 0 = 4 bytes */
-
-  cio_write( cio, num_max_tile_parts, size_of_coding);                      /* NMAX           */
-  cio_write( cio, cstr_info.tw*cstr_info.th, size_of_coding);                               /* M              */
-  for (i = 0; i < cstr_info.tw*cstr_info.th; i++){
-    for (j = 0; j < cstr_info.tile[i].num_tps; j++){
-      tp = cstr_info.tile[i].tp[j];
-      cio_write( cio, tp.tp_start_pos-coff, size_of_coding); /* start position */
-      cio_write( cio, tp.tp_end_pos-tp.tp_start_pos+1, size_of_coding);    /* length         */
-      if (version & 0x02){
-  if( cstr_info.tile[i].num_tps == 1 && cstr_info.numdecompos[compno] > 1)
-    Aux = cstr_info.numdecompos[compno] + 1;
-  else
-    Aux = j + 1;
-      
-  cio_write( cio, Aux,4);
-  /*cio_write(img.tile[i].tile_parts[j].num_reso_AUX,4);*/ /* Aux_i,j : Auxiliary value */
-  /* fprintf(stderr,"AUX value %d\n",Aux);*/
-      }
-      /*cio_write(0,4);*/
-    }
-    /* PADDING */
-    while (j < num_max_tile_parts){
-      cio_write( cio, 0, size_of_coding); /* start position            */
-      cio_write( cio, 0, size_of_coding); /* length                    */
-      if (version & 0x02)
-  cio_write( cio, 0,4);                  /* Aux_i,j : Auxiliary value */
-      j++;
-    }
-  }
-  
-  len = cio_tell( cio)-lenp;
-  cio_seek( cio, lenp);
-  cio_write( cio, len, 4);        /* L  */
-  cio_seek( cio, lenp+len);
-
-  return len;
-
-}
-
-int write_tpixfaix_v2( int coff, int compno, opj_codestream_info_t cstr_info, int j2klen, opj_stream_private_t *cio,
-              opj_event_mgr_t * p_manager )
-{
-  int len, lenp;
-  int i, j;
-  int Aux;
-  int num_max_tile_parts;
-  int size_of_coding; /* 4 or 8 */
-  opj_tp_info_t tp;
-  OPJ_BYTE l_data_header [8];
-  int version;
-
-  num_max_tile_parts = get_num_max_tile_parts( cstr_info);
-
-  if( j2klen > pow( 2, 32)){
-    size_of_coding =  8;
-    version = num_max_tile_parts == 1 ? 1:3;
-  }
-  else{
-    size_of_coding = 4;
-    version = num_max_tile_parts == 1 ? 0:2;
-  }
-
-#if 0
-  lenp = cio_tell( cio);
-  cio_skip( cio, 4);              /* L [at the end]      */
-  cio_write( cio, JPIP_FAIX, 4);  /* FAIX                */ 
-  cio_write( cio, version, 1);     /* Version 0 = 4 bytes */
-#else
-  lenp = opj_stream_tell(cio);
-  opj_stream_skip(cio, 4, p_manager);         /* L [at the end]      */
-  opj_write_bytes(l_data_header,JPIP_FAIX,4); /* FAIX */
-  opj_stream_write_data(cio,l_data_header,4,p_manager);
-  opj_write_bytes(l_data_header,version,1);   /* Version 0 = 4 bytes */
-  opj_stream_write_data(cio,l_data_header,1,p_manager);
-#endif
-
-#if 0
-  cio_write( cio, num_max_tile_parts, size_of_coding);                      /* NMAX           */
-  cio_write( cio, cstr_info.tw*cstr_info.th, size_of_coding);               /* M              */
-#else
-  opj_write_bytes(l_data_header,num_max_tile_parts,size_of_coding);         /* NMAX           */
-  opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
-  opj_write_bytes(l_data_header,cstr_info.tw*cstr_info.th,size_of_coding);  /* M              */
-  opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
-#endif
-  for (i = 0; i < cstr_info.tw*cstr_info.th; i++)
-    {
-    for (j = 0; j < cstr_info.tile[i].num_tps; j++)
-      {
-      tp = cstr_info.tile[i].tp[j];
-#if 0
-      cio_write( cio, tp.tp_start_pos-coff, size_of_coding); /* start position */
-      cio_write( cio, tp.tp_end_pos-tp.tp_start_pos+1, size_of_coding);    /* length         */
-#else
-      opj_write_bytes(l_data_header,tp.tp_start_pos-coff,size_of_coding);            /* start position */
-      opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
-      opj_write_bytes(l_data_header,tp.tp_end_pos-tp.tp_start_pos+1,size_of_coding); /* length         */
-      opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
-#endif
-      if (version & 0x02)
-        {
-        if( cstr_info.tile[i].num_tps == 1 && cstr_info.numdecompos[compno] > 1)
-          Aux = cstr_info.numdecompos[compno] + 1;
-        else
-          Aux = j + 1;
-
-#if 0
-        cio_write( cio, Aux,4);
-#else
-        opj_write_bytes(l_data_header,Aux,4);
-        opj_stream_write_data(cio,l_data_header,4,p_manager);
-#endif
-        /*cio_write(img.tile[i].tile_parts[j].num_reso_AUX,4);*/ /* Aux_i,j : Auxiliary value */
-        /* fprintf(stderr,"AUX value %d\n",Aux);*/
-        }
-      /*cio_write(0,4);*/
-      }
-    /* PADDING */
-    while (j < num_max_tile_parts)
-      {
-#if 0
-      cio_write( cio, 0, size_of_coding); /* start position            */
-      cio_write( cio, 0, size_of_coding); /* length                    */
-#else
-      opj_write_bytes(l_data_header,0,size_of_coding);/* start position            */
-      opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
-      opj_write_bytes(l_data_header,0,size_of_coding);/* length                    */
-      opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager);
-#endif
-      if (version & 0x02)
-#if 0
-        cio_write( cio, 0,4);                  /* Aux_i,j : Auxiliary value */
-#else
-      opj_write_bytes(l_data_header,0,4);      /* Aux_i,j : Auxiliary value */
-      opj_stream_write_data(cio,l_data_header,4,p_manager);
-#endif
-      j++;
-      }
-    }
-  
-#if 0
-  len = cio_tell( cio)-lenp;
-  cio_seek( cio, lenp);
-  cio_write( cio, len, 4);        /* L  */
-  cio_seek( cio, lenp+len);
-#else
-  len = opj_stream_tell(cio)-lenp;
-  opj_stream_seek(cio, lenp,p_manager);
-  opj_write_bytes(l_data_header,len,4);/* L  */
-  opj_stream_write_data(cio,l_data_header,4,p_manager);
-  opj_stream_seek(cio, lenp+len,p_manager);
-#endif
-
-  return len;
-}
-
-int get_num_max_tile_parts( opj_codestream_info_t cstr_info)
-{
-  int num_max_tp = 0, i;
-
-  for( i=0; i<cstr_info.tw*cstr_info.th; i++)
-    num_max_tp = MAX( cstr_info.tile[i].num_tps, num_max_tp);
-  
-  return num_max_tp;
-}