From ef6cefb3c2dc025576a7aaef46c331b1960c5735 Mon Sep 17 00:00:00 2001 From: Maksim Shabunin Date: Thu, 13 Sep 2018 12:53:33 +0300 Subject: [PATCH] Fixed cnn_3dobj module build --- modules/cnn_3dobj/test/test_cnn_3dobj_feature_extract.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/cnn_3dobj/test/test_cnn_3dobj_feature_extract.cpp b/modules/cnn_3dobj/test/test_cnn_3dobj_feature_extract.cpp index 10ade647c..89c139861 100755 --- a/modules/cnn_3dobj/test/test_cnn_3dobj_feature_extract.cpp +++ b/modules/cnn_3dobj/test/test_cnn_3dobj_feature_extract.cpp @@ -53,7 +53,7 @@ void CV_CNN_Feature_Test::run(int) // Reference feature is computed by Caffe extract_features tool. // To generate values for different images, use extract_features with the resetted image list in prototxt. Mat feature_reference = (Mat_(1,3) << -312.4805, 8.4768486, -224.98953); - float dist = norm(feature_test - feature_reference); + float dist = cvtest::norm(feature_test, feature_reference, NORM_L1); if (dist > 5) { ts->printf(cvtest::TS::LOG, "Extracted featrue is not the same from the one extracted from Caffe."); ts->set_failed_test_info(cvtest::TS::FAIL_MISSING_TEST_DATA);