Commit 70ad978

committed

Merge branch 'fix-new-opencv'

2 parents 8156852 + b52e37d commit 70ad978Copy full SHA for 70ad978

File tree

-6

lines changed

-6

lines changed

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -71,10 +71,8 @@ def NMS(tableHit, scoreThreshold=0.5, sortAscending=False, N_object=float("inf")`
`71`	`71`	`indexes = cv2.dnn.NMSBoxes(listBoxes, listScores, scoreThreshold, maxOverlap)`
`72`	`72`
`73`	`73`	`# Get N best hit`
`74`		`- if N_object == float("inf"):`
`75`		`- indexes = [ index[0] for index in indexes ] # ordered by score`
`76`		`- else:`
`77`		`- indexes = [ index[0] for index in indexes[:N_object] ]`
	`74`	`+ if N_object != float("inf"):`
	`75`	`+ indexes = indexes[:N_object]`
`78`	`76`
`79`	`77`	`outTable = tableHit.iloc[indexes]`
`80`	`78`

Lines changed: 1 addition & 1 deletion

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

Lines changed: 1 addition & 1 deletion

Comments

(0)