Fix bugs where pointer to remaining data in filters was not updated, also make all occurances of the code follow a common idiom.

1 files changed, 4 insertions, 4 deletions

diff --git a/fitz/filt_faxd.c b/fitz/filt_faxd.c
index 57e206bf..e925a612 100644
--- a/fitz/filt_faxd.c
+++ b/fitz/filt_faxd.c
@@ -634,13 +634,13 @@ eol:
 
 	if (fax->blackis1)
 	{
-		while (p < buf + len && fax->remain-- > 0)
-			*p++ = fax->dst[fax->stride - fax->remain];
+		while (fax->remain > 0 && p < buf + len)
+			*p++ = fax->dst[fax->stride - fax->remain--];
 	}
 	else
 	{
-		while (p < buf + len && fax->remain-- > 0)
-			*p++ = fax->dst[fax->stride - fax->remain] ^ 0xff;
+		while (fax->remain > 0 && p < buf + len)
+			*p++ = fax->dst[fax->stride - fax->remain--] ^ 0xff;
 	}
 
 	if (fax->remain > 0)