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

Fix warning: declaration shadows a previous local [-Wshadow].

This commit is contained in:
markus-bonk 2022-01-31 09:25:49 +01:00 committed by jean-pierre charras
parent e9ffea83fd
commit a8486c5296
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
3d-viewer/3d_navlib/nl_3d_viewer_plugin_impl.cpp
View File

@ -195,8 +195,7 @@ void NL_3D_VIEWER_PLUGIN_IMPL::exportCommandsAndImages()
std::vector<TDx::CImage> vImages; std::vector<TDx::CImage> vImages;
// add the action set to the category_store // add the action set to the category_store
CATEGORY_STORE::iterator iter = categoryStore.insert( categoryStore.insert( categoryStore.end(), CATEGORY_STORE::value_type( ".", &commandSet ) );
categoryStore.end(), CATEGORY_STORE::value_type( ".", &commandSet ) );
std::list<TOOL_ACTION*>::const_iterator it; std::list<TOOL_ACTION*>::const_iterator it;
@ -240,14 +239,14 @@ void NL_3D_VIEWER_PLUGIN_IMPL::exportCommandsAndImages()
if( imageStream.GetSize() ) if( imageStream.GetSize() )
{ {
wxStreamBuffer* streamBuffer = imageStream.GetOutputStreamBuffer(); wxStreamBuffer* streamBuffer = imageStream.GetOutputStreamBuffer();
TDx::CImage image = TDx::CImage::FromData( "", 0, name.c_str() ); TDx::CImage tdxImage = TDx::CImage::FromData( "", 0, name.c_str() );
image.AssignImage( std::string( reinterpret_cast<const char*>( tdxImage.AssignImage( std::string( reinterpret_cast<const char*>(
streamBuffer->GetBufferStart() ), streamBuffer->GetBufferStart() ),
streamBuffer->GetBufferSize() ), streamBuffer->GetBufferSize() ),
0 ); 0 );
wxLogTrace( m_logTrace, "Adding image for : %s", name ); wxLogTrace( m_logTrace, "Adding image for : %s", name );
vImages.push_back( std::move( image ) ); vImages.push_back( std::move( tdxImage ) );
} }
} }

15
pcbnew/navlib/nl_pcbnew_plugin_impl.cpp
View File

@ -202,8 +202,7 @@ void NL_PCBNEW_PLUGIN_IMPL::exportCommandsAndImages()
std::vector<TDx::CImage> vImages; std::vector<TDx::CImage> vImages;
// add the action set to the category_store // add the action set to the category_store
CATEGORY_STORE::iterator iter = categoryStore.insert( categoryStore.insert( categoryStore.end(), CATEGORY_STORE::value_type( ".", &commandSet ) );
categoryStore.end(), CATEGORY_STORE::value_type( ".", &commandSet ) );
std::list<TOOL_ACTION*>::const_iterator it; std::list<TOOL_ACTION*>::const_iterator it;
@ -248,14 +247,14 @@ void NL_PCBNEW_PLUGIN_IMPL::exportCommandsAndImages()
if( imageStream.GetSize() ) if( imageStream.GetSize() )
{ {
wxStreamBuffer* streamBuffer = imageStream.GetOutputStreamBuffer(); wxStreamBuffer* streamBuffer = imageStream.GetOutputStreamBuffer();
TDx::CImage image = TDx::CImage::FromData( "", 0, name.c_str() ); TDx::CImage tdxImage = TDx::CImage::FromData( "", 0, name.c_str() );
image.AssignImage( std::string( reinterpret_cast<const char*>( tdxImage.AssignImage( std::string( reinterpret_cast<const char*>(
streamBuffer->GetBufferStart() ), streamBuffer->GetBufferStart() ),
streamBuffer->GetBufferSize() ), streamBuffer->GetBufferSize() ),
0 ); 0 );
wxLogTrace( m_logTrace, "Adding image for : %s", name ); wxLogTrace( m_logTrace, "Adding image for : %s", name );
vImages.push_back( std::move( image ) ); vImages.push_back( std::move( tdxImage ) );
} }
} }