diff layer/ScrollableMagRangeCache.cpp @ 1324:13d9b422f7fe zoom

Merge from default branch

--- a/layer/ScrollableMagRangeCache.cpp	Mon Dec 12 15:18:52 2016 +0000
+++ b/layer/ScrollableMagRangeCache.cpp	Mon Sep 17 13:51:31 2018 +0100
@@ -23,20 +23,20 @@
 
 void
 ScrollableMagRangeCache::scrollTo(const LayerGeometryProvider *v,
-				  sv_frame_t newStartFrame)
-{	
+                                  sv_frame_t newStartFrame)
+{        
     static HitCount count("ScrollableMagRangeCache: scrolling");
     
     int dx = (v->getXForFrame(m_startFrame) -
-	      v->getXForFrame(newStartFrame));
+              v->getXForFrame(newStartFrame));
 
 #ifdef DEBUG_SCROLLABLE_MAG_RANGE_CACHE
     cerr << "ScrollableMagRangeCache::scrollTo: start frame " << m_startFrame
-	 << " -> " << newStartFrame << ", dx = " << dx << endl;
+         << " -> " << newStartFrame << ", dx = " << dx << endl;
 #endif
 
     if (m_startFrame == newStartFrame) {
-	// haven't moved
+        // haven't moved
         count.hit();
         return;
     }
@@ -44,51 +44,51 @@
     m_startFrame = newStartFrame;
 
     if (dx == 0) {
-	// haven't moved visibly (even though start frame may have changed)
+        // haven't moved visibly (even though start frame may have changed)
         count.hit();
-	return;
+        return;
     }
-	
+        
     int w = int(m_ranges.size());
 
     if (dx <= -w || dx >= w) {
-	// scrolled entirely off
-	invalidate();
+        // scrolled entirely off
+        invalidate();
         count.miss();
-	return;
+        return;
     }
 
     count.partial();
-	
+        
     // dx is in range, cache is scrollable
 
     if (dx < 0) {
-	// The new start frame is to the left of the old start
-	// frame. We need to add some empty ranges at the left (start)
-	// end and clip the right end. Assemble -dx new values, then
-	// w+dx old values starting at index 0.
+        // The new start frame is to the left of the old start
+        // frame. We need to add some empty ranges at the left (start)
+        // end and clip the right end. Assemble -dx new values, then
+        // w+dx old values starting at index 0.
 
-	auto newRanges = vector<MagnitudeRange>(-dx);
-	newRanges.insert(newRanges.end(),
-			 m_ranges.begin(), m_ranges.begin() + (w + dx));
-	m_ranges = newRanges;
-	
+        auto newRanges = vector<MagnitudeRange>(-dx);
+        newRanges.insert(newRanges.end(),
+                         m_ranges.begin(), m_ranges.begin() + (w + dx));
+        m_ranges = newRanges;
+        
     } else {
-	// The new start frame is to the right of the old start
-	// frame. We want to clip the left (start) end and add some
-	// empty ranges at the right end. Assemble w-dx old values
-	// starting at index dx, then dx new values.
+        // The new start frame is to the right of the old start
+        // frame. We want to clip the left (start) end and add some
+        // empty ranges at the right end. Assemble w-dx old values
+        // starting at index dx, then dx new values.
 
-	auto newRanges = vector<MagnitudeRange>(dx);
-	newRanges.insert(newRanges.begin(),
-			 m_ranges.begin() + dx, m_ranges.end());
-	m_ranges = newRanges;
+        auto newRanges = vector<MagnitudeRange>(dx);
+        newRanges.insert(newRanges.begin(),
+                         m_ranges.begin() + dx, m_ranges.end());
+        m_ranges = newRanges;
     }
 
 #ifdef DEBUG_SCROLLABLE_MAG_RANGE_CACHE
     cerr << "maxes (" << m_ranges.size() << ") now: ";
     for (int i = 0; in_range_for(m_ranges, i); ++i) {
-	cerr << m_ranges[i].getMax() << " ";
+        cerr << m_ranges[i].getMax() << " ";
     }
     cerr << endl;
 #endif
@@ -102,7 +102,7 @@
     cerr << "ScrollableMagRangeCache::getRange(" << x << ", " << count << ")" << endl;
 #endif
     for (int i = 0; i < count; ++i) {
-	r.sample(m_ranges.at(x + i));
+        r.sample(m_ranges.at(x + i));
     }
     return r;
 }
@@ -111,12 +111,12 @@
 ScrollableMagRangeCache::sampleColumn(int column, const MagnitudeRange &r)
 {
     if (!in_range_for(m_ranges, column)) {
-	cerr << "ERROR: ScrollableMagRangeCache::sampleColumn: column " << column
-	     << " is out of range for cache of width " << m_ranges.size()
-	     << " (with start frame " << m_startFrame << ")" << endl;
-	throw logic_error("column out of range");
+        cerr << "ERROR: ScrollableMagRangeCache::sampleColumn: column " << column
+             << " is out of range for cache of width " << m_ranges.size()
+             << " (with start frame " << m_startFrame << ")" << endl;
+        throw logic_error("column out of range");
     } else {
-	m_ranges[column].sample(r);
+        m_ranges[column].sample(r);
     }
 }