diff options
author | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-06-05 07:01:06 +0000 |
---|---|---|
committer | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-06-05 07:01:06 +0000 |
commit | 8f6ef4010f6835c5ce9ede180e50a6a58512a81e (patch) | |
tree | c66f46fb0b3242dfb7abbab5386c7d81ce57b375 /src/core | |
parent | 4a3ca94322510351f7304af2092d6513442ab9d7 (diff) |
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@9440 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/SkDraw.cpp | 8 | ||||
-rw-r--r-- | src/core/SkPaint.cpp | 8 | ||||
-rw-r--r-- | src/core/SkString.cpp | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp index f313c4b119..5782fc537e 100644 --- a/src/core/SkDraw.cpp +++ b/src/core/SkDraw.cpp @@ -37,7 +37,7 @@ bool SkDraw::ShouldDrawTextAsPaths(const SkPaint& paint, const SkMatrix& ctm) { 0 == paint.getStrokeWidth()) { return true; } - + // we don't cache perspective if (ctm.hasPerspective()) { return true; @@ -1867,7 +1867,7 @@ void SkDraw::drawPosText_asPaths(const char text[], size_t byteLength, SkMatrix matrix = *fMatrix; matrix.preScale(matrixScale, matrixScale); const SkScalar posScale = SkScalarInvert(matrixScale); - + SkDrawCacheProc glyphCacheProc = paint.getDrawCacheProc(); SkAutoGlyphCache autoCache(paint, NULL, NULL); SkGlyphCache* cache = autoCache.getCache(); @@ -1876,7 +1876,7 @@ void SkDraw::drawPosText_asPaths(const char text[], size_t byteLength, AlignProc alignProc = pick_align_proc(paint.getTextAlign()); TextMapState tms(SkMatrix::I(), constY); TextMapState::Proc tmsProc = tms.pickProc(scalarsPerPosition); - + while (text < stop) { const SkGlyph& glyph = glyphCacheProc(cache, &text, 0, 0); if (glyph.fWidth) { @@ -1885,7 +1885,7 @@ void SkDraw::drawPosText_asPaths(const char text[], size_t byteLength, tmsProc(tms, pos); SkIPoint fixedLoc; alignProc(tms.fLoc, glyph, &fixedLoc); - + SkMatrix localMatrix = matrix; localMatrix.preTranslate(SkFixedToScalar(fixedLoc.fX) * posScale, SkFixedToScalar(fixedLoc.fY) * posScale); diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp index e781cd45a7..886794c479 100644 --- a/src/core/SkPaint.cpp +++ b/src/core/SkPaint.cpp @@ -961,10 +961,10 @@ SkScalar SkPaint::setupForAsPaths() { flags &= ~TEXT_AS_PATHS_PAINT_FLAGS_TO_IGNORE; // set the flags we do care about flags |= SkPaint::kSubpixelText_Flag; - + this->setFlags(flags); this->setHinting(SkPaint::kNo_Hinting); - + SkScalar textSize = fTextSize; this->setTextSize(kCanonicalTextSizeForPaths); return textSize / kCanonicalTextSizeForPaths; @@ -981,7 +981,7 @@ public: } const SkPaint& getPaint() const { return *fPaint; } - + /** * Returns 0 if the paint was unmodified, or the scale factor need to * the original textSize @@ -1274,7 +1274,7 @@ SkScalar SkPaint::getFontMetrics(FontMetrics* metrics, SkScalar zoom) const { SkCanonicalizePaint canon(*this); const SkPaint& paint = canon.getPaint(); SkScalar scale = canon.getScale(); - + SkMatrix zoomMatrix, *zoomPtr = NULL; if (zoom) { zoomMatrix.setScale(zoom, zoom); diff --git a/src/core/SkString.cpp b/src/core/SkString.cpp index 3fae07e12a..d9d74c4caa 100644 --- a/src/core/SkString.cpp +++ b/src/core/SkString.cpp @@ -449,7 +449,7 @@ void SkString::insert(size_t offset, const char text[], size_t len) { if (offset > length) { offset = length; } - + // Check if length + len exceeds 32bits, we trim len len = check_add32(length, len); if (0 == len) { |