744 Commits

Author SHA1 Message Date
Jonas Wagner
a6eb86c9e9 Change DEBUG environment variable in .travis.yml 2016-10-20 00:46:24 +02:00
Jonas Wagner
7092c89d0c Change name of DEBUG environment variable
fixes #452
2016-10-19 23:34:34 +02:00
Peter Braden
4586b9bd40 Merge pull request #446 from peterbraden/6-0-0-release
6.0.0 release
v6.0.0
2016-09-23 03:53:03 -07:00
Peter Braden
336079340f Merge pull request #447 from peterbraden/fixes
Dockerfile for opencv3
2016-09-23 03:52:52 -07:00
Dan Schultzer
d47b6f6ce3 Update bug fixes/enhancements 2016-09-23 03:32:45 -07:00
Peter Braden
782efa994a Add thanks 2016-09-23 12:29:05 +02:00
Peter Braden
0677e83235 Merge pull request #445 from peterbraden/code-coverage
Code coverage
2016-09-23 01:15:54 -07:00
Peter Braden
25387eafa8 Merge pull request #306 from borromeotlhs/opencv3
opencv3 Dockerfile
2016-09-23 01:13:42 -07:00
Dan Schultzer
da7e707a0c Move cflags and ldflags for mac to debug config 2016-09-22 13:17:46 -07:00
Dan Schultzer
d64b28304d Bump version 2016-09-22 12:09:20 -07:00
Dan Schultzer
0bea755e70 Added 6.0.0 change log 2016-09-22 12:09:15 -07:00
Dan Schultzer
32bb2d089b Update readme 2016-09-22 11:34:04 -07:00
Dan Schultzer
90c7a0fc50 Update travis to run coverage and debug opencv 2016-09-22 11:23:51 -07:00
Dan Schultzer
6ca8a35338 Fix issues that came up with debug opencv
OpenCV compiled with debug has a lot of assertions. There was some issues that came up when I ran the tests on that build.
2016-09-22 11:23:51 -07:00
Dan Schultzer
64b35c19b2 Add code coverage 2016-09-22 11:23:45 -07:00
Peter Braden
5aee66eb2c Merge pull request #428 from Evilcat325/master
Add MatchTemplate By Matrix Method.
2016-09-22 01:10:24 -07:00
Peter Braden
72e3921461 Merge pull request #444 from peterbraden/rename-video-capture-close
Rename video capture close to release
2016-09-22 01:08:53 -07:00
Dan Schultzer
de57ca8419 Rename video capture close to release 2016-09-21 01:47:10 -07:00
Michael Vines
33976a951a Merge pull request #439 from silklabs/fix-getData-elemsize
make getData() work if we have more than one channel
2016-09-07 21:32:32 -07:00
Andreas Gal
9a2b3c3bfc make getData() work if we have more than one channel 2016-09-07 16:16:11 -07:00
Michael Vines
6f62e4a644 Merge pull request #438 from silklabs/getData-fix
compensate for any padding in getData
2016-09-05 17:21:22 -07:00
Andreas Gal
6722aadc2b fix signed/unsigned comparison warning 2016-09-05 13:11:13 -07:00
Andreas Gal
19067e5aff compensate for any padding in getData 2016-09-05 13:01:18 -07:00
Peter Braden
30c76efa0a Merge pull request #437 from danschultzer/update-node-pre-gyp
Update node-pre-gyp
2016-09-04 23:23:31 -07:00
Dan Schultzer
0471feedf8 Update node-pre-gyp
The older `node-pre-gyp` version prevented proper handling with electron (as shown in https://github.com/mapbox/node-pre-gyp/pull/175).
2016-09-02 15:03:20 -07:00
Sen
e084213578 Remove test temp png for visual debug 2016-07-25 16:48:51 -04:00
Sen
495e06a591 Add canny match template test
As we can pass matrix as template, detecting canny provide more robust
match if we only care about shape rather than contrast and color.
2016-07-25 16:48:17 -04:00
Sen
e578cdb869 Add method range check
Method can be only 0~5,  if other number supply will default to
TM_CCORR_NORMED.
2016-07-25 16:47:15 -04:00
Sen
a2a3018213 Add Unit test to method
the expected match location should be (717, 0)
2016-07-25 13:55:30 -04:00
Sen
344ea4963d change output
MatchTemplateByMatrix now only return the result matrix
2016-07-25 13:54:55 -04:00
Sen
d8de6a86b8 Add match temple method
Add match temple method that accept a matrix
2016-07-25 13:16:32 -04:00
Peter Braden
870ffb56c2 Merge pull request #424 from CardiganCam/master
Update documentup.min.js src
2016-07-15 11:55:24 +02:00
Yossi
2517d1d0a0 Update documentup.min.js src 2016-07-15 10:25:34 +03:00
Peter Braden
df9959ae7d Merge pull request #408 from idubinskiy/contour-points
Restore Contour.points method
2016-05-13 11:00:05 +02:00
Igor Dubinskiy
7112856244 Restore Contour.points method 2016-05-12 23:54:53 -07:00
Peter Braden
3af26fe5fb Merge pull request #407 from mcwhittemore/master
fix dissimilarity example
2016-05-06 10:36:51 +02:00
Matthew Chase Whittemore
d42df05708 fix dissimilarity example 2016-05-05 00:36:44 -04:00
Peter Braden
0374115c72 Merge pull request #405 from dxprog/master
loading image by file/buffer now has same behaviour
2016-05-03 15:45:47 +02:00
Matt Hackmann
5ae998becf loading image by file/buffer now has same behaviour 2016-05-02 10:21:39 -07:00
Michael Vines
13a1de4f92 Merge pull request #401 from jainanshul/mean
Add matrix mean method
2016-04-22 06:50:54 -07:00
Anshul
2a2ea7d74a Add matrix mean method 2016-04-22 00:01:38 -07:00
Michael Vines
7fb5e261b2 Merge pull request #400 from mvines/asw
AsyncSaveWorker now controls the lifecycle of its filename
2016-04-21 21:10:56 -07:00
Michael Vines
a3db0acb0a Merge pull request #395 from andreasgal/subtract
add subtract() to Matrix
2016-04-21 20:57:47 -07:00
Michael Vines
5ca03b25b4 AsyncSaveWorker now controls the lifecycle of its filename 2016-04-21 20:54:02 -07:00
Andreas Gal
bd56c36040 add subtract() to Matrix 2016-04-14 10:31:09 -07:00
Peter Braden
7a50a5b4c2 Merge pull request #371 from AwooOOoo/master
type_info error
2016-04-13 11:46:52 +02:00
Peter Braden
49b5f3403e Merge pull request #389 from salmanulhaq/matchtemplateupdate
Updated matchTemplate and added an example
2016-03-22 13:35:54 +01:00
Salman
5102116c52 updated matchTemplate and added example 2016-03-15 10:53:41 +05:00
Michael Vines
ead733ba34 Merge pull request #379 from mvines/face
Enable FaceRecognizer on OpenCV3
2016-02-25 12:04:27 -08:00
Michael Vines
85b4542b7f Work around bug in OpenCV3 FaceRecognizer::predict
Older versions of OpenCV3 incorrectly returned label=0 at confidence=DBL_MAX
instead of label=-1 on failure.  This can be removed once the fix* becomes
more widespread.

* 0aa58ae9b3 (diff-d9c561bf45c255c5951ff1ab55e80473)
2016-02-25 10:46:16 -08:00