| Index: src/ports/SkImageGenerator_skia.cpp
|
| diff --git a/src/ports/SkImageGenerator_skia.cpp b/src/ports/SkImageGenerator_skia.cpp
|
| index 1448d57ce57cf2f6340a71041d095a3b1a7219c0..6938880357356271eb6aab8d20f0f570946d90a1 100644
|
| --- a/src/ports/SkImageGenerator_skia.cpp
|
| +++ b/src/ports/SkImageGenerator_skia.cpp
|
| @@ -39,7 +39,7 @@ class SkImageDecoderGenerator : public SkImageGenerator {
|
|
|
| public:
|
| SkImageDecoderGenerator(const SkImageInfo& info, SkImageDecoder* decoder, SkData* data)
|
| - : fInfo(info), fDecoder(decoder), fData(SkRef(data))
|
| + : INHERITED(info), fInfo(info), fDecoder(decoder), fData(SkRef(data))
|
| {}
|
|
|
| protected:
|
| @@ -47,10 +47,12 @@ protected:
|
| return SkRef(fData.get());
|
| }
|
|
|
| +#ifdef SK_SUPPORT_LEGACY_BOOL_ONGETINFO
|
| virtual bool onGetInfo(SkImageInfo* info) SK_OVERRIDE {
|
| *info = fInfo;
|
| return true;
|
| }
|
| +#endif
|
|
|
| virtual Result onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes,
|
| const Options&,
|
| @@ -92,7 +94,9 @@ protected:
|
| SkMemoryStream stream(fData->data(), fData->size(), false);
|
| return fDecoder->decodeYUV8Planes(&stream, sizes, planes, rowBytes, colorSpace);
|
| }
|
| -
|
| +
|
| +private:
|
| + typedef SkImageGenerator INHERITED;
|
| };
|
|
|
| SkImageGenerator* SkImageGenerator::NewFromData(SkData* data) {
|
|
|