-rw-r--r-- | libopie2/opieui/oimageeffect.cpp | 76 |
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 | |||
@@ -66,5 +66,3 @@ QImage OImageEffect::gradient(const QSize &size, const QColor &ca, | |||
66 | if (size.width() == 0 || size.height() == 0) { | 66 | if (size.width() == 0 || size.height() == 0) { |
67 | #ifndef NDEBUG | 67 | qDebug( "WARNING: OImageEffect::gradient: invalid image" ); |
68 | cerr << "WARNING: OImageEffect::gradient: invalid image" << endl; | ||
69 | #endif | ||
70 | return image; | 68 | return image; |
@@ -354,5 +352,3 @@ QImage OImageEffect::unbalancedGradient(const QSize &size, const QColor &ca, | |||
354 | if (size.width() == 0 || size.height() == 0) { | 352 | if (size.width() == 0 || size.height() == 0) { |
355 | #ifndef NDEBUG | 353 | qDebug( "WARNING: OImageEffect::unbalancedGradient : invalid image" ); |
356 | cerr << "WARNING: OImageEffect::unbalancedGradient : invalid image\n"; | ||
357 | #endif | ||
358 | return image; | 354 | return image; |
@@ -575,5 +571,3 @@ QImage& OImageEffect::intensity(QImage &image, float percent) | |||
575 | if (image.width() == 0 || image.height() == 0) { | 571 | if (image.width() == 0 || image.height() == 0) { |
576 | #ifndef NDEBUG | 572 | qDebug( "WARNING: OImageEffect::intensity : invalid image" ); |
577 | cerr << "WARNING: OImageEffect::intensity : invalid image\n"; | ||
578 | #endif | ||
579 | return image; | 573 | return image; |
@@ -642,5 +636,3 @@ QImage& OImageEffect::channelIntensity(QImage &image, float percent, | |||
642 | if (image.width() == 0 || image.height() == 0) { | 636 | if (image.width() == 0 || image.height() == 0) { |
643 | #ifndef NDEBUG | 637 | qDebug( "WARNING: OImageEffect::channelIntensity : invalid image" ); |
644 | cerr << "WARNING: OImageEffect::channelIntensity : invalid image\n"; | ||
645 | #endif | ||
646 | return image; | 638 | return image; |
@@ -734,6 +726,4 @@ QImage& OImageEffect::modulate(QImage &image, QImage &modImage, bool reverse, | |||
734 | modImage.width() == 0 || modImage.height() == 0) { | 726 | modImage.width() == 0 || modImage.height() == 0) { |
735 | #ifndef NDEBUG | 727 | qDebug( "WARNING: OImageEffect::modulate : invalid image" ); |
736 | cerr << "WARNING: OImageEffect::modulate : invalid image\n"; | 728 | return image; |
737 | #endif | ||
738 | return image; | ||
739 | } | 729 | } |
@@ -862,9 +852,7 @@ QImage& OImageEffect::blend(const QColor& clr, QImage& dst, float opacity) | |||
862 | if (dst.width() <= 0 || dst.height() <= 0) | 852 | if (dst.width() <= 0 || dst.height() <= 0) |
863 | return dst; | 853 | return dst; |
864 | 854 | ||
865 | if (opacity < 0.0 || opacity > 1.0) { | 855 | if (opacity < 0.0 || opacity > 1.0) { |
866 | #ifndef NDEBUG | 856 | qDebug( "WARNING: OImageEffect::blend : invalid opacity. Range [0, 1] "); |
867 | cerr << "WARNING: OImageEffect::blend : invalid opacity. Range [0, 1]\n"; | 857 | return dst; |
868 | #endif | ||
869 | return dst; | ||
870 | } | 858 | } |
@@ -873,3 +861,3 @@ QImage& OImageEffect::blend(const QColor& clr, QImage& dst, float opacity) | |||
873 | if (depth != 32) | 861 | if (depth != 32) |
874 | dst = dst.convertDepth(32); | 862 | dst = dst.convertDepth(32); |
875 | 863 | ||
@@ -905,11 +893,9 @@ QImage& OImageEffect::blend(QImage& src, QImage& dst, float opacity) | |||
905 | if (src.width() <= 0 || src.height() <= 0) | 893 | if (src.width() <= 0 || src.height() <= 0) |
906 | return dst; | 894 | return dst; |
907 | if (dst.width() <= 0 || dst.height() <= 0) | 895 | if (dst.width() <= 0 || dst.height() <= 0) |
908 | return dst; | 896 | return dst; |
909 | 897 | ||
910 | if (src.width() != dst.width() || src.height() != dst.height()) { | 898 | if (src.width() != dst.width() || src.height() != dst.height()) { |
911 | #ifndef NDEBUG | 899 | qDebug( "WARNING: OImageEffect::blend : src and destination images are not the same size" ); |
912 | cerr << "WARNING: OImageEffect::blend : src and destination images are not the same size\n"; | 900 | return dst; |
913 | #endif | ||
914 | return dst; | ||
915 | } | 901 | } |
@@ -917,6 +903,4 @@ QImage& OImageEffect::blend(QImage& src, QImage& dst, float opacity) | |||
917 | if (opacity < 0.0 || opacity > 1.0) { | 903 | if (opacity < 0.0 || opacity > 1.0) { |
918 | #ifndef NDEBUG | 904 | qDebug( "WARNING: OImageEffect::blend : invalid opacity. Range [0, 1]" ); |
919 | cerr << "WARNING: OImageEffect::blend : invalid opacity. Range [0, 1]\n"; | 905 | return dst; |
920 | #endif | ||
921 | return dst; | ||
922 | } | 906 | } |
@@ -959,6 +943,4 @@ QImage& OImageEffect::blend(QImage &image, float initial_intensity, | |||
959 | if (image.width() == 0 || image.height() == 0 || image.depth()!=32 ) { | 943 | if (image.width() == 0 || image.height() == 0 || image.depth()!=32 ) { |
960 | #ifndef NDEBUG | 944 | qDebug( "WARNING: OImageEffect::blend : invalid image" ); |
961 | cerr << "WARNING: OImageEffect::blend : invalid image\n"; | 945 | return image; |
962 | #endif | ||
963 | return image; | ||
964 | } | 946 | } |
@@ -1154,5 +1136,3 @@ QImage& OImageEffect::blend(QImage &image, float initial_intensity, | |||
1154 | } | 1136 | } |
1155 | #ifndef NDEBUG | 1137 | else qDebug( "OImageEffect::blend effect not implemented" ); |
1156 | else cerr << "OImageEffect::blend effect not implemented" << endl; | ||
1157 | #endif | ||
1158 | return image; | 1138 | return image; |
@@ -1186,6 +1166,4 @@ QImage& OImageEffect::blend(QImage &image1, QImage &image2, | |||
1186 | blendImage.width() == 0 || blendImage.height() == 0) { | 1166 | blendImage.width() == 0 || blendImage.height() == 0) { |
1187 | #ifndef NDEBUG | 1167 | qDebug( "OImageEffect::blend effect invalid image" ); |
1188 | cerr << "OImageEffect::blend effect invalid image" << endl; | 1168 | return image1; |
1189 | #endif | ||
1190 | return image1; | ||
1191 | } | 1169 | } |
@@ -1286,6 +1264,4 @@ QImage& OImageEffect::hash(QImage &image, Lighting lite, unsigned int spacing) | |||
1286 | if (image.width() == 0 || image.height() == 0) { | 1264 | if (image.width() == 0 || image.height() == 0) { |
1287 | #ifndef NDEBUG | 1265 | qDebug( "OImageEffect::hash effect invalid image" ); |
1288 | cerr << "OImageEffect::hash effect invalid image" << endl; | 1266 | return image; |
1289 | #endif | ||
1290 | return image; | ||
1291 | } | 1267 | } |
@@ -1796,6 +1772,4 @@ bool OImageEffect::blend( | |||
1796 | { | 1772 | { |
1797 | #ifndef NDEBUG | 1773 | qDebug( "OImageEffect::blend : Sizes not correct" ); |
1798 | cerr << "OImageEffect::blend : Sizes not correct\n" ; | 1774 | return false; |
1799 | #endif | ||
1800 | return false; | ||
1801 | } | 1775 | } |