--- a/PBMReader.st	Tue Feb 03 17:55:44 1998 +0100
+++ b/PBMReader.st	Tue Feb 03 17:58:02 1998 +0100
@@ -178,9 +178,7 @@
     inStream text.
 
     inStream next == $P ifFalse:[
-        Image badImageFormatQuerySignal
-            raiseErrorString:'PBMReader [info]: not PNM format'.
-        ^nil
+        ^ self fileFormatError:'not PNM format'.
     ].
     pnmType := inStream next.
 
@@ -199,9 +197,7 @@
     (pnmType == $6) ifTrue: [
         ^ self readDepth24PPMStream:aStream
     ].
-    Image badImageFormatQuerySignal
-            raiseErrorString:'PBMReader [info]: No recognized PNM file format'.
-    ^ nil
+    ^ self fileFormatError:'No recognized PNM file format'.
 
     "
      PBMReader fromFile:'bitmaps/testimg.ppm'
@@ -210,7 +206,7 @@
     "
 
     "Created: / 3.2.1998 / 17:25:34 / cg"
-    "Modified: / 3.2.1998 / 17:31:24 / cg"
+    "Modified: / 3.2.1998 / 17:56:11 / cg"
 !
 
 readDepth1AsciiPBMStream:aStream 
@@ -221,17 +217,13 @@
     self skipPBMJunkOn:aStream.
     width := Integer readFrom:aStream.
     width > 0 ifFalse: [
-        Image badImageFormatQuerySignal
-            raiseErrorString:'PBMReader [info]: Invalid width'.
-        ^ nil
+        ^ self fileFormatError:'Invalid width'.
     ].
 
     self skipPBMJunkOn:aStream.
     height := Integer readFrom:aStream.
     height > 0 ifFalse: [
-        Image badImageFormatQuerySignal
-            raiseErrorString:'PBMReader [info]: Invalid height'.
-        ^ nil
+        ^ self fileFormatError:'Invalid height'.
     ].
 
     aStream nextLine "skipThrough: Character cr".
@@ -271,7 +263,7 @@
     bitsPerSample := #(1).
 
     "Created: / 3.2.1998 / 17:21:22 / cg"
-    "Modified: / 3.2.1998 / 17:32:07 / cg"
+    "Modified: / 3.2.1998 / 17:56:32 / cg"
 !
 
 readDepth1PBMStream:aStream 
@@ -282,17 +274,13 @@
     self skipPBMJunkOn:aStream.
     width := Integer readFrom:aStream onError:0.
     width > 0 ifFalse: [
-        Image badImageFormatQuerySignal
-            raiseErrorString:'PBMReader [info]: Invalid width'.
-        ^ nil
+        ^ self fileFormatError:'Invalid width'.
     ].
 
     self skipPBMJunkOn:aStream.
     height := Integer readFrom:aStream onError:0.
     height > 0 ifFalse: [
-        Image badImageFormatQuerySignal
-            raiseErrorString:'PBMReader [info]: Invalid height'.
-        ^ nil
+        ^ self fileFormatError:'Invalid height'.
     ].
 
     aStream nextLine "skipThrough: Character cr".
@@ -312,7 +300,7 @@
     bitsPerSample := #(1).
 
     "Created: / 3.2.1998 / 17:21:37 / cg"
-    "Modified: / 3.2.1998 / 17:32:24 / cg"
+    "Modified: / 3.2.1998 / 17:56:59 / cg"
 !
 
 readDepth24AsciiPBMStream:aStream
