Angus Leeming wrote:
> well could you send me rose.eps again. I deleted it because all seemed to be
> working fine. (Actually, I tested only the modification of the bottom left
> params, now I think about it.)
>
> Sorry about this,
no problem at all ...
here is a fix
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.48
diff -u -r1.48 ChangeLog
--- src/graphics/ChangeLog 8 Apr 2002 16:51:46 -0000 1.48
+++ src/graphics/ChangeLog 8 Apr 2002 18:42:15 -0000
@@ -1,3 +1,8 @@
+2002-04-08 Herbert Voss <[EMAIL PROTECTED]>
+
+ * GraphicsParams.C (c-tor): fix bug when lower left has negative
+ values
+
2002-04-08 Angus Leeming <[EMAIL PROTECTED]>
* GraphicsParams.C (c-tor): if clipping, then check the Bounding Box of
Index: src/graphics/GraphicsParams.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/graphics/GraphicsParams.C,v
retrieving revision 1.9
diff -u -r1.9 GraphicsParams.C
--- src/graphics/GraphicsParams.C 8 Apr 2002 16:51:46 -0000 1.9
+++ src/graphics/GraphicsParams.C 8 Apr 2002 18:42:15 -0000
@@ -38,16 +38,13 @@
// Get the original Bounding Box from the file
string const bb_orig_str = readBB_from_PSFile(filename);
if (!bb_orig_str.empty()) {
- BoundingBox bb_orig;
- bb_orig.xl = strToInt(token(bb_orig_str, ' ', 0));
- bb_orig.yb = strToInt(token(bb_orig_str, ' ', 1));
- bb_orig.xr = strToInt(token(bb_orig_str, ' ', 2));
- bb_orig.yt = strToInt(token(bb_orig_str, ' ', 3));
+ int const bb_orig_xl = strToInt(token(bb_orig_str, ' ', 0));
+ int const bb_orig_yb = strToInt(token(bb_orig_str, ' ', 1));
- bb.xl -= bb_orig.xl;
- bb.xr -= bb_orig.xl;
- bb.yb -= bb_orig.yb;
- bb.yt -= bb_orig.yb;
+ bb.xl = max(0, bb.xl - bb_orig_xl);
+ bb.xr = max(0, bb.xr - bb_orig_xl);
+ bb.yb = max(0, bb.yb - bb_orig_yb);
+ bb.yt = max(0, bb.yt - bb_orig_yb);
}
// Paranoia check.
