From 60bec281fe0a82556c07db3f8e13587d47b8449e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tapani=20P=C3=A4lli?= <tapani.palli@nokia.com>
Date: Wed, 16 Mar 2011 08:25:45 +0100
Subject: QMeeGoLivePixmapData : when creating QImage, use constructor with
 pitch.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As the data may be aligned/padded by the X driver.

Fixes: NB#231246 : Incorrect stride used when QMeeGoLivePixmap width not multiple of eight

Merge-request: 1115
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---
 src/plugins/graphicssystems/meego/qmeegolivepixmapdata.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/graphicssystems/meego/qmeegolivepixmapdata.cpp b/src/plugins/graphicssystems/meego/qmeegolivepixmapdata.cpp
index 2a2a098..0970b89 100644
--- a/src/plugins/graphicssystems/meego/qmeegolivepixmapdata.cpp
+++ b/src/plugins/graphicssystems/meego/qmeegolivepixmapdata.cpp
@@ -219,7 +219,7 @@ QImage* QMeeGoLivePixmapData::lock(EGLSyncKHR fenceSync)
         return &lockedImage;
     }
 
-    lockedImage = QImage((uchar *) data, width(), height(), format);
+    lockedImage = QImage((uchar *) data, width(), height(), pitch, format);
     return &lockedImage;
 }
 
-- 
cgit v0.12