Commit 9a6a3c8b authored by Wayne Stambaugh's avatar Wayne Stambaugh

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

parent 1c6ae1ea
...@@ -212,7 +212,7 @@ int VRML1_MODEL_PARSER::readCoordinate3() ...@@ -212,7 +212,7 @@ int VRML1_MODEL_PARSER::readCoordinate3()
// DBG( printf( " readCoordinate3\n" ) ); // DBG( printf( " readCoordinate3\n" ) );
while( GetNextTag( m_file, text, sizeof(text) ) ) while( GetNextTag( m_file, text, sizeof( text ) ) )
{ {
if( *text == ']' ) if( *text == ']' )
{ {
...@@ -401,12 +401,14 @@ int VRML1_MODEL_PARSER::readIndexedFaceSet_coordIndex() ...@@ -401,12 +401,14 @@ int VRML1_MODEL_PARSER::readIndexedFaceSet_coordIndex()
|| (coord[0] == coord[2]) || (coord[0] == coord[2])
|| (coord[2] == coord[1]) ) || (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 ) 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 ); m_model->m_CoordIndex.push_back( coord_list );
......
...@@ -403,7 +403,7 @@ int VRML2_MODEL_PARSER::read_Transform() ...@@ -403,7 +403,7 @@ int VRML2_MODEL_PARSER::read_Transform()
m_model->m_rotation[0], m_model->m_rotation[0],
m_model->m_rotation[1], m_model->m_rotation[1],
m_model->m_rotation[2], m_model->m_rotation[2],
m_model->m_rotation[3] ); m_model->m_rotation[3] );
} }
else if( strcmp( text, "scale" ) == 0 ) else if( strcmp( text, "scale" ) == 0 )
{ {
...@@ -1528,7 +1528,7 @@ int VRML2_MODEL_PARSER::read_colorIndex() ...@@ -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 else
{ {
...@@ -1542,7 +1542,7 @@ int VRML2_MODEL_PARSER::read_colorIndex() ...@@ -1542,7 +1542,7 @@ int VRML2_MODEL_PARSER::read_colorIndex()
m_model->m_MaterialIndexPerFace.push_back( index ); 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(); debug_exit();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment