walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge 8142cab0a0 into 2d606701e8

This commit is contained in:
szukw000 2022-11-01 05:42:38 +09:00 committed by GitHub
parent 2d606701e8 8142cab0a0
commit 481174ce03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/bin/jp2/convert.c
View File

@ -2016,7 +2016,7 @@ int imagetopnm(opj_image_t * image, const char *outfile, int force_split)
int *red, *green, *blue, *alpha;
int wr, hr, max;
int i;
unsigned int compno, ncomp;
unsigned int compno, ncomp, ui;
int adjustR, adjustG, adjustB, adjustA;
int fails, two, want_gray, has_alpha, triple;
int prec, v;
@ -2024,6 +2024,18 @@ int imagetopnm(opj_image_t * image, const char *outfile, int force_split)
const char *tmp = outfile;
char *destname;
fails = 0;
ncomp = image->numcomps;
for(ui = 0; ui < ncomp; ++ui) {
if(image->comps[ui].data == NULL) {
fprintf(stderr, "imagetopnm data[%u] == NULL\n",ui);
fails = 1;
}
}
if(fails) {
return 1;
}
alpha = NULL;
if ((prec = (int)image->comps[0].prec) > 16) {

13
src/bin/jp2/opj_decompress.c
View File

@ -578,11 +578,16 @@ static int infile_format(const char *fname)
}
s = fname + strlen(fname) - 4;
fputs("\n===========================================\n", stderr);
while(*s) {
if(*s == '.') {
break;
}
++s;
}
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);
" FOUND '%s'. SHOULD BE '%s'", s, magic_s);
fputs("\n===============================================\n", stderr);
return magic_format;
}