common error reporting for format errors;
fixed a debugPrint.
--- a/Image.st Tue Feb 03 17:51:57 1998 +0100
+++ b/Image.st Tue Feb 03 18:35:22 1998 +0100
@@ -1193,7 +1193,13 @@
image notNil ifTrue:[^ image].
]
] ifFalse:[
- image := readerClass fromFile:name.
+ BadImageFormatQuerySignal handle:[:ex |
+ ex errorString infoPrintCR.
+ image := nil.
+ ex return.
+ ] do:[
+ image := readerClass fromFile:name.
+ ].
image notNil ifTrue:[^ image].
]
].
@@ -1221,7 +1227,7 @@
"/ 'IMAGE: unknown image file format: ' infoPrint. aFileName infoPrintNL.
^ ImageNotFoundQuerySignal
raiseRequestWith:aFileName
- errorString:('IMAGE [warning]: unknown image file format: ''' , aFileName , '''').
+ errorString:('IMAGE [warning]: unknown image file format: ''' , aFileName asFilename pathName , '''').
"
Image fromFile:'bitmaps/gifImages/claus.gif'
@@ -1256,7 +1262,7 @@
]
"
- "Modified: 30.6.1997 / 22:04:07 / cg"
+ "Modified: / 3.2.1998 / 17:03:51 / cg"
!
fromFile:aFileName on:aDevice
@@ -11264,6 +11270,6 @@
!Image class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/Image.st,v 1.237 1998-01-29 11:56:15 ca Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/Image.st,v 1.238 1998-02-03 17:35:22 cg Exp $'
! !
Image initialize!