adding j2k_dump executable
authorMathieu Malaterre <mathieu.malaterre@gmail.com>
Mon, 21 Jun 2010 13:21:11 +0000 (13:21 +0000)
committerMathieu Malaterre <mathieu.malaterre@gmail.com>
Mon, 21 Jun 2010 13:21:11 +0000 (13:21 +0000)
CMakeLists.txt
ChangeLog
codec/CMakeLists.txt
codec/image_to_j2k.c
codec/j2k_dump.c [new file with mode: 0644]
codec/j2k_to_image.c

index 0d8092bf30b2ec9be1878f113a4422e516a244e5..aae9337175a7b0eb5e44ca0f1f45185416453ea6 100644 (file)
@@ -40,7 +40,6 @@ SET(OPENJPEG_LIBRARY_PROPERTIES
   SOVERSION "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}"
 )
 
-
 #-----------------------------------------------------------------------------
 # OpenJPEG build configuration options.
 OPTION(BUILD_SHARED_LIBS "Build OpenJPEG with shared libraries." OFF)
@@ -104,16 +103,12 @@ IF(BUILD_DOCUMENTATION)
 ENDIF(BUILD_DOCUMENTATION)
 
 #-----------------------------------------------------------------------------
-# For openjpeg team if they ever want Dart+CMake
-IF(OPENJPEG_STANDALONE)
+# For openjpeg team if they ever want CDash+CMake
+OPTION(BUILD_TESTING "Build the tests." OFF)
+IF(BUILD_TESTING)
+  ENABLE_TESTING()
   INCLUDE(CTest)
-  #MARK_AS_ADVANCED(BUILD_TESTING DART_ROOT TCL_TCLSH)
-  IF(BUILD_TESTING)
-    ENABLE_TESTING()
-    #SET(BUILDNAME "OpenJPEG-${CMAKE_SYSTEM}-${CMAKE_C_COMPILER}" CACHE STRING "Name of build on the dashboard")
-    MARK_AS_ADVANCED(BUILDNAME)
-  ENDIF(BUILD_TESTING)
-ENDIF(OPENJPEG_STANDALONE)
+ENDIF(BUILD_TESTING)
 
 # Adding test with dataset from:
 # http://www.crc.ricoh.com/~gormish/jpeg2000conformance/
index f392a84582ee0450246076b0032a24a38123d104..620f3e99fc53934317cf9c53938c0b744c19e75b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+June 21, 2010
++ [MM] Added a j2k_dump to simply dump the parameter of a J2K file
+
 May 26, 2010
 + [antonin] Added CTestConfig.cmake to the root directory to incorporate the testing dashboard.
 + [antonin] MACOSX : Added a "build all" target to the XCode project file.
index 32aed5eea1b0461a4a5e290f67b3149035a90711..1e04b38b4d4ed3cae2ae0af0eed4bac8cd12faf6 100644 (file)
@@ -41,7 +41,7 @@ FIND_PACKAGE(TIFF REQUIRED)
 FIND_PACKAGE(PNG REQUIRED)
 
 # Loop over all executables:
-FOREACH(exe j2k_to_image image_to_j2k)
+FOREACH(exe j2k_to_image image_to_j2k j2k_dump)
   ADD_EXECUTABLE(${exe} ${exe}.c ${common_SRCS})
   TARGET_LINK_LIBRARIES(${exe} ${OPJ_PREFIX}openjpeg ${TIFF_LIBRARIES} ${PNG_LIBRARIES})
   ADD_TEST(${exe} ${EXECUTABLE_OUTPUT_PATH}/${exe})
