From 33823ee0f6b1acf1e758cdd98953f1437bd35c97 Mon Sep 17 00:00:00 2001 From: Jamaika1 Date: Mon, 21 Dec 2020 12:25:04 +0100 Subject: [PATCH] Correction --- src/bin/jp2/opj_compress.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/bin/jp2/opj_compress.c b/src/bin/jp2/opj_compress.c index 421153c9..dc0683f9 100644 --- a/src/bin/jp2/opj_compress.c +++ b/src/bin/jp2/opj_compress.c @@ -638,7 +638,7 @@ static int parse_cmdline_encoder(int argc, char **argv, default: fprintf(stderr, "[ERROR] Unknown input file format: %s \n" - " Known file formats are *.pnm, *.pgm, *.ppm, *.pgx, *png, *.bmp, *.tif(f), *.raw, *yuv or *.tga\n", + " Known file formats are *.pnm, *.pgm, *.ppm, *.pgx, *png, *.bmp, *.tif(f), *.raw, *.yuv or *.tga\n", infile); return 1; } @@ -1732,8 +1732,8 @@ static int parse_cmdline_encoder(int argc, char **argv, } } - if ((parameters->decod_format == RAW_DFMT && raw_cp->rawWidth == 0) - || (parameters->decod_format == RAWL_DFMT && raw_cp->rawWidth == 0)) { + if ((parameters->decod_format == RAW_DFMT || parameters->decod_format == RAWL_DFMT) + && (raw_cp->rawWidth == 0)) { fprintf(stderr, "[ERROR] invalid raw/yuv image parameters\n"); fprintf(stderr, "Please use the Format option -F:\n"); fprintf(stderr, @@ -1947,18 +1947,12 @@ int main(int argc, char **argv) switch (parameters.decod_format) { case PGX_DFMT: - break; case PXM_DFMT: - break; case BMP_DFMT: - break; case TIF_DFMT: - break; case RAW_DFMT: case RAWL_DFMT: - break; case TGA_DFMT: - break; case PNG_DFMT: break; default: @@ -2020,7 +2014,7 @@ int main(int argc, char **argv) case RAWL_DFMT: image = rawltoimage(parameters.infile, ¶meters, &raw_cp); if (!image) { - fprintf(stderr, "Unable to load raw/yuv file\n"); + fprintf(stderr, "Unable to load raw file\n"); ret = 1; goto fin; }