forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix PNG with palette and transparency - close #118

This commit is contained in:
Vadim Lopatin 2015-12-16 15:40:19 +03:00
parent 301127262b
commit 7178d09630
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
3rdparty/dimage/png.d vendored
View File

@ -365,7 +365,9 @@ Compound!(SuperImage, string) loadPNG(
ubyte[] buffer = zlibDecoder.buffer; ubyte[] buffer = zlibDecoder.buffer;
version(PNGDebug) writefln("buffer.length = %s", buffer.length); version(PNGDebug) writefln("buffer.length = %s", buffer.length);
bool transparencyPalette;
// create image // create image
if (hdr.colorType == ColorType.Greyscale) if (hdr.colorType == ColorType.Greyscale)
{ {
@ -397,9 +399,10 @@ Compound!(SuperImage, string) loadPNG(
} }
else if (hdr.colorType == ColorType.Palette) else if (hdr.colorType == ColorType.Palette)
{ {
if (transparency.length > 0) if (transparency.length > 0) {
img = imgFac.createImage(hdr.width, hdr.height, 4, 8); img = imgFac.createImage(hdr.width, hdr.height, 4, 8);
else transparencyPalette = true;
} else
img = imgFac.createImage(hdr.width, hdr.height, 3, 8); img = imgFac.createImage(hdr.width, hdr.height, 3, 8);
} }
else else
@ -549,7 +552,7 @@ Compound!(SuperImage, string) loadPNG(
} }
else if (hdr.colorType == ColorType.Palette) else if (hdr.colorType == ColorType.Palette)
{ {
if (transparency.length > 0) { if (transparencyPalette) {
for (int i = 0; i < img.length; i++) { for (int i = 0; i < img.length; i++) {
img.data[i] = ((cast(uint)buffer[bufindex])<<16) | ((cast(uint)buffer[bufindex + 1])<<8) | ((cast(uint)buffer[bufindex + 2])<<0) | ((cast(uint)buffer[bufindex + 3])<<24); img.data[i] = ((cast(uint)buffer[bufindex])<<16) | ((cast(uint)buffer[bufindex + 1])<<8) | ((cast(uint)buffer[bufindex + 2])<<0) | ((cast(uint)buffer[bufindex + 3])<<24);
bufindex += 4; bufindex += 4;