Fix warnings about scaling pixmaps

diff --git a/src/kitemviews/kfileitemlistview.cpp b/src/kitemviews/kfileitemlistview.cpp
index 4ccda7b51be1b65b70597bdbf08fa1876fad7b13..75eb1559e39abeaf3b8f093305a3a0cd519a3270 100644 (file)
--- a/src/kitemviews/kfileitemlistview.cpp
+++ b/src/kitemviews/kfileitemlistview.cpp
@@ -168,7 +168,12 @@ QPixmap KFileItemListView::createDragPixmap(const KItemSet& indexes) const
         QPixmap pixmap = model()->data(index).value("iconPixmap").value<QPixmap>();
         if (pixmap.isNull()) {
             QIcon icon = QIcon::fromTheme(model()->data(index).value("iconName").toString());
         QPixmap pixmap = model()->data(index).value("iconPixmap").value<QPixmap>();
         if (pixmap.isNull()) {
             QIcon icon = QIcon::fromTheme(model()->data(index).value("iconName").toString());

-            pixmap = icon.pixmap(size, size);
+            if (!icon.isNull()) {
+                pixmap = icon.pixmap(size, size);
+            } else {
+                pixmap = QPixmap(size, size);
+                pixmap.fill(Qt::transparent);
+            }

         } else {
             KPixmapModifier::scale(pixmap, QSize(size, size) * dpr);
         }
         } else {
             KPixmapModifier::scale(pixmap, QSize(size, size) * dpr);
         }

diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp
index 8f3ddceed86858bbb96967cafca4f55a788359ba..18de05f010fab25545696aa4fc1224915c71848f 100644 (file)
--- a/src/kitemviews/kfileitemmodelrolesupdater.cpp
+++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp
@@ -494,7 +494,7 @@ void KFileItemModelRolesUpdater::slotGotPreview(const KFileItem& item, const QPi
 
     QPixmap scaledPixmap = pixmap;
 
 
     QPixmap scaledPixmap = pixmap;
 

-    if (!pixmap.hasAlpha()
+    if (!pixmap.hasAlpha() && !pixmap.isNull()

         && m_iconSize.width()  > KIconLoader::SizeSmallMedium
         && m_iconSize.height() > KIconLoader::SizeSmallMedium) {
         if (m_enlargeSmallPreviews) {
         && m_iconSize.width()  > KIconLoader::SizeSmallMedium
         && m_iconSize.height() > KIconLoader::SizeSmallMedium) {
         if (m_enlargeSmallPreviews) {


@@ -525,7 +525,7 @@ void KFileItemModelRolesUpdater::slotGotPreview(const KFileItem& item, const QPi
                 KPixmapModifier::applyFrame(scaledPixmap, m_iconSize);
             }
         }
                 KPixmapModifier::applyFrame(scaledPixmap, m_iconSize);
             }
         }

-    } else {
+    } else if (!pixmap.isNull()) {

         KPixmapModifier::scale(scaledPixmap, m_iconSize * qApp->devicePixelRatio());
         scaledPixmap.setDevicePixelRatio(qApp->devicePixelRatio());
     }
         KPixmapModifier::scale(scaledPixmap, m_iconSize * qApp->devicePixelRatio());
         scaledPixmap.setDevicePixelRatio(qApp->devicePixelRatio());
     }


@@ -538,12 +538,14 @@ void KFileItemModelRolesUpdater::slotGotPreview(const KFileItem& item, const QPi
     // It is more efficient to do it here, as KIconLoader::drawOverlays()
     // assumes that an overlay will be drawn and has some additional
     // setup time.
     // It is more efficient to do it here, as KIconLoader::drawOverlays()
     // assumes that an overlay will be drawn and has some additional
     // setup time.

-    for (const QString& overlay : overlays) {
-        if (!overlay.isEmpty()) {
-            // There is at least one overlay, draw all overlays above m_pixmap
-            // and cancel the check
-            KIconLoader::global()->drawOverlays(overlays, scaledPixmap, KIconLoader::Desktop);
-            break;
+    if (!scaledPixmap.isNull()) {
+        for (const QString& overlay : overlays) {
+            if (!overlay.isEmpty()) {
+                // There is at least one overlay, draw all overlays above m_pixmap
+                // and cancel the check
+                KIconLoader::global()->drawOverlays(overlays, scaledPixmap, KIconLoader::Desktop);
+                break;
+            }

         }
     }
 
         }
     }
 

diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp
index f2fc213326032450a36deb029780f99fe77d0d17..5175d80fa073474775428a7812d1329ab0aacd91 100644 (file)
--- a/src/kitemviews/kstandarditemlistwidget.cpp
+++ b/src/kitemviews/kstandarditemlistwidget.cpp
@@ -314,7 +314,7 @@ void KStandardItemListWidget::paint(QPainter* painter, const QStyleOptionGraphic
     }
 
     const KItemListStyleOption& itemListStyleOption = styleOption();
     }
 
     const KItemListStyleOption& itemListStyleOption = styleOption();

