diff options
Diffstat (limited to 'src/core/SkBitmap.cpp')
| -rw-r--r-- | src/core/SkBitmap.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp index 316878bad0..e525ea2f1d 100644 --- a/src/core/SkBitmap.cpp +++ b/src/core/SkBitmap.cpp @@ -1292,6 +1292,7 @@ enum { }; void SkBitmap::legacyUnflatten(SkReadBuffer& buffer) { +#ifdef SK_SUPPORT_LEGACY_PIXELREF_UNFLATTENABLE this->reset(); SkImageInfo info; @@ -1317,7 +1318,7 @@ void SkBitmap::legacyUnflatten(SkReadBuffer& buffer) { origin.fX = buffer.readInt(); origin.fY = buffer.readInt(); size_t offset = origin.fY * rowBytes + origin.fX * info.bytesPerPixel(); - SkPixelRef* pr = buffer.readPixelRef(); + SkPixelRef* pr = buffer.readFlattenable<SkPixelRef>(); if (!buffer.validate((NULL == pr) || (pr->getAllocatedSizeInBytes() >= (offset + this->getSafeSize())))) { origin.setZero(); @@ -1332,6 +1333,9 @@ void SkBitmap::legacyUnflatten(SkReadBuffer& buffer) { sk_throw(); } } +#else + sk_throw(); +#endif } /////////////////////////////////////////////////////////////////////////////// |