anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-27 06:19:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix graphics inset bug (see ChangeLog)

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8820 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2004-06-22 15:26:55 +00:00
parent e7d12d308e
commit 451b1bb338
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/insets/ChangeLog
View File

@ -1,3 +1,12 @@
2004-06-22 Georg Baum <Georg.Baum@post.rwth-aachen.de>
* insetgraphics.C (prepareFile): remove conversion_needed flag.
It made the following fail for a .eps graphics file:
1) view->ps
2) view->pdf (pdflatex)
because the .eps file was already in the temp dir when the pdflatex
export happened and therefore no .eps -> pdf conversion was done.
2004-06-18 Georg Baum <Georg.Baum@post.rwth-aachen.de> 2004-06-18 Georg Baum <Georg.Baum@post.rwth-aachen.de>
* insetgraphics.C, insettabular.C: s/wether/whether/g * insetgraphics.C, insettabular.C: s/wether/whether/g

7
src/insets/insetgraphics.C
View File

@ -455,16 +455,12 @@ string const InsetGraphics::prepareFile(Buffer const & buf,
// This is necessary for DVI export. // This is necessary for DVI export.
string const temp_path = m_buffer->temppath(); string const temp_path = m_buffer->temppath();
bool conversion_needed = true;
CopyStatus status; CopyStatus status;
boost::tie(status, temp_file) = boost::tie(status, temp_file) =
copyToDirIfNeeded(orig_file, temp_path, zipped); copyToDirIfNeeded(orig_file, temp_path, zipped);
if (status == FAILURE) if (status == FAILURE)
return orig_file; return orig_file;
else if (status == IDENTICAL_CONTENTS)
conversion_needed = false;
// a relative filename should be relative to the master // a relative filename should be relative to the master
// buffer. // buffer.
@ -551,8 +547,7 @@ string const InsetGraphics::prepareFile(Buffer const & buf,
// Do we need to perform the conversion? // Do we need to perform the conversion?
// Yes if to_file does not exist or if temp_file is newer than to_file // Yes if to_file does not exist or if temp_file is newer than to_file
if (!conversion_needed || if (compare_timestamps(temp_file, to_file) < 0) {
compare_timestamps(temp_file, to_file) < 0) {
lyxerr[Debug::GRAPHICS] lyxerr[Debug::GRAPHICS]
<< bformat(_("No conversion of %1$s is needed after all"), << bformat(_("No conversion of %1$s is needed after all"),
rel_file) rel_file)