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

Remove a Clang warning and add a missing dependency to boost in cmake file.

This commit is contained in:
Camille Delbegue 2013-08-05 17:53:13 +02:00 committed by Maciej Suminski
parent d15f0e91e2
commit 2134e7de04
5 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -403,6 +403,7 @@ add_subdirectory(tools)
add_dependencies( pcbnew boost ) add_dependencies( pcbnew boost )
add_dependencies( eeschema boost ) add_dependencies( eeschema boost )
add_dependencies( cvpcb boost ) add_dependencies( cvpcb boost )
add_dependencies( gal boost )
add_dependencies( common boost ) add_dependencies( common boost )
add_dependencies( pcbcommon boost ) add_dependencies( pcbcommon boost )
add_dependencies( 3d-viewer boost ) add_dependencies( 3d-viewer boost )

4
common/gal/stroke_font.cpp
View File

@ -29,6 +29,10 @@
using namespace KiGfx; using namespace KiGfx;
const double STROKE_FONT::LINE_HEIGHT_RATIO = 1.6;
STROKE_FONT::STROKE_FONT( GAL* aGal ) : STROKE_FONT::STROKE_FONT( GAL* aGal ) :
m_gal( aGal ), m_gal( aGal ),
m_bold( false ), m_bold( false ),

2
include/gal/stroke_font.h
View File

@ -182,7 +182,7 @@ private:
*/ */
VECTOR2D computeTextSize( const std::string& aText ) const; VECTOR2D computeTextSize( const std::string& aText ) const;
static const double LINE_HEIGHT_RATIO = 1.6; static const double LINE_HEIGHT_RATIO;
}; };
} // namespace KiGfx } // namespace KiGfx

4
pcbnew/pcb_painter.cpp
View File

@ -43,6 +43,10 @@
using namespace KiGfx; using namespace KiGfx;
const double PCB_RENDER_SETTINGS::MAX_FONT_SIZE = 100000000;
PCB_RENDER_SETTINGS::PCB_RENDER_SETTINGS() PCB_RENDER_SETTINGS::PCB_RENDER_SETTINGS()
{ {
// By default everything should be displayed as filled // By default everything should be displayed as filled

2
pcbnew/pcb_painter.h
View File

@ -106,7 +106,7 @@ protected:
bool m_netNamesOnPads; bool m_netNamesOnPads;
bool m_netNamesOnTracks; bool m_netNamesOnTracks;
static const double MAX_FONT_SIZE = 100000000; static const double MAX_FONT_SIZE;
DisplayZonesMode m_displayZoneMode; DisplayZonesMode m_displayZoneMode;
}; };