Update call-by-value to call-by-reference for EFI_HII_GLYPH_INFO type.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5351 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c b/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c
index eb8e651360a9615d210c21c68915466dd00356a7..a9070c425ad036d3ff3825aac2b7dacf118b8944 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c
@@ -337,7 +337,7 @@ GlyphToBlt (
   IN     UINTN                         ImageWidth,\r
   IN     UINTN                         ImageHeight,\r
   IN     BOOLEAN                       Transparent,\r
   IN     UINTN                         ImageWidth,\r
   IN     UINTN                         ImageHeight,\r
   IN     BOOLEAN                       Transparent,\r

-  IN     EFI_HII_GLYPH_INFO            Cell,\r
+  IN     CONST EFI_HII_GLYPH_INFO      *Cell,\r

   IN     UINT8                         Attributes,\r
   IN OUT EFI_GRAPHICS_OUTPUT_BLT_PIXEL **Origin\r
   )\r
   IN     UINT8                         Attributes,\r
   IN OUT EFI_GRAPHICS_OUTPUT_BLT_PIXEL **Origin\r
   )\r


@@ -350,7 +350,7 @@ GlyphToBlt (
   EFI_GRAPHICS_OUTPUT_BLT_PIXEL        *BltBuffer;\r
 \r
   ASSERT (GlyphBuffer != NULL && Origin != NULL && *Origin != NULL);\r
   EFI_GRAPHICS_OUTPUT_BLT_PIXEL        *BltBuffer;\r
 \r
   ASSERT (GlyphBuffer != NULL && Origin != NULL && *Origin != NULL);\r

-  ASSERT (Cell.Width <= ImageWidth && Cell.Height <= ImageHeight);\r
+  ASSERT (Cell->Width <= ImageWidth && Cell->Height <= ImageHeight);\r

 \r
   BltBuffer = *Origin;\r
 \r
 \r
   BltBuffer = *Origin;\r
 \r


@@ -366,13 +366,13 @@ GlyphToBlt (
   // The glyph's upper left hand corner pixel is the most significant bit of the\r
   // first bitmap byte.\r
   //\r
   // The glyph's upper left hand corner pixel is the most significant bit of the\r
   // first bitmap byte.\r
   //\r

-  for (Y = 0; Y < Cell.Height; Y++) {\r
-    OffsetY = BITMAP_LEN_1_BIT (Cell.Width, Y);\r
+  for (Y = 0; Y < Cell->Height; Y++) {\r
+    OffsetY = BITMAP_LEN_1_BIT (Cell->Width, Y);\r

 \r
     //\r
     // All bits in these bytes are meaningful.\r
     //\r
 \r
     //\r
     // All bits in these bytes are meaningful.\r
     //\r

-    for (X = 0; X < Cell.Width / 8; X++) {\r
+    for (X = 0; X < Cell->Width / 8; X++) {\r

       Data  = *(GlyphBuffer + OffsetY + X);\r
       for (Index = 0; Index < 8; Index++) {\r
         if ((Data & (1 << Index)) != 0) {\r
       Data  = *(GlyphBuffer + OffsetY + X);\r
       for (Index = 0; Index < 8; Index++) {\r
         if ((Data & (1 << Index)) != 0) {\r


@@ -385,12 +385,12 @@ GlyphToBlt (
       }\r
     }\r
 \r
       }\r
     }\r
 \r

-    if (Cell.Width % 8 != 0) {\r
+    if (Cell->Width % 8 != 0) {\r

       //\r
       // There are some padding bits in this byte. Ignore them.\r
       //\r
       Data  = *(GlyphBuffer + OffsetY + X);\r
       //\r
       // There are some padding bits in this byte. Ignore them.\r
       //\r
       Data  = *(GlyphBuffer + OffsetY + X);\r

-      for (Index = 0; Index < Cell.Width % 8; Index++) {\r
+      for (Index = 0; Index < Cell->Width % 8; Index++) {\r

         if ((Data & (1 << (8 - Index - 1))) != 0) {\r
           BltBuffer[Y * ImageWidth + X * 8 + Index] = Foreground;\r
         } else {\r
         if ((Data & (1 << (8 - Index - 1))) != 0) {\r
           BltBuffer[Y * ImageWidth + X * 8 + Index] = Foreground;\r
         } else {\r


@@ -403,7 +403,7 @@ GlyphToBlt (
 \r
   } // end of for (Y=0...)\r
 \r
 \r
   } // end of for (Y=0...)\r
 \r

-  *Origin = BltBuffer + Cell.Width;\r
+  *Origin = BltBuffer + Cell->Width;\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -440,7 +440,7 @@ GlyphToImage (
   IN     UINTN                         ImageWidth,\r
   IN     UINTN                         ImageHeight,\r
   IN     BOOLEAN                       Transparent,\r
   IN     UINTN                         ImageWidth,\r
   IN     UINTN                         ImageHeight,\r
   IN     BOOLEAN                       Transparent,\r

-  IN     EFI_HII_GLYPH_INFO            Cell,\r
+  IN     CONST EFI_HII_GLYPH_INFO      *Cell,\r

   IN     UINT8                         Attributes,\r
   IN OUT EFI_GRAPHICS_OUTPUT_BLT_PIXEL **Origin\r
   )\r
   IN     UINT8                         Attributes,\r
   IN OUT EFI_GRAPHICS_OUTPUT_BLT_PIXEL **Origin\r
   )\r


@@ -448,7 +448,7 @@ GlyphToImage (
   EFI_GRAPHICS_OUTPUT_BLT_PIXEL        *Buffer;\r
 \r
   ASSERT (GlyphBuffer != NULL && Origin != NULL && *Origin != NULL);\r
   EFI_GRAPHICS_OUTPUT_BLT_PIXEL        *Buffer;\r
 \r
   ASSERT (GlyphBuffer != NULL && Origin != NULL && *Origin != NULL);\r

-  ASSERT (Cell.Width <= ImageWidth && Cell.Height <= ImageHeight);\r
+  ASSERT (Cell->Width <= ImageWidth && Cell->Height <= ImageHeight);\r

 \r
   Buffer = *Origin;\r
 \r
 \r
   Buffer = *Origin;\r
 \r


@@ -457,7 +457,7 @@ GlyphToImage (
     // This character is a non-spacing key, print it OR'd with the previous glyph.\r
     // without advancing cursor.\r
     //\r
     // This character is a non-spacing key, print it OR'd with the previous glyph.\r
     // without advancing cursor.\r
     //\r

-    Buffer -= Cell.Width;\r
+    Buffer -= Cell->Width;\r

     GlyphToBlt (\r
       GlyphBuffer,\r
       Foreground,\r
     GlyphToBlt (\r
       GlyphBuffer,\r
       Foreground,\r


@@ -511,7 +511,7 @@ GlyphToImage (
 \r
   } else if ((Attributes & PROPORTIONAL_GLYPH) == PROPORTIONAL_GLYPH) {\r
     //\r
 \r
   } else if ((Attributes & PROPORTIONAL_GLYPH) == PROPORTIONAL_GLYPH) {\r
     //\r

-    // This character is proportional glyph, i.e. Cell.Width * Cell.Height pixels.\r
+    // This character is proportional glyph, i.e. Cell->Width * Cell->Height pixels.\r

     //\r
     GlyphToBlt (\r
       GlyphBuffer,\r
     //\r
     GlyphToBlt (\r
       GlyphBuffer,\r


@@ -1776,7 +1776,7 @@ HiiStringToImage (
             RowInfo[RowIndex].LineWidth,\r
             RowInfo[RowIndex].LineHeight,\r
             Transparent,\r
             RowInfo[RowIndex].LineWidth,\r
             RowInfo[RowIndex].LineHeight,\r
             Transparent,\r

-            Cell[Index1],\r
+            &Cell[Index1],\r

             Attributes[Index1],\r
             &BufferPtr\r
             );\r
             Attributes[Index1],\r
             &BufferPtr\r
             );\r


@@ -1817,7 +1817,7 @@ HiiStringToImage (
             Image->Width,\r
             Image->Height,\r
             Transparent,\r
             Image->Width,\r
             Image->Height,\r
             Transparent,\r

-            Cell[Index1],\r
+            &Cell[Index1],\r

             Attributes[Index1],\r
             &BufferPtr\r
             );\r
             Attributes[Index1],\r
             &BufferPtr\r
             );\r


@@ -2182,7 +2182,7 @@ HiiGetGlyph (
     Image->Width,\r
     Image->Height,\r
     FALSE,\r
     Image->Width,\r
     Image->Height,\r
     FALSE,\r

-    Cell,\r
+    &Cell,\r

     Attributes,\r
     &BltBuffer\r
     );\r
     Attributes,\r
     &BltBuffer\r
     );\r