| Index: src/codec/SkPngCodec.cpp
|
| diff --git a/src/codec/SkPngCodec.cpp b/src/codec/SkPngCodec.cpp
|
| index 30fffe11636bfd100f1dea23dd453316937d1ebd..a52d0ec2a61304dbc6d0c96381c74a940bbbc0f3 100644
|
| --- a/src/codec/SkPngCodec.cpp
|
| +++ b/src/codec/SkPngCodec.cpp
|
| @@ -272,8 +272,9 @@ bool SkPngCodec::createColorTable(const SkImageInfo& dstInfo, int* ctableCount)
|
| SkColorSpaceXform::kBGRA_8888_ColorFormat;
|
| SkAlphaType xformAlphaType = select_xform_alpha(dstInfo.alphaType(),
|
| this->getInfo().alphaType());
|
| - fColorXform->apply(colorTable, colorTable, numColors, xformColorFormat,
|
| - SkColorSpaceXform::kRGBA_8888_ColorFormat, xformAlphaType);
|
| + SkAssertResult(fColorXform->apply(xformColorFormat, colorTable,
|
| + SkColorSpaceXform::kRGBA_8888_ColorFormat, colorTable,
|
| + numColors, xformAlphaType));
|
| }
|
|
|
| // Pad the color table with the last color in the table (or black) in the case that
|
| @@ -500,13 +501,13 @@ void SkPngCodec::applyXformRow(void* dst, const void* src) {
|
| fSwizzler->swizzle(dst, (const uint8_t*) src);
|
| break;
|
| case kColorOnly_XformMode:
|
| - fColorXform->apply(dst, (const uint32_t*) src, fXformWidth, fXformColorFormat,
|
| - srcColorFormat, fXformAlphaType);
|
| + SkAssertResult(fColorXform->apply(fXformColorFormat, dst, srcColorFormat, src,
|
| + fXformWidth, fXformAlphaType));
|
| break;
|
| case kSwizzleColor_XformMode:
|
| fSwizzler->swizzle(fColorXformSrcRow, (const uint8_t*) src);
|
| - fColorXform->apply(dst, fColorXformSrcRow, fXformWidth, fXformColorFormat,
|
| - srcColorFormat, fXformAlphaType);
|
| + SkAssertResult(fColorXform->apply(fXformColorFormat, dst, srcColorFormat, fColorXformSrcRow,
|
| + fXformWidth, fXformAlphaType));
|
| break;
|
| }
|
| }
|
|
|