summaryrefslogtreecommitdiff
path: root/noncore/styles/theme/ogfxeffect.cpp
Unidiff
Diffstat (limited to 'noncore/styles/theme/ogfxeffect.cpp') (more/less context) (show whitespace changes)
-rw-r--r--noncore/styles/theme/ogfxeffect.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/noncore/styles/theme/ogfxeffect.cpp b/noncore/styles/theme/ogfxeffect.cpp
index 2071a67..90b45fe 100644
--- a/noncore/styles/theme/ogfxeffect.cpp
+++ b/noncore/styles/theme/ogfxeffect.cpp
@@ -27,9 +27,10 @@
27QPixmap& OGfxEffect::gradient(QPixmap &pixmap, const QColor &ca, 27QPixmap& OGfxEffect::gradient(QPixmap &pixmap, const QColor &ca,
28 const QColor &cb, GradientType eff, int ncols) 28 const QColor &cb, GradientType eff, int ncols)
29{ 29{
30 if ( !pixmap. isNull ( )) {
30 QImage image = gradient(pixmap.size(), ca, cb, eff, ncols); 31 QImage image = gradient(pixmap.size(), ca, cb, eff, ncols);
31 pixmap.convertFromImage(image); 32 pixmap.convertFromImage(image);
32 33 }
33 return pixmap; 34 return pixmap;
34} 35}
35 36
@@ -280,6 +281,7 @@ QPixmap& OGfxEffect::blend(QPixmap &pixmap, float initial_intensity,
280 const QColor &bgnd, GradientType eff, 281 const QColor &bgnd, GradientType eff,
281 bool anti_dir, int /*ncols*/) 282 bool anti_dir, int /*ncols*/)
282{ 283{
284 if ( !pixmap. isNull ( )) {
283 QImage image = pixmap.convertToImage(); 285 QImage image = pixmap.convertToImage();
284 OGfxEffect::blend(image, initial_intensity, bgnd, eff, anti_dir); 286 OGfxEffect::blend(image, initial_intensity, bgnd, eff, anti_dir);
285 287
@@ -287,7 +289,7 @@ QPixmap& OGfxEffect::blend(QPixmap &pixmap, float initial_intensity,
287 image. convertDepth ( pixmap. depth ( )); 289 image. convertDepth ( pixmap. depth ( ));
288 290
289 pixmap.convertFromImage(image); 291 pixmap.convertFromImage(image);
290 292 }
291 return pixmap; 293 return pixmap;
292} 294}
293 295