* [PATCH v2 1/3] MdeModulePkg: Remove ImageDecoderLib and BmpImageDecoderLib
2016-09-29 3:29 [PATCH 0/3] Remove ImageDecoderLib and BmpImageDecoderLib Ruiyu Ni
@ 2016-09-29 3:29 ` Ruiyu Ni
2016-09-29 3:29 ` [PATCH v2 2/3] MdeModulePkg/BmpImageDecoderLib: Retire it due to new BootLogoLib Ruiyu Ni
` (2 subsequent siblings)
3 siblings, 0 replies; 10+ messages in thread
From: Ruiyu Ni @ 2016-09-29 3:29 UTC (permalink / raw)
To: edk2-devel; +Cc: Liming Gao
The two libraries are created to support old BootLogoLib to
decode the images. Due to the new BootLogoLib starts using
HiiImageEx interfaces, the two libraries are not needed.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
---
MdeModulePkg/MdeModulePkg.dec | 4 ----
MdeModulePkg/MdeModulePkg.dsc | 3 ---
2 files changed, 7 deletions(-)
diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index b28677b..f870b83 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -137,10 +137,6 @@ [LibraryClasses]
#
FileExplorerLib|Include/Library/FileExplorerLib.h
- ## @libraryclass Provides image decoding service.
- #
- ImageDecoderLib|Include/Library/ImageDecoderLib.h
-
## @libraryclass Provides interfaces about logo display.
#
BootLogoLib|Include/Library/BootLogoLib.h
diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index 05120c7..214cb6c 100644
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -48,7 +48,6 @@ [LibraryClasses]
PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
SortLib|MdeModulePkg/Library/BaseSortLib/BaseSortLib.inf
- ImageDecoderLib|MdeModulePkg/Library/ImageDecoderLib/ImageDecoderLib.inf
#
# UEFI & PI
#
@@ -293,9 +292,7 @@ [Components]
MdeModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
MdeModulePkg/Library/PlatformBootManagerLibNull/PlatformBootManagerLibNull.inf
- MdeModulePkg/Library/ImageDecoderLib/ImageDecoderLib.inf
MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
- MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.inf
MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
--
2.9.0.windows.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH v2 2/3] MdeModulePkg/BmpImageDecoderLib: Retire it due to new BootLogoLib
2016-09-29 3:29 [PATCH 0/3] Remove ImageDecoderLib and BmpImageDecoderLib Ruiyu Ni
2016-09-29 3:29 ` [PATCH v2 1/3] MdeModulePkg: " Ruiyu Ni
@ 2016-09-29 3:29 ` Ruiyu Ni
2016-09-29 3:29 ` [PATCH v2 3/3] MdeModulePkg/ImageDecoderLib: " Ruiyu Ni
2016-09-29 3:50 ` [PATCH 0/3] Remove ImageDecoderLib and BmpImageDecoderLib Gao, Liming
3 siblings, 0 replies; 10+ messages in thread
From: Ruiyu Ni @ 2016-09-29 3:29 UTC (permalink / raw)
To: edk2-devel; +Cc: Liming Gao
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
---
.../BmpImageDecoderLib/BmpImageDecoderLib.c | 272 ---------------------
.../BmpImageDecoderLib/BmpImageDecoderLib.inf | 43 ----
.../BmpImageDecoderLib/BmpImageDecoderLib.uni | 26 --
3 files changed, 341 deletions(-)
delete mode 100644 MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.c
delete mode 100644 MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.inf
delete mode 100644 MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.uni
diff --git a/MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.c b/MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.c
deleted file mode 100644
index 6445c06..0000000
--- a/MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.c
+++ /dev/null
@@ -1,272 +0,0 @@
-/** @file
- This library provides BMP image decoding capability.
-
-Copyright (c) 2011 - 2015, 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.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#include <Uefi.h>
-#include <IndustryStandard/Bmp.h>
-#include <Protocol/GraphicsOutput.h>
-#include <Library/BaseLib.h>
-#include <Library/MemoryAllocationLib.h>
-#include <Library/DebugLib.h>
-#include <Library/ImageDecoderLib.h>
-
-/**
- Convert a *.BMP graphics image to a callee allocated GOP blt buffer.
-
- @param ImageFormat Format of the image file.
- @param BmpImage Pointer to BMP file.
- @param BmpImageSize Number of bytes in BmpImage.
- @param GopBlt Buffer containing GOP version of BmpImage.
- @param GopBltSize Size of GopBlt in bytes.
- @param PixelWidth Width of GopBlt/BmpImage in pixels.
- @param PixelHeight Height of GopBlt/BmpImage in pixels.
-
- @retval EFI_SUCCESS GopBlt and GopBltSize are returned.
- @retval EFI_INVALID_PARAMETER GopBlt or GopBltSize is NULL.
- @retval EFI_UNSUPPORTED BmpImage is not a valid *.BMP image
- @retval EFI_OUT_OF_RESOURCES No enough buffer to allocate.
-
-**/
-EFI_STATUS
-EFIAPI
-BmpImageDecoderLibConvertBmpToGopBlt (
- IN IMAGE_FORMAT ImageFormat,
- IN UINT8 *BmpImage,
- IN UINTN BmpImageSize,
- OUT EFI_GRAPHICS_OUTPUT_BLT_PIXEL **GopBlt,
- OUT UINTN *GopBltSize,
- OUT UINTN *PixelWidth,
- OUT UINTN *PixelHeight
- )
-{
- UINT8 *Image;
- UINT8 *ImageHeader;
- BMP_IMAGE_HEADER *BmpHeader;
- BMP_COLOR_MAP *BmpColorMap;
- EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer;
- EFI_GRAPHICS_OUTPUT_BLT_PIXEL *Blt;
- UINT64 BltBufferSize;
- UINTN Index;
- UINTN Height;
- UINTN Width;
- UINTN ImageIndex;
- UINT32 DataSizePerLine;
- UINT32 ColorMapNum;
-
- ASSERT ((GopBlt != NULL) && (GopBltSize != NULL));
-
- if ((ImageFormat != ImageFormatBmp) && (ImageFormat != ImageFormatUnknown)) {
- return EFI_UNSUPPORTED;
- }
-
- if (sizeof (BMP_IMAGE_HEADER) > BmpImageSize) {
- return EFI_UNSUPPORTED;
- }
-
- BmpHeader = (BMP_IMAGE_HEADER *) BmpImage;
-
- if (BmpHeader->CharB != 'B' || BmpHeader->CharM != 'M') {
- return EFI_UNSUPPORTED;
- }
-
- //
- // Doesn't support compress.
- //
- if (BmpHeader->CompressionType != 0) {
- return EFI_UNSUPPORTED;
- }
-
- //
- // Only support BITMAPINFOHEADER format.
- // BITMAPFILEHEADER + BITMAPINFOHEADER = BMP_IMAGE_HEADER
- //
- if (BmpHeader->HeaderSize != sizeof (BMP_IMAGE_HEADER) - OFFSET_OF(BMP_IMAGE_HEADER, HeaderSize)) {
- return EFI_UNSUPPORTED;
- }
-
- //
- // The data size in each line must be 4 byte alignment.
- //
- DataSizePerLine = ((BmpHeader->PixelWidth * BmpHeader->BitPerPixel + 31) >> 3) & (~0x3);
- BltBufferSize = MultU64x32 (DataSizePerLine, BmpHeader->PixelHeight);
- if (BltBufferSize > (UINT32) ~0) {
- return EFI_INVALID_PARAMETER;
- }
-
- if ((BmpHeader->Size != BmpImageSize) ||
- (BmpHeader->Size < BmpHeader->ImageOffset) ||
- (BmpHeader->Size - BmpHeader->ImageOffset != BmpHeader->PixelHeight * DataSizePerLine)) {
- return EFI_INVALID_PARAMETER;
- }
-
- //
- // Calculate Color Map offset in the image.
- //
- Image = BmpImage;
- BmpColorMap = (BMP_COLOR_MAP *) (Image + sizeof (BMP_IMAGE_HEADER));
- if (BmpHeader->ImageOffset < sizeof (BMP_IMAGE_HEADER)) {
- return EFI_INVALID_PARAMETER;
- }
-
- if (BmpHeader->ImageOffset > sizeof (BMP_IMAGE_HEADER)) {
- switch (BmpHeader->BitPerPixel) {
- case 1:
- ColorMapNum = 2;
- break;
- case 4:
- ColorMapNum = 16;
- break;
- case 8:
- ColorMapNum = 256;
- break;
- default:
- ColorMapNum = 0;
- break;
- }
- //
- // BMP file may has padding data between the bmp header section and the bmp data section.
- //
- if (BmpHeader->ImageOffset - sizeof (BMP_IMAGE_HEADER) < sizeof (BMP_COLOR_MAP) * ColorMapNum) {
- return EFI_INVALID_PARAMETER;
- }
- }
-
- //
- // Calculate graphics image data address in the image
- //
- Image = ((UINT8 *) BmpImage) + BmpHeader->ImageOffset;
- ImageHeader = Image;
-
- //
- // Calculate the BltBuffer needed size.
- //
- BltBufferSize = MultU64x32 ((UINT64) BmpHeader->PixelWidth, BmpHeader->PixelHeight);
- //
- // Ensure the BltBufferSize * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL) doesn't overflow
- //
- if (BltBufferSize > DivU64x32 ((UINTN) ~0, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL))) {
- return EFI_UNSUPPORTED;
- }
- BltBufferSize = MultU64x32 (BltBufferSize, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL));
-
- *GopBltSize = (UINTN) BltBufferSize;
- *GopBlt = AllocatePool (*GopBltSize);
- if (*GopBlt == NULL) {
- return EFI_OUT_OF_RESOURCES;
- }
-
- *PixelWidth = BmpHeader->PixelWidth;
- *PixelHeight = BmpHeader->PixelHeight;
-
- //
- // Convert image from BMP to Blt buffer format
- //
- BltBuffer = *GopBlt;
- for (Height = 0; Height < BmpHeader->PixelHeight; Height++) {
- Blt = &BltBuffer[(BmpHeader->PixelHeight - Height - 1) * BmpHeader->PixelWidth];
- for (Width = 0; Width < BmpHeader->PixelWidth; Width++, Image++, Blt++) {
- switch (BmpHeader->BitPerPixel) {
- case 1:
- //
- // Convert 1-bit (2 colors) BMP to 24-bit color
- //
- for (Index = 0; Index < 8 && Width < BmpHeader->PixelWidth; Index++) {
- Blt->Red = BmpColorMap[((*Image) >> (7 - Index)) & 0x1].Red;
- Blt->Green = BmpColorMap[((*Image) >> (7 - Index)) & 0x1].Green;
- Blt->Blue = BmpColorMap[((*Image) >> (7 - Index)) & 0x1].Blue;
- Blt++;
- Width++;
- }
-
- Blt--;
- Width--;
- break;
-
- case 4:
- //
- // Convert 4-bit (16 colors) BMP Palette to 24-bit color
- //
- Index = (*Image) >> 4;
- Blt->Red = BmpColorMap[Index].Red;
- Blt->Green = BmpColorMap[Index].Green;
- Blt->Blue = BmpColorMap[Index].Blue;
- if (Width < (BmpHeader->PixelWidth - 1)) {
- Blt++;
- Width++;
- Index = (*Image) & 0x0f;
- Blt->Red = BmpColorMap[Index].Red;
- Blt->Green = BmpColorMap[Index].Green;
- Blt->Blue = BmpColorMap[Index].Blue;
- }
- break;
-
- case 8:
- //
- // Convert 8-bit (256 colors) BMP Palette to 24-bit color
- //
- Blt->Red = BmpColorMap[*Image].Red;
- Blt->Green = BmpColorMap[*Image].Green;
- Blt->Blue = BmpColorMap[*Image].Blue;
- break;
-
- case 24:
- //
- // It is 24-bit BMP.
- //
- Blt->Blue = *Image++;
- Blt->Green = *Image++;
- Blt->Red = *Image;
- break;
-
- default:
- //
- // Other bit format BMP is not supported.
- //
- return EFI_UNSUPPORTED;
- break;
- };
-
- }
-
- ImageIndex = (UINTN) (Image - ImageHeader);
- if ((ImageIndex % 4) != 0) {
- //
- // Bmp Image starts each row on a 32-bit boundary!
- //
- Image = Image + (4 - (ImageIndex % 4));
- }
- }
-
- return EFI_SUCCESS;
-}
-
-/**
- Initialize BmpImageDecoderLib library.
-
- @param ImageHandle The image handle.
- @param SystemTable The system table.
-
- @retval EFI_SUCCESS The BmpImageDecoderLib library is initialized correctly.
- @return Other value if failed to initialize the BmpImageDecoderLib library.
-**/
-EFI_STATUS
-EFIAPI
-BmpImageDecoderLibConstructor (
- IN EFI_HANDLE ImageHandle,
- IN EFI_SYSTEM_TABLE *SystemTable
-)
-{
- RegisterImageDecoder (BmpImageDecoderLibConvertBmpToGopBlt);
- return EFI_SUCCESS;
-}
-
diff --git a/MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.inf b/MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.inf
deleted file mode 100644
index 0bde46c..0000000
--- a/MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.inf
+++ /dev/null
@@ -1,43 +0,0 @@
-## @file
-# This library provides BMP image decoding capability.
-#
-# Copyright (c) 2011 - 2015, 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.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php.
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-##
-
-[Defines]
- INF_VERSION = 0x00010005
- BASE_NAME = BmpImageDecoderLib
- MODULE_UNI_FILE = BmpImageDecoderLib.uni
- FILE_GUID = DF414223-F17C-4022-A1F4-4062612AB00D
- MODULE_TYPE = DXE_DRIVER
- VERSION_STRING = 1.0
- LIBRARY_CLASS = NULL|DXE_DRIVER UEFI_APPLICATION
- CONSTRUCTOR = BmpImageDecoderLibConstructor
-
-#
-# The following information is for reference only and not required by the build tools.
-#
-# VALID_ARCHITECTURES = IA32 X64 IPF EBC
-#
-
-[Sources]
- BmpImageDecoderLib.c
-
-[Packages]
- MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
-
-[LibraryClasses]
- BaseLib
- MemoryAllocationLib
- BaseMemoryLib
- DebugLib
- ImageDecoderLib
\ No newline at end of file
diff --git a/MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.uni b/MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.uni
deleted file mode 100644
index 334144b..0000000
--- a/MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.uni
+++ /dev/null
@@ -1,26 +0,0 @@
-// /** @file
-// This library provides BMP image decoding capability.
-//
-// This library provides BMP image decoding capability.
-//
-// Copyright (c) 2015, 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.
-// The full text of the license may be found at
-// http://opensource.org/licenses/bsd-license.php.
-//
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-//
-// **/
-
-#string STR_MODULE_ABSTRACT
-#language en-US
-"This library provides BMP image decoding capability."
-
-#string STR_MODULE_DESCRIPTION
-#language en-US
-"This library provides BMP image decoding capability."
-
-
--
2.9.0.windows.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH v2 3/3] MdeModulePkg/ImageDecoderLib: Retire it due to new BootLogoLib
2016-09-29 3:29 [PATCH 0/3] Remove ImageDecoderLib and BmpImageDecoderLib Ruiyu Ni
2016-09-29 3:29 ` [PATCH v2 1/3] MdeModulePkg: " Ruiyu Ni
2016-09-29 3:29 ` [PATCH v2 2/3] MdeModulePkg/BmpImageDecoderLib: Retire it due to new BootLogoLib Ruiyu Ni
@ 2016-09-29 3:29 ` Ruiyu Ni
2016-09-29 3:50 ` [PATCH 0/3] Remove ImageDecoderLib and BmpImageDecoderLib Gao, Liming
3 siblings, 0 replies; 10+ messages in thread
From: Ruiyu Ni @ 2016-09-29 3:29 UTC (permalink / raw)
To: edk2-devel; +Cc: Liming Gao
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
---
MdeModulePkg/Include/Library/ImageDecoderLib.h | 76 -------------
.../Library/ImageDecoderLib/ImageDecoderLib.c | 121 ---------------------
.../Library/ImageDecoderLib/ImageDecoderLib.inf | 43 --------
.../Library/ImageDecoderLib/ImageDecoderLib.uni | 26 -----
4 files changed, 266 deletions(-)
delete mode 100644 MdeModulePkg/Include/Library/ImageDecoderLib.h
delete mode 100644 MdeModulePkg/Library/ImageDecoderLib/ImageDecoderLib.c
delete mode 100644 MdeModulePkg/Library/ImageDecoderLib/ImageDecoderLib.inf
delete mode 100644 MdeModulePkg/Library/ImageDecoderLib/ImageDecoderLib.uni
diff --git a/MdeModulePkg/Include/Library/ImageDecoderLib.h b/MdeModulePkg/Include/Library/ImageDecoderLib.h
deleted file mode 100644
index 928a094..0000000
--- a/MdeModulePkg/Include/Library/ImageDecoderLib.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/** @file
- This library provides image decoding service by managing the different
- image decoding libraries.
-
-Copyright (c) 2015, 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.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-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 __IMAGE_DECODER_LIB_H__
-#define __IMAGE_DECODER_LIB_H__
-#include <Protocol/PlatformLogo.h>
-
-typedef
-EFI_STATUS
-(EFIAPI *DECODE_IMAGE)(
- IN IMAGE_FORMAT ImageFormat,
- IN UINT8 *Image,
- IN UINTN ImageSize,
- OUT EFI_GRAPHICS_OUTPUT_BLT_PIXEL **GopBlt,
- OUT UINTN *GopBltSize,
- OUT UINTN *PixelWidth,
- OUT UINTN *PixelHeight
- );
-
-/**
- Convert a graphics image to a callee allocated GOP blt buffer.
-
- @param ImageFormat Format of the image file.
- @param Image Pointer to image file.
- @param ImageSize Number of bytes in Image.
- @param GopBlt Buffer containing GOP version of Image.
- @param GopBltSize Size of GopBlt in bytes.
- @param PixelWidth Width of GopBlt/Image in pixels.
- @param PixelHeight Height of GopBlt/Image in pixels.
-
- @retval EFI_SUCCESS GopBlt and GopBltSize are returned.
- @retval EFI_INVALID_PARAMETER GopBlt or GopBltSize is NULL.
- @retval EFI_INVALID_PARAMETER Image is NULL or ImageSize is 0.
- @retval EFI_UNSUPPORTED Image is not supported.
- @retval EFI_OUT_OF_RESOURCES No enough buffer to allocate.
-
-**/
-EFI_STATUS
-EFIAPI
-DecodeImage (
- IN IMAGE_FORMAT ImageFormat,
- IN UINT8 *Image,
- IN UINTN ImageSize,
- OUT EFI_GRAPHICS_OUTPUT_BLT_PIXEL **GopBlt,
- OUT UINTN *GopBltSize,
- OUT UINTN *PixelWidth,
- OUT UINTN *PixelHeight
- );
-
-/**
- Register an image decoder.
-
- @param Decoder An image decoder.
-
- @retval EFI_SUCCESS The decoder was successfully registered.
- @retval EFI_OUT_OF_RESOURCES No enough resource to register the decoder.
-
-**/
-EFI_STATUS
-EFIAPI
-RegisterImageDecoder (
- IN DECODE_IMAGE Decoder
- );
-
-#endif
diff --git a/MdeModulePkg/Library/ImageDecoderLib/ImageDecoderLib.c b/MdeModulePkg/Library/ImageDecoderLib/ImageDecoderLib.c
deleted file mode 100644
index 4a6219b..0000000
--- a/MdeModulePkg/Library/ImageDecoderLib/ImageDecoderLib.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/** @file
- This library provides image decoding service by managing the different
- image decoding libraries.
-
-Copyright (c) 2011 - 2015, 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.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#include <Uefi.h>
-#include <Protocol/GraphicsOutput.h>
-#include <Library/ImageDecoderLib.h>
-#include <Library/BaseLib.h>
-#include <Library/MemoryAllocationLib.h>
-#include <Library/DebugLib.h>
-
-typedef struct {
- UINT32 Signature;
- DECODE_IMAGE Decoder;
- LIST_ENTRY Link;
-} IMAGE_DECODER_ENTRY;
-#define IMAGE_DECODER_ENTRY_SIGNATURE SIGNATURE_32 ('i', 'm', 'g', 'd')
-#define IMAGE_DECODER_ENTRY_FROM_LINK(Link) \
- CR (Link, IMAGE_DECODER_ENTRY, Link, IMAGE_DECODER_ENTRY_SIGNATURE)
-
-LIST_ENTRY mImageDecoderLibDecoders = INITIALIZE_LIST_HEAD_VARIABLE (mImageDecoderLibDecoders);
-
-/**
- Convert a graphics image to a callee allocated GOP blt buffer.
-
- @param ImageFormat Format of the image file.
- @param Image Pointer to image file.
- @param ImageSize Number of bytes in Image.
- @param GopBlt Buffer containing GOP version of Image.
- @param GopBltSize Size of GopBlt in bytes.
- @param PixelWidth Width of GopBlt/Image in pixels.
- @param PixelHeight Height of GopBlt/Image in pixels.
-
- @retval EFI_SUCCESS GopBlt and GopBltSize are returned.
- @retval EFI_INVALID_PARAMETER GopBlt or GopBltSize is NULL.
- @retval EFI_INVALID_PARAMETER Image is NULL or ImageSize is 0.
- @retval EFI_UNSUPPORTED Image is not supported.
- @retval EFI_OUT_OF_RESOURCES No enough buffer to allocate.
-
-**/
-EFI_STATUS
-EFIAPI
-DecodeImage (
- IN IMAGE_FORMAT ImageFormat,
- IN UINT8 *Image,
- IN UINTN ImageSize,
- OUT EFI_GRAPHICS_OUTPUT_BLT_PIXEL **GopBlt,
- OUT UINTN *GopBltSize,
- OUT UINTN *PixelWidth,
- OUT UINTN *PixelHeight
- )
-{
- IMAGE_DECODER_ENTRY *Entry;
- LIST_ENTRY *Link;
- EFI_STATUS Status;
-
- if ((GopBlt == NULL) || (GopBltSize == NULL)) {
- return EFI_INVALID_PARAMETER;
- }
-
- if ((Image == NULL) || (ImageSize == 0)) {
- return EFI_INVALID_PARAMETER;
- }
-
- for ( Link = GetFirstNode (&mImageDecoderLibDecoders)
- ; !IsNull (&mImageDecoderLibDecoders, Link)
- ; Link = GetNextNode (&mImageDecoderLibDecoders, Link)
- ) {
- Entry = IMAGE_DECODER_ENTRY_FROM_LINK (Link);
- Status = Entry->Decoder (ImageFormat, Image, ImageSize, GopBlt, GopBltSize, PixelWidth, PixelHeight);
- if (!EFI_ERROR (Status)) {
- break;
- }
- }
-
- if (IsNull (&mImageDecoderLibDecoders, Link)) {
- return EFI_UNSUPPORTED;
- } else {
- return EFI_SUCCESS;
- }
-}
-
-/**
- Register an image decoder.
-
- @param Decoder An image decoder.
-
- @retval EFI_SUCCESS The decoder was successfully registered.
- @retval EFI_OUT_OF_RESOURCES No enough resource to register the decoder.
-
-**/
-EFI_STATUS
-EFIAPI
-RegisterImageDecoder (
- IN DECODE_IMAGE Decoder
- )
-{
- IMAGE_DECODER_ENTRY *Entry;
-
- Entry = AllocatePool (sizeof (IMAGE_DECODER_ENTRY));
- if (Entry == NULL) {
- return EFI_OUT_OF_RESOURCES;
- }
-
- Entry->Signature = IMAGE_DECODER_ENTRY_SIGNATURE;
- Entry->Decoder = Decoder;
- InsertTailList (&mImageDecoderLibDecoders, &Entry->Link);
-
- return EFI_SUCCESS;
-}
\ No newline at end of file
diff --git a/MdeModulePkg/Library/ImageDecoderLib/ImageDecoderLib.inf b/MdeModulePkg/Library/ImageDecoderLib/ImageDecoderLib.inf
deleted file mode 100644
index 7ebeec6..0000000
--- a/MdeModulePkg/Library/ImageDecoderLib/ImageDecoderLib.inf
+++ /dev/null
@@ -1,43 +0,0 @@
-## @file
-# This library provides image decoding service by managing the different
-# image decoding libraries.
-#
-# Copyright (c) 2011 - 2015, 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.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php.
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-##
-
-[Defines]
- INF_VERSION = 0x00010005
- BASE_NAME = ImageDecoderLib
- MODULE_UNI_FILE = ImageDecoderLib.uni
- FILE_GUID = 5ACDA5F7-AE20-4A17-90C1-7D087F730202
- MODULE_TYPE = DXE_DRIVER
- VERSION_STRING = 1.0
- LIBRARY_CLASS = ImageDecoderLib|DXE_DRIVER UEFI_APPLICATION
-
-#
-# The following information is for reference only and not required by the build tools.
-#
-# VALID_ARCHITECTURES = IA32 X64 IPF EBC
-#
-
-[Sources]
- ImageDecoderLib.c
-
-[Packages]
- MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
-
-[LibraryClasses]
- BaseLib
- MemoryAllocationLib
- UefiLib
- BaseMemoryLib
- DebugLib
\ No newline at end of file
diff --git a/MdeModulePkg/Library/ImageDecoderLib/ImageDecoderLib.uni b/MdeModulePkg/Library/ImageDecoderLib/ImageDecoderLib.uni
deleted file mode 100644
index b37a92e..0000000
--- a/MdeModulePkg/Library/ImageDecoderLib/ImageDecoderLib.uni
+++ /dev/null
@@ -1,26 +0,0 @@
-// /** @file
-// This library provides image decoding service by managing the different
-//
-// image decoding libraries.
-//
-// Copyright (c) 2015, 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.
-// The full text of the license may be found at
-// http://opensource.org/licenses/bsd-license.php.
-//
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-//
-// **/
-
-#string STR_MODULE_ABSTRACT
-#language en-US
-"This library provides image decoding service by managing the different"
-
-#string STR_MODULE_DESCRIPTION
-#language en-US
-"image decoding libraries."
-
-
--
2.9.0.windows.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH 0/3] Remove ImageDecoderLib and BmpImageDecoderLib
2016-09-29 3:29 [PATCH 0/3] Remove ImageDecoderLib and BmpImageDecoderLib Ruiyu Ni
` (2 preceding siblings ...)
2016-09-29 3:29 ` [PATCH v2 3/3] MdeModulePkg/ImageDecoderLib: " Ruiyu Ni
@ 2016-09-29 3:50 ` Gao, Liming
2016-09-29 6:17 ` Ni, Ruiyu
3 siblings, 1 reply; 10+ messages in thread
From: Gao, Liming @ 2016-09-29 3:50 UTC (permalink / raw)
To: Ni, Ruiyu, edk2-devel@lists.01.org
Your patch has updated. But, this covert letter is not.
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: Thursday, September 29, 2016 11:29 AM
> To: edk2-devel@lists.01.org
> Subject: [edk2] [PATCH 0/3] Remove ImageDecoderLib and
> BmpImageDecoderLib
>
> The two libraries are created to support old BootLogoLib to
> decode the images. Due to the new BootLogoLib starts using
> HiiImageEx interfaces, the two libraries are not needed.
>
> Ruiyu Ni (3):
> MdeModulePkg/ImageDecoderLib: Retire it due to new BootLogoLib
> MdeModulePkg/BmpImageDecoderLib: Retire it due to new BootLogoLib
> MdeModulePkg: Remove ImageDecoderLib and BmpImageDecoderLib
>
> .../BmpImageDecoderLib/BmpImageDecoderLib.c | 272 ---------------------
> .../BmpImageDecoderLib/BmpImageDecoderLib.inf | 43 ----
> .../BmpImageDecoderLib/BmpImageDecoderLib.uni | 26 --
> .../Library/ImageDecoderLib/ImageDecoderLib.c | 121 ---------
> .../Library/ImageDecoderLib/ImageDecoderLib.inf | 43 ----
> .../Library/ImageDecoderLib/ImageDecoderLib.uni | 26 --
> MdeModulePkg/MdeModulePkg.dec | 4 -
> MdeModulePkg/MdeModulePkg.dsc | 3 -
> 8 files changed, 538 deletions(-)
> delete mode 100644
> MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.c
> delete mode 100644
> MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.inf
> delete mode 100644
> MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.uni
> delete mode 100644
> MdeModulePkg/Library/ImageDecoderLib/ImageDecoderLib.c
> delete mode 100644
> MdeModulePkg/Library/ImageDecoderLib/ImageDecoderLib.inf
> delete mode 100644
> MdeModulePkg/Library/ImageDecoderLib/ImageDecoderLib.uni
>
> --
> 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] 10+ messages in thread* Re: [PATCH 0/3] Remove ImageDecoderLib and BmpImageDecoderLib
2016-09-29 3:50 ` [PATCH 0/3] Remove ImageDecoderLib and BmpImageDecoderLib Gao, Liming
@ 2016-09-29 6:17 ` Ni, Ruiyu
0 siblings, 0 replies; 10+ messages in thread
From: Ni, Ruiyu @ 2016-09-29 6:17 UTC (permalink / raw)
To: Gao, Liming, edk2-devel@lists.01.org
I re-used the old cover letter:)
Regards,
Ray
From: Gao, Liming
Sent: Thursday, September 29, 2016 11:51 AM
To: Ni, Ruiyu <ruiyu.ni@intel.com>; edk2-devel@lists.01.org
Subject: RE: [edk2] [PATCH 0/3] Remove ImageDecoderLib and BmpImageDecoderLib
Your patch has updated. But, this covert letter is not.
Reviewed-by: Liming Gao <liming.gao@intel.com<mailto:liming.gao@intel.com>>
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Ruiyu Ni
> Sent: Thursday, September 29, 2016 11:29 AM
> To: edk2-devel@lists.01.org<mailto:edk2-devel@lists.01.org>
> Subject: [edk2] [PATCH 0/3] Remove ImageDecoderLib and
> BmpImageDecoderLib
>
> The two libraries are created to support old BootLogoLib to
> decode the images. Due to the new BootLogoLib starts using
> HiiImageEx interfaces, the two libraries are not needed.
>
> Ruiyu Ni (3):
> MdeModulePkg/ImageDecoderLib: Retire it due to new BootLogoLib
> MdeModulePkg/BmpImageDecoderLib: Retire it due to new BootLogoLib
> MdeModulePkg: Remove ImageDecoderLib and BmpImageDecoderLib
>
> .../BmpImageDecoderLib/BmpImageDecoderLib.c | 272 ---------------------
> .../BmpImageDecoderLib/BmpImageDecoderLib.inf | 43 ----
> .../BmpImageDecoderLib/BmpImageDecoderLib.uni | 26 --
> .../Library/ImageDecoderLib/ImageDecoderLib.c | 121 ---------
> .../Library/ImageDecoderLib/ImageDecoderLib.inf | 43 ----
> .../Library/ImageDecoderLib/ImageDecoderLib.uni | 26 --
> MdeModulePkg/MdeModulePkg.dec | 4 -
> MdeModulePkg/MdeModulePkg.dsc | 3 -
> 8 files changed, 538 deletions(-)
> delete mode 100644
> MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.c
> delete mode 100644
> MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.inf
> delete mode 100644
> MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.uni
> delete mode 100644
> MdeModulePkg/Library/ImageDecoderLib/ImageDecoderLib.c
> delete mode 100644
> MdeModulePkg/Library/ImageDecoderLib/ImageDecoderLib.inf
> delete mode 100644
> MdeModulePkg/Library/ImageDecoderLib/ImageDecoderLib.uni
>
> --
> 2.9.0.windows.1
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org<mailto:edk2-devel@lists.01.org>
> https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 10+ messages in thread