--- a/AbstractFileBrowser.st Thu May 22 10:00:31 2003 +0200
+++ b/AbstractFileBrowser.st Thu May 22 17:51:19 2003 +0200
@@ -4084,16 +4084,15 @@
!
convertImageToSuffix:outSuffix
- |image writer tempFileXPM chainOfConversions conversionStream skipSignal |
+ |image writer tempFileXPM chainOfConversions conversionStream skipSignal
+ inFile outFile eachConversionSuffixCommandPair doneWithThisFile
+ eachConversionSuffix eachConversionCommand tempFileTemplate|
"/ [
skipSignal := Signal new.
self withActivityIndicationDo:[
self currentFileNameHolder value do:[:fileName |
- |imageOrNil inFile outFile eachConversionSuffixCommandPair doneWithThisFile
- eachConversionSuffix eachConversionCommand tempFileTemplate|
-
skipSignal handle:[:ex | ]
do:[
|answer|
@@ -4113,15 +4112,14 @@
].
image := Image fromFile:fileName.
- image isNil ifTrue:[
- chainOfConversions := self conversionChainFrom:(fileName suffix) to:outSuffix.
- ] ifFalse:[
+ image notNil ifTrue:[
writer := MIMETypes imageReaderForSuffix:outSuffix.
(writer notNil and:[writer canRepresent:image]) ifTrue:[
writer save:image onFile:outFile.
skipSignal raise.
].
].
+ chainOfConversions := self conversionChainFrom:(fileName suffix) to:outSuffix.
chainOfConversions isNil ifTrue:[ skipSignal raise ].
conversionStream := chainOfConversions readStream.
@@ -4162,6 +4160,7 @@
with:(outFile pathName).
errOutput := '' writeStream.
+
(OperatingSystem executeCommand:command errorTo:errOutput)
ifFalse:[
Dialog warn:(
@@ -6179,5 +6178,5 @@
!AbstractFileBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.145 2003-05-19 13:40:59 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.146 2003-05-22 15:51:19 cg Exp $'
! !