a gfxline into a gfxpoly- for polygons which are too
complex or just degenerate, this might fail. So handle
all the cases where polygon conversion or intersection
- might go awry */
+ might fail */
if(!poly && !oldclip) {
i->out->startclip(i->out,line);
currentclip = 0;
}
}
-static gfxline_t* handle_poly(gfxdevice_t*dev, gfxpoly_t*poly, char*ok)
+gfxline_t* handle_poly(gfxdevice_t*dev, gfxpoly_t*poly)
{
internal_t*i = (internal_t*)dev->internal;
if(i->clip && i->clip->poly) {
// this is the case where everything went right
gfxline_t*line = gfxpoly_to_gfxline(poly);
gfxpoly_free(poly);
- *ok = 1;
return line;
} else {
if(i->clip && i->clip->poly) {
internal_t*i = (internal_t*)dev->internal;
gfxpoly_t* poly = gfxpoly_strokeToPoly(line, width, cap_style, joint_style, miterLimit);
- char ok = 0;
- gfxline_t*line2 = handle_poly(dev, poly, &ok);
+ gfxline_t*line2 = handle_poly(dev, poly);
- if(ok) {
- if(i->out && line2) i->out->fill(i->out, line2, color);
+ if(line2) {
+ if(i->out) i->out->fill(i->out, line2, color);
gfxline_free(line2);
} else {
- msg("<error> ..");
if(i->out) i->out->stroke(i->out, line, width, color, cap_style, joint_style, miterLimit);
}
}
internal_t*i = (internal_t*)dev->internal;
gfxpoly_t*poly = gfxpoly_fillToPoly(line);
- char ok = 0;
- gfxline_t*line2 = handle_poly(dev, poly, &ok);
+ gfxline_t*line2 = handle_poly(dev, poly);
- if(ok) {
- if(i->out && line2) i->out->fill(i->out, line2, color);
+ if(line2) {
+ if(i->out) i->out->fill(i->out, line2, color);
gfxline_free(line2);
} else {
if(i->out) i->out->fill(i->out, line, color);
internal_t*i = (internal_t*)dev->internal;
gfxpoly_t*poly = gfxpoly_fillToPoly(line);
- char ok = 0;
- gfxline_t*line2 = handle_poly(dev, poly, &ok);
+ gfxline_t*line2 = handle_poly(dev, poly);
- if(ok) {
- if(i->out && line2) i->out->fillbitmap(i->out, line2, img, matrix, cxform);
+ if(line2) {
+ if(i->out) i->out->fillbitmap(i->out, line2, img, matrix, cxform);
gfxline_free(line2);
} else {
if(i->out) i->out->fillbitmap(i->out, line, img, matrix, cxform);
internal_t*i = (internal_t*)dev->internal;
gfxpoly_t*poly = gfxpoly_fillToPoly(line);
- char ok = 0;
- gfxline_t*line2 = handle_poly(dev, poly, &ok);
+ gfxline_t*line2 = handle_poly(dev, poly);
- if(ok) {
- if(i->out && line2) i->out->fillgradient(i->out, line2, gradient, type, matrix);
+ if(line2) {
+ if(i->out) i->out->fillgradient(i->out, line2, gradient, type, matrix);
gfxline_free(line2);
} else {
if(i->out) i->out->fillgradient(i->out, line, gradient, type, matrix);
gfxbbox_t bbox = gfxline_getbbox(glyph);
gfxpoly_t*dummybox = gfxpoly_createbox(bbox.xmin,bbox.ymin,bbox.xmax,bbox.ymax);
- char ok=0;
- gfxline_t*gfxline = handle_poly(dev, dummybox, &ok);
- if(ok) {
+ gfxline_t*gfxline = handle_poly(dev, dummybox);
+ if(gfxline) {
gfxbbox_t bbox2 = gfxline_getbbox(gfxline);
double w = bbox2.xmax - bbox2.xmin;
double h = bbox2.ymax - bbox2.ymin;