881 Commits

Author SHA1 Message Date
Simon Hailes
cbb7f31b48 add back in missing #ifdef 2017-11-11 11:29:57 +00:00
Simon Hailes
841fe088f6 Background subtractor: Add async, add CreateMOG2, CreateGMG, Add some MOG parameters. now OpenCV 2.4 and 3.x 2017-11-11 11:03:14 +00:00
btsimonh
729686f6dc
Merge pull request #584 from btsimonh/readImageMem
opencv:readimage Async - fix suspected memory leak
2017-11-10 16:17:03 +00:00
btsimonh
65b64b162d
Merge pull request #583 from btsimonh/resizeexceptionchecking
Resize (async) exception checking and memory leak prevention
2017-11-10 16:16:23 +00:00
Simon Hailes
6d09f70367 opencv:readimage Async - change newed mat to local class to try to prevent mem leak; also try-catch to signal failure through callback 2017-11-10 14:07:20 +00:00
Simon Hailes
6393a7f44e avoid warning about initilisation order 2017-11-10 10:32:51 +00:00
Simon Hailes
0b6b1f42cc fix stupid typo 2017-11-10 10:28:56 +00:00
Simon Hailes
f2c05255a0 resize: delete the dest we created on error, and if still present on destructor 2017-11-10 10:25:27 +00:00
Simon Hailes
ab0bd505d2 resize(async): seems we can get an assert in Unwrap if image has 0,0, size, so catch and report as a callback error. 2017-11-10 09:49:12 +00:00
Peter Braden
fdd0c97a3c
Merge pull request #578 from btsimonh/warninglines
fix vs compile error due to warning lines
2017-11-07 13:51:41 +01:00
Peter Braden
cc70d63c79
Merge pull request #579 from btsimonh/histogram
Histogram - fix VS compilation by setting constant size arrays.
2017-11-07 13:51:31 +01:00
Simon Hailes
9271d2c606 Histogram - fix VS compilation by setting constant size arrays. 2017-11-07 09:42:17 +00:00
Simon Hailes
91796df65e fix vs compile error due to warning lines 2017-11-07 09:28:21 +00:00
Peter Braden
db70b8ce6b
Merge pull request #575 from btsimonh/imreadconstants
add constants for use with cv::imread and cv::imdecode
2017-11-06 15:14:35 +01:00
Simon Hailes
71a6d451fe make CV_LOAD_IMAGE_IGNORE_ORIENTATION only available if CV >= 3.2.0 2017-11-06 09:41:14 +00:00
Peter Braden
ca7847d651
Merge pull request #574 from btsimonh/btsimonh-readImageAsync
Btsimonh read image async
2017-11-06 09:26:05 +01:00
Simon Hailes
bf6aa03f5d add constants CV_LOAD_IMAGE_UNCHANGED, CV_LOAD_IMAGE_GRAYSCALE, CV_LOAD_IMAGE_COLOR, CV_LOAD_IMAGE_ANYDEPTH, CV_LOAD_IMAGE_ANYCOLOR, CV_LOAD_IMAGE_IGNORE_ORIENTATION
For use with imread/imdecode via readImage
2017-11-04 16:00:44 +00:00
Simon Hailes
862cb7f777 Update examples/readimage.js for readImageAsync. 2017-11-04 15:01:26 +00:00
Simon Hailes
bc62d03f84 Add cv.readImageAsync. same interface as readImage, only the callbacks are really Asynchronous, except for matrix creation.
Introduces two Asyn Wrokers, one for readin images from disk, and one for decoding images from buffers.
2017-11-04 14:53:44 +00:00
Simon Hailes
2dd3745c81 cv.readImage: add flags arguments plus update example 2017-11-04 14:50:01 +00:00
Simon Hailes
5d05f22d55 cv.readImage: Add verison which returns mat (i.e. no callback fn). Fix create with width & height. Add readimage.js to examples folder. 2017-11-04 13:20:39 +00:00
Peter Braden
cc8b4804c5
Merge pull request #568 from peterbraden/available-modules
Available modules
2017-11-03 13:41:48 +01:00
Peter Braden
d760e792a4
Merge pull request #565 from btsimonh/btsimonh-async-resize
Add Async to Matix.resize
2017-11-03 10:41:29 +01:00
Simon Hailes
9e4f214441 Add resize example 2017-11-03 08:34:59 +00:00
Peter Braden
bfd91f66b7
Merge pull request #567 from btsimonh/btsimonh-add-setFPS
VideoCaptureWrap: Add setFPS - returns FPS read back.
2017-11-03 09:15:31 +01:00
Simon Hailes
f2e1fc3e1e VideoCaptureWrap: Add setFPS - returns FPS read back. 2017-11-02 19:47:34 +00:00
Simon Hailes
44f175632c resize: move async fn to last argument 2017-11-02 09:44:57 +00:00
Simon Hailes
b67c96ee31 Matrix: Add aync to resize. If first argument is fn(err, img), then run async. Also add fx,fy arguments.
call styles may be:
Sync (modify existing image, new image is CV_32FC3) - same interface as before except added fx,fy
im.resize( width, height );
im.resize( width, height, fx, fy );
im.resize( width, height, interpolation );
im.resize( width, height, fx, fy, interpolation );
Async (create new image, new image is not forced to CV_32FC3?)
im.resize( fn, width, height );
im.resize( fn, width, height, fx, fy );
im.resize( fn, width, height, interpolation );
im.resize( fn, width, height, fx, fy, interpolation );
2017-11-02 08:48:59 +00:00
Dan Schultzer
a58656270f Disable CalcOpticalFlowPyrLK when no vid module 2017-09-16 13:13:08 -07:00
Dan Schultzer
b8169e009b Remove VideoWriterWrap 2017-09-16 13:02:47 -07:00
Dan Schultzer
b7967c3293 Fix new face recognizer setup 2017-09-16 12:58:02 -07:00
Dan Schultzer
95b0596245 Add logic for available modules
With OpenCV >3.1 and 2.4.13, OpenCV can now be installed without specific modules. This makes it so that `node-opencv` will still be able to compile.
2017-09-15 11:29:32 -07:00
Peter Braden
52333d460f Update package.json 2017-09-13 12:07:47 +02:00
Peter Braden
884e0dcc41 Merge pull request #518 from DynamicSTOP/master
extended pixelCol and pixelRow (1,3,4 channels), added getPixel
2017-09-13 11:54:17 +02:00
Peter Braden
cb67608f59 Merge pull request #509 from aramando/master
Missing var declaration in example
2017-09-13 11:43:06 +02:00
Peter Braden
1da9634322 Merge pull request #534 from dennisvr/videowriter
VideoWriter
2017-09-13 11:42:26 +02:00
Peter Braden
d28de48e72 Merge branch 'master' into master 2017-09-13 11:41:59 +02:00
Peter Braden
bbf323d8b4 Merge pull request #536 from piercus/master
Add emd(), calcHist(), Matrix.fromArray() and Matrix.prototype.toArray()
2017-09-13 11:39:04 +02:00
Peter Braden
5b52c8c327 Merge branch 'master' into videowriter 2017-09-13 11:34:08 +02:00
Peter Braden
5603b035f9 Merge pull request #539 from fakob/adding-getters
Adding getHeight and getWidth methods
2017-09-13 11:32:06 +02:00
Jakob Schindegger
5ebc9b3ced Adding missing mapping 2017-09-10 17:00:31 +02:00
Pierre Colle
6de971d0e8 merge compare with piercus's master branch 2017-09-05 17:47:10 +02:00
Pierre Colle
f061c032aa add compare test 2017-09-05 17:37:50 +02:00
Pierre Colle
8a8cf57693 add compare 2017-09-05 17:37:00 +02:00
Pierre Colle
416fbd100e add compare 2017-09-05 17:36:48 +02:00
Pierre Colle
0722569d7e clean logs and error messages 2017-09-05 16:49:28 +02:00
Jakob Schindegger
3e9daa46f8 Adding getHeight and getWidth methods 2017-09-04 22:52:37 +02:00
Pierre Colle
0cc8a3e86e error message 2017-08-31 16:10:18 +02:00
Pierre Colle
2754367628 add Matrix.prototype.mul 2017-08-31 15:53:45 +02:00
Pierre Colle
688d721465 rm useless function nodeArrayToVec 2017-08-28 17:07:33 +02:00