| Index: include/codec/SkCodec.h
|
| diff --git a/include/codec/SkCodec.h b/include/codec/SkCodec.h
|
| index 7337006769e13afdb72d77ccc1f8ea77e1d5c7af..cbfceb395be75147fa80e5575b37f34c721586ad 100644
|
| --- a/include/codec/SkCodec.h
|
| +++ b/include/codec/SkCodec.h
|
| @@ -109,7 +109,11 @@ protected:
|
|
|
| virtual SkISize onGetScaledDimensions(float /* desiredScale */) const {
|
| // By default, scaling is not supported.
|
| +#ifdef SK_SUPPORT_LEGACY_BOOL_ONGETINFO
|
| return fInfo.dimensions();
|
| +#else
|
| + return this->getInfo().dimensions();
|
| +#endif
|
| }
|
|
|
| virtual SkEncodedFormat onGetEncodedFormat() const = 0;
|
| @@ -156,7 +160,9 @@ protected:
|
| }
|
|
|
| private:
|
| +#ifdef SK_SUPPORT_LEGACY_BOOL_ONGETINFO
|
| const SkImageInfo fInfo;
|
| +#endif // SK_SUPPORT_LEGACY_BOOL_ONGETINFO
|
| SkAutoTDelete<SkStream> fStream;
|
| bool fNeedsRewind;
|
| SkAutoTDelete<SkScanlineDecoder> fScanlineDecoder;
|
|
|