diff options
| author | mayeut <mayeut@users.noreply.github.com> | 2015-07-11 11:35:21 +0200 |
|---|---|---|
| committer | mayeut <mayeut@users.noreply.github.com> | 2015-07-11 11:35:21 +0200 |
| commit | dc43ebf96c079fb2a91a0e18f4d8f180855dd9ac (patch) | |
| tree | 40fb0609300f36f8f4a694a5cf14b5dba8962783 /src/bin/jp2/convert.c | |
| parent | a7060dae1c689f994643a232c185307fe9545a84 (diff) | |
Add option to force component splitting in imagetopnm
Update uclouvain/openjpeg#289
Diffstat (limited to 'src/bin/jp2/convert.c')
| -rw-r--r-- | src/bin/jp2/convert.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/bin/jp2/convert.c b/src/bin/jp2/convert.c index 92e043b6..5cde4fbd 100644 --- a/src/bin/jp2/convert.c +++ b/src/bin/jp2/convert.c @@ -1350,7 +1350,7 @@ opj_image_t* pnmtoimage(const char *filename, opj_cparameters_t *parameters) { return image; }/* pnmtoimage() */ -int imagetopnm(opj_image_t * image, const char *outfile) +int imagetopnm(opj_image_t * image, const char *outfile, int force_split) { int *red, *green, *blue, *alpha; int wr, hr, max; @@ -1380,7 +1380,8 @@ int imagetopnm(opj_image_t * image, const char *outfile) if(want_gray) ncomp = 1; - if (ncomp == 2 /* GRAYA */ + if ((force_split == 0) && + (ncomp == 2 /* GRAYA */ || (ncomp > 2 /* RGB, RGBA */ && image->comps[0].dx == image->comps[1].dx && image->comps[1].dx == image->comps[2].dx @@ -1388,8 +1389,8 @@ int imagetopnm(opj_image_t * image, const char *outfile) && image->comps[1].dy == image->comps[2].dy && image->comps[0].prec == image->comps[1].prec && image->comps[1].prec == image->comps[2].prec - )) - { + ))) + { fdest = fopen(outfile, "wb"); if (!fdest) |