commit bdb4bfaf05087c82e81fefb6e8f8e7308b6dff09
author Antonin Descampe <antonin@gmail.com> Tue May 03 22:29:25 2016
committer Antonin Descampe <antonin@gmail.com> Tue May 03 22:29:25 2016
tree f0f181c57335115ef9f6f30e2f96f6a649c4a8bc
parent 51a51bdd031fc11fd0c9d29a9dfdecc9c3fe8b52
parent 44a499f2acf10b55172d07abf387e5a579a585f7

Merge branch 'master' into fix-bypass-restart

src/lib/openjp2/t1.c

diff --git a/src/lib/openjp2/t1.c b/src/lib/openjp2/t1.c
index 1bf7205..8eb42a4 100644
--- a/src/lib/openjp2/t1.c
+++ b/src/lib/openjp2/t1.c
@@ -1662,7 +1662,7 @@
 			bpno--;
 		}
 
-		if (pass->term && bpno > 0) {
+        if (pass->term) {
 			type = ((bpno < ((OPJ_INT32) (cblk->numbps) - 4)) && (passtype < 2) && (cblksty & J2K_CCP_CBLKSTY_LAZY)) ? T1_TYPE_RAW : T1_TYPE_MQ;
 			if (type == T1_TYPE_RAW)
 				opj_mqc_bypass_init_enc(mqc);
@@ -1691,7 +1691,7 @@
 		if (pass->rate > opj_mqc_numbytes(mqc))
 			pass->rate = opj_mqc_numbytes(mqc);
 		/*Preventing generation of FF as last data byte of a pass*/
-		if((pass->rate>1) && (cblk->data[pass->rate - 1] == 0xFF)){
+        if(!(cblksty & J2K_CCP_CBLKSTY_LAZY) && (pass->rate>1) && (cblk->data[pass->rate - 1] == 0xFF)){
 			pass->rate--;
 		}
 		pass->len = pass->rate - (passno == 0 ? 0 : cblk->passes[passno - 1].rate);