From 77b72dc3500c55c7a40e7ddba4c831fc6c8a7ccc Mon Sep 17 00:00:00 2001 From: Adrian Zankich Date: Tue, 9 Jun 2015 17:27:18 -0700 Subject: [PATCH] Return error instead of throw --- src/OpenCV.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/OpenCV.cc b/src/OpenCV.cc index 6ebdf01..4ccd4d2 100755 --- a/src/OpenCV.cc +++ b/src/OpenCV.cc @@ -27,6 +27,11 @@ NAN_METHOD(OpenCV::ReadImage) { REQ_FUN_ARG(1, cb); + Local 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 argv[2]; - - argv[0] = NanNull(); - argv[1] = im_h; - TryCatch try_catch; cb->Call(NanGetCurrentContext()->Global(), 2, argv);