diff options
author | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-08 03:02:06 +0000 |
---|---|---|
committer | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-08 03:02:06 +0000 |
commit | e62513fb9274b65bcd9fecf61acc418dd3949df5 (patch) | |
tree | 899cea64cb4b8eba938d1cd40464ca9ffaccf283 | |
parent | 77286a5945fd1a42018d93dee2c08a4280e5aa6d (diff) |
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@13714 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r-- | bench/WritePixelsBench.cpp | 2 | ||||
-rw-r--r-- | src/core/SkDevice.cpp | 1 | ||||
-rw-r--r-- | src/core/SkOffsetTable.h | 16 | ||||
-rw-r--r-- | src/core/SkPathHeap.cpp | 4 | ||||
-rw-r--r-- | src/core/SkPathHeap.h | 2 | ||||
-rw-r--r-- | src/utils/SkDeferredCanvas.cpp | 2 | ||||
-rw-r--r-- | tests/PremulAlphaRoundTripTest.cpp | 2 | ||||
-rw-r--r-- | tools/sk_tool_utils.cpp | 4 |
8 files changed, 16 insertions, 17 deletions
diff --git a/bench/WritePixelsBench.cpp b/bench/WritePixelsBench.cpp index 27c3f5a45b..80aeda74cb 100644 --- a/bench/WritePixelsBench.cpp +++ b/bench/WritePixelsBench.cpp @@ -57,7 +57,7 @@ protected: SkImageInfo info = bmp.info(); info.fColorType = fColorType; info.fAlphaType = fAlphaType; - + for (int loop = 0; loop < loops; ++loop) { canvas->writePixels(info, bmp.getPixels(), bmp.rowBytes(), 0, 0); } diff --git a/src/core/SkDevice.cpp b/src/core/SkDevice.cpp index 6087cd2a14..b9c923cf58 100644 --- a/src/core/SkDevice.cpp +++ b/src/core/SkDevice.cpp @@ -193,4 +193,3 @@ bool SkBaseDevice::onWritePixels(const SkImageInfo&, const void*, size_t, int, i #ifdef SK_SUPPORT_LEGACY_WRITEPIXELSCONFIG void SkBaseDevice::writePixels(const SkBitmap&, int x, int y, SkCanvas::Config8888) {} #endif - diff --git a/src/core/SkOffsetTable.h b/src/core/SkOffsetTable.h index 60c62642b2..0596c38f83 100644 --- a/src/core/SkOffsetTable.h +++ b/src/core/SkOffsetTable.h @@ -44,10 +44,10 @@ public: } int numIDs() const { - return fOffsetArrays.count(); + return fOffsetArrays.count(); } - // Do the offsets of any commands referencing this ID fall in the + // Do the offsets of any commands referencing this ID fall in the // range [min, max] (both inclusive) bool overlap(int id, size_t min, size_t max) { SkASSERT(id < fOffsetArrays.count()); @@ -87,17 +87,17 @@ public: protected: class OffsetArray { public: - void add(size_t offset) { + void add(size_t offset) { SkASSERT(fOffsets.count() == 0 || offset > this->max()); - *fOffsets.append() = offset; + *fOffsets.append() = offset; } - size_t min() const { + size_t min() const { SkASSERT(fOffsets.count() > 0); - return fOffsets[0]; + return fOffsets[0]; } - size_t max() const { + size_t max() const { SkASSERT(fOffsets.count() > 0); - return fOffsets[fOffsets.count()-1]; + return fOffsets[fOffsets.count()-1]; } int count() const { return fOffsets.count(); diff --git a/src/core/SkPathHeap.cpp b/src/core/SkPathHeap.cpp index d71257d731..84ffb04b80 100644 --- a/src/core/SkPathHeap.cpp +++ b/src/core/SkPathHeap.cpp @@ -50,7 +50,7 @@ int SkPathHeap::append(const SkPath& path) { return fPaths.count(); } -SkPathHeap::LookupEntry::LookupEntry(const SkPath& path) +SkPathHeap::LookupEntry::LookupEntry(const SkPath& path) : fGenerationID(path.getGenerationID()), fStorageSlot(0) { } @@ -59,7 +59,7 @@ SkPathHeap::LookupEntry* SkPathHeap::addIfNotPresent(const SkPath& path) { int index = SkTSearch<const LookupEntry, LookupEntry::Less>( fLookupTable.begin(), fLookupTable.count(), - searchKey, + searchKey, sizeof(LookupEntry)); if (index < 0) { index = ~index; diff --git a/src/core/SkPathHeap.h b/src/core/SkPathHeap.h index 7fdcdd93e0..377d8d968b 100644 --- a/src/core/SkPathHeap.h +++ b/src/core/SkPathHeap.h @@ -63,7 +63,7 @@ private: private: uint32_t fGenerationID; // the SkPath's generation ID // the path's index in the heap + 1. It is 0 if the path is not yet in the heap. - int fStorageSlot; + int fStorageSlot; }; SkTDArray<LookupEntry> fLookupTable; diff --git a/src/utils/SkDeferredCanvas.cpp b/src/utils/SkDeferredCanvas.cpp index b81d64c57d..efe750188e 100644 --- a/src/utils/SkDeferredCanvas.cpp +++ b/src/utils/SkDeferredCanvas.cpp @@ -521,7 +521,7 @@ bool DeferredDevice::onWritePixels(const SkImageInfo& info, const void* pixels, if (info.width() == deviceInfo.width() && info.height() == deviceInfo.height()) { this->skipPendingCommands(); } - + this->prepareForImmediatePixelWrite(); return immediateDevice()->onWritePixels(info, pixels, rowBytes, x, y); } diff --git a/tests/PremulAlphaRoundTripTest.cpp b/tests/PremulAlphaRoundTripTest.cpp index 68fbec80bd..1a42a9c0af 100644 --- a/tests/PremulAlphaRoundTripTest.cpp +++ b/tests/PremulAlphaRoundTripTest.cpp @@ -106,7 +106,7 @@ DEF_GPUTEST(PremulAlphaRoundTrip, reporter, factory) { for (size_t upmaIdx = 0; upmaIdx < SK_ARRAY_COUNT(gUnpremul); ++upmaIdx) { fillCanvas(&canvas, gUnpremul[upmaIdx].fColorType, gUnpremul[upmaIdx].fPackProc); - + readBmp1.eraseColor(0); readBmp2.eraseColor(0); diff --git a/tools/sk_tool_utils.cpp b/tools/sk_tool_utils.cpp index f5b8b9f93d..1197388694 100644 --- a/tools/sk_tool_utils.cpp +++ b/tools/sk_tool_utils.cpp @@ -37,11 +37,11 @@ void write_pixels(SkCanvas* canvas, const SkBitmap& bitmap, int x, int y, SkColorType colorType, SkAlphaType alphaType) { SkBitmap tmp(bitmap); tmp.lockPixels(); - + SkImageInfo info = tmp.info(); info.fColorType = colorType; info.fAlphaType = alphaType; - + canvas->writePixels(info, tmp.getPixels(), tmp.rowBytes(), x, y); } |