projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
| inline |
side by side
(parent:
44b2b6b
)
Fix another compile failure on non-64bit machines
author
Soeren Apel
<redacted>
Fri, 27 Dec 2019 16:47:14 +0000
(17:47 +0100)
committer
Soeren Apel
<redacted>
Fri, 27 Dec 2019 16:47:14 +0000
(17:47 +0100)
pv/views/decoder_output/QHexView.cpp
patch
|
blob
|
blame
|
history
diff --git
a/pv/views/decoder_output/QHexView.cpp
b/pv/views/decoder_output/QHexView.cpp
index 2fe54bf876075710327ef8a428bf4654f9d06606..951c818a5f7e26ec062b716387c821264385869d 100644
(file)
--- a/
pv/views/decoder_output/QHexView.cpp
+++ b/
pv/views/decoder_output/QHexView.cpp
@@
-154,7
+154,7
@@
size_t QHexView::create_hex_line(size_t start, size_t end, QString* dest,
// Determine start address for the row
uint64_t row = start / BYTES_PER_LINE;
uint64_t offset = row * BYTES_PER_LINE;
- end = std::min(end, offset + BYTES_PER_LINE);
+ end = std::min(
(uint64_t)
end, offset + BYTES_PER_LINE);
if (with_offset)
dest->append(QString("%1 ").arg(row * BYTES_PER_LINE, 10, 16, QChar('0')).toUpper());