Updated project to work properly with OpenCV 3.4.3 and Python 3.6 (#4)

* Update image_commons.py * Update prepare_model.py * Update webcam.py
PiotrDabrowskey · Oct 30, 2018 · db6c660 · db6c660
1 parent 47c7256
commit db6c660
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/image_commons.py b/image_commons.py
@@ -3,11 +3,7 @@
 """
 import cv2
 import numpy as np
-
-if cv2.__version__ == '3.1.0':
-    from PIL import Image
-else:
-    import Image
+from PIL import Image
 
 
 def image_as_nparray(image):

diff --git a/prepare_model.py b/prepare_model.py
@@ -9,10 +9,8 @@
 
 from image_commons import load_image
 
-if cv2.__version__ != '3.1.0':
-    fishface = cv2.createFisherFaceRecognizer()
-else:
-    fishface = cv2.face.createFisherFaceRecognizer()
+
+fishface = cv2.face.FisherFaceRecognizer_create()
 training_set_size = 0.95
 
 

diff --git a/webcam.py b/webcam.py
@@ -63,11 +63,8 @@ def show_webcam_and_run(model, emoticons, window_size=None, window_name='webcam'
     emoticons = _load_emoticons(emotions)
 
     # load model
-    if cv2.__version__ == '3.1.0':
-        fisher_face = cv2.face.createFisherFaceRecognizer()
-    else:
-        fisher_face = cv2.createFisherFaceRecognizer()
-    fisher_face.load('models/emotion_detection_model.xml')
+    fisher_face = cv2.face.FisherFaceRecognizer_create()
+    fisher_face.read('models/emotion_detection_model.xml')
 
     # use learnt model
     window_name = 'WEBCAM (press ESC to exit)'