diff options
| -rw-r--r-- | src/library_browser.js | 6 | ||||
| -rw-r--r-- | system/include/emscripten/emscripten.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/library_browser.js b/src/library_browser.js index db1695da..0b590342 100644 --- a/src/library_browser.js +++ b/src/library_browser.js @@ -1178,7 +1178,7 @@ mergeInto(LibraryManager.library, { }, emscripten_get_preloaded_image_data: function(path, w, h) { - if (typeof path == "number") { + if (typeof path === "number") { path = Pointer_stringify(path); } @@ -1194,14 +1194,14 @@ mergeInto(LibraryManager.library, { {{{ makeSetValue('h', '0', 'canvas.height', 'i32') }}}; return buf; } - + return 0; }, emscripten_get_preloaded_image_data_from_FILE__deps: ['emscripten_get_preloaded_image_data'], emscripten_get_preloaded_image_data_from_FILE: function(file, w, h) { var stream = FS.getStreamFromPtr(file); - if(stream) { + if (stream) { return _emscripten_get_preloaded_image_data(stream.path, w, h); } diff --git a/system/include/emscripten/emscripten.h b/system/include/emscripten/emscripten.h index 6bd3ef07..195c538d 100644 --- a/system/include/emscripten/emscripten.h +++ b/system/include/emscripten/emscripten.h @@ -521,6 +521,7 @@ void emscripten_debugger(); * Get preloaded image data and the size of the image. * * Returns pointer to loaded image or NULL. + * width/height of image are written to w/h if data is valid. * Pointer should be free()'d */ char *emscripten_get_preloaded_image_data(char *path, int *w, int *h); @@ -529,6 +530,7 @@ char *emscripten_get_preloaded_image_data(char *path, int *w, int *h); * Get preloaded image data from a c FILE *. * * Returns pointer to loaded image or NULL. + * width/height of image are written to w/h if data is valid. * Pointer should be free()'d */ char *emscripten_get_preloaded_image_data_from_FILE(FILE *file, int *w, int *h); |