diff options
Diffstat (limited to 'modules/skottie')
-rw-r--r-- | modules/skottie/src/SkottieJson.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/modules/skottie/src/SkottieJson.cpp b/modules/skottie/src/SkottieJson.cpp index 186cd42c31..23221af99e 100644 --- a/modules/skottie/src/SkottieJson.cpp +++ b/modules/skottie/src/SkottieJson.cpp @@ -24,7 +24,7 @@ template <> bool Parse<SkScalar>(const Value& v, SkScalar* s) { // Some versions wrap values as single-element arrays. if (const skjson::ArrayValue* array = v) { - if (array->size() == 1) { + if (array->size() > 0) { return Parse((*array)[0], s); } } @@ -80,16 +80,8 @@ bool Parse<SkPoint>(const Value& v, SkPoint* pt) { return false; const auto& ov = v.as<ObjectValue>(); - const auto& jvx = ov["x"]; - const auto& jvy = ov["y"]; - - // Some BM versions seem to store x/y as single-element arrays. - // TODO: We should be able to check size == 1 below, or just delegate to Parse<SkScalar>, - // but that change introduces diffs. Investigate. - const ArrayValue* jvxa = jvx; - const ArrayValue* jvya = jvy; - return Parse<SkScalar>(jvxa && jvxa->size() > 0 ? (*jvxa)[0] : jvx, &pt->fX) - && Parse<SkScalar>(jvya && jvya->size() > 0 ? (*jvya)[0] : jvy, &pt->fY); + return Parse<SkScalar>(ov["x"], &pt->fX) + && Parse<SkScalar>(ov["y"], &pt->fY); } template <> |