summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-03-30 03:12:23 (UTC)
committer mickeyl <mickeyl>2003-03-30 03:12:23 (UTC)
commit161d9299ad2448092d62a1cff16e64c1b5b3a436 (patch) (side-by-side diff)
tree057fc5da398fc6927c9fd6a6ebafa8256fb87d02
parent8e1504c3e8b8e5af509147f0b33f4e92a7c1c041 (diff)
downloadopie-161d9299ad2448092d62a1cff16e64c1b5b3a436.zip
opie-161d9299ad2448092d62a1cff16e64c1b5b3a436.tar.gz
opie-161d9299ad2448092d62a1cff16e64c1b5b3a436.tar.bz2
remove unnecessary usage of and thus the dependency on libstdc++
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opieui/oimageeffect.cpp76
1 files changed, 25 insertions, 51 deletions
diff --git a/libopie2/opieui/oimageeffect.cpp b/libopie2/opieui/oimageeffect.cpp
index 3c28bbe..2855da6 100644
--- a/libopie2/opieui/oimageeffect.cpp
+++ b/libopie2/opieui/oimageeffect.cpp
@@ -65,7 +65,5 @@ QImage OImageEffect::gradient(const QSize &size, const QColor &ca,
if (size.width() == 0 || size.height() == 0) {
-#ifndef NDEBUG
- cerr << "WARNING: OImageEffect::gradient: invalid image" << endl;
-#endif
+ qDebug( "WARNING: OImageEffect::gradient: invalid image" );
return image;
}
@@ -353,7 +351,5 @@ QImage OImageEffect::unbalancedGradient(const QSize &size, const QColor &ca,
if (size.width() == 0 || size.height() == 0) {
-#ifndef NDEBUG
- cerr << "WARNING: OImageEffect::unbalancedGradient : invalid image\n";
-#endif
+ qDebug( "WARNING: OImageEffect::unbalancedGradient : invalid image" );
return image;
}
@@ -574,7 +570,5 @@ QImage& OImageEffect::intensity(QImage &image, float percent)
{
if (image.width() == 0 || image.height() == 0) {
-#ifndef NDEBUG
- cerr << "WARNING: OImageEffect::intensity : invalid image\n";
-#endif
+ qDebug( "WARNING: OImageEffect::intensity : invalid image" );
return image;
}
@@ -641,7 +635,5 @@ QImage& OImageEffect::channelIntensity(QImage &image, float percent,
{
if (image.width() == 0 || image.height() == 0) {
-#ifndef NDEBUG
- cerr << "WARNING: OImageEffect::channelIntensity : invalid image\n";
-#endif
+ qDebug( "WARNING: OImageEffect::channelIntensity : invalid image" );
return image;
}
@@ -733,8 +725,6 @@ QImage& OImageEffect::modulate(QImage &image, QImage &modImage, bool reverse,
if (image.width() == 0 || image.height() == 0 ||
modImage.width() == 0 || modImage.height() == 0) {
-#ifndef NDEBUG
- cerr << "WARNING: OImageEffect::modulate : invalid image\n";
-#endif
- return image;
+ qDebug( "WARNING: OImageEffect::modulate : invalid image" );
+ return image;
}
@@ -861,16 +851,14 @@ QImage& OImageEffect::blend(const QColor& clr, QImage& dst, float opacity)
{
if (dst.width() <= 0 || dst.height() <= 0)
- return dst;
+ return dst;
if (opacity < 0.0 || opacity > 1.0) {
-#ifndef NDEBUG
- cerr << "WARNING: OImageEffect::blend : invalid opacity. Range [0, 1]\n";
-#endif
- return dst;
+ qDebug( "WARNING: OImageEffect::blend : invalid opacity. Range [0, 1] ");
+ return dst;
}
int depth = dst.depth();
if (depth != 32)
- dst = dst.convertDepth(32);
+ dst = dst.convertDepth(32);
int pixels = dst.width() * dst.height();
@@ -904,20 +892,16 @@ QImage& OImageEffect::blend(QImage& src, QImage& dst, float opacity)
{
if (src.width() <= 0 || src.height() <= 0)
- return dst;
+ return dst;
if (dst.width() <= 0 || dst.height() <= 0)
- return dst;
+ return dst;
if (src.width() != dst.width() || src.height() != dst.height()) {
-#ifndef NDEBUG
- cerr << "WARNING: OImageEffect::blend : src and destination images are not the same size\n";
-#endif
- return dst;
+ qDebug( "WARNING: OImageEffect::blend : src and destination images are not the same size" );
+ return dst;
}
if (opacity < 0.0 || opacity > 1.0) {
-#ifndef NDEBUG
- cerr << "WARNING: OImageEffect::blend : invalid opacity. Range [0, 1]\n";
-#endif
- return dst;
+ qDebug( "WARNING: OImageEffect::blend : invalid opacity. Range [0, 1]" );
+ return dst;
}
@@ -958,8 +942,6 @@ QImage& OImageEffect::blend(QImage &image, float initial_intensity,
{
if (image.width() == 0 || image.height() == 0 || image.depth()!=32 ) {
-#ifndef NDEBUG
- cerr << "WARNING: OImageEffect::blend : invalid image\n";
-#endif
- return image;
+ qDebug( "WARNING: OImageEffect::blend : invalid image" );
+ return image;
}
@@ -1153,7 +1135,5 @@ QImage& OImageEffect::blend(QImage &image, float initial_intensity,
}
}
-#ifndef NDEBUG
- else cerr << "OImageEffect::blend effect not implemented" << endl;
-#endif
+ else qDebug( "OImageEffect::blend effect not implemented" );
return image;
}
@@ -1185,8 +1165,6 @@ QImage& OImageEffect::blend(QImage &image1, QImage &image2,
image2.width() == 0 || image2.height() == 0 ||
blendImage.width() == 0 || blendImage.height() == 0) {
-#ifndef NDEBUG
- cerr << "OImageEffect::blend effect invalid image" << endl;
-#endif
- return image1;
+ qDebug( "OImageEffect::blend effect invalid image" );
+ return image1;
}
@@ -1285,8 +1263,6 @@ QImage& OImageEffect::hash(QImage &image, Lighting lite, unsigned int spacing)
{
if (image.width() == 0 || image.height() == 0) {
-#ifndef NDEBUG
- cerr << "OImageEffect::hash effect invalid image" << endl;
-#endif
- return image;
+ qDebug( "OImageEffect::hash effect invalid image" );
+ return image;
}
@@ -1795,8 +1771,6 @@ bool OImageEffect::blend(
)
{
-#ifndef NDEBUG
- cerr << "OImageEffect::blend : Sizes not correct\n" ;
-#endif
- return false;
+ qDebug( "OImageEffect::blend : Sizes not correct" );
+ return false;
}