From: Ivailo Monev <xakepa10@gmail.com>
Date: Sun, 12 Jun 2022 22:35:13 +0000 (+0300)
Subject: remove code for always false condition in QX11Data::copyQImageToXImage()
X-Git-Tag: 4.12.0~536
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6c22f6b444c6dc12761c621dc822452d8020d057;p=kde%2FKatie.git

remove code for always false condition in QX11Data::copyQImageToXImage()

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---

diff --git a/src/gui/kernel/qt_x11.cpp b/src/gui/kernel/qt_x11.cpp
index 721b0d7fd..240a95293 100644
--- a/src/gui/kernel/qt_x11.cpp
+++ b/src/gui/kernel/qt_x11.cpp
@@ -85,6 +85,7 @@ Picture QX11Data::getSolidFill(int screen, const QColor &c)
 void QX11Data::copyQImageToXImage(const QImage &image, XImage *ximage)
 {
     Q_ASSERT(ximage);
+    Q_ASSERT(image.depth() == 32);
 
     ximage->data = static_cast<char*>(::malloc(size_t(ximage->bytes_per_line) * image.height()));
     Q_CHECK_PTR(ximage->data);
@@ -93,8 +94,6 @@ void QX11Data::copyQImageToXImage(const QImage &image, XImage *ximage)
     const int h = image.height();
 
     if (ximage->bits_per_pixel == image.depth()) {
-        bool checkbyteorder = true;
-
         switch(image.format()) {
             case QImage::Format_RGB32: {
                 uint *xidata = (uint *)ximage->data;
@@ -132,18 +131,12 @@ void QX11Data::copyQImageToXImage(const QImage &image, XImage *ximage)
                 break;
             }
             default: {
-                checkbyteorder = false;
-                for (int h = 0; h < image.height(); h++) {
-                    for (int w = 0; w < image.width(); w++) {
-                        const QRgb pixel = image.pixel(w, h);
-                        XPutPixel(ximage, w, h, pixel);
-                    }
-                }
+                Q_ASSERT(false);
                 break;
             }
         }
 
-        if (checkbyteorder && (ximage->byte_order == MSBFirst) != (Q_BYTE_ORDER == Q_BIG_ENDIAN)) {
+        if ((ximage->byte_order == MSBFirst) != (Q_BYTE_ORDER == Q_BIG_ENDIAN)) {
             uint *xidata = (uint *)ximage->data;
             uint *xiend = xidata + w*h;
             while (xidata < xiend) {