Mouse tracking re-enabled for the vectorscope (got lost previously). Build warning...

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

diff --git a/src/colorcorrection/waveformgenerator.cpp b/src/colorcorrection/waveformgenerator.cpp
index 67419e28a1865af7e7c911405b25d98d2addbf69..971471e711a59b630a655ee859bca599f6993554 100644 (file)
--- a/src/colorcorrection/waveformgenerator.cpp
+++ b/src/colorcorrection/waveformgenerator.cpp
@@ -76,11 +76,10 @@ QImage WaveformGenerator::calculateWaveform(const QSize &waveformSize, const QIm
         const float wPrediv = (float)(ww-1)/(iw-1);
 
         const uchar *bits = image.bits();
-        const uchar *bitsStart = bits;
 
         for (uint i = 0, x = 0; i < byteCount; i += 4) {
 
-            Q_ASSERT(bits < bitsStart + byteCount);
+            Q_ASSERT(bits < image.bits() + byteCount);
 
             col = (QRgb *)bits;
 

diff --git a/src/vectorscope.cpp b/src/vectorscope.cpp
index 8f8b4dc49d2dd942d641c99c3d4d94e7b42f9b31..a445265d78a773e0f42a9c29d00eea69a0a48547 100644 (file)
--- a/src/vectorscope.cpp
+++ b/src/vectorscope.cpp
@@ -43,7 +43,7 @@ const QPointF YPbPr_Yl(-.5, .081);
 
 
 Vectorscope::Vectorscope(Monitor *projMonitor, Monitor *clipMonitor, QWidget *parent) :
-    AbstractScopeWidget(projMonitor, clipMonitor, parent),
+    AbstractScopeWidget(projMonitor, clipMonitor, true, parent),
     m_gain(1)
 {
     ui = new Ui::Vectorscope_UI();