Chromium Code Reviews| Index: src/images/SkImageDecoder_libgif.cpp |
| diff --git a/src/images/SkImageDecoder_libgif.cpp b/src/images/SkImageDecoder_libgif.cpp |
| index 08f37efced9fc8bdee36b286dc52ad44f06ac028..730f52f434f15d1bc47776e6feef1080039260b5 100644 |
| --- a/src/images/SkImageDecoder_libgif.cpp |
| +++ b/src/images/SkImageDecoder_libgif.cpp |
| @@ -248,10 +248,10 @@ bool SkGIFImageDecoder::onDecode(SkStream* sk_stream, SkBitmap* bm, Mode mode) { |
| if (NULL == cmap) { |
| return error_return(gif, *bm, "null cmap"); |
| } |
| - |
| colorCount = cmap->ColorCount; |
| - SkAutoTMalloc<SkPMColor> colorStorage(colorCount); |
| - SkPMColor* colorPtr = colorStorage.get(); |
| + |
| + SkPMColor colorPtr[256]; // storage for worst-case |
|
djsollen
2013/10/09 15:42:18
we should assert that colorCount is not greater th
reed1
2013/10/09 15:51:25
Done.
|
| + SkAlphaType alphaType = kOpaque_SkAlphaType; |
|
djsollen
2013/10/09 15:42:18
is it safe to assume always opaque without checkin
reed1
2013/10/09 15:51:25
That is detected on line 266
|
| for (int index = 0; index < colorCount; index++) { |
| colorPtr[index] = SkPackARGB32(0xFF, |
| cmap->Colors[index].Red, |
| @@ -263,10 +263,12 @@ bool SkGIFImageDecoder::onDecode(SkStream* sk_stream, SkBitmap* bm, Mode mode) { |
| bool reallyHasAlpha = transpIndex >= 0; |
| if (reallyHasAlpha) { |
| colorPtr[transpIndex] = SK_ColorTRANSPARENT; // ram in a transparent SkPMColor |
| + alphaType = kPremul_SkAlphaType; |
| } |
| - SkAutoTUnref<SkColorTable> ctable(SkNEW_ARGS(SkColorTable, (colorPtr, colorCount))); |
| - ctable->setIsOpaque(!reallyHasAlpha); |
| + SkAutoTUnref<SkColorTable> ctable(SkNEW_ARGS(SkColorTable, |
| + (colorPtr, colorCount, |
| + alphaType))); |
| if (!this->allocPixelRef(bm, ctable)) { |
| return error_return(gif, *bm, "allocPixelRef"); |
| } |