anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 02:14:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(Rob Lahaye): fix crash when clipping.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5560 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2002-10-31 11:14:13 +00:00
parent 3e6c9c0812
commit fb868c4aea
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,7 @@
2002-10-31 Rob Lahaye <lahaye@snu.ac.kr>
* xformsImage.C (clip): fix crash caused by uint -> int nastiness.
2002-10-29 Rob Lahaye <lahaye@snu.ac.kr>
* FormParagraph.[Ch]:

17
src/frontends/xforms/xformsImage.C
View File

@ -280,12 +280,17 @@ void xformsImage::clip(Params const & params)
// Bounds are unchanged.
return;
// FIXME: these values are unsigned so this makes NO sense
int const xoffset_l = std::max(0U, params.bb.xl);
int const xoffset_r = std::max(0U, image_->w - params.bb.xr);
int const yoffset_t = std::max(0U, image_->h - params.bb.yt);
int const yoffset_b = std::max(0U, params.bb.yb);
// flimage.h: image_ members w and h are of type int
// (though always >= 0)
// GraphicsParams.h: params.bb members xl, xr, yt and yb are of
// type unsigned int.
// 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 ?
image_->w - params.bb.xr : 0;
int const yoffset_t = image_->h > params.bb.yt ?
image_->h - params.bb.yt : 0;
flimage_crop(image_, xoffset_l, yoffset_t, xoffset_r, yoffset_b);
}