diff options
| -rw-r--r-- | include/core/SkPathEffect.h | 6 | ||||
| -rw-r--r-- | include/effects/SkDashPathEffect.h | 2 | ||||
| -rw-r--r-- | src/core/SkPathEffect.cpp | 2 | ||||
| -rw-r--r-- | src/ports/SkFontHost_mac_coretext.cpp | 8 |
4 files changed, 9 insertions, 9 deletions
diff --git a/include/core/SkPathEffect.h b/include/core/SkPathEffect.h index 44056a9902..c59d053657 100644 --- a/include/core/SkPathEffect.h +++ b/include/core/SkPathEffect.h @@ -136,14 +136,14 @@ public: /** \class PointData PointData aggregates all the information needed to draw the point - primitives returned by an 'asPoints' call. + primitives returned by an 'asPoints' call. */ class PointData { public: PointData() : fFlags(0) { fSize.set(SK_Scalar1, SK_Scalar1); - // 'asPoints' needs to initialize/fill-in 'fClipRect' if it sets + // 'asPoints' needs to initialize/fill-in 'fClipRect' if it sets // the kUseClip flag }; ~PointData() {}; @@ -171,7 +171,7 @@ public: * Does applying this path effect to 'src' yield a set of points? If so, * optionally return the points in 'results'. */ - virtual bool asPoints(PointData* results, const SkPath& src, + virtual bool asPoints(PointData* results, const SkPath& src, const SkStrokeRec&, const SkMatrix&) const; protected: diff --git a/include/effects/SkDashPathEffect.h b/include/effects/SkDashPathEffect.h index 52557c6dd8..5e8f14df80 100644 --- a/include/effects/SkDashPathEffect.h +++ b/include/effects/SkDashPathEffect.h @@ -41,7 +41,7 @@ public: virtual bool filterPath(SkPath* dst, const SkPath& src, SkStrokeRec*) SK_OVERRIDE; - virtual bool asPoints(PointData* results, const SkPath& src, + virtual bool asPoints(PointData* results, const SkPath& src, const SkStrokeRec&, const SkMatrix&) const SK_OVERRIDE; // overrides for SkFlattenable diff --git a/src/core/SkPathEffect.cpp b/src/core/SkPathEffect.cpp index a64ebc77a6..9e84b2f2bc 100644 --- a/src/core/SkPathEffect.cpp +++ b/src/core/SkPathEffect.cpp @@ -116,7 +116,7 @@ void SkPathEffect::computeFastBounds(SkRect* dst, const SkRect& src) { *dst = src; } -bool SkPathEffect::asPoints(PointData* results, const SkPath& src, +bool SkPathEffect::asPoints(PointData* results, const SkPath& src, const SkStrokeRec&, const SkMatrix&) const { return false; } diff --git a/src/ports/SkFontHost_mac_coretext.cpp b/src/ports/SkFontHost_mac_coretext.cpp index c0fb97ac2a..8d987200b0 100644 --- a/src/ports/SkFontHost_mac_coretext.cpp +++ b/src/ports/SkFontHost_mac_coretext.cpp @@ -1670,14 +1670,14 @@ static SK_SFNT_ULONG get_font_type_tag(SkFontID uniqueID) { if (!fontFormatRef) { return 0; } - + SInt32 fontFormatValue; if (!CFNumberGetValue(fontFormatRef, kCFNumberSInt32Type, &fontFormatValue)) { CFRelease(fontFormatRef); return 0; } CFRelease(fontFormatRef); - + switch (fontFormatValue) { case kCTFontFormatOpenTypePostScript: return SkSFNTHeader::fontType_OpenTypeCFF::TAG; @@ -1700,7 +1700,7 @@ SkStream* SkFontHost::OpenStream(SkFontID uniqueID) { if (0 == fontType) { return NULL; } - + // get table tags int numTables = CountTables(uniqueID); SkTDArray<SkFontTableTag> tableTags; @@ -1752,7 +1752,7 @@ SkStream* SkFontHost::OpenStream(SkFontID uniqueID) { tableSize)); entry->offset = SkEndian_SwapBE32(dataPtr - dataStart); entry->logicalLength = SkEndian_SwapBE32(tableSize); - + dataPtr += (tableSize + 3) & ~3; ++entry; } |