We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] patch for SDL / tests

SDL_test_patch_Android_API_21.diff (text/plain), 5.56 KB, created by Sylvain on 2015-06-17 07:06:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sylvain

Created: 2015-06-17 07:06:07 UTC

Size: 5.56 KB

patch

obsolete

>diff -r a1b920bc870d test/testdraw2.c
>--- a/test/testdraw2.c	Tue Jun 16 22:16:35 2015 -0700
>+++ b/test/testdraw2.c	Wed Jun 17 09:01:48 2015 +0200
>@@ -72,8 +72,8 @@
>         SDL_SetRenderDrawColor(renderer, 255, (Uint8) current_color,
>                                (Uint8) current_color, (Uint8) current_alpha);
> 
>-        x = rand() % viewport.w;
>-        y = rand() % viewport.h;
>+        x = lrand48() % viewport.w;
>+        y = lrand48() % viewport.h;
>         SDL_RenderDrawPoint(renderer, x, y);
>     }
> }
>@@ -121,10 +121,10 @@
>             SDL_RenderDrawLine(renderer, 0, viewport.h / 2, viewport.w - 1, viewport.h / 2);
>             SDL_RenderDrawLine(renderer, viewport.w / 2, 0, viewport.w / 2, viewport.h - 1);
>         } else {
>-            x1 = (rand() % (viewport.w*2)) - viewport.w;
>-            x2 = (rand() % (viewport.w*2)) - viewport.w;
>-            y1 = (rand() % (viewport.h*2)) - viewport.h;
>-            y2 = (rand() % (viewport.h*2)) - viewport.h;
>+            x1 = (lrand48() % (viewport.w*2)) - viewport.w;
>+            x2 = (lrand48() % (viewport.w*2)) - viewport.w;
>+            y1 = (lrand48() % (viewport.h*2)) - viewport.h;
>+            y2 = (lrand48() % (viewport.h*2)) - viewport.h;
>             SDL_RenderDrawLine(renderer, x1, y1, x2, y2);
>         }
>     }
>@@ -167,10 +167,10 @@
>         SDL_SetRenderDrawColor(renderer, 255, (Uint8) current_color,
>                                (Uint8) current_color, (Uint8) current_alpha);
> 
>-        rect.w = rand() % (viewport.h / 2);
>-        rect.h = rand() % (viewport.h / 2);
>-        rect.x = (rand() % (viewport.w*2) - viewport.w) - (rect.w / 2);
>-        rect.y = (rand() % (viewport.h*2) - viewport.h) - (rect.h / 2);
>+        rect.w = lrand48() % (viewport.h / 2);
>+        rect.h = lrand48() % (viewport.h / 2);
>+        rect.x = (lrand48() % (viewport.w*2) - viewport.w) - (rect.w / 2);
>+        rect.y = (lrand48() % (viewport.h*2) - viewport.h) - (rect.h / 2);
>         SDL_RenderFillRect(renderer, &rect);
>     }
> }
>@@ -274,7 +274,7 @@
>         SDL_RenderClear(renderer);
>     }
> 
>-    srand((unsigned int)time(NULL));
>+    srand48((unsigned int)time(NULL));
> 
>     /* Main render loop */
>     frames = 0;
>diff -r a1b920bc870d test/testintersections.c
>--- a/test/testintersections.c	Tue Jun 16 22:16:35 2015 -0700
>+++ b/test/testintersections.c	Wed Jun 17 09:01:48 2015 +0200
>@@ -74,8 +74,8 @@
>         SDL_SetRenderDrawColor(renderer, 255, (Uint8) current_color,
>                                (Uint8) current_color, (Uint8) current_alpha);
> 
>-        x = rand() % viewport.w;
>-        y = rand() % viewport.h;
>+        x = lrand48() % viewport.w;
>+        y = lrand48() % viewport.h;
>         SDL_RenderDrawPoint(renderer, x, y);
>     }
> }
>@@ -226,15 +226,15 @@
>                 if (event.key.keysym.mod & KMOD_SHIFT)
>                     num_lines = 0;
>                 else
>-                    add_line(rand() % 640, rand() % 480, rand() % 640,
>-                             rand() % 480);
>+                    add_line(lrand48() % 640, lrand48() % 480, lrand48() % 640,
>+                             lrand48() % 480);
>                 break;
>             case 'r':
>                 if (event.key.keysym.mod & KMOD_SHIFT)
>                     num_rects = 0;
>                 else
>-                    add_rect(rand() % 640, rand() % 480, rand() % 640,
>-                             rand() % 480);
>+                    add_rect(lrand48() % 640, lrand48() % 480, lrand48() % 640,
>+                             lrand48() % 480);
>                 break;
>             }
>             break;
>@@ -333,7 +333,7 @@
>         SDL_RenderClear(renderer);
>     }
> 
>-    srand(time(NULL));
>+    srand48(time(NULL));
> 
>     /* Main render loop */
>     frames = 0;
>diff -r a1b920bc870d test/testnative.c
>--- a/test/testnative.c	Tue Jun 16 22:16:35 2015 -0700
>+++ b/test/testnative.c	Wed Jun 17 09:01:48 2015 +0200
>@@ -191,7 +191,7 @@
>         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Out of memory!\n");
>         quit(2);
>     }
>-    srand(time(NULL));
>+    srand48(time(NULL));
>     for (i = 0; i < NUM_SPRITES; ++i) {
>         positions[i].x = rand() % (window_w - sprite_w);
>         positions[i].y = rand() % (window_h - sprite_h);
>diff -r a1b920bc870d test/testrelative.c
>--- a/test/testrelative.c	Tue Jun 16 22:16:35 2015 -0700
>+++ b/test/testrelative.c	Wed Jun 17 09:01:48 2015 +0200
>@@ -101,7 +101,7 @@
>         SDL_RenderClear(renderer);
>     }
> 
>-    srand((unsigned int)time(NULL));
>+    srand48((unsigned int)time(NULL));
>     if(SDL_SetRelativeMouseMode(SDL_TRUE) < 0) {
>         return 3;
>     };
>diff -r a1b920bc870d test/testspriteminimal.c
>--- a/test/testspriteminimal.c	Tue Jun 16 22:16:35 2015 -0700
>+++ b/test/testspriteminimal.c	Wed Jun 17 09:01:48 2015 +0200
>@@ -162,17 +162,17 @@
>     }
> 
>     /* Initialize the sprite positions */
>-    srand(time(NULL));
>+    srand48(time(NULL));
>     for (i = 0; i < NUM_SPRITES; ++i) {
>-        positions[i].x = rand() % (WINDOW_WIDTH - sprite_w);
>-        positions[i].y = rand() % (WINDOW_HEIGHT - sprite_h);
>+        positions[i].x = lrand48() % (WINDOW_WIDTH - sprite_w);
>+        positions[i].y = lrand48() % (WINDOW_HEIGHT - sprite_h);
>         positions[i].w = sprite_w;
>         positions[i].h = sprite_h;
>         velocities[i].x = 0;
>         velocities[i].y = 0;
>         while (!velocities[i].x && !velocities[i].y) {
>-            velocities[i].x = (rand() % (MAX_SPEED * 2 + 1)) - MAX_SPEED;
>-            velocities[i].y = (rand() % (MAX_SPEED * 2 + 1)) - MAX_SPEED;
>+            velocities[i].x = (lrand48() % (MAX_SPEED * 2 + 1)) - MAX_SPEED;
>+            velocities[i].y = (lrand48() % (MAX_SPEED * 2 + 1)) - MAX_SPEED;
>         }
>     }
>

Actions: View | Diff

Attachments on bug 2758: 2182 | 2183 | 2184

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.