Assume unknown formats are EPS, hacky solution before implementing a real one.

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

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 544f62fe65fb347c7001dc06b11cde0156c7541b..e0ce2691a849092eb20cf919714d13b20277efc0 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,10 @@
+2001-07-30  Baruch Even  <baruch@lyx.org>
+
+       * insetgraphics.C (decideOutputImageFormat): when doing postscript output
+       convert PNG/GIF/JPG to EPS, assume the rest are EPS already. 
+
+       HACKY! Will need to add an EPS detection routine like old InsetFig does!
+
 2001-07-30  Baruch Even  <baruch@lyx.org>
 
        * insetgraphics.C: Added EPSI to be an alias of EPS.

diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C
index 73644321168fdc19a44fb75e2a7b74eb4201d776..6333d45e8336e0fb7a8a68d1c04958463f3c024c 100644 (file)
--- a/src/insets/insetgraphics.C
+++ b/src/insets/insetgraphics.C
@@ -528,9 +528,11 @@ string decideOutputImageFormat(string const & in_fmt)
        }
 
        // If it's postscript, we always do eps.
-       if (in_fmt == "eps" || in_fmt == "epsi")
-               return in_fmt; // eps & epsi are both eps, but different extension.
-       return "eps";
+       // Garst has many eps files with various extensions, we just assume
+       // whatever goes in (except those we know to be otherwise) is eps
+       if (in_fmt == "gif" || in_fmt == "png" || in_fmt == "jpg")
+               return "eps";
+       return in_fmt;
 }
 
 } // Anon. namespace