Niklas Frisk 8138e26163 Fixes #3910, flags in _prepareImgAndDrawKeypoints are now binary OR'ed instead of added. ... Conflicts: modules/features2d/src/draw.cpp		2015-05-24 13:31:11 +02:00
..
include/opencv2	Leave AGAST at thresold=10, cosmetic for perf tests.	2015-04-30 02:23:58 +03:00
misc/java	Modified java wrapping mechanism	2015-03-02 18:12:30 +03:00
perf	Leave AGAST at thresold=10, cosmetic for perf tests.	2015-04-30 02:23:58 +03:00
src	Fixes #3910, flags in _prepareImgAndDrawKeypoints are now binary OR'ed instead of added.	2015-05-24 13:31:11 +02:00
test	another attempt to make the MSER test pass. removed possible randomization in parameters from run to run	2015-05-21 17:10:35 +03:00
CMakeLists.txt	Python support	2015-03-02 18:13:00 +03:00