Fix for CFbsBitmap to QPixmap conversion.

Symbian bitmap formats may have different scanline length
when compared to QImage formats. We need to define scanline
length for intermediate QImage when converting from CFbsBitmap
to QPixmap.

Task-number: QTBUG-14218
Reviewed-by: Jason Barron

1 files changed, 2 insertions, 1 deletions

diff --git a/src/openvg/qvg_symbian.cpp b/src/openvg/qvg_symbian.cpp
index a9625b2..41b35fc 100644
--- a/src/openvg/qvg_symbian.cpp
+++ b/src/openvg/qvg_symbian.cpp
@@ -185,10 +185,11 @@ void QVGPixmapData::fromNativeType(void* pixmap, NativeType type)
         QImage::Format format = qt_TDisplayMode2Format(displayMode);
 
         TSize size = bitmap->SizeInPixels();
+        int bytesPerLine = bitmap->ScanLineLength(size.iWidth, displayMode);
 
         bitmap->BeginDataAccess();
         uchar *bytes = (uchar*)bitmap->DataAddress();
-        QImage img = QImage(bytes, size.iWidth, size.iHeight, format);
+        QImage img = QImage(bytes, size.iWidth, size.iHeight, bytesPerLine, format);
         img = img.copy();
         bitmap->EndDataAccess();