GIFReader.st
changeset 1745 4fa0fad2a463
parent 1739 971f1a3970a3
child 1755 f61db1006d4f
--- a/GIFReader.st	Thu Apr 10 13:21:46 2003 +0200
+++ b/GIFReader.st	Thu Apr 10 16:26:11 2003 +0200
@@ -18,7 +18,7 @@
 		maxCode interlace frameDelay iterationCount leftOffs topOffs'
 	classVariableNames:'ImageSeparator Extension Terminator'
 	poolDictionaries:''
-	category:'Graphics-Images-Support'
+	category:'Graphics-Images-Readers'
 !
 
 !GIFReader class methodsFor:'documentation'!
@@ -457,27 +457,31 @@
 !
 
 readColorMap:colorMapSize
-    "get gif colormap consisting of colorMapSize entries"
+    "get a gif colormap consisting of colorMapSize entries"
 
-    |sz "{ Class: SmallInteger }"
-     redMap greenMap blueMap|
+    |rgbVector|
 
-    redMap := ByteArray uninitializedNew:colorMapSize.
-    greenMap := ByteArray uninitializedNew:colorMapSize.
-    blueMap := ByteArray uninitializedNew:colorMapSize.
+    rgbVector := inStream nextBytes:colorMapSize*3.
+    ^ Colormap rgbVector:rgbVector 
 
-    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)
-    ].
-
-    ^ Colormap 
-        redVector:redMap 
-        greenVector:greenMap 
-        blueVector:blueMap.
-
+"/    |sz "{ Class: SmallInteger }"
+"/     redMap greenMap blueMap|
+"/
+"/    redMap := ByteArray uninitializedNew:colorMapSize.
+"/    greenMap := ByteArray uninitializedNew:colorMapSize.
+"/    blueMap := ByteArray uninitializedNew:colorMapSize.
+"/
+"/    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)
+"/    ].
+"/
+"/    ^ Colormap 
+"/        redVector:redMap 
+"/        greenVector:greenMap 
+"/        blueVector:blueMap.
     "Modified: 21.6.1996 / 12:32:43 / cg"
 !
 
@@ -1018,7 +1022,7 @@
 !GIFReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/GIFReader.st,v 1.80 2003-04-04 17:25:46 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/GIFReader.st,v 1.81 2003-04-10 14:25:47 cg Exp $'
 ! !
 
 GIFReader initialize!