--- a/Depth24Image.st	Thu Feb 05 15:22:39 1998 +0100
+++ b/Depth24Image.st	Thu Feb 05 15:30:50 1998 +0100
@@ -819,12 +819,12 @@
              and:[nColors <= nColorCells]] whileTrue:[
 %{
                 if (__isByteArray(_INST(bytes))) {
-                    int sI = _intVal(srcIndex);
+                    int sI = __intVal(srcIndex);
                     unsigned char *cp = __ByteArrayInstPtr(_INST(bytes))->ba_element;
 
-                    r = __MKSMALLINT((cp[sI - 1] & _intVal(rMask)) + 1);
-                    g = __MKSMALLINT((cp[sI]     & _intVal(gMask)) + 1);
-                    b = __MKSMALLINT((cp[sI + 1] & _intVal(bMask)) + 1);
+                    r = __MKSMALLINT((cp[sI - 1] & __intVal(rMask)) + 1);
+                    g = __MKSMALLINT((cp[sI]     & __intVal(gMask)) + 1);
+                    b = __MKSMALLINT((cp[sI + 1] & __intVal(bMask)) + 1);
                     srcIndex = __MKSMALLINT(sI + 3);
                     fast = true;
                 } else {
@@ -2145,9 +2145,9 @@
     REGISTER unsigned char *_dstP = __ByteArrayInstPtr(newBytes)->ba_element;
     unsigned char *_srcP = __ByteArrayInstPtr(_INST(bytes))->ba_element;
     unsigned char *_srcRowP, *sP;
-    int _width3 = _intVal(_INST(width)) * 3;
-    int _w = _intVal(newWidth) - 1;
-    int _h = _intVal(newHeight) - 1;
+    int _width3 = __intVal(_INST(width)) * 3;
+    int _w = __intVal(newWidth) - 1;
+    int _h = __intVal(newHeight) - 1;
     int _row, _col;
     double _mX = _floatVal(mX);
     double _mY = _floatVal(mY);
@@ -2202,10 +2202,10 @@
     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(w);
+	_mag = __intVal(mX);
+	srcP = __ByteArrayInstPtr(srcBytes)->ba_element - 1 + __intVal(srcStart);
+	dstP = __ByteArrayInstPtr(dstBytes)->ba_element - 1 + __intVal(dstStart);
+	_pixels = __intVal(w);
 
 	while (_pixels--) {
 	    byte1 = *srcP;
@@ -2309,5 +2309,5 @@
 !Depth24Image class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/Depth24Image.st,v 1.60 1998-02-05 14:20:05 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/Depth24Image.st,v 1.61 1998-02-05 14:30:02 cg Exp $'
 ! !