596 Commits

Author SHA1 Message Date
Peter Braden
25387eafa8 Merge pull request #306 from borromeotlhs/opencv3
opencv3 Dockerfile
2016-09-23 01:13:42 -07:00
TJ Borromeo
77e7227360 Dockerfile: Instantiate opencv3 baseline
This should assist in making opencv3 and node-opencv work easier.
From logs of this build:
--     GDAL:                        NO
--
--   Video I/O:
--     DC1394 1.x:                  NO
--     DC1394 2.x:                  YES (ver 2.2.1)
--     FFMPEG:                      YES
--       codec:                     YES (ver 54.35.0)
--       format:                    YES (ver 54.20.4)
--       util:                      YES (ver 52.3.0)
--       swscale:                   YES (ver 2.1.1)
--       resample:                  NO
--       gentoo-style:              YES
--     GStreamer:
--       base:                      YES (ver 0.10.36)
--       video:                     YES (ver 0.10.36)
--       app:                       YES (ver 0.10.36)
--       riff:                      YES (ver 0.10.36)
--       pbutils:                   YES (ver 0.10.36)
--     OpenNI:                      NO
--     OpenNI PrimeSensor Modules:  NO
--     OpenNI2:                     NO
--     PvAPI:                       NO
--     GigEVisionSDK:               NO
--     UniCap:                      NO
--     UniCap ucil:                 NO
--     V4L/V4L2:                    Using libv4l1 (ver 1.0.1) / libv4l2 (ver 1.0.1)
--     XIMEA:                       NO
--     Xine:                        NO
--     gPhoto2:                     NO
--
--   Other third-party libraries:
--     Use IPP:                     8.2.1 [8.2.1]
--          at:                     /opencv/opencv-3.0.0/3rdparty/ippicv/unpack/ippicv_lnx
--     Use IPP Async:               NO
--     Use Eigen:                   NO
--     Use TBB:                     YES (ver 4.2 interface 7000)
--     Use OpenMP:                  NO
--     Use GCD                      NO
--     Use Concurrency              NO
--     Use C=:                      NO
--     Use pthreads for parallel for:
--                                  NO
--     Use Cuda:                    NO
--     Use OpenCL:                  YES
--
--   OpenCL:
--     Version:                     dynamic
--     Include path:                /opencv/opencv-3.0.0/3rdparty/include/opencl/1.2
--     Use AMDFFT:                  NO
--     Use AMDBLAS:                 NO
--
--   Python 2:
--     Interpreter:                 /usr/bin/python2.7 (ver 2.7.6)
--     Libraries:                   /usr/lib/x86_64-linux-gnu/libpython2.7.so (ver 2.7.6)
--     numpy:                       /usr/lib/python2.7/dist-packages/numpy/core/include (ver 1.8.2)
--     packages path:               lib/python2.7/dist-packages
--
--   Python 3:
--     Interpreter:                 /usr/bin/python3.4 (ver 3.4)
--
--   Python (for build):            /usr/bin/python2.7
--
--   Java:
--     ant:                         NO
--     JNI:                         NO
--     Java wrappers:               NO
--     Java tests:                  NO
--
--   Matlab:
--     mex:                         NO
--
--   Documentation:
--     Doxygen:                     NO
--     PlantUML:                    NO
--
--   Tests and samples:
--     Tests:                       YES
--     Performance tests:           YES
--     C/C++ Examples:              NO
--
--   Install path:                  /usr/local
--
--   cvconfig.h is in:              /opencv/opencv-3.0.0/build
-- -----------------------------------------------------------------
--
-- Configuring done
-- Generating done
CMake Warning:
  Manually-specified variables were not used by the project:

    BUILD_NEW_PYTHON_SUPPORT

-- Build files have been written to: /opencv/opencv-3.0.0/build
2015-09-22 21:00:24 -07:00
TJ Borromeo
e35522fdab Merge branch 'master' of https://github.com/peterbraden/node-opencv
Conflicts:
	Dockerfile
2015-09-22 20:59:05 -07:00
Peter Braden
709df98d83 Merge pull request #304 from peterbraden/docker-environments
Docker environments
2015-09-22 20:29:25 +02:00
Peter Braden
00bb8d9858 disable broken example 2015-09-22 20:09:33 +02:00
Peter Braden
b7ae201294 stupid whitespace 2015-09-22 19:57:46 +02:00
Peter Braden
2f82d00951 disable iojs build until I can resolve nan issues 2015-09-22 19:47:51 +02:00
Peter Braden
83237831ac typo 2015-09-22 19:39:50 +02:00
Peter Braden
b5f62f1f34 disable osx until https://github.com/travis-ci/travis-ci/issues/2311 2015-09-22 19:38:03 +02:00
Peter Braden
b96c99e5c1 build in travis 2015-09-22 19:32:50 +02:00
Peter Braden
6edc5de8cf Merge branch 'master' of github.com:peterbraden/node-opencv into docker-environments 2015-09-22 19:30:44 +02:00
Peter Braden
5663d6fac1 add Dockerfile 14.04 2015-09-22 19:28:14 +02:00
Peter Braden
5d48db4bd0 unpeg version - version in npm should _always_ be stable 2015-09-22 19:21:53 +02:00
Peter Braden
1d64a67724 Merge branch 'master' of https://github.com/borromeotlhs/node-opencv into docker-environments 2015-09-22 19:20:31 +02:00
Peter Braden
ee29e56c73 add 12:04 dockerfile 2015-09-22 19:19:53 +02:00
Peter Braden
246de81274 Merge pull request #303 from peterbraden/travis-docker
Travis docker
2015-09-22 19:16:06 +02:00
Peter Braden
f172d5ceaa Correct travis / docker build 2015-09-22 19:08:26 +02:00
Peter Braden
52da870c3f Revert "Revert "try docker and travis""
This reverts commit ae84a6891bebda4d602bbe00766b690b7a610897.
2015-09-22 18:41:09 +02:00
Peter Braden
ae84a6891b Revert "try docker and travis"
This reverts commit d9fee0f814afc1b278dd3b9a1506a66a57869893.
2015-09-22 12:38:33 -04:00
Peter Braden
d9fee0f814 try docker and travis 2015-09-22 12:27:01 -04:00
Peter Braden
0b723e99aa build on travis/osx 2015-09-22 11:41:53 -04:00
Peter Braden
6273a988bf Bump version requirements 2015-09-22 11:29:20 -04:00
Peter Braden
cbaff9a133 Make FaceRecognizer require OpenCV <= v2.4.8.
For some reason OpenCV shipped a broken branch build on Ubuntu 2.4.2 64
bit.

