SunRasterReader.st
changeset 11 1d0df18a7049
parent 5 4d55b551dc57
child 16 42d4754a035f
--- a/SunRasterReader.st	Sat Dec 11 02:31:47 1993 +0100
+++ b/SunRasterReader.st	Sat Dec 11 02:33:46 1993 +0100
@@ -24,7 +24,7 @@
 
 this class provides methods for loading Sun Raster file images
 
-$Header: /cvs/stx/stx/libview2/SunRasterReader.st,v 1.3 1993-10-13 00:46:33 claus Exp $
+$Header: /cvs/stx/stx/libview2/SunRasterReader.st,v 1.4 1993-12-11 01:33:32 claus Exp $
 written Summer 91 by claus
 '!
 
@@ -35,7 +35,7 @@
 
     |inStream|
 
-    inStream := FileStream readonlyFileNamed:aFileName.
+    inStream := self streamReadingFile:aFileName.
     inStream isNil ifTrue:[^ false].
 
     "try sun raster"
@@ -80,11 +80,8 @@
       rMap gMap bMap mapLen
       bits a b c index|
 
-    inStream := FileStream readonlyFileNamed:aFilename.
-    inStream isNil ifTrue:[
-        'open error' printNewline. 
-        ^ nil
-    ].
+    inStream := self class streamReadingFile:aFilename.
+    inStream isNil ifTrue:[^ nil].
 
     inStream binary.
 
@@ -179,13 +176,8 @@
 fromSunIconFile: aFilename 
     | index word |
 
-    inStream := FileStream readonlyFileNamed:aFilename.
-    inStream isNil ifTrue:[
-        'open error' printNewline. 
-        ^ nil
-    ].
-
-    inStream text.
+    inStream := self class streamReadingFile:aFilename.
+    inStream isNil ifTrue:[^ nil].
 
     (inStream skipToAll: 'idth') isNil ifTrue: [
         'Not a Sun Raster/Icon File' printNewline.