Mercurial Mercurial > hg > stx-libview / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more single-underline macros
authorClaus Gittinger <cg@exept.de>
Thu, 05 Feb 1998 15:30:50 +0100
changeset 2044 9ea84b4ba249
parent 2043 7b8d741538a0
child 2045 bd7978df685c
more single-underline macros
Depth1Image.st file | annotate | diff | comparison | revisions
Depth24Image.st file | annotate | diff | comparison | revisions
Depth2Image.st file | annotate | diff | comparison | revisions
Depth4Image.st file | annotate | diff | comparison | revisions
Depth8Image.st file | annotate | diff | comparison | revisions
ImageRdr.st file | annotate | diff | comparison | revisions
ImageReader.st file | annotate | diff | comparison | revisions 
--- a/Depth1Image.st	Thu Feb 05 15:22:39 1998 +0100
+++ b/Depth1Image.st	Thu Feb 05 15:30:50 1998 +0100
@@ -165,9 +165,9 @@
     OBJ w = _INST(width);
 
     if (__isByteArray(b) && __bothSmallInteger(x, y) && __isSmallInteger(w) ) {
-        int _w = _intVal(w);
-        int _y = _intVal(y);
-        int _x = _intVal(x);
+        int _w = __intVal(w);
+        int _y = __intVal(y);
+        int _x = __intVal(x);
         unsigned _byte;
         int _idx;
 
@@ -216,9 +216,9 @@
     OBJ w = _INST(width);
 
     if (__isByteArray(b) && __bothSmallInteger(x, y) && __isSmallInteger(w) ) {
-        int _w = _intVal(w);
-        int _y = _intVal(y);
-        int _x = _intVal(x);
+        int _w = __intVal(w);
+        int _y = __intVal(y);
+        int _x = __intVal(x);
         int _idx;
 
         _idx = ((_w + 7) >> 3) * _y + (_x >> 3);
@@ -532,8 +532,8 @@
     int _w1 = __intVal(__INST(width));
     int _y1, _y2;
     OBJ b2 = newBits;
-    int _w2 = _intVal(newWidth);
-    int _h2 = _intVal(newHeight);
+    int _w2 = __intVal(newWidth);
+    int _h2 = __intVal(newHeight);
     int _x2, _x1;
     int _idx2;
     unsigned _byte;
@@ -603,10 +603,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);
 
 	switch (_mag) {
 	    case 1:
@@ -736,5 +736,5 @@
 !Depth1Image class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/Depth1Image.st,v 1.32 1998-02-05 14:19:50 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/Depth1Image.st,v 1.33 1998-02-05 14:29:51 cg Exp $'
 ! !
--- 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 $'
 ! !
--- a/Depth2Image.st	Thu Feb 05 15:22:39 1998 +0100
+++ b/Depth2Image.st	Thu Feb 05 15:30:50 1998 +0100
@@ -422,10 +422,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);
 
 	 switch (_mag) {
 	     case 1:
@@ -532,5 +532,5 @@
 !Depth2Image class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/Depth2Image.st,v 1.27 1998-02-05 14:20:20 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/Depth2Image.st,v 1.28 1998-02-05 14:30:14 cg Exp $'
 ! !
--- a/Depth4Image.st	Thu Feb 05 15:22:39 1998 +0100
+++ b/Depth4Image.st	Thu Feb 05 15:30:50 1998 +0100
@@ -544,10 +544,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);
 
 	switch (_mag) {
 	    case 1:
@@ -665,5 +665,5 @@
 !Depth4Image class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/Depth4Image.st,v 1.27 1998-02-05 14:20:24 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/Depth4Image.st,v 1.28 1998-02-05 14:30:18 cg Exp $'
 ! !
--- a/Depth8Image.st	Thu Feb 05 15:22:39 1998 +0100
+++ b/Depth8Image.st	Thu Feb 05 15:30:50 1998 +0100
@@ -1474,10 +1474,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);
 
 	switch (_mag) {
 	    case 1:
@@ -1587,16 +1587,16 @@
 
     _srcP = __ByteArrayInstPtr(_INST(bytes))->ba_element;
     _dstP = __ByteArrayInstPtr(formBytes)->ba_element;
-    for (_h = _intVal(h); _h; _h--) {
+    for (_h = __intVal(h); _h; _h--) {
 	_last = -1;
-	for (_w = _intVal(w); _w; _w--) {
+	for (_w = __intVal(w); _w; _w--) {
 	    _v = *_srcP++;
 	    if (_v != _last) {
 		_patternBytes = __ArrayInstPtr(patterns)->a_element[_v];
 		if (__isByteArray(_patternBytes)) {
 		    _patternBits = __ByteArrayInstPtr(_patternBytes)->ba_element[_patternOffset];
 		} else if (__isArray(_patternBytes)) {
-		    _patternBits = _intVal(__ArrayInstPtr(_patternBytes)->a_element[_patternOffset]);
+		    _patternBits = __intVal(__ArrayInstPtr(_patternBytes)->a_element[_patternOffset]);
 		}
 		_p0 = __ByteArrayInstPtr(pixel0bytes)->ba_element[_v];
 		_p1 = __ByteArrayInstPtr(pixel1bytes)->ba_element[_v];
@@ -1690,17 +1690,17 @@
 
     _srcP = __ByteArrayInstPtr(_INST(bytes))->ba_element;
     _dstP = __ByteArrayInstPtr(formBytes)->ba_element;
-    for (_h = _intVal(h); _h; _h--) {
+    for (_h = __intVal(h); _h; _h--) {
         _last = -1;
         _outCount = 0;
-        for (_w = _intVal(w); _w; _w--) {
+        for (_w = __intVal(w); _w; _w--) {
             _v = *_srcP++;
             if (_v != _last) {
                 _patternBytes = __ArrayInstPtr(patterns)->a_element[_v];
                 if (__isByteArray(_patternBytes)) {
                     _patternBits = __ByteArrayInstPtr(_patternBytes)->ba_element[_patternOffset];
                 } else if (__isArray(_patternBytes)) {
-                    _patternBits = _intVal(__ArrayInstPtr(_patternBytes)->a_element[_patternOffset]);
+                    _patternBits = __intVal(__ArrayInstPtr(_patternBytes)->a_element[_patternOffset]);
                 }
                 _p0 = __ByteArrayInstPtr(pixel0bytes)->ba_element[_v];
                 _p1 = __ByteArrayInstPtr(pixel1bytes)->ba_element[_v];
@@ -1779,5 +1779,5 @@
 !Depth8Image class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/Depth8Image.st,v 1.81 1998-02-05 14:20:43 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/Depth8Image.st,v 1.82 1998-02-05 14:30:32 cg Exp $'
 ! !
--- a/ImageRdr.st	Thu Feb 05 15:22:39 1998 +0100
+++ b/ImageRdr.st	Thu Feb 05 15:30:50 1998 +0100
@@ -1149,7 +1149,7 @@
     if (__isByteArray(data)
      && __bothSmallInteger(width, height)) {
 	__decodeDelta__(__ByteArrayInstPtr(data)->ba_element,
-		    _intVal(width), _intVal(height));
+		    __intVal(width), __intVal(height));
 	RETURN ( self );
     }
 %}
@@ -1167,8 +1167,8 @@
      && __bothSmallInteger(offset, count)) {
 	if (__decodeCCITTgroup3__(__ByteArrayInstPtr(srcBytes)->ba_element,
 			          __ByteArrayInstPtr(dstBytes)->ba_element
-			          + _intVal(offset) - 1,
-			          _intVal(count))) {
+			          + __intVal(offset) - 1,
+			          __intVal(count))) {
 	    RETURN ( self );
 	}
     }
@@ -1957,5 +1957,5 @@
 !ImageReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/Attic/ImageRdr.st,v 1.61 1998-02-05 14:22:39 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/Attic/ImageRdr.st,v 1.62 1998-02-05 14:30:50 cg Exp $'
 ! !
--- a/ImageReader.st	Thu Feb 05 15:22:39 1998 +0100
+++ b/ImageReader.st	Thu Feb 05 15:30:50 1998 +0100
@@ -1149,7 +1149,7 @@
     if (__isByteArray(data)
      && __bothSmallInteger(width, height)) {
 	__decodeDelta__(__ByteArrayInstPtr(data)->ba_element,
-		    _intVal(width), _intVal(height));
+		    __intVal(width), __intVal(height));
 	RETURN ( self );
     }
 %}
@@ -1167,8 +1167,8 @@
      && __bothSmallInteger(offset, count)) {
 	if (__decodeCCITTgroup3__(__ByteArrayInstPtr(srcBytes)->ba_element,
 			          __ByteArrayInstPtr(dstBytes)->ba_element
-			          + _intVal(offset) - 1,
-			          _intVal(count))) {
+			          + __intVal(offset) - 1,
+			          __intVal(count))) {
 	    RETURN ( self );
 	}
     }
@@ -1957,5 +1957,5 @@
 !ImageReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/ImageReader.st,v 1.61 1998-02-05 14:22:39 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/ImageReader.st,v 1.62 1998-02-05 14:30:50 cg Exp $'
 ! !
hg/stx-libview