From 91ed5df62de9959bccd0ea1e797ba3fa33602695 Mon Sep 17 00:00:00 2001 From: "Simon A. Eugster" Date: Tue, 14 Sep 2010 18:43:00 +0000 Subject: [PATCH] Mouse tracking re-enabled for the vectorscope (got lost previously). Build warning in waveform fixed. svn path=/trunk/kdenlive/; revision=4895 --- src/colorcorrection/waveformgenerator.cpp | 3 +-- src/vectorscope.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/colorcorrection/waveformgenerator.cpp b/src/colorcorrection/waveformgenerator.cpp index 67419e28..971471e7 100644 --- 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 8f8b4dc4..a445265d 100644 --- 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(); -- 2.39.2