From 38886de0c3e9ea5729ef23e4c653fa2822f52e8f Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 6 Apr 2021 14:43:39 +0200
Subject: xscreensaver 6.00

---
 hacks/glx/bouncingcow.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'hacks/glx/bouncingcow.c')

diff --git a/hacks/glx/bouncingcow.c b/hacks/glx/bouncingcow.c
index 5dc9466..29baa46 100644
--- a/hacks/glx/bouncingcow.c
+++ b/hacks/glx/bouncingcow.c
@@ -21,9 +21,6 @@
 #define DEF_TEXTURE     "(none)"
 #define DEF_MATHEMATICAL "False"
 
-#undef countof
-#define countof(x) (sizeof((x))/sizeof((*x)))
-
 #undef BELLRAND
 #define BELLRAND(n) ((frand((n)) + frand((n)) + frand((n))) / 3)
 #undef RANDSIGN
@@ -551,15 +548,13 @@ draw_cow (ModeInfo *mi)
 
   glPushMatrix ();
 
-# ifdef HAVE_MOBILE	/* Keep it the same relative size when rotated. */
   {
-    GLfloat h = MI_HEIGHT(mi) / (GLfloat) MI_WIDTH(mi);
-    int o = (int) current_device_rotation();
-    if (o != 0 && o != 180 && o != -180)
-      glScalef (1/h, 1/h, 1/h);
-    glRotatef(o, 0, 0, 1);
+    GLfloat s = (MI_WIDTH(mi) < MI_HEIGHT(mi)
+                 ? (MI_WIDTH(mi) / (GLfloat) MI_HEIGHT(mi))
+                 : 1);
+    glRotatef(current_device_rotation(), 0, 0, 1);
+    glScalef (s, s, s);
   }
-# endif
 
   glScalef (0.5, 0.5, 0.5);
 
-- 
cgit v1.2.3-55-g7522