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

Merge pull request #40 from emchristiansen/manualBRISKFREAK

Browse Source
This commit is contained in:
Andrey Kamaev 2012-10-12 12:28:37 +04:00
commit a390c1e2e6
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,6 +33,7 @@ public:
HARRIS = 8, HARRIS = 8,
SIMPLEBLOB = 9, SIMPLEBLOB = 9,
DENSE = 10, DENSE = 10,
BRISK = 11,
GRIDDETECTOR = 1000, GRIDDETECTOR = 1000,
@ -47,6 +48,7 @@ public:
GRID_HARRIS = GRIDDETECTOR + HARRIS, GRID_HARRIS = GRIDDETECTOR + HARRIS,
GRID_SIMPLEBLOB = GRIDDETECTOR + SIMPLEBLOB, GRID_SIMPLEBLOB = GRIDDETECTOR + SIMPLEBLOB,
GRID_DENSE = GRIDDETECTOR + DENSE, GRID_DENSE = GRIDDETECTOR + DENSE,
GRID_BRISK = GRIDDETECTOR + BRISK,
PYRAMIDDETECTOR = 2000, PYRAMIDDETECTOR = 2000,
@ -61,6 +63,7 @@ public:
PYRAMID_HARRIS = PYRAMIDDETECTOR + HARRIS, PYRAMID_HARRIS = PYRAMIDDETECTOR + HARRIS,
PYRAMID_SIMPLEBLOB = PYRAMIDDETECTOR + SIMPLEBLOB, PYRAMID_SIMPLEBLOB = PYRAMIDDETECTOR + SIMPLEBLOB,
PYRAMID_DENSE = PYRAMIDDETECTOR + DENSE, PYRAMID_DENSE = PYRAMIDDETECTOR + DENSE,
PYRAMID_BRISK = PYRAMIDDETECTOR + BRISK,
DYNAMICDETECTOR = 3000, DYNAMICDETECTOR = 3000,
@ -73,10 +76,11 @@ public:
DYNAMIC_GFTT = DYNAMICDETECTOR + GFTT, DYNAMIC_GFTT = DYNAMICDETECTOR + GFTT,
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
}; };
//supported: FAST STAR SIFT SURF ORB MSER GFTT HARRIS Grid(XXXX) Pyramid(XXXX) Dynamic(XXXX) //supported: FAST STAR SIFT SURF ORB MSER GFTT HARRIS BRISK 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 )
{ {
@ -129,6 +133,9 @@ public:
case DENSE: case DENSE:
name += "Dense"; name += "Dense";
break; break;
case BRISK:
name += "BRISK";
break;
default: default:
CV_Error( CV_StsBadArg, "Specified feature detector type is not supported." ); CV_Error( CV_StsBadArg, "Specified feature detector type is not supported." );
break; break;
@ -267,6 +274,8 @@ public:
SURF = 2, SURF = 2,
ORB = 3, ORB = 3,
BRIEF = 4, BRIEF = 4,
BRISK = 5,
FREAK = 6,
OPPONENTEXTRACTOR = 1000, OPPONENTEXTRACTOR = 1000,
@ -276,10 +285,12 @@ public:
OPPONENT_SIFT = OPPONENTEXTRACTOR + SIFT, OPPONENT_SIFT = OPPONENTEXTRACTOR + SIFT,
OPPONENT_SURF = OPPONENTEXTRACTOR + SURF, OPPONENT_SURF = OPPONENTEXTRACTOR + SURF,
OPPONENT_ORB = OPPONENTEXTRACTOR + ORB, OPPONENT_ORB = OPPONENTEXTRACTOR + ORB,
OPPONENT_BRIEF = OPPONENTEXTRACTOR + BRIEF OPPONENT_BRIEF = OPPONENTEXTRACTOR + BRIEF,
OPPONENT_BRISK = OPPONENTEXTRACTOR + BRISK,
OPPONENT_FREAK = OPPONENTEXTRACTOR + FREAK
}; };
//supported SIFT, SURF, ORB, BRIEF, Opponent(XXXX) //supported SIFT, SURF, ORB, BRIEF, BRISK, FREAK, Opponent(XXXX)
//not supported: Calonder //not supported: Calonder
CV_WRAP static javaDescriptorExtractor* create( int extractorType ) CV_WRAP static javaDescriptorExtractor* create( int extractorType )
{ {
@ -305,6 +316,12 @@ public:
case BRIEF: case BRIEF:
name += "BRIEF"; name += "BRIEF";
break; break;
case BRISK:
name += "BRISK";
break;
case FREAK:
name += "FREAK";
break;
default: default:
CV_Error( CV_StsBadArg, "Specified descriptor extractor type is not supported." ); CV_Error( CV_StsBadArg, "Specified descriptor extractor type is not supported." );
break; break;