@@ -326,25 +314,19 @@
     self skipPBMJunkOn:aStream.
     width := Integer readFrom:aStream.
     width > 0 ifFalse: [
-        Image badImageFormatQuerySignal
-            raiseErrorString:'PBMReader [info]: Invalid width'.
-        ^ nil
+        ^ self fileFormatError:'Invalid width'.
     ].
 
     self skipPBMJunkOn:aStream.
     height := Integer readFrom:aStream.
     height > 0 ifFalse: [
-        Image badImageFormatQuerySignal
-            raiseErrorString:'PBMReader [info]: Invalid height'.
-        ^ nil
+        ^ self fileFormatError:'Invalid height'.
     ].
 
     self skipPBMJunkOn:aStream.
     maxval := Integer readFrom:aStream.
     maxval >= 256 ifTrue: [
-        Image badImageFormatQuerySignal
-            raiseErrorString:'PBMReader [info]: format error'.
-        ^ nil
+        ^ self fileFormatError:'Invalid format'.
     ].
 
     aStream skipThrough: Character cr.
@@ -367,7 +349,7 @@
     bitsPerSample := #(8 8 8).
 
     "Created: / 3.2.1998 / 17:21:55 / cg"
-    "Modified: / 3.2.1998 / 17:32:48 / cg"
+    "Modified: / 3.2.1998 / 17:57:30 / cg"
 !
 
 readDepth24PPMStream:aStream
@@ -378,25 +360,19 @@
     self skipPBMJunkOn:aStream.
     width := Integer readFrom:aStream.
     width > 0 ifFalse: [
-        Image badImageFormatQuerySignal
-            raiseErrorString:'PBMReader [info]: Invalid width'.
-        ^ nil
+        ^ self fileFormatError:'Invalid width'.
     ].
 
     self skipPBMJunkOn:aStream.
     height := Integer readFrom:aStream.
     height > 0 ifFalse: [
-        Image badImageFormatQuerySignal
-            raiseErrorString:'PBMReader [info]: Invalid height'.
-        ^ nil
+        ^ self fileFormatError:'Invalid height'.
     ].
 
     self skipPBMJunkOn:aStream.
     maxval := Integer readFrom:aStream.
     maxval >= 256 ifTrue: [
-        Image badImageFormatQuerySignal
-            raiseErrorString:'PBMReader [info]: format error'.
-        ^ nil
+        ^ self fileFormatError:'Invalid format'.
     ].
 
     aStream skipThrough: Character cr.
@@ -411,7 +387,7 @@
     bitsPerSample := #(8 8 8).
 
     "Created: / 3.2.1998 / 17:22:18 / cg"
-    "Modified: / 3.2.1998 / 17:33:10 / cg"
+    "Modified: / 3.2.1998 / 17:57:26 / cg"
 !
 
 readDepth8PGMStream:aStream 
@@ -422,23 +398,17 @@
     self skipPBMJunkOn:aStream.
     width := Integer readFrom:aStream.
     width > 0 ifFalse:[ 
-        Image badImageFormatQuerySignal
-            raiseErrorString:'PBMReader [info]: Invalid width'.
-        ^ nil
+        ^ self fileFormatError:'Invalid width'.
     ].
     self skipPBMJunkOn:aStream.
     height := Integer readFrom:aStream.
     height > 0 ifFalse:[ 
-        Image badImageFormatQuerySignal
-            raiseErrorString:'PBMReader [info]: Invalid height'.
-        ^ nil
+        ^ self fileFormatError:'Invalid height'.
     ].
     self skipPBMJunkOn:aStream.
     maxval := Integer readFrom:aStream.
     maxval >= 256 ifTrue:[
-        Image badImageFormatQuerySignal
-            raiseErrorString:'PBMReader [info]: Invalid format'.
-        ^ nil
+        ^ self fileFormatError:'Invalid format'.
     ].
     aStream nextLine "skipThrough: Character cr".
 
@@ -451,7 +421,7 @@
     samplesPerPixel := 1.
     bitsPerSample := #(8).
 
-    "Modified: / 3.2.1998 / 17:33:29 / cg"
+    "Modified: / 3.2.1998 / 17:57:21 / cg"
 ! !
 
 !PBMReader methodsFor:'writing to file'!
@@ -633,6 +603,6 @@
 !PBMReader class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/PBMReader.st,v 1.32 1998-02-03 16:34:22 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/PBMReader.st,v 1.33 1998-02-03 16:58:02 cg Exp $'
 ! !
 PBMReader initialize!