Changeset 2963 for trunk/src

Timestamp:

Mar 1, 2000, 10:55:42 PM (25 years ago)

Author:

sandervl

Message:

color conversion bugfix for 16 bpp

File:

• trunk/src/opengl/mesa/colors.h (modified) (5 diffs)

trunk/src/opengl/mesa/colors.h

@@ -1 @@
-/* $Id: colors.h,v 1.2 2000-03-01 18:49:24 jeroen Exp $ */
+/* $Id: colors.h,v 1.3 2000-03-01 21:55:42 sandervl Exp $ */
 
 /*      File name       :       colors.h
@@ -27 +27 @@
 /*
  * $Log: colors.h,v $
- * Revision 1.2  2000-03-01 18:49:24  jeroen
+ * Revision 1.3  2000-03-01 21:55:42  sandervl
+ * color conversion bugfix for 16 bpp
+ *
+ * Revision 1.2  2000/03/01 18:49:24  jeroen
  * *** empty log message ***
  *
@@ -45 +48 @@
 /*
  * $Log: colors.h,v $
- * Revision 1.2  2000-03-01 18:49:24  jeroen
+ * Revision 1.3  2000-03-01 21:55:42  sandervl
+ * color conversion bugfix for 16 bpp
+ *
+ * Revision 1.2  2000/03/01 18:49:24  jeroen
  * *** empty log message ***
  *
@@ -63 +69 @@
 /*
  * $Log: colors.h,v $
- * Revision 1.2  2000-03-01 18:49:24  jeroen
+ * Revision 1.3  2000-03-01 21:55:42  sandervl
+ * color conversion bugfix for 16 bpp
+ *
+ * Revision 1.2  2000/03/01 18:49:24  jeroen
  * *** empty log message ***
  *
@@ -127 +136 @@
 #define BGR16(r,g,b)    ((WORD)(((BYTE)(ColorMap16[b]) | ((BYTE)(g&0xfc) << 3)) | (((WORD)(BYTE)(ColorMap16[r])) << 11)))
 #else
-#define BGR16(r,g,b)    ((WORD)(((BYTE)(ColorMap16[b]) | ((BYTE)(ColorMap16[g]) << 5)) | (((WORD)(BYTE)(ColorMap16[r])) << 10)))
+#ifdef __WIN32OS2__
+#define BGR16(r,g,b)    ((WORD)(((BYTE)(ColorMap16[b]) | ((BYTE)(ColorMap16[g]*2) << 5)) | (((WORD)(BYTE)(ColorMap16[r])) << 11)))
+#else
+#define BGR16(r,g,b)    ((WORD)(((BYTE)(ColorMap16[b]) | ((BYTE)(ColorMap16[g]) << 5)) | (((WORD)(BYTE)(ColorMap16[r])) << 10)))
+#endif
 #endif
 /* JvdH -- FIX! In BGR24 don't shift another 8 bits (was <<8) */