X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=driver.c;h=2e5bda67f475f7e2fe58f2f899c1f2c7e2a17769;hb=d0afece00533a174faf2ce93633ca9731be89fc0;hp=20d64f2cd0c9c062e775fb0c66aad4dd6be4b797;hpb=90cfe68276c3639bb340956754dd726284f7b822;p=fjl

diff --git a/driver.c b/driver.c
index 20d64f2..2e5bda6 100644
--- a/driver.c
+++ b/driver.c
@@ -62,8 +62,8 @@ void read_sof(struct byte_source* source, struct jpeg_image* image)
 	assert(len >= 8);
 	image->precision = read_uint8(byte_source_input_func, source);
 	assert(image->precision == 8);
-	image->width = read_uint16(byte_source_input_func, source);
 	image->height = read_uint16(byte_source_input_func, source);
+	image->width = read_uint16(byte_source_input_func, source);
 	image->num_components = read_uint8(byte_source_input_func, source);
 	len -= 8;
 
@@ -163,10 +163,9 @@ void read_scan(struct byte_source* source, struct jpeg_image* image, huffman_tab
 							i += 15;
 							continue;
 						}
+						i += r;
 
 						possibly_refill(&bits, s);
-
-						i += r;
 						coeff[unzigzag[i]] = extend(read_bits(&bits, s), s);
 					}