X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiImage.cpp;h=e7defe7ec585933bd5d3cb5dcd6e5230c5ecb97d;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=ceea8fc05b1e3fea9294fcb263b8656c4a4b6206;hpb=7b8908881cdab0b90214d8967c9d97e1be2998af;p=lyx.git

diff --git a/src/frontends/qt4/GuiImage.cpp b/src/frontends/qt4/GuiImage.cpp
index ceea8fc05b..e7defe7ec5 100644
--- a/src/frontends/qt4/GuiImage.cpp
+++ b/src/frontends/qt4/GuiImage.cpp
@@ -165,10 +165,18 @@ bool GuiImage::scale(Params const & params)
 {
 	QImage const & image = is_transformed_ ? transformed_ : original_;
 
-	if (params.scale < 0 || params.scale == 100)
+	if (params.scale == 100)
 		return false;
 
-	qreal const scale = qreal(params.scale) / 100.0;
+	qreal scale = qreal(params.scale) / 100.0;
+
+#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
+	scale += 0.0001;
+#endif
+
 	QMatrix m;
 	m.scale(scale, scale);
 	transformed_ = image.transformed(m);