From 8b3e747c35ecaaece432aa542b8e56047fa1e387 Mon Sep 17 00:00:00 2001 From: Keegan Brown Date: Tue, 6 Oct 2015 12:46:44 -0500 Subject: [PATCH] Eliminated deprecation warnings while building in Node v4.1.2 --- src/BackgroundSubtractor.cc | 4 ++-- src/CascadeClassifierWrap.cc | 4 ++-- src/Matrix.cc | 8 ++++---- src/OpenCV.cc | 4 ++-- src/VideoCaptureWrap.cc | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/BackgroundSubtractor.cc b/src/BackgroundSubtractor.cc index 69b703d..fdbbaed 100644 --- a/src/BackgroundSubtractor.cc +++ b/src/BackgroundSubtractor.cc @@ -104,11 +104,11 @@ NAN_METHOD(BackgroundSubtractorWrap::ApplyMOG) { argv[0] = Nan::Null(); argv[1] = fgMask; - TryCatch try_catch; + Nan::TryCatch try_catch; cb->Call(Nan::GetCurrentContext()->Global(), 2, argv); if (try_catch.HasCaught()) { - FatalException(try_catch); + Nan::FatalException(try_catch); } return; } catch (cv::Exception& e) { diff --git a/src/CascadeClassifierWrap.cc b/src/CascadeClassifierWrap.cc index 9642722..b8c5a49 100755 --- a/src/CascadeClassifierWrap.cc +++ b/src/CascadeClassifierWrap.cc @@ -97,10 +97,10 @@ public: argv[0] = Nan::Null(); argv[1] = arr; - TryCatch try_catch; + Nan::TryCatch try_catch; callback->Call(2, argv); if (try_catch.HasCaught()) { - FatalException(try_catch); + Nan::FatalException(try_catch); } } diff --git a/src/Matrix.cc b/src/Matrix.cc index 1396781..fb6a145 100755 --- a/src/Matrix.cc +++ b/src/Matrix.cc @@ -645,10 +645,10 @@ public: actualBuffer }; - TryCatch try_catch; + Nan::TryCatch try_catch; callback->Call(2, argv); if (try_catch.HasCaught()) { - FatalException(try_catch); + Nan::FatalException(try_catch); } } @@ -915,10 +915,10 @@ public: Nan::New(res) }; - TryCatch try_catch; + Nan::TryCatch try_catch; callback->Call(2, argv); if (try_catch.HasCaught()) { - FatalException(try_catch); + Nan::FatalException(try_catch); } } diff --git a/src/OpenCV.cc b/src/OpenCV.cc index 20692df..62007a4 100755 --- a/src/OpenCV.cc +++ b/src/OpenCV.cc @@ -57,11 +57,11 @@ NAN_METHOD(OpenCV::ReadImage) { argv[1] = Nan::Null(); } - TryCatch try_catch; + Nan::TryCatch try_catch; cb->Call(Nan::GetCurrentContext()->Global(), 2, argv); if (try_catch.HasCaught()) { - FatalException(try_catch); + Nan::FatalException(try_catch); } return; diff --git a/src/VideoCaptureWrap.cc b/src/VideoCaptureWrap.cc index cb4fcfd..8bfc453 100755 --- a/src/VideoCaptureWrap.cc +++ b/src/VideoCaptureWrap.cc @@ -172,10 +172,10 @@ public: , im_to_return }; - TryCatch try_catch; + Nan::TryCatch try_catch; callback->Call(2, argv); if (try_catch.HasCaught()) { - FatalException(try_catch); + Nan::FatalException(try_catch); } }