tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg/HiiDatabase: Refine HiiDrawImage() 

Contributed-under: TianoCore Contribution Agreement 1.0
Reviewed-by: Liming Gao <liming.gao@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Dandan Bi <dandan.bi@intel.com>
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
This commit is contained in:
Ruiyu Ni 2016-09-21 11:31:49 +08:00
parent 7ca5b466ae
commit c0be50f0ef
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
View File

@ -1139,7 +1139,6 @@ HiiDrawImage (
EFI_STATUS Status; EFI_STATUS Status;
HII_DATABASE_PRIVATE_DATA *Private; HII_DATABASE_PRIVATE_DATA *Private;
BOOLEAN Transparent; BOOLEAN Transparent;
EFI_IMAGE_INPUT *ImageIn;
EFI_IMAGE_OUTPUT *ImageOut; EFI_IMAGE_OUTPUT *ImageOut;
EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer; EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer;
UINTN BufferLen; UINTN BufferLen;
@ -1165,7 +1164,6 @@ HiiDrawImage (
} }
FontInfo = NULL; FontInfo = NULL;
ImageIn = (EFI_IMAGE_INPUT *) Image;
// //
// Check whether the image will be drawn transparently or opaquely. // Check whether the image will be drawn transparently or opaquely.
@ -1180,7 +1178,7 @@ HiiDrawImage (
// Now EFI_HII_DRAW_FLAG_DEFAULT is set, whether image will be drawn depending // Now EFI_HII_DRAW_FLAG_DEFAULT is set, whether image will be drawn depending
// on the image's transparency setting. // on the image's transparency setting.
// //
if ((ImageIn->Flags & EFI_IMAGE_TRANSPARENT) == EFI_IMAGE_TRANSPARENT) { if ((Image->Flags & EFI_IMAGE_TRANSPARENT) == EFI_IMAGE_TRANSPARENT) {
Transparent = TRUE; Transparent = TRUE;
} }
} }
@ -1209,8 +1207,8 @@ HiiDrawImage (
// Clip the image by (Width, Height) // Clip the image by (Width, Height)
// //
Width = ImageIn->Width; Width = Image->Width;
Height = ImageIn->Height; Height = Image->Height;
if (Width > (*Blt)->Width - BltX) { if (Width > (*Blt)->Width - BltX) {
Width = (*Blt)->Width - BltX; Width = (*Blt)->Width - BltX;
@ -1225,14 +1223,14 @@ HiiDrawImage (
return EFI_OUT_OF_RESOURCES; return EFI_OUT_OF_RESOURCES;
} }
if (Width == ImageIn->Width && Height == ImageIn->Height) { if (Width == Image->Width && Height == Image->Height) {
CopyMem (BltBuffer, ImageIn->Bitmap, BufferLen); CopyMem (BltBuffer, Image->Bitmap, BufferLen);
} else { } else {
for (Ypos = 0; Ypos < Height; Ypos++) { for (Ypos = 0; Ypos < Height; Ypos++) {
OffsetY1 = ImageIn->Width * Ypos; OffsetY1 = Image->Width * Ypos;
OffsetY2 = Width * Ypos; OffsetY2 = Width * Ypos;
for (Xpos = 0; Xpos < Width; Xpos++) { for (Xpos = 0; Xpos < Width; Xpos++) {
BltBuffer[OffsetY2 + Xpos] = ImageIn->Bitmap[OffsetY1 + Xpos]; BltBuffer[OffsetY2 + Xpos] = Image->Bitmap[OffsetY1 + Xpos];
} }
} }
} }
@ -1283,8 +1281,8 @@ HiiDrawImage (
// //
// Allocate a new bitmap to hold the incoming image. // Allocate a new bitmap to hold the incoming image.
// //
Width = ImageIn->Width + BltX; Width = Image->Width + BltX;
Height = ImageIn->Height + BltY; Height = Image->Height + BltY;
BufferLen = Width * Height * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL); BufferLen = Width * Height * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL);
BltBuffer = (EFI_GRAPHICS_OUTPUT_BLT_PIXEL *) AllocateZeroPool (BufferLen); BltBuffer = (EFI_GRAPHICS_OUTPUT_BLT_PIXEL *) AllocateZeroPool (BufferLen);
@ -1322,11 +1320,11 @@ HiiDrawImage (
// //
*Blt = ImageOut; *Blt = ImageOut;
return ImageToBlt ( return ImageToBlt (
ImageIn->Bitmap, Image->Bitmap,
BltX, BltX,
BltY, BltY,
ImageIn->Width, Image->Width,
ImageIn->Height, Image->Height,
Transparent, Transparent,
Blt Blt
); );