don't run OpenVX pyrLK if user asked for err vector

savuor · savuor · commit 328151c8a4b4 · 2016-12-16T23:38:47.000+03:00
diff --git a/modules/video/src/lkpyramid.cpp b/modules/video/src/lkpyramid.cpp
@@ -1091,11 +1091,10 @@ namespace
         for(size_t i = 0; i < npoints; i++ )
             status[i] = true;
 
-        Mat errMat;
+        // OpenVX doesn't return detection errors
         if( _err.needed() )
         {
-            _err.create((int)npoints, 1, CV_32F, -1, true);
-            errMat = _err.getMat();
+            return false;
         }
 
         try
@@ -1184,8 +1183,6 @@ namespace
                 vx_keypoint_t kp = vxNextPts[i];
                 nextPtsMat.at<Point2f>(i) = Point2f(kp.x, kp.y);
                 statusMat.at<uchar>(i) = (bool)kp.tracking_status;
-                // OpenVX doesn't return detection errors
-                errMat.at<float>(i) = 0;
             }
 
 #ifdef VX_VERSION_1_1

Original file line number	Diff line number	Diff line change
`@@ -1091,11 +1091,10 @@ namespace`
`1091`	`1091`	`for(size_t i = 0; i < npoints; i++ )`
`1092`	`1092`	`status[i] = true;`
`1093`	`1093`
`1094`		`- Mat errMat;`
	`1094`	`+ // OpenVX doesn't return detection errors`
`1095`	`1095`	`if( _err.needed() )`
`1096`	`1096`	`{`
`1097`		`- _err.create((int)npoints, 1, CV_32F, -1, true);`
`1098`		`- errMat = _err.getMat();`
	`1097`	`+ return false;`
`1099`	`1098`	`}`
`1100`	`1099`
`1101`	`1100`	`try`
`@@ -1184,8 +1183,6 @@ namespace`
`1184`	`1183`	`vx_keypoint_t kp = vxNextPts[i];`
`1185`	`1184`	`nextPtsMat.at<Point2f>(i) = Point2f(kp.x, kp.y);`
`1186`	`1185`	`statusMat.at<uchar>(i) = (bool)kp.tracking_status;`
`1187`		`- // OpenVX doesn't return detection errors`
`1188`		`- errMat.at<float>(i) = 0;`
`1189`	`1186`	`}`
`1190`	`1187`
`1191`	`1188`	`#ifdef VX_VERSION_1_1`