Allow to write 3/5/7/9/11/13/15 bpp TIF files

[openjpeg.git] / src / bin / jp2 / opj_decompress.c

diff --git a/src/bin/jp2/opj_decompress.c b/src/bin/jp2/opj_decompress.c
index 04803e0ed96dd4496f6cebc6a51c55623c9dda52..f3b1cd5c9a3569ef39b4ed5d18f195f60a674396 100644 (file)
--- a/src/bin/jp2/opj_decompress.c
+++ b/src/bin/jp2/opj_decompress.c
@@ -291,7 +291,7 @@ static OPJ_BOOL parse_precision(const char* option, opj_decompress_parameters* p
                        
                        if (parameters->precision == NULL) {
                                /* first one */
-                               parameters->precision = malloc(sizeof(opj_precision));
+                               parameters->precision = (opj_precision *)malloc(sizeof(opj_precision));
                                if (parameters->precision == NULL) {
                                        fprintf(stderr,"Could not allocate memory for precision option\n");
                                        l_result = OPJ_FALSE;
@@ -307,7 +307,7 @@ static OPJ_BOOL parse_precision(const char* option, opj_decompress_parameters* p
                                        break;
                                }
                                
-                               l_new = realloc(parameters->precision, l_new_size * sizeof(opj_precision));
+                               l_new = (opj_precision *)realloc(parameters->precision, l_new_size * sizeof(opj_precision));
                                if (l_new == NULL) {
                                        fprintf(stderr,"Could not allocate memory for precision option\n");
                                        l_result = OPJ_FALSE;
@@ -400,7 +400,7 @@ int get_file_format(const char *filename) {
        unsigned int i;
        static const char *extension[] = {"pgx", "pnm", "pgm", "ppm", "bmp","tif", "raw", "rawl", "tga", "png", "j2k", "jp2", "jpt", "j2c", "jpc" };
        static const int format[] = { PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, TIF_DFMT, RAW_DFMT, RAWL_DFMT, TGA_DFMT, PNG_DFMT, J2K_CFMT, JP2_CFMT, JPT_CFMT, J2K_CFMT, J2K_CFMT };
-       char * ext = strrchr(filename, '.');
+       const char * ext = strrchr(filename, '.');
        if (ext == NULL)
                return -1;
        ext++;
@@ -599,7 +599,7 @@ int parse_cmdline_decoder(int argc, char **argv, opj_decompress_parameters *para
                                        case PNG_DFMT:
                                                break;
                                        default:
-                                               fprintf(stderr, "Unknown output format image %s [only *.pnm, *.pgm, *.ppm, *.pgx, *.bmp, *.tif, *.raw or *.tga]!! \n", outfile);
+                                               fprintf(stderr, "Unknown output format image %s [only *.png, *.pnm, *.pgm, *.ppm, *.pgx, *.bmp, *.tif, *.raw or *.tga]!!\n", outfile);
                                                return 1;
                                }
                                if (opj_strcpy_s(parameters->outfile, sizeof(parameters->outfile), outfile) != 0) {
@@ -644,7 +644,7 @@ int parse_cmdline_decoder(int argc, char **argv, opj_decompress_parameters *para
                                                img_fol->out_format = "png";
                                                break;
                                        default:
-                                               fprintf(stderr, "Unknown output format image %s [only *.pnm, *.pgm, *.ppm, *.pgx, *.bmp, *.tif, *.raw or *.tga]!! \n", outformat);
+                                               fprintf(stderr, "Unknown output format image %s [only *.png, *.pnm, *.pgm, *.ppm, *.pgx, *.bmp, *.tif, *.raw or *.tga]!!\n", outformat);
                                                return 1;
                                                break;
                                }