please apply, also for 1.2.1
Herbert
--
http://www.lyx.org/help/
Index: src/graphics/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/ChangeLog,v
retrieving revision 1.98
diff -u -r1.98 ChangeLog
--- src/graphics/ChangeLog 17 Jul 2002 16:56:41 -0000 1.98
+++ src/graphics/ChangeLog 17 Jul 2002 17:04:17 -0000
@@ -1,3 +1,9 @@
+2002-06-17 Herbert Voss <[EMAIL PROTECTED]>
+
+ * GraphicsCachItem.C: (findTargetFormat) remove the speciell case
+ for old ps-files (Garst). It's no handled via defining a converter and
+ disabling the ps-support of xforms.
+
2002-07-17 Angus Leeming <[EMAIL PROTECTED]>
Be true to the Pimpl idiom, moving all signals into the respective
Index: src/graphics/GraphicsCacheItem.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/GraphicsCacheItem.C,v
retrieving revision 1.40
diff -u -r1.40 GraphicsCacheItem.C
--- src/graphics/GraphicsCacheItem.C 17 Jul 2002 16:56:42 -0000 1.40
+++ src/graphics/GraphicsCacheItem.C 17 Jul 2002 17:04:17 -0000
@@ -293,16 +293,8 @@
}
string from = getExtFromContents(filename);
- // Some old ps-files make problems, so we do not need direct
- // loading of an ps-file
- if (from == "ps") {
- lyxerr[Debug::GRAPHICS]
- << "\n\tThe file contains PostScript format data.\n"
- << "\tchanging it to eps-format to get it converted to xpm\n";
- from = "eps";
- } else
- lyxerr[Debug::GRAPHICS]
- << "\n\tThe file contains " << from << " format data." << endl;
+ lyxerr[Debug::GRAPHICS]
+ << "\n\tThe file contains " << from << " format data." << endl;
string const to = findTargetFormat(from);
if (from == to) {
