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

List:       kde-commits
Subject:    [kdenlive] src/timeline: Fix Extract corruption found by thediveo
From:       Jean-Baptiste Mardelle <jb () kdenlive ! org>
Date:       2016-04-25 20:41:06
Message-ID: E1aunJa-0001SS-LK () scm ! kde ! org
[Download RAW message or body]

Git commit 1526861788a805797952a9e859f4dcd721f0ab12 by Jean-Baptiste Mardelle.
Committed on 25/04/2016 at 20:40.
Pushed by mardelle into branch 'master'.

Fix Extract corruption found by thediveo
Ref: T1961

M  +4    -13   src/timeline/customtrackview.cpp

http://commits.kde.org/kdenlive/1526861788a805797952a9e859f4dcd721f0ab12

diff --git a/src/timeline/customtrackview.cpp b/src/timeline/customtrackview.cpp
index 9cf5c80..1176c3d 100644
--- a/src/timeline/customtrackview.cpp
+++ b/src/timeline/customtrackview.cpp
@@ -3209,7 +3209,10 @@ void CustomTrackView::extractZone(bool closeGap)
                 }
                 ItemInfo moveInfo = item->info();
                 if (item->type() == AVWidget) {
-                    if (moveInfo.startPos < outPoint && moveInfo.endPos > outPoint) \
{ +                    if (moveInfo.startPos < outPoint) {
+                        if (moveInfo.endPos <= outPoint) {
+                            continue;
+                        }
                         moveInfo.startPos = outPoint;
                         moveInfo.cropDuration = moveInfo.endPos - moveInfo.startPos;
                     }
@@ -8196,18 +8199,6 @@ void CustomTrackView::dropTransitionGeometry(Transition \
*trans, const QString &g  trans->setSelected(true);
         updateTimelineSelection();
     }
-    /*ItemInfo info = trans->info();
-    QPoint p;
-    ClipItem *transitionClip = getClipItemAtStart(info.startPos, info.track);
-    if (transitionClip && transitionClip->binClip()) {
-        int frameWidth = \
transitionClip->binClip()->getProducerIntProperty(QStringLiteral("meta.media.width"));
                
-        int frameHeight = \
transitionClip->binClip()->getProducerIntProperty(QStringLiteral("meta.media.height"));
                
-        double factor = \
transitionClip->binClip()->getProducerProperty(QStringLiteral("aspect_ratio")).toDouble();
                
-        if (factor == 0) factor = 1.0;
-        p.setX((int)(frameWidth * factor + 0.5));
-        p.setY(frameHeight);
-    }
-    emit transitionItemSelected(trans, getPreviousVideoTrack(info.track), p, \
true);*/  QMap <QString, QString> data;
     data.insert(i18n("Dropped Geometry"), geometry);
     slotImportClipKeyframes(TransitionWidget, trans->info(), trans->toXML(), data);


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