Mercurial > hg > svgui

diff layer/RegionLayer.cpp @ 991:2adca8f05583 3.0-integration

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch simple-fft-model
author Chris Cannam
date Wed, 01 Jul 2015 18:31:28 +0100
parents 4fe7a09be0fe 3871dffc31bd
children 5144d7185fb5
line wrap: on
line diff
--- a/layer/RegionLayer.cpp	Wed Jul 01 13:27:03 2015 +0100
+++ b/layer/RegionLayer.cpp	Wed Jul 01 18:31:28 2015 +0100
@@ -306,7 +306,7 @@
 {
     if (!m_model) return RegionModel::PointList();
 
-    long frame = v->getFrameForX(x);
+    sv_frame_t frame = v->getFrameForX(x);
 
     RegionModel::PointList onPoints =
 	m_model->getPoints(frame);
@@ -349,7 +349,7 @@
 {
     if (!m_model) return false;
 
-    long frame = v->getFrameForX(x);
+    sv_frame_t frame = v->getFrameForX(x);
 
     RegionModel::PointList onPoints = m_model->getPoints(frame);
     if (onPoints.empty()) return false;
@@ -1125,7 +1125,7 @@
 {
     if (!m_model) return;
 
-    long frame = v->getFrameForX(e->x());
+    sv_frame_t frame = v->getFrameForX(e->x());
     if (frame < 0) frame = 0;
     frame = frame / m_model->getResolution() * m_model->getResolution();
 
@@ -1263,7 +1263,7 @@
     int newx = m_dragPointX + xdist;
     int newy = m_dragPointY + ydist;
 
-    long frame = v->getFrameForX(newx);
+    sv_frame_t frame = v->getFrameForX(newx);
     if (frame < 0) frame = 0;
     frame = frame / m_model->getResolution() * m_model->getResolution();