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

419 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Max Ehrlich
088b44bdeb Added drawChessboardCorners 2015-01-20 10:19:28 -05:00
Max Ehrlich
e35698ac16 Moved findChessboardCorners to calib3d source file 2015-01-20 09:37:52 -05:00
Max Ehrlich
97715a8048 Added findChessboardCorners function 2015-01-19 15:15:05 -05:00
Peter Braden
52de1e706c Merge pull request #212 from scanlime/master 
Build-related fixes in src/Matrix.cc
 2015-01-19 19:32:50 +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
Peter Braden
a5c5c3b4c9 Merge pull request #200 from dbpieter/master 
fixed Matrix Crop prototype
 2014-12-10 09:15:49 +01:00
Pieter De Bruyne
f90d623adc fixed Crop prototype 2014-12-09 19:59:56 +01:00
Peter Braden
4131385e4b Merge pull request #187 from madshall/master 
fixes to Matrix.cc: findContours(), bitwiseAnd(), bitwiseNot(), bitwiseXor(); houghCircles() has been added;
 2014-11-27 07:55:37 +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
862a31eb2a Tidy up lib 2014-10-15 20:54:58 +02:00
Peter Braden
b9fbf5f526 Merge pull request #183 from peterbraden/tape-tests 
Tape tests
 2014-10-15 20:00:51 +02:00
Peter Braden
e95ade25f6 Tape tests, complete conversion 2014-10-15 19:50:38 +02:00
Peter Braden
40ad8ab2ae Merge pull request #179 from marcbachmann/js-improvements 
Use this.emit(‘error’) in streams
 2014-10-15 19:38:17 +02:00
Peter Braden
e27d67d7c9 Starting porting the tests to tape 2014-10-12 07:32:53 +02:00
Peter Braden
a51df6ab36 Version 1.0.0 v1.0.0 2014-10-11 18:18:58 +02:00
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
63dbee5353 Add missing error emit 2014-10-04 00:00:00 +02:00
Marc Bachmann
0a944b47a2 Prettify & use this.emit(‘error’) everywhere 2014-10-03 23:36:26 +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