From d2ed36431ece651e74ad35d40f66ed75e9de18c4 Mon Sep 17 00:00:00 2001 From: Jamaika1 Date: Tue, 29 Dec 2020 03:08:45 +0100 Subject: [PATCH] Import files tiff and yuv(raw) --- src/bin/jp2/opj_decompress.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/src/bin/jp2/opj_decompress.c b/src/bin/jp2/opj_decompress.c index 2634907f..135297c1 100644 --- a/src/bin/jp2/opj_decompress.c +++ b/src/bin/jp2/opj_decompress.c @@ -187,7 +187,7 @@ static void decode_help_display(void) "\n" " -ImgDir \n" " Image file Directory path \n" - " -OutFor \n" + " -OutFor \n" " REQUIRED only if -ImgDir is used\n" " Output format for decompressed images.\n"); fprintf(stdout, " -i \n" @@ -427,8 +427,8 @@ int load_images(dircnt_t *dirptr, char *imgdirpath) 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 }; + static const char *extension[] = {"pgx", "pnm", "pgm", "ppm", "bmp", "tif", "tiff", "raw", "yuv", "rawl", "tga", "png", "j2k", "jp2", "jpt", "j2c", "jpc" }; + static const int format[] = { PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, TIF_DFMT, TIF_DFMT, RAW_DFMT, RAW_DFMT, RAWL_DFMT, TGA_DFMT, PNG_DFMT, J2K_CFMT, JP2_CFMT, JPT_CFMT, J2K_CFMT, J2K_CFMT }; const char * ext = strrchr(filename, '.'); if (ext == NULL) { return -1; @@ -628,24 +628,17 @@ int parse_cmdline_decoder(int argc, char **argv, parameters->cod_format = get_file_format(outfile); switch (parameters->cod_format) { case PGX_DFMT: - break; case PXM_DFMT: - break; case BMP_DFMT: - break; case TIF_DFMT: - break; case RAW_DFMT: - break; case RAWL_DFMT: - break; case TGA_DFMT: - break; case PNG_DFMT: break; default: fprintf(stderr, - "Unknown output format image %s [only *.png, *.pnm, *.pgm, *.ppm, *.pgx, *.bmp, *.tif, *.raw or *.tga]!!\n", + "Unknown output format image %s [only *.png, *.pnm, *.pgm, *.ppm, *.pgx, *.bmp, *.tif(f), *.raw, *.yuv or *.tga]!!\n", outfile); return 1; } @@ -692,7 +685,7 @@ int parse_cmdline_decoder(int argc, char **argv, break; default: fprintf(stderr, - "Unknown output format image %s [only *.png, *.pnm, *.pgm, *.ppm, *.pgx, *.bmp, *.tif, *.raw or *.tga]!!\n", + "Unknown output format image %s [only *.png, *.pnm, *.pgm, *.ppm, *.pgx, *.bmp, *.tif(f), *.raw, *.yuv or *.tga]!!\n", outformat); return 1; break; @@ -903,7 +896,7 @@ int parse_cmdline_decoder(int argc, char **argv, fprintf(stderr, "[ERROR] When -ImgDir is used, -OutFor must be used.\n"); fprintf(stderr, "Only one format allowed.\n" - "Valid format are PGM, PPM, PNM, PGX, BMP, TIF, RAW and TGA.\n"); + "Valid format are PGM, PPM, PNM, PGX, BMP, TIF, TIFF, RAW, YUV, and TGA.\n"); return 1; } if (!((parameters->outfile[0] == 0))) { @@ -1705,7 +1698,7 @@ int main(int argc, char **argv) } break; #ifdef OPJ_HAVE_LIBTIFF - case TIF_DFMT: /* TIFF */ + case TIF_DFMT: /* TIF(F) */ if (imagetotif(image, parameters.outfile)) { fprintf(stderr, "[ERROR] Outfile %s not generated\n", parameters.outfile); failed = 1; @@ -1716,7 +1709,7 @@ int main(int argc, char **argv) #endif /* OPJ_HAVE_LIBTIFF */ case RAW_DFMT: /* RAW */ if (imagetoraw(image, parameters.outfile)) { - fprintf(stderr, "[ERROR] Error generating raw file. Outfile %s not generated\n", + fprintf(stderr, "[ERROR] Error generating raw/yuv file. Outfile %s not generated\n", parameters.outfile); failed = 1; } else if (!(parameters.quiet)) {