renamed cv.cv.CV_CAP_xxx to cv.CAP_xxx for OpenCV 3.0 api

vlachoudis · Oct 2, 2017 · 4daf5db · 4daf5db
1 parent 38f4b00
commit 4daf5db
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/Camera.py b/Camera.py
@@ -64,16 +64,16 @@ def _getCameraProperties(self, prefix):
 			property.
 		"""
 		POSSIBLE_PROPERTIES = {
-			'height': (Utils.getInt, cv.cv.CV_CAP_PROP_FRAME_HEIGHT, ),
-			'width': (Utils.getInt, cv.cv.CV_CAP_PROP_FRAME_WIDTH, ),
-			'fps': (Utils.getInt, cv.cv.CV_CAP_PROP_FPS, ),
-			'codec': (Utils.getStr, cv.cv.CV_CAP_PROP_FOURCC, ),
-			'brightness': (Utils.getInt, cv.cv.CV_CAP_PROP_BRIGHTNESS, ),
-			'contrast': (Utils.getInt, cv.cv.CV_CAP_PROP_CONTRAST, ),
-			'saturation': (Utils.getInt, cv.cv.CV_CAP_PROP_SATURATION, ),
-			'hue': (Utils.getInt, cv.cv.CV_CAP_PROP_HUE, ),
-			'gain': (Utils.getInt, cv.cv.CV_CAP_PROP_GAIN, ),
-			'exposure': (Utils.getInt, cv.cv.CV_CAP_PROP_EXPOSURE, ),
+			'height'     : (Utils.getInt, cv.CAP_PROP_FRAME_HEIGHT ),
+			'width'      : (Utils.getInt, cv.CAP_PROP_FRAME_WIDTH ),
+			'fps'        : (Utils.getInt, cv.CAP_PROP_FPS ),
+			'codec'      : (Utils.getStr, cv.CAP_PROP_FOURCC ),
+			'brightness' : (Utils.getInt, cv.CAP_PROP_BRIGHTNESS ),
+			'contrast'   : (Utils.getInt, cv.CAP_PROP_CONTRAST ),
+			'saturation' : (Utils.getInt, cv.CAP_PROP_SATURATION ),
+			'hue'        : (Utils.getInt, cv.CAP_PROP_HUE ),
+			'gain'       : (Utils.getInt, cv.CAP_PROP_GAIN ),
+			'exposure'   : (Utils.getInt, cv.CAP_PROP_EXPOSURE ),
 		}
 
 		UNSPECIFIED = object()