Mercurial > hg > piper-cpp

diff capnproto/VampnProto.h @ 66:6f160dee1192

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Instead of using separate values and b64values entries in JSON serialisations, allow numeric arrays to be replaced by b64 variants wherever they appear (discriminating by type). Also rename values to featureValues in feature throughout, as values turns out to be a hazardous name in a JS context. Finally use Array instead of Text for array encoding (seems clearer).
author Chris Cannam <c.cannam@qmul.ac.uk>
date Tue, 27 Sep 2016 15:04:59 +0100
parents 85ec33975434
children db17657ac875
line wrap: on
line diff
--- a/capnproto/VampnProto.h	Fri Sep 23 14:23:10 2016 +0100
+++ b/capnproto/VampnProto.h	Tue Sep 27 15:04:59 2016 +0100
@@ -277,7 +277,7 @@
         b.setLabel(f.label);
 
         if (f.values.size() > 0) {
-            auto values = b.initValues(f.values.size());
+            auto values = b.initFeatureValues(f.values.size());
             for (size_t i = 0; i < f.values.size(); ++i) {
                 values.set(i, f.values[i]);
             }
@@ -301,7 +301,7 @@
         f.label = r.getLabel();
 
         f.values.clear();
-        auto vv = r.getValues();
+        auto vv = r.getFeatureValues();
         for (auto v: vv) {
             f.values.push_back(v);
         }