--- a/JPEGReader.st	Thu Jan 18 09:44:13 2007 +0100
+++ b/JPEGReader.st	Wed Jan 24 14:44:00 2007 +0100
@@ -67,7 +67,7 @@
     struct my_error_mgr *myerrPtr = (struct my_error_mgr *) cinfo->err;
 
     if (@global(ErrorPrinting) == true) {
-	fprintf(stderr, "JPEGReader [warning]: jpeg error\n");
+	console_printf("JPEGReader [warning]: jpeg error\n");
     }
     longjmp(myerrPtr->setjmp_buffer, 1);
 }
@@ -79,13 +79,13 @@
     char buffer[JMSG_LENGTH_MAX];
 
     if (@global(ErrorPrinting) == true) {
-	fprintf(stderr, "libJPEG [error]: ");
+	console_printf("libJPEG [error]: ");
 
        /* Create the message */
        (*cinfo->err->format_message) (cinfo, buffer);
 
        /* Send it to stderr, adding a newline */
-       fprintf(stderr, "%s\n", buffer);
+       console_printf("%s\n", buffer);
     }
 }
 
@@ -105,11 +105,11 @@
   if (percent_done != prog->percent_done) {
     prog->percent_done = percent_done;
     if (total_passes > 1) {
-      fprintf(stderr, "\rPass %d/%d: %3d%% ",
+      console_printf("\rPass %d/%d: %3d%% ",
 	      prog->pub.completed_passes + prog->completed_extra_passes + 1,
 	      total_passes, percent_done);
     } else {
-      fprintf(stderr, "\r %3d%% ", percent_done);
+      console_printf("\r %3d%% ", percent_done);
     }
     fflush(stderr);
   }
@@ -135,8 +135,7 @@
 {
   /* Clear away progress display */
   if (cinfo->err->trace_level == 0) {
-    fprintf(stderr, "\r                \r");
-    fflush(stderr);
+    console_printf("\r                \r");
   }
 }
 
@@ -171,9 +170,9 @@
 
     [See also:]
 	Image Form Icon
-	BlitImageReader FaceReader GIFReader PBMReader PCXReader 
-	ST80FormReader SunRasterReader TargaReader TIFFReader WindowsIconReader 
-	XBMReader XPMReader XWDReader 
+	BlitImageReader FaceReader GIFReader PBMReader PCXReader
+	ST80FormReader SunRasterReader TargaReader TIFFReader WindowsIconReader
+	XBMReader XPMReader XWDReader
 "
 ! !
 
@@ -254,7 +253,7 @@
 	cinfoPtr = (struct jpeg_decompress_struct *)(__externalBytesAddress(j_d_s));
 	jerrPtr = (struct my_error_mgr *)(__externalBytesAddress(j_e_m));
 
-	/* 
+	/*
 	 * Initialize the JPEG decompression object with default error handling.
 	 */
 	cinfoPtr->err = jpeg_std_error(jerrPtr);
@@ -264,7 +263,7 @@
 	 */
 	jerrPtr->pub.error_exit = my_error_exit;
 	if (setjmp(jerrPtr->setjmp_buffer)) {
-	    /* 
+	    /*
 	     * error occurred ...
 	     */
 	    jpeg_destroy_decompress(cinfoPtr);
@@ -278,7 +277,7 @@
 
 	jpeg_create_decompress(cinfoPtr);
 #if 0
-	/* 
+	/*
 	 * Insert custom COM marker processor.
 	 */
 	jpeg_set_marker_processor(cinfoPtr, JPEG_COM, COM_handler);
@@ -392,13 +391,13 @@
 
 	if (cinfoPtr->output_scanline < cinfoPtr->output_height) {
 	    if (setjmp(jerrPtr->setjmp_buffer)) {
-		/* 
+		/*
 		 * error occurred ...
 		 */
 		jpeg_destroy_decompress(cinfoPtr);
 		RETURN (__mkSmallInteger(-1));
 	    }
-	    num_scanlines = jpeg_read_scanlines(cinfoPtr, 
+	    num_scanlines = jpeg_read_scanlines(cinfoPtr,
 						rowPointers,
 						1);
 	    RETURN (__mkSmallInteger(num_scanlines));
@@ -496,7 +495,7 @@
 	    s notNil ifTrue:[s close].
 	    tmpFile delete.
 	].
-        
+
 	"/ 'JPEGReader [info]: can only read from real streams' infoPrintCR.
 	"/ ^ nil
     ].
@@ -537,7 +536,7 @@
     [(returnCode := self decompressChunkInto:data startingAt:dataIdx) > 0] whileTrue:[
 	"/ got a row in the buffer ...
 	dataIdx := dataIdx + bytesPerRow
-    ].    
+    ].
     returnCode < 0 ifTrue:[
 	'JPEGReader [info]: ' infoPrint. self get_error_message infoPrintCR.
 	^ nil
@@ -578,7 +577,7 @@
 !JPEGReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/JPEGReader.st,v 1.46 2005-07-08 19:39:01 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/JPEGReader.st,v 1.47 2007-01-24 13:44:00 cg Exp $'
 ! !
 
 JPEGReader initialize!