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

Add implicit NaN check in split_conic.

Browse Source 
SkFindQuadMaxCurvature returns either a value in [0, 1) or NaN.
split_conic uses this to determine where to chop a conic, but doesn't
check for NaN, and passing NaN to conic.chopAt() will assert. Inverting
the if statement and checking to see if t is in (0,1) rather than that
t == 0 || t == 1 will cover the NaN case, since NaN comparisons are
always false.

Bug: skia:1310167
Change-Id: I401f586d9b4cb9f05332027627f9fac9dc7dee15
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/530519
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>
This commit is contained in:
Jim Van Verth 2022-04-15 13:21:04 -04:00 committed by SkCQ
parent 11525080e1
commit d1a685e0c1
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gpu/ganesh/ops/AAHairLinePathRenderer.cpp
View File

@ -149,12 +149,11 @@ int get_float_exp(float x) {
// and dst[1] are the two new conics.
int split_conic(const SkPoint src[3], SkConic dst[2], const SkScalar weight) {
SkScalar t = SkFindQuadMaxCurvature(src);
if (t == 0 || t == 1) {
if (dst) {
dst[0].set(src, weight);
}
return 1;
} else {
// SkFindQuadMaxCurvature() returns either a value in [0, 1) or NaN.
// However, passing NaN to conic.chopAt() will assert. Checking to see if
// t is in (0,1) will also cover the NaN case since NaN comparisons are always
// false, so we'll drop down into the else block in that case.
if (0 < t && t < 1) {
if (dst) {
SkConic conic;
conic.set(src, weight);
@ -164,6 +163,11 @@ int split_conic(const SkPoint src[3], SkConic dst[2], const SkScalar weight) {
}
}
return 2;
} else {
if (dst) {
dst[0].set(src, weight);
}
return 1;
}
}