atria-soft/esvg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] continue removing STL

Browse Source
This commit is contained in:
Edouard DUPIN 2017-09-14 00:59:21 +02:00
parent 9ab4c0f7ab
commit ebdfeb99d8
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
esvg/render/DynamicColor.cpp
View File

@ -82,7 +82,7 @@ etk::Color<float,4> esvg::render::DynamicColorSpecial::getColorLinear(const ivec
ratio -= float(int32_t(ratio));
if (ratio <0.0f) {
#ifndef __STDCPP_LLVM__
ratio = 1.0f-std::abs(ratio);
ratio = 1.0f-etk::abs(ratio);
#else
ratio = 1.0f-abs(ratio);
#endif
@ -123,7 +123,7 @@ etk::Color<float,4> esvg::render::DynamicColorSpecial::getColorLinear(const ivec
break;
case spreadMethod_reflect:
#ifndef __STDCPP_LLVM__
ratio = std::abs(ratio);
ratio = etk::abs(ratio);
#else
ratio = abs(ratio);
#endif
@ -136,7 +136,7 @@ etk::Color<float,4> esvg::render::DynamicColorSpecial::getColorLinear(const ivec
ratio -= float(int32_t(ratio));
if (ratio <0.0f) {
#ifndef __STDCPP_LLVM__
ratio = 1.0f-std::abs(ratio);
ratio = 1.0f-etk::abs(ratio);
#else
ratio = 1.0f-abs(ratio);
#endif
@ -190,8 +190,8 @@ static etk::Pair<vec2,vec2> intersectLineToCircle(const vec2& _pos1,
distToIntersection = _radius;
} else {
#ifndef __STDCPP_LLVM__
distToCenter = std::sqrt(distToCenter);
distToIntersection = std::sqrt(_radius * _radius - distToCenter * distToCenter);
distToCenter = etk::sqrt(distToCenter);
distToIntersection = etk::sqrt(_radius * _radius - distToCenter * distToCenter);
#else
distToCenter = sqrtf(distToCenter);
distToIntersection = sqrtf(_radius * _radius - distToCenter * distToCenter);
@ -274,7 +274,7 @@ etk::Color<float,4> esvg::render::DynamicColorSpecial::getColorRadial(const ivec
ratio -= float(int32_t(ratio));
if (ratio <0.0f) {
#ifndef __STDCPP_LLVM__
ratio = 1.0f-std::abs(ratio);
ratio = 1.0f-etk::abs(ratio);
#else
ratio = 1.0f-abs(ratio);
#endif

14
esvg/render/Path.cpp
View File

@ -97,8 +97,8 @@ void interpolateCubicBezier(etk::Vector<esvg::render::Point>& _listPoint,
vec2 delta = _pos4 - _pos1;
#ifndef __STDCPP_LLVM__
float distance2 = std::abs(((_pos2.x() - _pos4.x()) * delta.y() - (_pos2.y() - _pos4.y()) * delta.x() ));
float distance3 = std::abs(((_pos3.x() - _pos4.x()) * delta.y() - (_pos3.y() - _pos4.y()) * delta.x() ));
float distance2 = etk::abs(((_pos2.x() - _pos4.x()) * delta.y() - (_pos2.y() - _pos4.y()) * delta.x() ));
float distance3 = etk::abs(((_pos3.x() - _pos4.x()) * delta.y() - (_pos3.y() - _pos4.y()) * delta.x() ));
#else
float distance2 = fabs(((_pos2.x() - _pos4.x()) * delta.y() - (_pos2.y() - _pos4.y()) * delta.x() ));
float distance3 = fabs(((_pos3.x() - _pos4.x()) * delta.y() - (_pos3.y() - _pos4.y()) * delta.x() ));
@ -377,7 +377,7 @@ esvg::render::PointList esvg::render::Path::generateListPoints(int32_t _level, i
+ (deltaPrim.y()*deltaPrim.y())/(radius.y()*radius.y());
if (ddd > 1.0f) {
#ifndef __STDCPP_LLVM__
ddd = std::sqrt(ddd);
ddd = etk::sqrt(ddd);
#else
ddd = sqrtf(ddd);
#endif
@ -395,7 +395,7 @@ esvg::render::PointList esvg::render::Path::generateListPoints(int32_t _level, i
}
if (ssb > 0.0f) {
#ifndef __STDCPP_LLVM__
sss = std::sqrt(ssa / ssb);
sss = etk::sqrt(ssa / ssb);
#else
sss = sqrtf(ssa / ssb);
#endif
@ -442,13 +442,13 @@ esvg::render::PointList esvg::render::Path::generateListPoints(int32_t _level, i
// Split arc into max 90 degree segments.
// The loop assumes an iteration per end point (including start and end), this +1.
#ifndef __STDCPP_LLVM__
int32_t ndivs = int32_t(std::abs(deltaTheta) / (M_PI*0.5f)) + 1;
int32_t ndivs = int32_t(etk::abs(deltaTheta) / (M_PI*0.5f)) + 1;
#else
int32_t ndivs = int32_t(fabs(deltaTheta) / (M_PI*0.5f)) + 1;
#endif
float hda = (deltaTheta / float(ndivs)) * 0.5f;
#ifndef __STDCPP_LLVM__
float kappa = std::abs(4.0f / 3.0f * (1.0f - std::cos(hda)) / std::sin(hda));
float kappa = etk::abs(4.0f / 3.0f * (1.0f - etk::cos(hda)) / etk::sin(hda));
#else
float kappa = fabs(4.0f / 3.0f * (1.0f - cosf(hda)) / sinf(hda));
#endif
@ -460,7 +460,7 @@ esvg::render::PointList esvg::render::Path::generateListPoints(int32_t _level, i
for (int32_t iii=0; iii<=ndivs; ++iii) {
float a = theta1 + deltaTheta * (float(iii)/(float)ndivs);
#ifndef __STDCPP_LLVM__
delta = vec2(std::cos(a), std::sin(a));
delta = vec2(etk::cos(a), etk::sin(a));
#else
delta = vec2(cosf(a), sinf(a));
#endif

2
esvg/render/Weight.cpp
View File

@ -160,7 +160,7 @@ void esvg::render::Weight::generate(ivec2 _size, int32_t _subSamplingCount, cons
if (currentPos != int32_t(it.first)) {
// fill to the new pos -1:
#if __CPP_VERSION__ >= 2011 && !defined(__TARGET_OS__MacOs) && !defined(__TARGET_OS__IOs)
float endValue = float(etk::min(1,std::abs(lastState))) * deltaSize;
float endValue = float(etk::min(1,etk::abs(lastState))) * deltaSize;
#else
float endValue = float(etk::min(1,abs(lastState))) * deltaSize;
#endif