Put the non-filter part of epan/color_filters.h into wsutil/color.h.

Places that only need color_t, such as certain preferences, don't need
the color filter stuff.

Change-Id: I88fc2858454d04e659b323a8bc28b21d362ca3fb
Reviewed-on: https://code.wireshark.org/review/22060
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>

5 files changed, 68 insertions, 19 deletions

diff --git a/epan/color_filters.h b/epan/color_filters.h
index b90f9fd285..650c3f3734 100644
--- a/epan/color_filters.h
+++ b/epan/color_filters.h
@@ -28,16 +28,9 @@
 extern "C" {
 #endif /* __cplusplus */
 
-struct epan_dissect;
+#include <wsutil/color.h>
 
-/*
- * Data structure holding RGB value for a color.
- */
-typedef struct {
-	guint16 red;
-	guint16 green;
-	guint16 blue;
-} color_t;
+struct epan_dissect;
 
 #define CONVERSATION_COLOR_PREFIX       "___conversation_color_filter___"
 /** @file
@@ -60,13 +53,6 @@ typedef struct _color_filter {
     void      *color_edit_dlg_info; /* if filter is being edited, ptr to req'd info. GTK+ only. */
 } color_filter_t;
 
-inline static unsigned int
-color_t_to_rgb(const color_t *color) {
-    return (((color->red >> 8) << 16)
-        | ((color->green >> 8) << 8)
-        | (color->blue >> 8));
-}
-
 /** A color filter was added (while importing).
  * (color_filters.c calls this for every filter coming in)
  *
diff --git a/epan/prefs.h b/epan/prefs.h
index e68b187d11..96546a188a 100644
--- a/epan/prefs.h
+++ b/epan/prefs.h
@@ -29,11 +29,11 @@ extern "C" {
 
 #include <glib.h>
 
-#include "color_filters.h"
-
 #include <epan/params.h>
 #include <epan/range.h>
 
+#include <wsutil/color.h>
+
 #include "ws_symbol_export.h"
 
 #define PR_DEST_CMD  0
diff --git a/ui/gtk/color_utils.h b/ui/gtk/color_utils.h
index 15c4953b62..988c0bfaa1 100644
--- a/ui/gtk/color_utils.h
+++ b/ui/gtk/color_utils.h
@@ -24,7 +24,7 @@
 #define  __COLOR_UTILS_H__
 
 #include "ui/gtk/gui_utils.h"
-#include <epan/color_filters.h>
+#include <wsutil/color.h>
 
 /** @file
  *  Definitions for color structures and routines
diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am
index cb409f7f4d..920b3f1216 100644
--- a/wsutil/Makefile.am
+++ b/wsutil/Makefile.am
@@ -48,6 +48,7 @@ libwsutil_nonrepl_INCLUDES = \
 	buffer.h		\
 	clopts_common.h		\
 	cmdarg_err.h		\
+	color.h			\
 	copyright_info.h	\
 	cpu_info.h		\
 	crash_info.h		\
diff --git a/wsutil/color.h b/wsutil/color.h
new file mode 100644
index 0000000000..7199bba396
--- /dev/null
+++ b/wsutil/color.h
@@ -0,0 +1,62 @@
+/* color.h
+ * Definitions for colors
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#ifndef  __COLOR_H__
+#define  __COLOR_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/*
+ * Data structure holding RGB value for a color.
+ */
+typedef struct {
+	guint16 red;
+	guint16 green;
+	guint16 blue;
+} color_t;
+
+inline static unsigned int
+color_t_to_rgb(const color_t *color) {
+    return (((color->red >> 8) << 16)
+        | ((color->green >> 8) << 8)
+        | (color->blue >> 8));
+}
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */