[Traverso-commit] traverso/src core/Peak.cpp traverso/songcanvas/...

[Ben Levitt]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Ben Levitt <benjie>     07/09/24 18:46:07

Modified files:
        src/core       : Peak.cpp 
        src/traverso/songcanvas: AudioClipView.cpp 

Log message:
        fix segv in Peak vs. draw_peaks

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Peak.cpp?cvsroot=traverso&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/AudioClipView.cpp?cvsroot=traverso&r1=1.91&r2=1.92

Patches:
Index: core/Peak.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Peak.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- core/Peak.cpp       20 Sep 2007 18:24:10 -0000      1.55
+++ core/Peak.cpp       24 Sep 2007 18:46:07 -0000      1.56
@@ -898,7 +898,7 @@
        }
                
        // Make sure the read buffer is big enough for this read
-       buffer->check_buffers_capacity(count, 1);
+       buffer->check_buffers_capacity(count*2, 1);
        
        // printf("read_from:: after_seek from %d, framepos is %d\n", start, 
m_readPos);
        Q_ASSERT(m_d->file);

Index: traverso/songcanvas/AudioClipView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/AudioClipView.cpp,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- traverso/songcanvas/AudioClipView.cpp       24 Sep 2007 16:58:39 -0000      
1.91
+++ traverso/songcanvas/AudioClipView.cpp       24 Sep 2007 18:46:07 -0000      
1.92
@@ -325,11 +325,7 @@
        if (!microView) {
                for (int chan=0; chan < channels; chan++) {
                        if (m_classicView) {
-                               for (int i = 0; i < (pixelcount*2); ++i) {
-                                       pixeldata[chan][i] = buffers[chan][i];
-                                       i++;
-                                       pixeldata[chan][i] = buffers[chan][i];
-                               }
+                               memcpy(pixeldata[chan], buffers[chan], 
pixelcount*2*sizeof(float));
                        } else {
                                for (int i = 0; i < (pixelcount*2); i+=2) {
                                        pixeldata[chan][i] = - 
f_max(buffers[chan][i], - buffers[chan][i+1]);