comparison data/model/WaveFileModel.cpp @ 225:185454896a76

* Return ranges from RangeSummarisableTimeValueModel::getRanges by references
  instead of by return value.  Trying to isolate a Win32 problem.

     }
 
     return i;
 }
 
-WaveFileModel::RangeBlock
+void
 WaveFileModel::getRanges(size_t channel, size_t start, size_t end,
-			 size_t &blockSize) const
-{
-    RangeBlock ranges;
-    if (!isOK()) return ranges;
+                         RangeBlock &ranges, size_t &blockSize) const
+{
+    ranges.clear();
+    if (!isOK()) return;
 
     if (end <= start) {
 	std::cerr << "WARNING: Internal error: end <= start in WaveFileModel::getRanges (end = " << end << ", start = " << start << ", blocksize = " << blockSize << ")" << std::endl;
-	return ranges;
+	return;
     }
 
     int cacheType = 0;
     int power = m_zoomConstraint.getMinCachePower();
     blockSize = m_zoomConstraint.getNearestBlockSize

 
 	if (count > 0) {
             ranges.push_back(Range(min, max, total / count));
 	}
 
-	return ranges;
+	return;
 
     } else {
 
 	QMutexLocker locker(&m_mutex);
     

             ranges.push_back(Range(min, max, total / count));
 	}
     }
 
     //cerr << "returning " << ranges.size() << " ranges" << endl;
-    return ranges;
+    return;
 }
 
 WaveFileModel::Range
 WaveFileModel::getRange(size_t channel, size_t start, size_t end) const
 {

     size_t blockEnd = (end / blockSize) * blockSize;
 
     if (blockStart < start) blockStart += blockSize;
         
     if (blockEnd > blockStart) {
-        RangeBlock ranges = getRanges(channel, blockStart, blockEnd, blockSize);
+        RangeBlock ranges;
+        getRanges(channel, blockStart, blockEnd, ranges, blockSize);
         for (size_t i = 0; i < ranges.size(); ++i) {
             if (first || ranges[i].min < range.min) range.min = ranges[i].min;
             if (first || ranges[i].max > range.max) range.max = ranges[i].max;
             if (first || ranges[i].absmean < range.absmean) range.absmean = ranges[i].absmean;
             first = false;