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
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
// 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
- 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
}\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
- 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
\r
} // end of for (Y=0...)\r
\r
- *Origin = BltBuffer + Cell.Width;\r
+ *Origin = BltBuffer + Cell->Width;\r
}\r
\r
\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
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
// 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
\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
RowInfo[RowIndex].LineWidth,\r
RowInfo[RowIndex].LineHeight,\r
Transparent,\r
- Cell[Index1],\r
+ &Cell[Index1],\r
Attributes[Index1],\r
&BufferPtr\r
);\r
Image->Width,\r
Image->Height,\r
Transparent,\r
- Cell[Index1],\r
+ &Cell[Index1],\r
Attributes[Index1],\r
&BufferPtr\r
);\r
Image->Width,\r
Image->Height,\r
FALSE,\r
- Cell,\r
+ &Cell,\r
Attributes,\r
&BltBuffer\r
);\r