Merge pull request #3796 from enpe:master

10 years ago · fd7a76fe5d
parent 092f599aac 32d56c6b43
commit fd7a76fe5d
1 changed files with 8 additions and 1 deletions
--- a/modules/features2d/src/akaze.cpp
+++ b/modules/features2d/src/akaze.cpp
@ -172,7 +172,14 @@ namespace cv
                cvtColor(image, img, COLOR_BGR2GRAY);
            Mat img1_32;
            if ( img.depth() == CV_32F )
                img1_32 = img;
            else if ( img.depth() == CV_8U )
                img.convertTo(img1_32, CV_32F, 1.0 / 255.0, 0);
            else if ( img.depth() == CV_16U )
                img.convertTo(img1_32, CV_32F, 1.0 / 65535.0, 0);
            CV_Assert( ! img1_32.empty() );
            AKAZEOptions options;
            options.descriptor = descriptor;