From: Angus Leeming Date: Tue, 25 Mar 2003 18:10:10 +0000 (+0000) Subject: Cure some compiler warnings. X-Git-Tag: 1.6.10~17175 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=37e2388f8e107ef86c0a9a530dd5b271ac969c0b;p=features.git Cure some compiler warnings. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6574 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 0e7b57f16e..5f24bcc840 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,7 @@ +2003-03-25 Angus Leeming + + * xformsImage.C (clip): cure compiler warnings. + 2003-03-24 Angus Leeming * xforms_resize.C (get_scaling_factor): "cure" float -> int warnings. diff --git a/src/frontends/xforms/xformsImage.C b/src/frontends/xforms/xformsImage.C index adb5dcdf19..510763b498 100644 --- a/src/frontends/xforms/xformsImage.C +++ b/src/frontends/xforms/xformsImage.C @@ -282,9 +282,9 @@ void xformsImage::clip(Params const & params) // We must, therefore, be careful... int const xoffset_l = params.bb.xl; int const yoffset_b = params.bb.yb; - int const xoffset_r = image_->w > params.bb.xr ? + int const xoffset_r = image_->w > int(params.bb.xr) ? image_->w - params.bb.xr : 0; - int const yoffset_t = image_->h > params.bb.yt ? + int const yoffset_t = image_->h > int(params.bb.yt) ? image_->h - params.bb.yt : 0; flimage_crop(image_, xoffset_l, yoffset_t, xoffset_r, yoffset_b);