Merge pull request #1772 from mshabunin:fix-cnn_3dobj-build

Author: alalek

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_<float>(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);