Added extra trace for investigation of 16MU blitting behaviour

2 files changed, 28 insertions, 2 deletions

diff --git a/src/3rdparty/phonon/mmf/videooutput.cpp b/src/3rdparty/phonon/mmf/videooutput.cpp
index c2bd775..d0f8707 100644
--- a/src/3rdparty/phonon/mmf/videooutput.cpp
+++ b/src/3rdparty/phonon/mmf/videooutput.cpp
@@ -144,7 +144,21 @@ void MMF::VideoOutput::transparentFill(const QVector<QRect>& rects)
 	QImage *image = window()->windowSurface()->buffer(window());
 	QRgb *data = reinterpret_cast<QRgb *>(image->bits());
 	const int row_stride = image->bytesPerLine() / 4;
-
+	
+	// Paint the entire surface
+	const int imageWidth = image->size().width();
+	const int imageHeight = image->size().height();
+	QRgb *row = data;
+	for(int y=0; y<imageHeight; ++y) {
+	
+		QRgb *ptr = row;
+		for(int x=0; x<imageWidth; ++x)
+			*ptr++ = 0xff0000ff;
+		row += row_stride;
+	}
+	
+/*
+	// Paint the specified regions
 	for (QVector<QRect>::const_iterator it = rects.begin(); it != rects.end(); ++it) {
 	
 		const QRect& rect = *it;
@@ -170,6 +184,7 @@ void MMF::VideoOutput::transparentFill(const QVector<QRect>& rects)
 			row += row_stride;
 		}
 	}
+*/
 	
 	TRACE_EXIT_0();
 }
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index 2035bb0..3cb7ada 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -643,7 +643,18 @@ void QSymbianControl::Draw(const TRect& r) const
         const TDisplayMode displayMode = bitmap->DisplayMode();
 		qDebug()    << "QSymbianControl::Draw [" << this << "]"
 					<< "mode " << displayMode;
-		for(int i=0; i<10 and i*10<bitmap->SizeInPixels().iWidth and i*10<bitmap->SizeInPixels().iHeight; ++i) {
+		
+		const TUint32 *address = bitmap->DataAddress();
+		const int bitmapWidth = bitmap->SizeInPixels().iWidth;
+		const int bitmapHeight = bitmap->SizeInPixels().iHeight;
+		
+		for(int i=0; i<10 and i*10<bitmapWidth and i*10<bitmapHeight; ++i) {
+			const int coord = i*10;
+			const TUint32 *ptr = address + (coord * bitmapWidth) + coord;
+			const TUint32 pixel = *ptr;
+		}
+		
+		for(int i=0; i<10 and i*10<bitmapWidth and i*10<bitmapHeight; ++i) {
 			TRgb color;
 			bitmap->GetPixel(color, TPoint(i*10, i*10));
 			qDebug()    << "    " << i*10 << " : " << color.Red() << color.Green() << color.Blue() << color.Alpha();