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 46845da6b3aff8c9f42bd2182d18b08ca61789fb..56937ad8cfc6fff8304b06527d1345a9460a3d1e 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -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>
 
        * insetgraphics.C, insettabular.C: s/wether/whether/g

diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C
index fe73b7ff06fffd99b30d67401a35ae57d9e3e5d6..34db409c60fb29faf7a97db0948d46e3c8acd18a 100644 (file)
--- 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)