From b73d9b585fe5e0771eb9dbf18fa4fc46f09c1e4c Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sun, 18 Nov 2012 21:48:29 +0000 Subject: fix prev commit (stupid C++ needs explicit typecast) git-svn-id: svn://localhost/ardour2/branches/3.0@13529 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/evoral/src/Curve.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libs') diff --git a/libs/evoral/src/Curve.cpp b/libs/evoral/src/Curve.cpp index 6da5db2dd5..dae23dc591 100644 --- a/libs/evoral/src/Curve.cpp +++ b/libs/evoral/src/Curve.cpp @@ -226,7 +226,7 @@ Curve::_get_vector (double x0, double x1, float *vec, int32_t veclen) double frac = (min_x - x0) / (x1 - x0); int64_t subveclen = (int64_t) floor (veclen * frac); - subveclen = min (subveclen, veclen); + subveclen = min (subveclen, (int64_t)veclen); for (i = 0; i < subveclen; ++i) { vec[i] = _list.events().front()->value; @@ -246,7 +246,7 @@ Curve::_get_vector (double x0, double x1, float *vec, int32_t veclen) float val; - subveclen = min (subveclen, veclen); + subveclen = min (subveclen, (int64_t)veclen); val = _list.events().back()->value; -- cgit v1.2.3