(Garst Reese): work-around xforms bug enabling the display of the edges

of an image.

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

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 8f69c1f7280e9be18e10b120f1a72cf11e436f3a..5245395960828411cfaa724b5e73d55bb8f47cc1 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,13 @@
+2002-10-21  Angus Leeming  <leeming@lyx.org>
+
+       * xformsImage.C (rotate): pass ints to flimage_rotate, fixing compiler
+       warning.
+
+2002-10-21  Garst Reese <reese@isn.net>
+
+       * xformsImage.C (getWidth): work-around xforms bug enabling the display
+       of the edges of an image.
+
 2002-10-21  Rob Lahaye  <lahaye@snu.ac.kr>
 
        * Tooltips.C (init): pass the /formatted/ string to xforms...

diff --git a/src/frontends/xforms/xformsImage.C b/src/frontends/xforms/xformsImage.C
index 8129e4bbe976ecd25d83dff4471304e0cad5ab3a..ff45269a31c8cd37fd65aa9334f3683428e25bd8 100644 (file)
--- a/src/frontends/xforms/xformsImage.C
+++ b/src/frontends/xforms/xformsImage.C
@@ -155,9 +155,9 @@ unsigned int xformsImage::getWidth() const
        if (!image_)
                return 0;
 
-       // Why, oh why do we need such hacks?
+       // Why, oh why, do we need such hacks?
        // Angus 12 July 2002
-       return image_->w + 2;
+       return image_->w + 4;
 }
 
 
@@ -310,7 +310,9 @@ void xformsImage::rotate(Params const & params)
                flimage_rotate(image_,  900, FLIMAGE_SUBPIXEL);
                flimage_rotate(image_, 1800, FLIMAGE_SUBPIXEL);
        } else {
-               flimage_rotate(image_, params.angle * 10, FLIMAGE_SUBPIXEL);
+               flimage_rotate(image_,
+                              int(params.angle * 10),
+                              FLIMAGE_SUBPIXEL);
        }
 }