added COLOR_... enumeration to imgproc.hpp and EVENT_... enumeration to highgui.hpp

This commit is contained in:
Vadim Pisarevsky
2011-07-18 13:05:34 +00:00
parent 86105b8727
commit 16ba62dcd5
16 changed files with 187 additions and 35 deletions

View File

@@ -1,6 +1,5 @@
import numpy as np
import cv2
import cv2.cv as cv
from common import anorm
help_message = '''SURF image match
@@ -25,7 +24,7 @@ def draw_match(img1, img2, p1, p2, status = None, H = None):
vis = np.zeros((max(h1, h2), w1+w2), np.uint8)
vis[:h1, :w1] = img1
vis[:h2, w1:w1+w2] = img2
vis = cv2.cvtColor(vis, cv.CV_GRAY2BGR)
vis = cv2.cvtColor(vis, cv2.COLOR_GRAY2BGR)
if H is not None:
corners = np.float32([[0, 0], [w1, 0], [w1, h1], [0, h1]])