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

[mirror_edk2.git] / EdkModulePkg / Library / EdkGraphicsLib / Graphics.c

diff --git a/EdkModulePkg/Library/EdkGraphicsLib/Graphics.c b/EdkModulePkg/Library/EdkGraphicsLib/Graphics.c
index 4f0d37894ecdef682f92cdba38516ba463bc9734..c94234d01794655845734d46b28ffab69a614e68 100644 (file)
--- a/EdkModulePkg/Library/EdkGraphicsLib/Graphics.c
+++ b/EdkModulePkg/Library/EdkGraphicsLib/Graphics.c
@@ -105,7 +105,7 @@ Returns:
   return EFI_NOT_FOUND;\r
 }\r
 \r
-\r
+STATIC\r
 EFI_STATUS\r
 ConvertBmpToGopBlt (\r
   IN  VOID      *BmpImage,\r
@@ -664,6 +664,7 @@ Returns:
   UINT32            VerticalResolution;\r
   UINT32            ColorDepth;\r
   UINT32            RefreshRate;\r
+  UINTN             BufferGlyphWidth;\r
 \r
   GlyphStatus = 0;\r
 \r
@@ -743,6 +744,7 @@ Returns:
   //\r
   // Blt a character to the screen\r
   //\r
+  BufferGlyphWidth = GLYPH_WIDTH * StrLen (Buffer);\r
   if (GraphicsOutput != NULL) {\r
     Status = GraphicsOutput->Blt (\r
                         GraphicsOutput,\r
@@ -752,9 +754,9 @@ Returns:
                         0,\r
                         X,\r
                         Y,\r
-                        GLYPH_WIDTH * StrLen (Buffer),\r
+                        BufferGlyphWidth,\r
                         GLYPH_HEIGHT,\r
-                        GLYPH_WIDTH * StrLen (Buffer) * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)\r
+                        BufferGlyphWidth * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)\r
                         );\r
   } else {\r
     Status = UgaDraw->Blt (\r
@@ -765,9 +767,9 @@ Returns:
                         0,\r
                         X,\r
                         Y,\r
-                        GLYPH_WIDTH * StrLen (Buffer),\r
+                        BufferGlyphWidth,\r
                         GLYPH_HEIGHT,\r
-                        GLYPH_WIDTH * StrLen (Buffer) * sizeof (EFI_UGA_PIXEL)\r
+                        BufferGlyphWidth * sizeof (EFI_UGA_PIXEL)\r
                         );\r
   }\r
 \r