[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [digikam] core/libs/dimg/filters/fx: fix clang warnings
From:       Gilles Caulier <null () kde ! org>
Date:       2018-09-27 5:44:17
Message-ID: E1g5P61-0002p8-5C () code ! kde ! org
[Download RAW message or body]

Git commit 601768c53eeb9e83874097cb9863431485b5cc0b by Gilles Caulier.
Committed on 27/09/2018 at 05:43.
Pushed by cgilles into branch 'master'.

fix clang warnings

M  +4    -6    core/libs/dimg/filters/fx/charcoalfilter.cpp
M  +4    -1    core/libs/dimg/filters/fx/charcoalfilter.h

https://commits.kde.org/digikam/601768c53eeb9e83874097cb9863431485b5cc0b

diff --git a/core/libs/dimg/filters/fx/charcoalfilter.cpp \
b/core/libs/dimg/filters/fx/charcoalfilter.cpp index 95e7ab8a1d..96e23f518c 100644
--- a/core/libs/dimg/filters/fx/charcoalfilter.cpp
+++ b/core/libs/dimg/filters/fx/charcoalfilter.cpp
@@ -205,8 +205,6 @@ void CharcoalFilter::convolveImageMultithreaded(uint start, uint \
stop, double* n  
     for (uint y = start ; runningFlag() && (y < stop) ; ++y)
     {
-        sy = y - (kernelWidth / 2);
-
         for (uint x = 0 ; runningFlag() && (x < width) ; ++x)
         {
             k   = normal_kernel;
@@ -275,7 +273,7 @@ bool CharcoalFilter::convolveImage(const unsigned int order, \
const double* kerne  return false;
     }
 
-    for (i = 0; i < (kernelWidth * kernelWidth); ++i)
+    for (i = 0 ; i < (kernelWidth * kernelWidth) ; ++i)
     {
         normalize += kernel[i];
     }
@@ -287,7 +285,7 @@ bool CharcoalFilter::convolveImage(const unsigned int order, \
const double* kerne  
     normalize = 1.0 / normalize;
 
-    for (i = 0; i < (kernelWidth * kernelWidth); ++i)
+    for (i = 0 ; i < (kernelWidth * kernelWidth) ; ++i)
     {
         normal_kernel[i] = normalize * kernel[i];
     }
@@ -308,7 +306,7 @@ bool CharcoalFilter::convolveImage(const unsigned int order, \
const double* kerne  ));
     }
 
-    foreach(QFuture<void> t, tasks)
+    foreach (QFuture<void> t, tasks)
         t.waitForFinished();
 
     return true;
@@ -325,7 +323,7 @@ int CharcoalFilter::getOptimalKernelWidth(double radius, double \
sigma)  return((int)(2.0 * ceil(radius) + 1.0));
     }
 
-    for (kernelWidth = 5; ;)
+    for (kernelWidth = 5 ; ;)
     {
         normalize = 0.0;
 
diff --git a/core/libs/dimg/filters/fx/charcoalfilter.h \
b/core/libs/dimg/filters/fx/charcoalfilter.h index bcda4f7b54..fa6f0b9a32 100644
--- a/core/libs/dimg/filters/fx/charcoalfilter.h
+++ b/core/libs/dimg/filters/fx/charcoalfilter.h
@@ -40,7 +40,10 @@ class DIGIKAM_EXPORT CharcoalFilter : public DImgThreadedFilter
 public:
 
     explicit CharcoalFilter(QObject* const parent = 0);
-    explicit CharcoalFilter(DImg* const orgImage, QObject* const parent=0, double \
pencil=5.0, double smooth=10.0); +    explicit CharcoalFilter(DImg* const orgImage,
+                            QObject* const parent=0,
+                            double pencil=5.0,
+                            double smooth=10.0);
     ~CharcoalFilter();
 
     static QString          FilterIdentifier()


[prev in list] [next in list] [prev in thread] [next in thread]