diff --git a/examples/files/opencv.png b/examples/files/opencv.png new file mode 100755 index 00000000..521a0dce Binary files /dev/null and b/examples/files/opencv.png differ diff --git a/examples/files/over_text.png b/examples/files/over_text.png index 1e21d42b..06a3819c 100755 Binary files a/examples/files/over_text.png and b/examples/files/over_text.png differ diff --git a/src/OpenCV.cc b/src/OpenCV.cc index 62007a45..14a498da 100755 --- a/src/OpenCV.cc +++ b/src/OpenCV.cc @@ -37,14 +37,14 @@ NAN_METHOD(OpenCV::ReadImage) { } else if (info[0]->IsString()) { std::string filename = std::string(*Nan::Utf8String(info[0]->ToString())); - mat = cv::imread(filename); + mat = cv::imread(filename, CV_LOAD_IMAGE_UNCHANGED); } else if (Buffer::HasInstance(info[0])) { uint8_t *buf = (uint8_t *) Buffer::Data(info[0]->ToObject()); unsigned len = Buffer::Length(info[0]->ToObject()); cv::Mat *mbuf = new cv::Mat(len, 1, CV_64FC1, buf); - mat = cv::imdecode(*mbuf, -1); + mat = cv::imdecode(*mbuf, CV_LOAD_IMAGE_UNCHANGED); if (mat.empty()) { argv[0] = Nan::Error("Error loading file"); diff --git a/test/unit.js b/test/unit.js index 309cf628..c13191cf 100755 --- a/test/unit.js +++ b/test/unit.js @@ -127,7 +127,7 @@ test(".norm", function(assert){ var errorL2 = im.norm(im2, cv.Constants.NORM_L2); assert.equal(errorL2, 7295.591339980605); - + errorL2 = im.norm(im, cv.Constants.NORM_L2); assert.equal(errorL2, 0); assert.end(); @@ -205,23 +205,25 @@ test(".bitwiseXor", function(assert){ test("Image read from file", function(assert){ - cv.readImage("./examples/files/mona.png", function(err, im){ + cv.readImage("./examples/files/opencv.png", function(err, im){ assert.ok(im); - assert.equal(im.width(), 500); - assert.equal(im.height(), 756) - assert.equal(im.empty(), false) - assert.end() + assert.equal(im.width(), 82); + assert.equal(im.height(), 99); + assert.equal(im.channels(), 4); + assert.equal(im.empty(), false); + assert.end(); }) }) test("read Image from buffer", function(assert){ - cv.readImage(fs.readFileSync('./examples/files/mona.png'), function(err, im){ + cv.readImage(fs.readFileSync('./examples/files/opencv.png'), function(err, im){ assert.ok(im); - assert.equal(im.width(), 500); - assert.equal(im.height(), 756) - assert.equal(im.empty(), false) - assert.end() + assert.equal(im.width(), 82); + assert.equal(im.height(), 99); + assert.equal(im.channels(), 4); + assert.equal(im.empty(), false); + assert.end(); }) }) @@ -242,7 +244,7 @@ test("Cascade Classifier", function(assert){ test("ImageDataStream", function(assert){ var s = new cv.ImageDataStream() - s.on('load', function(im){ + s.on('load', function(im){ assert.ok(im) assert.equal(im.empty(), false); assert.end()