diff options
Diffstat (limited to 'src/gui/painting')
-rw-r--r-- | src/gui/painting/qregion.cpp | 4 | ||||
-rw-r--r-- | src/gui/painting/qtransform.cpp | 4 | ||||
-rw-r--r-- | src/gui/painting/qtransform.h | 10 |
3 files changed, 15 insertions, 3 deletions
diff --git a/src/gui/painting/qregion.cpp b/src/gui/painting/qregion.cpp index b21c77f745..6bf5f6bf88 100644 --- a/src/gui/painting/qregion.cpp +++ b/src/gui/painting/qregion.cpp @@ -3558,8 +3558,10 @@ static QRegionPrivate *PolygonRegion(const QPoint *Pts, int Count, int rule) return region; } - if (!(pETEs = static_cast<EdgeTableEntry *>(malloc(sizeof(EdgeTableEntry) * Count)))) + if (!(pETEs = static_cast<EdgeTableEntry *>(malloc(sizeof(EdgeTableEntry) * Count)))) { + delete region; return 0; + } region->vectorize(); diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp index f597ea0e9e..04a97aabcb 100644 --- a/src/gui/painting/qtransform.cpp +++ b/src/gui/painting/qtransform.cpp @@ -250,6 +250,7 @@ QTransform::QTransform() , m_13(0), m_23(0), m_33(1) , m_type(TxNone) , m_dirty(TxNone) + , d(Q_NULLPTR) { } @@ -268,6 +269,7 @@ QTransform::QTransform(qreal h11, qreal h12, qreal h13, , m_13(h13), m_23(h23), m_33(h33) , m_type(TxNone) , m_dirty(TxProject) + , d(Q_NULLPTR) { } @@ -284,6 +286,7 @@ QTransform::QTransform(qreal h11, qreal h12, qreal h21, , m_13(0), m_23(0), m_33(1) , m_type(TxNone) , m_dirty(TxShear) + , d(Q_NULLPTR) { } @@ -299,6 +302,7 @@ QTransform::QTransform(const QMatrix &mtx) m_13(0), m_23(0), m_33(1) , m_type(TxNone) , m_dirty(TxShear) + , d(Q_NULLPTR) { } diff --git a/src/gui/painting/qtransform.h b/src/gui/painting/qtransform.h index e32e29c5da..68c4548644 100644 --- a/src/gui/painting/qtransform.h +++ b/src/gui/painting/qtransform.h @@ -154,12 +154,18 @@ private: : affine(h11, h12, h21, h22, h31, h32, true) , m_13(h13), m_23(h23), m_33(h33) , m_type(TxNone) - , m_dirty(TxProject) {} + , m_dirty(TxProject) + , d(Q_NULLPTR) + { + } inline QTransform(bool) : affine(true) , m_13(0), m_23(0), m_33(1) , m_type(TxNone) - , m_dirty(TxNone) {} + , m_dirty(TxNone) + , d(Q_NULLPTR) + { + } inline TransformationType inline_type() const; QMatrix affine; qreal m_13; |