Make the scale sanitization more comprehensive

This commit is contained in:
Kovid Goyal 2019-03-17 12:41:03 +05:30
parent 136f15e647
commit bafedf8376
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C

View File

@ -386,9 +386,9 @@ get_window_content_scale(GLFWwindow *w, float *xscale, float *yscale, double *xd
GLFWmonitor *monitor = glfwGetPrimaryMonitor();
if (monitor) glfwGetMonitorContentScale(monitor, xscale, yscale);
}
// check for zero or NaN values of xscale/yscale
if (!*xscale || *xscale != *xscale) *xscale = 1.0;
if (!*yscale || *yscale != *yscale) *yscale = 1.0;
// check for zero, negative, NaN or excessive values of xscale/yscale
if (*xscale <= 0 || *xscale != *xscale || *xscale >= 24) *xscale = 1.0;
if (*yscale <= 0 || *yscale != *yscale || *yscale >= 24) *yscale = 1.0;
#ifdef __APPLE__
const double factor = 72.0;
#else