electron
/
addon-tools-el
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reorder getData

This commit is contained in:
Luis Blanco 2020-03-23 15:09:14 +03:00
parent 360867eb0d
commit 1ca8dab472
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/addon-tools.hpp
View File

@ -397,22 +397,22 @@ inline Type* getBufferData(
inline void *getData(Napi::Env env, Napi::Object obj) { inline void *getData(Napi::Env env, Napi::Object obj) {
void *pixels = nullptr; void *data = nullptr;
if (obj.IsTypedArray() || obj.IsArrayBuffer()) { if (obj.IsBuffer()) {
pixels = getArrayData<uint8_t>(env, obj); data = getBufferData<uint8_t>(env, obj);
} else if (obj.IsBuffer()) { } else if (obj.IsTypedArray() || obj.IsArrayBuffer()) {
pixels = getBufferData<uint8_t>(env, obj); data = getArrayData<uint8_t>(env, obj);
} else if (obj.Has("data")) { } else if (obj.Has("data")) {
Napi::Object data = obj.Get("data").As<Napi::Object>(); Napi::Object data = obj.Get("data").As<Napi::Object>();
if (data.IsTypedArray() || data.IsArrayBuffer()) { if (data.IsBuffer()) {
pixels = getArrayData<uint8_t>(env, data); data = getBufferData<uint8_t>(env, data);
} else if (data.IsBuffer()) { } else if (data.IsTypedArray() || data.IsArrayBuffer()) {
pixels = getBufferData<uint8_t>(env, data); data = getArrayData<uint8_t>(env, data);
} }
} }
return pixels; return data;
} }