fix recursion in case QBitmap is constructed with null pixmap

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/gui/image/qbitmap.cpp b/src/gui/image/qbitmap.cpp
index d6f6bd4..696cf5f 100644 (file)
--- a/src/gui/image/qbitmap.cpp
+++ b/src/gui/image/qbitmap.cpp
@@ -192,16 +192,7 @@ QBitmap::QBitmap(const QString& fileName, const char *format)
 
 QBitmap &QBitmap::operator=(const QPixmap &pixmap)
 {
-    if (pixmap.isNull()) {                        // a null pixmap
-        QBitmap bm(0, 0);
-        QBitmap::operator=(bm);
-    } else if (pixmap.depth() == 1) {                // 1-bit pixmap
-        QPixmap::operator=(pixmap);                // shallow assignment
-    } else {                                        // n-bit depth pixmap
-        QImage image;
-        image = pixmap.toImage();                                // convert pixmap to image
-        *this = fromImage(image);                                // will dither image
-    }
+    *this = fromImage(pixmap.toImage());
     return *this;
 }