commit d6cd36570b5f18182c711532172cf233a41e643f
author Derek Sollenberger <djsollen@google.com> Tue Sep 06 11:32:59 2011 -0400
committer Derek Sollenberger <djsollen@google.com> Tue Sep 06 11:32:59 2011 -0400
tree 6aeae35ab4d465561462dedb8f958c2e8bb2e276
parent 625011e20eff7e57289d0bff45f74d16c476bf3f

Ignore the alpha bit for 32-bit ico images.

The 32-bit images have a full alpha channel so a dedicated alpha
bit is unecessary. This CL mirrors an identical change in Skia...

http://code.google.com/p/skia/source/detail?spec=svn2187&r=2051

bug: 5003756
Change-Id: Id3eab2e12aa49c0193d87df255a78758ba080d60

src/images/SkImageDecoder_libico.cpp

diff --git a/src/images/SkImageDecoder_libico.cpp b/src/images/SkImageDecoder_libico.cpp
index 52e9e4f..45d863a 100644
--- a/src/images/SkImageDecoder_libico.cpp
+++ b/src/images/SkImageDecoder_libico.cpp
@@ -363,6 +363,9 @@
     int green = readByte(buf, xorOffset + 4*pixelNo + 1);
     int red = readByte(buf, xorOffset + 4*pixelNo + 2);
     int alphaBit = (alphaByte & m) >> shift;
+#if 1 // don't trust the alphaBit for 32bit images <mrr>
+    alphaBit = 0;
+#endif
     int alpha = readByte(buf, xorOffset + 4*pixelNo + 3) & ((alphaBit-1)&0xFF);
     *address = SkPreMultiplyARGB(alpha, red, green, blue);
 }