]> git.lyx.org Git - features.git/commitdiff
Enable the graphics converter to copy with identical in and out file names.
authorGeorg Baum <georg.baum@post.rwth-aachen.de>
Sun, 22 Jan 2012 14:08:53 +0000 (14:08 +0000)
committerGeorg Baum <georg.baum@post.rwth-aachen.de>
Sun, 22 Jan 2012 14:08:53 +0000 (14:08 +0000)
This is already supported in Converters::convert() and needed e.g. for
eps2->eps conversion.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40649 a592a061-630c-0410-9148-cb99ea01b6c8

src/graphics/GraphicsConverter.cpp

index e3386f13ead0455f5b7d3911f8daf9b8909e8803..ccfb57ce4b4a02f9dfa3a1507713de677856987c 100644 (file)
@@ -356,6 +356,12 @@ static void build_script(string const & from_file,
                                  subst(conv.result_file,
                                        token_base, onlyFileName(infile_base)));
 
+               // If two formats share the same extension we may get identical names
+               if (outfile == infile && conv.result_file.empty()) {
+                       string const new_base = FileName::tempName(tmp).toFilesystemEncoding();
+                       outfile = addExtension(new_base, conv.To->extension());
+               }
+
                // Store these names in the python script
                script << "infile = "
                                << quoteName(infile, quote_python) << "\n"