archive-gh-me/node-opencv
1
0
Fork 0
mirror of https://github.com/peterbraden/node-opencv.git synced 2025-12-08 19:45:55 +00:00
Code Issues Projects Releases Wiki Activity
399 Commits 10 Branches 4 Tags
Commit Graph

399 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peter Braden
969e7d1d4c A few whitespace fixes 2014-10-11 18:11:44 +02:00
Peter Braden
a2408d4dab Merge branch 'master' of github.com:peterbraden/node-opencv 2014-10-11 18:07:06 +02:00
Peter Braden
3ad181019f Fix a few compiler warnings 2014-10-11 18:03:44 +02:00
Mark Moissette
e41ae1ea93 - fixed multiple node V0.11.x issues (ported more methods etc to Nan) 2014-10-09 11:55:18 +02:00
Peter Braden
0a8f09a740 can't clean before install 2014-10-07 21:32:43 +02:00
Peter Braden
0556ae342e Remove bad import as suggested by @marcbachmann 2014-10-07 21:19:05 +02:00
Peter Braden
04ce9e211b Use an up to date version of node. Can't be supporting 0.8 etc any more. 2014-10-07 21:16:04 +02:00
Peter Braden
34eb174ae8 silence some compiler warnings 2014-10-07 21:14:48 +02:00
Peter Braden
10bc08364f Merge pull request #178 from marcbachmann/cleanup-examples 
Cleanup of examples
 2014-10-07 08:33:07 +02:00
Peter Braden
2d2ac2900c Fixing merge some more, and compiler errors. 2014-10-07 08:05:21 +02:00
Peter Braden
19058ecea9 Merge branch 'nodev11.x' of github.com:kaosat-dev/node-opencv into kaosat-dev-nodev11.x 
Conflicts:
	src/Contours.cc
	src/Contours.h
	src/Matrix.cc
	src/VideoCaptureWrap.cc
 2014-10-07 07:56:31 +02:00
Marc Bachmann
6391cf0dc8 Reuse size variables, add missing var. 2014-10-04 17:55:17 +02:00
Marc Bachmann
950373579b Update file paths in unit test file & README 2014-10-03 00:11:13 +02:00
Marc Bachmann
8515b05245 Fix all examples & clean up 2014-10-02 23:41:56 +02:00
Marc Bachmann
da8add8b51 Move example images to separate directory 2014-10-02 23:35:06 +02:00
Mark Moissette
a42033ac96 - overall cleanup : 
* removed obsolete code , comments
 2014-09-30 21:49:24 +02:00
Mark Moissette
a5a4b59ff3 - fixed immutability of Point class with Nan 2014-09-29 12:18:05 +02:00
Mark Moissette
cac848fa87 - added missing Nan conversion of async method 
AsyncDetectMultiScale
 2014-09-29 11:52:58 +02:00
Peter Braden
f537ec25d5 Clarify version requirements re #168 2014-09-24 20:11:31 +02:00
Peter Braden
c1edd1b1ab v0.7.0 2014-09-24 20:10:11 +02:00
Peter Braden
349b79863a Merge pull request #175 from oskardahlberg/fix-split 
Fixes split, prefills vector with empty matrices
 2014-09-24 20:07:00 +02:00
Peter Braden
56f39b86ab Merge pull request #173 from oskardahlberg/contours-serialize 
Contours serializing
 2014-09-24 20:04:55 +02:00
Peter Braden
e6f9ee971f Merge pull request #174 from oskardahlberg/synced 
Added Zeros, Ones constructors
 2014-09-24 20:03:47 +02:00
Peter Braden
88aecbb4e7 Merge pull request #169 from emallson/master 
Implement `new cv.Matrix(rows, cols, type)` constructor
 2014-09-24 20:03:29 +02:00
Oskar Dahlberg
6dfab4168a Fixes split, prefills vector with empty matrices 2014-09-22 23:45:07 +02:00
Oskar Dahlberg
188a3fe11f Revert "Fixed split not working" 
This reverts commit bc9be2f1086ecb5e9227e6cac846041d26b2e3eb.
 2014-09-22 23:41:49 +02:00
