From b818bf2d67e4e5f3f3a01eeb0c0de37a4cd33b50 Mon Sep 17 00:00:00 2001
From: Anders Bakken <anders.bakken@nokia.com>
Date: Tue, 7 Apr 2009 15:01:46 -0700
Subject: Work around RGB32 issue in solidFill

Drawing operations with DirectFB in RGB32 changes the alpha byte to 0.
This doesn't play well with QRasterEngine.

See 5fb7752ff93b31635e64fa321917749744cc9db6 and
34059fba55816496d2570b3306ac2b631b12a5c6
Reviewed-by: TrustMe
---
 .../gfxdrivers/directfb/qdirectfbscreen.cpp        | 37 +++++++++++++---------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
index a62c846..bf9864a 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
@@ -1182,21 +1182,29 @@ void QDirectFBScreen::solidFill(const QColor &color, const QRegion &region)
     if (region.isEmpty())
         return;
 
-    const QVector<QRect> rects = region.rects();
-    QVarLengthArray<DFBRectangle> dfbRects(rects.size());
-    for (int i = 0; i < rects.size(); ++i) {
-        const QRect r = rects.at(i);
-        dfbRects[i].x = r.x();
-        dfbRects[i].y = r.y();
-        dfbRects[i].w = r.width();
-        dfbRects[i].h = r.height();
+    if (QDirectFBScreen::getImageFormat(d_ptr->dfbSurface) == QImage::Format_RGB32) {
+        uchar *mem;
+        int bpl;
+        d_ptr->dfbSurface->Lock(d_ptr->dfbSurface, DSLF_WRITE, (void**)&mem, &bpl);
+        QImage img(mem, w, h, bpl, QImage::Format_RGB32);
+        QPainter p(&img);
+        p.setBrush(color);
+        p.setPen(Qt::NoPen);
+        const QVector<QRect> rects = region.rects();
+        p.drawRects(rects.constData(), rects.size());
+        p.end();
+        d_ptr->dfbSurface->Unlock(d_ptr->dfbSurface);
+    } else {
+        d_ptr->dfbSurface->SetColor(d_ptr->dfbSurface,
+                                    color.red(), color.green(), color.blue(),
+                                    color.alpha());
+        const QVector<QRect> rects = region.rects();
+        for (int i=0; i<rects.size(); ++i) {
+            const QRect &r = rects.at(i);
+            d_ptr->dfbSurface->FillRectangle(d_ptr->dfbSurface,
+                                             r.x(), r.y(), r.width(), r.height());
+        }
     }
-
-    d_ptr->dfbSurface->SetColor(d_ptr->dfbSurface,
-                                color.red(), color.green(), color.blue(),
-                                color.alpha());
-    d_ptr->dfbSurface->FillRectangles(d_ptr->dfbSurface, dfbRects.data(),
-                                      dfbRects.size());
 }
 
 QImage::Format QDirectFBScreen::alphaPixmapFormat() const
@@ -1204,7 +1212,6 @@ QImage::Format QDirectFBScreen::alphaPixmapFormat() const
     return d_ptr->alphaPixmapFormat;
 }
 
-
 bool QDirectFBScreen::initSurfaceDescriptionPixelFormat(DFBSurfaceDescription *description,
                                                         QImage::Format format)
 {
-- 
cgit v0.12