archive-gh-me/node-opencv
1
0
Fork 0
mirror of https://github.com/peterbraden/node-opencv.git synced 2025-12-08 19:45:55 +00:00
Code Issues Projects Releases Wiki Activity
656 Commits 10 Branches 4 Tags
Commit Graph

656 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peter Braden
e7cf37b9cc Merge pull request #309 from keeganbrown/master 
Attempt to upgrade to NAN2
 2015-10-07 16:02:14 +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
420cd12c60 clean up vagrant folder 2015-10-05 17:57:13 -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
a0faef9e65 Here goes nothing... 
So apparently Nan v2 has removed Handle and uses Local instead. Not
sure wtf that’s all about. I have no idea if this works, but it builds
in both node v4.1.1 and v0.12.7 and passes the included tests in both.
 2015-10-05 13:53:34 -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
ad99fa17f2 temp change git url 2015-09-29 15:37:54 -05:00
Keegan Brown
ea69fcc10b conversion + build + test passed... so far 2015-09-29 13:39:49 -05:00
Keegan Brown
fd40071640 prep 2015-09-29 12:59:06 -05: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
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
Reski
6a1a8640c9 Merge pull request #2 from funky81/opencv-dev 
Update README.md
 2015-09-08 02:44:50 +07:00
Reski
e0f88ccbd4 Update README.md 2015-09-08 02:43:31 +07:00
Reski
d43718f56c Merge pull request #1 from funky81/opencv-dev 
Update README.md
 2015-09-08 02:39:47 +07:00
Reski
1e0c45cb87 Update README.md 2015-09-08 02:39:28 +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