--- a/ImageRdr.st Wed Jun 19 09:55:27 1996 +0200
+++ b/ImageRdr.st Fri Jun 21 11:54:17 1996 +0200
@@ -12,7 +12,7 @@
Object subclass:#ImageReader
instanceVariableNames:'width height data byteOrder inStream outStream photometric
- samplesPerPixel bitsPerSample colorMap'
+ samplesPerPixel bitsPerSample colorMap mask'
classVariableNames:'ReverseBits'
poolDictionaries:''
category:'Graphics-Images-Support'
@@ -967,7 +967,7 @@
%}
! !
-!ImageReader class methodsFor:'documentation'!
+!ImageReader class methodsFor:'documentation'!
copyright
"
@@ -1020,7 +1020,7 @@
"
! !
-!ImageReader class methodsFor:'cleanup'!
+!ImageReader class methodsFor:'cleanup'!
lowSpaceCleanup
"cleanup things we do not need"
@@ -1028,7 +1028,7 @@
ReverseBits := nil
! !
-!ImageReader class methodsFor:'constants'!
+!ImageReader class methodsFor:'constants'!
reverseBits
"return a table filled with bit reverse information.
@@ -1057,7 +1057,7 @@
^ ReverseBits
! !
-!ImageReader class methodsFor:'decompression support'!
+!ImageReader class methodsFor:'decompression support'!
decodeDelta:step in:data width:width height:height
"perform NeXT special predictor delta decoding inplace in data.
@@ -1239,7 +1239,7 @@
"Modified: 22.4.1996 / 19:14:54 / cg"
! !
-!ImageReader class methodsFor:'i/o support'!
+!ImageReader class methodsFor:'i/o support'!
streamReadingFile:aFilename
"return a stream to read aFilename.
@@ -1269,7 +1269,7 @@
"Modified: 7.3.1996 / 19:18:04 / cg"
! !
-!ImageReader class methodsFor:'image reading'!
+!ImageReader class methodsFor:'image reading'!
fromFile:aFileName
"read an image (in my format) from aFileName.
@@ -1309,7 +1309,7 @@
"Modified: 22.4.1996 / 19:11:58 / cg"
! !
-!ImageReader class methodsFor:'image writing'!
+!ImageReader class methodsFor:'image writing'!
save:anImage onFile:aFileName
"save the image in my format on aFileName"
@@ -1317,7 +1317,7 @@
^ (self basicNew) save:anImage onFile:aFileName
! !
-!ImageReader class methodsFor:'testing'!
+!ImageReader class methodsFor:'testing'!
canRepresent:anImage
"return true, if anImage can be represented in my file format.
@@ -1388,10 +1388,20 @@
samplesPerPixel:samplesPerPixel
bitsPerSample:bitsPerSample
colorMap:colorMap
- bits:data.
+ bits:data
+ mask:mask.
^ image
- "Modified: 23.4.1996 / 11:07:04 / cg"
+ "Modified: 20.6.1996 / 17:09:04 / cg"
+!
+
+mask
+ "return the image mask (or nil)"
+
+ ^ mask
+
+ "Modified: 22.4.1996 / 19:15:31 / cg"
+ "Created: 20.6.1996 / 17:08:29 / cg"
!
photometric
@@ -1482,8 +1492,8 @@
^ self subclassResponsibility
! !
-!ImageReader class methodsFor:'documentation'!
+!ImageReader class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/Attic/ImageRdr.st,v 1.30 1996-05-10 16:44:54 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/Attic/ImageRdr.st,v 1.31 1996-06-21 09:54:17 cg Exp $'
! !
--- a/ImageReader.st Wed Jun 19 09:55:27 1996 +0200
+++ b/ImageReader.st Fri Jun 21 11:54:17 1996 +0200
@@ -12,7 +12,7 @@
Object subclass:#ImageReader
instanceVariableNames:'width height data byteOrder inStream outStream photometric
- samplesPerPixel bitsPerSample colorMap'
+ samplesPerPixel bitsPerSample colorMap mask'
classVariableNames:'ReverseBits'
poolDictionaries:''
category:'Graphics-Images-Support'
@@ -967,7 +967,7 @@
%}
! !
-!ImageReader class methodsFor:'documentation'!
+!ImageReader class methodsFor:'documentation'!
copyright
"
@@ -1020,7 +1020,7 @@
"
! !
-!ImageReader class methodsFor:'cleanup'!
+!ImageReader class methodsFor:'cleanup'!
lowSpaceCleanup
"cleanup things we do not need"
@@ -1028,7 +1028,7 @@
ReverseBits := nil
! !
-!ImageReader class methodsFor:'constants'!
+!ImageReader class methodsFor:'constants'!
reverseBits
"return a table filled with bit reverse information.
@@ -1057,7 +1057,7 @@
^ ReverseBits
! !
-!ImageReader class methodsFor:'decompression support'!
+!ImageReader class methodsFor:'decompression support'!
decodeDelta:step in:data width:width height:height
"perform NeXT special predictor delta decoding inplace in data.
@@ -1239,7 +1239,7 @@
"Modified: 22.4.1996 / 19:14:54 / cg"
! !
-!ImageReader class methodsFor:'i/o support'!
+!ImageReader class methodsFor:'i/o support'!
streamReadingFile:aFilename
"return a stream to read aFilename.
@@ -1269,7 +1269,7 @@
"Modified: 7.3.1996 / 19:18:04 / cg"
! !
-!ImageReader class methodsFor:'image reading'!
+!ImageReader class methodsFor:'image reading'!
fromFile:aFileName
"read an image (in my format) from aFileName.
@@ -1309,7 +1309,7 @@
"Modified: 22.4.1996 / 19:11:58 / cg"
! !
-!ImageReader class methodsFor:'image writing'!
+!ImageReader class methodsFor:'image writing'!
save:anImage onFile:aFileName
"save the image in my format on aFileName"
@@ -1317,7 +1317,7 @@
^ (self basicNew) save:anImage onFile:aFileName
! !
-!ImageReader class methodsFor:'testing'!
+!ImageReader class methodsFor:'testing'!
canRepresent:anImage
"return true, if anImage can be represented in my file format.
@@ -1388,10 +1388,20 @@
samplesPerPixel:samplesPerPixel
bitsPerSample:bitsPerSample
colorMap:colorMap
- bits:data.
+ bits:data
+ mask:mask.
^ image
- "Modified: 23.4.1996 / 11:07:04 / cg"
+ "Modified: 20.6.1996 / 17:09:04 / cg"
+!
+
+mask
+ "return the image mask (or nil)"
+
+ ^ mask
+
+ "Modified: 22.4.1996 / 19:15:31 / cg"
+ "Created: 20.6.1996 / 17:08:29 / cg"
!
photometric
@@ -1482,8 +1492,8 @@
^ self subclassResponsibility
! !
-!ImageReader class methodsFor:'documentation'!
+!ImageReader class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/ImageReader.st,v 1.30 1996-05-10 16:44:54 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/ImageReader.st,v 1.31 1996-06-21 09:54:17 cg Exp $'
! !