/* Declarations */
int get_num_images(char *imgdirpath);
int load_images(dircnt_t *dirptr, char *imgdirpath);
-int get_file_format(char *filename);
+int get_file_format(const char *filename);
char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_dparameters_t *parameters);
+static int infile_format(const char *fname);
int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,img_fol_t *img_fol, char *indexfilename);
int parse_DA_values( char* inArg, unsigned int *DA_x0, unsigned int *DA_y0, unsigned int *DA_x1, unsigned int *DA_y1);
fprintf(stdout," are decoded.\n");
fprintf(stdout," -x \n");
fprintf(stdout," Create an index file *.Idx (-x index_name.Idx) \n");
+ fprintf(stdout," -d <x0,x1,y0,y1>\n");
+ fprintf(stdout," OPTIONAL\n");
+ fprintf(stdout," Decoding area\n");
+ fprintf(stdout," By default all tiles header are read.\n");
fprintf(stdout,"\n");
/* UniPG>> */
#ifdef USE_JPWL
}
/* -------------------------------------------------------------------------- */
-int get_file_format(char *filename) {
+int get_file_format(const char *filename) {
unsigned int i;
static const char *extension[] = {"pgx", "pnm", "pgm", "ppm", "bmp","tif", "raw", "tga", "png", "j2k", "jp2", "jpt", "j2c", "jpc" };
static const int format[] = { PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, TIF_DFMT, RAW_DFMT, TGA_DFMT, PNG_DFMT, J2K_CFMT, JP2_CFMT, JPT_CFMT, J2K_CFMT, J2K_CFMT };
strcpy(image_filename,dirptr->filename[imageno]);
fprintf(stderr,"File Number %d \"%s\"\n",imageno,image_filename);
- parameters->decod_format = get_file_format(image_filename);
+ parameters->decod_format = infile_format(image_filename);
if (parameters->decod_format == -1)
return 1;
sprintf(infilename,"%s/%s",img_fol->imgdirpath,image_filename);
return 0;
}
+#define JP2_RFC3745_MAGIC "\x00\x00\x00\x0c\x6a\x50\x20\x20\x0d\x0a\x87\x0a"
+#define JP2_MAGIC "\x0d\x0a\x87\x0a"
+/* position 45: "\xff\x52" */
+#define J2K_CODESTREAM_MAGIC "\xff\x4f\xff\x51"
+
+static int infile_format(const char *fname)
+{
+ FILE *reader;
+ const char *s, *magic_s;
+ int ext_format, magic_format;
+ unsigned char buf[12];
+
+ reader = fopen(fname, "rb");
+
+ if (reader == NULL)
+ return -1;
+
+ memset(buf, 0, 12);
+ fread(buf, 1, 12, reader);
+ fclose(reader);
+
+ ext_format = get_file_format(fname);
+
+ if (ext_format == JPT_CFMT)
+ return JPT_CFMT;
+
+ if (memcmp(buf, JP2_RFC3745_MAGIC, 12) == 0 || memcmp(buf, JP2_MAGIC, 4) == 0) {
+ magic_format = JP2_CFMT;
+ magic_s = ".jp2";
+ }
+ else if (memcmp(buf, J2K_CODESTREAM_MAGIC, 4) == 0) {
+ magic_format = J2K_CFMT;
+ magic_s = ".j2k or .jpc or .j2c";
+ }
+ else
+ return -1;
+
+ if (magic_format == ext_format)
+ return ext_format;
+
+ s = fname + strlen(fname) - 4;
+
+ fputs("\n===========================================\n", stderr);
+ fprintf(stderr, "The extension of this file is incorrect.\n"
+ "FOUND %s. SHOULD BE %s\n", s, magic_s);
+ fputs("===========================================\n", stderr);
+
+ return magic_format;
+}
+
/* -------------------------------------------------------------------------- */
/**
* Parse the command line
{"OutFor",REQ_ARG, NULL ,'O'},
};
- const char optlist[] = "i:o:r:l:x:"
+ const char optlist[] = "i:o:r:l:x:d:"
/* UniPG>> */
#ifdef USE_JPWL
case 'i': /* input file */
{
char *infile = opj_optarg;
- parameters->decod_format = get_file_format(infile);
+ parameters->decod_format = infile_format(infile);
switch(parameters->decod_format) {
case J2K_CFMT:
break;
img_fol->set_imgdir=1;
}
break;
+
+ /* ----------------------------------------------------- */
+
+ case 'd': /* Input decode ROI */
+ {
+ int size_optarg = (int)strlen(opj_optarg) + 1;
+ char *ROI_values = (char*) malloc(size_optarg);
+ ROI_values[0] = '\0';
+ strncpy(ROI_values, opj_optarg, strlen(opj_optarg));
+ ROI_values[strlen(opj_optarg)] = '\0';
+ /*printf("ROI_values = %s [%d / %d]\n", ROI_values, strlen(ROI_values), size_optarg ); */
+ parse_DA_values( ROI_values, ¶meters->DA_x0, ¶meters->DA_y0, ¶meters->DA_x1, ¶meters->DA_y1);
+
+ free(ROI_values);
+ }
+
/* ----------------------------------------------------- */
+
case 'x': /* Creation of index file */
{
char *index = opj_optarg;
/* Read the main header of the codestream and if necessary the JP2 boxes*/
if(! opj_read_header(cio, dinfo, &image)){
- fprintf(stderr, "ERROR -> j2k_dump: failed to read the header\n");
+ fprintf(stderr, "ERROR -> j2k_to_image: failed to read the header\n");
opj_stream_destroy(cio);
fclose(fsrc);
opj_destroy_codec(dinfo);
+ opj_image_destroy(image);
return EXIT_FAILURE;
}
+ if (! opj_set_decode_area( dinfo, image,
+ parameters.DA_x0, parameters.DA_y0, parameters.DA_x1, parameters.DA_y1)){
+ fprintf(stderr, "ERROR -> j2k_to_image: failed to set the decoded area\n");
+ opj_stream_destroy(cio);
+ opj_destroy_codec(dinfo);
+ opj_image_destroy(image);
+ fclose(fsrc);
+ return EXIT_FAILURE;
+ }
+
/* Get the decoded image */
if ( !( opj_decode_v2(dinfo, cio, image) && opj_end_decompress(dinfo,cio) ) ) {
fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n");
opj_destroy_codec(dinfo);
opj_stream_destroy(cio);
+ opj_image_destroy(image);
fclose(fsrc);
return EXIT_FAILURE;
}
- opj_dump_codec(dinfo, OPJ_J2K_MH_IND, stdout );
+ /*opj_dump_codec(dinfo, OPJ_J2K_MH_IND, stdout );
+
+ cstr_index = opj_get_cstr_index(dinfo);*/
- cstr_index = opj_get_cstr_index(dinfo);
+ fprintf(stderr, "image is decoded!\n");
/* Close the byte stream */
opj_stream_destroy(cio);
projects / openjpeg.git / blobdiff