352 Commits

Author SHA1 Message Date
Peter Braden
9b3b82fbbe fix convert image (crop was missing) and other file paths 2014-10-15 20:38:17 +02:00
Peter Braden
97875da492 fix window error 2014-10-15 20:31:19 +02:00
Peter Braden
c42422a715 Catch OpenCV exception in nodeland 2014-10-15 20:13:29 +02:00
Peter Braden
969e7d1d4c A few whitespace fixes 2014-10-11 18:11:44 +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
34eb174ae8 silence some compiler warnings 2014-10-07 21:14:48 +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
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
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
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
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
Oskar Dahlberg
056b6cd68e New method for filtering template matches 2014-09-11 16:59:22 +02:00
Oskar Dahlberg
46b09aa181 Changed MatchTemplate arg from path to matrix 2014-09-11 16:45:25 +02:00
John Cao
eca9be85c1 Added a delete for the matrix - Issue 101 2014-09-10 23:44:57 +08:00
Mark kaosat-dev Moissette
cd303829de - continued work migrating api to nan 2014-09-10 15:23:57 +02:00
Mark kaosat-dev Moissette
8db4e0ed2d - added nan dependency
- updated binding.gyp
- ported all header files to the nan api
2014-09-10 13:41:09 +02:00
Salman
49d5cbbb68 added check for number of channels in fetching pixel value. Addresses issue #147 2014-09-07 13:41:26 +05:00
Salman
86d277f1b3 added image.crop(x,y,width,height) to address #150 2014-09-07 13:21:09 +05:00
Mark kaosat-dev Moissette
668c21dc44 - added close() method to VideoCapture base on opencv capture's "release"
method
- added experimental ReadSync method : this serves two purposes:
 * usefull when not using callbacks
 * a possible workaround for huge memoryleaks in videocapture
2014-09-05 16:07:47 +02:00
Salman
d75a672fa2 added car detection example + cascade files 2014-08-31 22:10:03 +05:00
Salman
607bc32cf3 refreshed 2014-08-31 20:51:06 +05:00
John Ludwig
d9bfdee231 add shift image entry
Shifts an image by an integer number of pixels x or y directions, with
a BORDER_REPLICATE fill.  uses the underlying copymakeborder opencv call
2014-06-28 18:23:45 -07:00
John Ludwig
17f59cee5f Add SetPosition method
Allows video read stream to advance to a particular frame
2014-06-19 12:10:12 -07:00