summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorMatthieu Darbois <mayeut@users.noreply.github.com>2014-12-23 16:05:19 +0000
committerMatthieu Darbois <mayeut@users.noreply.github.com>2014-12-23 16:05:19 +0000
commit78a7762e3f1f30f4cc23411d7985390e9de2eda7 (patch)
tree9375461da5055ad3b0a28de8f06e6095f0997f3a /src/lib
parent33f52fb6117603cfef62eeb242ef9214f9d6f067 (diff)
[trunk] removed unnecessary operation in opj_bio_flush (fixes issue 461)
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/openjp2/bio.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/openjp2/bio.c b/src/lib/openjp2/bio.c
index 636264ce..3ce64927 100644
--- a/src/lib/openjp2/bio.c
+++ b/src/lib/openjp2/bio.c
@@ -169,12 +169,10 @@ OPJ_UINT32 opj_bio_read(opj_bio_t *bio, OPJ_UINT32 n) {
}
OPJ_BOOL opj_bio_flush(opj_bio_t *bio) {
- bio->ct = 0;
if (! opj_bio_byteout(bio)) {
return OPJ_FALSE;
}
if (bio->ct == 7) {
- bio->ct = 0;
if (! opj_bio_byteout(bio)) {
return OPJ_FALSE;
}
@@ -183,12 +181,11 @@ OPJ_BOOL opj_bio_flush(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)) {
return OPJ_FALSE;
}
- bio->ct = 0;
}
+ bio->ct = 0;
return OPJ_TRUE;
}