MdePkg/HiiImageDecoder.h: Add missing EFI_HII_IMAGE_DECODER_OTHER_INFO

Besides adding the missing structure
EFI_HII_IMAGE_DECODER_OTHER_INFO, the patch also correct some typo.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/MdePkg/Include/Protocol/HiiImageDecoder.h b/MdePkg/Include/Protocol/HiiImageDecoder.h
index aebb813ed6074627a9dc8c0f1007e7b61324aa46..fd14592237abd099edd6de26fe3e83961c9d7159 100644 (file)
--- 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.\r
 \r
 (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
+  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r
 \r
 This program and the accompanying materials are licensed and made available under\r
 the terms and conditions of the BSD License that accompanies this distribution.\r
@@ -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.\r
 \r
 **/\r
-#ifndef __EFI_IMAGE_DECODER_PROTOCOL_H__\r
-#define __EFI_IMAGE_DECODER_PROTOCOL_H__\r
+#ifndef __HII_IMAGE_DECODER_H__\r
+#define __HII_IMAGE_DECODER_H__\r
 \r
 #include <Protocol/HiiImage.h>\r
 \r
@@ -64,6 +65,9 @@ typedef struct _EFI_HII_IMAGE_DECODER_IMAGE_INFO_HEADER {
   UINT8                               ColorDepthInBits;\r
 } EFI_HII_IMAGE_DECODER_IMAGE_INFO_HEADER;\r
 \r
+#define EFI_IMAGE_JPEG_SCANTYPE_PROGREESSIVE 0x01\r
+#define EFI_IMAGE_JPEG_SCANTYPE_INTERLACED   0x02\r
+\r
 //\r
 // EFI_HII_IMAGE_DECODER_JPEG_INFO\r
 // Header         The common header\r
@@ -72,9 +76,6 @@ typedef struct _EFI_HII_IMAGE_DECODER_IMAGE_INFO_HEADER {
 //\r
 typedef struct _EFI_HII_IMAGE_DECODER_JPEG_INFO {\r
   EFI_HII_IMAGE_DECODER_IMAGE_INFO_HEADER  Header;\r
-\r
-#define EFI_IMAGE_JPEG_SCANTYPE_PROGREESSIVE 0x01\r
-#define EFI_IMAGE_JPEG_SCANTYPE_INTERLACED   0x02\r
   UINT16                                    ScanType;\r
   UINT64                                    Reserved;\r
 } EFI_HII_IMAGE_DECODER_JPEG_INFO;\r
@@ -91,6 +92,17 @@ typedef struct _EFI_HII_IMAGE_DECODER_PNG_INFO {
   UINT64                                    Reserved;\r
 } EFI_HII_IMAGE_DECODER_PNG_INFO;\r
 \r
+//\r
+// EFI_HII_IMAGE_DECODER_OTHER_INFO\r
+//\r
+typedef struct _EFI_HII_IMAGE_DECODER_OTHER_INFO {\r
+  EFI_HII_IMAGE_DECODER_IMAGE_INFO_HEADER Header;\r
+  CHAR16                                  ImageExtenion[1];\r
+  //\r
+  // Variable length of image file extension name.\r
+  //\r
+} EFI_HII_IMAGE_DECODER_OTHER_INFO;\r
+\r
 /**\r
   There could be more than one EFI_HII_IMAGE_DECODER_PROTOCOL instances installed\r
   in the system for different image formats. This function returns the decoder\r
@@ -112,10 +124,10 @@ typedef struct _EFI_HII_IMAGE_DECODER_PNG_INFO {
 **/\r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *EFI_HII_IMAGE_DECODER_GET_DECODER_NAME)(\r
+(EFIAPI *EFI_HII_IMAGE_DECODER_GET_NAME)(\r
   IN      EFI_HII_IMAGE_DECODER_PROTOCOL   *This,\r
   IN OUT  EFI_GUID                         **DecoderName,\r
-  IN OUT  UINT16                           *NumberofDecoderName\r
+  IN OUT  UINT16                           *NumberOfDecoderName\r
   );\r
 \r
 /**\r
@@ -183,12 +195,12 @@ EFI_STATUS
   IN      EFI_HII_IMAGE_DECODER_PROTOCOL   *This,\r
   IN      VOID                              *Image,\r
   IN      UINTN                             ImageRawDataSize,\r
-  IN OUT  EFI_IMAGE_OUTPUT                  **BitMap OPTIONAL,\r
+  IN OUT  EFI_IMAGE_OUTPUT                  **Bitmap,\r
   IN      BOOLEAN                           Transparent\r
   );\r
 \r
 struct _EFI_HII_IMAGE_DECODER_PROTOCOL {\r
-  EFI_HII_IMAGE_DECODER_GET_DECODER_NAME  GetImageDecoderName;\r
+  EFI_HII_IMAGE_DECODER_GET_NAME          GetImageDecoderName;\r
   EFI_HII_IMAGE_DECODER_GET_IMAGE_INFO    GetImageInfo;\r
   EFI_HII_IMAGE_DECODER_DECODE            DecodeImage;\r
 };\r