diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-12-31 18:04:37 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-01-01 02:05:07 +0000 |
| commit | 93f9416c3660b87896e8b59a4d952fb851002bb5 (patch) | |
| tree | 26109e8503ac6ea7457a5b53f4f8aa398029a593 /ui/gtk/color_utils.c | |
| parent | f7b3bda9b3957d8b479d0d7d5694ea6364ecb1a8 (diff) | |
| download | wireshark-93f9416c3660b87896e8b59a4d952fb851002bb5.tar.gz | |
Get rid of the "pixel" member of a color_t.
Now that we're letting GTK+/GDK allocate colors behind the scenes, if it
allocates them at all, there's no reason to save the allocated color in
the toolkit-independent color value.
Change-Id: I99df32bd6b07924f41f3d855d2ddecb3dc8d5201
Reviewed-on: https://code.wireshark.org/review/12983
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui/gtk/color_utils.c')
| -rw-r--r-- | ui/gtk/color_utils.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ui/gtk/color_utils.c b/ui/gtk/color_utils.c index 9df4f5b4b3..65889a2fbf 100644 --- a/ui/gtk/color_utils.c +++ b/ui/gtk/color_utils.c @@ -50,7 +50,7 @@ initialize_color(color_t *color, guint16 red, guint16 green, guint16 blue) void color_t_to_gdkcolor(GdkColor *target, const color_t *source) { - target->pixel = source->pixel; + target->pixel = 0; target->red = source->red; target->green = source->green; target->blue = source->blue; @@ -67,7 +67,6 @@ color_t_to_gdkRGBAcolor(GdkRGBA *target, const color_t *source) void gdkcolor_to_color_t(color_t *target, const GdkColor *source) { - target->pixel = source->pixel; target->red = source->red; target->green = source->green; target->blue = source->blue; @@ -76,7 +75,6 @@ gdkcolor_to_color_t(color_t *target, const GdkColor *source) void gdkRGBAcolor_to_color_t(color_t *target, const GdkRGBA *source) { - target->pixel = 0; target->red = (guint16)(source->red*65535); target->green = (guint16)(source->green*65535); target->blue = (guint16)(source->blue*65535); |