diff options
| author | Ruiyu Ni <ruiyu.ni@intel.com> | 2015-11-18 05:05:22 +0000 |
|---|---|---|
| committer | niruiyu <niruiyu@Edk2> | 2015-11-18 05:05:22 +0000 |
| commit | b9335cf562f11a096efea6c98d8612f22929eeb9 (patch) | |
| tree | 8b3f3c50c51eb3684d143d87764fdab645c0ee1a /MdeModulePkg | |
| parent | c25be72e15b9f499551278b06b458c5bf072646f (diff) | |
| download | edk2-b9335cf562f11a096efea6c98d8612f22929eeb9.tar.gz edk2-b9335cf562f11a096efea6c98d8612f22929eeb9.tar.bz2 edk2-b9335cf562f11a096efea6c98d8612f22929eeb9.zip | |
MdeModulePkg: Change BootLogoEnableLogo use INTN for minus value
The parameter name is also changed from Coordinate* to Offset* to
reflect that it's the offset to the location specified by Attribute.
For example, when the Attribute is Center, OffsetX and OffsetY are
used to specify the offset to the Center. OffsetX = 100 means
100 pixels right to the Center.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18867 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdeModulePkg')
| -rw-r--r-- | MdeModulePkg/Include/Library/BootLogoLib.h | 8 | ||||
| -rw-r--r-- | MdeModulePkg/Library/BootLogoLib/BootLogoLib.c | 63 |
2 files changed, 34 insertions, 37 deletions
diff --git a/MdeModulePkg/Include/Library/BootLogoLib.h b/MdeModulePkg/Include/Library/BootLogoLib.h index 3637405371..b39d61b7c3 100644 --- a/MdeModulePkg/Include/Library/BootLogoLib.h +++ b/MdeModulePkg/Include/Library/BootLogoLib.h @@ -24,8 +24,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. @param[in] ImageFormat Format of the image file.
@param[in] LogoFile The file name of logo to display.
@param[in] Attribute The display attributes of the image returned.
- @param[in] CoordinateX The X coordinate of the image.
- @param[in] CoordinateY The Y coordinate of the image.
+ @param[in] OffsetX The X offset of the image regarding the Attribute.
+ @param[in] OffsetY The Y offset of the image regarding the Attribute.
@retval EFI_SUCCESS Logo was displayed.
@retval EFI_UNSUPPORTED Logo was not found or cannot be displayed.
@@ -36,8 +36,8 @@ BootLogoEnableLogo ( IN IMAGE_FORMAT ImageFormat,
IN EFI_GUID *Logo,
IN EDKII_PLATFORM_LOGO_DISPLAY_ATTRIBUTE Attribute,
- IN UINTN CoordinateX,
- IN UINTN CoordinateY
+ IN INTN OffsetX,
+ IN INTN OffsetY
);
diff --git a/MdeModulePkg/Library/BootLogoLib/BootLogoLib.c b/MdeModulePkg/Library/BootLogoLib/BootLogoLib.c index 312adb04db..f824ae13c2 100644 --- a/MdeModulePkg/Library/BootLogoLib/BootLogoLib.c +++ b/MdeModulePkg/Library/BootLogoLib/BootLogoLib.c @@ -35,8 +35,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. @param[in] ImageFormat Format of the image file.
@param[in] LogoFile The file name of logo to display.
@param[in] Attribute The display attributes of the image returned.
- @param[in] CoordinateX The X coordinate of the image.
- @param[in] CoordinateY The Y coordinate of the image.
+ @param[in] OffsetX The X offset of the image regarding the Attribute.
+ @param[in] OffsetY The Y offset of the image regarding the Attribute.
@retval EFI_SUCCESS Logo was displayed.
@retval EFI_UNSUPPORTED Logo was not found or cannot be displayed.
@@ -47,8 +47,8 @@ BootLogoEnableLogo ( IN IMAGE_FORMAT ImageFormat,
IN EFI_GUID *Logo,
IN EDKII_PLATFORM_LOGO_DISPLAY_ATTRIBUTE Attribute,
- IN UINTN CoordinateX,
- IN UINTN CoordinateY
+ IN INTN OffsetX,
+ IN INTN OffsetY
)
{
EFI_STATUS Status;
@@ -160,8 +160,8 @@ BootLogoEnableLogo ( &ImageData,
&ImageSize,
&Attribute,
- &CoordinateX,
- &CoordinateY
+ &OffsetX,
+ &OffsetY
);
if (EFI_ERROR (Status)) {
break;
@@ -199,48 +199,42 @@ BootLogoEnableLogo ( //
switch (Attribute) {
case EdkiiPlatformLogoDisplayAttributeLeftTop:
- DestX = CoordinateX;
- DestY = CoordinateY;
+ DestX = 0;
+ DestY = 0;
break;
-
case EdkiiPlatformLogoDisplayAttributeCenterTop:
DestX = (SizeOfX - Width) / 2;
- DestY = CoordinateY;
+ DestY = 0;
break;
-
case EdkiiPlatformLogoDisplayAttributeRightTop:
- DestX = (SizeOfX - Width - CoordinateX);
- DestY = CoordinateY;;
+ DestX = SizeOfX - Width;
+ DestY = 0;
break;
- case EdkiiPlatformLogoDisplayAttributeCenterRight:
- DestX = (SizeOfX - Width - CoordinateX);
+ case EdkiiPlatformLogoDisplayAttributeCenterLeft:
+ DestX = 0;
DestY = (SizeOfY - Height) / 2;
break;
-
- case EdkiiPlatformLogoDisplayAttributeRightBottom:
- DestX = (SizeOfX - Width - CoordinateX);
- DestY = (SizeOfY - Height - CoordinateY);
- break;
-
- case EdkiiPlatformLogoDisplayAttributeCenterBottom:
+ case EdkiiPlatformLogoDisplayAttributeCenter:
DestX = (SizeOfX - Width) / 2;
- DestY = (SizeOfY - Height - CoordinateY);
- break;
-
- case EdkiiPlatformLogoDisplayAttributeLeftBottom:
- DestX = CoordinateX;
- DestY = (SizeOfY - Height - CoordinateY);
+ DestY = (SizeOfY - Height) / 2;
break;
-
- case EdkiiPlatformLogoDisplayAttributeCenterLeft:
- DestX = CoordinateX;
+ case EdkiiPlatformLogoDisplayAttributeCenterRight:
+ DestX = SizeOfX - Width;
DestY = (SizeOfY - Height) / 2;
break;
- case EdkiiPlatformLogoDisplayAttributeCenter:
+ case EdkiiPlatformLogoDisplayAttributeLeftBottom:
+ DestX = 0;
+ DestY = SizeOfY - Height;
+ break;
+ case EdkiiPlatformLogoDisplayAttributeCenterBottom:
DestX = (SizeOfX - Width) / 2;
- DestY = (SizeOfY - Height) / 2;
+ DestY = SizeOfY - Height;
+ break;
+ case EdkiiPlatformLogoDisplayAttributeRightBottom:
+ DestX = SizeOfX - Width;
+ DestY = SizeOfY - Height;
break;
default:
@@ -248,6 +242,9 @@ BootLogoEnableLogo ( break;
}
+ DestX += OffsetX;
+ DestY += OffsetY;
+
if ((DestX >= 0) && (DestY >= 0)) {
if (GraphicsOutput != NULL) {
Status = GraphicsOutput->Blt (
|