diff options
| -rw-r--r-- | include/core/SkBitmap.h | 1 | ||||
| -rw-r--r-- | src/core/SkBitmap.cpp | 9 |
2 files changed, 3 insertions, 7 deletions
diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h index c95accb808..0e847f2a4c 100644 --- a/include/core/SkBitmap.h +++ b/include/core/SkBitmap.h @@ -726,7 +726,6 @@ private: enum Flags { kImageIsVolatile_Flag = 0x02, - kImageIsImmutable_Flag = 0x04, #ifdef SK_BUILD_FOR_ANDROID /* A hint for the renderer responsible for drawing this bitmap * indicating that it should attempt to use mipmaps when this bitmap diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp index 1d68aee975..e675db2800 100644 --- a/src/core/SkBitmap.cpp +++ b/src/core/SkBitmap.cpp @@ -486,15 +486,12 @@ bool SkBitmap::copyPixelsTo(void* const dst, size_t dstSize, /////////////////////////////////////////////////////////////////////////////// bool SkBitmap::isImmutable() const { - return fPixelRef ? fPixelRef->isImmutable() : - fFlags & kImageIsImmutable_Flag; + return fPixelRef ? fPixelRef->isImmutable() : false; } void SkBitmap::setImmutable() { if (fPixelRef) { fPixelRef->setImmutable(); - } else { - fFlags |= kImageIsImmutable_Flag; } } @@ -1332,11 +1329,11 @@ void SkBitmap::validate() const { } SkASSERT(fInfo.validRowBytes(fRowBytes)); - uint8_t allFlags = kImageIsVolatile_Flag | kImageIsImmutable_Flag; + uint8_t allFlags = kImageIsVolatile_Flag; #ifdef SK_BUILD_FOR_ANDROID allFlags |= kHasHardwareMipMap_Flag; #endif - SkASSERT(fFlags <= allFlags); + SkASSERT((~allFlags & fFlags) == 0); SkASSERT(fPixelLockCount >= 0); if (fPixels) { |