diff --git a/src/metadata.cc b/src/metadata.cc index 83173c66..29e41ebb 100644 --- a/src/metadata.cc +++ b/src/metadata.cc @@ -145,7 +145,7 @@ class MetadataWorker : public Napi::AsyncWorker { // Handle warnings std::string warning = sharp::VipsWarningPop(); while (!warning.empty()) { - debuglog.MakeCallback(Receiver().Value(), { Napi::String::New(env, warning) }); + debuglog.Call(Receiver().Value(), { Napi::String::New(env, warning) }); warning = sharp::VipsWarningPop(); } @@ -246,9 +246,9 @@ class MetadataWorker : public Napi::AsyncWorker { Napi::Buffer::NewOrCopy(env, baton->tifftagPhotoshop, baton->tifftagPhotoshopLength, sharp::FreeCallback)); } - Callback().MakeCallback(Receiver().Value(), { env.Null(), info }); + Callback().Call(Receiver().Value(), { env.Null(), info }); } else { - Callback().MakeCallback(Receiver().Value(), { Napi::Error::New(env, sharp::TrimEnd(baton->err)).Value() }); + Callback().Call(Receiver().Value(), { Napi::Error::New(env, sharp::TrimEnd(baton->err)).Value() }); } delete baton->input; diff --git a/src/pipeline.cc b/src/pipeline.cc index 4bef6642..3144046e 100644 --- a/src/pipeline.cc +++ b/src/pipeline.cc @@ -1215,7 +1215,7 @@ class PipelineWorker : public Napi::AsyncWorker { // Handle warnings std::string warning = sharp::VipsWarningPop(); while (!warning.empty()) { - debuglog.MakeCallback(Receiver().Value(), { Napi::String::New(env, warning) }); + debuglog.Call(Receiver().Value(), { Napi::String::New(env, warning) }); warning = sharp::VipsWarningPop(); } @@ -1263,17 +1263,17 @@ class PipelineWorker : public Napi::AsyncWorker { // Pass ownership of output data to Buffer instance Napi::Buffer data = Napi::Buffer::NewOrCopy(env, static_cast(baton->bufferOut), baton->bufferOutLength, sharp::FreeCallback); - Callback().MakeCallback(Receiver().Value(), { env.Null(), data, info }); + Callback().Call(Receiver().Value(), { env.Null(), data, info }); } else { // Add file size to info struct STAT64_STRUCT st; if (STAT64_FUNCTION(baton->fileOut.data(), &st) == 0) { info.Set("size", static_cast(st.st_size)); } - Callback().MakeCallback(Receiver().Value(), { env.Null(), info }); + Callback().Call(Receiver().Value(), { env.Null(), info }); } } else { - Callback().MakeCallback(Receiver().Value(), { Napi::Error::New(env, sharp::TrimEnd(baton->err)).Value() }); + Callback().Call(Receiver().Value(), { Napi::Error::New(env, sharp::TrimEnd(baton->err)).Value() }); } // Delete baton @@ -1291,7 +1291,7 @@ class PipelineWorker : public Napi::AsyncWorker { // Decrement processing task counter sharp::counterProcess--; Napi::Number queueLength = Napi::Number::New(env, static_cast(sharp::counterQueue)); - queueListener.MakeCallback(Receiver().Value(), { queueLength }); + queueListener.Call(Receiver().Value(), { queueLength }); } private: @@ -1708,7 +1708,7 @@ Napi::Value pipeline(const Napi::CallbackInfo& info) { // Increment queued task counter Napi::Number queueLength = Napi::Number::New(info.Env(), static_cast(++sharp::counterQueue)); - queueListener.MakeCallback(info.This(), { queueLength }); + queueListener.Call(info.This(), { queueLength }); return info.Env().Undefined(); } diff --git a/src/stats.cc b/src/stats.cc index 74454190..b06d3bb5 100644 --- a/src/stats.cc +++ b/src/stats.cc @@ -106,7 +106,7 @@ class StatsWorker : public Napi::AsyncWorker { // Handle warnings std::string warning = sharp::VipsWarningPop(); while (!warning.empty()) { - debuglog.MakeCallback(Receiver().Value(), { Napi::String::New(env, warning) }); + debuglog.Call(Receiver().Value(), { Napi::String::New(env, warning) }); warning = sharp::VipsWarningPop(); } @@ -141,9 +141,9 @@ class StatsWorker : public Napi::AsyncWorker { dominant.Set("g", baton->dominantGreen); dominant.Set("b", baton->dominantBlue); info.Set("dominant", dominant); - Callback().MakeCallback(Receiver().Value(), { env.Null(), info }); + Callback().Call(Receiver().Value(), { env.Null(), info }); } else { - Callback().MakeCallback(Receiver().Value(), { Napi::Error::New(env, sharp::TrimEnd(baton->err)).Value() }); + Callback().Call(Receiver().Value(), { Napi::Error::New(env, sharp::TrimEnd(baton->err)).Value() }); } delete baton->input;