gEDA-cvs: gaf.git: branch: master updated (1.5.2-20090328-95-gad38ef8)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  ad38ef86300b9eae33e241333863201b7b28b688 (commit)
      from  b166d053e62c01b3b6413e0c6df275a432ba9792 (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
=========

 gschem/src/o_line.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)


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

commit ad38ef86300b9eae33e241333863201b7b28b688
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    Fix o_line_visible() to work when object clipping is switched off()
    
    We need to transfer the line's coordinates to the return locations
    before returning TRUE.

:100644 100644 6ac1dc3... f41d4e2... M	gschem/src/o_line.c

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

commit ad38ef86300b9eae33e241333863201b7b28b688
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    Fix o_line_visible() to work when object clipping is switched off()
    
    We need to transfer the line's coordinates to the return locations
    before returning TRUE.

diff --git a/gschem/src/o_line.c b/gschem/src/o_line.c
index 6ac1dc3..f41d4e2 100644
--- a/gschem/src/o_line.c
+++ b/gschem/src/o_line.c
@@ -284,13 +284,12 @@ void o_line_draw_grips(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
 int o_line_visible (GSCHEM_TOPLEVEL *w_current, LINE *line,
                     int *x1, int *y1, int *x2, int *y2)
 {
-  /* don't do clipping if this is false */
-  if (!w_current->toplevel->object_clipping) {
-    return(TRUE);
-  }
-
   *x1 = line->x[0];  *y1 = line->y[0];
   *x2 = line->x[1];  *y2 = line->y[1];
 
+  /* Do we want to skip clipping? */
+  if (!w_current->toplevel->object_clipping)
+    return TRUE;
+
   return WORLDclip_change (w_current, x1, y1, x2, y2);
 }




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