--- a/FaceReader.st	Fri Apr 04 19:18:18 2003 +0200
+++ b/FaceReader.st	Fri Apr 04 19:26:11 2003 +0200
@@ -10,6 +10,8 @@
  hereby transferred.
 "
 
+"{ Package: 'stx:libview2' }"
+
 ImageReader subclass:#FaceReader
 	instanceVariableNames:''
 	classVariableNames:''
@@ -83,8 +85,8 @@
 
 !FaceReader methodsFor:'reading from file'!
 
-fromStream:aStream
-    "read an image in my format from aStream"
+readImage
+    "read an image in my format from my inStream"
 
     |line 
      dstIndex "{ Class: SmallInteger }"
@@ -94,9 +96,7 @@
      val      "{ Class: SmallInteger }"
      inHeader s depth|
 
-    inStream := aStream.
-
-    line := aStream nextLine.
+    line := inStream nextLine.
     line isNil ifTrue:[
         ^ self fileFormatError:'short read'.
     ].
@@ -111,7 +111,7 @@
             depth := Number readFrom:s.
             inHeader := false.
         ].
-        line := aStream nextLine
+        line := inStream nextLine
     ].
 
     depth == 8 ifFalse:[
@@ -119,7 +119,7 @@
     ].
 
     [line isEmpty] whileTrue:[
-        line := aStream nextLine.
+        line := inStream nextLine.
     ].
 
     bytesPerRow := width * depth // 8.
@@ -138,7 +138,7 @@
             data at:dstIndex put:val.
             dstIndex := dstIndex - 1
         ].
-        line := aStream nextLine
+        line := inStream nextLine
     ].
     photometric := #blackIs0.
     samplesPerPixel := 1.
@@ -155,6 +155,7 @@
 !FaceReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/FaceReader.st,v 1.25 1998-02-03 16:52:33 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/FaceReader.st,v 1.26 2003-04-04 17:26:11 cg Exp $'
 ! !
+
 FaceReader initialize!