+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
2004-06-18 Georg Baum <Georg.Baum@post.rwth-aachen.de>
* insetgraphics.C, insettabular.C: s/wether/whether/g
// This is necessary for DVI export.
string const temp_path = m_buffer->temppath();
// 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;
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.
// a relative filename should be relative to the master
// buffer.
// Do we need to perform the conversion?
// Yes if to_file does not exist or if temp_file is newer than to_file
// 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)
lyxerr[Debug::GRAPHICS]
<< bformat(_("No conversion of %1$s is needed after all"),
rel_file)