From e14c387e8e69024a16db110ec5b1a9a08a5a6169 Mon Sep 17 00:00:00 2001
From: Albrecht Schlosser <albrechts.fltk@online.de>
Date: Thu, 15 Jun 2017 15:39:55 +0000
Subject: Limit initial scaling factor to sensible values.

FLTK_SCALING_FACTOR=0 or negative values would issue unexpected
X11 warnings or crash immediately.

Also commented out scaling factor output statements (printf).


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12261 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/Fl_Screen_Driver.cxx | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/Fl_Screen_Driver.cxx')

diff --git a/src/Fl_Screen_Driver.cxx b/src/Fl_Screen_Driver.cxx
index 4e721d28e..ec1474cc5 100644
--- a/src/Fl_Screen_Driver.cxx
+++ b/src/Fl_Screen_Driver.cxx
@@ -493,6 +493,9 @@ float Fl_Screen_Driver::default_scale_factor()
   else {
     factor = desktop_scale_factor();
   }
+  // checks to prevent potential crash (factor <= 0) or very large factors
+  if (factor < 0.25) factor = 0.25;
+  else if (factor > 10.0) factor = 10.0;
   return factor;
 }
 
-- 
cgit v1.2.3