diff options
| author | Antonin Descampe <antonin@gmail.com> | 2005-01-26 08:59:49 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2005-01-26 08:59:49 +0000 |
| commit | 3b1bee0eec81ae97bdb345103074e98ad1d29ab8 (patch) | |
| tree | 8b00001c35c8df23cf0d0665f5d84612ea5130b9 /libopenjpeg/j2k.c | |
| parent | ba1cf545df1bd789ddeaf31842971ed0a13ff932 (diff) | |
* function getopt added to the decoder (to efficiently manage arguments
in command line)
* reduce_on, reduce_value grouped in a single variable reduce
* up-to-date usage display
* image_type renamed --> decod_format
* JPEG2000_format renamed --> cod_format
Diffstat (limited to 'libopenjpeg/j2k.c')
| -rw-r--r-- | libopenjpeg/j2k.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c index 274d1b69..6092c5bb 100644 --- a/libopenjpeg/j2k.c +++ b/libopenjpeg/j2k.c @@ -345,6 +345,8 @@ void j2k_read_cox(int compno) J2K_STATE_TPH ? &j2k_cp->tcps[j2k_curtileno] : &j2k_default_tcp; tccp = &tcp->tccps[compno]; tccp->numresolutions = cio_read(1) + 1; /* SPcox (D) */ + //Check the reduce value + j2k_cp->reduce=int_min((tccp->numresolutions)-1,j2k_cp->reduce); tccp->cblkw = cio_read(1) + 2; /* SPcox (E) */ tccp->cblkh = cio_read(1) + 2; /* SPcox (F) */ tccp->cblksty = cio_read(1); /* SPcox (G) */ @@ -878,7 +880,7 @@ void j2k_write_sod() } info_IM.num = 0; - if (j2k_cp->image_type) + if (j2k_cp->decod_format != PGX_DFMT) l = tcd_encode_tile_pxm(j2k_curtileno, cio_getbp(), cio_numbytesleft() - 2, &info_IM); else |