whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging 

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Prevent crash in OpenGL engine when scaling images / pixmaps.
bb10
Qt Continuous Integration System 2011-05-12 02:11:15 +10:00
parent ca724e095b e40443f7df
commit c6b4da2f8a
4 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/image/qimage.cpp
View File

@ -4449,6 +4449,8 @@ QImage QImage::scaled(const QSize& s, Qt::AspectRatioMode aspectMode, Qt::Transf
QSize newSize = size();
newSize.scale(s, aspectMode);
newSize.rwidth() = qMax(newSize.width(), 1);
newSize.rheight() = qMax(newSize.height(), 1);
if (newSize == size())
return *this;

2
src/gui/image/qpixmap.cpp
View File

@ -1514,6 +1514,8 @@ QPixmap QPixmap::scaled(const QSize& s, Qt::AspectRatioMode aspectMode, Qt::Tran
QSize newSize = size();
newSize.scale(s, aspectMode);
newSize.rwidth() = qMax(newSize.width(), 1);
newSize.rheight() = qMax(newSize.height(), 1);
if (newSize == size())
return *this;

8
tests/auto/qimage/tst_qimage.cpp
View File

@ -151,6 +151,7 @@ private slots:
void rgbSwapped();
void deepCopyWhenPaintingActive();
void scaled_QTBUG19157();
};
tst_QImage::tst_QImage()
@ -2029,5 +2030,12 @@ void tst_QImage::deepCopyWhenPaintingActive()
QVERIFY(copy != image);
}
void tst_QImage::scaled_QTBUG19157()
{
QImage foo(5000, 1, QImage::Format_RGB32);
foo = foo.scaled(1024, 1024, Qt::KeepAspectRatio);
QVERIFY(!foo.isNull());
}
QTEST_MAIN(tst_QImage)
#include "tst_qimage.moc"

8
tests/auto/qpixmap/tst_qpixmap.cpp
View File

@ -196,6 +196,7 @@ private slots:
#if defined(Q_OS_SYMBIAN) && !defined(QT_NO_OPENVG)
void vgImageReadBack();
#endif
void scaled_QTBUG19157();
};
static bool lenientCompare(const QPixmap &actual, const QPixmap &expected)
@ -1897,5 +1898,12 @@ void tst_QPixmap::vgImageReadBack()
}
#endif // Symbian & OpenVG
void tst_QPixmap::scaled_QTBUG19157()
{
QPixmap foo(5000, 1);
foo = foo.scaled(1024, 1024, Qt::KeepAspectRatio);
QVERIFY(!foo.isNull());
}
QTEST_MAIN(tst_QPixmap)
#include "tst_qpixmap.moc"