Index: trunk/src/thermal.c
===================================================================
--- trunk/src/thermal.c	(revision 12428)
+++ trunk/src/thermal.c	(revision 12429)
@@ -118,7 +118,7 @@
 	double dx, dy, len, vx, vy, nx, ny, clr, clrth, x1, y1, x2, y2, mx, my;
 	pcb_coord_t th;
 
-	if ((x1 == line->Point2.X) && (line->Point1.Y == line->Point2.Y)) {
+	if ((line->Point1.X == line->Point2.X) && (line->Point1.Y == line->Point2.Y)) {
 		/* conrer case zero-long line is a circle: do the same as for vias */
 #warning thermal TODO
 		abort();
@@ -270,15 +270,93 @@
 	return NULL;
 }
 
+/* combine a base poly-area into the result area (pres) */
+static void polytherm_base(pcb_polyarea_t **pres, const pcb_polyarea_t *src)
+{
+	pcb_polyarea_t *p;
+
+	if (*pres != NULL) {
+		pcb_polyarea_boolean(src, *pres, &p, PCB_PBO_UNITE);
+		pcb_polyarea_free(pres);
+		*pres = p;
+	}
+	else
+		pcb_polyarea_copy0(pres, src);
+}
+
+/* combine a round clearance line set into pres; "it" is an iterator
+   already initialized to a polyarea contour */
+static void polytherm_round(pcb_polyarea_t **pres, pcb_poly_it_t *it, pcb_coord_t clr, pcb_bool is_diag)
+{
+	pcb_polyarea_t *ptmp, *p;
+	double fact = 0.5, fact_ortho=0.75;
+	pcb_coord_t cx, cy;
+	double px, py, x, y, dx, dy, vx, vy, nx, ny, mx, my, len;
+	int go, first = 1;
+
+	clr -= 2;
+
+	/* iterate over the vectors of the contour */
+	for(go = pcb_poly_vect_first(it, &cx, &cy); go; go = pcb_poly_vect_next(it, &cx, &cy)) {
+		x = cx; y = cy;
+		if (first) {
+			pcb_poly_vect_peek_prev(it, &cx, &cy);
+			px = cx; py = cy;
+			first = 0;
+		}
+
+		dx = x - px;
+		dy = y - py;
+		mx = (x+px)/2.0;
+		my = (y+py)/2.0;
+
+		len = sqrt(dx*dx + dy*dy);
+		vx = dx / len;
+		vy = dy / len;
+
+		nx = -vy;
+		ny = vx;
+
+		/* cheat: clr-2+4 to guarantee some overlap with the poly cutout */
+		if (is_diag) {
+			ptmp = pa_line_at(x - vx * clr * fact - nx * clr/2, y - vy * clr * fact - ny * clr/2, px + vx * clr *fact - nx * clr/2, py + vy * clr * fact - ny * clr/2, clr+4);
+
+			pcb_polyarea_boolean(ptmp, *pres, &p, PCB_PBO_UNITE);
+			pcb_polyarea_free(pres);
+			pcb_polyarea_free(&ptmp);
+			*pres = p;
+		}
+		else {
+			ptmp = pa_line_at(x - nx * clr/2 , y - ny * clr/2, mx + vx * clr * fact_ortho - nx * clr/2, my + vy * clr * fact_ortho - ny * clr/2, clr+4);
+			pcb_polyarea_boolean(ptmp, *pres, &p, PCB_PBO_UNITE);
+			pcb_polyarea_free(pres);
+			pcb_polyarea_free(&ptmp);
+			*pres = p;
+
+			ptmp = pa_line_at(px - nx * clr/2, py - ny * clr/2, mx - vx * clr * fact_ortho - nx * clr/2, my - vy * clr * fact_ortho - ny * clr/2, clr+4);
+			pcb_polyarea_boolean(ptmp, *pres, &p, PCB_PBO_UNITE);
+			pcb_polyarea_free(pres);
+			pcb_polyarea_free(&ptmp);
+			*pres = p;
+
+			ptmp = pcb_poly_from_circle(x, y, clr);
+			pcb_polyarea_boolean(ptmp, *pres, &p, PCB_PBO_UNITE);
+			pcb_polyarea_free(pres);
+			pcb_polyarea_free(&ptmp);
+			*pres = p;
+		}
+		px = x;
+		py = y;
+	}
+}
+
 pcb_polyarea_t *pcb_thermal_area_poly(pcb_board_t *pcb, pcb_poly_t *poly, pcb_layer_id_t lid)
 {
-	pcb_polyarea_t *ptmp, *pres = NULL, *p;
-	pcb_coord_t clr = poly->Clearance / 2 - 2;
-	double fact = 0.5, fact_ortho=0.75;
+	pcb_polyarea_t *pa, *pres = NULL;
+	pcb_coord_t clr = poly->Clearance / 2;
 	pcb_poly_it_t it;
-	pcb_polyarea_t *pa;
+	pcb_pline_t *pl;
 
-
 	assert(poly->thermal & PCB_THERMAL_ON); /* caller should have checked this */
 	switch(poly->thermal & 3) {
 		case PCB_THERMAL_NOSHAPE:
@@ -286,79 +364,14 @@
 
 		case PCB_THERMAL_ROUND:
 			/* cut out the poly so terminals will be displayed proerply */
-			for(pa = pcb_poly_island_first(poly, &it); pa != NULL; pa = pcb_poly_island_next(&it)) {
-				if (pres != NULL) {
-					pcb_polyarea_boolean(pa, pres, &p, PCB_PBO_UNITE);
-					pcb_polyarea_free(&pres);
-					pres = p;
-				}
-				else
-					pcb_polyarea_copy0(&pres, pa);
-			}
+			for(pa = pcb_poly_island_first(poly, &it); pa != NULL; pa = pcb_poly_island_next(&it))
+				polytherm_base(&pres, pa);
 
-			/* iterate over all islands of a polygon */
+			/* iterate over all islands of a polygon to generate the clear-lines */
 			for(pa = pcb_poly_island_first(poly, &it); pa != NULL; pa = pcb_poly_island_next(&it)) {
-				pcb_coord_t cx, cy;
-				double px, py, x, y, dx, dy, vx, vy, nx, ny, mx, my, len;
-				pcb_pline_t *pl;
-				int go, first = 1;
-
-				/* check if we have a contour for the given island */
 				pl = pcb_poly_contour(&it);
-				if (pl != NULL) {
-					/* iterate over the vectors of the contour */
-					for(go = pcb_poly_vect_first(&it, &cx, &cy); go; go = pcb_poly_vect_next(&it, &cx, &cy)) {
-						x = cx; y = cy;
-						if (first) {
-							pcb_poly_vect_peek_prev(&it, &cx, &cy);
-							px = cx; py = cy;
-							first = 0;
-						}
-
-						dx = x - px;
-						dy = y - py;
-						mx = (x+px)/2.0;
-						my = (y+py)/2.0;
-
-						len = sqrt(dx*dx + dy*dy);
-						vx = dx / len;
-						vy = dy / len;
-
-						nx = -vy;
-						ny = vx;
-
-						/* cheat: clr-2+4 to guarantee some overlap with the poly cutout */
-						if (poly->thermal & PCB_THERMAL_DIAGONAL) {
-							ptmp = pa_line_at(x - vx * clr * fact - nx * clr/2, y - vy * clr * fact - ny * clr/2, px + vx * clr *fact - nx * clr/2, py + vy * clr * fact - ny * clr/2, clr+4);
-
-							pcb_polyarea_boolean(ptmp, pres, &p, PCB_PBO_UNITE);
-							pcb_polyarea_free(&pres);
-							pcb_polyarea_free(&ptmp);
-							pres = p;
-						}
-						else {
-							ptmp = pa_line_at(x - nx * clr/2 , y - ny * clr/2, mx + vx * clr * fact_ortho - nx * clr/2, my + vy * clr * fact_ortho - ny * clr/2, clr+4);
-							pcb_polyarea_boolean(ptmp, pres, &p, PCB_PBO_UNITE);
-							pcb_polyarea_free(&pres);
-							pcb_polyarea_free(&ptmp);
-							pres = p;
-
-							ptmp = pa_line_at(px - nx * clr/2, py - ny * clr/2, mx - vx * clr * fact_ortho - nx * clr/2, my - vy * clr * fact_ortho - ny * clr/2, clr+4);
-							pcb_polyarea_boolean(ptmp, pres, &p, PCB_PBO_UNITE);
-							pcb_polyarea_free(&pres);
-							pcb_polyarea_free(&ptmp);
-							pres = p;
-
-							ptmp = pcb_poly_from_circle(x, y, clr);
-							pcb_polyarea_boolean(ptmp, pres, &p, PCB_PBO_UNITE);
-							pcb_polyarea_free(&pres);
-							pcb_polyarea_free(&ptmp);
-							pres = p;
-						}
-						px = x;
-						py = y;
-					}
-				}
+				if (pl != NULL)
+					polytherm_round(&pres, &it, clr, (poly->thermal & PCB_THERMAL_DIAGONAL));
 			}
 			return pres;