From: Michael Kuhn <suraia@ikkoku.de>
Date: Mon, 22 Aug 2016 19:54:52 +0000 (+0200)
Subject: libply: fix HiDPI detection
X-Git-Tag: 0.9.3~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4226bd054d80a4de4f6feca4c02eb37bbf0a706;p=thirdparty%2Fplymouth.git

libply: fix HiDPI detection

The check would erroneously turn off HiDPI mode for devices with a
resolution less than 4K.

https://bugs.freedesktop.org/show_bug.cgi?id=97424
---

diff --git a/src/libply/ply-utils.c b/src/libply/ply-utils.c
index 31b642eb..239c365d 100644
--- a/src/libply/ply-utils.c
+++ b/src/libply/ply-utils.c
@@ -963,8 +963,6 @@ out:
 /* The minimum resolution at which we turn on a device-scale of 2 */
 #define HIDPI_LIMIT 192
 #define HIDPI_MIN_HEIGHT 1200
-/* From http://en.wikipedia.org/wiki/4K_resolution#Resolutions_of_common_formats */
-#define SMALLEST_4K_WIDTH 3656
 
 int
 ply_get_device_scale (uint32_t width,
@@ -981,9 +979,6 @@ ply_get_device_scale (uint32_t width,
         if ((force_device_scale = getenv ("PLYMOUTH_FORCE_SCALE")))
                 return strtoul (force_device_scale, NULL, 0);
 
-        if (width >= SMALLEST_4K_WIDTH)
-                return 1;
-
         if (height < HIDPI_MIN_HEIGHT)
                 return 1;