anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 21:21:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ensure that graphics BoundingBox member variables are initialised.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3899 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2002-04-04 10:24:33 +00:00
parent 12f082c3ba
commit 4a964acbe7
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/graphics/ChangeLog
View File

@ -1,3 +1,8 @@
2002-04-04 Angus Leeming <a.leeming@ic.ac.uk>
* GraphicsParams.C (c-tor): ensure that the member variables are
initialised.
2002-03-26 Angus Leeming <a.leeming@ic.ac.uk> 2002-03-26 Angus Leeming <a.leeming@ic.ac.uk>
* GraphicsCacheItem.C (convertToDisplayFormat): don't launch that Alert * GraphicsCacheItem.C (convertToDisplayFormat): don't launch that Alert

25
src/graphics/GraphicsParams.C
View File

@ -109,6 +109,7 @@ BoundingBox::BoundingBox()
BoundingBox::BoundingBox(string const & bb) BoundingBox::BoundingBox(string const & bb)
: xl(0), yb(0), xr(0), yt(0)
{ {
if (bb.empty()) if (bb.empty())
return; return;
@ -139,18 +140,22 @@ BoundingBox::BoundingBox(string const & bb)
// want the bounding box in Postscript pixels. // want the bounding box in Postscript pixels.
// Note further that there are 72 Postscript pixels per inch. // Note further that there are 72 Postscript pixels per inch.
double const scaling_factor = 7200.0 / (lyxrc.dpi * lyxrc.zoom); double const scaling_factor = 7200.0 / (lyxrc.dpi * lyxrc.zoom);
xl = uint(scaling_factor * length_xl.inPixels(1, 1)); unsigned int const xl_tmp =
yb = uint(scaling_factor * length_yb.inPixels(1, 1)); uint(scaling_factor * length_xl.inPixels(1, 1));
xr = uint(scaling_factor * length_xr.inPixels(1, 1)); unsigned int const yb_tmp =
yt = uint(scaling_factor * length_yt.inPixels(1, 1)); uint(scaling_factor * length_yb.inPixels(1, 1));
unsigned int const xr_tmp =
uint(scaling_factor * length_xr.inPixels(1, 1));
unsigned int const yt_tmp =
uint(scaling_factor * length_yt.inPixels(1, 1));
if (xr <= xl || yt <= yb) { if (xr <= xl || yt <= yb)
xl = 0;
yb = 0;
xr = 0;
yt = 0;
return; return;
}
xl = xl_tmp;
yb = yb_tmp;
xr = xr_tmp;
yt = yt_tmp;
} }