GTK graphics dialog: Default to scaling 100% when no scaling or size is given

[lyx.git] / src / converter.C

diff --git a/src/converter.C b/src/converter.C
index 79feb70ffeb02e61af370d81acdfb40f55b49592..1d5b67c19700e6184a836709c0ff96499763cabf 100644 (file)
--- a/src/converter.C
+++ b/src/converter.C
@@ -77,7 +77,7 @@ string const dvipdfm_options(BufferParams const & bp)
 {
        string result;
 
-       if (bp.papersize2 != VM_PAPER_CUSTOM) {
+       if (bp.papersize != PAPER_CUSTOM) {
                string const paper_size = bp.paperSizeName();
                if (paper_size != "b5" && paper_size != "foolscap")
                        result = "-p "+ paper_size;
@@ -294,7 +294,9 @@ bool Converters::convert(Buffer const * buffer,
                if (try_default) {
                        // if no special converter defined, then we take the
                        // default one from ImageMagic.
-                       string const from_ext = formats.extension(from_format);
+                       string const from_ext = from_format.empty() ?
+                               GetExtension(from_file) :
+                               formats.extension(from_format);
                        string const command =
                                "sh " +
                                QuoteName(LibFileSearch("scripts", "convertDefault.sh")) +
@@ -412,6 +414,9 @@ bool Converters::convert(Buffer const * buffer,
                                                << "renaming file " << outfile
                                                << " to " << real_outfile
                                                << endl;
+                               // Finally, don't forget to tell any future
+                               // converters to use the renamed file...
+                               outfile = real_outfile;
                        }
 
                        if (!conv.parselog.empty()) {