Index: src/images/SkDecodingImageGenerator.cpp |
diff --git a/src/images/SkDecodingImageGenerator.cpp b/src/images/SkDecodingImageGenerator.cpp |
index 170397dda15c01103395df0c42312028237485ad..337a96407b86b675ff227319b9ac98ac4d1c9c57 100644 |
--- a/src/images/SkDecodingImageGenerator.cpp |
+++ b/src/images/SkDecodingImageGenerator.cpp |
@@ -38,10 +38,12 @@ public: |
protected: |
SkData* onRefEncodedData() SK_OVERRIDE; |
+#ifdef SK_SUPPORT_LEGACY_BOOL_ONGETINFO |
bool onGetInfo(SkImageInfo* info) SK_OVERRIDE { |
*info = fInfo; |
return true; |
} |
+#endif |
virtual Result onGetPixels(const SkImageInfo& info, |
void* pixels, size_t rowBytes, const Options&, |
SkPMColor ctable[], int* ctableCount) SK_OVERRIDE; |
@@ -116,7 +118,8 @@ DecodingImageGenerator::DecodingImageGenerator( |
const SkImageInfo& info, |
int sampleSize, |
bool ditherImage) |
- : fData(data) |
+ : INHERITED(info) |
+ , fData(data) |
, fStream(stream) |
, fInfo(info) |
, fSampleSize(sampleSize) |