-    if (isHovered()) {
+    if (isHovered() && !m_pixmap.isNull()) {

         if (hoverOpacity() < 1.0) {
             /*
              * Linear interpolation between m_pixmap and m_hoverPixmap.
         if (hoverOpacity() < 1.0) {
             /*
              * Linear interpolation between m_pixmap and m_hoverPixmap.


@@ -357,7 +357,7 @@ void KStandardItemListWidget::paint(QPainter* painter, const QStyleOptionGraphic
         } else {
             drawPixmap(painter, m_hoverPixmap);
         }
         } else {
             drawPixmap(painter, m_hoverPixmap);
         }

-    } else {
+    } else if (!m_pixmap.isNull()) {

         drawPixmap(painter, m_pixmap);
     }
 
         drawPixmap(painter, m_pixmap);
     }
 


@@ -962,6 +962,11 @@ void KStandardItemListWidget::updatePixmapCache()
             KPixmapModifier::scale(m_pixmap, QSize(maxIconWidth, maxIconHeight) * qApp->devicePixelRatio());
         }
 
             KPixmapModifier::scale(m_pixmap, QSize(maxIconWidth, maxIconHeight) * qApp->devicePixelRatio());
         }
 

+        if (m_pixmap.isNull()) {
+            m_hoverPixmap = QPixmap();
+            return;
+        }
+

         if (m_isCut) {
             KIconEffect* effect = KIconLoader::global()->iconEffect();
             m_pixmap = effect->apply(m_pixmap, KIconLoader::Desktop, KIconLoader::DisabledState);
         if (m_isCut) {
             KIconEffect* effect = KIconLoader::global()->iconEffect();
             m_pixmap = effect->apply(m_pixmap, KIconLoader::Desktop, KIconLoader::DisabledState);


@@ -974,6 +979,10 @@ void KStandardItemListWidget::updatePixmapCache()
         if (m_layout == IconsLayout && isSelected()) {
             const QColor color = palette().brush(QPalette::Normal, QPalette::Highlight).color();
             QImage image = m_pixmap.toImage();
         if (m_layout == IconsLayout && isSelected()) {
             const QColor color = palette().brush(QPalette::Normal, QPalette::Highlight).color();
             QImage image = m_pixmap.toImage();

+            if (image.isNull()) {
+                m_hoverPixmap = QPixmap();
+                return;
+            }

             KIconEffect::colorize(image, color, 0.8f);
             m_pixmap = QPixmap::fromImage(image);
         }
             KIconEffect::colorize(image, color, 0.8f);
             m_pixmap = QPixmap::fromImage(image);
         }

diff --git a/src/kitemviews/private/kpixmapmodifier.cpp b/src/kitemviews/private/kpixmapmodifier.cpp
index 5bcb3b8f5dc4ebe5e4cf33c4077fc82e3163b490..9f7f2edc82d33885289341a0415456dcbb557d2a 100644 (file)
--- a/src/kitemviews/private/kpixmapmodifier.cpp
+++ b/src/kitemviews/private/kpixmapmodifier.cpp
@@ -298,7 +298,7 @@ namespace {
 
 void KPixmapModifier::scale(QPixmap& pixmap, const QSize& scaledSize)
 {
 
 void KPixmapModifier::scale(QPixmap& pixmap, const QSize& scaledSize)
 {

-    if (scaledSize.isEmpty()) {
+    if (scaledSize.isEmpty() || pixmap.isNull()) {

         pixmap = QPixmap();
         return;
     }
         pixmap = QPixmap();
         return;
     }


@@ -309,6 +309,12 @@ void KPixmapModifier::scale(QPixmap& pixmap, const QSize& scaledSize)
 
 void KPixmapModifier::applyFrame(QPixmap& icon, const QSize& scaledSize)
 {
 
 void KPixmapModifier::applyFrame(QPixmap& icon, const QSize& scaledSize)
 {

+    if (icon.isNull()) {
+        icon = QPixmap(scaledSize);
+        icon.fill(Qt::transparent);
+        return;
+    }
+

     static TileSet tileSet;
     qreal dpr = qApp->devicePixelRatio();
 
     static TileSet tileSet;
     qreal dpr = qApp->devicePixelRatio();
 

diff --git a/src/panels/information/pixmapviewer.cpp b/src/panels/information/pixmapviewer.cpp
index ce84506dd964d942f4ae33ce627faacc1408313c..1f072641e5992b81b4bc4d3ff49e3d0971b15299 100644 (file)
--- a/src/panels/information/pixmapviewer.cpp
+++ b/src/panels/information/pixmapviewer.cpp
@@ -136,7 +136,7 @@ void PixmapViewer::paintEvent(QPaintEvent* event)
 
             style()->drawItemPixmap(&painter, rect(), Qt::AlignCenter, scaledPixmap);
         }
 
             style()->drawItemPixmap(&painter, rect(), Qt::AlignCenter, scaledPixmap);
         }

-    } else {
+    } else if (!m_pixmap.isNull()) {

         style()->drawItemPixmap(&painter, rect(), Qt::AlignCenter, m_pixmap);
     }
 }
         style()->drawItemPixmap(&painter, rect(), Qt::AlignCenter, m_pixmap);
     }
 }