From: Uwe Hermann <redacted>
Date: Wed, 10 May 2017 14:50:46 +0000 (+0200)
Subject: Fix a build issue with std::roundf() on Android.
X-Git-Tag: pulseview-0.4.0~86
X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff_plain;h=64a21e782d6c9081f13f8398e6408c13648d1d14;ds=sidebyside

Fix a build issue with std::roundf() on Android.

Apparently std::roundf() doesn't exist there, but plain roundf()
from <cmath> does.

This closes bug #945.
---

diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index eaa03b94..853f7c02 100644
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -74,7 +74,8 @@ void TimeMarker::set_time(const pv::util::Timestamp& time)
 
 float TimeMarker::get_x() const
 {
-	return std::roundf(((time_ - view_.offset()) / view_.scale()).convert_to<float>()) + 0.5f;
+	// Use roundf() from cmath, std::roundf() causes Android issues (see #945).
+	return roundf(((time_ - view_.offset()) / view_.scale()).convert_to<float>()) + 0.5f;
 }
 
 QPoint TimeMarker::point(const QRect &rect) const