Oskar Dahlberg
af67ae0905 Revert "Revert "Added Zeros, Ones constructors"" 
This reverts commit d4b9d0edffad3de105d981219cdb08e210d633f4.
 2014-09-22 23:41:39 +02:00
Oskar Dahlberg
3f2f74e819 Revert "Revert "Fixed split not working"" 
This reverts commit 20efb8313bd6f101782f3a6cc60468052bc34f00.
 2014-09-22 23:41:30 +02:00
Oskar Dahlberg
3ba64a7e3d Revert "Fixed split not working" 
This reverts commit 28253d1226f2380ce7120543fc8aa6b9d7bd5892.
 2014-09-22 23:41:23 +02:00
Oskar Dahlberg
28253d1226 Fixed split not working 2014-09-22 23:36:24 +02:00
Oskar Dahlberg
d4b9d0edff Revert "Added Zeros, Ones constructors" 
This reverts commit ee3ae4c1968b1acd54d389bac742c5c6d8e32ca3.
 2014-09-22 23:35:38 +02:00
Oskar Dahlberg
20efb8313b Revert "Fixed split not working" 
This reverts commit bc9be2f1086ecb5e9227e6cac846041d26b2e3eb.
 2014-09-22 23:35:34 +02:00
Oskar Dahlberg
bc9be2f108 Fixed split not working 2014-09-22 23:31:40 +02:00
Oskar Dahlberg
ee3ae4c196 Added Zeros, Ones constructors 2014-09-22 21:54:40 +02:00
Oskar Dahlberg
1e3842a0ac Added space between >> 2014-09-22 15:44:11 +02:00
Oskar Dahlberg
d9af0e7ee4 New methods for easier access of contour data 2014-09-22 14:50:11 +02:00
Oskar Dahlberg
1341a83a7a Added hierarchy to Contours 2014-09-22 14:40:39 +02:00
Mark Moissette
416fe0a6d5 - migrate the async methods of VideoCaptureWrap to NAN 2014-09-21 16:08:43 +02:00
Mark Moissette
52a1e827f2 - implemented NAN version of async methods for Matrix.cc 2014-09-21 15:54:36 +02:00
Mark Moissette
a793f21561 - first pass migration of all relevant source done 
* compiling ok under node 0.11.13
 * missing a  number of async methods
 2014-09-21 12:42:55 +02:00
Mark Moissette
3bf2ee7fac - finished converting Matrix.cc (preliminary pass) 
* no compile error in nw-gyp v0.10.5
 2014-09-20 17:08:19 +02:00
Mark Moissette
0a23d23636 - ported Contours.cc 2014-09-20 16:16:00 +02:00
Mark Moissette
d0351f336f - migration of OpenCV.h/.cc done 
- migration of init.cc done
- migration of Matrix.cc about half done
- migration of Contours.cc in progress
 2014-09-20 16:01:08 +02:00
J David Smith
ede3feaf3d Exposed a bunch of OpenCV type constants. 2014-09-18 13:33:47 -04:00
J David Smith
21afdcd787 Added Matrix constructor with integer type field. 2014-09-18 10:24:46 -04:00
Peter Braden
dcf6ae4571 Bump version to 0.6.0 2014-09-17 22:37:38 +02:00
Peter Braden
1304750f6f Merge pull request #162 from oskardahlberg/master 
Changed MatchTemplate arg from path to matrix
 2014-09-17 22:29:10 +02:00
Peter Braden
25c79cd653 Merge branch 'issue-150' of github.com:salmanulhaq/node-opencv 
Conflicts:
	examples/convert_image.js
 2014-09-17 22:27:22 +02:00
Peter Braden
99c2592510 Merge pull request #160 from jcao75/issue-101 
Added a delete for the matrix - Issue 101
 2014-09-12 09:44:49 +02:00
Oskar Dahlberg
46b09aa181 Changed MatchTemplate arg from path to matrix 2014-09-11 16:45:25 +02:00