--- a/Depth1Image.st Thu Feb 05 12:54:05 1998 +0100
+++ b/Depth1Image.st Thu Feb 05 15:20:43 1998 +0100
@@ -173,7 +173,7 @@
_idx = ((_w + 7) >> 3) * _y + (_x >> 3);
if ((unsigned)_idx < __byteArraySize(b)) {
- _byte = _ByteArrayInstPtr(b)->ba_element[_idx];
+ _byte = __ByteArrayInstPtr(b)->ba_element[_idx];
RETURN( (_byte & (0x80 >> (_x & 7))) ? __MKSMALLINT(1) : __MKSMALLINT(0) );
}
}
@@ -224,9 +224,9 @@
_idx = ((_w + 7) >> 3) * _y + (_x >> 3);
if ((unsigned)_idx < __byteArraySize(b)) {
if (aPixelValue == __MKSMALLINT(0)) {
- _ByteArrayInstPtr(b)->ba_element[_idx] &= ~(0x80 >> (_x & 7));
+ __ByteArrayInstPtr(b)->ba_element[_idx] &= ~(0x80 >> (_x & 7));
} else {
- _ByteArrayInstPtr(b)->ba_element[_idx] |= (0x80 >> (_x & 7));
+ __ByteArrayInstPtr(b)->ba_element[_idx] |= (0x80 >> (_x & 7));
}
RETURN( self );
}
@@ -546,11 +546,11 @@
for (_x2 = 0; _x2 < _w2; _x2++) {
_x1 = (int)( (double)_x2 / _mX);
- _byte = _ByteArrayInstPtr(b1)->ba_element[(_w1 + 7) / 8 * _y1 + (_x1 / 8)];
+ _byte = __ByteArrayInstPtr(b1)->ba_element[(_w1 + 7) / 8 * _y1 + (_x1 / 8)];
if ((_byte & (0x80 >> (_x1 % 8)))) {
_idx2 = (_w2 + 7) / 8 * _y2 + (_x2 / 8);
- _ByteArrayInstPtr(b2)->ba_element[_idx2] |= (0x80 >> (_x2 % 8));
+ __ByteArrayInstPtr(b2)->ba_element[_idx2] |= (0x80 >> (_x2 % 8));
}
}
}
@@ -604,8 +604,8 @@
&& __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);
+ srcP = __ByteArrayInstPtr(srcBytes)->ba_element - 1 + _intVal(srcStart);
+ dstP = __ByteArrayInstPtr(dstBytes)->ba_element - 1 + _intVal(dstStart);
_pixels = _intVal(w);
switch (_mag) {
@@ -736,5 +736,5 @@
!Depth1Image class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/Depth1Image.st,v 1.31 1997-04-24 15:53:42 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/Depth1Image.st,v 1.32 1998-02-05 14:19:50 cg Exp $'
! !
--- a/Depth24Image.st Thu Feb 05 12:54:05 1998 +0100
+++ b/Depth24Image.st Thu Feb 05 15:20:43 1998 +0100
@@ -820,7 +820,7 @@
%{
if (__isByteArray(_INST(bytes))) {
int sI = _intVal(srcIndex);
- unsigned char *cp = _ByteArrayInstPtr(_INST(bytes))->ba_element;
+ unsigned char *cp = __ByteArrayInstPtr(_INST(bytes))->ba_element;
r = __MKSMALLINT((cp[sI - 1] & _intVal(rMask)) + 1);
g = __MKSMALLINT((cp[sI] & _intVal(gMask)) + 1);
@@ -1116,8 +1116,8 @@
lShBlue = __intVal(shiftBlue);
int x, y, w;
- unsigned char *srcPtr = _ByteArrayInstPtr(_INST(bytes))->ba_element;
- unsigned char *dstPtr = _ByteArrayInstPtr(imageBits)->ba_element;
+ unsigned char *srcPtr = __ByteArrayInstPtr(_INST(bytes))->ba_element;
+ unsigned char *dstPtr = __ByteArrayInstPtr(imageBits)->ba_element;
w = __intVal(_INST(width));
if ((rShRed == 0) && (rShGreen == 0) && (rShBlue == 0)) {
@@ -1186,8 +1186,8 @@
lShBlue = __intVal(shiftBlue);
int x, y, w;
- unsigned char *srcPtr = _ByteArrayInstPtr(_INST(bytes))->ba_element;
- unsigned char *dstPtr = _ByteArrayInstPtr(imageBits)->ba_element;
+ unsigned char *srcPtr = __ByteArrayInstPtr(_INST(bytes))->ba_element;
+ unsigned char *dstPtr = __ByteArrayInstPtr(imageBits)->ba_element;
w = __intVal(_INST(width));
if ((rShRed == 0) && (rShGreen == 0) && (rShBlue == 0)) {
@@ -1260,8 +1260,8 @@
lShBlue = __intVal(shiftBlue);
int x, y, w;
- unsigned char *srcPtr = _ByteArrayInstPtr(_INST(bytes))->ba_element;
- unsigned char *dstPtr = _ByteArrayInstPtr(imageBits)->ba_element;
+ unsigned char *srcPtr = __ByteArrayInstPtr(_INST(bytes))->ba_element;
+ unsigned char *dstPtr = __ByteArrayInstPtr(imageBits)->ba_element;
w = __intVal(_INST(width));
if ((rShRed == 0) && (rShGreen == 0) && (rShBlue == 0)) {
@@ -2142,8 +2142,8 @@
mY := mY asFloat.
mX := mX asFloat.
%{
- REGISTER unsigned char *_dstP = _ByteArrayInstPtr(newBytes)->ba_element;
- unsigned char *_srcP = _ByteArrayInstPtr(_INST(bytes))->ba_element;
+ 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;
@@ -2203,8 +2203,8 @@
&& __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);
+ srcP = __ByteArrayInstPtr(srcBytes)->ba_element - 1 + _intVal(srcStart);
+ dstP = __ByteArrayInstPtr(dstBytes)->ba_element - 1 + _intVal(dstStart);
_pixels = _intVal(w);
while (_pixels--) {
@@ -2309,5 +2309,5 @@
!Depth24Image class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/Depth24Image.st,v 1.59 1998-01-20 23:28:29 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/Depth24Image.st,v 1.60 1998-02-05 14:20:05 cg Exp $'
! !
--- a/Depth2Image.st Thu Feb 05 12:54:05 1998 +0100
+++ b/Depth2Image.st Thu Feb 05 15:20:43 1998 +0100
@@ -423,8 +423,8 @@
&& __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);
+ srcP = __ByteArrayInstPtr(srcBytes)->ba_element - 1 + _intVal(srcStart);
+ dstP = __ByteArrayInstPtr(dstBytes)->ba_element - 1 + _intVal(dstStart);
_pixels = _intVal(w);
switch (_mag) {
@@ -532,5 +532,5 @@
!Depth2Image class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/Depth2Image.st,v 1.26 1997-07-18 22:41:29 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/Depth2Image.st,v 1.27 1998-02-05 14:20:20 cg Exp $'
! !
--- a/Depth4Image.st Thu Feb 05 12:54:05 1998 +0100
+++ b/Depth4Image.st Thu Feb 05 15:20:43 1998 +0100
@@ -545,8 +545,8 @@
&& __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);
+ srcP = __ByteArrayInstPtr(srcBytes)->ba_element - 1 + _intVal(srcStart);
+ dstP = __ByteArrayInstPtr(dstBytes)->ba_element - 1 + _intVal(dstStart);
_pixels = _intVal(w);
switch (_mag) {
@@ -665,5 +665,5 @@
!Depth4Image class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/Depth4Image.st,v 1.26 1997-07-21 16:07:37 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/Depth4Image.st,v 1.27 1998-02-05 14:20:24 cg Exp $'
! !
--- a/Depth8Image.st Thu Feb 05 12:54:05 1998 +0100
+++ b/Depth8Image.st Thu Feb 05 15:20:43 1998 +0100
@@ -107,7 +107,7 @@
_idx = (__intVal(w) * __intVal(y)) + __intVal(x);
if ((unsigned)_idx < __byteArraySize(b)) {
- _pix = _ByteArrayInstPtr(b)->ba_element[_idx];
+ _pix = __ByteArrayInstPtr(b)->ba_element[_idx];
RETURN( __MKSMALLINT(_pix) );
}
}
@@ -137,7 +137,7 @@
_idx = (__intVal(w) * __intVal(y)) + __intVal(x);
if ((unsigned)_idx < __byteArraySize(b)) {
- _ByteArrayInstPtr(b)->ba_element[_idx] = __intVal(aPixelValue);
+ __ByteArrayInstPtr(b)->ba_element[_idx] = __intVal(aPixelValue);
RETURN( self );
}
}
@@ -761,8 +761,8 @@
int r,p;
int x, y, w, h, nPix;
- unsigned char *srcPtr = _ByteArrayInstPtr(_INST(bytes))->ba_element;
- unsigned char *dstPtr = _ByteArrayInstPtr(imageBits)->ba_element;
+ unsigned char *srcPtr = __ByteArrayInstPtr(_INST(bytes))->ba_element;
+ unsigned char *dstPtr = __ByteArrayInstPtr(imageBits)->ba_element;
OBJ *ap = __ArrayInstPtr(colorValues)->a_element;
w = __intVal(_INST(width));
@@ -806,8 +806,8 @@
&& __isByteArray(imageBits)) {
int x, y, w, h, nPix;
- unsigned char *srcPtr = _ByteArrayInstPtr(_INST(bytes))->ba_element;
- unsigned char *dstPtr = _ByteArrayInstPtr(imageBits)->ba_element;
+ unsigned char *srcPtr = __ByteArrayInstPtr(_INST(bytes))->ba_element;
+ unsigned char *dstPtr = __ByteArrayInstPtr(imageBits)->ba_element;
OBJ *ap = __ArrayInstPtr(colorValues)->a_element;
w = __intVal(_INST(width));
@@ -849,8 +849,8 @@
int x, y, w, h, nPix;
int r,p;
- unsigned char *srcPtr = _ByteArrayInstPtr(_INST(bytes))->ba_element;
- unsigned char *dstPtr = _ByteArrayInstPtr(imageBits)->ba_element;
+ unsigned char *srcPtr = __ByteArrayInstPtr(_INST(bytes))->ba_element;
+ unsigned char *dstPtr = __ByteArrayInstPtr(imageBits)->ba_element;
OBJ *ap = __ArrayInstPtr(colorValues)->a_element;
w = __intVal(_INST(width));
@@ -896,8 +896,8 @@
int x, y, w, h, nPix;
int r,p;
- unsigned char *srcPtr = _ByteArrayInstPtr(_INST(bytes))->ba_element;
- unsigned char *dstPtr = _ByteArrayInstPtr(imageBits)->ba_element;
+ unsigned char *srcPtr = __ByteArrayInstPtr(_INST(bytes))->ba_element;
+ unsigned char *dstPtr = __ByteArrayInstPtr(imageBits)->ba_element;
OBJ *ap = __ArrayInstPtr(colorValues)->a_element;
w = __intVal(_INST(width));
@@ -1420,8 +1420,8 @@
mY := mY asFloat.
mX := mX asFloat.
%{
- unsigned char *__dstP = _ByteArrayInstPtr(newBytes)->ba_element;
- unsigned char *__srcP = _ByteArrayInstPtr(_INST(bytes))->ba_element;
+ unsigned char *__dstP = __ByteArrayInstPtr(newBytes)->ba_element;
+ unsigned char *__srcP = __ByteArrayInstPtr(_INST(bytes))->ba_element;
unsigned char *__srcRowP;
int __width = __intVal(_INST(width));
int __w = __intVal(newWidth) - 1;
@@ -1475,8 +1475,8 @@
&& __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);
+ srcP = __ByteArrayInstPtr(srcBytes)->ba_element - 1 + _intVal(srcStart);
+ dstP = __ByteArrayInstPtr(dstBytes)->ba_element - 1 + _intVal(dstStart);
_pixels = _intVal(w);
switch (_mag) {
@@ -1585,21 +1585,21 @@
int _h, _w;
int _patternOffset = 0;
- _srcP = _ByteArrayInstPtr(_INST(bytes))->ba_element;
- _dstP = _ByteArrayInstPtr(formBytes)->ba_element;
+ _srcP = __ByteArrayInstPtr(_INST(bytes))->ba_element;
+ _dstP = __ByteArrayInstPtr(formBytes)->ba_element;
for (_h = _intVal(h); _h; _h--) {
_last = -1;
for (_w = _intVal(w); _w; _w--) {
_v = *_srcP++;
if (_v != _last) {
- _patternBytes = _ArrayInstPtr(patterns)->a_element[_v];
+ _patternBytes = __ArrayInstPtr(patterns)->a_element[_v];
if (__isByteArray(_patternBytes)) {
- _patternBits = _ByteArrayInstPtr(_patternBytes)->ba_element[_patternOffset];
+ _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];
+ _p0 = __ByteArrayInstPtr(pixel0bytes)->ba_element[_v];
+ _p1 = __ByteArrayInstPtr(pixel1bytes)->ba_element[_v];
_last = _v;
}
_outBits <<= 1;
@@ -1688,22 +1688,22 @@
int _patternOffset = 0;
int _outCount;
- _srcP = _ByteArrayInstPtr(_INST(bytes))->ba_element;
- _dstP = _ByteArrayInstPtr(formBytes)->ba_element;
+ _srcP = __ByteArrayInstPtr(_INST(bytes))->ba_element;
+ _dstP = __ByteArrayInstPtr(formBytes)->ba_element;
for (_h = _intVal(h); _h; _h--) {
_last = -1;
_outCount = 0;
for (_w = _intVal(w); _w; _w--) {
_v = *_srcP++;
if (_v != _last) {
- _patternBytes = _ArrayInstPtr(patterns)->a_element[_v];
+ _patternBytes = __ArrayInstPtr(patterns)->a_element[_v];
if (__isByteArray(_patternBytes)) {
- _patternBits = _ByteArrayInstPtr(_patternBytes)->ba_element[_patternOffset];
+ _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];
+ _p0 = __ByteArrayInstPtr(pixel0bytes)->ba_element[_v];
+ _p1 = __ByteArrayInstPtr(pixel1bytes)->ba_element[_v];
_last = _v;
}
_outBits <<= 2;
@@ -1779,5 +1779,5 @@
!Depth8Image class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/Depth8Image.st,v 1.80 1998-01-22 13:04:42 tz Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/Depth8Image.st,v 1.81 1998-02-05 14:20:43 cg Exp $'
! !