anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Martin's convertDefault patch. Remove lyxpreview2xpm cruft.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5192 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2002-09-03 11:55:22 +00:00
parent 036147ebfa
commit ae50323b0b
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/graphics/ChangeLog
View File

@ -1,3 +1,12 @@
2002-09-03 Angus Leeming <leeming@lyx.org>
* GraphicsConverter.C (Impl c-tor): remove lyxpreview2xpm cruft.
2002-09-03 Martin Vermeer <martin.vermeer@hut.fi>
* GraphicsConverter.C (Impl c-tor): "hide" crash by prefixing
convertDefault command with "sh ".
2002-08-28 Rob Lahaye <lahaye@snu.ac.kr>
* GraphicsImage.C: small style fix to width/height setting.

32
src/graphics/GraphicsConverter.C
View File

@ -134,33 +134,25 @@ Converter::Impl::Impl(string const & from_file, string const & to_file_base,
<< "\n\tfrom_format: " << from_format
<< "\n\tto_format: " << to_format << endl;
// The converted image is to be stored in this file
to_file_ = ChangeExtension(to_file_base, formats.extension(to_format));
// The conversion commands are stored in a stringstream
ostringstream script;
script << "#!/bin/sh\n";
bool const success = build_script(from_file, to_file_base,
from_format, to_format, script);
// The converted image is to be stored in this file
to_file_ = ChangeExtension(to_file_base, formats.extension(to_format));
if (!success) {
script_file_ = string();
if (from_format == "lyxpreview") {
script_command_ =
LibFileSearch("scripts", "lyxpreview2xpm.sh")
+ " " +from_file + " " + to_file_;
lyxerr[Debug::GRAPHICS]
<< "\tI use lyxpreview2xpm for the conversion\n\t"
<< script_command_ << endl;
} else {
script_command_ =
LibFileSearch("scripts", "convertDefault.sh") +
' ' + from_format + ':' + from_file + ' ' +
to_format + ':' + to_file_;
lyxerr[Debug::GRAPHICS]
<< "\tNo converter defined! I use convertDefault.sh\n\t"
<< script_command_ << endl;
}
script_command_ =
"sh " + LibFileSearch("scripts", "convertDefault.sh") +
' ' + from_format + ':' + from_file + ' ' +
to_format + ':' + to_file_;
lyxerr[Debug::GRAPHICS]
<< "\tNo converter defined! I use convertDefault.sh\n\t"
<< script_command_ << endl;
} else {
lyxerr[Debug::GRAPHICS] << "\tConversion script:"