From: Georg Baum Date: Tue, 22 Jun 2004 15:26:55 +0000 (+0000) Subject: fix graphics inset bug (see ChangeLog) X-Git-Tag: 1.6.10~15166 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=451b1bb3387bcf9f3f479667de7e55a39f3fe815;p=features.git fix graphics inset bug (see ChangeLog) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8820 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index 46845da6b3..56937ad8cf 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,12 @@ +2004-06-22 Georg Baum + + * 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 * insetgraphics.C, insettabular.C: s/wether/whether/g diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C index fe73b7ff06..34db409c60 100644 --- a/src/insets/insetgraphics.C +++ b/src/insets/insetgraphics.C @@ -455,16 +455,12 @@ string const InsetGraphics::prepareFile(Buffer const & buf, // This is necessary for DVI export. string const temp_path = m_buffer->temppath(); - bool conversion_needed = true; - CopyStatus status; boost::tie(status, temp_file) = copyToDirIfNeeded(orig_file, temp_path, zipped); if (status == FAILURE) return orig_file; - else if (status == IDENTICAL_CONTENTS) - conversion_needed = false; // a relative filename should be relative to the master // buffer. @@ -551,8 +547,7 @@ string const InsetGraphics::prepareFile(Buffer const & buf, // Do we need to perform the conversion? // Yes if to_file does not exist or if temp_file is newer than to_file - if (!conversion_needed || - compare_timestamps(temp_file, to_file) < 0) { + if (compare_timestamps(temp_file, to_file) < 0) { lyxerr[Debug::GRAPHICS] << bformat(_("No conversion of %1$s is needed after all"), rel_file)