Diffstat (limited to 'libopie2/opieui/oimageeffect.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | libopie2/opieui/oimageeffect.cpp | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/libopie2/opieui/oimageeffect.cpp b/libopie2/opieui/oimageeffect.cpp index 01e7c6f..9a58bb9 100644 --- a/libopie2/opieui/oimageeffect.cpp +++ b/libopie2/opieui/oimageeffect.cpp | |||
@@ -35,5 +35,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |||
35 | #include <stdlib.h> | 35 | #include <stdlib.h> |
36 | 36 | ||
37 | #include "oimageeffect.h" | 37 | #include <opie2/oimageeffect.h> |
38 | #include <opie2/odebug.h> | ||
38 | 39 | ||
39 | #define MaxRGB 255L | 40 | #define MaxRGB 255L |
@@ -64,5 +65,5 @@ QImage OImageEffect::gradient(const QSize &size, const QColor &ca, | |||
64 | 65 | ||
65 | if (size.width() == 0 || size.height() == 0) { | 66 | if (size.width() == 0 || size.height() == 0) { |
66 | qDebug( "WARNING: OImageEffect::gradient: invalid image" ); | 67 | odebug << "WARNING: OImageEffect::gradient: invalid image" << oendl; |
67 | return image; | 68 | return image; |
68 | } | 69 | } |
@@ -350,5 +351,5 @@ QImage OImageEffect::unbalancedGradient(const QSize &size, const QColor &ca, | |||
350 | 351 | ||
351 | if (size.width() == 0 || size.height() == 0) { | 352 | if (size.width() == 0 || size.height() == 0) { |
352 | qDebug( "WARNING: OImageEffect::unbalancedGradient : invalid image" ); | 353 | odebug << "WARNING: OImageEffect::unbalancedGradient : invalid image" << oendl; |
353 | return image; | 354 | return image; |
354 | } | 355 | } |
@@ -569,5 +570,5 @@ QImage& OImageEffect::intensity(QImage &image, float percent) | |||
569 | { | 570 | { |
570 | if (image.width() == 0 || image.height() == 0) { | 571 | if (image.width() == 0 || image.height() == 0) { |
571 | qDebug( "WARNING: OImageEffect::intensity : invalid image" ); | 572 | odebug << "WARNING: OImageEffect::intensity : invalid image" << oendl; |
572 | return image; | 573 | return image; |
573 | } | 574 | } |
@@ -634,5 +635,5 @@ QImage& OImageEffect::channelIntensity(QImage &image, float percent, | |||
634 | { | 635 | { |
635 | if (image.width() == 0 || image.height() == 0) { | 636 | if (image.width() == 0 || image.height() == 0) { |
636 | qDebug( "WARNING: OImageEffect::channelIntensity : invalid image" ); | 637 | odebug << "WARNING: OImageEffect::channelIntensity : invalid image" << oendl; |
637 | return image; | 638 | return image; |
638 | } | 639 | } |
@@ -724,5 +725,5 @@ QImage& OImageEffect::modulate(QImage &image, QImage &modImage, bool reverse, | |||
724 | if (image.width() == 0 || image.height() == 0 || | 725 | if (image.width() == 0 || image.height() == 0 || |
725 | modImage.width() == 0 || modImage.height() == 0) { | 726 | modImage.width() == 0 || modImage.height() == 0) { |
726 | qDebug( "WARNING: OImageEffect::modulate : invalid image" ); | 727 | odebug << "WARNING: OImageEffect::modulate : invalid image" << oendl; |
727 | return image; | 728 | return image; |
728 | } | 729 | } |
@@ -853,5 +854,5 @@ QImage& OImageEffect::blend(const QColor& clr, QImage& dst, float opacity) | |||
853 | 854 | ||
854 | if (opacity < 0.0 || opacity > 1.0) { | 855 | if (opacity < 0.0 || opacity > 1.0) { |
855 | qDebug( "WARNING: OImageEffect::blend : invalid opacity. Range [0, 1] "); | 856 | odebug << "WARNING: OImageEffect::blend : invalid opacity. Range [0, 1] " << oendl; |
856 | return dst; | 857 | return dst; |
857 | } | 858 | } |
@@ -896,10 +897,10 @@ QImage& OImageEffect::blend(QImage& src, QImage& dst, float opacity) | |||
896 | 897 | ||
897 | if (src.width() != dst.width() || src.height() != dst.height()) { | 898 | if (src.width() != dst.width() || src.height() != dst.height()) { |
898 | qDebug( "WARNING: OImageEffect::blend : src and destination images are not the same size" ); | 899 | odebug << "WARNING: OImageEffect::blend : src and destination images are not the same size" << oendl; |
899 | return dst; | 900 | return dst; |
900 | } | 901 | } |
901 | 902 | ||
902 | if (opacity < 0.0 || opacity > 1.0) { | 903 | if (opacity < 0.0 || opacity > 1.0) { |
903 | qDebug( "WARNING: OImageEffect::blend : invalid opacity. Range [0, 1]" ); | 904 | odebug << "WARNING: OImageEffect::blend : invalid opacity. Range [0, 1]" << oendl; |
904 | return dst; | 905 | return dst; |
905 | } | 906 | } |
@@ -941,5 +942,5 @@ QImage& OImageEffect::blend(QImage &image, float initial_intensity, | |||
941 | { | 942 | { |
942 | if (image.width() == 0 || image.height() == 0 || image.depth()!=32 ) { | 943 | if (image.width() == 0 || image.height() == 0 || image.depth()!=32 ) { |
943 | qDebug( "WARNING: OImageEffect::blend : invalid image" ); | 944 | odebug << "WARNING: OImageEffect::blend : invalid image" << oendl; |
944 | return image; | 945 | return image; |
945 | } | 946 | } |
@@ -1134,5 +1135,5 @@ QImage& OImageEffect::blend(QImage &image, float initial_intensity, | |||
1134 | } | 1135 | } |
1135 | } | 1136 | } |
1136 | else qDebug( "OImageEffect::blend effect not implemented" ); | 1137 | else odebug << "OImageEffect::blend effect not implemented" << oendl; |
1137 | return image; | 1138 | return image; |
1138 | } | 1139 | } |
@@ -1164,5 +1165,5 @@ QImage& OImageEffect::blend(QImage &image1, QImage &image2, | |||
1164 | image2.width() == 0 || image2.height() == 0 || | 1165 | image2.width() == 0 || image2.height() == 0 || |
1165 | blendImage.width() == 0 || blendImage.height() == 0) { | 1166 | blendImage.width() == 0 || blendImage.height() == 0) { |
1166 | qDebug( "OImageEffect::blend effect invalid image" ); | 1167 | odebug << "OImageEffect::blend effect invalid image" << oendl; |
1167 | return image1; | 1168 | return image1; |
1168 | } | 1169 | } |
@@ -1262,5 +1263,5 @@ QImage& OImageEffect::hash(QImage &image, Lighting lite, unsigned int spacing) | |||
1262 | { | 1263 | { |
1263 | if (image.width() == 0 || image.height() == 0) { | 1264 | if (image.width() == 0 || image.height() == 0) { |
1264 | qDebug( "OImageEffect::hash effect invalid image" ); | 1265 | odebug << "OImageEffect::hash effect invalid image" << oendl; |
1265 | return image; | 1266 | return image; |
1266 | } | 1267 | } |
@@ -1770,5 +1771,5 @@ bool OImageEffect::blend( | |||
1770 | ) | 1771 | ) |
1771 | { | 1772 | { |
1772 | qDebug( "OImageEffect::blend : Sizes not correct" ); | 1773 | odebug << "OImageEffect::blend : Sizes not correct" << oendl; |
1773 | return false; | 1774 | return false; |
1774 | } | 1775 | } |
@@ -1987,5 +1988,5 @@ void OImageEffect::normalize(QImage &img) | |||
1987 | normalize_map = (unsigned int *)malloc((MaxRGB+1)*sizeof(unsigned int)); | 1988 | normalize_map = (unsigned int *)malloc((MaxRGB+1)*sizeof(unsigned int)); |
1988 | if(!normalize_map || !histogram){ | 1989 | if(!normalize_map || !histogram){ |
1989 | qWarning("Unable to allocate normalize histogram and map"); | 1990 | owarn << "Unable to allocate normalize histogram and map" << oendl; |
1990 | free(normalize_map); | 1991 | free(normalize_map); |
1991 | free(histogram); | 1992 | free(histogram); |
@@ -2103,5 +2104,5 @@ void OImageEffect::equalize(QImage &img) | |||
2103 | 2104 | ||
2104 | if(!histogram || !map || !equalize_map){ | 2105 | if(!histogram || !map || !equalize_map){ |
2105 | qWarning("Unable to allocate equalize histogram and maps"); | 2106 | owarn << "Unable to allocate equalize histogram and maps" << oendl; |
2106 | free(histogram); | 2107 | free(histogram); |
2107 | free(map); | 2108 | free(map); |
@@ -2188,5 +2189,5 @@ QImage OImageEffect::sample(QImage &src, int w, int h) | |||
2188 | y_offset = (double *)malloc(h*sizeof(double)); | 2189 | y_offset = (double *)malloc(h*sizeof(double)); |
2189 | if(!x_offset || !y_offset){ | 2190 | if(!x_offset || !y_offset){ |
2190 | qWarning("Unable to allocate pixels buffer"); | 2191 | owarn << "Unable to allocate pixels buffer" << oendl; |
2191 | free(x_offset); | 2192 | free(x_offset); |
2192 | free(y_offset); | 2193 | free(y_offset); |
@@ -2206,5 +2207,5 @@ QImage OImageEffect::sample(QImage &src, int w, int h) | |||
2206 | pixels = (unsigned int *)malloc(src.width()*sizeof(unsigned int)); | 2207 | pixels = (unsigned int *)malloc(src.width()*sizeof(unsigned int)); |
2207 | if(!pixels){ | 2208 | if(!pixels){ |
2208 | qWarning("Unable to allocate pixels buffer"); | 2209 | owarn << "Unable to allocate pixels buffer" << oendl; |
2209 | free(pixels); | 2210 | free(pixels); |
2210 | free(x_offset); | 2211 | free(x_offset); |
@@ -2234,5 +2235,5 @@ QImage OImageEffect::sample(QImage &src, int w, int h) | |||
2234 | pixels = (unsigned char *)malloc(src.width()*sizeof(unsigned char)); | 2235 | pixels = (unsigned char *)malloc(src.width()*sizeof(unsigned char)); |
2235 | if(!pixels){ | 2236 | if(!pixels){ |
2236 | qWarning("Unable to allocate pixels buffer"); | 2237 | owarn << "Unable to allocate pixels buffer" << oendl; |
2237 | free(pixels); | 2238 | free(pixels); |
2238 | free(x_offset); | 2239 | free(x_offset); |
@@ -3073,5 +3074,5 @@ QImage OImageEffect::oilPaint(QImage &src, int radius) | |||
3073 | // TODO 8bpp src! | 3074 | // TODO 8bpp src! |
3074 | if(src.depth() < 32){ | 3075 | if(src.depth() < 32){ |
3075 | qWarning("Oil Paint source image < 32bpp. Convert before using!"); | 3076 | owarn << "Oil Paint source image < 32bpp. Convert before using!" << oendl; |
3076 | return(src); | 3077 | return(src); |
3077 | } | 3078 | } |