diff options
| author | Anders Bakken <agbakken@gmail.com> | 2010-05-27 08:50:40 (GMT) |
|---|---|---|
| committer | Samuel Rødal <sroedal@trolltech.com> | 2010-05-27 08:50:40 (GMT) |
| commit | ddf119a57001edd71eb6b84dffc7cda4a8ca2c0e (patch) | |
| tree | 02f43830806fd6f7ae9c94e1b0c608484a860a1e /src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h | |
| parent | ea68e4ddcf903bde74ded9d588a09863491d1d56 (diff) | |
| download | Qt-ddf119a57001edd71eb6b84dffc7cda4a8ca2c0e.zip Qt-ddf119a57001edd71eb6b84dffc7cda4a8ca2c0e.tar.gz Qt-ddf119a57001edd71eb6b84dffc7cda4a8ca2c0e.tar.bz2 | |
Fix a bug in QDirectFBPixmapData::fromImage
Every image that was converted with flags & Qt::NoOpaqueDetection would
be considered to have an alpha channel. This patch fixes that and
simplifies the code a little.
Merge-request: 637
Reviewed-by: Samuel Rødal <sroedal@trolltech.com>
Diffstat (limited to 'src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h')
| -rw-r--r-- | src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h index da6edc6..343b26e 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h @@ -86,8 +86,8 @@ public: virtual int metric(QPaintDevice::PaintDeviceMetric m) const { return QDirectFBPaintDevice::metric(m); } inline QImage::Format pixelFormat() const { return imageFormat; } - static bool hasAlphaChannel(const QImage &img); inline bool hasAlphaChannel() const { return alpha; } + static bool hasAlphaChannel(const QImage &img, Qt::ImageConversionFlags flags = Qt::AutoColor); private: #ifdef QT_DIRECTFB_IMAGEPROVIDER bool fromDataBufferDescription(const DFBDataBufferDescription &dataBuffer); |