diff options
| -rw-r--r-- | include/core/SkPixelRef.h | 4 | ||||
| -rw-r--r-- | src/core/SkBitmapDevice.cpp | 2 | ||||
| -rw-r--r-- | src/core/SkMallocPixelRef.cpp | 2 | ||||
| -rw-r--r-- | src/core/SkPixelRef.cpp | 4 | ||||
| -rw-r--r-- | src/lazy/SkCachingPixelRef.cpp | 4 | ||||
| -rw-r--r-- | src/lazy/SkDiscardablePixelRef.cpp | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/include/core/SkPixelRef.h b/include/core/SkPixelRef.h index a332b76a5d..4811435721 100644 --- a/include/core/SkPixelRef.h +++ b/include/core/SkPixelRef.h @@ -77,14 +77,14 @@ public: void* fPixels; SkColorTable* fColorTable; size_t fRowBytes; - + void zero() { sk_bzero(this, sizeof(*this)); } bool isZero() const { return NULL == fPixels && NULL == fColorTable && 0 == fRowBytes; } }; - + /** * Returns true if the lockcount > 0 */ diff --git a/src/core/SkBitmapDevice.cpp b/src/core/SkBitmapDevice.cpp index 368c807511..0570fd9afd 100644 --- a/src/core/SkBitmapDevice.cpp +++ b/src/core/SkBitmapDevice.cpp @@ -27,7 +27,7 @@ SkBitmapDevice::SkBitmapDevice(const SkBitmap& bitmap, const SkDeviceProperties& void SkBitmapDevice::init(SkBitmap::Config config, int width, int height, bool isOpaque) { fBitmap.setConfig(config, width, height, 0, isOpaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType); - + if (SkBitmap::kNo_Config != config) { if (!fBitmap.allocPixels()) { // indicate failure by zeroing our bitmap diff --git a/src/core/SkMallocPixelRef.cpp b/src/core/SkMallocPixelRef.cpp index c86d33bf18..53042d263d 100644 --- a/src/core/SkMallocPixelRef.cpp +++ b/src/core/SkMallocPixelRef.cpp @@ -174,7 +174,7 @@ SkMallocPixelRef::SkMallocPixelRef(const SkImageInfo& info, void* storage, fCTable = ctable; fRB = rowBytes; SkSafeRef(ctable); - + this->setPreLocked(fStorage, fRB, fCTable); } diff --git a/src/core/SkPixelRef.cpp b/src/core/SkPixelRef.cpp index 7ec5929669..422d5039fe 100644 --- a/src/core/SkPixelRef.cpp +++ b/src/core/SkPixelRef.cpp @@ -167,10 +167,10 @@ void SkPixelRef::flatten(SkFlattenableWriteBuffer& buffer) const { bool SkPixelRef::lockPixels(LockRec* rec) { SkASSERT(!fPreLocked || SKPIXELREF_PRELOCKED_LOCKCOUNT == fLockCount); - + if (!fPreLocked) { SkAutoMutexAcquire ac(*fMutex); - + if (1 == ++fLockCount) { SkASSERT(fRec.isZero()); diff --git a/src/lazy/SkCachingPixelRef.cpp b/src/lazy/SkCachingPixelRef.cpp index 033a6b5ebb..f1510fb67c 100644 --- a/src/lazy/SkCachingPixelRef.cpp +++ b/src/lazy/SkCachingPixelRef.cpp @@ -44,7 +44,7 @@ bool SkCachingPixelRef::onNewLockPixels(LockRec* rec) { if (fErrorInDecoding) { return false; // don't try again. } - + const SkImageInfo& info = this->info(); SkBitmap bitmap; SkASSERT(NULL == fScaledCacheId); @@ -75,7 +75,7 @@ bool SkCachingPixelRef::onNewLockPixels(LockRec* rec) { SkAutoLockPixels autoLockPixels(bitmap); void* pixels = bitmap.getPixels(); SkASSERT(pixels != NULL); - + // At this point, the autoLockPixels will unlockPixels() // to remove bitmap's lock on the pixels. We will then // destroy bitmap. The *only* guarantee that this pointer diff --git a/src/lazy/SkDiscardablePixelRef.cpp b/src/lazy/SkDiscardablePixelRef.cpp index 3f960d3c47..abd80f2e0a 100644 --- a/src/lazy/SkDiscardablePixelRef.cpp +++ b/src/lazy/SkDiscardablePixelRef.cpp @@ -47,7 +47,7 @@ bool SkDiscardablePixelRef::onNewLockPixels(LockRec* rec) { SkDELETE(fDiscardableMemory); fDiscardableMemory = NULL; } - + const size_t size = this->info().getSafeSize(fRowBytes); if (fDMFactory != NULL) { |