From 4fb4b32043174432f9b12b56f2e20a652ff2091c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Sat, 25 Jul 2015 17:28:39 +0200 Subject: [PATCH] Force use of std::isnan() in agg_conv_curve.h. cmath could be included before inclusion of this header, thus undefining isnan. --- headers/libs/agg/agg_conv_curve.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/headers/libs/agg/agg_conv_curve.h b/headers/libs/agg/agg_conv_curve.h index 751e08d9fa..bc286910ff 100644 --- a/headers/libs/agg/agg_conv_curve.h +++ b/headers/libs/agg/agg_conv_curve.h @@ -23,6 +23,9 @@ #include "agg_basics.h" #include "agg_curves.h" +#include + + namespace agg { @@ -165,8 +168,8 @@ namespace agg case path_cmd_curve3: m_source->vertex(&end_x, &end_y); - if (!isnan(m_last_x) && !isnan(m_last_y) && !isnan(*x) && !isnan(*y) - && !isnan(end_x) && !isnan(end_y)) { + if (!std::isnan(m_last_x) && !std::isnan(m_last_y) && !std::isnan(*x) + && !std::isnan(*y) && !std::isnan(end_x) && !std::isnan(end_y)) { m_curve3.init(m_last_x, m_last_y, *x, *y, end_x, end_y); @@ -181,8 +184,8 @@ namespace agg m_source->vertex(&ct2_x, &ct2_y); m_source->vertex(&end_x, &end_y); - if (!isnan(m_last_x) && !isnan(m_last_y) && !isnan(*x) && !isnan(*y) - && !isnan(end_x) && !isnan(end_y)) { + if (!std::isnan(m_last_x) && !std::isnan(m_last_y) && !std::isnan(*x) + && !std::isnan(*y) && !std::isnan(end_x) && !std::isnan(end_y)) { m_curve4.init(m_last_x, m_last_y, *x, *y, ct2_x, ct2_y,