diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-11-27 11:34:51 +0100 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-11-27 18:39:41 +0000 |
| commit | 3cd7991f7f6bf6a776b50f4ee11812cbedc4454e (patch) | |
| tree | dd020b5d83c44adf3b99e021e44cc3c31cda80da /ui/qt/packet_dialog.cpp | |
| parent | 6793a037cc05402d51762a67d8603cff618839b4 (diff) | |
| download | wireshark-3cd7991f7f6bf6a776b50f4ee11812cbedc4454e.tar.gz | |
Fix display of bytes as EBCDIC
MSVC compiler does not support properly setting an enum being part of a bit field.
For example the following code:
pinfo->fd->flags.encoding = PACKET_CHAR_ENC_CHAR_EBCDIC;
changes pinfo->fd->flags.encoding from 0x0 to 0xfffffffe instead of 0x1
Let's put back an unsigned int definition (like it is in master-1.12 branch) and add explicit casts where required
Bug: 11787
Change-Id: Idae0140fb6c172f1b3dbf10baefc8cfb00128f4c
Reviewed-on: https://code.wireshark.org/review/12220
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
(cherry picked from commit 62b03da49a3e6c32f788da375faea2ca47fa2aa9)
Reviewed-on: https://code.wireshark.org/review/12229
Diffstat (limited to 'ui/qt/packet_dialog.cpp')
| -rw-r--r-- | ui/qt/packet_dialog.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/qt/packet_dialog.cpp b/ui/qt/packet_dialog.cpp index e8efeadac5..a562f37f3f 100644 --- a/ui/qt/packet_dialog.cpp +++ b/ui/qt/packet_dialog.cpp @@ -83,7 +83,7 @@ PacketDialog::PacketDialog(QWidget &parent, CaptureFile &cf, frame_data *fdata) source = (struct data_source *)src_le->data; source_name = get_data_source_name(source); byte_view_tab_->addTab(source_name, get_data_source_tvb(source), edt_.tree, proto_tree_, - cap_file_.capFile()->current_frame->flags.encoding); + (packet_char_enc)cap_file_.capFile()->current_frame->flags.encoding); wmem_free(NULL, source_name); } byte_view_tab_->setCurrentIndex(0); |