From a681b3e3da514fc95a211fc4310ce9aaf961c541 Mon Sep 17 00:00:00 2001 From: toine Date: Fri, 28 Aug 2015 16:47:34 +0100 Subject: [PATCH] add support for opencv 3+ --- CMT.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/CMT.py b/CMT.py index 8ca0d96..104adbe 100644 --- a/CMT.py +++ b/CMT.py @@ -26,9 +26,15 @@ class CMT(object): def initialise(self, im_gray0, tl, br): # Initialise detector, descriptor, matcher - self.detector = cv2.FeatureDetector_create(self.DETECTOR) - self.descriptor = cv2.DescriptorExtractor_create(self.DESCRIPTOR) - self.matcher = cv2.DescriptorMatcher_create(self.MATCHER) + # check opencv version + if cv2.__version__ < 3.0: + self.detector = cv2.FeatureDetector_create(self.DETECTOR) + self.descriptor = cv2.DescriptorExtractor_create(self.DESCRIPTOR) + self.matcher = cv2.DescriptorMatcher_create(self.MATCHER) + else: + self.detector = cv2.BRISK_create() + self.descriptor = self.detector + self.matcher = cv2.BFMatcher(cv2.NORM_HAMMING) # Get initial keypoints in whole image keypoints_cv = self.detector.detect(im_gray0)