From: Dekel Tsur <dekelts@tau.ac.il>
Date: Tue, 27 Mar 2001 10:50:24 +0000 (+0000)
Subject: Fix figinset for the case when the filename doesn't contain a suffix.
X-Git-Tag: 1.6.10~21393
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=cdb40c285b5ce2155fff1711900c67c3ce631592;p=lyx.git

Fix figinset for the case when the filename doesn't contain a suffix.


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

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index f684408326..c3fae2ce3b 100644
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,9 @@
+2001-03-27  Dekel Tsur  <dekelts@tau.ac.il>
+
+	* figinset.C (GetPSSizes): Fix for the case when filename doesn't
+ 	contain a suffix.
+	(Clone): ditto
+
 2001-03-26  Juergen Vigna  <jug@sad.it>
 
 	* lyxinset.h: added ShowInsetDialog() function in UpdatableInset.
diff --git a/src/insets/figinset.C b/src/insets/figinset.C
index 125538ba42..4b2dcb936b 100644
--- a/src/insets/figinset.C
+++ b/src/insets/figinset.C
@@ -1255,12 +1255,15 @@ Inset * InsetFig::Clone(Buffer const & buffer) const
 	tmp->pswid = pswid;
 	tmp->pshgh = pshgh;
 	tmp->fname = fname;
-	if (!fname.empty() && IsFileReadable(fname) 
+	string lfname = fname;
+	if (!fname.empty() && GetExtension(fname).empty())
+		lfname += ".eps";
+	if (!fname.empty() && IsFileReadable(lfname) 
 	    && (flags & 3) && !lyxrc.ps_command.empty()
 	    && lyxrc.use_gui) { 
 		// do not display if there is
 		// "do not display" chosen (Matthias 260696)
-		tmp->figure->data = getfigdata(wid, hgh, fname, psx, psy,
+		tmp->figure->data = getfigdata(wid, hgh, lfname, psx, psy,
 					       pswid, pshgh, raw_wid, raw_hgh,
 					       angle, flags & (3|8));
 	} else tmp->figure->data = 0;
@@ -1553,7 +1556,10 @@ void InsetFig::GetPSSizes()
 
 	if (fname.empty()) return;
 	string p;
-	ifstream ifs(fname.c_str());
+	string lfname = fname;
+	if (GetExtension(fname).empty())
+		lfname += ".eps";
+	ifstream ifs(lfname.c_str());
 
 	if (!ifs) return;	// file not found !!!!