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

don't create zero length intervals

Browse Source 
Dashing a pattern without zero-length intervals should
not create them if the end of the on interval coincides
with the beginning of the initial dash offset.

R=reed@google.com
BUG=591993
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1766243004

Review URL: https://codereview.chromium.org/1766243004
This commit is contained in:
caryclark 2016-03-09 05:55:53 -08:00 committed by Commit bot
parent 6ac97b7eb9
commit 18bbd00190
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gm/bug530095.cpp
View File

@ -46,3 +46,16 @@ DEF_SIMPLE_GM(bug530095, canvas, 900, 1200) {
canvas->translate(4, 4); canvas->translate(4, 4);
canvas->drawPath(path2, paint); canvas->drawPath(path2, paint);
} }
DEF_SIMPLE_GM(bug591993, canvas, 40, 140) {
SkPaint p;
p.setColor(SK_ColorRED);
p.setAntiAlias(true);
p.setStyle(SkPaint::kStroke_Style);
p.setStrokeCap(SkPaint::kRound_Cap);
p.setStrokeWidth(10);
SkScalar intervals[] = { 100, 100 };
SkPathEffect* dash = SkDashPathEffect::Create(intervals, SK_ARRAY_COUNT(intervals), 100);
p.setPathEffect(dash)->unref();
canvas->drawLine(20, 20, 120, 20, p);
}

7
src/utils/SkDashPath.cpp
View File

@ -16,11 +16,12 @@ static inline int is_even(int x) {
static SkScalar find_first_interval(const SkScalar intervals[], SkScalar phase, static SkScalar find_first_interval(const SkScalar intervals[], SkScalar phase,
int32_t* index, int count) { int32_t* index, int count) {
for (int i = 0; i < count; ++i) { for (int i = 0; i < count; ++i) {
if (phase > intervals[i]) { SkScalar gap = intervals[i];
phase -= intervals[i]; if (phase > gap || (phase == gap && gap)) {
phase -= gap;
} else { } else {
*index = i; *index = i;
return intervals[i] - phase; return gap - phase;
} }
} }
// If we get here, phase "appears" to be larger than our length. This // If we get here, phase "appears" to be larger than our length. This