From f062174e87e6f3c034b77f34069350e6f462a474 Mon Sep 17 00:00:00 2001 From: "Simon A. Eugster" Date: Fri, 18 Mar 2011 10:13:14 +0000 Subject: [PATCH] Some memleaks closed with valgrind --leak-check=full --track-origins=yes src/cmake_bindir/kdenlive svn path=/trunk/kdenlive/; revision=5500 --- src/audioscopes/audiospectrum.cpp | 1 + src/audioscopes/spectrogram.cpp | 1 + src/clipitem.cpp | 6 +++--- src/colorscopes/vectorscope.cpp | 1 + src/colorscopes/waveform.cpp | 2 ++ src/customtrackview.cpp | 4 +++- src/customtrackview.h | 2 +- src/mainwindow.cpp | 1 + src/renderer.cpp | 7 ++++++- src/smallruler.cpp | 9 +++++---- src/timecodedisplay.cpp | 1 + 11 files changed, 25 insertions(+), 10 deletions(-) diff --git a/src/audioscopes/audiospectrum.cpp b/src/audioscopes/audiospectrum.cpp index 50b4aea5..ecab68fb 100644 --- a/src/audioscopes/audiospectrum.cpp +++ b/src/audioscopes/audiospectrum.cpp @@ -101,6 +101,7 @@ AudioSpectrum::~AudioSpectrum() delete m_aResetHz; delete m_aTrackMouse; + delete ui; } void AudioSpectrum::readConfig() diff --git a/src/audioscopes/spectrogram.cpp b/src/audioscopes/spectrogram.cpp index 06a4c013..c0759003 100644 --- a/src/audioscopes/spectrogram.cpp +++ b/src/audioscopes/spectrogram.cpp @@ -88,6 +88,7 @@ Spectrogram::~Spectrogram() delete m_aResetHz; delete m_aTrackMouse; delete m_aGrid; + delete ui; } void Spectrogram::readConfig() diff --git a/src/clipitem.cpp b/src/clipitem.cpp index 73573ec4..cf9a6736 100644 --- a/src/clipitem.cpp +++ b/src/clipitem.cpp @@ -1402,7 +1402,7 @@ EffectsParameterList ClipItem::addEffect(const QDomElement effect, bool /*animat if (effectId.isEmpty()) effectId = effect.attribute("tag"); parameters.addParam("id", effectId); - // special case: the affine effect needs in / out points + // special case: the affine effect needs in / out points if (effectId == "pan_zoom") { parameters.addParam("in", QString::number(cropStart().frames(m_fps))); parameters.addParam("out", QString::number((cropStart() + cropDuration()).frames(m_fps))); @@ -1762,9 +1762,9 @@ void ClipItem::doGetIntraThumbs(QPainter *painter, const QPointF startPos, int o } QPixmap p; for (int i = start; i <= end; i++) { - if (!view->pixmapCache->find(m_clip->fileURL().path() + "%" + QString::number(i), p)) { + if (!view->m_pixmapCache->find(m_clip->fileURL().path() + "%" + QString::number(i), p)) { p = m_clip->thumbProducer()->extractImage(i, twidth, theight); - view->pixmapCache->insert(m_clip->fileURL().path() + "%" + QString::number(i), p); + view->m_pixmapCache->insert(m_clip->fileURL().path() + "%" + QString::number(i), p); } painter->drawPixmap(startPos + QPointF(twidth *(i - offset), 0), p); } diff --git a/src/colorscopes/vectorscope.cpp b/src/colorscopes/vectorscope.cpp index e7ffd0a8..9bf50aff 100644 --- a/src/colorscopes/vectorscope.cpp +++ b/src/colorscopes/vectorscope.cpp @@ -136,6 +136,7 @@ Vectorscope::~Vectorscope() delete m_aAxisEnabled; delete m_a75PBox; delete m_agColorSpace; + delete ui; } QString Vectorscope::widgetName() const { return QString("Vectorscope"); } diff --git a/src/colorscopes/waveform.cpp b/src/colorscopes/waveform.cpp index 1dd6304e..47597ac3 100644 --- a/src/colorscopes/waveform.cpp +++ b/src/colorscopes/waveform.cpp @@ -27,6 +27,7 @@ const int Waveform::m_paddingBottom(20); Waveform::Waveform(Monitor *projMonitor, Monitor *clipMonitor, QWidget *parent) : AbstractGfxScopeWidget(projMonitor, clipMonitor, true, parent) + ,ui(NULL) { ui = new Ui::Waveform_UI(); ui->setupUi(this); @@ -67,6 +68,7 @@ Waveform::~Waveform() delete m_aRec601; delete m_aRec709; delete m_agRec; + delete ui; } void Waveform::readConfig() diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 8a8b6dba..ceca754e 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -142,7 +142,7 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscen m_activeTrackBrush = KStatefulBrush(KColorScheme::View, KColorScheme::ActiveBackground, KSharedConfig::openConfig(KdenliveSettings::colortheme())); - pixmapCache = new KPixmapCache("kdenlive-thumbs"); + m_pixmapCache = new KPixmapCache("kdenlive-thumbs"); m_animationTimer = new QTimeLine(800); m_animationTimer->setFrameRange(0, 5); @@ -188,6 +188,8 @@ CustomTrackView::~CustomTrackView() qDeleteAll(m_guides); m_guides.clear(); m_waitingThumbs.clear(); + delete m_pixmapCache; + delete m_animationTimer; } //virtual diff --git a/src/customtrackview.h b/src/customtrackview.h index 2abde9e2..18a0446d 100644 --- a/src/customtrackview.h +++ b/src/customtrackview.h @@ -177,7 +177,7 @@ public: void clearSelection(); void editItemDuration(); void buildGuidesMenu(QMenu *goMenu) const; - KPixmapCache* pixmapCache; + KPixmapCache* m_pixmapCache; /** update the timeline objects when palette changes */ void updatePalette(); /** @brief Returns true if a track has audio data on it. diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 01d8daf1..e3151e18 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -616,6 +616,7 @@ MainWindow::~MainWindow() delete m_projectMonitor; delete m_clipMonitor; delete m_shortcutRemoveFocus; + delete[] m_transitions; Mlt::Factory::close(); } diff --git a/src/renderer.cpp b/src/renderer.cpp index 3d2b2492..054aa0c6 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -122,6 +122,7 @@ Render::~Render() { m_isBlocked = 1; closeMlt(); + delete m_mltProfile; } @@ -156,6 +157,8 @@ void Render::closeMlt() Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); if (trackPlaylist.type() == playlist_type) trackPlaylist.clear(); } + delete field; + field = NULL; } mlt_service_unlock(service.get_service()); } @@ -181,7 +184,9 @@ void Render::buildConsumer(const QString profileName) m_blackClip = NULL; //TODO: uncomment following line when everything is clean - //if (m_mltProfile) delete m_mltProfile; + // uncommented Feb 2011 --Granjow + if (m_mltProfile) delete m_mltProfile; + m_mltProfile = new Mlt::Profile(tmp); m_mltProfile->get_profile()->is_explicit = 1; delete[] tmp; diff --git a/src/smallruler.cpp b/src/smallruler.cpp index 5f287b35..c9dbf48f 100644 --- a/src/smallruler.cpp +++ b/src/smallruler.cpp @@ -30,10 +30,11 @@ SmallRuler::SmallRuler(MonitorManager *manager, QWidget *parent) : - QWidget(parent), - m_scale(1), - m_maxval(25), - m_manager(manager) + QWidget(parent) + ,m_cursorFramePosition(0) + ,m_scale(1) + ,m_maxval(25) + ,m_manager(manager) { m_zoneStart = 10; m_zoneEnd = 60; diff --git a/src/timecodedisplay.cpp b/src/timecodedisplay.cpp index 8f65b722..acd1515a 100644 --- a/src/timecodedisplay.cpp +++ b/src/timecodedisplay.cpp @@ -34,6 +34,7 @@ TimecodeDisplay::TimecodeDisplay(Timecode t, QWidget *parent) : QAbstractSpinBox(parent), m_timecode(t), + m_frametimecode(false), m_minimum(0), m_maximum(-1) { -- 2.39.2