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
913 Commits 10 Branches 4 Tags
Commit Graph

238 Commits

Author SHA1 Message Date
Thomas Hoffmann
ef8090f4b6 added simple brightness 2015-07-01 14:56:26 +02:00
Thomas Hoffmann
71da46939b added brightness support for gray images 2015-06-11 13:40:04 +02:00
Thomas Hoffmann
d5441b93ff fixed channel check 2015-06-11 12:59:00 +02:00
Thomas Hoffmann
f9d5c8a4d7 added brightness 2015-06-11 12:23:54 +02:00
Thomas Hoffmann
2704d607fe added mask parameter 2015-05-15 11:34:11 +02:00
Thomas Hoffmann
569a1143cd added getData and normailze 2015-05-15 10:43:33 +02:00
Morgan 'ARR\!' Allen
27267f310a added option for putText line thickness 2015-05-06 10:46:00 -07:00
Thomas Hoffmann
150fc4a66d added mat.put(buffer) function 2015-04-22 07:51:46 +02:00
Max Ehrlich
7acb6ea5cd Added fillPoly function for drawing polygons 2015-03-17 10:09:39 -04:00
Peter Braden
091447b573 Merge branch 'master' into test-examples 
Conflicts:
	src/Matrix.cc
 2015-02-11 19:59:30 +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
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
Micah Elizabeth Scott
85c3a90db7 Fix compile errors with ambiguous signedness in NanNew param 
This fixes two instances of a compile error I'd been getting with
OpenCV 2.4.9 (via Homebrew) on Mac OS:

../node_modules/nan/nan_new.h:184:10: error: call to 'New' is ambiguous
  return NanIntern::Factory<T>::New(arg0);
         ^~~~~~~~~~~~~~~~~~~~~~~~~~
../src/Matrix.cc:453:51: note: in instantiation of function template specialization 'NanNew<v8::Integer, unsigned long>' requested here
        v8::Handle<v8::Value> constructorArgs[3] = {buf, NanNew<v8::Integer>(vec.size()), NanNew<v8::Integer>(0)};
                                                         ^
../node_modules/nan/nan_new.h:86:26: note: candidate function
  static inline return_t New(int32_t value);
                         ^
../node_modules/nan/nan_new.h:87:26: note: candidate function
  static inline return_t New(uint32_t value);
 2015-01-16 12:13:45 -08:00
Micah Elizabeth Scott
73cddc81de In setRect(), don't return a pointer to stack memory 
Noticed a compiler warning for this during build, and the code looks
like the sort of thing that may often work accidentally, but is not
at all guaranteed to work.

This is the simplest fix I could imagine; keep the logic about whether
to return NULL or not in setRect(), but pass it a reference to some
memory in the caller's stack frame to use for the result.

This fixes the warning, but I haven't had a chance to verify functionality.
 2015-01-16 12:11:05 -08:00
Pieter De Bruyne
f90d623adc fixed Crop prototype 2014-12-09 19:59:56 +01:00
Dmitry Ivanov
23fc1c04ed HoughCircles added 2014-10-23 15:50:05 -04:00
madshall
4860f875c9 oops, bitwiseNot() hotfix 2014-10-22 21:26:52 -04:00
madshall
c6319937e0 - findContours() fixed 
- bitwiseAnd(), bitwiseNot(), bitwiseXor() may accept mask as the last argument since now
 2014-10-22 20:16:22 -04:00
Peter Braden
9b3b82fbbe fix convert image (crop was missing) and other file paths 2014-10-15 20:38:17 +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
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
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
1341a83a7a Added hierarchy to Contours 2014-09-22 14:40:39 +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
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
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