diff --git a/include/addon-tools.hpp b/include/addon-tools.hpp index 546dd23..0a4c792 100644 --- a/include/addon-tools.hpp +++ b/include/addon-tools.hpp @@ -397,22 +397,22 @@ inline Type* getBufferData( inline void *getData(Napi::Env env, Napi::Object obj) { - void *pixels = nullptr; + void *data = nullptr; - if (obj.IsTypedArray() || obj.IsArrayBuffer()) { - pixels = getArrayData(env, obj); - } else if (obj.IsBuffer()) { - pixels = getBufferData(env, obj); + if (obj.IsBuffer()) { + data = getBufferData(env, obj); + } else if (obj.IsTypedArray() || obj.IsArrayBuffer()) { + data = getArrayData(env, obj); } else if (obj.Has("data")) { Napi::Object data = obj.Get("data").As(); - if (data.IsTypedArray() || data.IsArrayBuffer()) { - pixels = getArrayData(env, data); - } else if (data.IsBuffer()) { - pixels = getBufferData(env, data); + if (data.IsBuffer()) { + data = getBufferData(env, data); + } else if (data.IsTypedArray() || data.IsArrayBuffer()) { + data = getArrayData(env, data); } } - return pixels; + return data; }