From 5badc82fa9380a7bcfe12369c7ed4f3738ede167 Mon Sep 17 00:00:00 2001 From: Mathieu Malaterre Date: Tue, 22 Jun 2010 17:29:21 +0000 Subject: [PATCH] Start merging change from svn trunk --- codec/CMakeLists.txt | 3 +- codec/convert.c | 362 ++++++++++++++++++++++++++++++++++++++++++- codec/image_to_j2k.c | 106 +++++++------ 3 files changed, 418 insertions(+), 53 deletions(-) diff --git a/codec/CMakeLists.txt b/codec/CMakeLists.txt index e55d19da..40f4d427 100644 --- a/codec/CMakeLists.txt +++ b/codec/CMakeLists.txt @@ -38,11 +38,12 @@ IF(NOT BUILD_SHARED_LIBS) ENDIF(NOT BUILD_SHARED_LIBS) FIND_PACKAGE(TIFF REQUIRED) +FIND_PACKAGE(PNG REQUIRED) # Loop over all executables: FOREACH(exe j2k_to_image image_to_j2k) ADD_EXECUTABLE(${exe} ${exe}.c ${common_SRCS}) - TARGET_LINK_LIBRARIES(${exe} ${OPJ_PREFIX}openjpeg ${TIFF_LIBRARIES}) + TARGET_LINK_LIBRARIES(${exe} ${OPJ_PREFIX}openjpeg ${TIFF_LIBRARIES} ${PNG_LIBRARIES}) ADD_TEST(${exe} ${EXECUTABLE_OUTPUT_PATH}/${exe}) # calling those exe without option will make them fail always: SET_TESTS_PROPERTIES(${exe} PROPERTIES WILL_FAIL TRUE) diff --git a/codec/convert.c b/codec/convert.c index 51c8160f..9493e8b6 100644 --- a/codec/convert.c +++ b/codec/convert.c @@ -32,8 +32,14 @@ #include #include #include -#include "openjpeg.h" +#ifdef WIN32 #include "../libs/libtiff/tiffio.h" +#include "../libs/libpng/png.h" +#else +#include +#include +#endif /* WIN32 */ +#include "openjpeg.h" #include "convert.h" /* @@ -2157,3 +2163,357 @@ int imagetoraw(opj_image_t * image, const char *outfile) fclose(rawFile); return 0; } + +opj_image_t *pngtoimage(const char *read_idf, opj_cparameters_t * params) +#ifdef WIN32 +{ + printf("Error. PNG format is not yet handled under windows\n"); + return NULL; +} +#else +{ + png_bytep row; + png_structp png; + png_infop info; + double gamma, display_exponent; + int bit_depth, interlace_type, compression_type, filter_type; + int unit, pass, nr_passes; + png_uint_32 resx, resy; + unsigned int i, max, src_w; + png_uint_32 width, height; + int color_type, has_alpha; + unsigned char *png_buf, *s; + FILE *reader; +/* j2k: */ + opj_image_t *image; + opj_image_cmptparm_t cmptparm[4]; + int sub_dx, sub_dy; + unsigned int nr_comp; + int *r, *g, *b, *a; + + if ((reader = fopen(read_idf, "rb")) == NULL) { + fprintf(stderr, "pngtoimage: can not open %s\n", read_idf); + return NULL; + } + nr_passes = 0; + png_buf = NULL; + +/* libpng-VERSION/example.c: + * PC : screen_gamma = 2.2; + * Mac: screen_gamma = 1.7 or 1.0; +*/ + display_exponent = 2.2; + + if ((png = png_create_read_struct(PNG_LIBPNG_VER_STRING, + NULL, NULL, NULL)) == NULL) + goto fin; + if ((info = png_create_info_struct(png)) == NULL) + goto fin; + + if (setjmp(png_jmpbuf(png))) + goto fin; + + png_init_io(png, reader); + png_read_info(png, info); + + png_get_IHDR(png, info, &width, &height, + &bit_depth, &color_type, &interlace_type, + &compression_type, &filter_type); + + if (color_type == PNG_COLOR_TYPE_PALETTE) + png_set_expand(png); + else if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) + png_set_expand(png); + + if (png_get_valid(png, info, PNG_INFO_tRNS)) + png_set_expand(png); + + if (bit_depth == 16) + png_set_strip_16(png); + +/* GRAY => RGB; GRAY_ALPHA => RGBA +*/ + if (color_type == PNG_COLOR_TYPE_GRAY + || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { + png_set_gray_to_rgb(png); + color_type = + (color_type == PNG_COLOR_TYPE_GRAY ? PNG_COLOR_TYPE_RGB : + PNG_COLOR_TYPE_RGB_ALPHA); + } + if (!png_get_gAMA(png, info, &gamma)) + gamma = 0.45455; + + png_set_gamma(png, display_exponent, gamma); + + nr_passes = png_set_interlace_handling(png); + + png_read_update_info(png, info); + + png_get_pHYs(png, info, &resx, &resy, &unit); + + color_type = png_get_color_type(png, info); + + has_alpha = (color_type == PNG_COLOR_TYPE_RGB_ALPHA); + + if (has_alpha) + nr_comp = 4; + else + nr_comp = 3; + + src_w = width * nr_comp; + png_buf = (unsigned char *) malloc(src_w * height); + + if (nr_passes == 0) + nr_passes = 1; + + for (pass = 0; pass < nr_passes; pass++) { + s = png_buf; + + for (i = 0; i < height; i++) { +/* libpng.3: + * If you want the "sparkle" effect, just call png_read_rows() as + * normal, with the third parameter NULL. +*/ + png_read_rows(png, &s, NULL, 1); + + s += src_w; + } + } + memset(&cmptparm, 0, 4 * sizeof(opj_image_cmptparm_t)); + + sub_dx = params->subsampling_dx; + sub_dy = params->subsampling_dy; + + for (i = 0; i < nr_comp; ++i) { + cmptparm[i].prec = 8; + cmptparm[i].bpp = 8; + cmptparm[i].sgnd = 0; + cmptparm[i].dx = sub_dx; + cmptparm[i].dy = sub_dy; + cmptparm[i].w = width; + cmptparm[i].h = height; + } + + image = opj_image_create(nr_comp, &cmptparm[0], CLRSPC_SRGB); + + if (image == NULL) + goto fin; + + image->x0 = params->image_offset_x0; + image->y0 = params->image_offset_y0; + image->x1 = + params->image_offset_x0 + (width - 1) * sub_dx + 1 + image->x0; + image->y1 = + params->image_offset_y0 + (height - 1) * sub_dy + 1 + image->y0; + + r = image->comps[0].data; + g = image->comps[1].data; + b = image->comps[2].data; + a = image->comps[3].data; + s = png_buf; + + max = width * height; + + for (i = 0; i < max; ++i) { + *r++ = *s++; + *g++ = *s++; + *b++ = *s++; + + if (has_alpha) + *a++ = *s++; + } + + fin: + if (png) + png_destroy_read_struct(&png, &info, NULL); + if (png_buf) + free(png_buf); + + fclose(reader); + + return image; + +} /* pngtoimage() */ +#endif + +int imagetopng(opj_image_t * image, const char *write_idf) +#ifdef WIN32 +{ + printf("Error. PNG format is not yet handled under windows\n"); + return -1; +} +#else +{ + FILE *writer; + png_structp png_ptr; + png_infop info_ptr; + int *rs, *gs, *bs, *as; + unsigned char *row_buf, *d; + int fails, mono, graya, rgb, rgba; + int width, height, nr_colors, color_type; + int bit_depth, adjust, x, y; + png_color_8 sig_bit; + + writer = fopen(write_idf, "wb"); + + if (writer == NULL) + return 1; + + info_ptr = NULL; + fails = 1; + +/* Create and initialize the png_struct with the desired error handler + * functions. If you want to use the default stderr and longjump method, + * you can supply NULL for the last three parameters. We also check that + * the library version is compatible with the one used at compile time, + * in case we are using dynamically linked libraries. REQUIRED. +*/ + png_ptr = + png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); +/*png_voidp user_error_ptr, user_error_fn, user_warning_fn); */ + + if (png_ptr == NULL) + goto fin; + +/* Allocate/initialize the image information data. REQUIRED +*/ + info_ptr = png_create_info_struct(png_ptr); + + if (info_ptr == NULL) + goto fin; + +/* Set error handling. REQUIRED if you are not supplying your own + * error handling functions in the png_create_write_struct() call. +*/ + if (setjmp(png_jmpbuf(png_ptr))) + goto fin; + +/* I/O initialization functions is REQUIRED +*/ + png_init_io(png_ptr, writer); + +/* Set the image information here. Width and height are up to 2^31, + * bit_depth is one of 1, 2, 4, 8, or 16, but valid values also depend on + * the color_type selected. color_type is one of PNG_COLOR_TYPE_GRAY, + * PNG_COLOR_TYPE_GRAY_ALPHA, PNG_COLOR_TYPE_PALETTE, PNG_COLOR_TYPE_RGB, + * or PNG_COLOR_TYPE_RGB_ALPHA. interlace is either PNG_INTERLACE_NONE or + * PNG_INTERLACE_ADAM7, and the compression_type and filter_type MUST + * currently be PNG_COMPRESSION_TYPE_BASE and PNG_FILTER_TYPE_BASE. + * REQUIRED +*/ + png_set_compression_level(png_ptr, Z_BEST_COMPRESSION); + + mono = graya = rgb = rgba = adjust = 0; + + nr_colors = image->numcomps; + width = image->comps[0].w; + height = image->comps[0].h; + rs = image->comps[0].data; + + if (nr_colors == 2) { + graya = 1; + color_type = PNG_COLOR_TYPE_GRAY_ALPHA; + sig_bit.gray = image->comps[0].prec; + bit_depth = image->comps[0].prec; + as = image->comps[1].data; + } else if (nr_colors == 3) { + rgb = 1; + color_type = PNG_COLOR_TYPE_RGB; + sig_bit.red = image->comps[0].prec; + sig_bit.green = image->comps[1].prec; + sig_bit.blue = image->comps[2].prec; + bit_depth = image->comps[0].prec; + gs = image->comps[1].data; + bs = image->comps[2].data; + if (image->comps[0].sgnd) + adjust = 1 << (image->comps[0].prec - 1); + } else if (nr_colors == 4) { + rgb = rgba = 1; + color_type = PNG_COLOR_TYPE_RGB_ALPHA; + sig_bit.red = image->comps[0].prec; + sig_bit.green = image->comps[1].prec; + sig_bit.blue = image->comps[2].prec; + sig_bit.alpha = image->comps[3].prec; + bit_depth = image->comps[0].prec; + gs = image->comps[1].data; + bs = image->comps[2].data; + as = image->comps[3].data; + if (image->comps[0].sgnd) + adjust = 1 << (image->comps[0].prec - 1); + } else { + mono = 1; + color_type = PNG_COLOR_TYPE_GRAY; + sig_bit.gray = image->comps[0].prec; + bit_depth = image->comps[0].prec; + } + png_set_sBIT(png_ptr, info_ptr, &sig_bit); + + png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth, + color_type, + PNG_INTERLACE_NONE, + PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); + +#ifdef HIDDEN_CODE +/* Optional gamma chunk is strongly suggested if you have any guess + * as to the correct gamma of the image. +*/ + + if (gamma > 0.0) { + png_set_gAMA(png_ptr, info_ptr, gamma); + } +#endif /* HIDDEN_CODE */ +#ifdef HIDDEN_CODE + if (have_bg) { + png_color_16 background; + + background.red = bg_red; + background.green = bg_green; + background.blue = bg_blue; + + png_set_bKGD(png_ptr, info_ptr, &background); + } +#endif /* HIDDEN_CODE */ + png_write_info(png_ptr, info_ptr); + + png_set_packing(png_ptr); + + row_buf = (unsigned char *) malloc(width * nr_colors); + + for (y = 0; y < height; ++y) { + d = row_buf; + + for (x = 0; x < width; ++x) { + if (mono) { + *d++ = (unsigned char) *rs++; + } + if (graya) { + *d++ = (unsigned char) *rs++; + *d++ = (unsigned char) *as++; + } else if (rgb) { + *d++ = (unsigned char) (*rs++ + adjust); + *d++ = (unsigned char) (*gs++ + adjust); + *d++ = (unsigned char) (*bs++ + adjust); + + if (rgba) + *d++ = (unsigned char) (*as++ + adjust); + } + } /* for(x) */ + + png_write_row(png_ptr, row_buf); + + } /* for(y) */ + + png_write_end(png_ptr, info_ptr); + + fails = 0; + + fin: + + if (png_ptr) { + png_destroy_write_struct(&png_ptr, &info_ptr); + } + fclose(writer); + + return fails; +} +#endif diff --git a/codec/image_to_j2k.c b/codec/image_to_j2k.c index e0e567c3..b5ab62a4 100644 --- a/codec/image_to_j2k.c +++ b/codec/image_to_j2k.c @@ -4,7 +4,7 @@ * 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) 2005, Herve Drolon, FreeImage Team * Copyright (c) 2006-2007, Parvatha Elangovan * Copyright (c) 2008, Jerome Fimes, Communications & Systemes * All rights reserved. @@ -31,7 +31,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include -#define __USE_BSD #include #include #include @@ -43,6 +42,7 @@ #include "index.h" #ifndef WIN32 +#include #define _stricmp strcasecmp #define _strnicmp strncasecmp #endif @@ -60,7 +60,7 @@ #define TIF_DFMT 14 #define RAW_DFMT 15 #define TGA_DFMT 16 - +#define PNG_DFMT 17 /* ----------------------------------------------------------------------- */ #define CINEMA_24_CS 1302083 /*Codestream length for 24fps*/ #define CINEMA_48_CS 651041 /*Codestream length for 48fps*/ @@ -153,10 +153,10 @@ void encode_help_display() { 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," 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," 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"); @@ -210,6 +210,9 @@ void encode_help_display() { 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,"-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,"\n"); @@ -342,7 +345,7 @@ OPJ_PROG_ORDER give_progression(char progression[4]) { int get_num_images(char *imgdirpath){ DIR *dir; - struct dirent* content; + struct dirent* content; int num_images = 0; /*Reading the input images from given input directory*/ @@ -364,7 +367,7 @@ int get_num_images(char *imgdirpath){ int load_images(dircnt_t *dirptr, char *imgdirpath){ DIR *dir; - struct dirent* content; + struct dirent* content; int i = 0; /*Reading the input images from given input directory*/ @@ -384,16 +387,16 @@ int load_images(dircnt_t *dirptr, char *imgdirpath){ strcpy(dirptr->filename[i],content->d_name); i++; } - return 0; + return 0; } int get_file_format(char *filename) { unsigned int i; static const char *extension[] = { - "pgx", "pnm", "pgm", "ppm", "bmp", "tif", "raw", "tga", "j2k", "jp2", "j2c", "jpc" + "pgx", "pnm", "pgm", "ppm", "bmp", "tif", "raw", "tga", "png", "j2k", "jp2", "j2c", "jpc" }; static const int format[] = { - PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, TIF_DFMT, RAW_DFMT, TGA_DFMT, J2K_CFMT, JP2_CFMT, J2K_CFMT, J2K_CFMT + PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, TIF_DFMT, RAW_DFMT, TGA_DFMT, PNG_DFMT, J2K_CFMT, JP2_CFMT, J2K_CFMT, J2K_CFMT }; char * ext = strrchr(filename, '.'); if (ext == NULL) @@ -440,15 +443,15 @@ char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_cparamet } static int initialise_4K_poc(opj_poc_t *POC, int numres){ - POC[0].tile = 1; - POC[0].resno0 = 0; + 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].resno0 = numres-1; POC[1].compno0 = 0; POC[1].layno1 = 1; POC[1].resno1 = numres; @@ -461,7 +464,7 @@ void cinema_parameters(opj_cparameters_t *parameters){ parameters->tile_size_on = false; parameters->cp_tdx=1; parameters->cp_tdy=1; - + /*Tile part*/ parameters->tp_flag = 'C'; parameters->tp_on = 1; @@ -473,7 +476,7 @@ void cinema_parameters(opj_cparameters_t *parameters){ parameters->image_offset_y0 = 0; /*Codeblock size= 32*32*/ - parameters->cblockw_init = 32; + parameters->cblockw_init = 32; parameters->cblockh_init = 32; parameters->csty |= 0x01; @@ -507,7 +510,7 @@ void cinema_setup_encoder(opj_cparameters_t *parameters,opj_image_t *image, img_ parameters->cp_rsiz = STD_RSIZ; } break; - + case CINEMA4K_24: if(parameters->numresolution < 1){ parameters->numresolution = 1; @@ -515,7 +518,7 @@ void cinema_setup_encoder(opj_cparameters_t *parameters,opj_image_t *image, img_ 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" + 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; @@ -532,13 +535,13 @@ void cinema_setup_encoder(opj_cparameters_t *parameters,opj_image_t *image, img_ for(i=0 ; itcp_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))/ + 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))/ + 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))/ + 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]; @@ -547,18 +550,18 @@ void cinema_setup_encoder(opj_cparameters_t *parameters,opj_image_t *image, img_ } parameters->max_comp_size = COMP_24_CS; break; - + case CINEMA2K_48: for(i=0 ; itcp_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))/ + 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))/ + 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))/ + 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]; @@ -617,11 +620,12 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters, case TIF_DFMT: case RAW_DFMT: case TGA_DFMT: + case PNG_DFMT: break; default: fprintf(stderr, "!! Unrecognized format for infile : %s " - "[accept only *.pnm, *.pgm, *.ppm, *.pgx, *.bmp, *.tif, *.raw or *.tga] !!\n\n", + "[accept only *.pnm, *.pgm, *.ppm, *.pgx, *.bmp, *.tif, *.raw or *.tga] !!\n\n", infile); return 1; } @@ -674,6 +678,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters, case 'r': /* rates rates/distorsion */ { char *s = optarg; + parameters->tcp_numlayers = 0; while (sscanf(s, "%f", ¶meters->tcp_rates[parameters->tcp_numlayers]) == 1) { parameters->tcp_numlayers++; while (*s && *s != ',') { @@ -689,7 +694,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters, /* ----------------------------------------------------- */ - + case 'F': /* Raw image format parameters */ { char signo; @@ -709,7 +714,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters, 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"); @@ -1002,16 +1007,16 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters, break; /* ------------------------------------------------------ */ - + case 'v': /* Tile part generation*/ { parameters->tp_flag = optarg[0]; parameters->tp_on = 1; } - break; + break; /* ------------------------------------------------------ */ - + case 'z': /* Image Directory path */ { img_fol->imgdirpath = (char*)malloc(strlen(optarg) + 1); @@ -1021,7 +1026,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters, break; /* ------------------------------------------------------ */ - + case 'w': /* Digital Cinema 2K profile compliance*/ { int fps=0; @@ -1036,12 +1041,12 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters, } fprintf(stdout,"CINEMA 2K compliant codestream\n"); parameters->cp_rsiz = CINEMA2K; - + } break; - + /* ------------------------------------------------------ */ - + case 'y': /* Digital Cinema 4K profile compliance*/ { parameters->cp_cinema = CINEMA4K_24; @@ -1119,20 +1124,20 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters, 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) { + if (!indexfilename || !*indexfilename) { strncpy(indexfilename, JPWL_PRIVATEINDEX_NAME, OPJ_PATH_LEN); } @@ -1200,7 +1205,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters, /* search packet error protection method */ if (*token == 'p') { - static int pack = 0, tile = 0, packspec = 0, lastpackno = 0; + static int pack = 0, tile = 0, packspec = 0; pprot = 1; /* predefined method */ @@ -1349,14 +1354,13 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters, 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') { - static int tile = 0, tilespec = 0, lasttileno = 0; addr = 0; /* predefined: auto */ @@ -1376,13 +1380,12 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters, fprintf(stderr, "ERROR -> invalid addressing selection = %s\n", token); return 1; }; - + } /* search sensitivity size */ if (*token == 'z') { - static int tile = 0, tilespec = 0, lasttileno = 0; size = 1; /* predefined: 1 byte */ @@ -1402,13 +1405,12 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters, fprintf(stderr, "ERROR -> invalid size selection = %s\n", token); return 1; }; - + } /* search range method */ if (*token == 'g') { - static int tile = 0, tilespec = 0, lasttileno = 0; range = 0; /* predefined: 0 (packet) */ @@ -1428,7 +1430,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters, fprintf(stderr, "ERROR -> invalid range selection = %s\n", token); return 1; }; - + } /* next token or bust */ @@ -1580,14 +1582,14 @@ int main(int argc, char **argv) { if(parse_cmdline_encoder(argc, argv, ¶meters,&img_fol, &raw_cp, indexfilename) == 1) { return 1; } - + if (parameters.cp_cinema){ img_fol.rates = (float*)malloc(parameters.tcp_numlayers * sizeof(float)); for(i=0; i< parameters.tcp_numlayers; i++){ img_fol.rates[i] = parameters.tcp_rates[i]; } cinema_parameters(¶meters); - } + } /* Create comment for codestream */ if(parameters.cp_comment == NULL) { @@ -1633,7 +1635,7 @@ int main(int argc, char **argv) { for(imageno=0;imageno