From a405437ca9294bf4f0f974739bd1130e165491b8 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Wed, 9 Dec 2009 13:46:00 +0200
Subject: Access to image needs to be protected in QS60PixmapData

The image can get corrupted if access to it is not properly
surrounded with beginDataAccess and endDataAccess calls.

Task-number: QTBUG-6050
Reviewed-by: Jani Hautakangas
---
 src/gui/image/qpixmap_s60.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/gui/image/qpixmap_s60.cpp b/src/gui/image/qpixmap_s60.cpp
index dc33ade..610317d 100644
--- a/src/gui/image/qpixmap_s60.cpp
+++ b/src/gui/image/qpixmap_s60.cpp
@@ -820,7 +820,9 @@ void* QS60PixmapData::toNativeType(NativeType type)
         if(displayMode == EGray2) {
             //Symbian thinks set pixels are white/transparent, Qt thinks they are foreground/solid
             //So invert mono bitmaps so that masks work correctly.
+            beginDataAccess();
             image.invertPixels();
+            endDataAccess();
             needsCopy = true;
         }
 
@@ -828,7 +830,9 @@ void* QS60PixmapData::toNativeType(NativeType type)
             QImage source;
 
             if (convertToArgb32) {
+                beginDataAccess();
                 source = image.convertToFormat(QImage::Format_ARGB32);
+                endDataAccess();
                 displayMode = EColor16MA;
             } else {
                 source = image;
@@ -858,7 +862,9 @@ void* QS60PixmapData::toNativeType(NativeType type)
 
         if(displayMode == EGray2) {
             // restore pixels
+            beginDataAccess();
             image.invertPixels();
+            endDataAccess();
         }
 
         return reinterpret_cast<void*>(bitmap);
-- 
cgit v0.12