fix compositing for premultiplication and non-alpha cases

[inkscape.git] / src / live_effects / effect.cpp

diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index 1e86ab479be37adc0108183c738527e262054081..d13de7f9e9fea2d99c5a13ce0cdfd8b45b525c57 100644 (file)
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -30,6 +30,7 @@
 #include "live_effects/lpe-slant.h"\r
 #include "live_effects/lpe-test-doEffect-stack.h"\r
 #include "live_effects/lpe-gears.h"\r
+#include "live_effects/lpe-curvestitch.h"\r
 \r
 namespace Inkscape {\r
 \r
@@ -37,10 +38,13 @@ namespace LivePathEffect {
 \r
 const Util::EnumData<EffectType> LPETypeData[INVALID_LPE] = {\r
     // {constant defined in effect.h, _("name of your effect"), "name of your effect in SVG"}\r
-    {SKELETAL_STROKES,      _("Skeletal Strokes"),      "skeletal"},\r
+    {SKELETAL_STROKES,      _("Path along path"),      "skeletal"},\r
+#ifdef LPE_ENABLE_TEST_EFFECTS\r
     {SLANT,                 _("Slant"),                 "slant"},\r
     {DOEFFECTSTACK_TEST,    _("doEffect stack test"),   "doeffectstacktest"},\r
-    {GEARS,                 _("Gears"),                 "gears"}\r
+#endif\r
+    {GEARS,                 _("Gears"),                 "gears"},\r
+    {CURVE_STITCH,          _("Curve stitching"),       "curvestitching"},\r
 };\r
 const Util::EnumDataConverter<EffectType> LPETypeConverter(LPETypeData, INVALID_LPE);\r
 \r
@@ -52,15 +56,20 @@ Effect::New(EffectType lpenr, LivePathEffectObject *lpeobj)
         case SKELETAL_STROKES:\r
             neweffect = (Effect*) new LPESkeletalStrokes(lpeobj);\r
             break;\r
-        case SLANT:\r
+#ifdef LPE_ENABLE_TEST_EFFECTS\r
+            case SLANT:\r
             neweffect = (Effect*) new LPESlant(lpeobj);\r
             break;\r
         case DOEFFECTSTACK_TEST:\r
             neweffect = (Effect*) new LPEdoEffectStackTest(lpeobj);\r
             break;\r
+#endif\r
         case GEARS:\r
             neweffect = (Effect*) new LPEGears(lpeobj);\r
             break;\r
+        case CURVE_STITCH:\r
+            neweffect = (Effect*) new LPECurveStitch(lpeobj);\r
+            break;\r
         default:\r
             g_warning("LivePathEffect::Effect::New   called with invalid patheffect type (%d)", lpenr);\r
             neweffect = NULL;\r