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

[CI] reduce log level

Browse Source
This commit is contained in:
Edouard DUPIN 2015-12-03 21:21:42 +01:00
parent b1a2dec4d9
commit bbe79f971d
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -71,7 +71,7 @@ after_script:
- if [ "$GCOV" != "" ]; then - if [ "$GCOV" != "" ]; then
./ci/warning_send.py --find-path ./out/Linux_x86_64/$CONF/build/$BUILDER/esvg/; ./ci/warning_send.py --find-path ./out/Linux_x86_64/$CONF/build/$BUILDER/esvg/;
fi fi
- ./out/Linux_x86_64/$CONF/staging/$BUILDER/esvg-test/esvg-test.app/bin/esvg-test --etk-log-level=6 | tee out_test.txt - ./out/Linux_x86_64/$CONF/staging/$BUILDER/esvg-test/esvg-test.app/bin/esvg-test --etk-log-level=3 | tee out_test.txt
- if [ "$GCOV" != "" ]; then - if [ "$GCOV" != "" ]; then
./ci/test_send.py --file=out_test.txt; ./ci/test_send.py --file=out_test.txt;
lutin -C -P -t $TARGET -c $BUILDER $COMPILATOR_OPTION $BUS -m $CONF -p esvg?gcov; lutin -C -P -t $TARGET -c $BUILDER $COMPILATOR_OPTION $BUS -m $CONF -p esvg?gcov;

9
esvg/render/Path.cpp
View File

@ -101,8 +101,13 @@ void interpolateCubicBezier(std::vector<esvg::render::Point>& _listPoint,
vec2 pos34 = (_pos3+_pos4)*0.5f; vec2 pos34 = (_pos3+_pos4)*0.5f;
vec2 delta = _pos4 - _pos1; vec2 delta = _pos4 - _pos1;
float distance2 = std::abs(((_pos2.x() - _pos4.x()) * delta.y() - (_pos2.y() - _pos4.y()) * delta.x() )); #if __CPP_VERSION__ >= 2011 && !defined(__TARGET_OS__MacOs) && !defined(__TARGET_OS__IOs)
float distance3 = std::abs(((_pos3.x() - _pos4.x()) * delta.y() - (_pos3.y() - _pos4.y()) * delta.x() )); 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() ));
#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() ));
#endif
if ((distance2 + distance3)*(distance2 + distance3) < _threshold * delta.length2()) { if ((distance2 + distance3)*(distance2 + distance3) < _threshold * delta.length2()) {
_listPoint.push_back(esvg::render::Point(_pos4, _type) ); _listPoint.push_back(esvg::render::Point(_pos4, _type) );

6
esvg/render/Weight.cpp
View File

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