diff data/model/DenseThreeDimensionalModel.h @ 1057:5c5d4863b428 tonioni

Merge from cxx11 branch

--- a/data/model/DenseThreeDimensionalModel.h	Mon Mar 23 10:04:48 2015 +0000
+++ b/data/model/DenseThreeDimensionalModel.h	Mon Mar 23 11:26:28 2015 +0000
@@ -93,7 +93,7 @@
      * value which does not vary from one column to the next. This is
      * only meaningful if hasBinValues() returns true.
      */
-    virtual float getBinValue(int n) const { return n; }
+    virtual float getBinValue(int n) const { return float(n); }
 
     /**
      * Obtain the name of the unit of the values returned from
@@ -171,11 +171,11 @@
         return SortNumeric;
     }
 
-    virtual long getFrameForRow(int row) const {
-        return row * getResolution();
+    virtual sv_frame_t getFrameForRow(int row) const {
+        return sv_frame_t(row) * getResolution();
     }
-    virtual int getRowForFrame(long frame) const {
-        return frame / getResolution();
+    virtual int getRowForFrame(sv_frame_t frame) const {
+        return int(frame / getResolution());
     }
 
 protected: