Upstream
/
CloverBootloader
mirror of https://github.com/CloverHackyColor/CloverBootloader.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Include bmp instead of re-defining to avoid broken compilation of unit 

tests
This commit is contained in:
jief 2023-11-20 19:57:30 +01:00
parent 23d5c632d1
commit 485a77a65e
1 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
Protocols/AppleImageCodec/load_bmp.c
View File

@ -35,41 +35,42 @@
*/
//#include "libegint.h"
#include <IndustryStandard/Bmp.h>
#include "picopng.h"
#define DBG(...)
// BMP structures
#pragma pack(1)
typedef struct {
UINT8 Blue;
UINT8 Green;
UINT8 Red;
UINT8 Alpha;
} BMP_COLOR_MAP;
typedef struct {
CHAR8 CharB;
CHAR8 CharM;
UINT32 Size;
UINT16 Reserved[2];
UINT32 ImageOffset;
UINT32 HeaderSize;
INT32 PixelWidth;
INT32 PixelHeight;
UINT16 Planes; // Must be 1
UINT16 BitPerPixel; // 1, 4, 8, 24, or 32
UINT32 CompressionType;
UINT32 ImageSize; // Compressed image size in bytes
UINT32 XPixelsPerMeter;
UINT32 YPixelsPerMeter;
UINT32 NumberOfColors;
UINT32 ImportantColors;
} BMP_IMAGE_HEADER;
#pragma pack()
//#pragma pack(1)
//
//typedef struct {
// UINT8 Blue;
// UINT8 Green;
// UINT8 Red;
// UINT8 Alpha;
//} BMP_COLOR_MAP;
//
//typedef struct {
// CHAR8 CharB;
// CHAR8 CharM;
// UINT32 Size;
// UINT16 Reserved[2];
// UINT32 ImageOffset;
// UINT32 HeaderSize;
// INT32 PixelWidth;
// INT32 PixelHeight;
// UINT16 Planes; // Must be 1
// UINT16 BitPerPixel; // 1, 4, 8, 24, or 32
// UINT32 CompressionType;
// UINT32 ImageSize; // Compressed image size in bytes
// UINT32 XPixelsPerMeter;
// UINT32 YPixelsPerMeter;
// UINT32 NumberOfColors;
// UINT32 ImportantColors;
//} BMP_IMAGE_HEADER;
//
//#pragma pack()
//
// Load BMP image
@ -80,8 +81,7 @@ EG_IMAGE * egDecodeBMP(IN UINT8 *FileData, IN UINTN FileDataLength, IN BOOLEAN W
EG_IMAGE *NewImage;
BMP_IMAGE_HEADER *BmpHeader;
BMP_COLOR_MAP *BmpColorMap;
INT32 x, y;
INT32 RealPixelHeight, RealPixelWidth;
UINT32 RealPixelHeight, RealPixelWidth;
UINT8 *ImagePtr;
UINT8 *ImagePtrBase;
UINTN ImageLineOffset;
@ -132,7 +132,7 @@ EG_IMAGE * egDecodeBMP(IN UINT8 *FileData, IN UINTN FileDataLength, IN BOOLEAN W
// convert image
BmpColorMap = (BMP_COLOR_MAP *)(FileData + sizeof(BMP_IMAGE_HEADER));
ImagePtrBase = FileData + BmpHeader->ImageOffset;
for (y = 0; y < RealPixelHeight; y++) {
for (UINT32 y = 0; y < RealPixelHeight; y++) {
ImagePtr = ImagePtrBase;
ImagePtrBase += ImageLineOffset;
// vertically mirror
@ -145,7 +145,7 @@ EG_IMAGE * egDecodeBMP(IN UINT8 *FileData, IN UINTN FileDataLength, IN BOOLEAN W
switch (BmpHeader->BitPerPixel) {
case 1:
for (x = 0; x < RealPixelWidth; x++) {
for (UINT32 x = 0; x < RealPixelWidth; x++) {
BitIndex = x & 0x07;
if (BitIndex == 0)
ImageValue = *ImagePtr++;
@ -160,6 +160,8 @@ EG_IMAGE * egDecodeBMP(IN UINT8 *FileData, IN UINTN FileDataLength, IN BOOLEAN W
break;
case 4:
{
UINT32 x;
for (x = 0; x <= RealPixelWidth - 2; x += 2) {
ImageValue = *ImagePtr++;
@ -188,9 +190,9 @@ EG_IMAGE * egDecodeBMP(IN UINT8 *FileData, IN UINTN FileDataLength, IN BOOLEAN W
PixelPtr++;
}
break;
}
case 8:
for (x = 0; x < RealPixelWidth; x++) {
for (UINT32 x = 0; x < RealPixelWidth; x++) {
Index = *ImagePtr++;
PixelPtr->Blue = BmpColorMap[Index].Blue;
PixelPtr->Green = BmpColorMap[Index].Green;
@ -201,7 +203,7 @@ EG_IMAGE * egDecodeBMP(IN UINT8 *FileData, IN UINTN FileDataLength, IN BOOLEAN W
break;
case 24:
for (x = 0; x < RealPixelWidth; x++) {
for (UINT32 x = 0; x < RealPixelWidth; x++) {
PixelPtr->Blue = *ImagePtr++;
PixelPtr->Green = *ImagePtr++;
PixelPtr->Red = *ImagePtr++;
@ -210,7 +212,7 @@ EG_IMAGE * egDecodeBMP(IN UINT8 *FileData, IN UINTN FileDataLength, IN BOOLEAN W
}
break;
case 32:
for (x = 0; x < RealPixelWidth; x++) {
for (UINT32 x = 0; x < RealPixelWidth; x++) {
PixelPtr->Blue = *ImagePtr++;
PixelPtr->Green = *ImagePtr++;
PixelPtr->Red = *ImagePtr++;