[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src/core Peak.cpp
From: |
Remon Sijrier |
Subject: |
[Traverso-commit] traverso/src/core Peak.cpp |
Date: |
Mon, 17 Sep 2007 18:42:13 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 07/09/17 18:42:13
Modified files:
src/core : Peak.cpp
Log message:
fix double free in microview
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Peak.cpp?cvsroot=traverso&r1=1.52&r2=1.53
Patches:
Index: Peak.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Peak.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- Peak.cpp 17 Sep 2007 18:29:27 -0000 1.52
+++ Peak.cpp 17 Sep 2007 18:42:13 -0000 1.53
@@ -297,7 +297,7 @@
nframes_t toRead = pixelcount * zoomStep[zoomLevel];
TimeRef startlocation(startPos, 44100);
- nframes_t readFrames =
m_source->file_read(m_peakdataDecodeBuffer, startlocation, toRead);
+ nframes_t readFrames =
m_source->file_read(data->peakdataDecodeBuffer, startlocation, toRead);
if (readFrames == 0) {
return NO_PEAKDATA_FOUND;
@@ -315,14 +315,14 @@
// MicroView needs a buffer to store the calculated peakdata
// our decodebuffer's readbuffer is large enough for this
purpose
// and it's no problem to use it at this point in the process
chain.
- float* peakdata = m_peakdataDecodeBuffer->readBuffer;
+ float* peakdata = data->peakdataDecodeBuffer->readBuffer;
do {
valueMax = valueMin = 0;
for(int i=0; i < zoomStep[zoomLevel]; i++) {
Q_ASSERT(pos <= readFrames);
- sample =
m_peakdataDecodeBuffer->destination[chan][pos];
+ sample =
data->peakdataDecodeBuffer->destination[chan][pos];
if (sample > valueMax)
valueMax = sample;
if (sample < valueMin)