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

Fix 2 minor warning compil (unused variables)

This commit is contained in:
jean-pierre charras 2012-05-16 22:44:21 +02:00
parent 9e7cbed8c1
commit 6d1fe6fe5e
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/boost/polygon/detail/minkowski.hpp
View File

@ -24,13 +24,13 @@ struct minkowski_offset {
static void convolve_two_point_sequences(polygon_set& result, itrT1 ab, itrT1 ae, itrT2 bb, itrT2 be) { static void convolve_two_point_sequences(polygon_set& result, itrT1 ab, itrT1 ae, itrT2 bb, itrT2 be) {
if(ab == ae || bb == be) if(ab == ae || bb == be)
return; return;
point first_a = *ab; // point first_a = *ab; // seems unused
point prev_a = *ab; point prev_a = *ab;
std::vector<point> vec; std::vector<point> vec;
polygon poly; polygon poly;
++ab; ++ab;
for( ; ab != ae; ++ab) { for( ; ab != ae; ++ab) {
point first_b = *bb; // point first_b = *bb; // seems unused
point prev_b = *bb; point prev_b = *bb;
itrT2 tmpb = bb; itrT2 tmpb = bb;
++tmpb; ++tmpb;
@ -62,11 +62,11 @@ struct minkowski_offset {
a.get(a_polygons); a.get(a_polygons);
b.get(b_polygons); b.get(b_polygons);
for(std::size_t ai = 0; ai < a_polygons.size(); ++ai) { for(std::size_t ai = 0; ai < a_polygons.size(); ++ai) {
convolve_point_sequence_with_polygons(result, begin_points(a_polygons[ai]), convolve_point_sequence_with_polygons(result, begin_points(a_polygons[ai]),
end_points(a_polygons[ai]), b_polygons); end_points(a_polygons[ai]), b_polygons);
for(typename polygon_with_holes_traits<polygon>::iterator_holes_type itrh = begin_holes(a_polygons[ai]); for(typename polygon_with_holes_traits<polygon>::iterator_holes_type itrh = begin_holes(a_polygons[ai]);
itrh != end_holes(a_polygons[ai]); ++itrh) { itrh != end_holes(a_polygons[ai]); ++itrh) {
convolve_point_sequence_with_polygons(result, begin_points(*itrh), convolve_point_sequence_with_polygons(result, begin_points(*itrh),
end_points(*itrh), b_polygons); end_points(*itrh), b_polygons);
} }
for(std::size_t bi = 0; bi < b_polygons.size(); ++bi) { for(std::size_t bi = 0; bi < b_polygons.size(); ++bi) {
@ -100,9 +100,9 @@ struct minkowski_offset {
::boost::polygon::bloat(rect, 10); ::boost::polygon::bloat(rect, 10);
(*this) = rect - (*this); //invert (*this) = rect - (*this); //invert
} }
//make_arc(std::vector<point_data< T> >& return_points, //make_arc(std::vector<point_data< T> >& return_points,
//point_data< double> start, point_data< double> end, //point_data< double> start, point_data< double> end,
//point_data< double> center, double r, unsigned int num_circle_segments) //point_data< double> center, double r, unsigned int num_circle_segments)
std::vector<point_data<coordinate_type> > circle; std::vector<point_data<coordinate_type> > circle;
point_data<double> center(0.0, 0.0), start(0.0, (double)resizing); point_data<double> center(0.0, 0.0), start(0.0, (double)resizing);
make_arc(circle, start, start, center, std::abs((double)resizing), make_arc(circle, start, start, center, std::abs((double)resizing),

11
polygon/PolyLine.cpp
View File

@ -339,17 +339,6 @@ int CPolyLine::MakeKboolPoly( int aStart_contour, int aEnd_contour, std::vector<
for( int ic = ic_st; ic<=ic_end; ic++ ) for( int ic = ic_st; ic<=ic_end; ic++ )
{ {
int style = side_style[ic]; int style = side_style[ic];
int x2, y2;
if( ic < ic_end )
{
x2 = corner[ic + 1].x;
y2 = corner[ic + 1].y;
}
else
{
x2 = corner[ic_st].x;
y2 = corner[ic_st].y;
}
if( style == STRAIGHT ) if( style == STRAIGHT )
n_vertices++; n_vertices++;
else else