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

[git@xxxxxxxxxx]

The branch, master has been updated
       via  c51f3cf1993611e43ca799bf0cfdd2fd9ab1a17a (commit)
       via  e96ecd20eba1fbb5b59b18ba1421f88195082734 (commit)
      from  24669073abf8a2ebc52d4644e3da4a9d3401d4b5 (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/gtk/gtkhid-gdk.c |   22 ++++++++++++++++++++++
 src/hid/gtk/gui.h        |   16 ----------------
 2 files changed, 22 insertions(+), 16 deletions(-)


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

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

    hid/gtk: Add a guard against GC's being passed from another HID
    
    Various other HIDs have this check.

:100644 100644 51a6f22... dc2ad98... M	src/hid/gtk/gtkhid-gdk.c

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

    hid/gtk: Move definition of the device context inside gtkhid-gdk.c
    
    Keep it private to the drawing routines.

:100644 100644 f577d3e... 51a6f22... M	src/hid/gtk/gtkhid-gdk.c
:100644 100644 245a2c3... deb3112... M	src/hid/gtk/gui.h

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

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

    hid/gtk: Add a guard against GC's being passed from another HID
    
    Various other HIDs have this check.

diff --git a/src/hid/gtk/gtkhid-gdk.c b/src/hid/gtk/gtkhid-gdk.c
index 51a6f22..dc2ad98 100644
--- a/src/hid/gtk/gtkhid-gdk.c
+++ b/src/hid/gtk/gtkhid-gdk.c
@@ -441,6 +441,13 @@ ghid_set_line_cap_angle (hidGC gc, int x1, int y1, int x2, int y2)
 static int
 use_gc (hidGC gc)
 {
+
+  if (gc->me_pointer != &ghid_hid)
+    {
+      fprintf (stderr, "Fatal: GC from another HID passed to GTK HID\n");
+      abort ();
+    }
+
   if (!gport->pixmap)
     return 0;
   if (!gc->gc)

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

    hid/gtk: Move definition of the device context inside gtkhid-gdk.c
    
    Keep it private to the drawing routines.

diff --git a/src/hid/gtk/gtkhid-gdk.c b/src/hid/gtk/gtkhid-gdk.c
index f577d3e..51a6f22 100644
--- a/src/hid/gtk/gtkhid-gdk.c
+++ b/src/hid/gtk/gtkhid-gdk.c
@@ -45,6 +45,21 @@ Vy2 (int y)
 
 /* ------------------------------------------------------------ */
 
+typedef struct hid_gc_struct
+{
+  HID *me_pointer;
+  GdkGC *gc;
+
+  gchar *colorname;
+  gint width;
+  gint cap, join;
+  gchar xor;
+  gchar erase;
+  gint mask_seq;
+}
+hid_gc_struct;
+
+
 void
 ghid_destroy_gc (hidGC gc)
 {
diff --git a/src/hid/gtk/gui.h b/src/hid/gtk/gui.h
index 245a2c3..deb3112 100644
--- a/src/hid/gtk/gui.h
+++ b/src/hid/gtk/gui.h
@@ -121,22 +121,6 @@ extern int ghid_flip_x, ghid_flip_y;
 #define GRID_UNITS_VALUE(mm, mil)   (Settings.grid_units_mm ? (mm) : (mil))
 
 
-
-typedef struct hid_gc_struct
-{
-  HID *me_pointer;
-  GdkGC *gc;
-
-  gchar *colorname;
-  gint width;
-  gint cap, join;
-  gchar xor;
-  gchar erase;
-  gint mask_seq;
-}
-hid_gc_struct;
-
-
 typedef struct
 {
   GtkUIManager *ui_manager;




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