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/cubenetic.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

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

diff --git a/hacks/glx/cubenetic.c b/hacks/glx/cubenetic.c
index 0ddbb29..7524410 100644
--- a/hacks/glx/cubenetic.c
+++ b/hacks/glx/cubenetic.c
@@ -16,8 +16,6 @@
 			"*suppressRotationAnimation: True\n" \
 
 # define release_cube 0
-#undef countof
-#define countof(x) (sizeof((x))/sizeof((*x)))
 
 #include "xlockmore.h"
 #include "colors.h"
@@ -206,13 +204,12 @@ reshape_cube (ModeInfo *mi, int width, int height)
              0.0, 0.0, 0.0,
              0.0, 1.0, 0.0);
 
-# ifdef HAVE_MOBILE	/* Keep it the same relative size when rotated. */
   {
-    int o = (int) current_device_rotation();
-    if (o != 0 && o != 180 && o != -180)
-      glScalef (1/h, 1/h, 1/h);
+    GLfloat s = (MI_WIDTH(mi) < MI_HEIGHT(mi)
+                 ? (MI_WIDTH(mi) / (GLfloat) MI_HEIGHT(mi))
+                 : 1);
+    glScalef (s, s, s);
   }
-# endif
 
   glClear(GL_COLOR_BUFFER_BIT);
 }
-- 
cgit v1.2.3-55-g7522