Commit a338e0e5 authored by Wayne Stambaugh's avatar Wayne Stambaugh

Minor GCC3 compiler warning fixes.

parent dc1e4107
...@@ -139,7 +139,7 @@ private: ...@@ -139,7 +139,7 @@ private:
public: public:
GERBER_IMAGE( GERBVIEW_FRAME* aParent, int layer ); GERBER_IMAGE( GERBVIEW_FRAME* aParent, int layer );
~GERBER_IMAGE(); virtual ~GERBER_IMAGE();
void Clear_GERBER_IMAGE(); void Clear_GERBER_IMAGE();
int ReturnUsedDcodeNumber(); int ReturnUsedDcodeNumber();
virtual void ResetDefaultValues(); virtual void ResetDefaultValues();
......
...@@ -958,10 +958,10 @@ CPolyLine* CPolyLine::Chamfer( unsigned int aDistance ) ...@@ -958,10 +958,10 @@ CPolyLine* CPolyLine::Chamfer( unsigned int aDistance )
// Chamfer one half of an edge at most // Chamfer one half of an edge at most
if( 0.5*lena < distance ) if( 0.5*lena < distance )
distance = 0.5*lena; distance = (unsigned int)(0.5*(double)lena);
if( 0.5*lenb < distance ) if( 0.5*lenb < distance )
distance = 0.5*lenb; distance = (unsigned int)(0.5*(double)lenb);
nx = (int) ( (double) (distance*xa)/sqrt( (double) (xa*xa + ya*ya) ) ); nx = (int) ( (double) (distance*xa)/sqrt( (double) (xa*xa + ya*ya) ) );
ny = (int) ( (double) (distance*ya)/sqrt( (double) (xa*xa + ya*ya) ) ); ny = (int) ( (double) (distance*ya)/sqrt( (double) (xa*xa + ya*ya) ) );
...@@ -1039,10 +1039,10 @@ CPolyLine* CPolyLine::Fillet( unsigned int aRadius, unsigned int aSegments ) ...@@ -1039,10 +1039,10 @@ CPolyLine* CPolyLine::Fillet( unsigned int aRadius, unsigned int aSegments )
// Limit rounding distance to one half of an edge // Limit rounding distance to one half of an edge
if( 0.5*lena*denom < radius ) if( 0.5*lena*denom < radius )
radius = 0.5*lena*denom; radius = (unsigned int)(0.5*lena*denom);
if( 0.5*lenb*denom < radius ) if( 0.5*lenb*denom < radius )
radius = 0.5*lenb*denom; radius = (unsigned int)(0.5*lenb*denom);
// Calculate fillet arc absolute center point (xc, yx) // Calculate fillet arc absolute center point (xc, yx)
double k = radius / sqrt( .5*( 1-cosine ) ); double k = radius / sqrt( .5*( 1-cosine ) );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment