diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-11-15 13:13:36 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-11-15 13:13:36 +0000 |
| commit | ec0fe091380c2de75584fdfc3d914eee5b89e731 (patch) | |
| tree | 320da598f7ee33ed955f8f82fd15a051be03f6d0 /src/lib/openjp2/bio.c | |
| parent | 8562ed3018967d5c7bc44248c6de74889dcbc6ed (diff) | |
[trunk] move opj_bool to OPJ_BOOL to follow the other type
Diffstat (limited to 'src/lib/openjp2/bio.c')
| -rw-r--r-- | src/lib/openjp2/bio.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/openjp2/bio.c b/src/lib/openjp2/bio.c index f4694069..797e01e1 100644 --- a/src/lib/openjp2/bio.c +++ b/src/lib/openjp2/bio.c @@ -54,13 +54,13 @@ Write a byte @param bio BIO handle @return Returns OPJ_TRUE if successful, returns OPJ_FALSE otherwise */ -static opj_bool opj_bio_byteout(opj_bio_t *bio); +static OPJ_BOOL opj_bio_byteout(opj_bio_t *bio); /** Read a byte @param bio BIO handle @return Returns OPJ_TRUE if successful, returns OPJ_FALSE otherwise */ -static opj_bool opj_bio_bytein(opj_bio_t *bio); +static OPJ_BOOL opj_bio_bytein(opj_bio_t *bio); /*@}*/ @@ -72,7 +72,7 @@ static opj_bool opj_bio_bytein(opj_bio_t *bio); ========================================================== */ -opj_bool opj_bio_byteout(opj_bio_t *bio) { +OPJ_BOOL opj_bio_byteout(opj_bio_t *bio) { bio->buf = (bio->buf << 8) & 0xffff; bio->ct = bio->buf == 0xff00 ? 7 : 8; if (bio->bp >= bio->end) { @@ -82,7 +82,7 @@ opj_bool opj_bio_byteout(opj_bio_t *bio) { return OPJ_TRUE; } -opj_bool opj_bio_bytein(opj_bio_t *bio) { +OPJ_BOOL opj_bio_bytein(opj_bio_t *bio) { bio->buf = (bio->buf << 8) & 0xffff; bio->ct = bio->buf == 0xff00 ? 7 : 8; if (bio->bp >= bio->end) { @@ -162,7 +162,7 @@ OPJ_UINT32 opj_bio_read(opj_bio_t *bio, OPJ_UINT32 n) { return v; } -opj_bool opj_bio_flush(opj_bio_t *bio) { +OPJ_BOOL opj_bio_flush(opj_bio_t *bio) { bio->ct = 0; if (! opj_bio_byteout(bio)) { return OPJ_FALSE; @@ -176,7 +176,7 @@ opj_bool opj_bio_flush(opj_bio_t *bio) { return OPJ_TRUE; } -opj_bool opj_bio_inalign(opj_bio_t *bio) { +OPJ_BOOL opj_bio_inalign(opj_bio_t *bio) { bio->ct = 0; if ((bio->buf & 0xff) == 0xff) { if (! opj_bio_bytein(bio)) { |