diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-06-09 18:43:00 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-06-10 02:56:31 +0000 |
| commit | 0480a0be81dd5c561637c8d6351191c154f72970 (patch) | |
| tree | e8c730edeb11460789f0c52b8e17584089ff36b0 /epan/color_filters.h | |
| parent | 25777d09866015d0cfef7265aefcc341321df110 (diff) | |
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>
Diffstat (limited to 'epan/color_filters.h')
| -rw-r--r-- | epan/color_filters.h | 18 |
1 files changed, 2 insertions, 16 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) * |