haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some more size_t assertions in the VRML parser debugging messages.

This commit is contained in:
Wayne Stambaugh 2015-04-19 19:46:38 -04:00
parent 1c6ae1eac7
commit 9a6a3c8b58
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
3d-viewer/vrml_v1_modelparser.cpp
View File

@ -212,7 +212,7 @@ int VRML1_MODEL_PARSER::readCoordinate3()
// DBG( printf( " readCoordinate3\n" ) );
while( GetNextTag( m_file, text, sizeof(text) ) )
while( GetNextTag( m_file, text, sizeof( text ) ) )
{
if( *text == ']' )
{
@ -401,12 +401,14 @@ int VRML1_MODEL_PARSER::readIndexedFaceSet_coordIndex()
|| (coord[0] == coord[2])
|| (coord[2] == coord[1]) )
{
wxLogTrace( traceVrmlV1Parser, wxT( " invalid coordIndex at index %u (%d, %d, %d, %d)" ), (unsigned int)m_model->m_CoordIndex.size() + 1,coord[0], coord[1], coord[2], dummy );
wxLogTrace( traceVrmlV1Parser, wxT( " invalid coordIndex at index %zu (%d, %d, %d, %d)" ),
m_model->m_CoordIndex.size() + 1, coord[0], coord[1], coord[2], dummy );
}
if( dummy != -1 )
{
wxLogTrace( traceVrmlV1Parser, wxT( " Error at index %u, -1 Expected, got %d" ), (unsigned int)m_model->m_CoordIndex.size() + 1, dummy );
wxLogTrace( traceVrmlV1Parser, wxT( " Error at index %zu, -1 Expected, got %d" ),
m_model->m_CoordIndex.size() + 1, dummy );
}
m_model->m_CoordIndex.push_back( coord_list );

6
3d-viewer/vrml_v2_modelparser.cpp
View File

@ -403,7 +403,7 @@ int VRML2_MODEL_PARSER::read_Transform()
m_model->m_rotation[0],
m_model->m_rotation[1],
m_model->m_rotation[2],
m_model->m_rotation[3] );
m_model->m_rotation[3] );
}
else if( strcmp( text, "scale" ) == 0 )
{
@ -1528,7 +1528,7 @@ int VRML2_MODEL_PARSER::read_colorIndex()
}
}
wxLogTrace( traceVrmlV2Parser, m_debugSpacer + wxT( "read_colorIndex m_MaterialIndexPerVertex.size: %lu" ), m_model->m_MaterialIndexPerVertex.size() );
wxLogTrace( traceVrmlV2Parser, m_debugSpacer + wxT( "read_colorIndex m_MaterialIndexPerVertex.size: %zu" ), m_model->m_MaterialIndexPerVertex.size() );
}
else
{
@ -1542,7 +1542,7 @@ int VRML2_MODEL_PARSER::read_colorIndex()
m_model->m_MaterialIndexPerFace.push_back( index );
}
wxLogTrace( traceVrmlV2Parser, m_debugSpacer + wxT( "read_colorIndex m_MaterialIndexPerFace.size: %lu" ), m_model->m_MaterialIndexPerFace.size() );
wxLogTrace( traceVrmlV2Parser, m_debugSpacer + wxT( "read_colorIndex m_MaterialIndexPerFace.size: %zu" ), m_model->m_MaterialIndexPerFace.size() );
}
debug_exit();