From: Soeren Apel <redacted>
Date: Fri, 27 Dec 2019 16:47:14 +0000 (+0100)
Subject: Fix another compile failure on non-64bit machines
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=b6d0bcb839f63ca1aeb78f9f86aeb6cac84ad193;p=pulseview.git

Fix another compile failure on non-64bit machines
---

diff --git a/pv/views/decoder_output/QHexView.cpp b/pv/views/decoder_output/QHexView.cpp
index 2fe54bf8..951c818a 100644
--- 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());