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

Fix breakage of 2fa0fc61f2 (#970)

This commit is contained in:
Even Rouault 2017-07-29 17:51:10 +02:00
parent 2fa0fc61f2
commit 784d4d47e9
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1896,8 +1896,9 @@ static int are_comps_similar(opj_image_t * image)
for (i = 1; i < image->numcomps; i++) { for (i = 1; i < image->numcomps; i++) {
if (image->comps[0].dx != image->comps[i].dx || if (image->comps[0].dx != image->comps[i].dx ||
image->comps[0].dy != image->comps[i].dy || image->comps[0].dy != image->comps[i].dy ||
image->comps[0].prec != image->comps[i].prec || (i <= 2 &&
image->comps[0].sgnd != image->comps[i].sgnd) { (image->comps[0].prec != image->comps[i].prec ||
image->comps[0].sgnd != image->comps[i].sgnd))) {
return OPJ_FALSE; return OPJ_FALSE;
} }
} }
@ -1940,7 +1941,7 @@ int imagetopnm(opj_image_t * image, const char *outfile, int force_split)
ncomp = 1; ncomp = 1;
} }
if ((force_split == 0) && if ((force_split == 0) && ncomp >= 2 &&
are_comps_similar(image)) { are_comps_similar(image)) {
fdest = fopen(outfile, "wb"); fdest = fopen(outfile, "wb");