Yet another microoptimization in the driver.

[fjl] / driver.c

diff --git a/driver.c b/driver.c
index d5bec84f8db5101aa33d6010c2de831e8f85339a..5b4545343ddcc4504a09b51d8dc27a4a225bd19c 100644 (file)
--- a/driver.c
+++ b/driver.c
@@ -181,6 +181,7 @@ void read_scan(struct byte_source* source, struct jpeg_image* image, huffman_tab
                                                unsigned r = rs >> 4;
                                                unsigned s = rs & 0xf;
                                                i += r;
+                                               possibly_refill(&bits, s + DEHUF_TABLE_BITS);
 
                                                if (rs == 0x00) {
                                                        /* end of block */
@@ -188,11 +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);
                                                        continue;
                                                }
 
-                                               possibly_refill(&bits, s + DEHUF_TABLE_BITS);
                                                coeff[unzigzag[i]] = extend(read_bits(&bits, s), s);
                                        }