| Index: include/core/SkImageGenerator.h
|
| diff --git a/include/core/SkImageGenerator.h b/include/core/SkImageGenerator.h
|
| index fc6b1b4421443dedec199176b165235de8abf7e4..cd6c373f407dc3099a5f64717092f6c764e62e79 100644
|
| --- a/include/core/SkImageGenerator.h
|
| +++ b/include/core/SkImageGenerator.h
|
| @@ -48,13 +48,6 @@ public:
|
| */
|
| virtual ~SkImageGenerator() { }
|
|
|
| -#ifdef SK_SUPPORT_LEGACY_IMAGEGENERATORAPI
|
| - virtual SkData* refEncodedData() { return this->onRefEncodedData(); }
|
| - virtual bool getInfo(SkImageInfo* info) { return this->onGetInfo(info); }
|
| - virtual bool getPixels(const SkImageInfo& info, void* pixels, size_t rowBytes) {
|
| - return this->onGetPixels(info, pixels, rowBytes, NULL, NULL);
|
| - }
|
| -#else
|
| /**
|
| * Return a ref to the encoded (i.e. compressed) representation,
|
| * of this data.
|
| @@ -108,7 +101,6 @@ public:
|
| * Simplified version of getPixels() that asserts that info is NOT kIndex8_SkColorType.
|
| */
|
| bool getPixels(const SkImageInfo& info, void* pixels, size_t rowBytes);
|
| -#endif
|
|
|
| /**
|
| * If planes or rowBytes is NULL or if any entry in planes is NULL or if any entry in rowBytes
|
|
|