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

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

Issue 1621453004: Use nextafter instead of nexttoward to avoid using long double calculation. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Add note back. 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2016 Google Inc. 2 * Copyright 2016 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #ifndef SkScaleToSides_DEFINED 8 #ifndef SkScaleToSides_DEFINED
9 #define SkScaleToSides_DEFINED 9 #define SkScaleToSides_DEFINED
10 10
(...skipping 27 matching lines...) Expand all
38 // is 1/2 the ratio of minRadius : (minRadius + maxRadius), therefor e in the resulting 38 // is 1/2 the ratio of minRadius : (minRadius + maxRadius), therefor e in the resulting
39 // division, minRadius can be no larger than 1/2 limit + ULP. 39 // division, minRadius can be no larger than 1/2 limit + ULP.
40 float newMinRadius = *minRadius; 40 float newMinRadius = *minRadius;
41 41
42 // Because newMaxRadius is the result of a double to float conversio n, it can be larger 42 // Because newMaxRadius is the result of a double to float conversio n, it can be larger
43 // than limit, but only by one ULP. 43 // than limit, but only by one ULP.
44 float newMaxRadius = (float)(limit - newMinRadius); 44 float newMaxRadius = (float)(limit - newMinRadius);
45 45
46 // If newMaxRadius forces the total over the limit, then it needs to be 46 // If newMaxRadius forces the total over the limit, then it needs to be
47 // reduced by one ULP to be less than limit - newMinRadius. 47 // reduced by one ULP to be less than limit - newMinRadius.
48 // Note: nexttowardf is a c99 call and should be std::nexttoward, bu t this is not 48 // Note: nextafterf is a c99 call and should be std::nextafter, but this is not
49 // implemented in the ARM compiler. 49 // implemented in the GCC ARM compiler.
50 if (newMaxRadius + newMinRadius > limit) { 50 if (newMaxRadius + newMinRadius > limit) {
51 newMaxRadius = nexttowardf(newMaxRadius, 0.0); 51 newMaxRadius = nextafterf(newMaxRadius, 0.0f);
52 } 52 }
53 *maxRadius = newMaxRadius; 53 *maxRadius = newMaxRadius;
54 } 54 }
55 55
56 SkASSERTF(*a >= 0.0f && *b >= 0.0f, "a: %g, b: %g, limit: %g, scale: %g" , *a, *b, limit, 56 SkASSERTF(*a >= 0.0f && *b >= 0.0f, "a: %g, b: %g, limit: %g, scale: %g" , *a, *b, limit,
57 scale); 57 scale);
58 SkASSERTF(*a + *b <= limit, "\nlimit: %.10f, a: %.10f, b: %.10f, scale: %.20f", 58 SkASSERTF(*a + *b <= limit, "\nlimit: %.10f, a: %.10f, b: %.10f, scale: %.20f",
59 limit, *a, *b, scale); 59 limit, *a, *b, scale);
60 } 60 }
61 }; 61 };
62 #endif // ScaleToSides_DEFINED 62 #endif // ScaleToSides_DEFINED
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698