From 5d876644a1635ed8ac900686c31af274cc585ada Mon Sep 17 00:00:00 2001 From: Ivan Mahonin Date: May 01 2023 08:50:56 +0000 Subject: #assistants: fix link error at windows --- diff --git a/toonz/sources/common/tgeometry/tgeometry.cpp b/toonz/sources/common/tgeometry/tgeometry.cpp index 5c2b704..d8bb6b6 100644 --- a/toonz/sources/common/tgeometry/tgeometry.cpp +++ b/toonz/sources/common/tgeometry/tgeometry.cpp @@ -368,11 +368,6 @@ TAffine4 TAffine4::rotationZ(double angle) { //================================================================================================== -TAngleRangeSet::List::const_iterator TAngleRangeSet::Iterator::empty_iterator() { - static List list; - return list.end(); -} - int TAngleRangeSet::find(Type a) const { assert(!m_angles.empty()); int i0 = 0, i1 = m_angles.size() - 1; diff --git a/toonz/sources/include/tgeometry.h b/toonz/sources/include/tgeometry.h index 80b7376..7654e26 100644 --- a/toonz/sources/include/tgeometry.h +++ b/toonz/sources/include/tgeometry.h @@ -1349,7 +1349,9 @@ public: { return Type(round((a/M_2PI + 0.5)*max)); } static double toDouble(Type a) { return ((double)a/(double)max - 0.5)*M_2PI; } - + static List::const_iterator empty_iterator() + { static List list; return list.end(); } + struct Range { Type a0, a1; Range(): a0(), a1() { } @@ -1367,8 +1369,6 @@ public: List::const_iterator m_current; bool m_lapped; - static List::const_iterator empty_iterator(); - public: inline Iterator(): m_flip(), m_lapped(true) { reset(); }