From 741f203565ba9f92b0ace80d858073f75ced2716 Mon Sep 17 00:00:00 2001
From: Peter Clifton <peter@clifton-electronics.co.uk>
Date: Wed, 14 Nov 2012 23:02:58 +0000
Subject: [PATCH] Convert mask type to enum

---
 src/hid.h                 | 17 ++++++++---------
 src/hid/common/extents.c  |  2 +-
 src/hid/common/hidnogui.c |  2 +-
 src/hid/gcode/gcode.c     |  2 +-
 src/hid/gerber/gerber.c   | 10 +++++-----
 src/hid/gtk/gtkhid-gdk.c  | 10 +++++-----
 src/hid/gtk/gtkhid-gl.c   | 10 +++++-----
 src/hid/gtk/gui.h         |  2 +-
 src/hid/nelma/nelma.c     |  2 +-
 src/hid/png/png.c         |  6 +++---
 src/hid/ps/eps.c          |  7 ++++---
 src/hid/ps/ps.c           |  2 +-
 12 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/hid.h b/src/hid.h
index 28daf1d603..6c5f606067 100644
--- a/src/hid.h
+++ b/src/hid.h
@@ -232,6 +232,13 @@ typedef enum
     int (*throw_drc_dialog) (void);
   } HID_DRC_GUI;
 
+  enum mask_mode {
+    HID_MASK_OFF    = 0, /* Flush the buffer and return to non-mask operation. */
+    HID_MASK_BEFORE = 1, /* Polygons being drawn before clears.                */
+    HID_MASK_CLEAR  = 2, /* Clearances being drawn.                            */
+    HID_MASK_AFTER  = 3, /* Polygons being drawn after clears.                 */
+  };
+
   typedef struct hid_st HID;
 
 /* This is the main HID structure.  */
@@ -333,15 +340,7 @@ typedef enum
        call use_mask(HID_MASK_OFF) to flush the buffer to the HID.  If
        you use the "erase" color when use_mask is disabled, it simply
        draws in the background color.  */
-    void (*use_mask) (int use_it_);
-    /* Flush the buffer and return to non-mask operation.  */
-#define HID_MASK_OFF 0
-    /* Polygons being drawn before clears.  */
-#define HID_MASK_BEFORE 1
-    /* Clearances being drawn.  */
-#define HID_MASK_CLEAR 2
-    /* Polygons being drawn after clears.  */
-#define HID_MASK_AFTER 3
+    void (*use_mask) (enum mask_mode mode);
 
     /* Set a color.  Names can be like "red" or "#rrggbb" or special
        names like "erase".  *Always* use the "erase" color for removing
diff --git a/src/hid/common/extents.c b/src/hid/common/extents.c
index d970c77ca6..c9e34187e3 100644
--- a/src/hid/common/extents.c
+++ b/src/hid/common/extents.c
@@ -71,7 +71,7 @@ extents_destroy_gc (hidGC gc)
 }
 
 static void
-extents_use_mask (int use_it)
+extents_use_mask (enum mask_mode mode)
 {
 }
 
diff --git a/src/hid/common/hidnogui.c b/src/hid/common/hidnogui.c
index d772e18bda..a6ae852eb0 100644
--- a/src/hid/common/hidnogui.c
+++ b/src/hid/common/hidnogui.c
@@ -81,7 +81,7 @@ nogui_destroy_gc (hidGC gc)
 }
 
 static void
-nogui_use_mask (int use_it)
+nogui_use_mask (enum mask_mode mode)
 {
   CRASH;
 }
diff --git a/src/hid/gcode/gcode.c b/src/hid/gcode/gcode.c
index 33c4a00c93..40b0d7f725 100644
--- a/src/hid/gcode/gcode.c
+++ b/src/hid/gcode/gcode.c
@@ -1183,7 +1183,7 @@ gcode_destroy_gc (hidGC gc)
 }
 
 static void
-gcode_use_mask (int use_it)
+gcode_use_mask (enum mask_mode mode)
 {
   /* does nothing */
 }
diff --git a/src/hid/gerber/gerber.c b/src/hid/gerber/gerber.c
index 79c044700c..8d73c7e880 100644
--- a/src/hid/gerber/gerber.c
+++ b/src/hid/gerber/gerber.c
@@ -48,7 +48,7 @@ static void gerber_parse_arguments (int *argc, char ***argv);
 static int gerber_set_layer (const char *name, int group, int empty);
 static hidGC gerber_make_gc (void);
 static void gerber_destroy_gc (hidGC gc);
