455 Commits

Author SHA1 Message Date
David Starke
e1c0d8ef4e Correctly track memory for image pyramid functions 2018-01-17 14:55:57 -08:00
David Starke
9646626e3d Consolidate external memory adjustment in Matrix 2018-01-17 14:25:43 -08:00
David Starke
45c8894167 Additional memory tracking for matrices 2018-01-11 15:47:30 -08:00
David Starke
2cd3bd4ff4 slightly more clear memory handling for async tasks 2018-01-05 11:49:36 -08:00
David Starke
f8d7dc2f06 More accurate tracking of external memory using OpenCV’s reference counts 2018-01-04 20:16:36 -08:00
David Starke
dff99718b9 missed adjusting the external memory on resize 2018-01-04 12:04:26 -08:00
David Starke
dbf2df0ef8 Track external memory usage for matrices 2017-12-22 15:29:49 -08:00
Eric Lundberg
a8790273a9 Add support for scale param in mul, several additional params in goodFeaturesToTrack. Only convert to grayscale in goodFeaturesToTrack if not already in grayscale 2017-11-28 11:39:44 -08:00
btsimonh
a1d7a22ccd
Merge pull request #590 from btsimonh/logopencvversion
Log OpenCV version in built in init.cc
2017-11-14 13:42:13 +00:00
Simon Hailes
e943fe727b Log OpenCV version in built in init.cc 2017-11-14 13:21:13 +00:00
Simon Thiel
6597046897 FIX OpenCV 3.3: support compilation with OpenCV 3.3 2017-11-13 14:51:56 +01:00
Simon Thiel
ece9efc8c9 FEATURE HighGUI.cc: add resize window function 2017-11-13 14:51:56 +01:00
Peter Braden
fa663d449b
Merge pull request #588 from btsimonh/refcount
Refcount
2017-11-13 09:58:02 +01:00
Simon Hailes
f4d0459fa7 kill ref to addref in Matrix.h 2017-11-13 08:40:44 +00:00
Simon Hailes
bc8095534b comment out Addref - too dangerous to leave in. Modify test example. 2017-11-12 17:48:36 +00:00
Simon Hailes
9316a01f03 fix typo 2017-11-12 16:48:08 +00:00
Simon Hailes
96d0eb8824 Matrix: add mtx.addref() and mtx.getrefCount() 2017-11-12 16:03:17 +00:00
Simon Hailes
b1edee0527 VideoWriter: make safe to mat.release() before async is complete 2017-11-12 15:59:45 +00:00
Simon Hailes
642bf94a3d Matrix: resizeasync - make safe to mat.release() before async is complete 2017-11-12 15:58:17 +00:00
Simon Hailes
31c9349885 Matrix: asyncsave: make safe to mat.release of input mat before async is complete. 2017-11-12 15:57:29 +00:00
Simon Hailes
81ac6941b9 AsyncToBuffer - make it safe to mat.release() the input image before the async func has completed. 2017-11-12 15:56:33 +00:00
Simon Hailes
e0087841bd Backgroundsubtractor: protect async against release of input mat 2017-11-12 15:45:03 +00:00
Simon Hailes
cdb8d7ff9b move backgroundsubtrator::init out if HAVE_OPENCV_VIDEO and into new HAVE_BACKGROUNDSUBTRACTOR 2017-11-11 14:00:19 +00:00
Simon Hailes
507bb2482b Fix Synchronous Apply() 2017-11-11 12:14:55 +00:00
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
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
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
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
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
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
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
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