diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/core/SkBitmap.cpp | 23 | ||||
-rw-r--r-- | src/core/SkReadBuffer.cpp | 2 | ||||
-rw-r--r-- | src/effects/SkBitmapSource.cpp | 2 |
3 files changed, 3 insertions, 24 deletions
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp index 3cd2a79b28..cc3c165a3a 100644 --- a/src/core/SkBitmap.cpp +++ b/src/core/SkBitmap.cpp @@ -1347,28 +1347,7 @@ enum { SERIALIZE_PIXELTYPE_REF_DATA }; -#ifdef SK_SUPPORT_LEGACY_BITMAPFLATTEN -void SkBitmap::flatten(SkWriteBuffer& buffer) const { - fInfo.flatten(buffer); - buffer.writeInt(fRowBytes); - - if (fPixelRef) { - if (fPixelRef->getFactory()) { - buffer.writeInt(SERIALIZE_PIXELTYPE_REF_DATA); - buffer.writeInt(fPixelRefOrigin.fX); - buffer.writeInt(fPixelRefOrigin.fY); - buffer.writeFlattenable(fPixelRef); - return; - } - // if we get here, we can't record the pixels - buffer.writeInt(SERIALIZE_PIXELTYPE_NONE); - } else { - buffer.writeInt(SERIALIZE_PIXELTYPE_NONE); - } -} -#endif - -void SkBitmap::unflatten(SkReadBuffer& buffer) { +void SkBitmap::legacyUnflatten(SkReadBuffer& buffer) { this->reset(); SkImageInfo info; diff --git a/src/core/SkReadBuffer.cpp b/src/core/SkReadBuffer.cpp index 3f21078b1f..88894d13ab 100644 --- a/src/core/SkReadBuffer.cpp +++ b/src/core/SkReadBuffer.cpp @@ -266,7 +266,7 @@ bool SkReadBuffer::readBitmap(SkBitmap* bitmap) { // A size of zero means the SkBitmap was simply flattened. if (this->isVersionLT(kNoMoreBitmapFlatten_Version)) { SkBitmap tmp; - tmp.unflatten(*this); + tmp.legacyUnflatten(*this); // just throw this guy away } else { if (SkBitmap::ReadRawPixels(this, bitmap)) { diff --git a/src/effects/SkBitmapSource.cpp b/src/effects/SkBitmapSource.cpp index 79f6e92c1d..d8d4329e65 100644 --- a/src/effects/SkBitmapSource.cpp +++ b/src/effects/SkBitmapSource.cpp @@ -28,7 +28,7 @@ SkBitmapSource::SkBitmapSource(const SkBitmap& bitmap, const SkRect& srcRect, co SkBitmapSource::SkBitmapSource(SkReadBuffer& buffer) : INHERITED(0, buffer) { if (buffer.isVersionLT(SkReadBuffer::kNoMoreBitmapFlatten_Version)) { - fBitmap.unflatten(buffer); + fBitmap.legacyUnflatten(buffer); } else { buffer.readBitmap(&fBitmap); } |