[Sumover-dev] [svn commit] r4063 - vic/branches/mpeg4/render

[sumover-dev at cs.ucl.ac.uk]

Author: piers
Date: Tue Jun 12 12:04:39 2007
New Revision: 4063

Modified:
   vic/branches/mpeg4/render/color-true.cpp

Log:
Fix for BIG endian MAC displays - 
Trac: #76: yellow tint with vic built on PowerPC mac


Modified: vic/branches/mpeg4/render/color-true.cpp
==============================================================================
--- vic/branches/mpeg4/render/color-true.cpp	(original)
+++ vic/branches/mpeg4/render/color-true.cpp	Tue Jun 12 12:04:39 2007
@@ -143,20 +143,27 @@
 //printf("rmask: %d(%d), gmask: %d(%d), bmask: %d(%d);\n",rmask,htonl(rmask),gmask,htonl(gmask),bmask,htonl(bmask));
 //|| visual_->bits_per_rgb==32
 #if BYTE_ORDER == LITTLE_ENDIAN
+// OSX TK doesn't set the dpy_ byteorder properly
+#ifndef MAC_OSX_TK
 	if (ImageByteOrder(dpy_) == MSBFirst ) {
 		rmask = htonl(rmask);
 		gmask = htonl(gmask);
 		bmask = htonl(bmask);
 	}
+#endif
 
 #else
+#ifdef MAC_OSX_TK
+		rmask = htonl(rmask);
+		gmask = htonl(gmask);
+		bmask = htonl(bmask);
+#else
 	if (ImageByteOrder(dpy_) != MSBFirst) {
-
 		rmask = swapbyte32(rmask);
 		gmask = swapbyte32(gmask);
 		bmask = swapbyte32(bmask);
 	}
-
+#endif
 #endif
 	u_int rshft = mtos(rmask);
 	u_int rlose = 8 - mtos(~(rmask >> rshft));