diff options
| author | Parvatha Elangovan <p.elangovan@intopix.com> | 2007-03-21 13:01:15 +0000 |
|---|---|---|
| committer | Parvatha Elangovan <p.elangovan@intopix.com> | 2007-03-21 13:01:15 +0000 |
| commit | 6045158ce611504f6359256926f69b6043ec50ea (patch) | |
| tree | 9b2e2b96eab57434884b3ea7dcda8a7c0d30a83c /libopenjpeg | |
| parent | 694a173adb14a7724a37f942a9183fccd2766657 (diff) | |
Fixed j2k_prog_order_list[]. Modifications in j2k.c.
Fixed t1_decode_cblks. Modifications in t1.c.
Diffstat (limited to 'libopenjpeg')
| -rw-r--r-- | libopenjpeg/j2k.c | 3 | ||||
| -rw-r--r-- | libopenjpeg/t1.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c index 3768a110..f8c5a3e0 100644 --- a/libopenjpeg/j2k.c +++ b/libopenjpeg/j2k.c @@ -244,7 +244,8 @@ j2k_prog_order_t j2k_prog_order_list[] = { {LRCP, "LRCP"}, {PCRL, "PCRL"}, {RLCP, "RLCP"}, - {RPCL, "RPCL"} + {RPCL, "RPCL"}, + {-1, NULL} }; char *convert_progression_order(OPJ_PROG_ORDER prg_order){ diff --git a/libopenjpeg/t1.c b/libopenjpeg/t1.c index 87a29594..da93834a 100644 --- a/libopenjpeg/t1.c +++ b/libopenjpeg/t1.c @@ -1064,7 +1064,7 @@ void t1_decode_cblks(opj_t1_t *t1, opj_tcd_tile_t *tile, opj_tcp_t *tcp) { if (t1->data[j][i] >> 1 == 0) { tilec->data[x + i + (y + j) * w] = 0; } else { - double tmp = (double)((t1->data[j][i] << 12) * band->stepsize); + double tmp = (double)(t1->data[j][i] * band->stepsize * 4096.0); int tmp2 = ((int) (floor(fabs(tmp)))) + ((int) floor(fabs(tmp*2))%2); tilec->data[x + i + (y + j) * w] = ((tmp<0)?-tmp2:tmp2); } |