| Index: include/core/SkImageGenerator.h
|
| diff --git a/include/core/SkImageGenerator.h b/include/core/SkImageGenerator.h
|
| index 5f8f5ba8fbb5a6632ac6b28a0ab0e5241a29d94a..9760205c64f8069b25633fe7dee1e9f0af0140fe 100644
|
| --- a/include/core/SkImageGenerator.h
|
| +++ b/include/core/SkImageGenerator.h
|
| @@ -67,17 +67,7 @@ public:
|
| /**
|
| * Return the ImageInfo associated with this generator.
|
| */
|
| -#ifdef SK_SUPPORT_LEGACY_BOOL_ONGETINFO
|
| - SkImageInfo getInfo();
|
| - bool getInfo(SkImageInfo* info) {
|
| - if (info) {
|
| - *info = this->getInfo();
|
| - }
|
| - return true;
|
| - }
|
| -#else
|
| const SkImageInfo& getInfo() const { return fInfo; }
|
| -#endif
|
|
|
| /**
|
| * Used to describe the result of a call to getPixels().
|
| @@ -210,10 +200,6 @@ public:
|
| static SkImageGenerator* NewFromData(SkData*);
|
|
|
| protected:
|
| -#ifdef SK_SUPPORT_LEGACY_BOOL_ONGETINFO
|
| - SkImageGenerator() : fInfo(SkImageInfo::MakeUnknown(0, 0) ) {}
|
| - virtual bool onGetInfo(SkImageInfo* info);
|
| -#endif
|
| SkImageGenerator(const SkImageInfo& info) : fInfo(info) {}
|
|
|
| virtual SkData* onRefEncodedData();
|
|
|