From 0480a0be81dd5c561637c8d6351191c154f72970 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Fri, 9 Jun 2017 18:43:00 -0700 Subject: 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 Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris --- wsutil/Makefile.am | 1 + wsutil/color.h | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 wsutil/color.h (limited to 'wsutil') 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 + * 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: + */ -- cgit v1.2.1