generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2822 from timedia:akaze-java

Browse Source
This commit is contained in:
Roman Donchenko 2014-06-09 14:27:51 +04:00 committed by OpenCV Buildbot
commit 150dd39b08
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/java/generator/src/cpp/features2d_manual.hpp
View File

@ -36,6 +36,7 @@ public:
SIMPLEBLOB = 9, SIMPLEBLOB = 9,
DENSE = 10, DENSE = 10,
BRISK = 11, BRISK = 11,
AKAZE = 12,
GRIDDETECTOR = 1000, GRIDDETECTOR = 1000,
@ -51,6 +52,7 @@ public:
GRID_SIMPLEBLOB = GRIDDETECTOR + SIMPLEBLOB, GRID_SIMPLEBLOB = GRIDDETECTOR + SIMPLEBLOB,
GRID_DENSE = GRIDDETECTOR + DENSE, GRID_DENSE = GRIDDETECTOR + DENSE,
GRID_BRISK = GRIDDETECTOR + BRISK, GRID_BRISK = GRIDDETECTOR + BRISK,
GRID_AKAZE = GRIDDETECTOR + AKAZE,
PYRAMIDDETECTOR = 2000, PYRAMIDDETECTOR = 2000,
@ -66,6 +68,7 @@ public:
PYRAMID_SIMPLEBLOB = PYRAMIDDETECTOR + SIMPLEBLOB, PYRAMID_SIMPLEBLOB = PYRAMIDDETECTOR + SIMPLEBLOB,
PYRAMID_DENSE = PYRAMIDDETECTOR + DENSE, PYRAMID_DENSE = PYRAMIDDETECTOR + DENSE,
PYRAMID_BRISK = PYRAMIDDETECTOR + BRISK, PYRAMID_BRISK = PYRAMIDDETECTOR + BRISK,
PYRAMID_AKAZE = PYRAMIDDETECTOR + AKAZE,
DYNAMICDETECTOR = 3000, DYNAMICDETECTOR = 3000,
@ -79,10 +82,11 @@ public:
DYNAMIC_HARRIS = DYNAMICDETECTOR + HARRIS, DYNAMIC_HARRIS = DYNAMICDETECTOR + HARRIS,
DYNAMIC_SIMPLEBLOB = DYNAMICDETECTOR + SIMPLEBLOB, DYNAMIC_SIMPLEBLOB = DYNAMICDETECTOR + SIMPLEBLOB,
DYNAMIC_DENSE = DYNAMICDETECTOR + DENSE, DYNAMIC_DENSE = DYNAMICDETECTOR + DENSE,
DYNAMIC_BRISK = DYNAMICDETECTOR + BRISK DYNAMIC_BRISK = DYNAMICDETECTOR + BRISK,
DYNAMIC_AKAZE = DYNAMICDETECTOR + AKAZE
}; };
//supported: FAST STAR SIFT SURF ORB MSER GFTT HARRIS BRISK Grid(XXXX) Pyramid(XXXX) Dynamic(XXXX) //supported: FAST STAR SIFT SURF ORB MSER GFTT HARRIS BRISK AKAZE Grid(XXXX) Pyramid(XXXX) Dynamic(XXXX)
//not supported: SimpleBlob, Dense //not supported: SimpleBlob, Dense
CV_WRAP static javaFeatureDetector* create( int detectorType ) CV_WRAP static javaFeatureDetector* create( int detectorType )
{ {
@ -138,6 +142,9 @@ public:
case BRISK: case BRISK:
name = name + "BRISK"; name = name + "BRISK";
break; break;
case AKAZE:
name = name + "AKAZE";
break;
default: default:
CV_Error( Error::StsBadArg, "Specified feature detector type is not supported." ); CV_Error( Error::StsBadArg, "Specified feature detector type is not supported." );
break; break;
@ -305,6 +312,7 @@ public:
BRIEF = 4, BRIEF = 4,
BRISK = 5, BRISK = 5,
FREAK = 6, FREAK = 6,
AKAZE = 7,
OPPONENTEXTRACTOR = 1000, OPPONENTEXTRACTOR = 1000,
@ -316,10 +324,11 @@ public:
OPPONENT_ORB = OPPONENTEXTRACTOR + ORB, OPPONENT_ORB = OPPONENTEXTRACTOR + ORB,
OPPONENT_BRIEF = OPPONENTEXTRACTOR + BRIEF, OPPONENT_BRIEF = OPPONENTEXTRACTOR + BRIEF,
OPPONENT_BRISK = OPPONENTEXTRACTOR + BRISK, OPPONENT_BRISK = OPPONENTEXTRACTOR + BRISK,
OPPONENT_FREAK = OPPONENTEXTRACTOR + FREAK OPPONENT_FREAK = OPPONENTEXTRACTOR + FREAK,
OPPONENT_AKAZE = OPPONENTEXTRACTOR + AKAZE
}; };
//supported SIFT, SURF, ORB, BRIEF, BRISK, FREAK, Opponent(XXXX) //supported SIFT, SURF, ORB, BRIEF, BRISK, FREAK, AKAZE, Opponent(XXXX)
//not supported: Calonder //not supported: Calonder
CV_WRAP static javaDescriptorExtractor* create( int extractorType ) CV_WRAP static javaDescriptorExtractor* create( int extractorType )
{ {
@ -351,6 +360,9 @@ public:
case FREAK: case FREAK:
name = name + "FREAK"; name = name + "FREAK";
break; break;
case AKAZE:
name = name + "AKAZE";
break;
default: default:
CV_Error( Error::StsBadArg, "Specified descriptor extractor type is not supported." ); CV_Error( Error::StsBadArg, "Specified descriptor extractor type is not supported." );
break; break;