--- a/AVIReader.st	Tue Jun 24 16:18:59 1997 +0200
+++ b/AVIReader.st	Tue Jun 24 16:19:35 1997 +0200
@@ -145,28 +145,32 @@
 images
     "return a collection of all images as represented by myself"
 
-    |images image depth|
+    |image depth|
 
     depth := self bitsPerPixel.
+    1 to:imageSequence size do:[:i |
+        |frame|
 
-    images := OrderedCollection new.
-    frames do:[:aFrame |
-        image := (Image implementorForDepth:depth) new.
-        image 
-            width:width 
-            height:height
-            photometric:photometric
-            samplesPerPixel:samplesPerPixel
-            bitsPerSample:bitsPerSample
-            colorMap:colorMap
-            bits:aFrame
-            mask:mask.
-        images add:image.
+        frame := imageSequence at:i.
+
+        frame isImage ifFalse:[
+            image := (Image implementorForDepth:depth) new.
+            image 
+                width:width 
+                height:height
+                photometric:photometric
+                samplesPerPixel:samplesPerPixel
+                bitsPerSample:bitsPerSample
+                colorMap:colorMap
+                bits:frame
+                mask:mask.
+            imageSequence at:i put:image.
+        ].
     ].
-    ^ images
+    ^ imageSequence
 
-    "Modified: 20.6.1996 / 17:09:04 / cg"
     "Created: 4.4.1997 / 22:35:52 / cg"
+    "Modified: 24.6.1997 / 15:57:17 / cg"
 ! !
 
 !AVIReader methodsFor:'decoders'!
@@ -506,17 +510,13 @@
     samplesPerPixel := 1.
     bitsPerSample := #(8).
 
-    frames notNil ifTrue:[
-        data := frames at:1.
-    ]
-
     "
      AVIReader fromFile:'/home2/pd_stuff/movies/avi/drlair.avi'      
      AVIReader fromFile:'/home2/pd_stuff/movies/avi/hangldm.avi'      
     "
 
     "Created: 4.4.1997 / 22:35:53 / cg"
-    "Modified: 5.4.1997 / 14:34:54 / cg"
+    "Modified: 24.6.1997 / 15:58:29 / cg"
 ! !
 
 !AVIReader ignoredMethodsFor:'reading from stream'!
@@ -1455,6 +1455,6 @@
 !AVIReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/AVIReader.st,v 1.6 1997-06-24 13:40:23 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/AVIReader.st,v 1.7 1997-06-24 14:19:35 cg Exp $'
 ! !
 AVIReader initialize!