From: Angus Leeming <leeming@lyx.org>
Date: Mon, 13 Jan 2003 23:03:48 +0000 (+0000)
Subject: Re-define the catch-all conversion format from XPM to PPM, although
X-Git-Tag: 1.6.10~17693
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=1106989d3614c4078e9b34966e415e2ae0f192b6;p=features.git

Re-define the catch-all conversion format from XPM to PPM, although
personally I'm still of the opinion that people too lazy to define
their own get what they deserve ;-)


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

diff --git a/src/graphics/ChangeLog b/src/graphics/ChangeLog
index 8d2f872793..149786ec3d 100644
--- a/src/graphics/ChangeLog
+++ b/src/graphics/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-13  Angus Leeming  <leeming@lyx.org>
+
+	* GraphicsCacheItem.C (findTargetFormat): define the default conversion
+	format to be PPM not XPM.
+
 2002-12-17  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
 	* Makefile.am (EXTRA_DIST): remove variable 
diff --git a/src/graphics/GraphicsCacheItem.C b/src/graphics/GraphicsCacheItem.C
index 04646d3837..af6b3e4ff5 100644
--- a/src/graphics/GraphicsCacheItem.C
+++ b/src/graphics/GraphicsCacheItem.C
@@ -343,9 +343,9 @@ string const findTargetFormat(string const & from)
 				<< " to " << *it << std::endl;
 	}
 
-	// Failed! so we have to try to convert it to XPM format
+	// Failed! so we have to try to convert it to PPM format
 	// with the standard converter
-	return string("xpm");
+	return string("ppm");
 }
 
 } // anon namespace