comparison transform/FeatureExtractionModelTransformer.cpp @ 1206:659372323b45 tony-2.0-integration

Merge latest SV 3.0 branch code
author Chris Cannam
date Fri, 19 Aug 2016 15:58:57 +0100
parents aa588c391d1a
children 5a1198083d9a
comparison
equal deleted inserted replaced
1136:e94719f941ba 1206:659372323b45
1005 } 1005 }
1006 } 1006 }
1007 1007
1008 } else if (isOutput<EditableDenseThreeDimensionalModel>(n)) { 1008 } else if (isOutput<EditableDenseThreeDimensionalModel>(n)) {
1009 1009
1010 DenseThreeDimensionalModel::Column values = 1010 DenseThreeDimensionalModel::Column values = feature.values;
1011 DenseThreeDimensionalModel::Column::fromStdVector(feature.values);
1012 1011
1013 EditableDenseThreeDimensionalModel *model = 1012 EditableDenseThreeDimensionalModel *model =
1014 getConformingOutput<EditableDenseThreeDimensionalModel>(n); 1013 getConformingOutput<EditableDenseThreeDimensionalModel>(n);
1015 if (!model) return; 1014 if (!model) return;
1016 1015