summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonald Carr <donald.carr@nokia.com>2010-11-11 17:33:36 (GMT)
committerDonald Carr <donald.carr@nokia.com>2010-11-11 18:03:33 (GMT)
commit540d5bde104dd924b24850c0ed8e8ee285b6ec69 (patch)
tree7ae691b8d3858753289c794640cc23833d693efa
parentacde750479653837612131a847b2fb1246a1ff10 (diff)
downloadQt-540d5bde104dd924b24850c0ed8e8ee285b6ec69.zip
Qt-540d5bde104dd924b24850c0ed8e8ee285b6ec69.tar.gz
Qt-540d5bde104dd924b24850c0ed8e8ee285b6ec69.tar.bz2
Minor adjustments to merge-request 915
Fix minor stylistic issue raised by Oswald Removed duplicate sourceSurface pointer introduced by sibling merge request
-rw-r--r--src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
index 85ff925..ceed7ae 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
@@ -68,7 +68,8 @@ public:
Matrix_BlitsUnsupported = (Matrix_NegativeScale|Matrix_RectsUnsupported)
};
- inline static uint getTransformationType(const QTransform &transform) {
+ inline static uint getTransformationType(const QTransform &transform)
+ {
int ret = transform.type();
if (qMin(transform.m11(), transform.m22()) < 0) {
ret |= QDirectFBPaintEnginePrivate::Matrix_NegativeScale;
@@ -1200,7 +1201,6 @@ void QDirectFBPaintEnginePrivate::drawTiledPixmap(const QRectF &dest, const QPix
prepareForBlit(blitFlags);
QDirectFBPaintEnginePrivate::unlock(dfbData);
const QSize pixmapSize = dfbData->size();
- IDirectFBSurface *sourceSurface = dfbData->directFBSurface();
if (transform.isScaling() || pixmapTransform.isScaling()) {
Q_ASSERT(supportsStretchBlit());
Q_ASSERT(qMin(transform.m11(), transform.m22()) >= 0);