From 7eb8a5c5dcab7297f07e2d90ca46e7bfc0885530 Mon Sep 17 00:00:00 2001 From: Tim Lander Date: Tue, 4 Jun 2019 10:00:12 +0800 Subject: [PATCH 1/6] Replace uses of deprecated canvas_size functions --- tests/sdl_canvas_size.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/sdl_canvas_size.c b/tests/sdl_canvas_size.c index eed3e50dc998e..15afe4c89af1a 100644 --- a/tests/sdl_canvas_size.c +++ b/tests/sdl_canvas_size.c @@ -29,15 +29,15 @@ int main(int argc, char *argv[]) screen = SDL_SetVideoMode( 0, 0, 16, SDL_OPENGL ); // *changed* // Test 2: Check that getting current canvas size works. - int w, h, fs; - emscripten_get_canvas_size(&w, &h, &fs); + int w, h; + emscripten_get_canvas_size("#canvas", &w, &h); printf("w:%d,h:%d\n", w,h); assert(w == 700); assert(h == 200); // Test 3: Check that resizing the canvas works as well. - emscripten_set_canvas_size(640, 480); - emscripten_get_canvas_size(&w, &h, &fs); + emscripten_set_canvas_size("#canvas", 640, 480); + emscripten_get_canvas_size("#canvas", &w, &h); printf("w:%d,h:%d\n", w,h); assert(w == 640); assert(h == 480); From 8e8ce4bd779b1b2f5c613d249763d47020118822 Mon Sep 17 00:00:00 2001 From: Tim Lander Date: Tue, 4 Jun 2019 10:26:14 +0800 Subject: [PATCH 2/6] Replace more uses of deprecated canvas_size functions --- tests/sdl_resize.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/sdl_resize.c b/tests/sdl_resize.c index 2e1845fb054ec..333c7db782322 100644 --- a/tests/sdl_resize.c +++ b/tests/sdl_resize.c @@ -24,7 +24,7 @@ void loop() { case 0: assert(r->w == 100); assert(r->h == 200); - emscripten_set_canvas_size(123, 246); + emscripten_set_canvas_size("#canvas", 123, 246); stage++; break; case 1: @@ -44,7 +44,7 @@ int main() { SDL_Init(SDL_INIT_VIDEO); SDL_Surface *screen = SDL_SetVideoMode(600, 450, 32, SDL_HWSURFACE); - emscripten_set_canvas_size(100, 200); + emscripten_set_canvas_size("#canvas", 100, 200); emscripten_set_main_loop(loop, 0, 0); } From b0998a8415f67d5ae4a803929acabb31927b0d4e Mon Sep 17 00:00:00 2001 From: Tim Lander Date: Tue, 4 Jun 2019 11:04:15 +0800 Subject: [PATCH 3/6] Forgot to also rename the function --- tests/sdl_resize.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/sdl_resize.c b/tests/sdl_resize.c index 333c7db782322..b3b1b9541a6b6 100644 --- a/tests/sdl_resize.c +++ b/tests/sdl_resize.c @@ -24,7 +24,7 @@ void loop() { case 0: assert(r->w == 100); assert(r->h == 200); - emscripten_set_canvas_size("#canvas", 123, 246); + emscripten_set_canvas_element_size("#canvas", 123, 246); stage++; break; case 1: @@ -44,7 +44,7 @@ int main() { SDL_Init(SDL_INIT_VIDEO); SDL_Surface *screen = SDL_SetVideoMode(600, 450, 32, SDL_HWSURFACE); - emscripten_set_canvas_size("#canvas", 100, 200); + emscripten_set_canvas_element_size("#canvas", 100, 200); emscripten_set_main_loop(loop, 0, 0); } From 1d778c3aceb303e994a0db7ec9ab693410880055 Mon Sep 17 00:00:00 2001 From: Tim Lander Date: Tue, 4 Jun 2019 11:05:02 +0800 Subject: [PATCH 4/6] Forgot to also rename the function --- tests/sdl_canvas_size.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/sdl_canvas_size.c b/tests/sdl_canvas_size.c index 15afe4c89af1a..d82b87cd42fab 100644 --- a/tests/sdl_canvas_size.c +++ b/tests/sdl_canvas_size.c @@ -30,14 +30,14 @@ int main(int argc, char *argv[]) // Test 2: Check that getting current canvas size works. int w, h; - emscripten_get_canvas_size("#canvas", &w, &h); + emscripten_get_canvas_element_size("#canvas", &w, &h); printf("w:%d,h:%d\n", w,h); assert(w == 700); assert(h == 200); // Test 3: Check that resizing the canvas works as well. - emscripten_set_canvas_size("#canvas", 640, 480); - emscripten_get_canvas_size("#canvas", &w, &h); + emscripten_set_canvas_element_size("#canvas", 640, 480); + emscripten_get_canvas_element_size("#canvas", &w, &h); printf("w:%d,h:%d\n", w,h); assert(w == 640); assert(h == 480); From 6afde5d1b154b0dae85731c71d2306e6ce02aa9b Mon Sep 17 00:00:00 2001 From: Tim Lander Date: Tue, 4 Jun 2019 14:09:51 +0800 Subject: [PATCH 5/6] Include html5 header --- tests/sdl_canvas_size.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/sdl_canvas_size.c b/tests/sdl_canvas_size.c index d82b87cd42fab..b21e337c72175 100644 --- a/tests/sdl_canvas_size.c +++ b/tests/sdl_canvas_size.c @@ -14,6 +14,7 @@ #include #include +#include int main(int argc, char *argv[]) { From 37c83035a48d8a0235fee742208bd9c043212a6e Mon Sep 17 00:00:00 2001 From: Tim Lander Date: Tue, 4 Jun 2019 14:10:07 +0800 Subject: [PATCH 6/6] Include html5 header (part2) --- tests/sdl_resize.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/sdl_resize.c b/tests/sdl_resize.c index b3b1b9541a6b6..8f0a611e66d7a 100644 --- a/tests/sdl_resize.c +++ b/tests/sdl_resize.c @@ -10,6 +10,7 @@ #include #include #include +#include int stage = 0;