X-Git-Url: https://git.sesse.net/?p=fjl;a=blobdiff_plain;f=driver.c;h=b12b226c336dcc29ea9993f521fbd8f393ec8f79;hp=06d94d99d553e6aa4e784e22cfc99a4d19216df5;hb=e58d7fc6e17349a9a456632f9403a73262a428e5;hpb=8445e04bae016b6bd74705902972e66ae7fe37c1

diff --git a/driver.c b/driver.c
index 06d94d9..b12b226 100644
--- a/driver.c
+++ b/driver.c
@@ -147,11 +147,11 @@ void read_scan(struct byte_source* source, struct jpeg_image* image, huffman_tab
 	}
 
 	struct bit_source bits;
-	init_bit_source(&bits, byte_source_input_func, source);
+	init_bit_source(&bits, byte_source_input_func, 8, source);
 		
 	unsigned mcu_x = 0, mcu_y = 0;
 
-	for ( ;; ) {
+	while (!bits.source_eof) {
 		for (unsigned c = 0; c < num_components; ++c) {
 			unsigned cn = component_num[c];
 			unsigned stride = image->num_blocks_horizontal * image->hsample[cn] * DCTSIZE;
@@ -214,8 +214,9 @@ void read_scan(struct byte_source* source, struct jpeg_image* image, huffman_tab
 			const int c = 1;
 			if (mcu_y == image->num_blocks_vertical) {
 				unsigned stride = image->num_blocks_horizontal * image->hsample[c] * DCTSIZE;
-				printf("P5\n%u %u\n255\n", stride, image->height);
-				fwrite(image->pixel_data[c], stride * image->height, 1, stdout);
+				unsigned height = image->num_blocks_vertical * image->vsample[c] * DCTSIZE;
+				printf("P5\n%u %u\n255\n", stride, height);
+				fwrite(image->pixel_data[c], stride * height, 1, stdout);
 			}
 		}
 	}
@@ -293,6 +294,9 @@ int main(void)
 		case 0xd8:
 			/* SOI */
 			break;
+		case 0xd9:
+			/* EOI */
+			exit(0);
 		case 0xc4:
 			/* DHT (define Huffman tables) */
 			read_huffman_tables(&tables, byte_source_input_func, &source);