fly/terragear
1
0
Fork 0
Code Activity

tgconstruct: align with recent SimGear changes

Browse source 
sgClearReadError() has been removed.
sgClearWriteError() has been removed.
This commit is contained in:
Scott Giese 2021-05-09 18:03:42 -05:00
parent db606f647d
commit 37ecd8aa21
1 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/BuildTiles/Main/tgconstruct_shared.cxx
View file

@ -77,8 +77,6 @@ void TGConstruct::CreateMatchedEdgeFiles( std::vector<SGBucket>& bucketList )
return; return;
} }
sgClearWriteError();
// north // north
nCount = north.size(); nCount = north.size();
SG_LOG( SG_GENERAL, SG_DEBUG, "write " << north.size() << " northern nodes to file " << filepath.c_str() ); SG_LOG( SG_GENERAL, SG_DEBUG, "write " << north.size() << " northern nodes to file " << filepath.c_str() );
@ -200,8 +198,6 @@ void TGConstruct::SaveSharedEdgeData( int stage )
return; return;
} }
sgClearWriteError();
// north // north
nCount = north.size(); nCount = north.size();
sgWriteInt( fp, nCount ); sgWriteInt( fp, nCount );
@ -273,7 +269,6 @@ void TGConstruct::SaveSharedEdgeData( int stage )
SG_LOG( SG_GENERAL, SG_INFO,"ERROR: opening " << file_north.c_str() << " for writing!" ); SG_LOG( SG_GENERAL, SG_INFO,"ERROR: opening " << file_north.c_str() << " for writing!" );
return; return;
} }
sgClearWriteError();
nCount = north.size(); nCount = north.size();
sgWriteInt( fp, nCount ); sgWriteInt( fp, nCount );
@ -289,7 +284,6 @@ void TGConstruct::SaveSharedEdgeData( int stage )
SG_LOG( SG_GENERAL, SG_INFO,"ERROR: opening " << file_south.c_str() << " for writing!" ); SG_LOG( SG_GENERAL, SG_INFO,"ERROR: opening " << file_south.c_str() << " for writing!" );
return; return;
} }
sgClearWriteError();
nCount = south.size(); nCount = south.size();
sgWriteInt( fp, nCount ); sgWriteInt( fp, nCount );
@ -304,7 +298,6 @@ void TGConstruct::SaveSharedEdgeData( int stage )
SG_LOG( SG_GENERAL, SG_INFO,"ERROR: opening " << file_east.c_str() << " for writing!" ); SG_LOG( SG_GENERAL, SG_INFO,"ERROR: opening " << file_east.c_str() << " for writing!" );
return; return;
} }
sgClearWriteError();
nCount = east.size(); nCount = east.size();
sgWriteInt( fp, nCount ); sgWriteInt( fp, nCount );
@ -319,7 +312,6 @@ void TGConstruct::SaveSharedEdgeData( int stage )
SG_LOG( SG_GENERAL, SG_INFO,"ERROR: opening " << file_west.c_str() << " for writing!" ); SG_LOG( SG_GENERAL, SG_INFO,"ERROR: opening " << file_west.c_str() << " for writing!" );
return; return;
} }
sgClearWriteError();
nCount = west.size(); nCount = west.size();
sgWriteInt( fp, nCount ); sgWriteInt( fp, nCount );
@ -388,7 +380,6 @@ void TGConstruct::LoadSharedEdgeData( int stage )
file = dir + "/" + b.gen_index_str() + "_south_edge"; file = dir + "/" + b.gen_index_str() + "_south_edge";
fp = gzopen( file.c_str(), "rb" ); fp = gzopen( file.c_str(), "rb" );
if (fp) { if (fp) {
sgClearReadError();
ReadNeighborFaces( fp ); ReadNeighborFaces( fp );
gzclose( fp ); gzclose( fp );
} }
@ -399,7 +390,6 @@ void TGConstruct::LoadSharedEdgeData( int stage )
file = dir + "/" + b.gen_index_str() + "_north_edge"; file = dir + "/" + b.gen_index_str() + "_north_edge";
fp = gzopen( file.c_str(), "rb" ); fp = gzopen( file.c_str(), "rb" );
if (fp) { if (fp) {
sgClearReadError();
ReadNeighborFaces( fp ); ReadNeighborFaces( fp );
gzclose( fp ); gzclose( fp );
} }
@ -410,7 +400,6 @@ void TGConstruct::LoadSharedEdgeData( int stage )
file = dir + "/" + b.gen_index_str() + "_west_edge"; file = dir + "/" + b.gen_index_str() + "_west_edge";
fp = gzopen( file.c_str(), "rb" ); fp = gzopen( file.c_str(), "rb" );
if (fp) { if (fp) {
sgClearReadError();
ReadNeighborFaces( fp ); ReadNeighborFaces( fp );
gzclose( fp ); gzclose( fp );
} }
@ -421,7 +410,6 @@ void TGConstruct::LoadSharedEdgeData( int stage )
file = dir + "/" + b.gen_index_str() + "_east_edge"; file = dir + "/" + b.gen_index_str() + "_east_edge";
fp = gzopen( file.c_str(), "rb" ); fp = gzopen( file.c_str(), "rb" );
if (fp) { if (fp) {
sgClearReadError();
ReadNeighborFaces( fp ); ReadNeighborFaces( fp );
gzclose( fp ); gzclose( fp );
} }
@ -561,7 +549,7 @@ void TGConstruct::SaveToIntermediateFiles( int stage )
SG_LOG( SG_GENERAL, SG_INFO,"ERROR: opening " << file_clipped.c_str() << " for writing!" ); SG_LOG( SG_GENERAL, SG_INFO,"ERROR: opening " << file_clipped.c_str() << " for writing!" );
return; return;
} }
sgClearWriteError();
polys_clipped.SaveToGzFile( fp ); polys_clipped.SaveToGzFile( fp );
gzclose( fp ); gzclose( fp );
@ -569,7 +557,7 @@ void TGConstruct::SaveToIntermediateFiles( int stage )
SG_LOG( SG_GENERAL, SG_INFO,"ERROR: opening " << file_nodes.c_str() << " for writing!" ); SG_LOG( SG_GENERAL, SG_INFO,"ERROR: opening " << file_nodes.c_str() << " for writing!" );
return; return;
} }
sgClearWriteError();
nodes.SaveToGzFile( fp ); nodes.SaveToGzFile( fp );
gzclose( fp ); gzclose( fp );
@ -596,7 +584,7 @@ void TGConstruct::SaveToIntermediateFiles( int stage )
SG_LOG( SG_GENERAL, SG_INFO,"ERROR: opening " << file_clipped.c_str() << " for writing!" ); SG_LOG( SG_GENERAL, SG_INFO,"ERROR: opening " << file_clipped.c_str() << " for writing!" );
return; return;
} }
sgClearWriteError();
polys_clipped.SaveToGzFile( fp ); polys_clipped.SaveToGzFile( fp );
gzclose( fp ); gzclose( fp );
@ -604,7 +592,7 @@ void TGConstruct::SaveToIntermediateFiles( int stage )
SG_LOG( SG_GENERAL, SG_INFO,"ERROR: opening " << file_nodes.c_str() << " for writing!" ); SG_LOG( SG_GENERAL, SG_INFO,"ERROR: opening " << file_nodes.c_str() << " for writing!" );
return; return;
} }
sgClearWriteError();
nodes.SaveToGzFile( fp ); nodes.SaveToGzFile( fp );
gzclose( fp ); gzclose( fp );