Partially make EdkModulePkg pass intel IPF compiler with /W4 /WX switched on.

[mirror_edk2.git] / EdkModulePkg / Universal / UserInterface / HiiDataBase / Dxe / Fonts.c

diff --git a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Fonts.c b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Fonts.c
index d7daa64902e8154045842e1e08d128b5ba6cd07e..ebab3bc3d09a418b766d66563a9855478697ee18 100644 (file)
--- a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Fonts.c
+++ b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Fonts.c
@@ -210,14 +210,17 @@ Returns:
 \r
     if (Narrow) {\r
       for (Value = 0; Value != Count; Value++) {\r
-        *GlyphBuffer[Location + Value] |= GlobalData->NarrowGlyphs[Character].GlyphCol1[Value];\r
+        *GlyphBuffer[Location + Value] = (UINT8) (*GlyphBuffer[Location + Value] |\r
+                                                  GlobalData->NarrowGlyphs[Character].GlyphCol1[Value]);\r
       }\r
 \r
       Attributes = GlobalData->NarrowGlyphs[Character].Attributes & EFI_GLYPH_NON_SPACING;\r
     } else {\r
       for (Value = 0; Value != Count; Value++) {\r
-        *GlyphBuffer[Location + Value] |= GlobalData->WideGlyphs[Character].GlyphCol1[Value];\r
-        *GlyphBuffer[Location + Value + Count] |= GlobalData->WideGlyphs[Character].GlyphCol2[Value];\r
+        *GlyphBuffer[Location + Value] = (UINT8) (*GlyphBuffer[Location + Value] | \r
+                                                  GlobalData->WideGlyphs[Character].GlyphCol1[Value]);\r
+        *GlyphBuffer[Location + Value + Count] = (UINT8) (*GlyphBuffer[Location + Value + Count] |\r
+                                                          GlobalData->WideGlyphs[Character].GlyphCol2[Value]);\r
       }\r
 \r
       Attributes = GlobalData->WideGlyphs[Character].Attributes & EFI_GLYPH_NON_SPACING;\r