From: Matthieu Darbois <mayeut@users.noreply.github.com>
Date: Tue, 23 Dec 2014 16:05:19 +0000 (+0000)
Subject: [trunk] removed unnecessary operation in opj_bio_flush (fixes issue 461)
X-Git-Tag: v2.1.1~22^2~146
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=78a7762e3f1f30f4cc23411d7985390e9de2eda7;p=openjpeg

[trunk] removed unnecessary operation in opj_bio_flush (fixes issue 461)
---

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;
 }