FLIReader.st
changeset 620 6a4214e29c86
parent 615 1f5b783f9c08
child 621 7df3678991c1
--- a/FLIReader.st	Tue Jun 24 15:39:39 1997 +0200
+++ b/FLIReader.st	Tue Jun 24 15:40:35 1997 +0200
@@ -12,7 +12,7 @@
 
 
 ImageReader subclass:#FLIReader
-	instanceVariableNames:'frames nframes frameBuffer frameBufferSize imageBuffer redPalette
+	instanceVariableNames:'nframes frameBuffer frameBufferSize imageBuffer redPalette
 		greenPalette bluePalette flags frameDelay'
 	classVariableNames:'FLI_FILE_MAGIC FLC_FILE_MAGIC FLI_FRAME_MAGIC FILE_HEAD_SIZE
 		FRAME_HEAD_SIZE CHUNK_HEAD_SIZE FLI_256_COLOR FLI_DELTA FLI_COLOR
@@ -194,13 +194,6 @@
     "Created: 4.4.1997 / 21:59:02 / cg"
 !
 
-hasMultipleImages
-    ^ frames size > 1
-
-    "Created: 4.4.1997 / 21:39:25 / cg"
-    "Modified: 4.4.1997 / 21:42:59 / cg"
-!
-
 images
     "return a collection of all images as represented by myself"
 
@@ -209,7 +202,7 @@
     depth := self bitsPerPixel.
 
     images := OrderedCollection new.
-    frames do:[:aFrame |
+    imageSequence do:[:aFrame |
         image := (Image implementorForDepth:depth) new.
         image 
             width:width 
@@ -224,8 +217,8 @@
     ].
     ^ images
 
-    "Modified: 20.6.1996 / 17:09:04 / cg"
     "Created: 4.4.1997 / 21:44:44 / cg"
+    "Modified: 24.6.1997 / 15:31:14 / cg"
 ! !
 
 !FLIReader methodsFor:'processing chunks'!
@@ -264,13 +257,13 @@
         lineIdx := nextLineIdx
     ].
 
-    frames add:imageBuffer.
+    imageSequence add:imageBuffer.
 
     "
      FLIReader imagesFromFile:'/usr/local/FLI/jeffmild.fli'      
     "
 
-    "Modified: 4.4.1997 / 22:45:37 / cg"
+    "Modified: 24.6.1997 / 15:31:22 / cg"
 !
 
 color256ChunkAt:chunkOffs
@@ -350,7 +343,7 @@
 
     0 to:height-1 do:[:row |
         lineCnt >= lines ifTrue:[
-            frames add:imageBuffer.
+            imageSequence add:imageBuffer.
             ^ self
         ].
 
@@ -378,9 +371,9 @@
         ].
         lineIdx := lineIdx + width
     ].
-    frames add:imageBuffer.
+    imageSequence add:imageBuffer.
 
-    "Modified: 4.4.1997 / 22:46:15 / cg"
+    "Modified: 24.6.1997 / 15:31:25 / cg"
 !
 
 processChunks:nchunks size:dataLen
@@ -457,13 +450,11 @@
     samplesPerPixel := 1.
     bitsPerSample := #(8).
 
-    data := frames at:1.
-
     "
      FLIReader fromFile:'/usr/local/FLI/jeffmild.fli'      
     "
 
-    "Modified: 21.4.1997 / 21:14:29 / cg"
+    "Modified: 24.6.1997 / 15:32:20 / cg"
 !
 
 getFrame
@@ -550,7 +541,7 @@
     greenPalette := ByteArray new:256.
     bluePalette := ByteArray new:256.
 
-    frames := OrderedCollection new:nframes.
+    imageSequence := OrderedCollection new:nframes.
 
     ^ true
 
@@ -560,12 +551,12 @@
     "
 
     "Created: 3.4.1997 / 22:09:12 / cg"
-    "Modified: 4.4.1997 / 22:45:20 / cg"
+    "Modified: 24.6.1997 / 15:31:39 / cg"
 ! !
 
 !FLIReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/FLIReader.st,v 1.7 1997-06-21 16:24:35 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/FLIReader.st,v 1.8 1997-06-24 13:40:35 cg Exp $'
 ! !
 FLIReader initialize!