X-Git-Url: https://git.sesse.net/?p=fjl;a=blobdiff_plain;f=driver.c;h=5b4545343ddcc4504a09b51d8dc27a4a225bd19c;hp=616b613f944ee5ae3ba12a69476eb37d9b20a336;hb=1dec09cef241dae5c5e93962d2ec96c444874bc8;hpb=fb0138d517d723f43221e95bd8ece7419dac70b7

diff --git a/driver.c b/driver.c
index 616b613..5b45453 100644
--- a/driver.c
+++ b/driver.c
@@ -180,6 +180,8 @@ void read_scan(struct byte_source* source, struct jpeg_image* image, huffman_tab
 						unsigned rs = read_huffman_symbol_no_refill(ac_table, &bits);
 						unsigned r = rs >> 4;
 						unsigned s = rs & 0xf;
+						i += r;
+						possibly_refill(&bits, s + DEHUF_TABLE_BITS);
 
 						if (rs == 0x00) {
 							/* end of block */
@@ -187,13 +189,9 @@ void read_scan(struct byte_source* source, struct jpeg_image* image, huffman_tab
 						}
 						if (rs == 0xf0) {
 							/* 16 zero coefficients */
-							possibly_refill(&bits, DEHUF_TABLE_BITS);
-							i += 15;
 							continue;
 						}
-						i += r;
 
-						possibly_refill(&bits, s + DEHUF_TABLE_BITS);
 						coeff[unzigzag[i]] = extend(read_bits(&bits, s), s);
 					}