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

gerbview: Cleanup some unsigned comparisons that were extraneous

This commit is contained in:
Ian McInerney 2022-09-24 03:27:12 +01:00
parent fdb97a46c1
commit eb2ea5bcd6
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gerbview/gerber_file_image_list.cpp
View File

@ -109,14 +109,14 @@ void GERBER_FILE_IMAGE_LIST::DeleteAllImages()
} }
void GERBER_FILE_IMAGE_LIST::DeleteImage( int aIdx ) void GERBER_FILE_IMAGE_LIST::DeleteImage( unsigned int aIdx )
{ {
// Ensure the index is valid: // Ensure the index is valid:
if( aIdx < 0 || aIdx >= int( m_GERBER_List.size() ) ) if( aIdx >= m_GERBER_List.size() )
return; return;
// delete image aIdx // delete image aIdx
GERBER_FILE_IMAGE* gbr_image = GetGbrImage( aIdx ); GERBER_FILE_IMAGE* gbr_image = GetGbrImage( static_cast<int>( aIdx ) );
delete gbr_image; delete gbr_image;
m_GERBER_List[ aIdx ] = nullptr; m_GERBER_List[ aIdx ] = nullptr;
@ -457,11 +457,8 @@ std::unordered_map<int, int> GERBER_FILE_IMAGE_LIST::SortImagesByZOrder()
std::unordered_map<int, int> GERBER_FILE_IMAGE_LIST::SwapImages( unsigned int layer1, std::unordered_map<int, int> GERBER_FILE_IMAGE_LIST::SwapImages( unsigned int layer1,
unsigned int layer2 ) unsigned int layer2 )
{ {
if( ( layer1 < 0 || layer1 >= m_GERBER_List.size() ) if( ( layer1 >= m_GERBER_List.size() ) || ( layer2 >= m_GERBER_List.size() ) )
|| ( layer2 < 0 || layer2 >= m_GERBER_List.size() ) )
{
return std::unordered_map<int, int>(); return std::unordered_map<int, int>();
}
std::swap( m_GERBER_List[layer1], m_GERBER_List[layer2] ); std::swap( m_GERBER_List[layer1], m_GERBER_List[layer2] );
return GetLayerRemap(); return GetLayerRemap();
@ -469,7 +466,7 @@ std::unordered_map<int, int> GERBER_FILE_IMAGE_LIST::SwapImages( unsigned int la
std::unordered_map<int, int> GERBER_FILE_IMAGE_LIST::RemoveImage( unsigned int layer ) std::unordered_map<int, int> GERBER_FILE_IMAGE_LIST::RemoveImage( unsigned int layer )
{ {
if( layer < 0 || layer >= m_GERBER_List.size() ) if( layer >= m_GERBER_List.size() )
return std::unordered_map<int, int>(); return std::unordered_map<int, int>();
DeleteImage( layer ); DeleteImage( layer );

2
gerbview/gerber_file_image_list.h
View File

@ -127,7 +127,7 @@ public:
* *
* @param aIdx is the index ( 0 ... GERBER_DRAWLAYERS_COUNT-1 ). * @param aIdx is the index ( 0 ... GERBER_DRAWLAYERS_COUNT-1 ).
*/ */
void DeleteImage( int aIdx ); void DeleteImage( unsigned int aIdx );
/** /**
* Get the display name for the layer at \a aIdx. * Get the display name for the layer at \a aIdx.