anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-05 17:09:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

branch: Adjust the work-around for bug #5957.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@31032 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2009-08-14 15:08:04 +00:00
parent 8ee8115955
commit b92e1c3a96
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/frontends/qt4/GuiImage.cpp
View File

@ -170,13 +170,11 @@ bool GuiImage::scale(Params const & params)
qreal scale = qreal(params.scale) / 100.0; qreal scale = qreal(params.scale) / 100.0;
#if QT_VERSION >= 0x040500 #if (QT_VERSION >= 0x040500) && (QT_VERSION <= 0x040502)
// Due to a bug in Qt, LyX will crash when scaling an // Due to a bug in Qt, LyX will crash for certain
// image with an odd height to 50%. // scaling factors and sizes of the image.
// see bug #5957: http://www.lyx.org/trac/ticket/5957 // see bug #5957: http://www.lyx.org/trac/ticket/5957
// FIXME: Add an upper version limit as soon as the bug is fixed in Qt. scale += 0.0001;
if (params.scale == 50)
scale += 0.0001;
#endif #endif
QMatrix m; QMatrix m;

4
status.16x
View File

@ -183,8 +183,8 @@ What's new
* USER INTERFACE * USER INTERFACE
- Prevent a crash when scaling down an image with an odd height - Prevent a crash in Qt when scaling images on screen. This could occur
to 50% on screen (part of bug 5957). only for certain scaling factors and image sizes (bug 5957).
- Fix bookmark navigation crash when multiple windows are used - Fix bookmark navigation crash when multiple windows are used
(bug 6000). (bug 6000).