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

689 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Max Ehrlich
9e04f95703 Added solvePnP 2015-01-20 14:05:58 -05:00
Max Ehrlich
024d8e5ee5 Changed to non-callback API since all methods are synchronous 2015-01-20 13:26:37 -05:00
Max Ehrlich
0c35976950 Added calibrateCamera function 2015-01-20 13:04:22 -05:00
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
Fille
702cd7a992 Forced nan to 1.4.3 2015-01-17 23:08:18 +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
edgarsilva
094d91eece update cflags opencv version in bindings.gyp 2014-12-23 12:45:33 -06: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
edgarsilva
74cc0546a8 Added info on how to create and name the branch to generate the OSX binaries 2014-11-03 18:43:48 -06:00
edgarsilva
ce159e15e0 Added new release make task to simplify publishing binaries and releasing to npm. Added publish-binary.md file to have as a reference on the process of making a release and publishing the binaries. 2014-11-03 18:33:34 -06:00
edgarsilva
a903162a5c Add pre compiled binaries for all 3 major platforms. 2014-11-03 11:09:08 -06: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
Edgar O Silva
cf11a2100a Merge pull request #5 from peterbraden/master 
Merge latest master changes from main node-opencv repo
 2014-10-21 13:34:43 -05:00
Peter Braden
a62456f47b Don't assume a camera 2014-10-15 20:59:46 +02:00
Peter Braden
862a31eb2a Tidy up lib 2014-10-15 20:54:58 +02:00
Peter Braden
1659f7ef1a All examples now run without erroring 2014-10-15 20:42:44 +02:00
Peter Braden
9b3b82fbbe fix convert image (crop was missing) and other file paths 2014-10-15 20:38:17 +02:00
Peter Braden
d5021b1bcc quad crossess example fixed 2014-10-15 20:33:49 +02:00
Peter Braden
97875da492 fix window error 2014-10-15 20:31:19 +02:00
Peter Braden
a4af50daf7 fix face-proxy 2014-10-15 20:17:31 +02:00
Peter Braden
ea7f25962c Fix addweighted 2014-10-15 20:15:29 +02:00
Peter Braden
c42422a715 Catch OpenCV exception in nodeland 2014-10-15 20:13:29 +02:00
Peter Braden
7ebb4d70de fix warp image example 2014-10-15 20:04:03 +02:00
Peter Braden
18394814ab Failing examples tests 2014-10-15 20:01:44 +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