525 Commits

Author SHA1 Message Date
Adrian Zankich
77b72dc350 Return error instead of throw 2015-06-09 17:27:18 -07:00
Peter Braden
585790f06e Merge pull request #250 from morganrallen/putTextThickness
added option for putText line thickness
2015-05-06 22:43:33 +02:00
Morgan 'ARR\!' Allen
27267f310a added option for putText line thickness 2015-05-06 10:46:00 -07:00
Peter Braden
afe7467e13 Merge pull request #248 from tualo/master
missing mat.put
2015-04-27 08:21:15 +02:00
Thomas Hoffmann
7d52f60645 commented out opencv window 2015-04-22 08:33:23 +02:00
Thomas Hoffmann
a1a2421b32 added example for mat.put 2015-04-22 07:58:30 +02:00
Thomas Hoffmann
150fc4a66d added mat.put(buffer) function 2015-04-22 07:51:46 +02:00
Peter Braden
e65202575a Merge pull request #202 from arkcore/features2d
Dirty draft of using features2d for calculating
2015-04-01 08:15:29 +02:00
AVVS
a7eba6a9e4 Add imageSimilarity method beased on features 2d 2015-03-31 18:51:08 -07:00
AVVS
d2a918bedc Merge branch 'peterbraden-master' 2015-03-31 18:46:28 -07:00
Max Ehrlich
3ae1ccb212 Merge pull request #236 from Queuecumber/master
Added fillPoly function for drawing polygons
2015-03-17 10:34:48 -04:00
Max Ehrlich
7acb6ea5cd Added fillPoly function for drawing polygons 2015-03-17 10:09:39 -04:00
Max Ehrlich
622c2ca995 Merge pull request #233 from hybridgroup/master
Fix issue with Linux binaries not passing self-test on install.
2015-02-24 19:43:56 -05:00
edgarsilva
a872bcf9c4 Fix incorrect secure keys. 2015-02-24 18:00:27 -06:00
edgarsilva
131554274a Fix issue with travis-ci pre-compiled binaries using a really old opencv version. 2015-02-24 17:51:12 -06:00
Peter Braden
d3434565c5 Merge pull request #228 from Queuecumber/master
Stereo Camera Functions
2015-02-22 18:22:24 +01:00
Max Ehrlich
24a23b803b Merge remote-tracking branch 'origin/stereo'
Conflicts:
	binding.gyp
2015-02-13 12:24:05 -05:00
Max Ehrlich
81f36f9321 Merge remote-tracking branch 'upstream/master' 2015-02-13 12:19:51 -05:00
Max Ehrlich
c1686749bd Merge remote-tracking branch 'upstream/master' 2015-02-13 12:19:00 -05:00
Max Ehrlich
14fed8c12b Fixed a bug causing argments to be read incorrectly in stereoRectify 2015-02-13 12:11:18 -05:00
Max Ehrlich
f60b41ec32 Fixed naming error in reprojectImageTo3d 2015-02-13 12:05:58 -05:00
Max Ehrlich
bce394f775 Init StereoGC class 2015-02-12 14:17:58 -05:00
Peter Braden
e7604cda59 missing comma v3.0.0 2015-02-11 21:49:05 +01:00
Peter Braden
94dcfda3c2 Bump the version. 3.0.0 2015-02-11 21:47:31 +01:00
Peter Braden
6725545e33 Merge branch 'test-examples'
Conflicts:
	package.json
2015-02-11 21:44:20 +01:00
Peter Braden
efb9bf5356 disable broken example 2015-02-11 21:38:49 +01:00
Peter Braden
2c6ec42ffd Don't fail the build if package upload fails 2015-02-11 21:24:59 +01:00
Peter Braden
efc2f6a881 Missed a character... [publish binary] 2015-02-11 21:17:30 +01:00
Peter Braden
f485906bc0 [publish binary] Lets test this 2015-02-11 20:52:56 +01:00
Peter Braden
bd6629de47 Appveyor keys 2015-02-11 20:46:15 +01:00
Peter Braden
2eaf099b35 New Travis keys 2015-02-11 20:38:39 +01:00
Peter Braden
1baad7b364 Merge branch 'master' into hybridgroup-master
Conflicts:
	.travis.yml
2015-02-11 20:34:09 +01:00
Peter Braden
7af5707be1 Update Car Detection cascade for example
re http://code.opencv.org/issues/2387
2015-02-11 20:24:17 +01:00
Peter Braden
0c72d55ec4 Fix example paths 2015-02-11 20:15:01 +01:00
Peter Braden
091447b573 Merge branch 'master' into test-examples
Conflicts:
	src/Matrix.cc
2015-02-11 19:59:30 +01:00
Peter Braden
081ca6056f Much overdue release. 2.0.0 2015-02-11 19:52:50 +01:00
Peter Braden
9e4f904da7 Keep changelog up to date 2015-02-11 19:52:11 +01:00
Peter Braden
4618b15880 Travis test 0.12 2015-02-11 19:45:13 +01:00
Peter Braden
ae5887c4cd Use Nan for rest of the method 2015-02-11 19:44:38 +01:00
Peter Braden
03ce7973bf Use Nan for template matches 2015-02-11 19:20:19 +01:00
Peter Braden
c5bd3e89bd Merge branch 'master' into oskardahlberg-templateMatches 2015-02-11 18:47:04 +01:00
Peter Braden
373fa339f7 Remove unused 'sleep_for' variable to suppress compile warning 2015-02-11 18:46:23 +01:00
Peter Braden
aa8ee12587 Merge branch 'templateMatches' of https://github.com/oskardahlberg/node-opencv into oskardahlberg-templateMatches
Conflicts:
	src/Matrix.cc
2015-02-11 18:46:13 +01:00
Peter Braden
cfc6c16721 Remove unused 'sleep_for' variable to suppress compile warning 2015-02-11 18:35:00 +01:00
Peter Braden
c36350ade8 Move smoke test into makefile 2015-02-11 18:32:25 +01:00
Peter Braden
1418336348 Merge pull request #221 from Queuecumber/master
Removed unused code to avoid compile warning
2015-02-10 08:26:14 +01:00
Max Ehrlich
d0400ec5ae Added graph-cut stereo algorithm 2015-02-09 18:19:00 -05:00
edgarsilva
3558be3d50 Always build from source in appveyor. 2015-02-06 15:40:25 -06:00
Edgar O Silva
c776475f3a Merge pull request #10 from hybridgroup/custom-os-cflags
Custom os cflags, fixes pre compiled binaries
2015-02-06 13:24:52 -06:00
edgarsilva
44695e0c61 Test install from pre compiled binaries 2015-02-06 11:26:46 -06:00