TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

x11: fix loading 24-bpp ico/cur image alpha with width 24

Browse Source
This commit is contained in:
rdb 2017-08-29 23:51:15 +02:00
parent c66b4792d7
commit a925e0bcd9
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
panda/src/x11display/x11GraphicsWindow.cxx
View File

@ -2280,9 +2280,11 @@ read_ico(istream &ico) {
if (!ico.good()) goto cleanup; if (!ico.good()) goto cleanup;
} }
int and_stride = ((infoHeader.width >> 3) + 3) & ~0x03;
// Read in the pixel data. // Read in the pixel data.
xorBmpSize = (infoHeader.width * (infoHeader.height / 2) * bitsPerPixel) / 8; xorBmpSize = (infoHeader.width * (infoHeader.height / 2) * bitsPerPixel) / 8;
andBmpSize = (infoHeader.width * (infoHeader.height / 2)) / 8; andBmpSize = and_stride * (infoHeader.height / 2);
curXor = xorBmp = new char[xorBmpSize]; curXor = xorBmp = new char[xorBmpSize];
curAnd = andBmp = new char[andBmpSize]; curAnd = andBmp = new char[andBmpSize];
ico.read(xorBmp, xorBmpSize); ico.read(xorBmp, xorBmpSize);
@ -2330,21 +2332,15 @@ read_ico(istream &ico) {
// Pack each of the three bytes into a single color, BGR -> 0RGB // Pack each of the three bytes into a single color, BGR -> 0RGB
for (i = image->height - 1; i >= 0; i--) { for (i = image->height - 1; i >= 0; i--) {
for (j = 0; j < image->width; j++) { for (j = 0; j < image->width; j++) {
image->pixels[(i * image->width) + j] = (*(curXor + 2) << 16) + shift = 7 - (j & 0x7);
(*(curXor + 1) << 8) + (*curXor); uint32_t alpha = (curAnd[j >> 3] & (1 << shift)) ? 0 : 0xff000000U;
image->pixels[(i * image->width) + j] = (uint8_t)curXor[0]
| ((uint8_t)curXor[1] << 8u)
| ((uint8_t)curXor[2] << 16u)
| alpha;
curXor += 3; curXor += 3;
} }
curAnd += and_stride;
// Set the alpha byte properly according to the andBmp.
for (j = 0; j < image->width; j += 8) {
for (k = 0; k < 8; k++) {
shift = 7 - k;
image->pixels[(i * image->width) + j + k] |=
((*curAnd & (1 << shift)) >> shift) ? 0x0 : (0xff << 24);
}
curAnd++;
}
} }
break; break;