942 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Peter Braden	d4c019f5da	Merge pull request #608 from wenq1/master ... Minor fix for readme	2019-03-20 10:51:16 +01:00
Peter Braden	40ed9c8250	Merge branch 'master' into master	2019-03-20 10:51:01 +01:00
Peter Braden	bec64ba17a	Merge pull request #635 from flyashi/patch-1 ... Fix off-by-one error in README	2019-03-20 10:48:07 +01:00
Peter Braden	5a2317d8fa	Merge pull request #625 from aylusltd/patch-2 ... Remove superfluous check	2019-03-20 10:47:48 +01:00
Peter Braden	28d73408b5	Closes #620	2019-03-20 09:46:54 +00:00
Peter Braden	ad22b452c0	dependencies	2019-03-20 09:43:45 +00:00
Peter Braden	79ad10a449	bump deps	2019-03-20 09:41:35 +00:00
Peter Braden	5decfb3c33	6.2.0	2019-03-20 09:36:53 +00:00
Peter Braden	aaece6921d	Fix install script	2019-03-20 09:36:36 +00:00
Peter Braden	58f248af12	Remove prebuilt binaries	2019-03-20 09:11:36 +00:00
Peter Braden	77c4fb52b5	6.1.0	2019-03-20 08:49:51 +00:00
Peter Braden	69b219be41	6.0.1	2019-03-20 08:49:31 +00:00
Peter Braden	81a4b86201	Remove untrusted input to exec	2019-03-20 08:45:23 +00:00
flyashi	51408f930b	Fix off-by-one error in README	2018-07-30 14:33:08 -04:00
Peter Braden	cfc96ba0af	Merge pull request #624 from ATLCTO/master ... Add Div/Pow matrix functions.	2018-04-16 09:02:26 +02:00
Peter Braden	2e7148127a	Merge pull request #626 from markdicksonjr/master ... Additional (optional) parameters added to gaussian blur	2018-04-16 09:01:38 +02:00
Mark Dickson Jr	302bbea2af	Additional (optional) parameters added to gaussian blur	2018-04-14 21:32:52 -04:00
Patrick Childers	a9f799004d	Add CV_BGRA2BGR format conversion.	2018-04-13 12:42:47 -04:00
Jason Nichols	927e879e3c	Remove superfluous check ... CV_Minor_Version <= 4 is always < 10... superfluous check.	2018-04-13 11:21:32 -04:00
Patrick Childers	b5a078a631	Add Div/Pow matrix functions.	2018-04-13 09:11:49 -04:00
Peter Braden	41730f8257	Merge pull request #602 from Atollogy/memory-fix ... Track external memory usage for matrices	2018-04-04 08:40:22 +02:00
Wenqi Chen	b141800a01	- fixups	2018-02-04 12:57:37 +08:00
David Starke	e1c0d8ef4e	Correctly track memory for image pyramid functions	2018-01-17 14:55:57 -08:00
David Starke	9646626e3d	Consolidate external memory adjustment in Matrix	2018-01-17 14:25:43 -08:00
David Starke	45c8894167	Additional memory tracking for matrices	2018-01-11 15:47:30 -08:00
David Starke	2cd3bd4ff4	slightly more clear memory handling for async tasks	2018-01-05 11:49:36 -08:00
David Starke	f8d7dc2f06	More accurate tracking of external memory using OpenCV’s reference counts	2018-01-04 20:16:36 -08:00
David Starke	dff99718b9	missed adjusting the external memory on resize	2018-01-04 12:04:26 -08:00
David Starke	dbf2df0ef8	Track external memory usage for matrices	2017-12-22 15:29:49 -08:00
Peter Braden	48a4fc35e8	Merge pull request #595 from eric-radiant/master ... Add support for scale param in mul, update goodFeaturesToTrack a bit	2017-12-22 09:26:24 +01:00
Peter Braden	361ce02971	Merge pull request #600 from zdenham/master ... Upgraded node-pre-gyp	2017-12-22 09:25:07 +01:00
Peter Braden	85195735c9	Merge pull request #555 from shamrin/patch-1 ... instruct brew to install opencv@2	2017-12-22 09:23:12 +01:00
Zachary Denham	d31189fa66	Upgraded node-pre-gyp	2017-12-21 17:33:13 -08:00
Eric Lundberg	a8790273a9	Add support for scale param in mul, several additional params in goodFeaturesToTrack. Only convert to grayscale in goodFeaturesToTrack if not already in grayscale	2017-11-28 11:39:44 -08:00
btsimonh	a1d7a22ccd	Merge pull request #590 from btsimonh/logopencvversion ... Log OpenCV version in built in init.cc	2017-11-14 13:42:13 +00:00
Simon Hailes	e943fe727b	Log OpenCV version in built in init.cc	2017-11-14 13:21:13 +00:00
btsimonh	1a5947c934	Merge pull request #589 from thielsn/opencv_3_3_support_v2 ... Opencv 3 3 support v2	2017-11-14 13:14:35 +00:00
Simon Thiel	6597046897	FIX OpenCV 3.3: support compilation with OpenCV 3.3	2017-11-13 14:51:56 +01:00
Simon Thiel	ece9efc8c9	FEATURE HighGUI.cc: add resize window function	2017-11-13 14:51:56 +01:00
Peter Braden	fa663d449b	Merge pull request #588 from btsimonh/refcount ... Refcount	2017-11-13 09:58:02 +01:00
Simon Hailes	f4d0459fa7	kill ref to addref in Matrix.h	2017-11-13 08:40:44 +00:00
Simon Hailes	bc8095534b	comment out Addref - too dangerous to leave in. Modify test example.	2017-11-12 17:48:36 +00:00
Simon Hailes	2c1732f0c4	add example matrix-ref-count	2017-11-12 17:38:01 +00:00
btsimonh	649df8f8de	Merge pull request #587 from btsimonh/asyncprotection ... Asyncprotection	2017-11-12 16:57:15 +00:00
Simon Hailes	9316a01f03	fix typo	2017-11-12 16:48:08 +00:00
Simon Hailes	e65301dbee	examples - update write-video.js for async with test of mat.release() before async done	2017-11-12 16:22:59 +00:00
Simon Hailes	96d0eb8824	Matrix: add mtx.addref() and mtx.getrefCount()	2017-11-12 16:03:17 +00:00
Simon Hailes	b1edee0527	VideoWriter: make safe to mat.release() before async is complete	2017-11-12 15:59:45 +00:00
Simon Hailes	bfdb33e0fc	examples: update asyncresize to test mat.release before async is complete	2017-11-12 15:58:59 +00:00
Simon Hailes	642bf94a3d	Matrix: resizeasync - make safe to mat.release() before async is complete	2017-11-12 15:58:17 +00:00