From fc80189f34c77547f20db8cb389874cb84a7aa9f Mon Sep 17 00:00:00 2001 From: Ivan Mahonin Date: Aug 16 2023 15:17:10 +0000 Subject: #assistants: fix compilation for windows --- diff --git a/toonz/sources/include/tgeometry.h b/toonz/sources/include/tgeometry.h index c669869..f5c9a81 100644 --- a/toonz/sources/include/tgeometry.h +++ b/toonz/sources/include/tgeometry.h @@ -1474,7 +1474,7 @@ public: inline int operator-(const Iterator &i) const { assert(m_flip == i.m_flip && m_begin == i.m_begin && m_end == i.m_end && m_prebegin == i.m_prebegin); - int ii = m_current - i.m_current; + int ii = (int)(m_current - i.m_current); return ii < 0 ? ii + size() : ii; } diff --git a/toonz/sources/include/tmathutil.h b/toonz/sources/include/tmathutil.h index 65e2637..15fec88 100644 --- a/toonz/sources/include/tmathutil.h +++ b/toonz/sources/include/tmathutil.h @@ -137,7 +137,7 @@ DVAPI int rootFinding(const std::vector &poly, 2 if a is not almost zero roots may have duplicates, count depends only from type of equation */ -int solveEquation2(std::complex *roots, double a, double b, double c); +DVAPI int solveEquation2(std::complex *roots, double a, double b, double c); //----------------------------------------------------------------------------- @@ -151,7 +151,7 @@ int solveEquation2(std::complex *roots, double a, double b, double c); 3 if a is not almost zero roots may have duplicates, count depends only from type of equation */ -int solveEquation3(std::complex *roots, double a, double b, double c, double d); +DVAPI int solveEquation3(std::complex *roots, double a, double b, double c, double d); //----------------------------------------------------------------------------- @@ -166,7 +166,7 @@ int solveEquation3(std::complex *roots, double a, double b, double c, do 4 if a is not almost zero roots may have duplicates, count depends only from type of equation */ -int solveEquation4(std::complex *roots, double a, double b, double c, double d, double e); +DVAPI int solveEquation4(std::complex *roots, double a, double b, double c, double d, double e); //-----------------------------------------------------------------------------