-static void gerber_use_mask (int use_it);
+static void gerber_use_mask (enum mask_mode mode);
 static void gerber_set_color (hidGC gc, const char *name);
 static void gerber_set_line_cap (hidGC gc, EndCapStyle style);
 static void gerber_set_line_width (hidGC gc, Coord width);
@@ -86,7 +86,7 @@ static int metric;
 static char *x_convspec, *y_convspec;
 static int is_mask, was_drill;
 static int is_drill;
-static int current_mask;
+static enum mask_mode current_mask;
 static int flash_drills;
 static int copy_outline_mode;
 static int name_style;
@@ -706,7 +706,7 @@ gerber_set_layer (const char *name, int group, int empty)
 
   is_drill = (SL_TYPE (idx) == SL_PDRILL || SL_TYPE (idx) == SL_UDRILL);
   is_mask = (SL_TYPE (idx) == SL_MASK);
-  current_mask = 0;
+  current_mask = HID_MASK_OFF;
 #if 0
   printf ("Layer %s group %d drill %d mask %d\n", name, group, is_drill,
 	  is_mask);
@@ -891,9 +891,9 @@ gerber_destroy_gc (hidGC gc)
 }
 
 static void
-gerber_use_mask (int use_it)
+gerber_use_mask (enum mask_mode mode)
 {
-  current_mask = use_it;
+  current_mask = mode;
 }
 
 static void
diff --git a/src/hid/gtk/gtkhid-gdk.c b/src/hid/gtk/gtkhid-gdk.c
index 8e6cf224f3..6c159b4114 100644
--- a/src/hid/gtk/gtkhid-gdk.c
+++ b/src/hid/gtk/gtkhid-gdk.c
@@ -20,7 +20,7 @@ extern HID ghid_hid;
 */
 #define USE_GC(gc) if (!use_gc(gc)) return
 
-static int cur_mask = -1;
+static enum mask_mode cur_mask = HID_MASK_OFF;
 static int mask_seq = 0;
 
 typedef struct render_priv {
@@ -258,7 +258,7 @@ ghid_draw_bg_image (void)
 #define WHICH_GC(gc) (cur_mask == HID_MASK_CLEAR ? priv->mask_gc : (gc)->gc)
 
 void
-ghid_use_mask (int use_it)
+ghid_use_mask (enum mask_mode mode)
 {
   static int mask_seq_id = 0;
   GdkColor color;
@@ -266,9 +266,9 @@ ghid_use_mask (int use_it)
 
   if (!gport->pixmap)
     return;
-  if (use_it == cur_mask)
+  if (mode == cur_mask)
     return;
-  switch (use_it)
+  switch (mode)
     {
     case HID_MASK_OFF:
       gport->drawable = gport->pixmap;
@@ -308,7 +308,7 @@ ghid_use_mask (int use_it)
       break;
 
     }
-  cur_mask = use_it;
+  cur_mask = mode;
 }
 
 
diff --git a/src/hid/gtk/gtkhid-gl.c b/src/hid/gtk/gtkhid-gl.c
index a1c6e5bb06..19132109bd 100644
--- a/src/hid/gtk/gtkhid-gl.c
+++ b/src/hid/gtk/gtkhid-gl.c
@@ -41,7 +41,7 @@ static hidGC current_gc = NULL;
 */
 #define USE_GC(gc) if (!use_gc(gc)) return
 
-static int cur_mask = -1;
+static enum mask_mode cur_mask = HID_MASK_OFF;
 static GLfloat view_matrix[4][4] = {{1.0, 0.0, 0.0, 0.0},
                                     {0.0, 1.0, 0.0, 0.0},
                                     {0.0, 0.0, 1.0, 0.0},
@@ -287,17 +287,17 @@ ghid_draw_bg_image (void)
 }
 
 void
-ghid_use_mask (int use_it)
+ghid_use_mask (enum mask_mode mode)
 {
   static int stencil_bit = 0;
 
-  if (use_it == cur_mask)
+  if (mode == cur_mask)
     return;
 
   /* Flush out any existing geoemtry to be rendered */
   hidgl_flush_triangles (&buffer);
 
-  switch (use_it)
+  switch (mode)
     {
     case HID_MASK_BEFORE:
       /* The HID asks not to receive this mask type, so warn if we get it */
@@ -326,7 +326,7 @@ ghid_use_mask (int use_it)
       glDisable (GL_STENCIL_TEST);                /* Disable Stencil test */
       break;
     }
-  cur_mask = use_it;
+  cur_mask = mode;
 }
 
 
diff --git a/src/hid/gtk/gui.h b/src/hid/gtk/gui.h
index 77fa4d4e5c..af719fd6d1 100644
--- a/src/hid/gtk/gui.h
+++ b/src/hid/gtk/gui.h
@@ -472,7 +472,7 @@ void ghid_pinout_window_show (GHidPort *out, ElementType *Element);
 int ghid_set_layer (const char *name, int group, int empty);
 hidGC ghid_make_gc (void);
 void ghid_destroy_gc (hidGC);
-void ghid_use_mask (int use_it);
+void ghid_use_mask (enum mask_mode mode);
 void ghid_set_color (hidGC gc, const char *name);
 void ghid_set_line_cap (hidGC gc, EndCapStyle style);
 void ghid_set_line_width (hidGC gc, Coord width);
diff --git a/src/hid/nelma/nelma.c b/src/hid/nelma/nelma.c
index 048f476302..fe71234c9b 100644
--- a/src/hid/nelma/nelma.c
+++ b/src/hid/nelma/nelma.c
@@ -776,7 +776,7 @@ nelma_destroy_gc(hidGC gc)
 }
 
 static void 
