diff options
| -rw-r--r-- | debugger/SkObjectParser.cpp | 6 | ||||
| -rw-r--r-- | experimental/Intersection/CubicToQuadratics_Test.cpp | 6 | ||||
| -rw-r--r-- | experimental/StrokePathRenderer/GrStrokePathRenderer.cpp | 6 | ||||
| -rw-r--r-- | src/gpu/GrDrawTarget.cpp | 4 | ||||
| -rw-r--r-- | src/ports/SkFontHost_mac_coretext.cpp | 6 |
5 files changed, 14 insertions, 14 deletions
diff --git a/debugger/SkObjectParser.cpp b/debugger/SkObjectParser.cpp index b327c0b090..f382664ac2 100644 --- a/debugger/SkObjectParser.cpp +++ b/debugger/SkObjectParser.cpp @@ -105,16 +105,16 @@ SkString* SkObjectParser::PaintToString(const SkPaint& paint) { SkString* mPaint = new SkString("<dl><dt>SkPaint:</dt><dd><dl><dt>Color:</dt><dd>0x"); mPaint->appendHex(color); mPaint->append("</dd>"); - + SkTypeface *typeface = paint.getTypeface(); if (typeface) { SkDynamicMemoryWStream ostream; typeface->serialize(&ostream); SkData *data = SkAutoTUnref<SkData>(ostream.copyToData()); - + SkMemoryStream stream(data); SkFontDescriptor descriptor(&stream); - + mPaint->append("<dt>Font Family Name:</dt><dd>"); mPaint->append(descriptor.getFamilyName()); mPaint->append("</dd><dt>Font Full Name:</dt><dd>"); diff --git a/experimental/Intersection/CubicToQuadratics_Test.cpp b/experimental/Intersection/CubicToQuadratics_Test.cpp index c4dc96a39e..24c0ffe03a 100644 --- a/experimental/Intersection/CubicToQuadratics_Test.cpp +++ b/experimental/Intersection/CubicToQuadratics_Test.cpp @@ -140,13 +140,13 @@ static Cubic locals[] = { 60.776536520932126, 71.249307306133829 }, { - 87.107894191103014, + 87.107894191103014, 22.377669868235323 }, { - 1.4974754310666936, + 1.4974754310666936, 68.069569937917208 }, { - 45.261946574441133, + 45.261946574441133, 17.536076632112298 }} }; diff --git a/experimental/StrokePathRenderer/GrStrokePathRenderer.cpp b/experimental/StrokePathRenderer/GrStrokePathRenderer.cpp index e23d9ef078..4d2c8a8862 100644 --- a/experimental/StrokePathRenderer/GrStrokePathRenderer.cpp +++ b/experimental/StrokePathRenderer/GrStrokePathRenderer.cpp @@ -30,13 +30,13 @@ IntersectionType intersection(const SkPoint& p1, const SkPoint& p2, // equations-to-code conversion SkScalar x1 = p1.x(), x2 = p2.x(), x3 = p3.x(), x4 = p4.x(); SkScalar y1 = p1.y(), y2 = p2.y(), y3 = p3.y(), y4 = p4.y(); - + SkScalar d = SkScalarMul(x1 - x2, y3 - y4) - SkScalarMul(y1 - y2, x3 - x4); // If d is zero, there is no intersection if (SkScalarNearlyZero(d)) { return kNone_IntersectionType; } - + // Get the x and y SkScalar pre = SkScalarMul(x1, y2) - SkScalarMul(y1, x2), post = SkScalarMul(x3, y4) - SkScalarMul(y3, x4); @@ -72,7 +72,7 @@ bool GrStrokePathRenderer::canDrawPath(const SkPath& path, // Indices being stored in uint16, we don't want to overflow the indices capacity static const int maxVBSize = 1 << 16; const int maxNbVerts = (path.countPoints() + 1) * 5; - + // Check that the path contains no curved lines, only straight lines static const uint32_t unsupportedMask = SkPath::kQuad_SegmentMask | SkPath::kCubic_SegmentMask; diff --git a/src/gpu/GrDrawTarget.cpp b/src/gpu/GrDrawTarget.cpp index a67be1c550..3c112871e5 100644 --- a/src/gpu/GrDrawTarget.cpp +++ b/src/gpu/GrDrawTarget.cpp @@ -46,12 +46,12 @@ void gen_mask_arrays(GrVertexLayout* stageTexCoordMasks, } /** - * Uncomment and run the gen_globals function to generate + * Uncomment and run the gen_globals function to generate * the code that declares the global masks. * * #if 0'ed out to avoid unused function warning. */ - + #if 0 void gen_globals() { GrVertexLayout stageTexCoordMasks[GrDrawState::kNumStages]; diff --git a/src/ports/SkFontHost_mac_coretext.cpp b/src/ports/SkFontHost_mac_coretext.cpp index bc020e78ff..ceb9a040c8 100644 --- a/src/ports/SkFontHost_mac_coretext.cpp +++ b/src/ports/SkFontHost_mac_coretext.cpp @@ -1524,15 +1524,15 @@ SkAdvancedTypefaceMetrics* SkFontHost::GetAdvancedTypefaceMetrics( info->fDescent = (int16_t) CTFontGetDescent(ctFont); info->fCapHeight = (int16_t) CTFontGetCapHeight(ctFont); CGRect bbox = CTFontGetBoundingBox(ctFont); - + SkRect r; r.set( CGToScalar(CGRectGetMinX_inline(bbox)), // Left CGToScalar(CGRectGetMaxY_inline(bbox)), // Top CGToScalar(CGRectGetMaxX_inline(bbox)), // Right CGToScalar(CGRectGetMinY_inline(bbox))); // Bottom - + r.roundOut(&(info->fBBox)); - + // Figure out a good guess for StemV - Min width of i, I, !, 1. // This probably isn't very good with an italic font. int16_t min_width = SHRT_MAX; |