Merge branch 'fix-new-opencv'

Author: LauLauThom

MTM/NMS.py

@@ -71,10 +71,8 @@ def NMS(tableHit, scoreThreshold=0.5, sortAscending=False, N_object=float("inf")
     indexes = cv2.dnn.NMSBoxes(listBoxes, listScores, scoreThreshold, maxOverlap)
 
     # Get N best hit
-    if N_object == float("inf"): 
-        indexes  = [ index[0] for index in indexes ] # ordered by score
-    else:
-        indexes  = [ index[0] for index in indexes[:N_object] ]
+    if N_object != float("inf"): 
+        indexes = indexes[:N_object] 
 
     outTable = tableHit.iloc[indexes]
 

MTM/version.py

@@ -2,4 +2,4 @@
 # 1) we don't load dependencies by storing it in __init__.py
 # 2) we can import it in setup.py for the same reason
 # 3) we can import it into your module module
-__version__ = '1.6.2.post1'
+__version__ = '1.6.3'

setup.py

@@ -20,7 +20,7 @@
 	packages=["MTM"],
 	install_requires=[
 		  'numpy',
-		  'opencv-python-headless<=4.3.0',
+		  'opencv-python-headless>=4.5.4',
 		  'scikit-image',
 		  'scipy',
 		  'pandas'