| Index: src/images/SkDecodingImageGenerator.cpp
|
| diff --git a/src/images/SkDecodingImageGenerator.cpp b/src/images/SkDecodingImageGenerator.cpp
|
| index cce01d2832c611d5160b65061c9ab08b25f8cea3..f9b9393e00705654e9a61677a8874eab61a2dffb 100644
|
| --- a/src/images/SkDecodingImageGenerator.cpp
|
| +++ b/src/images/SkDecodingImageGenerator.cpp
|
| @@ -42,9 +42,9 @@ protected:
|
| *info = fInfo;
|
| return true;
|
| }
|
| - virtual Result onGetPixelsEnum(const SkImageInfo& info,
|
| - void* pixels, size_t rowBytes,
|
| - SkPMColor ctable[], int* ctableCount) SK_OVERRIDE;
|
| + virtual Result onGetPixels(const SkImageInfo& info,
|
| + void* pixels, size_t rowBytes,
|
| + SkPMColor ctable[], int* ctableCount) SK_OVERRIDE;
|
| virtual bool onGetYUV8Planes(SkISize sizes[3], void* planes[3], size_t rowBytes[3],
|
| SkYUVColorSpace* colorSpace) SK_OVERRIDE;
|
|
|
| @@ -147,7 +147,7 @@ SkData* DecodingImageGenerator::onRefEncodedData() {
|
| return SkSafeRef(fData);
|
| }
|
|
|
| -SkImageGenerator::Result DecodingImageGenerator::onGetPixelsEnum(const SkImageInfo& info,
|
| +SkImageGenerator::Result DecodingImageGenerator::onGetPixels(const SkImageInfo& info,
|
| void* pixels, size_t rowBytes, SkPMColor ctableEntries[], int* ctableCount) {
|
| if (fInfo != info) {
|
| // The caller has specified a different info. This is an
|
|
|