1 files changed, 1 insertions, 22 deletions

diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
index c9b676a..dba1b51 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
@@ -76,7 +76,6 @@ void QDirectFBPixmapData::resize(int width, int height)
                                                                format,
                                                                QDirectFBScreen::TrackSurface);
     alpha = false;
-    forceRaster = (format == QImage::Format_RGB32);
     if (!dfbSurface) {
         invalidate();
         qWarning("QDirectFBPixmapData::resize(): Unable to allocate surface");
@@ -187,7 +186,6 @@ void QDirectFBPixmapData::fromImage(const QImage &i,
     }
     dfbSurface = screen->copyToDFBSurface(img, format,
                                           QDirectFBScreen::TrackSurface);
-    forceRaster = (format == QImage::Format_RGB32);
     if (!dfbSurface) {
         qWarning("QDirectFBPixmapData::fromImage()");
         invalidate();
@@ -216,7 +214,6 @@ void QDirectFBPixmapData::copy(const QPixmapData *data, const QRect &rect)
         invalidate();
         return;
     }
-    forceRaster = (format == QImage::Format_RGB32);
 
     if (hasAlpha) {
         dfbSurface->Clear(dfbSurface, 0, 0, 0, 0);
@@ -268,7 +265,6 @@ void QDirectFBPixmapData::fill(const QColor &color)
         screen->releaseDFBSurface(dfbSurface);
         format = screen->alphaPixmapFormat();
         dfbSurface = screen->createDFBSurface(size, screen->alphaPixmapFormat(), QDirectFBScreen::TrackSurface);
-        forceRaster = false;
         setSerialNumber(++global_ser_no);
         if (!dfbSurface) {
             qWarning("QDirectFBPixmapData::fill()");
@@ -277,24 +273,7 @@ void QDirectFBPixmapData::fill(const QColor &color)
         }
     }
 
-    if (forceRaster) {
-        // in DSPF_RGB32 all dfb drawing causes the Alpha byte to be
-        // set to 0. This causes issues for the raster engine.
-        uchar *mem = QDirectFBScreen::lockSurface(dfbSurface, DSLF_WRITE, &bpl);
-        if (mem) {
-            const int h = QPixmapData::height();
-            const int w = QPixmapData::width() * 4; // 4 bytes per 32 bit pixel
-            const int c = color.rgba();
-            for (int i = 0; i < h; ++i) {
-                memset(mem, c, w);
-                mem += bpl;
-            }
-            dfbSurface->Unlock(dfbSurface);
-        }
-    } else {
-        dfbSurface->Clear(dfbSurface, color.red(), color.green(), color.blue(),
-                          color.alpha());
-    }
+    dfbSurface->Clear(dfbSurface, color.red(), color.green(), color.blue(), color.alpha());
 }
 
 QPixmap QDirectFBPixmapData::transformed(const QTransform &transform,