feature2d: fix descriptors allocation for AKAZE and KAZE

hrnr · hrnr · commit c22f72e248a5 · 2017-06-07T16:55:41.000+02:00
fix crash when descriptors are UMat
diff --git a/modules/features2d/src/akaze.cpp b/modules/features2d/src/akaze.cpp
@@ -211,8 +211,10 @@ namespace cv
 
             if( descriptors.needed() )
             {
-                Mat& desc = descriptors.getMatRef();
+                Mat desc;
                 impl.Compute_Descriptors(keypoints, desc);
+                // TODO optimize this copy
+                desc.copyTo(descriptors);
 
                 CV_Assert((!desc.rows || desc.cols == descriptorSize()));
                 CV_Assert((!desc.rows || (desc.type() == descriptorType())));
diff --git a/modules/features2d/src/kaze.cpp b/modules/features2d/src/kaze.cpp
@@ -151,8 +151,9 @@ namespace cv
 
             if( descriptors.needed() )
             {
-                Mat& desc = descriptors.getMatRef();
+                Mat desc;
                 impl.Feature_Description(keypoints, desc);
+                desc.copyTo(descriptors);
 
                 CV_Assert((!desc.rows || desc.cols == descriptorSize()));
                 CV_Assert((!desc.rows || (desc.type() == descriptorType())));

Original file line number	Diff line number	Diff line change
`@@ -151,8 +151,9 @@ namespace cv`
`151`	`151`
`152`	`152`	`if( descriptors.needed() )`
`153`	`153`	`{`
`154`		`- Mat& desc = descriptors.getMatRef();`
	`154`	`+ Mat desc;`
`155`	`155`	`impl.Feature_Description(keypoints, desc);`
	`156`	`+ desc.copyTo(descriptors);`
`156`	`157`
`157`	`158`	`CV_Assert((!desc.rows \|\| desc.cols == descriptorSize()));`
`158`	`159`	`CV_Assert((!desc.rows \|\| (desc.type() == descriptorType())));`