From 1cc8ee7861a59532700a6fd1255689576eda0f52 Mon Sep 17 00:00:00 2001
From: xli24 <xli24@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 25 Jan 2007 06:15:58 +0000
Subject: Partially make EdkModulePkg pass intel IPF compiler with /W4 /WX
 switched on.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2313 6f19259b-4bc3-4df7-8a09-765794883524
---
 EdkModulePkg/Library/EdkGraphicsLib/Graphics.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'EdkModulePkg/Library/EdkGraphicsLib')

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