* [PATCH 0/2] Refine HiiImageDecoder.h
@ 2016-09-27 2:17 Ruiyu Ni
2016-09-27 2:17 ` [PATCH 1/2] MdePkg/HiiImageDecoder.h: Rename from ImageDecoder.h Ruiyu Ni
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Ruiyu Ni @ 2016-09-27 2:17 UTC (permalink / raw)
To: edk2-devel
The patch renames ImageDecoder.h to HiiImageDecoder.h before
anyone starts to use it. The new file name follows the EDKII
file name rule. The patch also adds a missing structure.
Ruiyu Ni (2):
MdePkg/HiiImageDecoder.h: Rename from ImageDecoder.h
MdePkg/HiiImageDecoder.h: Add missing EFI_HII_IMAGE_DECODER_OTHER_INFO
.../Protocol/{ImageDecoder.h => HiiImageDecoder.h} | 30 +++++++++++++++-------
1 file changed, 21 insertions(+), 9 deletions(-)
rename MdePkg/Include/Protocol/{ImageDecoder.h => HiiImageDecoder.h} (90%)
--
2.9.0.windows.1
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH 1/2] MdePkg/HiiImageDecoder.h: Rename from ImageDecoder.h 2016-09-27 2:17 [PATCH 0/2] Refine HiiImageDecoder.h Ruiyu Ni @ 2016-09-27 2:17 ` Ruiyu Ni 2016-09-27 2:17 ` [PATCH 2/2] MdePkg/HiiImageDecoder.h: Add missing EFI_HII_IMAGE_DECODER_OTHER_INFO Ruiyu Ni 2016-09-28 8:13 ` [PATCH 0/2] Refine HiiImageDecoder.h Gao, Liming 2 siblings, 0 replies; 4+ messages in thread From: Ruiyu Ni @ 2016-09-27 2:17 UTC (permalink / raw) To: edk2-devel; +Cc: Liming Gao Rename the protocol header file to follow EDKII file name rule before the HiiImageDecoder protocol is used by anyone. Cc: Liming Gao <liming.gao@intel.com> Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com> --- MdePkg/Include/Protocol/{ImageDecoder.h => HiiImageDecoder.h} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename MdePkg/Include/Protocol/{ImageDecoder.h => HiiImageDecoder.h} (100%) diff --git a/MdePkg/Include/Protocol/ImageDecoder.h b/MdePkg/Include/Protocol/HiiImageDecoder.h similarity index 100% rename from MdePkg/Include/Protocol/ImageDecoder.h rename to MdePkg/Include/Protocol/HiiImageDecoder.h -- 2.9.0.windows.1 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 2/2] MdePkg/HiiImageDecoder.h: Add missing EFI_HII_IMAGE_DECODER_OTHER_INFO 2016-09-27 2:17 [PATCH 0/2] Refine HiiImageDecoder.h Ruiyu Ni 2016-09-27 2:17 ` [PATCH 1/2] MdePkg/HiiImageDecoder.h: Rename from ImageDecoder.h Ruiyu Ni @ 2016-09-27 2:17 ` Ruiyu Ni 2016-09-28 8:13 ` [PATCH 0/2] Refine HiiImageDecoder.h Gao, Liming 2 siblings, 0 replies; 4+ messages in thread From: Ruiyu Ni @ 2016-09-27 2:17 UTC (permalink / raw) To: edk2-devel; +Cc: Liming Gao Besides adding the missing structure EFI_HII_IMAGE_DECODER_OTHER_INFO, the patch also correct some typo. Cc: Liming Gao <liming.gao@intel.com> Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com> --- MdePkg/Include/Protocol/HiiImageDecoder.h | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/MdePkg/Include/Protocol/HiiImageDecoder.h b/MdePkg/Include/Protocol/HiiImageDecoder.h index aebb813..fd14592 100644 --- a/MdePkg/Include/Protocol/HiiImageDecoder.h +++ b/MdePkg/Include/Protocol/HiiImageDecoder.h @@ -2,6 +2,7 @@ This protocol provides generic image decoder interfaces to various image formats. (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR> + Copyright (c) 2016, Intel Corporation. All rights reserved.<BR> This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License that accompanies this distribution. @@ -12,8 +13,8 @@ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ -#ifndef __EFI_IMAGE_DECODER_PROTOCOL_H__ -#define __EFI_IMAGE_DECODER_PROTOCOL_H__ +#ifndef __HII_IMAGE_DECODER_H__ +#define __HII_IMAGE_DECODER_H__ #include <Protocol/HiiImage.h> @@ -64,6 +65,9 @@ typedef struct _EFI_HII_IMAGE_DECODER_IMAGE_INFO_HEADER { UINT8 ColorDepthInBits; } EFI_HII_IMAGE_DECODER_IMAGE_INFO_HEADER; +#define EFI_IMAGE_JPEG_SCANTYPE_PROGREESSIVE 0x01 +#define EFI_IMAGE_JPEG_SCANTYPE_INTERLACED 0x02 + // // EFI_HII_IMAGE_DECODER_JPEG_INFO // Header The common header @@ -72,9 +76,6 @@ typedef struct _EFI_HII_IMAGE_DECODER_IMAGE_INFO_HEADER { // typedef struct _EFI_HII_IMAGE_DECODER_JPEG_INFO { EFI_HII_IMAGE_DECODER_IMAGE_INFO_HEADER Header; - -#define EFI_IMAGE_JPEG_SCANTYPE_PROGREESSIVE 0x01 -#define EFI_IMAGE_JPEG_SCANTYPE_INTERLACED 0x02 UINT16 ScanType; UINT64 Reserved; } EFI_HII_IMAGE_DECODER_JPEG_INFO; @@ -91,6 +92,17 @@ typedef struct _EFI_HII_IMAGE_DECODER_PNG_INFO { UINT64 Reserved; } EFI_HII_IMAGE_DECODER_PNG_INFO; +// +// EFI_HII_IMAGE_DECODER_OTHER_INFO +// +typedef struct _EFI_HII_IMAGE_DECODER_OTHER_INFO { + EFI_HII_IMAGE_DECODER_IMAGE_INFO_HEADER Header; + CHAR16 ImageExtenion[1]; + // + // Variable length of image file extension name. + // +} EFI_HII_IMAGE_DECODER_OTHER_INFO; + /** There could be more than one EFI_HII_IMAGE_DECODER_PROTOCOL instances installed in the system for different image formats. This function returns the decoder @@ -112,10 +124,10 @@ typedef struct _EFI_HII_IMAGE_DECODER_PNG_INFO { **/ typedef EFI_STATUS -(EFIAPI *EFI_HII_IMAGE_DECODER_GET_DECODER_NAME)( +(EFIAPI *EFI_HII_IMAGE_DECODER_GET_NAME)( IN EFI_HII_IMAGE_DECODER_PROTOCOL *This, IN OUT EFI_GUID **DecoderName, - IN OUT UINT16 *NumberofDecoderName + IN OUT UINT16 *NumberOfDecoderName ); /** @@ -183,12 +195,12 @@ EFI_STATUS IN EFI_HII_IMAGE_DECODER_PROTOCOL *This, IN VOID *Image, IN UINTN ImageRawDataSize, - IN OUT EFI_IMAGE_OUTPUT **BitMap OPTIONAL, + IN OUT EFI_IMAGE_OUTPUT **Bitmap, IN BOOLEAN Transparent ); struct _EFI_HII_IMAGE_DECODER_PROTOCOL { - EFI_HII_IMAGE_DECODER_GET_DECODER_NAME GetImageDecoderName; + EFI_HII_IMAGE_DECODER_GET_NAME GetImageDecoderName; EFI_HII_IMAGE_DECODER_GET_IMAGE_INFO GetImageInfo; EFI_HII_IMAGE_DECODER_DECODE DecodeImage; }; -- 2.9.0.windows.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 0/2] Refine HiiImageDecoder.h 2016-09-27 2:17 [PATCH 0/2] Refine HiiImageDecoder.h Ruiyu Ni 2016-09-27 2:17 ` [PATCH 1/2] MdePkg/HiiImageDecoder.h: Rename from ImageDecoder.h Ruiyu Ni 2016-09-27 2:17 ` [PATCH 2/2] MdePkg/HiiImageDecoder.h: Add missing EFI_HII_IMAGE_DECODER_OTHER_INFO Ruiyu Ni @ 2016-09-28 8:13 ` Gao, Liming 2 siblings, 0 replies; 4+ messages in thread From: Gao, Liming @ 2016-09-28 8:13 UTC (permalink / raw) To: Ni, Ruiyu, edk2-devel@lists.01.org Reviewed-by: Liming Gao <liming.gao@intel.com> -----Original Message----- From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Ruiyu Ni Sent: Tuesday, September 27, 2016 10:18 AM To: edk2-devel@lists.01.org Subject: [edk2] [PATCH 0/2] Refine HiiImageDecoder.h The patch renames ImageDecoder.h to HiiImageDecoder.h before anyone starts to use it. The new file name follows the EDKII file name rule. The patch also adds a missing structure. Ruiyu Ni (2): MdePkg/HiiImageDecoder.h: Rename from ImageDecoder.h MdePkg/HiiImageDecoder.h: Add missing EFI_HII_IMAGE_DECODER_OTHER_INFO .../Protocol/{ImageDecoder.h => HiiImageDecoder.h} | 30 +++++++++++++++------- 1 file changed, 21 insertions(+), 9 deletions(-) rename MdePkg/Include/Protocol/{ImageDecoder.h => HiiImageDecoder.h} (90%) -- 2.9.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-09-28 8:13 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-09-27 2:17 [PATCH 0/2] Refine HiiImageDecoder.h Ruiyu Ni 2016-09-27 2:17 ` [PATCH 1/2] MdePkg/HiiImageDecoder.h: Rename from ImageDecoder.h Ruiyu Ni 2016-09-27 2:17 ` [PATCH 2/2] MdePkg/HiiImageDecoder.h: Add missing EFI_HII_IMAGE_DECODER_OTHER_INFO Ruiyu Ni 2016-09-28 8:13 ` [PATCH 0/2] Refine HiiImageDecoder.h Gao, Liming
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox