From 7d74f4cf92131e925afc3b73d316d4210ad472b6 Mon Sep 17 00:00:00 2001
From: William Joye <wjoye@cfa.harvard.edu>
Date: Wed, 4 Mar 2020 17:20:20 -0500
Subject: WCS: fixed a problem with wcs reset and WCSNAMEP keywords

---
 ds9/doc/release/r8.2.html | 1 +
 tksao/frame/fitsblock.C   | 4 ----
 tksao/frame/fitsimage.C   | 4 ++++
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ds9/doc/release/r8.2.html b/ds9/doc/release/r8.2.html
index ab47a7b..788b078 100644
--- a/ds9/doc/release/r8.2.html
+++ b/ds9/doc/release/r8.2.html
@@ -34,6 +34,7 @@
 <li><tt>02.26.2020 MASK: fixed an issue with the mask blending.</tt></li>
 <li><tt>02.26.2020 MASK: add blend mode darken.</tt></li>
 <li><tt>02.26.2020 MASK: add blend mode screen.</tt></li>
+<li><tt>03.04.2020 WCS: fixed a problem with wcs reset and WCSNAMEP keywords.</tt></li>
 <li><tt><b>xx.xx.2020 RELEASE version 8.2b2</b></tt></li>
 </ol>
 </div>
diff --git a/tksao/frame/fitsblock.C b/tksao/frame/fitsblock.C
index bb0a844..1261cc9 100644
--- a/tksao/frame/fitsblock.C
+++ b/tksao/frame/fitsblock.C
@@ -70,8 +70,6 @@ void FitsImage::block()
   data_ = analysisdata_;
 
   resetWCS();
-  processKeywordsPhysical();
-  processKeywordsParams();
 }
 
 void FitsImage::block(pthread_t* thread)
@@ -137,8 +135,6 @@ void FitsImage::block(pthread_t* thread)
   data_ = analysisdata_;
 
   resetWCS();
-  processKeywordsPhysical();
-  processKeywordsParams();
 }
 
 void* blockproc(void* tt)
diff --git a/tksao/frame/fitsimage.C b/tksao/frame/fitsimage.C
index ca93849..6b26a3e 100644
--- a/tksao/frame/fitsimage.C
+++ b/tksao/frame/fitsimage.C
@@ -1209,6 +1209,10 @@ void FitsImage::resetWCS()
       astEnd;
     }
   }
+
+  // WCSNAMEP may have been cleared, check for LTMV
+  processKeywordsPhysical();
+  processKeywordsParams();
 }
 
 void FitsImage::initWCS0(const Vector& pix)
-- 
cgit v0.12