Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#226476

Browse Source 
r=pedemonte, sr=blizzard (platform specific), a=mkaply
Bad structure/bitfield definitions causing icons not to work


git-svn-id: svn://10.0.0.236/trunk@149691 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mkaply%us.ibm.com 2003-11-24 22:05:11 +00:00
parent 26a48f4560
commit 4efc3d6f3e
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mozilla/modules/libpr0n/decoders/icon/os2/nsIconChannel.cpp
View File

@ -56,12 +56,9 @@
#define SHGFI_LARGEICON 0x0004
#define SHGFI_SMALLICON 0x0008
// Used for 4 bips per pel
typedef struct _PELLPAIR
{ // Due to byte swap the second is first of the pair
INT SecondPel:4;
INT FirstPel:4;
} PELPAIR, *PPELPAIR;
// Due to byte swap the second is first of the pair
#define FIRSTPEL(x) (0xF & (x >> 4))
#define SECONDPEL(x) (0xF & x)
// forward declarations of a couple of helper methods.
// Takes a bitmap from the windows registry and converts it into 4 byte RGB data.
@ -241,7 +238,7 @@ void ConvertColorBitMap(PBYTE buffer, PBITMAPINFO2 pBitMapInfo, nsCString& iconB
if (pBitMapInfo->cBitCount == 4 ||
pBitMapInfo->cBitCount == 8 )
{
PPELPAIR pPelPair;
PBYTE pPelPair;
PBYTE pPel;
if (pBitMapInfo->cBitCount == 4)
{
@ -253,15 +250,15 @@ void ConvertColorBitMap(PBYTE buffer, PBITMAPINFO2 pBitMapInfo, nsCString& iconB
}
for (INT j = 0; j < pBitMapInfo->cy; j++) //Number of rows
{
pPelPair = (PPELPAIR)buffer;
pPelPair = buffer;
pPel = (PBYTE)buffer;
for(INT i = 0; i < iIter; i++)
{
if (pBitMapInfo->cBitCount == 4)
{
AddBGR(&pColorTable[pPelPair->FirstPel], iconBuffer);
AddBGR(&pColorTable[pPelPair->SecondPel], iconBuffer);
AddBGR(&pColorTable[FIRSTPEL(*pPelPair)], iconBuffer);
AddBGR(&pColorTable[SECONDPEL(*pPelPair)], iconBuffer);
pPelPair++;
}
else