-nelma_use_mask(int use_it)
+nelma_use_mask(enum mask_mode mode)
 {
 	/* does nothing */
 }
diff --git a/src/hid/png/png.c b/src/hid/png/png.c
index c7c0efd734..23f5247755 100644
--- a/src/hid/png/png.c
+++ b/src/hid/png/png.c
@@ -1357,16 +1357,16 @@ png_destroy_gc (hidGC gc)
 }
 
 static void
-png_use_mask (int use_it)
+png_use_mask (enum mask_mode mode)
 {
   if (photo_mode)
     return;
 
-  if (use_it == HID_MASK_CLEAR)
+  if (mode == HID_MASK_CLEAR)
     {
       return;
     }
-  if (use_it)
+  if (mode != HID_MASK_OFF)
     {
       if (mask_im == NULL)
 	{
diff --git a/src/hid/ps/eps.c b/src/hid/ps/eps.c
index 0e90c7bfd9..8988de8452 100644
--- a/src/hid/ps/eps.c
+++ b/src/hid/ps/eps.c
@@ -35,7 +35,7 @@ static void eps_parse_arguments (int *argc, char ***argv);
 static int eps_set_layer (const char *name, int group, int empty);
 static hidGC eps_make_gc (void);
 static void eps_destroy_gc (hidGC gc);
-static void eps_use_mask (int use_it);
+static void eps_use_mask (enum mask_mode mode);
 static void eps_set_color (hidGC gc, const char *name);
 static void eps_set_line_cap (hidGC gc, EndCapStyle style);
 static void eps_set_line_width (hidGC gc, Coord width);
@@ -442,10 +442,10 @@ eps_destroy_gc (hidGC gc)
 }
 
 static void
-eps_use_mask (int use_it)
+eps_use_mask (enum mask_mode mode)
 {
   static int mask_pending = 0;
-  switch (use_it)
+  switch (mode)
     {
     case HID_MASK_CLEAR:
       if (!mask_pending)
@@ -454,6 +454,7 @@ eps_use_mask (int use_it)
 	  fprintf (f, "gsave\n");
 	}
       break;
+    case HID_MASK_BEFORE:
     case HID_MASK_AFTER:
       break;
     case HID_MASK_OFF:
diff --git a/src/hid/ps/ps.c b/src/hid/ps/ps.c
index 55873471b6..a192423e71 100644
--- a/src/hid/ps/ps.c
+++ b/src/hid/ps/ps.c
@@ -1025,7 +1025,7 @@ ps_destroy_gc (hidGC gc)
 }
 
 static void
-ps_use_mask (int use_it)
+ps_use_mask (enum mask_mode mode)
 {
   /* does nothing */
 }
-- 
2.11.4.GIT