i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Force use of std::isnan() in agg_conv_curve.h.

Browse Source 
cmath could be included before inclusion of this header, thus undefining isnan.
This commit is contained in:
Jérôme Duval
2015-07-25 23:42:14 +02:00
parent 9cd62a24e5
commit 4fb4b32043
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/libs/agg/agg_conv_curve.h
+7 -4
View File
@@ -23,6 +23,9 @@
#include "agg_basics.h" #include "agg_basics.h"
#include "agg_curves.h" #include "agg_curves.h"
#include <cmath>
namespace agg namespace agg
{ {
@@ -165,8 +168,8 @@ namespace agg
case path_cmd_curve3: case path_cmd_curve3:
m_source->vertex(&end_x, &end_y); m_source->vertex(&end_x, &end_y);
if (!isnan(m_last_x) && !isnan(m_last_y) && !isnan(*x) && !isnan(*y) if (!std::isnan(m_last_x) && !std::isnan(m_last_y) && !std::isnan(*x)
&& !isnan(end_x) && !isnan(end_y)) { && !std::isnan(*y) && !std::isnan(end_x) && !std::isnan(end_y)) {
m_curve3.init(m_last_x, m_last_y, m_curve3.init(m_last_x, m_last_y,
*x, *y, *x, *y,
end_x, end_y); end_x, end_y);
@@ -181,8 +184,8 @@ namespace agg
m_source->vertex(&ct2_x, &ct2_y); m_source->vertex(&ct2_x, &ct2_y);
m_source->vertex(&end_x, &end_y); m_source->vertex(&end_x, &end_y);
if (!isnan(m_last_x) && !isnan(m_last_y) && !isnan(*x) && !isnan(*y) if (!std::isnan(m_last_x) && !std::isnan(m_last_y) && !std::isnan(*x)
&& !isnan(end_x) && !isnan(end_y)) { && !std::isnan(*y) && !std::isnan(end_x) && !std::isnan(end_y)) {
m_curve4.init(m_last_x, m_last_y, m_curve4.init(m_last_x, m_last_y,
*x, *y, *x, *y,
ct2_x, ct2_y, ct2_x, ct2_y,