--- a/JPEGReader.st	Tue Jul 05 20:12:46 2005 +0200
+++ b/JPEGReader.st	Fri Jul 08 21:39:01 2005 +0200
@@ -234,8 +234,8 @@
     ].
 
 %{
-    errMgrStructSize = __MKSMALLINT(sizeof(struct my_error_mgr));
-    decompressStructSize = __MKSMALLINT(sizeof(struct jpeg_decompress_struct));
+    errMgrStructSize = __mkSmallInteger(sizeof(struct my_error_mgr));
+    decompressStructSize = __mkSmallInteger(sizeof(struct jpeg_decompress_struct));
 %}.
 
     jpeg_error_mgr_struct := ExternalBytes unprotectedNew:errMgrStructSize.
@@ -345,9 +345,9 @@
 	/* Calculate output image dimensions so we can allocate space */
 	jpeg_calc_output_dimensions(cinfoPtr);
 
-	__INST(width) = __MKSMALLINT(cinfoPtr->output_width);
-	__INST(height) = __MKSMALLINT(cinfoPtr->output_height);
-	__INST(colorComponents) = __MKSMALLINT(cinfoPtr->output_components);
+	__INST(width) = __mkSmallInteger(cinfoPtr->output_width);
+	__INST(height) = __mkSmallInteger(cinfoPtr->output_height);
+	__INST(colorComponents) = __mkSmallInteger(cinfoPtr->output_components);
 
 #if 0
 	/* could now set additional values in cinfo
@@ -396,14 +396,14 @@
 		 * error occurred ...
 		 */
 		jpeg_destroy_decompress(cinfoPtr);
-		RETURN (__MKSMALLINT(-1));
+		RETURN (__mkSmallInteger(-1));
 	    }
 	    num_scanlines = jpeg_read_scanlines(cinfoPtr, 
 						rowPointers,
 						1);
-	    RETURN (__MKSMALLINT(num_scanlines));
+	    RETURN (__mkSmallInteger(num_scanlines));
 	}
-	RETURN (__MKSMALLINT(0));
+	RETURN (__mkSmallInteger(0));
     }
 %}.
     self halt:'bad arguments'.
@@ -578,7 +578,7 @@
 !JPEGReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/JPEGReader.st,v 1.45 2004-04-28 15:46:15 penk Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/JPEGReader.st,v 1.46 2005-07-08 19:39:01 cg Exp $'
 ! !
 
 JPEGReader initialize!