--- a/GIFReader.st Fri Apr 04 19:18:18 2003 +0200
+++ b/GIFReader.st Fri Apr 04 19:26:11 2003 +0200
@@ -13,10 +13,9 @@
"{ Package: 'stx:libview2' }"
ImageReader subclass:#GIFReader
- instanceVariableNames:'redMap greenMap blueMap pass xpos ypos rowByteSize remainBitCount
- bufByte bufStream prefixTable suffixTable clearCode eoiCode
- freeCode codeSize maxCode interlace frameDelay iterationCount
- leftOffs topOffs'
+ instanceVariableNames:'pass xpos ypos rowByteSize remainBitCount bufByte bufStream
+ prefixTable suffixTable clearCode eoiCode freeCode codeSize
+ maxCode interlace frameDelay iterationCount leftOffs topOffs'
classVariableNames:'ImageSeparator Extension Terminator'
poolDictionaries:''
category:'Graphics-Images-Support'
@@ -293,25 +292,6 @@
!GIFReader methodsFor:'reading from file'!
-checkGreyscaleColormap
- "return true, if colormap is actually a greymap.
- Could be used to convert it into a greyScale image - which is not yet done."
-
- |sz "{ Class: SmallInteger }"
- redVal|
-
- sz := redMap size.
-
- 1 to:sz do:[:i |
- redVal := redMap at:i.
- redVal ~~ (greenMap at:i) ifTrue:[^ false].
- redVal ~~ (blueMap at:i) ifTrue:[^ false].
- ].
- ^ true
-
- "Modified: 2.5.1996 / 17:54:40 / cg"
-!
-
fromStream:aStream
"read a stream containing a GIF image (or an image sequence).
Leave image description in instance variables."
@@ -370,11 +350,7 @@
"get colorMap"
hasColorMap ifTrue:[
- self readColorMap:colorMapSize.
- fileColorMap := Colormap
- redVector:redMap
- greenVector:greenMap
- blueVector:blueMap.
+ fileColorMap := self readColorMap:colorMapSize.
].
colorMap := fileColorMap.
@@ -483,7 +459,8 @@
readColorMap:colorMapSize
"get gif colormap consisting of colorMapSize entries"
- |sz "{ Class: SmallInteger }"|
+ |sz "{ Class: SmallInteger }"
+ redMap greenMap blueMap|
redMap := ByteArray uninitializedNew:colorMapSize.
greenMap := ByteArray uninitializedNew:colorMapSize.
@@ -491,11 +468,16 @@
sz := colorMapSize.
1 to:sz do:[:i |
- redMap at:i put:(inStream nextByte).
- greenMap at:i put:(inStream nextByte).
- blueMap at:i put:(inStream nextByte)
+ redMap at:i put:(inStream nextByte).
+ greenMap at:i put:(inStream nextByte).
+ blueMap at:i put:(inStream nextByte)
].
+ ^ Colormap
+ redVector:redMap
+ greenVector:greenMap
+ blueVector:blueMap.
+
"Modified: 21.6.1996 / 12:32:43 / cg"
!
@@ -687,11 +669,7 @@
bitsPerPixel := (flag bitAnd:2r00000111) + 1.
colorMapSize := 1 bitShift:bitsPerPixel.
"overwrite colormap"
- self readColorMap:colorMapSize.
- colorMap := Colormap
- redVector:redMap
- greenVector:greenMap
- blueVector:blueMap.
+ colorMap := self readColorMap:colorMapSize.
].
@@ -1040,7 +1018,7 @@
!GIFReader class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview2/GIFReader.st,v 1.79 2003-03-02 18:41:31 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libview2/GIFReader.st,v 1.80 2003-04-04 17:25:46 cg Exp $'
! !
GIFReader initialize!