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 #258 from hybridgroup/return-instead-of-throw

Browse Source 
Return error instead of throw
This commit is contained in:
Peter Braden 2015-06-15 13:02:08 +02:00
commit 3fdb9c5ad5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/OpenCV.cc
View File

@ -27,6 +27,11 @@ NAN_METHOD(OpenCV::ReadImage) {
REQ_FUN_ARG(1, cb);
Local<Value> argv[2];
argv[0] = NanNull();
argv[1] = im_h;
if (args[0]->IsNumber() && args[1]->IsNumber()){
int width, height;
@ -47,17 +52,12 @@ NAN_METHOD(OpenCV::ReadImage) {
mat = cv::imdecode(*mbuf, -1);
if (mat.empty()){
NanThrowTypeError("Error loading file");
argv[0] = NanError("Error loading file");
}
}
img->mat = mat;
Local<Value> argv[2];
argv[0] = NanNull();
argv[1] = im_h;
TryCatch try_catch;
cb->Call(NanGetCurrentContext()->Global(), 2, argv);