Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@7875 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/experimental/Intersection/CubicIntersection.cpp b/experimental/Intersection/CubicIntersection.cpp
index bf8ea46..0a82866 100644
--- a/experimental/Intersection/CubicIntersection.cpp
+++ b/experimental/Intersection/CubicIntersection.cpp
@@ -397,7 +397,7 @@
return result;
}
-// intersect the end of the cubic with the other. Try lines from the end to control and opposite
+// intersect the end of the cubic with the other. Try lines from the end to control and opposite
// end to determine range of t on opposite cubic.
static bool intersectEnd(const Cubic& cubic1, bool start, const Cubic& cubic2, const _Rect& bounds2,
Intersections& i) {
diff --git a/experimental/Intersection/CubicIntersection_Test.cpp b/experimental/Intersection/CubicIntersection_Test.cpp
index e45d543..358afcf 100644
--- a/experimental/Intersection/CubicIntersection_Test.cpp
+++ b/experimental/Intersection/CubicIntersection_Test.cpp
@@ -134,7 +134,7 @@
const size_t testSetCount = sizeof(testSet) / sizeof(testSet[0]);
static const Cubic newTestSet[] = {
-{{0,1}, {2,5}, {6,0}, {5,3}},
+{{0,1}, {2,5}, {6,0}, {5,3}},
{{0,6}, {3,5}, {1,0}, {5,2}},
{{0,1}, {3,6}, {1,0}, {5,2}},
diff --git a/experimental/Intersection/CubicUtilities.cpp b/experimental/Intersection/CubicUtilities.cpp
index b27accf..1de2ef7 100644
--- a/experimental/Intersection/CubicUtilities.cpp
+++ b/experimental/Intersection/CubicUtilities.cpp
@@ -324,4 +324,3 @@
a * cubic[0].y + b * cubic[1].y + c * cubic[2].y + d * cubic[3].y};
return result;
}
-
diff --git a/experimental/Intersection/Simplify.cpp b/experimental/Intersection/Simplify.cpp
index ea4c9bf..e269ffd 100644
--- a/experimental/Intersection/Simplify.cpp
+++ b/experimental/Intersection/Simplify.cpp
@@ -3668,7 +3668,7 @@
void setOppXor(bool isOppXor) {
fOppXor = isOppXor;
}
-
+
void setSpanT(int index, double t) {
Span& span = fTs[index];
span.fT = t;
diff --git a/gm/typeface.cpp b/gm/typeface.cpp
index a442f32..4c6857f 100644
--- a/gm/typeface.cpp
+++ b/gm/typeface.cpp
@@ -96,7 +96,7 @@
class TypefaceStylesGM : public skiagm::GM {
SkTypeface* fFaces[gFaceStylesCount];
-
+
public:
TypefaceStylesGM() {
for (int i = 0; i < gFaceStylesCount; i++) {
@@ -104,34 +104,34 @@
gFaceStyles[i].fStyle);
}
}
-
+
virtual ~TypefaceStylesGM() {
for (int i = 0; i < gFaceStylesCount; i++) {
SkSafeUnref(fFaces[i]);
}
}
-
+
protected:
virtual SkString onShortName() SK_OVERRIDE {
return SkString("typefacestyles");
}
-
+
virtual SkISize onISize() SK_OVERRIDE {
return SkISize::Make(640, 480);
}
-
+
virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
SkPaint paint;
paint.setAntiAlias(true);
paint.setTextSize(SkIntToScalar(30));
-
+
const char* text = "Hamburgefons";
const size_t textLen = strlen(text);
-
+
SkScalar x = SkIntToScalar(10);
SkScalar dy = paint.getFontMetrics(NULL);
SkScalar y = dy;
-
+
paint.setLinearText(true);
for (int i = 0; i < gFaceStylesCount; i++) {
paint.setTypeface(fFaces[i]);
@@ -139,13 +139,12 @@
y += dy;
}
}
-
+
private:
typedef skiagm::GM INHERITED;
};
-
+
///////////////////////////////////////////////////////////////////////////////
DEF_GM( return new TypefaceGM; )
DEF_GM( return new TypefaceStylesGM; )
-
diff --git a/include/gpu/gl/GrGLExtensions.h b/include/gpu/gl/GrGLExtensions.h
index 6699c12..d0970a6 100644
--- a/include/gpu/gl/GrGLExtensions.h
+++ b/include/gpu/gl/GrGLExtensions.h
@@ -32,12 +32,12 @@
GrGLGetStringProc getString,
GrGLGetStringiProc getStringi,
GrGLGetIntegervProc getIntegerv);
-
+
/**
* Queries whether an extension is present. This will fail if init() has not been called.
*/
bool has(const char*) const;
-
+
void reset() { fStrings.reset(); }
private:
diff --git a/src/gpu/gl/GrGLExtensions.cpp b/src/gpu/gl/GrGLExtensions.cpp
index b5df2cc..9f31a05 100644
--- a/src/gpu/gl/GrGLExtensions.cpp
+++ b/src/gpu/gl/GrGLExtensions.cpp
@@ -50,7 +50,7 @@
++extensionCnt;
}
fStrings.push_back_n(extensionCnt);
-
+
int i = 0;
while (true) {
size_t length = strcspn(extensions, " ");
diff --git a/src/gpu/gl/GrGLInterface.cpp b/src/gpu/gl/GrGLInterface.cpp
index f1be64f..6fcd6ab 100644
--- a/src/gpu/gl/GrGLInterface.cpp
+++ b/src/gpu/gl/GrGLInterface.cpp
@@ -38,7 +38,7 @@
if (0 == (binding & fBindingsExported)) {
return false;
}
-
+
GrGLExtensions extensions;
if (!extensions.init(binding, this)) {
return false;
@@ -342,7 +342,7 @@
return false;
}
}
-
+
if (kDesktop_GrGLBinding == binding && glVer >= GR_GL_VER(3, 0)) {
if (NULL == fGetStringi) {
return false;
diff --git a/src/ports/SkFontConfigInterface_direct.cpp b/src/ports/SkFontConfigInterface_direct.cpp
index 0fac111..84555a2 100644
--- a/src/ports/SkFontConfigInterface_direct.cpp
+++ b/src/ports/SkFontConfigInterface_direct.cpp
@@ -164,25 +164,25 @@
{ SIMHEI, "MYingHeiGB18030" },
{ SIMHEI, "MYingHeiB5HK" },
- // 新細明體
- { PMINGLIU, "PMingLiU"},
- { PMINGLIU, "\xe6\x96\xb0\xe7\xb4\xb0\xe6\x98\x8e\xe9\xab\x94" },
- { PMINGLIU, "MSung B5HK"},
+ // 新細明體
+ { PMINGLIU, "PMingLiU"},
+ { PMINGLIU, "\xe6\x96\xb0\xe7\xb4\xb0\xe6\x98\x8e\xe9\xab\x94" },
+ { PMINGLIU, "MSung B5HK"},
- // 細明體
- { MINGLIU, "MingLiU"},
- { MINGLIU, "\xe7\xb4\xb0\xe6\x98\x8e\xe9\xab\x94" },
- { MINGLIU, "MSung B5HK"},
+ // 細明體
+ { MINGLIU, "MingLiU"},
+ { MINGLIU, "\xe7\xb4\xb0\xe6\x98\x8e\xe9\xab\x94" },
+ { MINGLIU, "MSung B5HK"},
- // 新細明體
- { PMINGLIUHK, "PMingLiU_HKSCS"},
- { PMINGLIUHK, "\xe6\x96\xb0\xe7\xb4\xb0\xe6\x98\x8e\xe9\xab\x94_HKSCS" },
- { PMINGLIUHK, "MSung B5HK"},
+ // 新細明體
+ { PMINGLIUHK, "PMingLiU_HKSCS"},
+ { PMINGLIUHK, "\xe6\x96\xb0\xe7\xb4\xb0\xe6\x98\x8e\xe9\xab\x94_HKSCS" },
+ { PMINGLIUHK, "MSung B5HK"},
- // 細明體
- { MINGLIUHK, "MingLiU_HKSCS"},
- { MINGLIUHK, "\xe7\xb4\xb0\xe6\x98\x8e\xe9\xab\x94_HKSCS" },
- { MINGLIUHK, "MSung B5HK"},
+ // 細明體
+ { MINGLIUHK, "MingLiU_HKSCS"},
+ { MINGLIUHK, "\xe7\xb4\xb0\xe6\x98\x8e\xe9\xab\x94_HKSCS" },
+ { MINGLIUHK, "MSung B5HK"},
};
static const size_t kFontCount =
@@ -296,7 +296,7 @@
FcChar8* c_family;
if (FcPatternGetString(font, FC_FAMILY, 0, &c_family))
return false;
-
+
int resulting_bold;
if (FcPatternGetInteger(font, FC_WEIGHT, 0, &resulting_bold))
resulting_bold = FC_WEIGHT_NORMAL;
@@ -334,7 +334,7 @@
///////////////////////////////////////////////////////////////////////////////
-#define kMaxFontFamilyLength 1024
+#define kMaxFontFamilyLength 1024
SkFontConfigInterfaceDirect::SkFontConfigInterfaceDirect() : next_file_id_(0) {
FcInit();
@@ -345,7 +345,7 @@
bool SkFontConfigInterfaceDirect::match(const char familyName[],
SkTypeface::Style style,
- unsigned* result_filefaceid,
+ unsigned* result_filefaceid,
SkTypeface::Style* result_style) {
std::string familyStr(familyName ? familyName : "");
if (familyStr.length() > kMaxFontFamilyLength) {
@@ -356,7 +356,7 @@
// search our cache
{
- FontMatchKey key = FontMatchKey(familyStr, style);
+ FontMatchKey key = FontMatchKey(familyStr, style);
const std::map<FontMatchKey, FontMatch>::const_iterator i =
font_match_cache_.find(key);
if (i != font_match_cache_.end()) {
@@ -559,5 +559,3 @@
int fd = open(i->second.c_str(), O_RDONLY);
return (fd >= 0) ? SkNEW_ARGS(SkFDStream, (fd, true)) : NULL;
}
-
-