rotoscoping:

- rename mode "matte" to "luma"
- fix possible crash

svn path=/trunk/kdenlive/; revision=5440

diff --git a/effects/rotoscoping.xml b/effects/rotoscoping.xml
index 0a7bf07260c20ab070e9700029334bcca90b084a..9548f5c1044dad3e2c6c6f43cc360472490ffdc9 100644 (file)
--- a/effects/rotoscoping.xml
+++ b/effects/rotoscoping.xml
@@ -4,8 +4,8 @@
         <description>Keyframable vector based rotoscoping</description>
         <author>Till Theato</author>
 
-        <parameter type="list" name="mode" default="alpha" paramlist="alpha,matte,rgb">
-            <paramlistdisplay>Alpha,Matte,RGB</paramlistdisplay>
+        <parameter type="list" name="mode" default="alpha" paramlist="alpha,luma,rgb">
+            <paramlistdisplay>Alpha,Luma,RGB</paramlistdisplay>
             <name>Mode</name>
         </parameter>
 

diff --git a/src/rotoscoping/rotowidget.cpp b/src/rotoscoping/rotowidget.cpp
index d1c2133d73d8814932a0b7ecf1df020fd13d5b09..3d120c38f14b580af4f863f662dc094daa8acca6 100644 (file)
--- a/src/rotoscoping/rotowidget.cpp
+++ b/src/rotoscoping/rotowidget.cpp
@@ -194,7 +194,8 @@ void RotoWidget::slotPositionChanged(int pos, bool seek)
             QList <BPoint> p;
             qreal relPos = (pos - keyframe1) / (qreal)(keyframe2 - keyframe1 + 1);
 
-            for (int i = 0; i < p1.count(); ++i) {
+            int count = qMin(p1.count(), p2.count());
+            for (int i = 0; i < count; ++i) {
                 BPoint bp;
                 for (int j = 0; j < 3; ++j) {
                     if (p1.at(i)[j] != p2.at(i)[j])