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

Temporary back to boost::polygon in 3d-viewer. Fix an assert warning in hashtables.h, when a wxString contains non basic ASCII chars (Bug #1470078).

This commit is contained in:
jean-pierre charras 2015-07-04 21:53:37 +02:00
parent b9f1ada90b
commit c1bbf3ecb4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3d-viewer/3d_draw_board_body.cpp
View File

@ -354,7 +354,7 @@ void EDA_3D_CANVAS::buildBoard3DView( GLuint aBoardList, GLuint aBodyOnlyList,
if( bufferPolys.GetCornersCount() == 0 ) if( bufferPolys.GetCornersCount() == 0 )
continue; continue;
#if 0 // Set to 1 to use boost::polygon to subtract holes to copper areas #if 1 // Set to 1 to use boost::polygon to subtract holes to copper areas
// (due to bugs in boost::polygon, this is deprecated and Clipper is used instead // (due to bugs in boost::polygon, this is deprecated and Clipper is used instead
KI_POLYGON_SET currLayerPolyset; KI_POLYGON_SET currLayerPolyset;
KI_POLYGON_SET polysetHoles; KI_POLYGON_SET polysetHoles;

4
include/hashtables.h
View File

@ -107,10 +107,10 @@ struct WXSTRING_HASH : std::unary_function<wxString, std::size_t>
for( wxString::const_iterator it = aString.begin(); it != aString.end(); ++it ) for( wxString::const_iterator it = aString.begin(); it != aString.end(); ++it )
{ {
hash ^= (unsigned char) *it; unsigned ch = static_cast<unsigned>( *it );
hash ^= ch;
hash *= 16777619; hash *= 16777619;
} }
return hash; return hash;
} }
}; };