ImageReader.st
changeset 2082 e9dbcef26c9a
parent 2080 5361e4ffaaaf
child 2152 b071479dac57
--- a/ImageReader.st	Wed Apr 01 14:44:00 1998 +0200
+++ b/ImageReader.st	Wed Apr 01 15:07:15 1998 +0200
@@ -1729,13 +1729,24 @@
      If my file contained multiple images, return the first one."
 
     imageSequence size > 0 ifTrue:[
-        ^  self images first.
+        ^ self images first.
     ].
 
     ^ self makeImage.
 
     "Modified: / 15.1.1998 / 15:46:24 / stefan"
-    "Modified: / 1.4.1998 / 14:09:59 / cg"
+    "Modified: / 1.4.1998 / 14:31:35 / cg"
+!
+
+imageFrames
+    "return a collection of all imageFrames as represented by myself.
+     ImageFrames are wrappers for individual images, which hold
+     additional information (such as image delay time).
+     Nil is return for single image formats/files."
+
+    ^ imageSequence
+
+    "Created: / 1.4.1998 / 14:37:42 / cg"
 !
 
 images
@@ -1749,21 +1760,22 @@
     |img|
 
     imageSequence notNil ifTrue:[
-	^ imageSequence
+        ^ (imageSequence collect:[:aFrame | aFrame image])
     ].
 
-    img := self image.
+    img := self makeImage.
     img isNil ifTrue:[
-	^ img
+        ^ img
     ].
     ^ Array with:img
 
-    "Modified: 24.6.1997 / 15:35:40 / cg"
+    "Modified: / 1.4.1998 / 14:36:23 / cg"
 !
 
 makeImage
-    "return the image as represented by myself;
-     If my file contained multiple images, return the first one."
+    "return the image as represented by the values found in my
+     instvars; these have been typically set as a side effect of
+     the fromStream:-method, which reads images."
 
     |image depth|
 
@@ -1782,11 +1794,16 @@
         colorMap:colorMap
         bits:data
         mask:mask.
+
+    imageSequence notNil ifTrue:[
+        image imageSequence:imageSequence.
+    ].
+
     ^ image
 
-    "Modified: / 3.11.1997 / 14:55:00 / cg"
     "Modified: / 15.1.1998 / 15:46:24 / stefan"
     "Created: / 1.4.1998 / 14:09:45 / cg"
+    "Modified: / 1.4.1998 / 14:41:35 / cg"
 !
 
 mask
@@ -1968,5 +1985,5 @@
 !ImageReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/ImageReader.st,v 1.63 1998-04-01 12:10:12 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/ImageReader.st,v 1.64 1998-04-01 13:07:15 cg Exp $'
 ! !