Fix explicit check for OpenCV version == 3 causing the Fitter class t…

…o try using the OpenCV 2 style call to cv2.calibrate_camera when actually using OpenCV 4 (Issue #35). Increment patch version to 2.1.2.

CHANGELOG.txt

@@ -1,6 +1,23 @@
 Project Changelog
 =================
 
+
+Bug fix release 2.1.2 (5th Feb 2019)
+------------------------------------
+
+Hot on the heels of yesterday's serious bug...another!
+
+Fixes:
+* Change explicit check for OpenCV major version == 3 to major version > 2, for compatbility with OpenCV 4.
+
+
+Bug fix release 2.1.1 (4th Feb 2019)
+------------------------------------
+
+Fixes:
+* Performing a fit in a newly created calibration raises an exception
+
+
 Minor Release 2.1.0 (18 Jan 2019)
 ---------------------------------
 

calcam/__init__.py

@@ -25,7 +25,7 @@
 """
 
 # Calcam version
-__version__ = '2.1.1'
+__version__ = '2.1.2'
 
 # Import the top level "public facing" classes & functions
 from .calibration import Calibration

calcam/calibration.py

@@ -2190,7 +2190,7 @@ def do_fit(self):
 
         # Do the fit!
         if self.model == 'perspective':
-            if int(cv2.__version__[0]) == 3:
+            if int(cv2.__version__[0]) > 2:
                 fit_output = cv2.calibrateCamera(obj_points,img_points,self.image_display_shape,copy.copy(self.initial_matrix),None,flags=self.get_fitflags())
             else:
                 fit_output = cv2.calibrateCamera(obj_points,img_points,self.image_display_shape,copy.copy(self.initial_matrix),flags=self.get_fitflags())

setup.py

@@ -141,7 +141,7 @@ def query_yes_no(question, default="yes"):
 # Actually do the install
 setup(
       name='Calcam',
-      version='2.1.1',
+      version='2.1.2',
       url='https://euratom-software.github.io/calcam/',
       license='European Union Public License 1.1',
       author='Scott Silburn et.al.',