Return to old version of opencv to try compilation.

This commit is contained in:
edgarsilva 2015-02-04 12:51:35 -06:00
parent 9035d9b0fb
commit 7d16f2e046
3 changed files with 24 additions and 23 deletions

View File

@ -14,8 +14,8 @@ env:
before_install: before_install:
# Fix a problem with apt-get failing later, see http://docs.travis-ci.com/user/installing-dependencies/#Installing-Ubuntu-packages # Fix a problem with apt-get failing later, see http://docs.travis-ci.com/user/installing-dependencies/#Installing-Ubuntu-packages
- sudo apt-get update -qq - sudo apt-get update -qq
- sudo add-apt-repository -y ppa:kubuntu-ppa/backports # - sudo add-apt-repository -y ppa:kubuntu-ppa/backports
- sudo apt-get update # - sudo apt-get update
- sudo apt-get install libcv-dev - sudo apt-get install libcv-dev
- sudo apt-get install libopencv-dev - sudo apt-get install libopencv-dev
- sudo apt-get install libhighgui-dev - sudo apt-get install libhighgui-dev

View File

@ -1,6 +1,6 @@
var cv = require('../lib/opencv') var cv = require('../lib/opencv');
var trainingData = [] var trainingData = [];
/* /*
for (var i = 1; i< 41; i++){ for (var i = 1; i< 41; i++){
for (var j = 1; j<10; j++){ for (var j = 1; j<10; j++){
@ -22,5 +22,5 @@ cv.readImage("/Users/peterbraden/Downloads/orl_faces/s6/10.pgm", function(e, im)
*/ */
cv.readImage("./examples/files/mona.png", function(e, mat){ cv.readImage("./examples/files/mona.png", function(e, mat){
var th = mat.threshold(200, 200, "Threshold to Zero Inverted"); var th = mat.threshold(200, 200, "Threshold to Zero Inverted");
th.save('./examples/tmp/out.png') th.save('./examples/tmp/out.png');
}) });

View File

@ -21,7 +21,7 @@ BackgroundSubtractorWrap::Init(Handle<Object> target) {
NODE_SET_PROTOTYPE_METHOD(ctor, "applyMOG", ApplyMOG); NODE_SET_PROTOTYPE_METHOD(ctor, "applyMOG", ApplyMOG);
target->Set(NanNew("BackgroundSubtractor"), ctor->GetFunction()); target->Set(NanNew("BackgroundSubtractor"), ctor->GetFunction());
}; };
NAN_METHOD(BackgroundSubtractorWrap::New) { NAN_METHOD(BackgroundSubtractorWrap::New) {
@ -42,17 +42,17 @@ NAN_METHOD(BackgroundSubtractorWrap::New) {
NAN_METHOD(BackgroundSubtractorWrap::CreateMOG) { NAN_METHOD(BackgroundSubtractorWrap::CreateMOG) {
NanScope(); NanScope();
int history = 200; // int history = 200;
int nmixtures = 5; // int nmixtures = 5;
double backgroundRatio = 0.7; // double backgroundRatio = 0.7;
double noiseSigma = 0; // double noiseSigma = 0;
//
if(args.Length() > 1){ // if(args.Length() > 1){
INT_FROM_ARGS(history, 0) // INT_FROM_ARGS(history, 0)
INT_FROM_ARGS(nmixtures, 1) // INT_FROM_ARGS(nmixtures, 1)
DOUBLE_FROM_ARGS(backgroundRatio, 2) // DOUBLE_FROM_ARGS(backgroundRatio, 2)
DOUBLE_FROM_ARGS(noiseSigma, 3) // DOUBLE_FROM_ARGS(noiseSigma, 3)
} // }
Local<Object> n = NanNew(BackgroundSubtractorWrap::constructor)->GetFunction()->NewInstance(); Local<Object> n = NanNew(BackgroundSubtractorWrap::constructor)->GetFunction()->NewInstance();
@ -83,13 +83,13 @@ NAN_METHOD(BackgroundSubtractorWrap::ApplyMOG) {
Local<Object> fgMask = NanNew(Matrix::constructor)->GetFunction()->NewInstance(); Local<Object> fgMask = NanNew(Matrix::constructor)->GetFunction()->NewInstance();
Matrix *img = ObjectWrap::Unwrap<Matrix>(fgMask); Matrix *img = ObjectWrap::Unwrap<Matrix>(fgMask);
cv::Mat mat; cv::Mat mat;
if(Buffer::HasInstance(args[0])){ if(Buffer::HasInstance(args[0])){
uint8_t *buf = (uint8_t *) Buffer::Data(args[0]->ToObject()); uint8_t *buf = (uint8_t *) Buffer::Data(args[0]->ToObject());
unsigned len = Buffer::Length(args[0]->ToObject()); unsigned len = Buffer::Length(args[0]->ToObject());
cv::Mat *mbuf = new cv::Mat(len, 1, CV_64FC1, buf); cv::Mat *mbuf = new cv::Mat(len, 1, CV_64FC1, buf);
mat = cv::imdecode(*mbuf, -1); mat = cv::imdecode(*mbuf, -1);
//mbuf->release(); //mbuf->release();
@ -116,13 +116,13 @@ NAN_METHOD(BackgroundSubtractorWrap::ApplyMOG) {
TryCatch try_catch; TryCatch try_catch;
cb->Call(NanGetCurrentContext()->Global(), 2, argv); cb->Call(NanGetCurrentContext()->Global(), 2, argv);
if (try_catch.HasCaught()) { if (try_catch.HasCaught()) {
FatalException(try_catch); FatalException(try_catch);
} }
NanReturnUndefined(); NanReturnUndefined();
} }
catch( cv::Exception& e ){ catch( cv::Exception& e ){
const char* err_msg = e.what(); const char* err_msg = e.what();
NanThrowError(err_msg); NanThrowError(err_msg);
@ -136,3 +136,4 @@ BackgroundSubtractorWrap::BackgroundSubtractorWrap(cv::Ptr<cv::BackgroundSubtrac
}; };
#endif #endif