diff options
| -rw-r--r--[-rwxr-xr-x] | bench/ShadowBench.cpp | 0 | ||||
| -rw-r--r-- | gm/fontscalerdistortable.cpp | 2 | ||||
| -rw-r--r-- | samplecode/SamplePath.cpp | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | samplecode/SampleShadowColor.cpp | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | samplecode/SampleShadowReference.cpp | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | samplecode/SampleShadowUtils.cpp | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | src/core/SkDrawShadowInfo.cpp | 0 | ||||
| -rw-r--r-- | src/pathops/SkPathOpsDebug.cpp | 2 | ||||
| -rw-r--r-- | src/ports/SkScalerContext_win_dw.h | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | src/utils/SkPolyUtils.cpp | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | src/utils/SkPolyUtils.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | src/utils/SkShadowTessellator.cpp | 0 | ||||
| -rw-r--r-- | tests/PathOpsConicQuadIntersectionTest.cpp | 10 | ||||
| -rw-r--r-- | tests/PathOpsCubicConicIntersectionTest.cpp | 14 | ||||
| -rw-r--r--[-rwxr-xr-x] | tests/TransferPixelsTest.cpp | 0 |
15 files changed, 17 insertions, 17 deletions
diff --git a/bench/ShadowBench.cpp b/bench/ShadowBench.cpp index e454abd3a4..e454abd3a4 100755..100644 --- a/bench/ShadowBench.cpp +++ b/bench/ShadowBench.cpp diff --git a/gm/fontscalerdistortable.cpp b/gm/fontscalerdistortable.cpp index 5778ce0200..432fca843d 100644 --- a/gm/fontscalerdistortable.cpp +++ b/gm/fontscalerdistortable.cpp @@ -37,7 +37,7 @@ protected: std::unique_ptr<SkStreamAsset> distortableStream(GetResourceAsStream("fonts/Distortable.ttf")); sk_sp<SkTypeface> distortable(MakeResourceAsTypeface("fonts/Distortable.ttf")); - + if (!distortableStream) { return; } diff --git a/samplecode/SamplePath.cpp b/samplecode/SamplePath.cpp index 7480604ca5..52d5d64aaa 100644 --- a/samplecode/SamplePath.cpp +++ b/samplecode/SamplePath.cpp @@ -663,7 +663,7 @@ protected: canvas->drawCircle(storage[i].fX, storage[i].fY, 4, paint); } } - + void showFlattness(SkCanvas* canvas) { SkPaint paint; paint.setStyle(SkPaint::kStroke_Style); diff --git a/samplecode/SampleShadowColor.cpp b/samplecode/SampleShadowColor.cpp index 337bb28650..337bb28650 100755..100644 --- a/samplecode/SampleShadowColor.cpp +++ b/samplecode/SampleShadowColor.cpp diff --git a/samplecode/SampleShadowReference.cpp b/samplecode/SampleShadowReference.cpp index 6cd63798b5..6cd63798b5 100755..100644 --- a/samplecode/SampleShadowReference.cpp +++ b/samplecode/SampleShadowReference.cpp diff --git a/samplecode/SampleShadowUtils.cpp b/samplecode/SampleShadowUtils.cpp index 4929877548..4929877548 100755..100644 --- a/samplecode/SampleShadowUtils.cpp +++ b/samplecode/SampleShadowUtils.cpp diff --git a/src/core/SkDrawShadowInfo.cpp b/src/core/SkDrawShadowInfo.cpp index 704083b428..704083b428 100755..100644 --- a/src/core/SkDrawShadowInfo.cpp +++ b/src/core/SkDrawShadowInfo.cpp diff --git a/src/pathops/SkPathOpsDebug.cpp b/src/pathops/SkPathOpsDebug.cpp index bfef403f7c..45314dea72 100644 --- a/src/pathops/SkPathOpsDebug.cpp +++ b/src/pathops/SkPathOpsDebug.cpp @@ -63,7 +63,7 @@ bool SkPathOpsDebug::ChaseContains(const SkTDArray<SkOpSpanBase* >& chaseArray, return false; } #endif - + #if DEBUG_ACTIVE_SPANS SkString SkPathOpsDebug::gActiveSpans; #endif diff --git a/src/ports/SkScalerContext_win_dw.h b/src/ports/SkScalerContext_win_dw.h index d5a217d5b4..aa36194aa5 100644 --- a/src/ports/SkScalerContext_win_dw.h +++ b/src/ports/SkScalerContext_win_dw.h @@ -52,9 +52,9 @@ private: } bool getColorGlyphRun(const SkGlyph& glyph, IDWriteColorGlyphRunEnumerator** colorGlyph); - + void generateColorMetrics(SkGlyph* glyph); - + void generateColorGlyphImage(const SkGlyph& glyph); SkTDArray<uint8_t> fBits; diff --git a/src/utils/SkPolyUtils.cpp b/src/utils/SkPolyUtils.cpp index b76d270d15..b76d270d15 100755..100644 --- a/src/utils/SkPolyUtils.cpp +++ b/src/utils/SkPolyUtils.cpp diff --git a/src/utils/SkPolyUtils.h b/src/utils/SkPolyUtils.h index b753a91141..b753a91141 100755..100644 --- a/src/utils/SkPolyUtils.h +++ b/src/utils/SkPolyUtils.h diff --git a/src/utils/SkShadowTessellator.cpp b/src/utils/SkShadowTessellator.cpp index b485f3f68c..b485f3f68c 100755..100644 --- a/src/utils/SkShadowTessellator.cpp +++ b/src/utils/SkShadowTessellator.cpp diff --git a/tests/PathOpsConicQuadIntersectionTest.cpp b/tests/PathOpsConicQuadIntersectionTest.cpp index bdf1d42d37..8f47e76bd9 100644 --- a/tests/PathOpsConicQuadIntersectionTest.cpp +++ b/tests/PathOpsConicQuadIntersectionTest.cpp @@ -15,11 +15,11 @@ static struct conicQuad { ConicPts conic; QuadPts quad; } conicQuadTests[] = { - {{{{{0.00000000000000000, -1.8135968446731567 },
- {0.00000000000000000, -1.0033817291259766 },
- {-0.0073835160583257675, 0.00000000000000000 }}}, 2.26585215e+11f},
- {{{0.00000000000000000, -1.0000113248825073 },
- {-2.4824290449032560e-05, -1.0000115633010864 },
+ {{{{{0.00000000000000000, -1.8135968446731567 }, + {0.00000000000000000, -1.0033817291259766 }, + {-0.0073835160583257675, 0.00000000000000000 }}}, 2.26585215e+11f}, + {{{0.00000000000000000, -1.0000113248825073 }, + {-2.4824290449032560e-05, -1.0000115633010864 }, {-0.0073835160583257675, 0.00000000000000000 }}}}, {{{{{494.348663,224.583771}, {494.365143,224.633194}, {494.376404,224.684067}}}, 0.998645842f}, diff --git a/tests/PathOpsCubicConicIntersectionTest.cpp b/tests/PathOpsCubicConicIntersectionTest.cpp index ff4dec9864..aa8a9d8599 100644 --- a/tests/PathOpsCubicConicIntersectionTest.cpp +++ b/tests/PathOpsCubicConicIntersectionTest.cpp @@ -20,14 +20,14 @@ static struct cubicConic { // SkOPASSERT(oppStartT < oppEndT); // Throwing an error here breaks one test, but only in release. // More work to be done to figure this out. - {{{{2.1883804947719909e-05, 3.6366123822517693e-05 },
- {2.9145950975362211e-05, 2.9117207304807380e-05 },
- {2.9113532946212217e-05, 2.9173743314458989e-05 },
- {0.00000000000000000, 5.8282588724978268e-05 }}},
- {{{{0.00000000000000000, 5.8282581449020654e-05 },
- {0.00000000000000000, 5.8282563259126619e-05 },
+ {{{{2.1883804947719909e-05, 3.6366123822517693e-05 }, + {2.9145950975362211e-05, 2.9117207304807380e-05 }, + {2.9113532946212217e-05, 2.9173743314458989e-05 }, + {0.00000000000000000, 5.8282588724978268e-05 }}}, + {{{{0.00000000000000000, 5.8282581449020654e-05 }, + {0.00000000000000000, 5.8282563259126619e-05 }, {5.8282588724978268e-05, 0.00000000000000000 }}}, 53684.6563f}}, -#endif
+#endif {{{{188.60000610351562, 2041.5999755859375}, {188.60000610351562, 2065.39990234375}, {208, 2084.800048828125}, {231.80000305175781, 2084.800048828125}}}, diff --git a/tests/TransferPixelsTest.cpp b/tests/TransferPixelsTest.cpp index 339a591660..339a591660 100755..100644 --- a/tests/TransferPixelsTest.cpp +++ b/tests/TransferPixelsTest.cpp |