songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix callback wrapper if no callback provided

This commit is contained in:
Simon Giraudot 2020-03-02 16:11:55 +01:00
parent fb3ed79148
commit 90f7d81291
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Point_set_processing_3/include/CGAL/Point_set_processing_3/internal/Callback_wrapper.h
View File

@ -47,9 +47,9 @@ class Callback_wrapper<CGAL::Sequential_tag>
public:
Callback_wrapper (const std::function<bool(double)>& callback,
std::size_t size,
std::size_t advancement = 0,
bool interrupted = false)
std::size_t size,
std::size_t advancement = 0,
bool interrupted = false)
: m_callback (callback)
, m_advancement (advancement)
, m_interrupted (interrupted)
@ -78,7 +78,8 @@ public:
bool& interrupted()
{
m_interrupted = (m_callback(m_advancement / double(m_size)));
if (m_callback)
m_interrupted = (m_callback(m_advancement / double(m_size)));
return m_interrupted;
}
@ -164,13 +165,14 @@ public:
{
while (*m_advancement != m_size)
{
if (!m_callback (*m_advancement / double(m_size)))
if (m_callback && !m_callback (*m_advancement / double(m_size)))
*m_interrupted = true;
if (*m_interrupted)
return;
cpp11::sleep_for (0.00001);
}
m_callback (1.);
if (m_callback)
m_callback (1.);
}
};
#endif