--- a/Depth24Image.st	Sat Feb 11 17:47:17 1995 +0100
+++ b/Depth24Image.st	Wed Feb 15 11:36:19 1995 +0100
@@ -21,7 +21,7 @@
 COPYRIGHT (c) 1993 by Claus Gittinger
 	      All Rights Reserved
 
-$Header: /cvs/stx/stx/libview/Depth24Image.st,v 1.9 1995-02-06 00:35:49 claus Exp $
+$Header: /cvs/stx/stx/libview/Depth24Image.st,v 1.10 1995-02-15 10:35:42 claus Exp $
 '!
 
 !Depth24Image class methodsFor:'documentation'!
@@ -42,7 +42,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libview/Depth24Image.st,v 1.9 1995-02-06 00:35:49 claus Exp $
+$Header: /cvs/stx/stx/libview/Depth24Image.st,v 1.10 1995-02-15 10:35:42 claus Exp $
 "
 !
 
@@ -966,9 +966,8 @@
     if (__isByteArray(_INST(bytes))
      && __isByteArray(pseudoBits)
      && __isByteArray(fixIds)
-     && _isSmallInteger(fixR)
-     && _isSmallInteger(fixG)
-     && _isSmallInteger(fixB)) {
+     && __bothSmallInteger(fixR, fixG)
+     && __isSmallInteger(fixB)) {
 	failed = false;
 
 	srcP = _ByteArrayInstPtr(_INST(bytes))->ba_element;
@@ -1360,14 +1359,15 @@
     REGISTER int i;
     REGISTER unsigned char byte1, byte2, byte3;
     int _pixels;
+    OBJ w = _INST(width);
 
-    if (_isSmallInteger(srcStart) && _isSmallInteger(dstStart)
-     && _isSmallInteger(_INST(width)) && _isSmallInteger(mX)
+    if (__bothSmallInteger(srcStart, dstStart)
+     && __bothSmallInteger(w, mX)
      && __isByteArray(srcBytes) && __isByteArray(dstBytes)) {
 	_mag = _intVal(mX);
 	srcP = _ByteArrayInstPtr(srcBytes)->ba_element - 1 + _intVal(srcStart);
 	dstP = _ByteArrayInstPtr(dstBytes)->ba_element - 1 + _intVal(dstStart);
-	_pixels = _intVal(_INST(width));
+	_pixels = _intVal(w);
 
 	while (_pixels--) {
 	    byte1 = *srcP;