summaryrefslogtreecommitdiffstats
path: root/src/plugins/gfxdrivers
diff options
context:
space:
mode:
authorAnders Bakken <anders.bakken@nokia.com>2010-03-26 18:08:12 (GMT)
committerAnders Bakken <anders.bakken@nokia.com>2010-03-26 18:19:48 (GMT)
commit96d6bff54942be11458801edc5c59e2cf646253c (patch)
tree53229c79a4bbe9c0c100be6250cdd0888e3af64a /src/plugins/gfxdrivers
parente5aae4591bb6a75d3c8cac42a566eff1a97e45b2 (diff)
downloadQt-96d6bff54942be11458801edc5c59e2cf646253c.zip
Qt-96d6bff54942be11458801edc5c59e2cf646253c.tar.gz
Qt-96d6bff54942be11458801edc5c59e2cf646253c.tar.bz2
QDirectFBPixmap can handle NoOpaqueDetection.
We don't need to do the conversion using QImage when NoOpaqueDetection is specified. Reviewed-by: muthu <qt-info@nokia.com>
Diffstat (limited to 'src/plugins/gfxdrivers')
-rw-r--r--src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
index 4219f6f..f2fd699 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
@@ -307,7 +307,7 @@ void QDirectFBPixmapData::fromImage(const QImage &img,
imageFormat = screen->pixelFormat();
}
QImage image;
- if (flags != Qt::AutoColor) {
+ if ((flags & ~Qt::NoOpaqueDetection) != Qt::AutoColor) {
image = img.convertToFormat(imageFormat, flags);
flags = Qt::AutoColor;
} else if (img.format() == QImage::Format_RGB32) {