Fix cap prop frame width/height

Update code so it works in both OpenCV 2 and 3 re:
cv2.cv.CV_CAP_PROP_FRAME_WIDTH, see issue jBenes#13.

Author: hermesdev0131

chapter1/chapter1.py

@@ -87,8 +87,13 @@ def main():
     capture = cv2.VideoCapture(0)
     if not(capture.isOpened()):
         capture.open()
-    capture.set(cv2.cv.CV_CAP_PROP_FRAME_WIDTH, 640)
-    capture.set(cv2.cv.CV_CAP_PROP_FRAME_HEIGHT, 480)
+
+    if hasattr(cv2, 'cv'):
+        capture.set(cv2.cv.CV_CAP_PROP_FRAME_WIDTH, 640)
+        capture.set(cv2.cv.CV_CAP_PROP_FRAME_HEIGHT, 480)
+    else:
+        capture.set(cv2.CAP_PROP_FRAME_WIDTH, 640)
+        capture.set(cv2.CV_CAP_PROP_FRAME_HEIGHT, 480)
 
     # start graphical user interface
     app = wx.App()

chapter2/chapter2.py

@@ -58,8 +58,8 @@ def _process_frame(self, frame):
 
         # draw some helpers for correctly placing hand
         height, width = frame.shape[:2]
-        cv2.circle(img_draw, (width/2, height/2), 3, [255, 102, 0], 2)
-        cv2.rectangle(img_draw, (width/3, height/3), (width*2/3, height*2/3),
+        cv2.circle(img_draw, (width / 2, height / 2), 3, [255, 102, 0], 2)
+        cv2.rectangle(img_draw, (width / 3, height / 3), (width * 2 / 3, height * 2 / 3),
                       [255, 102, 0], 2)
 
         # print number of fingers on image
@@ -75,8 +75,12 @@ def main():
     if not(capture.isOpened()):
         capture.open(device)
 
-    capture.set(cv2.cv.CV_CAP_PROP_FRAME_WIDTH, 640)
-    capture.set(cv2.cv.CV_CAP_PROP_FRAME_HEIGHT, 480)
+    if hasattr(cv2, 'cv'):
+        capture.set(cv2.cv.CV_CAP_PROP_FRAME_WIDTH, 640)
+        capture.set(cv2.cv.CV_CAP_PROP_FRAME_HEIGHT, 480)
+    else:
+        capture.set(cv2.CAP_PROP_FRAME_WIDTH, 640)
+        capture.set(cv2.CV_CAP_PROP_FRAME_HEIGHT, 480)
 
     # start graphical user interface
     app = wx.App()

chapter3/chapter3.py

@@ -23,6 +23,7 @@ class FeatureMatchingLayout(BaseLayout):
         Each captured frame is passed to the FeatureMatching class, so that an
         object of interest can be tracked.
     """
+
     def _init_custom_layout(self):
         """Initializes feature matching class"""
         self.matching = FeatureMatching(train_image='salinger.jpg')
@@ -46,8 +47,12 @@ def main():
     if not(capture.isOpened()):
         capture.open()
 
-    capture.set(cv2.cv.CV_CAP_PROP_FRAME_WIDTH, 640)
-    capture.set(cv2.cv.CV_CAP_PROP_FRAME_HEIGHT, 480)
+    if hasattr(cv2, 'cv'):
+        capture.set(cv2.cv.CV_CAP_PROP_FRAME_WIDTH, 640)
+        capture.set(cv2.cv.CV_CAP_PROP_FRAME_HEIGHT, 480)
+    else:
+        capture.set(cv2.CAP_PROP_FRAME_WIDTH, 640)
+        capture.set(cv2.CV_CAP_PROP_FRAME_HEIGHT, 480)
 
     # start graphical user interface
     app = wx.App()

chapter7/chapter7.py

@@ -274,8 +274,12 @@ def main():
     if not(capture.isOpened()):
         capture.open()
 
-    capture.set(cv2.cv.CV_CAP_PROP_FRAME_WIDTH, 640)
-    capture.set(cv2.cv.CV_CAP_PROP_FRAME_HEIGHT, 480)
+    if hasattr(cv2, 'cv'):
+        capture.set(cv2.cv.CV_CAP_PROP_FRAME_WIDTH, 640)
+        capture.set(cv2.cv.CV_CAP_PROP_FRAME_HEIGHT, 480)
+    else:
+        capture.set(cv2.CAP_PROP_FRAME_WIDTH, 640)
+        capture.set(cv2.CV_CAP_PROP_FRAME_HEIGHT, 480)
 
     # start graphical user interface
     app = wx.App()