| Index: src/core/SkImageGenerator.cpp
|
| diff --git a/src/core/SkImageGenerator.cpp b/src/core/SkImageGenerator.cpp
|
| index 08c133d925aba4a24dcd2494c68bae9c2266da9e..f18dce2d2faeec86299d4c906445dc78146020f6 100644
|
| --- a/src/core/SkImageGenerator.cpp
|
| +++ b/src/core/SkImageGenerator.cpp
|
| @@ -7,16 +7,6 @@
|
|
|
| #include "SkImageGenerator.h"
|
|
|
| -#ifdef SK_SUPPORT_LEGACY_BOOL_ONGETINFO
|
| -SkImageInfo SkImageGenerator::getInfo() {
|
| - SkImageInfo info;
|
| - if (!this->onGetInfo(&info)) {
|
| - info = SkImageInfo::MakeUnknown(0, 0);
|
| - }
|
| - return info;
|
| -}
|
| -#endif
|
| -
|
| SkImageGenerator::Result SkImageGenerator::getPixels(const SkImageInfo& info, void* pixels,
|
| size_t rowBytes, const Options* options,
|
| SkPMColor ctable[], int* ctableCount) {
|
| @@ -122,15 +112,6 @@ SkData* SkImageGenerator::onRefEncodedData() {
|
| return NULL;
|
| }
|
|
|
| -#ifdef SK_SUPPORT_LEGACY_BOOL_ONGETINFO
|
| -bool SkImageGenerator::onGetInfo(SkImageInfo* info) {
|
| - if (info) {
|
| - *info = fInfo;
|
| - }
|
| - return true;
|
| -}
|
| -#endif
|
| -
|
| #ifdef SK_SUPPORT_LEGACY_OPTIONLESS_GET_PIXELS
|
| SkImageGenerator::Result SkImageGenerator::onGetPixels(const SkImageInfo&, void*, size_t,
|
| SkPMColor*, int*) {
|
|
|