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

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

View File

@ -170,13 +170,11 @@ bool GuiImage::scale(Params const & params)
qreal scale = qreal(params.scale) / 100.0;
#if QT_VERSION >= 0x040500
// Due to a bug in Qt, LyX will crash when scaling an
// image with an odd height to 50%.
#if (QT_VERSION >= 0x040500) && (QT_VERSION <= 0x040502)
// Due to a bug in Qt, LyX will crash for certain
// scaling factors and sizes of the image.
// 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.
if (params.scale == 50)
scale += 0.0001;
scale += 0.0001;
#endif
QMatrix m;

View File

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