gEDA-cvs: pcb.git: branch: master updated (3fcc7bd23ee151220c442fc775b3b29f98cee2d0)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  3fcc7bd23ee151220c442fc775b3b29f98cee2d0 (commit)
       via  27b5d79992011e6f6e72011e8a93ebb92ad701dc (commit)
      from  aa28e8686b2d95f42dfcf476ad20e30ad59f78a1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 src/hid/png/png.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)


=================
 Commit Messages
=================

commit 3fcc7bd23ee151220c442fc775b3b29f98cee2d0
Author: DJ Delorie <dj@xxxxxxxxxxx>
Commit: DJ Delorie <dj@xxxxxxxxxxx>

    swap png bloat too
    
    When computing the bloat offsets for filled rectangles, apply the bloat
    after sorting the Y coordinates but before swapping them if we're
    printing the solder side.

:100644 100644 0c8eb52... 2e8e40c... M	src/hid/png/png.c

commit 27b5d79992011e6f6e72011e8a93ebb92ad701dc
Author: DJ Delorie <dj@xxxxxxxxxxx>
Commit: DJ Delorie <dj@xxxxxxxxxxx>

    Fix drawn circles
    
    When drawing a "line" that's zero length, check for rounded ends (circle)
    vs square ends (square).

:100644 100644 b819533... 0c8eb52... M	src/hid/png/png.c

=========
 Changes
=========

commit 3fcc7bd23ee151220c442fc775b3b29f98cee2d0
Author: DJ Delorie <dj@xxxxxxxxxxx>
Commit: DJ Delorie <dj@xxxxxxxxxxx>

    swap png bloat too
    
    When computing the bloat offsets for filled rectangles, apply the bloat
    after sorting the Y coordinates but before swapping them if we're
    printing the solder side.

diff --git a/src/hid/png/png.c b/src/hid/png/png.c
index 0c8eb52..2e8e40c 100644
--- a/src/hid/png/png.c
+++ b/src/hid/png/png.c
@@ -1305,10 +1305,12 @@ png_fill_rect (hidGC gc, int x1, int y1, int x2, int y2)
       y2 = y2;
       y2 = t;
     }
+  y1 -= bloat;
+  y2 += bloat;
   SWAP_IF_SOLDER (y1, y2);
 
-  gdImageFilledRectangle (im, SCALE_X (x1-bloat), SCALE_Y (y1-bloat),
-			  SCALE_X (x2+bloat)-1, SCALE_Y (y2+bloat)-1, gc->color->c);
+  gdImageFilledRectangle (im, SCALE_X (x1-bloat), SCALE_Y (y1),
+			  SCALE_X (x2+bloat)-1, SCALE_Y (y2)-1, gc->color->c);
 }
 
 static void

commit 27b5d79992011e6f6e72011e8a93ebb92ad701dc
Author: DJ Delorie <dj@xxxxxxxxxxx>
Commit: DJ Delorie <dj@xxxxxxxxxxx>

    Fix drawn circles
    
    When drawing a "line" that's zero length, check for rounded ends (circle)
    vs square ends (square).

diff --git a/src/hid/png/png.c b/src/hid/png/png.c
index b819533..0c8eb52 100644
--- a/src/hid/png/png.c
+++ b/src/hid/png/png.c
@@ -66,6 +66,8 @@ static int show_solder_side;
 #define SCALE_Y(y) ((int)(((show_solder_side ? (PCB->MaxHeight-(y)) : (y)) - y_shift)/scale))
 #define SWAP_IF_SOLDER(a,b) do { int c; if (show_solder_side) { c=a; a=b; b=c; }} while (0)
 
+static void png_fill_circle (hidGC gc, int cx, int cy, int radius);
+
 /* The result of a failed gdImageColorAllocate() call */
 #define BADC -1
 
@@ -1315,7 +1317,10 @@ png_draw_line (hidGC gc, int x1, int y1, int x2, int y2)
   if (x1 == x2 && y1 == y2)
     {
       int w = gc->width / 2;
-      png_fill_rect (gc, x1 - w, y1 - w, x1 + w, y1 + w);
+      if (gc->cap != Square_Cap)
+	png_fill_circle (gc, x1, y1, w);
+      else
+	png_fill_rect (gc, x1 - w, y1 - w, x1 + w, y1 + w);
       return;
     }
   use_gc (gc);




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs