--- a/SunRasterReader.st	Tue Feb 03 18:00:06 1998 +0100
+++ b/SunRasterReader.st	Tue Feb 03 18:01:23 1998 +0100
@@ -165,8 +165,7 @@
         ^ self
     ].
     depth ~~ 1 ifTrue: [
-        'SUNReader [warning]: only depth 1 and 8 supported' errorPrintNL.
-        ^ nil
+        ^ self fileFormatError:'only depth 1 and 8 supported'.
     ].
 
     form := nil.
@@ -176,8 +175,7 @@
     data := ByteArray uninitializedNew:(imageWords * 2).
 
     (rasterType between: 0 and: 2) ifFalse: [
-        'SUNReader [warning]: Unknown raster file rasterType' errorPrintNL.
-        ^ nil
+        ^ self fileFormatError:'Unknown raster file rasterType'.
     ].
 
     (rasterType = 2)  ifFalse: [
@@ -219,7 +217,7 @@
      SunRasterReader fromStream:'bitmaps/bf.im8' asFilename readStream
     "
 
-    "Modified: 28.1.1997 / 12:02:49 / cg"
+    "Modified: / 3.2.1998 / 18:00:35 / cg"
 !
 
 fromSunIconStream:aStream 
@@ -233,26 +231,23 @@
     aStream text.
 
     (aStream skipThroughAll:'idth') isNil ifTrue: [
-        'SUNReader [warning]: Not a Sun Raster/Icon File' errorPrintNL.
-        ^nil
+        ^ self fileFormatError:'Not a Sun Raster/Icon File'.
     ].
     aStream next; skipSeparators. "skip $="
     width := Integer readFrom: aStream.
     (width isNil or:[width <= 0]) ifTrue: [
-        'SUNReader [warning]: format error (expected number)' errorPrintNL.
-        ^ nil
+        ^ self fileFormatError:'format error (expected number)'.
     ].
     w := width.
 
     (aStream skipThroughAll:'eight') isNil ifTrue: [
-        'SUNReader [warning]: format error (expected height)' errorPrintNL.
+        ^ self fileFormatError:'format error (expected height)'.
         ^ nil
     ].
     aStream next; skipSeparators. "skip $="
     height := Integer readFrom: aStream.
     (height isNil or:[height <= 0]) ifTrue: [
-        'SUNReader [warning]: format error (expected number)' errorPrintNL.
-        ^nil
+        ^ self fileFormatError:'format error (expected number)'.
     ].
     h := height.
 
@@ -268,20 +263,19 @@
             (aStream skipThroughAll:'0x') isNil ifTrue: [^ nil]. 
             word := Integer readFrom:aStream radix:16.
             word isNil ifTrue:[
-                'SUNReader [warning]: format error' errorPrintNL.
-                ^ nil
+                ^ self fileFormatError:'format error'.
             ].
             data at: (index := index + 1) put: (word bitShift:-8).
             data at: (index := index + 1) put: (word bitAnd:16rFF).
         ]
     ].
 
-    "Modified: 28.1.1997 / 12:03:09 / cg"
+    "Modified: / 3.2.1998 / 18:01:15 / cg"
 ! !
 
 !SunRasterReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/SunRasterReader.st,v 1.25 1997-06-30 20:56:11 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/SunRasterReader.st,v 1.26 1998-02-03 17:01:23 cg Exp $'
 ! !
 SunRasterReader initialize!