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

List:       kde-commits
Subject:    [calligra] krita/image: Rename triangle filter to bilinear to avoid some confusion
From:       Boudewijn Rempt <boud () valdyas ! org>
Date:       2012-12-28 14:45:23
Message-ID: 20121228144523.C6D06A6091 () git ! kde ! org
[Download RAW message or body]

Git commit dff1cb270ba8f64130ab915b0737d3702773786c by Boudewijn Rempt.
Committed on 28/12/2012 at 15:43.
Pushed by rempt into branch 'master'.

Rename triangle filter to bilinear to avoid some confusion

M  +3    -3    krita/image/kis_filter_strategy.cc
M  +3    -3    krita/image/kis_filter_strategy.h
M  +2    -2    krita/image/kis_image.cc
M  +1    -1    krita/image/tests/kis_filter_strategy_test.cpp

http://commits.kde.org/calligra/dff1cb270ba8f64130ab915b0737d3702773786c

diff --git a/krita/image/kis_filter_strategy.cc b/krita/image/kis_filter_strategy.cc
index 58f9567..1e397d7 100644
--- a/krita/image/kis_filter_strategy.cc
+++ b/krita/image/kis_filter_strategy.cc
@@ -96,14 +96,14 @@ qint32 KisBoxFilterStrategy::intValueAt(qint32 t) const
     return 0;
 }
 
-qreal KisTriangleFilterStrategy::valueAt(qreal t) const
+qreal KisBilinearFilterStrategy::valueAt(qreal t) const
 {
     if (t < 0.0) t = -t;
     if (t < 1.0) return(1.0 - t);
     return(0.0);
 }
 
-qint32 KisTriangleFilterStrategy::intValueAt(qint32 t) const
+qint32 KisBilinearFilterStrategy::intValueAt(qint32 t) const
 {
     /* f(t) = |t|, -1 <= t <= 1 */
     if (t < 0) t = -t;
@@ -194,7 +194,7 @@ KisFilterStrategyRegistry* KisFilterStrategyRegistry::instance()
         // s_instance->add(new KisHermiteFilterStrategy);
         s_instance->add(new KisBicubicFilterStrategy);
         s_instance->add(new KisBoxFilterStrategy);
-        s_instance->add(new KisTriangleFilterStrategy);
+        s_instance->add(new KisBilinearFilterStrategy);
         // s_instance->add(new KisBellFilterStrategy);
         // s_instance->add(new KisBSplineFilterStrategy);
         // s_instance->add(new KisLanczos3FilterStrategy);
diff --git a/krita/image/kis_filter_strategy.h b/krita/image/kis_filter_strategy.h
index cb43597..240fcc3 100644
--- a/krita/image/kis_filter_strategy.h
+++ b/krita/image/kis_filter_strategy.h
@@ -97,13 +97,13 @@ public:
     }
 };
 
-class KRITAIMAGE_EXPORT KisTriangleFilterStrategy : public KisFilterStrategy
+class KRITAIMAGE_EXPORT KisBilinearFilterStrategy : public KisFilterStrategy
 {
 public:
-    KisTriangleFilterStrategy() : KisFilterStrategy(KoID("Triangle", \
i18n("Bilinear"))) { +    KisBilinearFilterStrategy() : \
KisFilterStrategy(KoID("Bilinear", i18n("Bilinear"))) {  supportVal = 1.0; \
intSupportVal = 256;  }
-    virtual ~KisTriangleFilterStrategy() {}
+    virtual ~KisBilinearFilterStrategy() {}
 
     virtual qint32 intValueAt(qint32 t) const;
     virtual qreal valueAt(qreal t) const;
diff --git a/krita/image/kis_image.cc b/krita/image/kis_image.cc
index 077d638..c63f8c6 100644
--- a/krita/image/kis_image.cc
+++ b/krita/image/kis_image.cc
@@ -597,7 +597,7 @@ void KisImage::rotateImpl(const QString &actionName,
                                        KisProcessingApplicator::RECURSIVE | \
signalFlags,  emitSignals, actionName);
 
-    KisFilterStrategy *filter = \
KisFilterStrategyRegistry::instance()->value("Triangle"); +    KisFilterStrategy \
*filter = KisFilterStrategyRegistry::instance()->value("Bilinear");  
     KisProcessingVisitorSP visitor =
             new KisTransformProcessingVisitor(1.0, 1.0, 0.0, 0.0,
@@ -668,7 +668,7 @@ void KisImage::shearImpl(const QString &actionName,
                                        signalFlags,
                                        emitSignals, actionName);
 
-    KisFilterStrategy *filter = \
KisFilterStrategyRegistry::instance()->value("Triangle"); +    KisFilterStrategy \
*filter = KisFilterStrategyRegistry::instance()->value("Bilinear");  
     KisProcessingVisitorSP visitor =
             new KisTransformProcessingVisitor(1.0, 1.0,
diff --git a/krita/image/tests/kis_filter_strategy_test.cpp \
b/krita/image/tests/kis_filter_strategy_test.cpp index 8cd9dc9..1a36aff 100644
--- a/krita/image/tests/kis_filter_strategy_test.cpp
+++ b/krita/image/tests/kis_filter_strategy_test.cpp
@@ -27,7 +27,7 @@ void KisFilterStrategyTest::testCreation()
     Q_UNUSED(reg);
     KisHermiteFilterStrategy hermite;
     KisBoxFilterStrategy box;
-    KisTriangleFilterStrategy triangle;
+    KisBilinearFilterStrategy triangle;
     KisBellFilterStrategy bell;
     KisBSplineFilterStrategy bspline;
     KisLanczos3FilterStrategy  lanczos3;


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