From 6a97fe0532f681240b1e9204181504eb20aab50a Mon Sep 17 00:00:00 2001
From: William Joye <wjoye@cfa.harvard.edu>
Date: Thu, 24 Jan 2019 12:46:41 -0500
Subject: fix macos mojave port

---
 tksao/frame/frame.C       |  5 ++++-
 tksao/frame/frame3dbase.C | 14 +-------------
 tksao/frame/frcommand.C   |  5 ++++-
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/tksao/frame/frame.C b/tksao/frame/frame.C
index 692a0ae..c3f469a 100644
--- a/tksao/frame/frame.C
+++ b/tksao/frame/frame.C
@@ -790,7 +790,10 @@ void Frame::colormapMotionCmd(int id, float b, float c, int i,
   updatePanner();
 }
 
-void Frame::colormapEndCmd() {}
+void Frame::colormapEndCmd()
+{
+  update(BASE);
+}
 #endif
 
 void Frame::getColorbarCmd()
diff --git a/tksao/frame/frame3dbase.C b/tksao/frame/frame3dbase.C
index aa2ae05..90ee455 100644
--- a/tksao/frame/frame3dbase.C
+++ b/tksao/frame/frame3dbase.C
@@ -1217,21 +1217,9 @@ void Frame3dBase::ximageToPixmapMagnifier()
     for (int ii=0; ii<ww; ii++, dest+=bytesPerPixel) {
       Vector vv = Vector(ii,jj)*mm;
 
-      if (vv[0] >= 0 && vv[0] < zz[0] && vv[1] >= 0 && vv[1] < zz[1]) {
-	// I really don't understand this
-#if MAC_OSX_TK
-	char* sptr = src + ((int)vv[1])*srcBytesPerLine + 
-	  ((int)vv[0])*bytesPerPixel;
-
-	*(dest+0) = *(sptr+3);
-	*(dest+1) = *(sptr+0);
-	*(dest+2) = *(sptr+1);
-	*(dest+3) = *(sptr+2);
-#else
+      if (vv[0] >= 0 && vv[0] < zz[0] && vv[1] >= 0 && vv[1] < zz[1])
 	memcpy(dest, src + ((int)vv[1])*srcBytesPerLine + 
 	       ((int)vv[0])*bytesPerPixel, bytesPerPixel);
-#endif
-      }
       else
 	memcpy(dest, bgTrueColor_, bytesPerPixel);
     }
diff --git a/tksao/frame/frcommand.C b/tksao/frame/frcommand.C
index 949dfca..e93a7e8 100644
--- a/tksao/frame/frcommand.C
+++ b/tksao/frame/frcommand.C
@@ -418,7 +418,10 @@ void FrameBase::rotateMotionCmd(double angle)
   update(MATRIX);
 }
 
-void FrameBase::rotateEndCmd() {}
+void FrameBase::rotateEndCmd()
+{
+  update(MATRIX);
+}
 #endif
 
 void FrameBase::saveFitsResampleFileCmd(const char* fn)
-- 
cgit v0.12