compiler warning
This commit is contained in:
dickelbeck
parent
4b94704ec7
commit
4a2830e4a4
|
|
@ -1234,7 +1234,7 @@ void gpc_polygon_clip(gpc_op op, gpc_polygon *subj, gpc_polygon *clip,
|
|||
if (next_edge->bundle[ABOVE][next_edge->type])
|
||||
{
|
||||
if (EQ(e0->xb, next_edge->xb) && EQ(e0->dx, next_edge->dx)
|
||||
&& (e0->top.y != yb))
|
||||
&& (e0->top.y != yb))
|
||||
{
|
||||
next_edge->bundle[ABOVE][ next_edge->type]^=
|
||||
e0->bundle[ABOVE][ next_edge->type];
|
||||
|
|
@ -1389,10 +1389,10 @@ void gpc_polygon_clip(gpc_op op, gpc_polygon *subj, gpc_polygon *clip,
|
|||
break;
|
||||
case IMM:
|
||||
if (xb != px)
|
||||
{
|
||||
{
|
||||
add_right(cf, xb, yb);
|
||||
px= xb;
|
||||
}
|
||||
}
|
||||
merge_left(cf, edge->outp[BELOW], out_poly);
|
||||
edge->outp[BELOW]= NULL;
|
||||
add_local_min(&out_poly, edge, xb, yb);
|
||||
|
|
@ -1400,10 +1400,10 @@ void gpc_polygon_clip(gpc_op op, gpc_polygon *subj, gpc_polygon *clip,
|
|||
break;
|
||||
case EMM:
|
||||
if (xb != px)
|
||||
{
|
||||
{
|
||||
add_left(cf, xb, yb);
|
||||
px= xb;
|
||||
}
|
||||
}
|
||||
merge_right(cf, edge->outp[BELOW], out_poly);
|
||||
edge->outp[BELOW]= NULL;
|
||||
add_local_min(&out_poly, edge, xb, yb);
|
||||
|
|
@ -1444,7 +1444,7 @@ void gpc_polygon_clip(gpc_op op, gpc_polygon *subj, gpc_polygon *clip,
|
|||
|
||||
/* Copy bundle head state to the adjacent tail edge if required */
|
||||
if ((edge->bstate[BELOW] == BUNDLE_HEAD) && prev_edge)
|
||||
{
|
||||
{
|
||||
if (prev_edge->bstate[BELOW] == BUNDLE_TAIL)
|
||||
{
|
||||
prev_edge->outp[BELOW]= edge->outp[BELOW];
|
||||
|
|
@ -1452,8 +1452,8 @@ void gpc_polygon_clip(gpc_op op, gpc_polygon *subj, gpc_polygon *clip,
|
|||
if (prev_edge->prev)
|
||||
if (prev_edge->prev->bstate[BELOW] == BUNDLE_TAIL)
|
||||
prev_edge->bstate[BELOW]= BUNDLE_HEAD;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -1479,7 +1479,7 @@ void gpc_polygon_clip(gpc_op op, gpc_polygon *subj, gpc_polygon *clip,
|
|||
/* Only generate output for contributing intersections */
|
||||
if ((e0->bundle[ABOVE][CLIP] || e0->bundle[ABOVE][SUBJ])
|
||||
&& (e1->bundle[ABOVE][CLIP] || e1->bundle[ABOVE][SUBJ]))
|
||||
{
|
||||
{
|
||||
p= e0->outp[ABOVE];
|
||||
q= e1->outp[ABOVE];
|
||||
ix= intersect->point.x;
|
||||
|
|
@ -1613,17 +1613,17 @@ void gpc_polygon_clip(gpc_op op, gpc_polygon *subj, gpc_polygon *clip,
|
|||
default:
|
||||
break;
|
||||
} /* End of switch */
|
||||
} /* End of contributing intersection conditional */
|
||||
} /* End of contributing intersection conditional */
|
||||
|
||||
/* Swap bundle sides in response to edge crossing */
|
||||
if (e0->bundle[ABOVE][CLIP])
|
||||
e1->bside[CLIP]= !e1->bside[CLIP];
|
||||
e1->bside[CLIP]= !e1->bside[CLIP];
|
||||
if (e1->bundle[ABOVE][CLIP])
|
||||
e0->bside[CLIP]= !e0->bside[CLIP];
|
||||
e0->bside[CLIP]= !e0->bside[CLIP];
|
||||
if (e0->bundle[ABOVE][SUBJ])
|
||||
e1->bside[SUBJ]= !e1->bside[SUBJ];
|
||||
e1->bside[SUBJ]= !e1->bside[SUBJ];
|
||||
if (e1->bundle[ABOVE][SUBJ])
|
||||
e0->bside[SUBJ]= !e0->bside[SUBJ];
|
||||
e0->bside[SUBJ]= !e0->bside[SUBJ];
|
||||
|
||||
/* Swap e0 and e1 bundles in the AET */
|
||||
prev_edge= e0->prev;
|
||||
|
|
@ -1694,7 +1694,7 @@ void gpc_polygon_clip(gpc_op op, gpc_polygon *subj, gpc_polygon *clip,
|
|||
edge->bundle[BELOW][CLIP]= edge->bundle[ABOVE][CLIP];
|
||||
edge->bundle[BELOW][SUBJ]= edge->bundle[ABOVE][SUBJ];
|
||||
edge->xb= edge->xt;
|
||||
}
|
||||
}
|
||||
edge->outp[ABOVE]= NULL;
|
||||
}
|
||||
}
|
||||
|
|
@ -1788,7 +1788,7 @@ void gpc_tristrip_clip(gpc_op op, gpc_polygon *subj, gpc_polygon *clip,
|
|||
polygon_node *tlist= NULL, *tn, *tnn, *p, *q;
|
||||
vertex_node *lt, *ltn, *rt, *rtn;
|
||||
h_state horiz[2];
|
||||
vertex_type cft;
|
||||
vertex_type cft = vertex_type(-1);
|
||||
int in[2], exists[2], parity[2]= {LEFT, LEFT};
|
||||
int s, v, contributing, search, scanbeam= 0, sbt_entries= 0;
|
||||
int vclass, bl, br, tl, tr;
|
||||
|
|
@ -1891,7 +1891,7 @@ void gpc_tristrip_clip(gpc_op op, gpc_polygon *subj, gpc_polygon *clip,
|
|||
if (next_edge->bundle[ABOVE][next_edge->type])
|
||||
{
|
||||
if (EQ(e0->xb, next_edge->xb) && EQ(e0->dx, next_edge->dx)
|
||||
&& (e0->top.y != yb))
|
||||
&& (e0->top.y != yb))
|
||||
{
|
||||
next_edge->bundle[ABOVE][ next_edge->type]^=
|
||||
e0->bundle[ABOVE][ next_edge->type];
|
||||
|
|
@ -2013,11 +2013,11 @@ void gpc_tristrip_clip(gpc_op op, gpc_polygon *subj, gpc_polygon *clip,
|
|||
break;
|
||||
case IMN:
|
||||
if (cft == LED)
|
||||
{
|
||||
{
|
||||
if (cf->bot.y != yb)
|
||||
VERTEX(cf, BELOW, LEFT, cf->xb, yb);
|
||||
new_tristrip(&tlist, cf, cf->xb, yb);
|
||||
}
|
||||
}
|
||||
edge->outp[ABOVE]= cf->outp[ABOVE];
|
||||
VERTEX(edge, ABOVE, RIGHT, xb, yb);
|
||||
break;
|
||||
|
|
@ -2028,11 +2028,11 @@ void gpc_tristrip_clip(gpc_op op, gpc_polygon *subj, gpc_polygon *clip,
|
|||
break;
|
||||
case IRI:
|
||||
if (cft == LED)
|
||||
{
|
||||
{
|
||||
if (cf->bot.y != yb)
|
||||
VERTEX(cf, BELOW, LEFT, cf->xb, yb);
|
||||
new_tristrip(&tlist, cf, cf->xb, yb);
|
||||
}
|
||||
}
|
||||
VERTEX(edge, BELOW, RIGHT, xb, yb);
|
||||
edge->outp[ABOVE]= NULL;
|
||||
break;
|
||||
|
|
@ -2041,7 +2041,7 @@ void gpc_tristrip_clip(gpc_op op, gpc_polygon *subj, gpc_polygon *clip,
|
|||
edge->outp[ABOVE]= NULL;
|
||||
cft= IMX;
|
||||
break;
|
||||
case IMM:
|
||||
case IMM:
|
||||
VERTEX(edge, BELOW, LEFT, xb, yb);
|
||||
edge->outp[ABOVE]= cf->outp[ABOVE];
|
||||
if (xb != cf->xb)
|
||||
|
|
@ -2064,25 +2064,25 @@ void gpc_tristrip_clip(gpc_op op, gpc_polygon *subj, gpc_polygon *clip,
|
|||
case RED:
|
||||
edge->outp[ABOVE]= cf->outp[ABOVE];
|
||||
if (cft == LED)
|
||||
{
|
||||
{
|
||||
if (cf->bot.y == yb)
|
||||
{
|
||||
{
|
||||
VERTEX(edge, BELOW, RIGHT, xb, yb);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
{
|
||||
if (edge->bot.y == yb)
|
||||
{
|
||||
{
|
||||
VERTEX(cf, BELOW, LEFT, cf->xb, yb);
|
||||
VERTEX(edge, BELOW, RIGHT, xb, yb);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
{
|
||||
VERTEX(edge, BELOW, RIGHT, xb, yb);
|
||||
VERTEX(edge, ABOVE, RIGHT, xb, yb);
|
||||
}
|
||||
}
|
||||
cf= NULL;
|
||||
break;
|
||||
default:
|
||||
|
|
@ -2108,7 +2108,7 @@ void gpc_tristrip_clip(gpc_op op, gpc_polygon *subj, gpc_polygon *clip,
|
|||
|
||||
/* Copy bundle head state to the adjacent tail edge if required */
|
||||
if ((edge->bstate[BELOW] == BUNDLE_HEAD) && prev_edge)
|
||||
{
|
||||
{
|
||||
if (prev_edge->bstate[BELOW] == BUNDLE_TAIL)
|
||||
{
|
||||
prev_edge->outp[BELOW]= edge->outp[BELOW];
|
||||
|
|
@ -2116,8 +2116,8 @@ void gpc_tristrip_clip(gpc_op op, gpc_polygon *subj, gpc_polygon *clip,
|
|||
if (prev_edge->prev)
|
||||
if (prev_edge->prev->bstate[BELOW] == BUNDLE_TAIL)
|
||||
prev_edge->bstate[BELOW]= BUNDLE_HEAD;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -2143,7 +2143,7 @@ void gpc_tristrip_clip(gpc_op op, gpc_polygon *subj, gpc_polygon *clip,
|
|||
/* Only generate output for contributing intersections */
|
||||
if ((e0->bundle[ABOVE][CLIP] || e0->bundle[ABOVE][SUBJ])
|
||||
&& (e1->bundle[ABOVE][CLIP] || e1->bundle[ABOVE][SUBJ]))
|
||||
{
|
||||
{
|
||||
p= e0->outp[ABOVE];
|
||||
q= e1->outp[ABOVE];
|
||||
ix= intersect->point.x;
|
||||
|
|
@ -2306,17 +2306,17 @@ void gpc_tristrip_clip(gpc_op op, gpc_polygon *subj, gpc_polygon *clip,
|
|||
default:
|
||||
break;
|
||||
} /* End of switch */
|
||||
} /* End of contributing intersection conditional */
|
||||
} /* End of contributing intersection conditional */
|
||||
|
||||
/* Swap bundle sides in response to edge crossing */
|
||||
if (e0->bundle[ABOVE][CLIP])
|
||||
e1->bside[CLIP]= !e1->bside[CLIP];
|
||||
e1->bside[CLIP]= !e1->bside[CLIP];
|
||||
if (e1->bundle[ABOVE][CLIP])
|
||||
e0->bside[CLIP]= !e0->bside[CLIP];
|
||||
e0->bside[CLIP]= !e0->bside[CLIP];
|
||||
if (e0->bundle[ABOVE][SUBJ])
|
||||
e1->bside[SUBJ]= !e1->bside[SUBJ];
|
||||
e1->bside[SUBJ]= !e1->bside[SUBJ];
|
||||
if (e1->bundle[ABOVE][SUBJ])
|
||||
e0->bside[SUBJ]= !e0->bside[SUBJ];
|
||||
e0->bside[SUBJ]= !e0->bside[SUBJ];
|
||||
|
||||
/* Swap e0 and e1 bundles in the AET */
|
||||
prev_edge= e0->prev;
|
||||
|
|
|
|||
Loading…
Reference in New Issue