| Index: src/core/SkImageGenerator.cpp
|
| diff --git a/src/core/SkImageGenerator.cpp b/src/core/SkImageGenerator.cpp
|
| index f18dce2d2faeec86299d4c906445dc78146020f6..36caae99c382b6b7480be2066693c963e18d93a3 100644
|
| --- a/src/core/SkImageGenerator.cpp
|
| +++ b/src/core/SkImageGenerator.cpp
|
| @@ -112,19 +112,8 @@ SkData* SkImageGenerator::onRefEncodedData() {
|
| return NULL;
|
| }
|
|
|
| -#ifdef SK_SUPPORT_LEGACY_OPTIONLESS_GET_PIXELS
|
| -SkImageGenerator::Result SkImageGenerator::onGetPixels(const SkImageInfo&, void*, size_t,
|
| - SkPMColor*, int*) {
|
| - return kUnimplemented;
|
| -}
|
| -#endif
|
| -
|
| SkImageGenerator::Result SkImageGenerator::onGetPixels(const SkImageInfo& info, void* dst,
|
| size_t rb, const Options& options,
|
| SkPMColor* colors, int* colorCount) {
|
| -#ifdef SK_SUPPORT_LEGACY_OPTIONLESS_GET_PIXELS
|
| - return this->onGetPixels(info, dst, rb, colors, colorCount);
|
| -#else
|
| return kUnimplemented;
|
| -#endif
|
| }
|
|
|