diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-09-27 09:54:35 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-09-27 09:54:35 +0000 |
| commit | a9a1336502b180a5902ba2a523d59ee67716e82d (patch) | |
| tree | 4a285e25f645820f762f7af1e9e42a7597b14a3d | |
| parent | 9103674950a37e4fda7fadb2dc57295e5ecb39f2 (diff) | |
[trunk] update t2_getnumpasses from V2 branch and put opj_ prefix
| -rw-r--r-- | libopenjpeg/t2.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libopenjpeg/t2.c b/libopenjpeg/t2.c index 1836c688..577b5017 100644 --- a/libopenjpeg/t2.c +++ b/libopenjpeg/t2.c @@ -46,7 +46,7 @@ Variable length code for signalling delta Zil (truncation point) @param n delta Zil */ static void opj_t2_putnumpasses(opj_bio_t *bio, OPJ_UINT32 n); -static int t2_getnumpasses(opj_bio_t *bio); +static OPJ_UINT32 opj_t2_getnumpasses(opj_bio_t *bio); /** Encode a packet of a tile to a destination buffer @param tile Tile for which to write the packets @@ -210,8 +210,8 @@ void opj_t2_putnumpasses(opj_bio_t *bio, OPJ_UINT32 n) { } } -static int t2_getnumpasses(opj_bio_t *bio) { - int n; +OPJ_UINT32 opj_t2_getnumpasses(opj_bio_t *bio) { + OPJ_UINT32 n; if (!bio_read(bio, 1)) return 1; if (!bio_read(bio, 1)) @@ -558,7 +558,7 @@ static int t2_decode_packet(opj_t2_t* t2, unsigned char *src, int len, opj_tcd_t cblk->numlenbits = 3; } /* number of coding passes */ - cblk->numnewpasses = t2_getnumpasses(bio); + cblk->numnewpasses = opj_t2_getnumpasses(bio); increment = opj_t2_getcommacode(bio); /* length indicator increment */ cblk->numlenbits += increment; @@ -1666,7 +1666,7 @@ opj_bool opj_t2_read_packet_header( opj_t2_v2_t* p_t2, } /* number of coding passes */ - l_cblk->numnewpasses = t2_getnumpasses(l_bio); + l_cblk->numnewpasses = opj_t2_getnumpasses(l_bio); l_increment = opj_t2_getcommacode(l_bio); /* length indicator increment */ |