summaryrefslogtreecommitdiff
path: root/noncore/styles/theme/ogfxeffect.cpp
Unidiff
Diffstat (limited to 'noncore/styles/theme/ogfxeffect.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/styles/theme/ogfxeffect.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/noncore/styles/theme/ogfxeffect.cpp b/noncore/styles/theme/ogfxeffect.cpp
index a991728..55f3c1f 100644
--- a/noncore/styles/theme/ogfxeffect.cpp
+++ b/noncore/styles/theme/ogfxeffect.cpp
@@ -7,24 +7,26 @@
7 7
8// $Id$ 8// $Id$
9 9
10#include <qimage.h> 10#include <qimage.h>
11#include <qpainter.h> 11#include <qpainter.h>
12 12
13#include <qpe/qmath.h>
14
13#include "ogfxeffect.h" 15#include "ogfxeffect.h"
14 16
15 17
16//====================================================================== 18//======================================================================
17// 19//
18// Gradient effects 20// Gradient effects
19// 21//
20//====================================================================== 22//======================================================================
21 23
22 24
23QPixmap& OGfxEffect::gradient(QPixmap &pixmap, const QColor &ca, 25QPixmap& OGfxEffect::gradient(QPixmap &pixmap, const QColor &ca,
24 const QColor &cb, GradientType eff, int ncols) 26 const QColor &cb, GradientType eff, int /*ncols*/)
25{ 27{
26 if(pixmap.depth() > 8 && 28 if(pixmap.depth() > 8 &&
27 (eff == VerticalGradient || eff == HorizontalGradient)) { 29 (eff == VerticalGradient || eff == HorizontalGradient)) {
28 30
29 int rDiff, gDiff, bDiff; 31 int rDiff, gDiff, bDiff;
30 int rca, gca, bca /*, rcb, gcb, bcb*/; 32 int rca, gca, bca /*, rcb, gcb, bcb*/;
@@ -88,19 +90,17 @@ QPixmap& OGfxEffect::gradient(QPixmap &pixmap, const QColor &ca,
88// 90//
89//====================================================================== 91//======================================================================
90 92
91 93
92QPixmap& OGfxEffect::blend(QPixmap &pixmap, float initial_intensity, 94QPixmap& OGfxEffect::blend(QPixmap &pixmap, float initial_intensity,
93 const QColor &bgnd, GradientType eff, 95 const QColor &bgnd, GradientType eff,
94 bool anti_dir, int ncols) 96 bool anti_dir, int /*ncols*/)
95{ 97{
96 QImage image = pixmap.convertToImage(); 98 QImage image = pixmap.convertToImage();
97 OGfxEffect::blend(image, initial_intensity, bgnd, eff, anti_dir); 99 OGfxEffect::blend(image, initial_intensity, bgnd, eff, anti_dir);
98 100
99 unsigned int tmp;
100
101 if ( pixmap. depth ( ) <= 8 ) 101 if ( pixmap. depth ( ) <= 8 )
102 image. convertDepth ( pixmap. depth ( )); 102 image. convertDepth ( pixmap. depth ( ));
103 103
104 pixmap.convertFromImage(image); 104 pixmap.convertFromImage(image);
105 105
106 return pixmap; 106 return pixmap;
@@ -215,13 +215,13 @@ QImage& OGfxEffect::blend(QImage &image, float initial_intensity,
215 for (y = 0; y < image.height() / 2 + image.height() % 2; y++) { 215 for (y = 0; y < image.height() / 2 + image.height() % 2; y++) {
216 yvar = var / image.height() * (image.height() - y*2/unaffected -1); 216 yvar = var / image.height() * (image.height() - y*2/unaffected -1);
217 217
218 if (eff == RectangleGradient) 218 if (eff == RectangleGradient)
219 intensity = initial_intensity + QMAX(xvar, yvar); 219 intensity = initial_intensity + QMAX(xvar, yvar);
220 else 220 else
221 intensity = initial_intensity + sqrt(xvar * xvar + yvar * yvar); 221 intensity = initial_intensity + qSqrt(xvar * xvar + yvar * yvar);
222 if (intensity > 1) intensity = 1; 222 if (intensity > 1) intensity = 1;
223 if (intensity < 0) intensity = 0; 223 if (intensity < 0) intensity = 0;
224 224
225 //NW 225 //NW
226 ind = x + image.width() * y ; 226 ind = x + image.width() * y ;
227 r = qRed (data[ind]) + (int)(intensity * 227 r = qRed (data[ind]) + (int)(intensity *
@@ -259,13 +259,13 @@ QImage& OGfxEffect::blend(QImage &image, float initial_intensity,
259 for (y = 0; y < image.height() / 2; y++) { 259 for (y = 0; y < image.height() / 2; y++) {
260 yvar = var / image.height() * (image.height() - y*2/unaffected -1); 260 yvar = var / image.height() * (image.height() - y*2/unaffected -1);
261 261
262 if (eff == RectangleGradient) 262 if (eff == RectangleGradient)
263 intensity = initial_intensity + QMAX(xvar, yvar); 263 intensity = initial_intensity + QMAX(xvar, yvar);
264 else 264 else
265 intensity = initial_intensity + sqrt(xvar * xvar + yvar * yvar); 265 intensity = initial_intensity + qSqrt(xvar * xvar + yvar * yvar);
266 if (intensity > 1) intensity = 1; 266 if (intensity > 1) intensity = 1;
267 if (intensity < 0) intensity = 0; 267 if (intensity < 0) intensity = 0;
268 268
269 //SW 269 //SW
270 ind = x + image.width() * (image.height() - y -1) ; 270 ind = x + image.width() * (image.height() - y -1) ;
271 r = qRed (data[ind]) + (int)(intensity * 271 r = qRed (data[ind]) + (int)(intensity *