diff options
| author | Anthony Coddington <anthony.coddington@endace.com> | 2017-08-18 20:51:14 +1200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-08-21 10:42:06 +0000 |
| commit | fa390fa8f388efbc1859d22663e1694739ad77eb (patch) | |
| tree | 11b306a391b4ee9af906bfe163f555772e56220a /epan/print.c | |
| parent | 5939c7417d1f2e24b6e9b78160fe7588d634e7e1 (diff) | |
Fix bit depth of color psml and pdml xml attributes
color_t is 16-bit per channel, the print string assumes the usual 8-bit.
Use 8-bit per channel as per older patches proposed for bug 6682 via
color_t_to_rgb().
Change-Id: I7d71bc04e52376c0ecb598aedafa066f982de840
Ping-Bug: 6682
Reviewed-on: https://code.wireshark.org/review/23154
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/print.c')
| -rw-r--r-- | epan/print.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/print.c b/epan/print.c index 41b64ea4db..f9a79f10ff 100644 --- a/epan/print.c +++ b/epan/print.c @@ -321,9 +321,9 @@ write_pdml_proto_tree(output_fields_t* fields, gchar **protocolfilter, pf_flags /* Create the output */ if (use_color && (cfp != NULL)) { - fprintf(fh, "<packet foreground='#%02x%02x%02x' background='#%02x%02x%02x'>\n", - cfp->fg_color.red, cfp->fg_color.green, cfp->fg_color.blue, - cfp->bg_color.red, cfp->bg_color.green, cfp->bg_color.blue); + fprintf(fh, "<packet foreground='#%06x' background='#%06x'>\n", + color_t_to_rgb(&cfp->fg_color), + color_t_to_rgb(&cfp->bg_color)); } else { fprintf(fh, "<packet>\n"); @@ -1466,9 +1466,9 @@ write_psml_columns(epan_dissect_t *edt, FILE *fh, gboolean use_color) const color_filter_t *cfp = edt->pi.fd->color_filter; if (use_color && (cfp != NULL)) { - fprintf(fh, "<packet foreground='#%02x%02x%02x' background='#%02x%02x%02x'>\n", - cfp->fg_color.red, cfp->fg_color.green, cfp->fg_color.blue, - cfp->bg_color.red, cfp->bg_color.green, cfp->bg_color.blue); + fprintf(fh, "<packet foreground='#%06x' background='#%06x'>\n", + color_t_to_rgb(&cfp->fg_color), + color_t_to_rgb(&cfp->bg_color)); } else { fprintf(fh, "<packet>\n"); |