Mercurial > mm7

changeset 2078:66cbc97b31fa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix transparent fonts
author Gloval
date Wed, 04 Dec 2013 23:35:44 +0400
parents d8b40e0fa21d
children ba5cd8a8a0d3 6c0dbff26f5d
files NewUI/Core/UIControlModule_wrap.cxx Render.cpp
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/NewUI/Core/UIControlModule_wrap.cxx	Wed Dec 04 16:10:54 2013 +0600
+++ b/NewUI/Core/UIControlModule_wrap.cxx	Wed Dec 04 23:35:44 2013 +0400
@@ -726,7 +726,7 @@
  * type checking.
  * ----------------------------------------------------------------------------- */
  
-#include "lib/lua/lua.h"
+#include "../../lib/lua/lua.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
--- a/Render.cpp	Wed Dec 04 16:10:54 2013 +0600
+++ b/Render.cpp	Wed Dec 04 23:35:44 2013 +0400
@@ -1215,7 +1215,7 @@
     {
       v2 = 1;
 LABEL_6:
-      memcpy(Dst, Src, 0x20u);
+      memcpy(Dst, Src, sizeof(DDPIXELFORMAT));
       return v2;
     }
   }
@@ -6745,7 +6745,7 @@
   unsigned int g = ((c >> 5) & 63) * 4;
   unsigned int r = ((c >> 11) & 31) * 8;
 
-  return 0xFF000000 | (r << 16) | (g << 8) | b;
+  return  (r << 16) | (g << 8) | b;//
 }
 
 //----- (0040DEF3) --------------------------------------------------------
@@ -7105,7 +7105,7 @@
     void *pDst = (char *)pTargetSurface + (FORCE_16_BITS ? 2 : 4) * (uX + (y + uY) * uTargetSurfacePitch);
 
     memset32(pDst,
-             FORCE_16_BITS ? twoColors : Color32(uColor16),  // two colors per int (16bit) or 1 (32bit)
+             FORCE_16_BITS ? twoColors : 0xFF000000 |Color32(uColor16),  // two colors per int (16bit) or 1 (32bit)
              uWidth / (FORCE_16_BITS ? 2 : 1));                      // two pixels per int (16bit) or 1 (32bit)
 
     if (FORCE_16_BITS && uWidth & 1) // we may miss one pixel for 16bit