the first draft of transparent API and new UMat class. more files

2013-10-22 14:05:15 +04:00
parent 278fb617d2
commit d8c8339bec
17 changed files with 1318 additions and 362 deletions
--- a/modules/legacy/src/features2d.cpp
+++ b/modules/legacy/src/features2d.cpp
@@ -82,7 +82,7 @@ cvExtractSURF( const CvArr* _img, const CvArr* _mask,
    surf->set("upright", params.upright != 0);
    surf->set("extended", params.extended != 0);

-    surf->operator()(img, mask, kpt, _descriptors ? _OutputArray(descr) : noArray(),
+    surf->operator()(img, mask, kpt, _descriptors ? _OutputArray(descr) : (OutputArray)noArray(),
                     useProvidedKeyPts != 0);

    if( _keypoints )