HARRIS = 8,\r
SIMPLEBLOB = 9,\r
DENSE = 10,\r
+ BRISK = 11,\r
\r
\r
GRIDDETECTOR = 1000,\r
GRID_HARRIS = GRIDDETECTOR + HARRIS,\r
GRID_SIMPLEBLOB = GRIDDETECTOR + SIMPLEBLOB,\r
GRID_DENSE = GRIDDETECTOR + DENSE,\r
+ GRID_BRISK = GRIDDETECTOR + BRISK,\r
\r
\r
PYRAMIDDETECTOR = 2000,\r
PYRAMID_HARRIS = PYRAMIDDETECTOR + HARRIS,\r
PYRAMID_SIMPLEBLOB = PYRAMIDDETECTOR + SIMPLEBLOB,\r
PYRAMID_DENSE = PYRAMIDDETECTOR + DENSE,\r
+ PYRAMID_BRISK = PYRAMIDDETECTOR + BRISK,\r
\r
DYNAMICDETECTOR = 3000,\r
\r
DYNAMIC_GFTT = DYNAMICDETECTOR + GFTT,\r
DYNAMIC_HARRIS = DYNAMICDETECTOR + HARRIS,\r
DYNAMIC_SIMPLEBLOB = DYNAMICDETECTOR + SIMPLEBLOB,\r
- DYNAMIC_DENSE = DYNAMICDETECTOR + DENSE\r
+ DYNAMIC_DENSE = DYNAMICDETECTOR + DENSE,\r
+ DYNAMIC_BRISK = DYNAMICDETECTOR + BRISK\r
};\r
\r
- //supported: FAST STAR SIFT SURF ORB MSER GFTT HARRIS Grid(XXXX) Pyramid(XXXX) Dynamic(XXXX)\r
+ //supported: FAST STAR SIFT SURF ORB MSER GFTT HARRIS BRISK Grid(XXXX) Pyramid(XXXX) Dynamic(XXXX)\r
//not supported: SimpleBlob, Dense\r
CV_WRAP static javaFeatureDetector* create( int detectorType )\r
{\r
case DENSE:\r
name += "Dense";\r
break;\r
+ case BRISK:\r
+ name += "BRISK";\r
+ break;\r
default:\r
CV_Error( CV_StsBadArg, "Specified feature detector type is not supported." );\r
break;\r
SURF = 2,\r
ORB = 3,\r
BRIEF = 4,\r
+ BRISK = 5,\r
+ FREAK = 6,\r
\r
\r
OPPONENTEXTRACTOR = 1000,\r
OPPONENT_SIFT = OPPONENTEXTRACTOR + SIFT,\r
OPPONENT_SURF = OPPONENTEXTRACTOR + SURF,\r
OPPONENT_ORB = OPPONENTEXTRACTOR + ORB,\r
- OPPONENT_BRIEF = OPPONENTEXTRACTOR + BRIEF\r
+ OPPONENT_BRIEF = OPPONENTEXTRACTOR + BRIEF,\r
+ OPPONENT_BRISK = OPPONENTEXTRACTOR + BRISK,\r
+ OPPONENT_FREAK = OPPONENTEXTRACTOR + FREAK\r
};\r
\r
- //supported SIFT, SURF, ORB, BRIEF, Opponent(XXXX)\r
+ //supported SIFT, SURF, ORB, BRIEF, BRISK, FREAK, Opponent(XXXX)\r
//not supported: Calonder\r
CV_WRAP static javaDescriptorExtractor* create( int extractorType )\r
{\r
case BRIEF:\r
name += "BRIEF";\r
break;\r
+ case BRISK:\r
+ name += "BRISK";\r
+ break;\r
+ case FREAK:\r
+ name += "FREAK";\r
+ break;\r
default:\r
CV_Error( CV_StsBadArg, "Specified descriptor extractor type is not supported." );\r
break;\r