diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-05-10 22:19:00 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-05-10 22:19:00 (GMT) |
| commit | 35bc65ecf89ccc14f2e949f2d2881e899f7c4165 (patch) | |
| tree | c206594911961655608803ceda0816e45b4a32c2 /src/gui/painting/qoutlinemapper.cpp | |
| parent | da8d6c23ceaeb1f266c9c499e98c9fedb1d1e20d (diff) | |
| parent | 5280485f2b614c7b0417e37f91b959b689835b42 (diff) | |
| download | Qt-35bc65ecf89ccc14f2e949f2d2881e899f7c4165.zip Qt-35bc65ecf89ccc14f2e949f2d2881e899f7c4165.tar.gz Qt-35bc65ecf89ccc14f2e949f2d2881e899f7c4165.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/gui/painting/qoutlinemapper.cpp')
| -rw-r--r-- | src/gui/painting/qoutlinemapper.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/painting/qoutlinemapper.cpp b/src/gui/painting/qoutlinemapper.cpp index ad0c2eb..1b01960 100644 --- a/src/gui/painting/qoutlinemapper.cpp +++ b/src/gui/painting/qoutlinemapper.cpp @@ -154,7 +154,8 @@ QT_FT_Outline *QOutlineMapper::convertPath(const QVectorPath &path) // ### We can kill this copying and just use the buffer straight... m_elements.resize(count); - memcpy(m_elements.data(), path.points(), count* sizeof(QPointF)); + if (count) + memcpy(m_elements.data(), path.points(), count* sizeof(QPointF)); m_element_types.resize(0); } |