index 26297e558c769453d610cd66aa2b1c15c3c84779..818c6b8703042ab8b3c9612e2081fb6bf6d7043c 100644 (file)
@@ -493,7 +493,6 @@ void cinema_parameters(opj_cparameters_t *parameters){
 void cinema_setup_encoder(opj_cparameters_t *parameters,opj_image_t *image, img_fol_t *img_fol){
        int i;
        float temp_rate;
-       opj_poc_t *POC = NULL;
 
        switch (parameters->cp_cinema){
        case CINEMA2K_24:
diff --git a/codec/j2k_dump.c b/codec/j2k_dump.c
new file mode 100644 (file)
index 0000000..6d92bcb
--- /dev/null
@@ -0,0 +1,553 @@
+/*
+ * Copyright (c) 20010, Mathieu Malaterre, GDCM
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <math.h>
+
+#include "openjpeg.h"
+#include "j2k.h"
+#include "jp2.h"
+#include "compat/getopt.h"
+#include "convert.h"
+#include "dirent.h"
+#include "index.h"
+
+#ifndef WIN32
+#include <strings.h>
+#define _stricmp strcasecmp
+#define _strnicmp strncasecmp
+#endif
+
+/* ----------------------------------------------------------------------- */
+
+#define J2K_CFMT 0
+#define JP2_CFMT 1
+#define JPT_CFMT 2
+
+#define PXM_DFMT 10
+#define PGX_DFMT 11
+#define BMP_DFMT 12
+#define YUV_DFMT 13
+#define TIF_DFMT 14
+#define RAW_DFMT 15
+#define TGA_DFMT 16
+#define PNG_DFMT 17
+/* ----------------------------------------------------------------------- */
+
+typedef struct dircnt{
+       /** Buffer for holding images read from Directory*/
+       char *filename_buf;
+       /** Pointer to the buffer*/
+       char **filename;
+}dircnt_t;
+
+
+typedef struct img_folder{
+       /** The directory path of the folder containing input images*/
+       char *imgdirpath;
+       /** Output format*/
+       const char *out_format;
+       /** Enable option*/
+       char set_imgdir;
+       /** Enable Cod Format for output*/
+       char set_out_format;
+
+}img_fol_t;
+
+void decode_help_display() {
+       fprintf(stdout,"HELP\n----\n\n");
+       fprintf(stdout,"- the -h option displays this help information on screen\n\n");
+
+/* UniPG>> */
+       fprintf(stdout,"List of parameters for the JPEG 2000 "
+#ifdef USE_JPWL
+               "+ JPWL "
+#endif /* USE_JPWL */
+               "decoder:\n");
+/* <<UniPG */
+       fprintf(stdout,"\n");
+       fprintf(stdout,"\n");
+       fprintf(stdout,"  -ImgDir \n");
+       fprintf(stdout,"        Image file Directory path \n");
+       fprintf(stdout,"  -i <compressed file>\n");
+       fprintf(stdout,"    REQUIRED only if an Input image directory not specified\n");
+       fprintf(stdout,"    Currently accepts J2K-files, JP2-files and JPT-files. The file type\n");
+       fprintf(stdout,"    is identified based on its suffix.\n");
+       fprintf(stdout,"\n");
+}
+
+/* -------------------------------------------------------------------------- */
+
+int get_num_images(char *imgdirpath){
+       DIR *dir;
+       struct dirent* content; 
+       int num_images = 0;
+
+       /*Reading the input images from given input directory*/
+
+       dir= opendir(imgdirpath);
+       if(!dir){
+               fprintf(stderr,"Could not open Folder %s\n",imgdirpath);
+               return 0;
+       }
+       
+       while((content=readdir(dir))!=NULL){
+               if(strcmp(".",content->d_name)==0 || strcmp("..",content->d_name)==0 )
+                       continue;
+               num_images++;
+       }
+       return num_images;
+}
+
+int load_images(dircnt_t *dirptr, char *imgdirpath){
+       DIR *dir;
+       struct dirent* content; 
+       int i = 0;
+
+       /*Reading the input images from given input directory*/
+
+       dir= opendir(imgdirpath);
+       if(!dir){
+               fprintf(stderr,"Could not open Folder %s\n",imgdirpath);
+               return 1;
+       }else   {
+               fprintf(stderr,"Folder opened successfully\n");
+       }
+       
+       while((content=readdir(dir))!=NULL){
+               if(strcmp(".",content->d_name)==0 || strcmp("..",content->d_name)==0 )
+                       continue;
+
+               strcpy(dirptr->filename[i],content->d_name);
+               i++;
+       }
+       return 0;       
+}
+
+int get_file_format(char *filename) {
+       unsigned int i;
+       static const char *extension[] = {"pgx", "pnm", "pgm", "ppm", "bmp","tif", "raw", "tga", "png", "j2k", "jp2", "jpt", "j2c", "jpc"  };
+       static const int format[] = { PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, TIF_DFMT, RAW_DFMT, TGA_DFMT, PNG_DFMT, J2K_CFMT, JP2_CFMT, JPT_CFMT, J2K_CFMT, J2K_CFMT };
+       char * ext = strrchr(filename, '.');
+       if (ext == NULL)
+               return -1;
+       ext++;
+       if(ext) {
+               for(i = 0; i < sizeof(format)/sizeof(*format); i++) {
+                       if(_strnicmp(ext, extension[i], 3) == 0) {
+                               return format[i];
+                       }
+               }
+       }
+
+       return -1;
+}
+
+char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_dparameters_t *parameters){
+       char image_filename[OPJ_PATH_LEN], infilename[OPJ_PATH_LEN],outfilename[OPJ_PATH_LEN],temp_ofname[OPJ_PATH_LEN];
+       char *temp_p, temp1[OPJ_PATH_LEN]="";
+
+       strcpy(image_filename,dirptr->filename[imageno]);
+       fprintf(stderr,"File Number %d \"%s\"\n",imageno,image_filename);
+       parameters->decod_format = get_file_format(image_filename);
+       if (parameters->decod_format == -1)
+               return 1;
+       sprintf(infilename,"%s/%s",img_fol->imgdirpath,image_filename);
+       strncpy(parameters->infile, infilename, sizeof(infilename));
+
+       //Set output file
+       strcpy(temp_ofname,strtok(image_filename,"."));
+       while((temp_p = strtok(NULL,".")) != NULL){
+               strcat(temp_ofname,temp1);
+               sprintf(temp1,".%s",temp_p);
+       }
+       if(img_fol->set_out_format==1){
+               sprintf(outfilename,"%s/%s.%s",img_fol->imgdirpath,temp_ofname,img_fol->out_format);
+               strncpy(parameters->outfile, outfilename, sizeof(outfilename));
+       }
+       return 0;
+}
+
+/* -------------------------------------------------------------------------- */
+int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,img_fol_t *img_fol, char *indexfilename) {
+       /* parse the command line */
+       int totlen;
+       option_t long_option[]={
+               {"ImgDir",REQ_ARG, NULL ,'y'},
+       };
+
+       const char optlist[] = "i:h";
+       totlen=sizeof(long_option);
+       img_fol->set_out_format = 0;
+       while (1) {
+               int c = getopt_long(argc, argv,optlist,long_option,totlen);
+               if (c == -1)
+                       break;
+               switch (c) {
+                       case 'i':                       /* input file */
+                       {
+                               char *infile = optarg;
+                               parameters->decod_format = get_file_format(infile);
+                               switch(parameters->decod_format) {
+                                       case J2K_CFMT:
+                                       case JP2_CFMT:
+                                       case JPT_CFMT:
+                                               break;
+                                       default:
+                                               fprintf(stderr, 
+                                                       "!! Unrecognized format for infile : %s [accept only *.j2k, *.jp2, *.jpc or *.jpt] !!\n\n", 
+                                                       infile);
+                                               return 1;
+                               }
+                               strncpy(parameters->infile, infile, sizeof(parameters->infile)-1);
+                       }
+                       break;
+                               
+                               /* ----------------------------------------------------- */
+
+                       case 'h':                       /* display an help description */
+                               decode_help_display();
+                               return 1;                               
+
+                               /* ------------------------------------------------------ */
+
+                       case 'y':                       /* Image Directory path */
+                               {
+                                       img_fol->imgdirpath = (char*)malloc(strlen(optarg) + 1);
+                                       strcpy(img_fol->imgdirpath,optarg);
+                                       img_fol->set_imgdir=1;
+                               }
+                               break;
+
+                               /* ----------------------------------------------------- */
+                       
+                       default:
+                               fprintf(stderr,"WARNING -> this option is not valid \"-%c %s\"\n",c, optarg);
+                               break;
+               }
+       }
+
+       /* check for possible errors */
+       if(img_fol->set_imgdir==1){
+               if(!(parameters->infile[0]==0)){
+                       fprintf(stderr, "Error: options -ImgDir and -i cannot be used together !!\n");
+                       return 1;
+               }
+               if(img_fol->set_out_format == 0){
+                       fprintf(stderr, "Error: When -ImgDir is used, -OutFor <FORMAT> must be used !!\n");
+                       fprintf(stderr, "Only one format allowed! Valid format PGM, PPM, PNM, PGX, BMP, TIF, RAW and TGA!!\n");
+                       return 1;
+               }
+               if(!((parameters->outfile[0] == 0))){
+                       fprintf(stderr, "Error: options -ImgDir and -o cannot be used together !!\n");
+                       return 1;
+               }
+       }else{
+               if((parameters->infile[0] == 0) ) {
+                       fprintf(stderr, "Error: One of the options -i or -ImgDir must be specified\n");
+                       fprintf(stderr, "usage: image_to_j2k -i *.j2k/jp2/j2c (+ options)\n");
+                       return 1;
+               }
+       }
+
+       return 0;
+}
+
+/* -------------------------------------------------------------------------- */
+
+/**
+sample error callback expecting a FILE* client object
+*/
+void error_callback(const char *msg, void *client_data) {
+       FILE *stream = (FILE*)client_data;
+       fprintf(stream, "[ERROR] %s", msg);
+}
+/**
+sample warning callback expecting a FILE* client object
+*/
+void warning_callback(const char *msg, void *client_data) {
+       FILE *stream = (FILE*)client_data;
+       fprintf(stream, "[WARNING] %s", msg);
+}
+/**
+sample debug callback expecting no client object
+*/
+void info_callback(const char *msg, void *client_data) {
+       (void)client_data;
+       fprintf(stdout, "[INFO] %s", msg);
+}
+
+//void j2k_dump_cp(FILE *fd, opj_image_t * img, opj_cp_t * cp);
+
+/* -------------------------------------------------------------------------- */
+
+int main(int argc, char *argv[])
+{
+       opj_dparameters_t parameters;   /* decompression parameters */
+       img_fol_t img_fol;
+       opj_event_mgr_t event_mgr;              /* event manager */
+       opj_image_t *image = NULL;
+       FILE *fsrc = NULL;
+       unsigned char *src = NULL;
+       int file_length;
+       int num_images;
+       int i,imageno;
+       dircnt_t *dirptr;
+       opj_dinfo_t* dinfo = NULL;      /* handle to a decompressor */
+       opj_cio_t *cio = NULL;
+       opj_codestream_info_t cstr_info;  /* Codestream information structure */
+       char indexfilename[OPJ_PATH_LEN];       /* index file name */
+
+       /* configure the event callbacks (not required) */
+       memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
+       event_mgr.error_handler = error_callback;
+       event_mgr.warning_handler = warning_callback;
+       event_mgr.info_handler = info_callback;
+
+       /* set decoding parameters to default values */
+       opj_set_default_decoder_parameters(&parameters);
+
+       /* Initialize indexfilename and img_fol */
+       *indexfilename = 0;
+       memset(&img_fol,0,sizeof(img_fol_t));
+
+       /* parse input and get user encoding parameters */
+       if(parse_cmdline_decoder(argc, argv, &parameters,&img_fol, indexfilename) == 1) {
+               return 1;
+       }
+
+       /* Initialize reading of directory */
+       if(img_fol.set_imgdir==1){      
+               num_images=get_num_images(img_fol.imgdirpath);
+
+               dirptr=(dircnt_t*)malloc(sizeof(dircnt_t));
+               if(dirptr){
+                       dirptr->filename_buf = (char*)malloc(num_images*OPJ_PATH_LEN*sizeof(char));     // Stores at max 10 image file names
+                       dirptr->filename = (char**) malloc(num_images*sizeof(char*));
+
+                       if(!dirptr->filename_buf){
+                               return 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;
+                       }
+               }
+
+               /* read the input file and put it in memory */
+               /* ---------------------------------------- */
+               fsrc = fopen(parameters.infile, "rb");
+               if (!fsrc) {
+                       fprintf(stderr, "ERROR -> failed to open %s for reading\n", parameters.infile);
+                       return 1;
+               }
+               fseek(fsrc, 0, SEEK_END);
+               file_length = ftell(fsrc);
+               fseek(fsrc, 0, SEEK_SET);
+               src = (unsigned char *) malloc(file_length);
+               fread(src, 1, file_length, fsrc);
+               fclose(fsrc);
+
+               /* decode the code-stream */
+               /* ---------------------- */
+
+               switch(parameters.decod_format) {
+               case J2K_CFMT:
+               {
+                       /* JPEG-2000 codestream */
+
+                       /* get a decoder handle */
+                       dinfo = opj_create_decompress(CODEC_J2K);
+
+                       /* catch events using our callbacks and give a local context */
+                       opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, stderr);
+
+                       /* setup the decoder decoding parameters using user parameters */
+                       opj_setup_decoder(dinfo, &parameters);
+
+                       /* open a byte stream */
+                       cio = opj_cio_open((opj_common_ptr)dinfo, src, file_length);
+
+                       /* decode the stream and fill the image structure */
+                       if (*indexfilename)                             // If need to extract codestream information
+                               image = opj_decode_with_info(dinfo, cio, &cstr_info);
+                       else
+                               image = opj_decode(dinfo, cio);
+                       if(!image) {
+                               fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n");
+                               opj_destroy_decompress(dinfo);
+                               opj_cio_close(cio);
+                               return 1;
+                       }
+                       /* dump */
+      j2k_dump_cp(stdout, image, ((opj_j2k_t*)dinfo->j2k_handle)->cp);
+
+                       /* close the byte stream */
+                       opj_cio_close(cio);
+
+                       /* Write the index to disk */
+                       if (*indexfilename) {
+                               char bSuccess;
+                               bSuccess = write_index_file(&cstr_info, indexfilename);
+                               if (bSuccess) {
+                                       fprintf(stderr, "Failed to output index file\n");
+                               }
+                       }
+               }
+               break;
+
+               case JP2_CFMT:
+               {
+                       /* JPEG 2000 compressed image data */
+
+                       /* get a decoder handle */
+                       dinfo = opj_create_decompress(CODEC_JP2);
+
+                       /* catch events using our callbacks and give a local context */
+                       opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, stderr);
+
+                       /* setup the decoder decoding parameters using the current image and user parameters */
+                       opj_setup_decoder(dinfo, &parameters);
+
+                       /* open a byte stream */
+                       cio = opj_cio_open((opj_common_ptr)dinfo, src, file_length);
+
+                       /* decode the stream and fill the image structure */
+                       if (*indexfilename)                             // If need to extract codestream information
+                               image = opj_decode_with_info(dinfo, cio, &cstr_info);
+                       else
+                               image = opj_decode(dinfo, cio);                 
+                       if(!image) {
+                               fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n");
+                               opj_destroy_decompress(dinfo);
+                               opj_cio_close(cio);
+                               return 1;
+                       }
+                       /* dump */
+      j2k_dump_cp(stdout, image, ((opj_jp2_t*)dinfo->jp2_handle)->j2k->cp);
+
+                       /* close the byte stream */
+                       opj_cio_close(cio);
+
+                       /* Write the index to disk */
+                       if (*indexfilename) {
+                               char bSuccess;
+                               bSuccess = write_index_file(&cstr_info, indexfilename);
+                               if (bSuccess) {
+                                       fprintf(stderr, "Failed to output index file\n");
+                               }
+                       }
+               }
+               break;
+
+               case JPT_CFMT:
+               {
+                       /* JPEG 2000, JPIP */
+
+                       /* get a decoder handle */
+                       dinfo = opj_create_decompress(CODEC_JPT);
+
+                       /* catch events using our callbacks and give a local context */
+                       opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, stderr);
+
+                       /* setup the decoder decoding parameters using user parameters */
+                       opj_setup_decoder(dinfo, &parameters);
+
+                       /* open a byte stream */
+                       cio = opj_cio_open((opj_common_ptr)dinfo, src, file_length);
+
+                       /* decode the stream and fill the image structure */
+                       if (*indexfilename)                             // If need to extract codestream information
+                               image = opj_decode_with_info(dinfo, cio, &cstr_info);
+                       else
+                               image = opj_decode(dinfo, cio);
+                       if(!image) {
+                               fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n");
+                               opj_destroy_decompress(dinfo);
+                               opj_cio_close(cio);
+                               return 1;
+                       }
+
+                       /* close the byte stream */
+                       opj_cio_close(cio);
+
+                       /* Write the index to disk */
+                       if (*indexfilename) {
+                               char bSuccess;
+                               bSuccess = write_index_file(&cstr_info, indexfilename);
+                               if (bSuccess) {
+                                       fprintf(stderr, "Failed to output index file\n");
+                               }
+                       }
+               }
+               break;
+
+               default:
+                       fprintf(stderr, "skipping file..\n");
+                       continue;
+       }
+
+               /* free the memory containing the code-stream */
+               free(src);
+               src = NULL;
+
+               /* free remaining structures */
+               if(dinfo) {
+                       opj_destroy_decompress(dinfo);
+               }
+               /* free codestream information structure */
+               if (*indexfilename)     
+                       opj_destroy_cstr_info(&cstr_info);
+               /* free image data structure */
+               opj_image_destroy(image);
+
+       }
+
+  return EXIT_SUCCESS;
+}
index 1020adb9374de5851fb0f2916858098d585a3988..2aa7ed49c7bfd69d5236eba836f4b53fe725e5b0 100644 (file)
@@ -41,6 +41,7 @@
 #include "index.h"
 
 #ifndef WIN32
+#include <strings.h>
 #define _stricmp strcasecmp
 #define _strnicmp strncasecmp
 #endif