From 691cf36c3fd9b594e51929093d1ff0b89ac4e0e1 Mon Sep 17 00:00:00 2001
From: William Joye <wjoye@cfa.harvard.edu>
Date: Tue, 22 Jan 2019 15:51:48 -0500
Subject: fix aqua bitmap order

---
 tksao/widget/truecolor24.C | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/tksao/widget/truecolor24.C b/tksao/widget/truecolor24.C
index cf2fad3..9ef87f9 100644
--- a/tksao/widget/truecolor24.C
+++ b/tksao/widget/truecolor24.C
@@ -14,10 +14,23 @@ TrueColor24::TrueColor24(Visual* visual)
   bx_ = visual->blue_mask;
 #endif
 #if MAC_OSX_TK
-  ax_ = 0xFF000000;
-  rx_ = 0x00FF0000;
-  gx_ = 0x0000FF00;
-  bx_ = 0x000000FF;
+  // major change in 8.6.9: in macos/tkMacOSXImage.c
+  if (TCL_MAJOR_VERSION == 8 &&
+      TCL_MINOR_VERSION == 6 &&
+      TCL_RELEASE_SERIAL < 9) {
+    // bitmapInfo = (image->byte_order == MSBFirst ? kCGBitmapByteOrder32Big : kCGBitmapByteOrder32Little);
+    ax_ = 0xFF000000;
+    rx_ = 0x00FF0000;
+    gx_ = 0x0000FF00;
+    bx_ = 0x000000FF;
+  }
+  else {
+    // bitmapInfo = (image->byte_order == MSBFirst ? kCGBitmapByteOrder32Little : kCGBitmapByteOrder32Big);
+    ax_ = 0xFF000000;
+    rx_ = 0x000000FF;
+    gx_ = 0x0000FF00;
+    bx_ = 0x00FF0000;
+  }
 #endif
 #if _WIN32
   // windows masks are plain wrong
-- 
cgit v0.12