159 Commits

Author SHA1 Message Date
Peter Braden
d291d89771 Merge pull request #315 from adius/add-otsus-method
Add otsus method
2015-10-09 10:21:14 +02:00
Adrian Sieber
9faf0f5a77 Add function argument to specify the threshold algorithm 2015-10-08 22:00:12 +02:00
Adrian Sieber
90fe184501 Mark the default value in error message 2015-10-08 21:58:32 +02:00
Adrian Sieber
8281330044 Use correct datatype for binarization type 2015-10-08 21:46:03 +02:00
Adrian Sieber
901edf4d58 Throw error if invalid binarization technique is provided 2015-10-08 21:43:36 +02:00
Adrian Sieber
769b3f912e Remove redundant variable assignment 2015-10-08 21:43:05 +02:00
Anshul Jain
dc12c4f2ed Prevent a copy during grayscale conversion 2015-10-08 12:21:44 -07:00
Anshul Jain
a2073757a2 Add support for CV_BGR2RGB color transformation 2015-10-08 12:21:44 -07:00
Anshul Jain
c7037ef20c Fix formatting for CvtColor matrix function 2015-10-08 12:21:41 -07:00
Adrian Sieber
0737bdd85a Use "else if" to clarify mutual exclusivity 2015-10-08 20:50:59 +02:00
Keegan Brown
8b3e747c35 Eliminated deprecation warnings while building in Node v4.1.2 2015-10-06 12:46:44 -05:00
Keegan Brown
ec09e0bdde Swapped out all "handle" for "local"
Now building and passing tests locally in node v0.10.40 v0.12.7 and
v4.1.1. Other modules would not build at node lower than v0.10, so I
stopped there.
2015-10-05 14:33:12 -05:00
Keegan Brown
0216128fb0 Builds fine in 4, Fails in 0.12.7 2015-10-01 18:15:10 -05:00
Keegan Brown
1974fd6d00 Revert "conversion + build + test passed... so far"
This reverts commit ea69fcc10b73a191e1d3dc6c9decdc1ebc8bc714.
2015-10-01 11:03:08 -05:00
Keegan Brown
ea69fcc10b conversion + build + test passed... so far 2015-09-29 13:39:49 -05:00
Anshul Jain
7c426bf69a Fix code formatting for native code closes #295 2015-09-14 17:03:51 -07:00
Anshul Jain
4f04198cc3 Create a matrix using the provided scalar 2015-09-10 17:59:33 -07:00
Michael Vines
ddf0313d3a Matrix::ToBuffer no longer references deallocated memory 2015-08-21 14:12:07 -07:00
Max Ehrlich
3655349e83 Fixed function name 2015-07-23 11:16:27 -04:00
Max Ehrlich
1eeae7879c Added release function to attempt to explicitly free mat memory 2015-07-23 10:34:56 -04:00
Peter Braden
2ddb97047e Merge pull request #253 from tualo/master
added cv::normalize and getData
2015-07-15 12:32:02 +02:00
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