Mercurial > hg > piper-cpp

changeset 140:807a0a43096e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix a couple more compiler warnings
author Chris Cannam <c.cannam@qmul.ac.uk>
date Thu, 12 Jan 2017 09:00:35 +0000
parents 1c58149b64a2
children c3ddc4a72561
files vamp-json/VampJson.h vamp-server/simple-server.cpp
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/vamp-json/VampJson.h	Thu Jan 12 08:49:36 2017 +0000
+++ b/vamp-json/VampJson.h	Thu Jan 12 09:00:35 2017 +0000
@@ -156,8 +156,8 @@
         } else if (j["extents"].is_object()) {
             if (j["extents"]["min"].is_number() &&
                 j["extents"]["max"].is_number()) {
-                t.minValue = j["extents"]["min"].number_value();
-                t.maxValue = j["extents"]["max"].number_value();
+                t.minValue = float(j["extents"]["min"].number_value());
+                t.maxValue = float(j["extents"]["max"].number_value());
                 return true;
             } else {
                 err = "numbers expected for min and max";
--- a/vamp-server/simple-server.cpp	Thu Jan 12 08:49:36 2017 +0000
+++ b/vamp-server/simple-server.cpp	Thu Jan 12 09:00:35 2017 +0000
@@ -202,7 +202,7 @@
 
     if (j["id"].is_number()) {
         id.type = RequestOrResponse::RpcId::Number;
-        id.number = j["id"].number_value();
+        id.number = int(round(j["id"].number_value()));
     } else if (j["id"].is_string()) {
         id.type = RequestOrResponse::RpcId::Tag;
         id.tag = j["id"].string_value();