From 41af4310806ae25fec33219c080631a853a014ed Mon Sep 17 00:00:00 2001
From: William Joye <wjoye@cfa.harvard.edu>
Date: Tue, 15 Nov 2016 14:00:27 -0500
Subject: check for invalid [tk scaling] command results

---
 ds9/doc/release/r7.0.html | 3 ++-
 ds9/library/layout.tcl    | 7 ++++++-
 ds9/library/plotprint.tcl | 7 ++++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/ds9/doc/release/r7.0.html b/ds9/doc/release/r7.0.html
index 73accc6..e21074c 100644
--- a/ds9/doc/release/r7.0.html
+++ b/ds9/doc/release/r7.0.html
@@ -733,8 +733,9 @@
         <li><tt>10.05.2016 REGION: fixed a problem saving or listing regions in WCS when no WCS is defined for the FITS image. The regions file was corrupted.</tt></li>
         <li><tt>10.05.2016 REGION: fixed a problem with Composite Regions not properly updating when created. The region was not displayed properly.</tt></li>
         <li><tt>11.10.2016 MAGNIFIER: added check to prevent a SEGV in rare cases.</tt></li>
+        <li><tt>11.15.2016 GUI: added check for bad "tk scaling" command results, which can occur with high resolution monitors.</tt></li>
         <li><tt><b>12.15.2016 RELEASE version 7.5</b></tt></li>
-        <li><tt><b>xx.xx.2017 RELEASE version 7.b1</b></tt></li>
+        <li><tt><b>xx.xx.2017 RELEASE version 7.6b1</b></tt></li>
      </ol>
     </ol>
   </body>
diff --git a/ds9/library/layout.tcl b/ds9/library/layout.tcl
index 191a748..5bba029 100644
--- a/ds9/library/layout.tcl
+++ b/ds9/library/layout.tcl
@@ -370,7 +370,12 @@ proc LayoutViewAdjust {varname} {
 	# can't trust 'tk scaling'
 	switch $ds9(wm) {
 	    x11 -
-	    win32 {set scaling [tk scaling]}
+	    win32 {
+		set scaling [tk scaling]
+		if {$scaling == Inf} {
+		    set scaling 1.334
+		}
+	    }
 	    aqua {set scaling 1.4}
 	}
 
diff --git a/ds9/library/plotprint.tcl b/ds9/library/plotprint.tcl
index ac83384..3bf16ea 100644
--- a/ds9/library/plotprint.tcl
+++ b/ds9/library/plotprint.tcl
@@ -50,7 +50,12 @@ proc PlotPostScript {varname} {
     # can't trust 'tk scaling'
     switch $ds9(wm) {
 	x11 -
-	win32 {set scaling [tk scaling]}
+	win32 {
+	    set scaling [tk scaling]
+	    if {$scaling == Inf} {
+		set scaling 1.334
+	    }
+	}
 	aqua {set scaling 1.4}
     }
 
-- 
cgit v0.12