Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Side by Side Diff: src/core/SkScaleToSides.h

Issue 1567723004: Fix handling of radii scaling to force the result to always be less (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Small cleanup. Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/core/SkRRect.cpp ('k') | tests/ScaleToSidesTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
(Empty)
1 /*
2 * Copyright 2016 Google Inc.
3 *
4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file.
6 */
7
8 #ifndef SkScaleToSides_DEFINED
9 #define SkScaleToSides_DEFINED
10
11 #include <cmath>
12 #include "SkScalar.h"
13 #include "SkTypes.h"
14
15 class ScaleToSides {
16 public:
17 // This code assumes that a and b fit in in a float, and therefore the resul ting smaller value
18 // of a and b will fit in a float. The side of the rectangle may be larger t han a float.
19 // Scale must be less than or equal to the ratio limit / (*a + *b).
20 // This code assumes that NaN and Inf are never passed in.
21 static void AdjustRadii(double limit, double scale, SkScalar* a, SkScalar* b ) {
22 SkASSERTF(scale < 1.0 && scale > 0.0, "scale: %g", scale);
23
24 *a *= scale;
25 *b *= scale;
26
27 // This check is conservative. (double)*a + (double)*b >= (double)(*a + *b)
28 if ((double)*a + (double)*b > limit) {
29 float* minRadius = a;
30 float* maxRadius = b;
31
32 // Force minRadius to be the smaller of the two.
33 if (*minRadius > *maxRadius) {
34 SkTSwap(minRadius, maxRadius);
35 }
36
37 // newMinRadius must be float in order to give the actual value of t he radius.
38 // The newMinRadius will always be smaller than limit. The largest t hat minRadius can be
39 // is 1/2 the ratio of minRadius : (minRadius + maxRadius), therefor e in the resulting
40 // division, minRadius can be no larger than 1/2 limit + ULP.
41 float newMinRadius = *minRadius;
42
43 // Because newMaxRadius is the result of a double to float conversio n, it can be larger
44 // than limit, but only by one ULP.
45 float newMaxRadius = (float)(limit - newMinRadius);
46
47 // If newMaxRadius is larger than the same value as a double, then i t needs to be
48 // reduced by one ULP to be less than limit - newMinRadius.
49 // Note: nexttowardf is a c99 call and should be std::nexttoward, bu t this is not
50 // implemented in the ARM compiler.
51 if ((double)newMaxRadius + (double)newMinRadius > limit) {
52 newMaxRadius = nexttowardf(newMaxRadius, 0.0);
53 }
54 *maxRadius = newMaxRadius;
55 }
56
57 SkASSERTF(*a >= 0.0f && *b >= 0.0f, "a: %g, b: %g", *a, *b);
58 SkASSERTF((*a + *b) <= limit, "limit: %g, a: %g, b: %g", limit, *a, *b);
59 }
60 };
61 #endif // ScaleToSides_DEFINED
OLDNEW
« no previous file with comments | « src/core/SkRRect.cpp ('k') | tests/ScaleToSidesTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698