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.
 #include <stdlib.h>
 
-#include "oimageeffect.h"
+#include <opie2/oimageeffect.h>
+#include <opie2/odebug.h>
 
 #define MaxRGB 255L
@@ -64,5 +65,5 @@ QImage OImageEffect::gradient(const QSize &size, const QColor &ca,
 
     if (size.width() == 0 || size.height() == 0) {
-      qDebug( "WARNING: OImageEffect::gradient: invalid image" );
+      odebug << "WARNING: OImageEffect::gradient: invalid image" << oendl;
       return image;
     }
@@ -350,5 +351,5 @@ QImage OImageEffect::unbalancedGradient(const QSize &size, const QColor &ca,
 
     if (size.width() == 0 || size.height() == 0) {
-      qDebug( "WARNING: OImageEffect::unbalancedGradient : invalid image" );
+      odebug << "WARNING: OImageEffect::unbalancedGradient : invalid image" << oendl;
       return image;
     }
@@ -569,5 +570,5 @@ QImage& OImageEffect::intensity(QImage &image, float percent)
 {
     if (image.width() == 0 || image.height() == 0) {
-      qDebug( "WARNING: OImageEffect::intensity : invalid image" );
+      odebug << "WARNING: OImageEffect::intensity : invalid image" << oendl;
       return image;
     }
@@ -634,5 +635,5 @@ QImage& OImageEffect::channelIntensity(QImage &image, float percent,
 {
     if (image.width() == 0 || image.height() == 0) {
-      qDebug( "WARNING: OImageEffect::channelIntensity : invalid image" );
+      odebug << "WARNING: OImageEffect::channelIntensity : invalid image" << oendl;
       return image;
     }
@@ -724,5 +725,5 @@ QImage& OImageEffect::modulate(QImage &image, QImage &modImage, bool reverse,
     if (image.width() == 0 || image.height() == 0 ||
         modImage.width() == 0 || modImage.height() == 0) {
-          qDebug( "WARNING: OImageEffect::modulate : invalid image" );
+          odebug << "WARNING: OImageEffect::modulate : invalid image" << oendl;
           return image;
     }
@@ -853,5 +854,5 @@ QImage& OImageEffect::blend(const QColor& clr, QImage& dst, float opacity)
 
     if (opacity < 0.0 || opacity > 1.0) {
-        qDebug( "WARNING: OImageEffect::blend : invalid opacity. Range [0, 1] ");
+        odebug << "WARNING: OImageEffect::blend : invalid opacity. Range [0, 1] " << oendl;
         return dst;
     }
@@ -896,10 +897,10 @@ QImage& OImageEffect::blend(QImage& src, QImage& dst, float opacity)
 
     if (src.width() != dst.width() || src.height() != dst.height()) {
-        qDebug( "WARNING: OImageEffect::blend : src and destination images are not the same size" );
+        odebug << "WARNING: OImageEffect::blend : src and destination images are not the same size" << oendl;
         return dst;
     }
 
     if (opacity < 0.0 || opacity > 1.0) {
-        qDebug( "WARNING: OImageEffect::blend : invalid opacity. Range [0, 1]" );
+        odebug << "WARNING: OImageEffect::blend : invalid opacity. Range [0, 1]" << oendl;
         return dst;
     }
@@ -941,5 +942,5 @@ QImage& OImageEffect::blend(QImage &image, float initial_intensity,
 {
     if (image.width() == 0 || image.height() == 0 || image.depth()!=32 ) {
-        qDebug( "WARNING: OImageEffect::blend : invalid image" );
+        odebug << "WARNING: OImageEffect::blend : invalid image" << oendl;
         return image;
     }
@@ -1134,5 +1135,5 @@ QImage& OImageEffect::blend(QImage &image, float initial_intensity,
         }
     }
-    else qDebug( "OImageEffect::blend effect not implemented" );
+    else odebug << "OImageEffect::blend effect not implemented" << oendl;
     return image;
 }
@@ -1164,5 +1165,5 @@ QImage& OImageEffect::blend(QImage &image1, QImage &image2,
         image2.width() == 0 || image2.height() == 0 ||
         blendImage.width() == 0 || blendImage.height() == 0) {
-            qDebug( "OImageEffect::blend effect invalid image" );
+            odebug << "OImageEffect::blend effect invalid image" << oendl;
             return image1;
     }
@@ -1262,5 +1263,5 @@ QImage& OImageEffect::hash(QImage &image, Lighting lite, unsigned int spacing)
 {
     if (image.width() == 0 || image.height() == 0) {
-        qDebug( "OImageEffect::hash effect invalid image" );
+        odebug << "OImageEffect::hash effect invalid image" << oendl;
         return image;
     }
@@ -1770,5 +1771,5 @@ bool OImageEffect::blend(
   )
   {
-      qDebug( "OImageEffect::blend : Sizes not correct" );
+      odebug << "OImageEffect::blend : Sizes not correct" << oendl;
       return false;
   }
@@ -1987,5 +1988,5 @@ void OImageEffect::normalize(QImage &img)
     normalize_map = (unsigned int *)malloc((MaxRGB+1)*sizeof(unsigned int));
     if(!normalize_map || !histogram){
-        qWarning("Unable to allocate normalize histogram and map");
+        owarn << "Unable to allocate normalize histogram and map" << oendl;
         free(normalize_map);
         free(histogram);
@@ -2103,5 +2104,5 @@ void OImageEffect::equalize(QImage &img)
 
     if(!histogram || !map || !equalize_map){
-        qWarning("Unable to allocate equalize histogram and maps");
+        owarn << "Unable to allocate equalize histogram and maps" << oendl;
         free(histogram);
         free(map);
@@ -2188,5 +2189,5 @@ QImage OImageEffect::sample(QImage &src, int w, int h)
     y_offset = (double *)malloc(h*sizeof(double));
     if(!x_offset || !y_offset){
-        qWarning("Unable to allocate pixels buffer");
+        owarn << "Unable to allocate pixels buffer" << oendl;
         free(x_offset);
         free(y_offset);
@@ -2206,5 +2207,5 @@ QImage OImageEffect::sample(QImage &src, int w, int h)
         pixels = (unsigned int *)malloc(src.width()*sizeof(unsigned int));
         if(!pixels){
-            qWarning("Unable to allocate pixels buffer");
+            owarn << "Unable to allocate pixels buffer" << oendl;
             free(pixels);
             free(x_offset);
@@ -2234,5 +2235,5 @@ QImage OImageEffect::sample(QImage &src, int w, int h)
         pixels = (unsigned char *)malloc(src.width()*sizeof(unsigned char));
         if(!pixels){
-            qWarning("Unable to allocate pixels buffer");
+            owarn << "Unable to allocate pixels buffer" << oendl;
             free(pixels);
             free(x_offset);
@@ -3073,5 +3074,5 @@ QImage OImageEffect::oilPaint(QImage &src, int radius)
     // TODO 8bpp src!
     if(src.depth() < 32){
-        qWarning("Oil Paint source image < 32bpp. Convert before using!");
+        owarn << "Oil Paint source image < 32bpp. Convert before using!" << oendl;
         return(src);
     }