Skip to content

Updated to nan 2.4.0 #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ReneHollander wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updated to nan 2.4.0 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d0ad5b
Updated to nan 2.4.0
Sep 15, 2016
05335fd
Fixed vgImageSubData
Sep 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion openvg.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var openVG = module.exports = require('./build/Release/openvg.node');
var openVG = module.exports = require('bindings')('openvg.node');

var screen = openVG.screen = {
width : null,
Expand Down
14 changes: 7 additions & 7 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
{
"name": "openvg",
"preferGlobal": "true",
"version": "0.4.6",
"version": "0.5.0",
"author": "Luis Reis <luis@luismreis.com> (http://luismreis.com/)",
"contributors": [
"Rene Hollander <rene@rene8888.at> (http://www.rene8888.at/)"
],
"description": "OpenVG bindings for node",
"main": "openvg.js",
"repository": {
Expand All @@ -14,11 +17,8 @@
"openvg"
],
"dependencies": {
"nan": "^1.8.4"
"nan": "^2.4.0",
"bindings": "^1.2.1"
},
"devDependencies": {},
"license": "MIT",
"engines": {
"node": ">=0.8 <0.11"
}
"license": "MIT"
}
184 changes: 92 additions & 92 deletions src/argchecks.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,173 +6,173 @@
#if defined(ARG_CHECKS)

#define BASE_MESSAGE "Invalid arguments: Expected "
#define THROW(fn, args) NanThrowTypeError(BASE_MESSAGE #fn "(" args ")")
#define THROW(fn, info) NanThrowTypeError(BASE_MESSAGE #fn "(" info ")")

#define CheckArgs0(fn) \
do {\
if (!(args.Length() == 0)) {\
if (!(info.Length() == 0)) {\
THROW(fn, );\
}\
} while(0)

#define CheckArgs1(fn, arg0, type0) \
do {\
if (!(args.Length() == 1 &&\
args[0]->Is ## type0())) {\
if (!(info.Length() == 1 &&\
info[0]->Is ## type0())) {\
THROW(fn, #arg0);\
}\
} while(0)

#define CheckArgs2(fn, arg0, type0, arg1, type1) \
do {\
if (!(args.Length() == 2 &&\
args[0]->Is ## type0() &&\
args[1]->Is ## type1())) {\
if (!(info.Length() == 2 &&\
info[0]->Is ## type0() &&\
info[1]->Is ## type1())) {\
THROW(fn, #arg0 "," #arg1);\
}\
} while(0)

#define CheckArgs3(fn, arg0, type0, arg1, type1, arg2, type2) \
do {\
if (!(args.Length() == 3 &&\
args[0]->Is ## type0() &&\
args[1]->Is ## type1() &&\
args[2]->Is ## type2())) {\
if (!(info.Length() == 3 &&\
info[0]->Is ## type0() &&\
info[1]->Is ## type1() &&\
info[2]->Is ## type2())) {\
THROW(fn, #arg0 "," #arg1 "," #arg2);\
}\
} while(0)

#define CheckArgs4(fn, arg0, type0, arg1, type1, arg2, type2, arg3, type3) \
do {\
if (!(args.Length() == 4 &&\
args[0]->Is ## type0() &&\
args[1]->Is ## type1() &&\
args[2]->Is ## type2() &&\
args[3]->Is ## type3())) {\
if (!(info.Length() == 4 &&\
info[0]->Is ## type0() &&\
info[1]->Is ## type1() &&\
info[2]->Is ## type2() &&\
info[3]->Is ## type3())) {\
THROW(fn, #arg0 "," #arg1 "," #arg2 "," #arg3);\
}\
} while(0)

#define CheckArgs5(fn, arg0, type0, arg1, type1, arg2, type2, arg3, type3, arg4, type4) \
do {\
if (!(args.Length() == 5 &&\
args[0]->Is ## type0() &&\
args[1]->Is ## type1() &&\
args[2]->Is ## type2() &&\
args[3]->Is ## type3() &&\
args[4]->Is ## type4())) {\
if (!(info.Length() == 5 &&\
info[0]->Is ## type0() &&\
info[1]->Is ## type1() &&\
info[2]->Is ## type2() &&\
info[3]->Is ## type3() &&\
info[4]->Is ## type4())) {\
THROW(fn, #arg0 "," #arg1 "," #arg2 "," #arg3 "," #arg4);\
}\
} while(0)

#define CheckArgs6(fn, arg0, type0, arg1, type1, arg2, type2, arg3, type3, arg4, type4, arg5, type5) \
do {\
if (!(args.Length() == 6 &&\
args[0]->Is ## type0() &&\
args[1]->Is ## type1() &&\
args[2]->Is ## type2() &&\
args[3]->Is ## type3() &&\
args[4]->Is ## type4() &&\
args[5]->Is ## type5())) {\
if (!(info.Length() == 6 &&\
info[0]->Is ## type0() &&\
info[1]->Is ## type1() &&\
info[2]->Is ## type2() &&\
info[3]->Is ## type3() &&\
info[4]->Is ## type4() &&\
info[5]->Is ## type5())) {\
THROW(fn, #arg0 "," #arg1 "," #arg2 "," #arg3 "," #arg4 "," #arg5);\
}\
} while(0)

#define CheckArgs7(fn, arg0, type0, arg1, type1, arg2, type2, arg3, type3, arg4, type4, arg5, type5, arg6, type6) \
do {\
if (!(args.Length() == 7 &&\
args[0]->Is ## type0() &&\
args[1]->Is ## type1() &&\
args[2]->Is ## type2() &&\
args[3]->Is ## type3() &&\
args[4]->Is ## type4() &&\
args[5]->Is ## type5() &&\
args[6]->Is ## type6())) {\
if (!(info.Length() == 7 &&\
info[0]->Is ## type0() &&\
info[1]->Is ## type1() &&\
info[2]->Is ## type2() &&\
info[3]->Is ## type3() &&\
info[4]->Is ## type4() &&\
info[5]->Is ## type5() &&\
info[6]->Is ## type6())) {\
THROW(fn, #arg0 "," #arg1 "," #arg2 "," #arg3 "," #arg4 "," #arg5 "," #arg6);\
}\
} while(0)

#define CheckArgs8(fn, arg0, type0, arg1, type1, arg2, type2, arg3, type3, arg4, type4, arg5, type5, arg6, type6, arg7, type7) \
do {\
if (!(args.Length() == 8 &&\
args[0]->Is ## type0() &&\
args[1]->Is ## type1() &&\
args[2]->Is ## type2() &&\
args[3]->Is ## type3() &&\
args[4]->Is ## type4() &&\
args[5]->Is ## type5() &&\
args[6]->Is ## type6() &&\
args[7]->Is ## type7())) {\
if (!(info.Length() == 8 &&\
info[0]->Is ## type0() &&\
info[1]->Is ## type1() &&\
info[2]->Is ## type2() &&\
info[3]->Is ## type3() &&\
info[4]->Is ## type4() &&\
info[5]->Is ## type5() &&\
info[6]->Is ## type6() &&\
info[7]->Is ## type7())) {\
THROW(fn, #arg0 "," #arg1 "," #arg2 "," #arg3 "," #arg4 "," #arg5 "," #arg6 "," #arg7);\
}\
} while(0)

#define CheckArgs9(fn, arg0, type0, arg1, type1, arg2, type2, arg3, type3, arg4, type4, arg5, type5, arg6, type6, arg7, type7, arg8, type8) \
do {\
if (!(args.Length() == 9 &&\
args[0]->Is ## type0() &&\
args[1]->Is ## type1() &&\
args[2]->Is ## type2() &&\
args[3]->Is ## type3() &&\
args[4]->Is ## type4() &&\
args[5]->Is ## type5() &&\
args[6]->Is ## type6() &&\
args[7]->Is ## type7() &&\
args[8]->Is ## type8())) {\
if (!(info.Length() == 9 &&\
info[0]->Is ## type0() &&\
info[1]->Is ## type1() &&\
info[2]->Is ## type2() &&\
info[3]->Is ## type3() &&\
info[4]->Is ## type4() &&\
info[5]->Is ## type5() &&\
info[6]->Is ## type6() &&\
info[7]->Is ## type7() &&\
info[8]->Is ## type8())) {\
THROW(fn, #arg0 "," #arg1 "," #arg2 "," #arg3 "," #arg4 "," #arg5 "," #arg6 "," #arg7 "," #arg8);\
}\
} while(0)

#define CheckArgs10(fn, arg0, type0, arg1, type1, arg2, type2, arg3, type3, arg4, type4, arg5, type5, arg6, type6, arg7, type7, arg8, type8, arg9, type9) \
do {\
if (!(args.Length() == 10 &&\
args[0]->Is ## type0() &&\
args[1]->Is ## type1() &&\
args[2]->Is ## type2() &&\
args[3]->Is ## type3() &&\
args[4]->Is ## type4() &&\
args[5]->Is ## type5() &&\
args[6]->Is ## type6() &&\
args[7]->Is ## type7() &&\
args[8]->Is ## type8() &&\
args[9]->Is ## type9())) {\
if (!(info.Length() == 10 &&\
info[0]->Is ## type0() &&\
info[1]->Is ## type1() &&\
info[2]->Is ## type2() &&\
info[3]->Is ## type3() &&\
info[4]->Is ## type4() &&\
info[5]->Is ## type5() &&\
info[6]->Is ## type6() &&\
info[7]->Is ## type7() &&\
info[8]->Is ## type8() &&\
info[9]->Is ## type9())) {\
THROW(fn, #arg0 "," #arg1 "," #arg2 "," #arg3 "," #arg4 "," #arg5 "," #arg6 "," #arg7 "," #arg8 "," #arg9);\
}\
} while(0)

#define CheckArgs11(fn, arg0, type0, arg1, type1, arg2, type2, arg3, type3, arg4, type4, arg5, type5, arg6, type6, arg7, type7, arg8, type8, arg9, type9, arg10, type10) \
do {\
if (!(args.Length() == 11 &&\
args[0]->Is ## type0() &&\
args[1]->Is ## type1() &&\
args[2]->Is ## type2() &&\
args[3]->Is ## type3() &&\
args[4]->Is ## type4() &&\
args[5]->Is ## type5() &&\
args[6]->Is ## type6() &&\
args[7]->Is ## type7() &&\
args[8]->Is ## type8() &&\
args[9]->Is ## type9() &&\
args[10]->Is ## type10())) {\
if (!(info.Length() == 11 &&\
info[0]->Is ## type0() &&\
info[1]->Is ## type1() &&\
info[2]->Is ## type2() &&\
info[3]->Is ## type3() &&\
info[4]->Is ## type4() &&\
info[5]->Is ## type5() &&\
info[6]->Is ## type6() &&\
info[7]->Is ## type7() &&\
info[8]->Is ## type8() &&\
info[9]->Is ## type9() &&\
info[10]->Is ## type10())) {\
THROW(fn, #arg0 "," #arg1 "," #arg2 "," #arg3 "," #arg4 "," #arg5 "," #arg6 "," #arg7 "," #arg8 "," #arg9 "," #arg10);\
}\
} while(0)

#define CheckArgs12(fn, arg0, type0, arg1, type1, arg2, type2, arg3, type3, arg4, type4, arg5, type5, arg6, type6, arg7, type7, arg8, type8, arg9, type9, arg10, type10, arg11, type11) \
do {\
if (!(args.Length() == 12 &&\
args[0]->Is ## type0() &&\
args[1]->Is ## type1() &&\
args[2]->Is ## type2() &&\
args[3]->Is ## type3() &&\
args[4]->Is ## type4() &&\
args[5]->Is ## type5() &&\
args[6]->Is ## type6() &&\
args[7]->Is ## type7() &&\
args[8]->Is ## type8() &&\
args[9]->Is ## type9() &&\
args[10]->Is ## type10() &&\
args[11]->Is ## type11())) {\
if (!(info.Length() == 12 &&\
info[0]->Is ## type0() &&\
info[1]->Is ## type1() &&\
info[2]->Is ## type2() &&\
info[3]->Is ## type3() &&\
info[4]->Is ## type4() &&\
info[5]->Is ## type5() &&\
info[6]->Is ## type6() &&\
info[7]->Is ## type7() &&\
info[8]->Is ## type8() &&\
info[9]->Is ## type9() &&\
info[10]->Is ## type10() &&\
info[11]->Is ## type11())) {\
THROW(fn, #arg0 "," #arg1 "," #arg2 "," #arg3 "," #arg4 "," #arg5 "," #arg6 "," #arg7 "," #arg8 "," #arg9 "," #arg10 "," #arg11);\
}\
} while(0)
Expand Down
Loading