--- a/Image.st Thu Feb 05 15:20:43 1998 +0100
+++ b/Image.st Thu Feb 05 15:22:39 1998 +0100
@@ -5701,7 +5701,7 @@
rgbP = __ByteArrayInstPtr(rgbBytes)->ba_element;
idP = __ByteArrayInstPtr(ditherIds)->ba_element;
__clrLookup = __ByteArrayInstPtr(clrLookup)->ba_element;
- errP = (short *) _ByteArrayInstPtr(error)->ba_element;
+ errP = (short *) __ByteArrayInstPtr(error)->ba_element;
/*
* clear error accumulator
@@ -6110,7 +6110,7 @@
__idxAndErrRBytes = __ByteArrayInstPtr(idxAndErrRBytes)->ba_element;
__idxAndErrGBytes = __ByteArrayInstPtr(idxAndErrGBytes)->ba_element;
__idxAndErrBBytes = __ByteArrayInstPtr(idxAndErrBBytes)->ba_element;
- errP = (short *) _ByteArrayInstPtr(error)->ba_element;
+ errP = (short *) __ByteArrayInstPtr(error)->ba_element;
eP = errP;
@@ -11270,6 +11270,6 @@
!Image class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/Image.st,v 1.238 1998-02-03 17:35:22 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/Image.st,v 1.239 1998-02-05 14:21:47 cg Exp $'
! !
Image initialize!
--- a/ImageRdr.st Thu Feb 05 15:20:43 1998 +0100
+++ b/ImageRdr.st Thu Feb 05 15:22:39 1998 +0100
@@ -1148,7 +1148,7 @@
%{
if (__isByteArray(data)
&& __bothSmallInteger(width, height)) {
- __decodeDelta__(_ByteArrayInstPtr(data)->ba_element,
+ __decodeDelta__(__ByteArrayInstPtr(data)->ba_element,
_intVal(width), _intVal(height));
RETURN ( self );
}
@@ -1165,8 +1165,8 @@
if (__isByteArray(srcBytes)
&& __isByteArray(dstBytes)
&& __bothSmallInteger(offset, count)) {
- if (__decodeCCITTgroup3__(_ByteArrayInstPtr(srcBytes)->ba_element,
- _ByteArrayInstPtr(dstBytes)->ba_element
+ if (__decodeCCITTgroup3__(__ByteArrayInstPtr(srcBytes)->ba_element,
+ __ByteArrayInstPtr(dstBytes)->ba_element
+ _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.60 1998-02-03 16:51:57 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/Attic/ImageRdr.st,v 1.61 1998-02-05 14:22:39 cg Exp $'
! !
--- a/ImageReader.st Thu Feb 05 15:20:43 1998 +0100
+++ b/ImageReader.st Thu Feb 05 15:22:39 1998 +0100
@@ -1148,7 +1148,7 @@
%{
if (__isByteArray(data)
&& __bothSmallInteger(width, height)) {
- __decodeDelta__(_ByteArrayInstPtr(data)->ba_element,
+ __decodeDelta__(__ByteArrayInstPtr(data)->ba_element,
_intVal(width), _intVal(height));
RETURN ( self );
}
@@ -1165,8 +1165,8 @@
if (__isByteArray(srcBytes)
&& __isByteArray(dstBytes)
&& __bothSmallInteger(offset, count)) {
- if (__decodeCCITTgroup3__(_ByteArrayInstPtr(srcBytes)->ba_element,
- _ByteArrayInstPtr(dstBytes)->ba_element
+ if (__decodeCCITTgroup3__(__ByteArrayInstPtr(srcBytes)->ba_element,
+ __ByteArrayInstPtr(dstBytes)->ba_element
+ _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.60 1998-02-03 16:51:57 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/ImageReader.st,v 1.61 1998-02-05 14:22:39 cg Exp $'
! !