AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Sanitizing source files in Skia_Periodic_House_Keeping

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@6594 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
skia.committer@gmail.com 2012-11-29 02:01:19 +00:00
parent ffd7907ba3
commit 687c57c7d5
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/core/SkPathEffect.h
View File

@ -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:

2
include/effects/SkDashPathEffect.h
View File

@ -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

2
src/core/SkPathEffect.cpp
View File

@ -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;
}

8
src/ports/SkFontHost_mac_coretext.cpp
View File

@ -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;
}