Mercurial > hg > svcore

diff data/model/WaveFileModel.cpp @ 608:d7f3dfe6f9a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* solaris build fixes
author Chris Cannam
date Thu, 10 Sep 2009 18:44:45 +0000
parents d3faa6447c5b
children 06f13a3b9e9e
line wrap: on
line diff
--- a/data/model/WaveFileModel.cpp	Thu Sep 10 14:31:49 2009 +0000
+++ b/data/model/WaveFileModel.cpp	Thu Sep 10 18:44:45 2009 +0000
@@ -494,8 +494,8 @@
 	    cacheBlock = (1 << m_zoomConstraint.getMinCachePower());
             div = (1 << power) / cacheBlock;
 	} else {
-	    cacheBlock = ((unsigned int)((1 << m_zoomConstraint.getMinCachePower()) * sqrt(2) + 0.01));
-            div = ((unsigned int)((1 << power) * sqrt(2) + 0.01)) / cacheBlock;
+	    cacheBlock = ((unsigned int)((1 << m_zoomConstraint.getMinCachePower()) * sqrt(2.) + 0.01));
+            div = ((unsigned int)((1 << power) * sqrt(2.) + 0.01)) / cacheBlock;
 	}
 
 	size_t startIndex = start / cacheBlock;
@@ -656,7 +656,7 @@
     size_t cacheBlockSize[2];
     cacheBlockSize[0] = (1 << m_model.m_zoomConstraint.getMinCachePower());
     cacheBlockSize[1] = ((unsigned int)((1 << m_model.m_zoomConstraint.getMinCachePower()) *
-                                        sqrt(2) + 0.01));
+                                        sqrt(2.) + 0.01));
     
     size_t frame = 0;
     int readBlockSize = 16384;