diff options
| author | Tor Andersson <tor@ccxvii.net> | 2014-12-03 01:30:51 +0100 |
|---|---|---|
| committer | Tor Andersson <tor@ccxvii.net> | 2014-12-03 01:33:01 +0100 |
| commit | 026e27be430c5d1dca82f087ed1dc1a594232b70 (patch) | |
| tree | e5f34d88705b20d2904e07ac3bf7baf1ed7d7eeb | |
| parent | b5c88619e31952649275b9fc03d24a1c66ad2ec5 (diff) | |
| download | mupdf-026e27be430c5d1dca82f087ed1dc1a594232b70.tar.xz | |
Update MuJS to latest.
| -rw-r--r-- | source/pdf/js/pdf-jsimp-mu.c | 23 | ||||
| m--------- | thirdparty/mujs | 0 |
2 files changed, 7 insertions, 16 deletions
diff --git a/source/pdf/js/pdf-jsimp-mu.c b/source/pdf/js/pdf-jsimp-mu.c index fb777028..37a5cc76 100644 --- a/source/pdf/js/pdf-jsimp-mu.c +++ b/source/pdf/js/pdf-jsimp-mu.c @@ -33,10 +33,7 @@ pdf_jsimp *pdf_new_jsimp(fz_context *ctx, void *jsctx) pdf_jsimp *imp; J = js_newstate(alloc, ctx); - - js_pushnull(J); /* prototype for jsctx userdata object */ - js_newuserdata(J, "jsctx", jsctx); /* create jsctx userdata object */ - js_setregistry(J, "jsctx"); /* hide it in the registry */ + js_setcontext(J, jsctx); imp = fz_malloc_struct(ctx, pdf_jsimp); imp->ctx = ctx; @@ -83,9 +80,7 @@ static void wrapmethod(js_State *J) int argc = js_gettop(J) - 1; - js_getregistry(J, "jsctx"); - jsctx = js_touserdata(J, -1, "jsctx"); - js_pop(J, 1); + jsctx = js_getcontext(J); js_currentfunction(J); { @@ -124,9 +119,7 @@ static void wrapgetter(js_State *J) void *jsctx; void *obj; - js_getregistry(J, "jsctx"); - jsctx = js_touserdata(J, -1, "jsctx"); - js_pop(J, 1); + jsctx = js_getcontext(J); js_currentfunction(J); { @@ -159,9 +152,7 @@ static void wrapsetter(js_State *J) void *jsctx; void *obj; - js_getregistry(J, "jsctx"); - jsctx = js_touserdata(J, -1, "jsctx"); - js_pop(J, 1); + jsctx = js_getcontext(J); js_currentfunction(J); { @@ -190,7 +181,7 @@ void pdf_jsimp_addmethod(pdf_jsimp *imp, pdf_jsimp_type *type, char *name, pdf_j js_State *J = imp->J; js_getregistry(J, (const char *)type); { - js_newcfunction(J, wrapmethod, 0); + js_newcfunction(J, wrapmethod, name, 0); { js_pushnull(J); js_newuserdata(J, "method", meth); @@ -208,7 +199,7 @@ void pdf_jsimp_addproperty(pdf_jsimp *imp, pdf_jsimp_type *type, char *name, pdf js_State *J = imp->J; js_getregistry(J, (const char *)type); { - js_newcfunction(J, wrapgetter, 0); + js_newcfunction(J, wrapgetter, name, 0); { js_pushnull(J); js_newuserdata(J, "getter", get); @@ -216,7 +207,7 @@ void pdf_jsimp_addproperty(pdf_jsimp *imp, pdf_jsimp_type *type, char *name, pdf js_pushstring(J, (const char *)type); js_defproperty(J, -2, "__type", JS_READONLY | JS_DONTENUM | JS_DONTCONF); } - js_newcfunction(J, wrapsetter, 0); + js_newcfunction(J, wrapsetter, name, 0); { js_pushnull(J); js_newuserdata(J, "setter", set); diff --git a/thirdparty/mujs b/thirdparty/mujs -Subproject bc51de87ef59dee31e37d1e81de7886a6e54bf4 +Subproject 031513b25b73ce5e5fc7d6bafd512a822d8ded7 |