[vlmc-devel] commit: Fixed resizing. ( Hugo Beauzée-Luyssen )

git at videolan.org git at videolan.org
Sun Apr 18 19:53:18 CEST 2010


vlmc | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Sun Apr 18 17:40:33 2010 +0200| [2f14a0c8b0545dcbd1aa7175651b241e9ca6e701] | committer: Hugo Beauzée-Luyssen 

Fixed resizing.

> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=2f14a0c8b0545dcbd1aa7175651b241e9ca6e701
---

 src/Gui/timeline/AbstractGraphicsMediaItem.cpp |    2 +-
 src/Workflow/ClipHelper.cpp                    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Gui/timeline/AbstractGraphicsMediaItem.cpp b/src/Gui/timeline/AbstractGraphicsMediaItem.cpp
index a6433a5..d0f6b0b 100644
--- a/src/Gui/timeline/AbstractGraphicsMediaItem.cpp
+++ b/src/Gui/timeline/AbstractGraphicsMediaItem.cpp
@@ -242,7 +242,7 @@ void AbstractGraphicsMediaItem::resize( qint64 size, From from )
     if ( from == BEGINNING )
     {
         if ( clipHelper()->clip()->getMedia()->fileType() != Media::Image )
-            if ( clipHelper()->begin() + size > clipHelper()->end() )
+            if ( clipHelper()->begin() + size > clipHelper()->clip()->end() )
                 return;
         MainWorkflow::getInstance()->resizeClip( m_clipHelper, m_clipHelper->begin(),
                                                  m_clipHelper->begin() + size, 0,
diff --git a/src/Workflow/ClipHelper.cpp b/src/Workflow/ClipHelper.cpp
index 8e7c5a6..d6cff1f 100644
--- a/src/Workflow/ClipHelper.cpp
+++ b/src/Workflow/ClipHelper.cpp
@@ -59,7 +59,7 @@ ClipHelper::setBoundaries( qint64 begin, qint64 end )
 {
     if ( begin >= m_clip->m_begin )
         m_begin = begin;
-    if ( end <= m_end )
+    if ( end <= m_clip->m_end )
         m_end = end;
     emit lengthUpdated();
 }



More information about the Vlmc-devel mailing list