Thanks to @gluxon for noticing this:
https://github.com/peterbraden/node-opencv/issues/56#issuecomment-20263153

Rather than try and be clever, I'm just gonna up the version
requirements.

This fixes #56 #41 #105 #240 and #275
2015-09-22 11:24:40 -04:00
TJ Borromeo
c37b4ae932 Bump versioning
Pointing out that node's opencv is locked to v3.2.0.  This should be updated (IMO) whenever it is known that node's opencv is stable and that prebuilt binaries are checked into the osx-binaries branch.
2015-09-21 18:52:34 -07:00
TJ Borromeo
f888846dbd Updating to Ubuntu 14.04
Updated version to 0.2 and Docker-version to 1.8.2.
Locked node's opencv to v3.2.0 when installed via npm.
2015-09-21 18:44:11 -07:00
TJ Borromeo
6c3ae43b1b Updating to Ubuntu 14.04
Just because.
2015-09-21 18:41:13 -07:00
Peter Braden
6df08451b5 Iojs originally isn't working yet 2015-09-18 16:55:53 +02:00
Peter Braden
b3838a740e start testing newer node 2015-09-18 16:50:05 +02:00
Peter Braden
8983f40e23 add editorconfig 2015-09-18 16:46:49 +02:00
Peter Braden
6363918463 Merge branch 'code_formatting' of https://github.com/jainanshul/node-opencv into jainanshul-code_formatting 2015-09-18 16:42:16 +02:00
Peter Braden
57884e5d31 Fix dockerfile 2015-09-18 16:19:37 +02:00
Anshul Jain
7c426bf69a Fix code formatting for native code closes #295 2015-09-14 17:03:51 -07:00
Peter Braden
97b896331c Merge pull request #294 from jainanshul/matrix_scalar
Create a matrix using the provided scalar
2015-09-11 14:50:48 +02:00
Anshul Jain
4f04198cc3 Create a matrix using the provided scalar 2015-09-10 17:59:33 -07:00
Peter Braden
e8eaef2e1f Merge pull request #289 from mvines/master
Only run equalizeHist() if an BGR matrix was provided
2015-08-31 12:25:26 +02:00
Michael Vines
20807d6284 Only run equalizeHist() if an BGR matrix was provided
Grayscale matrices are used unmodified.
2015-08-30 01:08:55 -07:00
Peter Braden
6988381bfa Merge pull request #287 from mvines/vcwleak
VideoCaptureWrap: patch memory leak and simplify AsyncVCWorker
2015-08-27 08:29:40 +02:00
Michael Vines
63bc56be70 VideoCaptureWrap: patch memory leak and simplify AsyncVCWorker. 2015-08-26 22:18:28 -07:00
Peter Braden
110fc740b1 3.2.0 2015-08-22 18:05:13 +02:00
Peter Braden
59d1d2b975 changelog 2015-08-22 18:05:01 +02:00
Peter Braden
5026afaf08 Merge pull request #282 from mvines/3950c04
detectMultiScale now works if a grayscale matrix is provided
2015-08-22 18:03:25 +02:00
Peter Braden
dab2d6253a Merge pull request #283 from mvines/100755
Matrix::ToBuffer no longer references deallocated memory
2015-08-22 18:03:04 +02:00
Peter Braden
2691de4fa2 Merge pull request #284 from mvines/a512cf9
Add support for VideoCapture grab/retrieve
2015-08-22 18:02:37 +02:00
Michael Vines
45d6b84320 Add support for VideoCapture grab/retrieve 2015-08-21 15:04:28 -07:00
Michael Vines
ddf0313d3a Matrix::ToBuffer no longer references deallocated memory 2015-08-21 14:12:07 -07:00
Michael Vines
dece21619f AsyncDetectMultiScale: use input matrix if color conversion was not required. 2015-08-21 14:10:39 -07:00
Peter Braden
d376062737 Merge pull request #280 from dropfen/master
Allow UTF8 Filenames in readImage
2015-08-21 09:28:10 +02:00
dropfen
e2cabf1305 Allow UTF8 Filenames in readImage 2015-08-20 19:09:36 +02:00
Peter Braden
b382a807d2 3.1.0 2015-08-17 18:39:42 +02:00
Peter Braden
bec1ccd73a changelog 2015-08-17 18:39:38 +02:00