summaryrefslogtreecommitdiff
path: root/core/math/geometry.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2017-08-18 08:12:56 +0200
committerGitHub <noreply@github.com>2017-08-18 08:12:56 +0200
commit1a92906b681735a5a2acfd98e3d6a4c75a7f6115 (patch)
treef01757ba9a3b618df7da54b0698134b1a9f03e3f /core/math/geometry.cpp
parent3a4ff3402dedab5f30b0f97aeadec6cf61f29a40 (diff)
parenteab850524ead092ed9fe22e57955e59eae373b79 (diff)
Merge pull request #10406 from marcelofg55/closest_power_of_2
Add closest_power_of_2 func and implement mix_rate/latency on OS X
Diffstat (limited to 'core/math/geometry.cpp')
-rw-r--r--core/math/geometry.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/math/geometry.cpp b/core/math/geometry.cpp
index 2bea514d37..9a5811244a 100644
--- a/core/math/geometry.cpp
+++ b/core/math/geometry.cpp
@@ -1076,8 +1076,8 @@ void Geometry::make_atlas(const Vector<Size2i> &p_rects, Vector<Point2i> &r_resu
for (int i = 0; i < results.size(); i++) {
- real_t h = nearest_power_of_2(results[i].max_h);
- real_t w = nearest_power_of_2(results[i].max_w);
+ real_t h = next_power_of_2(results[i].max_h);
+ real_t w = next_power_of_2(results[i].max_w);
real_t aspect = h > w ? h / w : w / h;
if (aspect < best_aspect) {
best = i;