From 5d05f22d554b911de2dfb4d6e1942fc8ce1ead46 Mon Sep 17 00:00:00 2001
From: Simon Hailes <btsimonh@googlemail.com>
Date: Sat, 4 Nov 2017 13:20:39 +0000
Subject: [PATCH] cv.readImage:  Add verison which returns mat (i.e. no
 callback fn).  Fix create with width & height.  Add readimage.js to examples
 folder.

---
 examples/readimage.js | 27 +++++++++++++++++++++++++++
 src/OpenCV.cc         | 30 +++++++++++++++++++++++++-----
 2 files changed, 52 insertions(+), 5 deletions(-)
 create mode 100644 examples/readimage.js

diff --git a/examples/readimage.js b/examples/readimage.js
new file mode 100644
index 0000000..435d6bb
--- /dev/null
+++ b/examples/readimage.js
@@ -0,0 +1,27 @@
+var cv = require('../lib/opencv');
+
+
+
+var img = cv.readImage("./files/mona.png");
+console.log('Synchronous readImage("./files/mona.png")'+img.width()+'x'+img.height());
+
+cv.readImage("./files/mona.png", function(err, im){
+	console.log('callback readImage("./files/mona.png", fn(){})'+im.width()+'x'+im.height());
+});
+
+img = cv.readImage( 100, 100 );
+console.log('Synchronous readImage(100, 100) (create mat)'+img.width()+'x'+img.height());
+
+cv.readImage(100, 100, function(err, im){
+	console.log('callback readImage(100, 100, fn(){}) (create mat)'+im.width()+'x'+im.height());
+});
+
+var fs = require('fs');
+var imgdata = fs.readFileSync("./files/mona.png");
+
+img = cv.readImage(imgdata);
+console.log('Synchronous readImage(imgdata:Buffer)'+img.width()+'x'+img.height());
+
+cv.readImage(imgdata, function(err, im){
+	console.log('callback readImage(imgdata:Buffer, fn(){})'+im.width()+'x'+im.height());
+});
diff --git a/src/OpenCV.cc b/src/OpenCV.cc
index d77090e..9002c5e 100755
--- a/src/OpenCV.cc
+++ b/src/OpenCV.cc
@@ -17,7 +17,6 @@ void OpenCV::Init(Local<Object> target) {
 NAN_METHOD(OpenCV::ReadImage) {
   Nan::EscapableHandleScope scope;
 
-  REQ_FUN_ARG(1, cb);
 
   Local<Value> argv[2];
   argv[0] = Nan::Null();
@@ -26,12 +25,23 @@ NAN_METHOD(OpenCV::ReadImage) {
   Matrix *img = Nan::ObjectWrap::Unwrap<Matrix>(im_h);
   argv[1] = im_h;
 
+  int callback_arg = -1;
+  int numargs = info.Length();
+  int success = 1;
+  
+  Local<Function> cb;
+
+  // deal with situation where we have int, int, cb
+  if (info[numargs-1]->IsFunction()){
+      callback_arg = numargs-1;
+      cb = Local<Function>::Cast(info[callback_arg]);
+  }
+  
   try {
     cv::Mat mat;
 
     if (info[0]->IsNumber() && info[1]->IsNumber()) {
       int width, height;
-
       width = info[0]->Uint32Value();
       height = info[1]->Uint32Value();
       mat = *(new cv::Mat(width, height, CV_64FC1));
@@ -48,6 +58,7 @@ NAN_METHOD(OpenCV::ReadImage) {
       mat = cv::imdecode(*mbuf, CV_LOAD_IMAGE_UNCHANGED);
 
       if (mat.empty()) {
+        success = 0;
         argv[0] = Nan::Error("Error loading file");
       }
     }
@@ -56,15 +67,24 @@ NAN_METHOD(OpenCV::ReadImage) {
   } catch (cv::Exception& e) {
     argv[0] = Nan::Error(e.what());
     argv[1] = Nan::Null();
+    success = 0;
   }
 
   Nan::TryCatch try_catch;
-  cb->Call(Nan::GetCurrentContext()->Global(), 2, argv);
-
+  // if we got a callback
+  if (callback_arg >= 0){
+    // if using callback
+    cb->Call(Nan::GetCurrentContext()->Global(), 2, argv);
+  } else {
+    // if to return the mat
+    if (success)
+      info.GetReturnValue().Set(im_h);
+    else
+      info.GetReturnValue().Set(Nan::New<Boolean>(false));
+  }
   if (try_catch.HasCaught()) {
     Nan::FatalException(try_catch);
   }
-
   return;
 }