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

Merge pull request #405 from dxprog/master

Browse Source 
loading image by file/buffer now has same behaviour
This commit is contained in:
Peter Braden 2016-05-03 15:45:47 +02:00
commit 0374115c72
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
examples/files/opencv.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
examples/files/over_text.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

4
src/OpenCV.cc
View File

@ -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");

26
test/unit.js
View File

@ -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()