561 Commits

Author SHA1 Message Date
edgarsilva
16380f445e Fix missing targets from bindings to make tests pass. 2015-02-04 13:02:09 -06:00
edgarsilva
7d16f2e046 Return to old version of opencv to try compilation. 2015-02-04 12:51:35 -06:00
Max Ehrlich
037fa6a7a5 Removed unused code to avoid compile warning 2015-02-04 13:27:11 -05:00
edgarsilva
9035d9b0fb Fix merge issue with main repo master 2015-02-04 12:05:48 -06:00
edgarsilva
37bda024c2 Force ppa update to get newer version of opencv. 2015-02-04 11:56:12 -06:00
edgarsilva
aeff4d10f6 Update travis opencv version. 2015-02-04 11:51:29 -06:00
edgarsilva
4bc20cda6f Fix issue with different versions of opencv installed in different OSs, updated cflags opencv version in bindings.gyp 2015-02-04 11:22:09 -06:00
Peter Braden
6aaea0978c Merge pull request #220 from Queuecumber/master
More camera calibration functions
2015-02-02 18:48:42 +01:00
Max Ehrlich
8ed5177c34 Added map1 type paramter to initUndistortRectifyMap 2015-01-27 12:59:51 -05:00
Max Ehrlich
d9aaf529f8 Fixed bug causing image sizes to be transposed 2015-01-27 12:55:42 -05:00
Max Ehrlich
3d09bb30ea Added remap 2015-01-27 12:55:32 -05:00
Max Ehrlich
51be174b6e Added interpolation constants 2015-01-27 12:22:05 -05:00
Max Ehrlich
a66d95b537 Added initUndistortRectifyMap 2015-01-27 12:02:08 -05:00
Max Ehrlich
b76c39a42e Added getOptimalNewCameraMatrix 2015-01-27 11:49:01 -05:00
Max Ehrlich
92f0bf80e5 Added cv::undistort 2015-01-27 11:16:36 -05:00
Max Ehrlich
96068dd7a9 Added stub imgproc source file 2015-01-27 10:53:06 -05:00
Max Ehrlich
e0998baa92 Merge remote-tracking branch 'upstream/master' 2015-01-27 10:43:20 -05:00
Peter Braden
c8c7625c6e Merge pull request #218 from IMGNRY/master
Forced nan to 1.4.3
2015-01-26 17:48:39 +01:00
Peter Braden
52a4517926 Update README.md 2015-01-26 17:42:14 +01:00
Peter Braden
176887e3ba Update README.md 2015-01-26 17:41:14 +01:00
Peter Braden
8a7a8c6f85 Merge pull request #215 from Queuecumber/master
Added Camera Calibration Functions
2015-01-26 17:39:45 +01:00
Max Ehrlich
9e9bf23e95 Switched to NaNNew functions to avoid compile errors on differing node versions 2015-01-21 10:56:16 -05:00
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