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

[DEBUG] continue removing STL

Browse Source
This commit is contained in:
Edouard DUPIN 2017-09-17 15:23:44 +02:00
parent ebdfeb99d8
commit 1e0de1fc98
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
esvg/Path.cpp
View File

@ -116,7 +116,7 @@ bool esvg::Path::parseXML(const exml::Element& _element, mat2x3& _parentTrans, v
m_listElement.moveTo(relative, m_listElement.moveTo(relative,
vec2(listDot[0], listDot[1])); vec2(listDot[0], listDot[1]));
} }
for(int32_t iii=2; iii<listDot.size(); iii+=2) { for (size_t iii=2; iii<listDot.size(); iii+=2) {
m_listElement.lineTo(relative, m_listElement.lineTo(relative,
vec2(listDot[iii], listDot[iii+1])); vec2(listDot[iii], listDot[iii+1]));
} }
@ -129,7 +129,7 @@ bool esvg::Path::parseXML(const exml::Element& _element, mat2x3& _parentTrans, v
ESVG_WARNING("the PATH command "<< command << " has not the good number of element = " << listDot.size() ); ESVG_WARNING("the PATH command "<< command << " has not the good number of element = " << listDot.size() );
break; break;
} }
for(int32_t iii=0; iii<listDot.size(); iii+=2) { for (size_t iii=0; iii<listDot.size(); iii+=2) {
m_listElement.lineTo(relative, m_listElement.lineTo(relative,
vec2(listDot[iii], listDot[iii+1])); vec2(listDot[iii], listDot[iii+1]));
} }
@ -143,7 +143,7 @@ bool esvg::Path::parseXML(const exml::Element& _element, mat2x3& _parentTrans, v
ESVG_WARNING("the PATH command "<< command << " has not the good number of element = " << listDot.size() ); ESVG_WARNING("the PATH command "<< command << " has not the good number of element = " << listDot.size() );
break; break;
} }
for(int32_t iii=0; iii<listDot.size(); iii+=1) { for (size_t iii=0; iii<listDot.size(); iii+=1) {
m_listElement.lineToV(relative, m_listElement.lineToV(relative,
listDot[iii]); listDot[iii]);
} }
@ -153,11 +153,11 @@ bool esvg::Path::parseXML(const exml::Element& _element, mat2x3& _parentTrans, v
relative = true; relative = true;
case 'H': // Horizantal Line to (absolute) case 'H': // Horizantal Line to (absolute)
// 1 Element ... // 1 Element ...
if(listDot.size() == 0) { if (listDot.size() == 0) {
ESVG_WARNING("the PATH command "<< command << " has not the good number of element = " << listDot.size() ); ESVG_WARNING("the PATH command "<< command << " has not the good number of element = " << listDot.size() );
break; break;
} }
for(int32_t iii=0; iii<listDot.size(); iii+=1) { for (size_t iii=0; iii<listDot.size(); iii+=1) {
m_listElement.lineToH(relative, m_listElement.lineToH(relative,
listDot[iii]); listDot[iii]);
} }
@ -167,11 +167,11 @@ bool esvg::Path::parseXML(const exml::Element& _element, mat2x3& _parentTrans, v
relative = true; relative = true;
case 'Q': // Quadratic Bezier curve (absolute) case 'Q': // Quadratic Bezier curve (absolute)
// 4 Elements ... // 4 Elements ...
if(listDot.size()%4 != 0) { if (listDot.size()%4 != 0) {
ESVG_WARNING("the PATH command "<< command << " has not the good number of element = " << listDot.size() ); ESVG_WARNING("the PATH command "<< command << " has not the good number of element = " << listDot.size() );
break; break;
} }
for(int32_t iii=0; iii<listDot.size(); iii+=4) { for (size_t iii=0; iii<listDot.size(); iii+=4) {
m_listElement.bezierCurveTo(relative, m_listElement.bezierCurveTo(relative,
vec2(listDot[iii],listDot[iii+1]), vec2(listDot[iii],listDot[iii+1]),
vec2(listDot[iii+2],listDot[iii+3])); vec2(listDot[iii+2],listDot[iii+3]));
@ -182,11 +182,11 @@ bool esvg::Path::parseXML(const exml::Element& _element, mat2x3& _parentTrans, v
relative = true; relative = true;
case 'T': // smooth quadratic Bezier curve to (absolute) case 'T': // smooth quadratic Bezier curve to (absolute)
// 2 Elements ... // 2 Elements ...
if(listDot.size()%2 != 0) { if (listDot.size()%2 != 0) {
ESVG_WARNING("the PATH command "<< command << " has not the good number of element = " << listDot.size() ); ESVG_WARNING("the PATH command "<< command << " has not the good number of element = " << listDot.size() );
break; break;
} }
for(int32_t iii=0; iii<listDot.size(); iii+=2) { for (size_t iii=0; iii<listDot.size(); iii+=2) {
m_listElement.bezierSmoothCurveTo(relative, m_listElement.bezierSmoothCurveTo(relative,
vec2(listDot[iii],listDot[iii+1])); vec2(listDot[iii],listDot[iii+1]));
} }
@ -196,11 +196,11 @@ bool esvg::Path::parseXML(const exml::Element& _element, mat2x3& _parentTrans, v
relative = true; relative = true;
case 'C': // curve to (absolute) case 'C': // curve to (absolute)
// 6 Elements ... // 6 Elements ...
if(listDot.size()%6 != 0) { if (listDot.size()%6 != 0) {
ESVG_WARNING("the PATH command "<< command << " has not the good number of element = " << listDot.size() ); ESVG_WARNING("the PATH command "<< command << " has not the good number of element = " << listDot.size() );
break; break;
} }
for(int32_t iii=0; iii<listDot.size(); iii+=6) { for (size_t iii=0; iii<listDot.size(); iii+=6) {
m_listElement.curveTo(relative, m_listElement.curveTo(relative,
vec2(listDot[iii],listDot[iii+1]), vec2(listDot[iii],listDot[iii+1]),
vec2(listDot[iii+2],listDot[iii+3]), vec2(listDot[iii+2],listDot[iii+3]),
@ -212,11 +212,11 @@ bool esvg::Path::parseXML(const exml::Element& _element, mat2x3& _parentTrans, v
relative = true; relative = true;
case 'S': // smooth curve to (absolute) case 'S': // smooth curve to (absolute)
// 4 Elements ... // 4 Elements ...
if(listDot.size()%4 != 0) { if (listDot.size()%4 != 0) {
ESVG_WARNING("the PATH command "<< command << " has not the good number of element = " << listDot.size() ); ESVG_WARNING("the PATH command "<< command << " has not the good number of element = " << listDot.size() );
break; break;
} }
for(int32_t iii=0; iii<listDot.size(); iii+=4) { for (size_t iii=0; iii<listDot.size(); iii+=4) {
m_listElement.smoothCurveTo(relative, m_listElement.smoothCurveTo(relative,
vec2(listDot[iii],listDot[iii+1]), vec2(listDot[iii],listDot[iii+1]),
vec2(listDot[iii+2],listDot[iii+3])); vec2(listDot[iii+2],listDot[iii+3]));
@ -227,11 +227,11 @@ bool esvg::Path::parseXML(const exml::Element& _element, mat2x3& _parentTrans, v
relative = true; relative = true;
case 'A': // elliptical Arc (absolute) case 'A': // elliptical Arc (absolute)
// 7 Elements ... // 7 Elements ...
if(listDot.size()%7 != 0) { if (listDot.size()%7 != 0) {
ESVG_WARNING("the PATH command "<< command << " has not the good number of element = " << listDot.size() ); ESVG_WARNING("the PATH command "<< command << " has not the good number of element = " << listDot.size() );
break; break;
} }
for(int32_t iii=0; iii<listDot.size(); iii+=7) { for (size_t iii=0; iii<listDot.size(); iii+=7) {
bool largeArcFlag = true; bool largeArcFlag = true;
bool sweepFlag = true; bool sweepFlag = true;
if (listDot[iii+3] == 0.0f) { if (listDot[iii+3] == 0.0f) {
@ -252,7 +252,7 @@ bool esvg::Path::parseXML(const exml::Element& _element, mat2x3& _parentTrans, v
relative = true; relative = true;
case 'Z': // closepath (absolute) case 'Z': // closepath (absolute)
// 0 Element ... // 0 Element ...
if(listDot.size() != 0) { if (listDot.size() != 0) {
ESVG_WARNING("the PATH command "<< command << " has not the good number of element = " << listDot.size() ); ESVG_WARNING("the PATH command "<< command << " has not the good number of element = " << listDot.size() );
break; break;
} }

6
esvg/esvg.cpp
View File

@ -35,13 +35,13 @@ esvg::Document::~Document() {
void esvg::Document::displayDebug() { void esvg::Document::displayDebug() {
ESVG_DEBUG("Main SVG: size=" << m_size); ESVG_DEBUG("Main SVG: size=" << m_size);
ESVG_DEBUG(" refs:"); ESVG_DEBUG(" refs:");
for (int32_t iii=0; iii<m_refList.size(); iii++) { for (size_t iii=0; iii<m_refList.size(); iii++) {
if (m_refList[iii] != nullptr) { if (m_refList[iii] != nullptr) {
m_refList[iii]->display(2); m_refList[iii]->display(2);
} }
} }
ESVG_DEBUG(" Nodes:"); ESVG_DEBUG(" Nodes:");
for (int32_t iii=0; iii<m_subElementList.size(); iii++) { for (size_t iii=0; iii<m_subElementList.size(); iii++) {
if (m_subElementList[iii] != nullptr) { if (m_subElementList[iii] != nullptr) {
m_subElementList[iii]->display(2); m_subElementList[iii]->display(2);
} }
@ -50,7 +50,7 @@ void esvg::Document::displayDebug() {
void esvg::Document::draw(esvg::Renderer& _myRenderer, mat2x3& _basicTrans, int32_t _level) { void esvg::Document::draw(esvg::Renderer& _myRenderer, mat2x3& _basicTrans, int32_t _level) {
for (int32_t iii=0; iii<m_subElementList.size(); iii++) { for (size_t iii=0; iii<m_subElementList.size(); iii++) {
if (m_subElementList[iii] != nullptr) { if (m_subElementList[iii] != nullptr) {
m_subElementList[iii]->draw(_myRenderer, _basicTrans); m_subElementList[iii]->draw(_myRenderer, _basicTrans);
} }

4
esvg/render/Weight.cpp
View File

@ -67,7 +67,7 @@ void esvg::render::Weight::set(const ivec2& _pos, float _newColor) {
void esvg::render::Weight::set(int32_t _posY, const esvg::render::Scanline& _data) { void esvg::render::Weight::set(int32_t _posY, const esvg::render::Scanline& _data) {
if ( _posY>=0 if ( _posY>=0
&& _posY<m_size.y()) { && _posY<m_size.y()) {
for (size_t xxx=0; xxx<m_size.x(); ++xxx) { for (int32_t xxx=0; xxx<m_size.x(); ++xxx) {
m_data[xxx+_posY*m_size.x()] = _data.get(xxx); m_data[xxx+_posY*m_size.x()] = _data.get(xxx);
} }
} }
@ -76,7 +76,7 @@ void esvg::render::Weight::set(int32_t _posY, const esvg::render::Scanline& _dat
void esvg::render::Weight::append(int32_t _posY, const esvg::render::Scanline& _data) { void esvg::render::Weight::append(int32_t _posY, const esvg::render::Scanline& _data) {
if ( _posY>=0 if ( _posY>=0
&& _posY<m_size.y()) { && _posY<m_size.y()) {
for (size_t xxx=0; xxx<m_size.x(); ++xxx) { for (int32_t xxx=0; xxx<m_size.x(); ++xxx) {
m_data[xxx+_posY*m_size.x()] += _data.get(xxx); m_data[xxx+_posY*m_size.x()] += _data.get(xxx);
} }
} }