Merge pull request #3796 from enpe:master

fd7a76fe · Vadim Pisarevsky · 092f599a · 32d56c6b · fd7a76fe
Commit fd7a76fe authored Mar 06, 2015 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

akaze.cpp modules/features2d/src/akaze.cpp +8 -1

No files found.
--- 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;
-            img.convertTo(img1_32, CV_32F, 1.0 / 255.0, 0);
+            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;