From: Soeren Apel <redacted>
Date: Thu, 26 Dec 2019 23:20:37 +0000 (+0100)
Subject: Fix build for machines that are not 64 bit
X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff_plain;h=44b2b6b7a56e744aeae38b482c2ac59b92ae73c9

Fix build for machines that are not 64 bit
---

diff --git a/pv/views/decoder_output/view.cpp b/pv/views/decoder_output/view.cpp
index c6d80d16..325fa716 100644
--- a/pv/views/decoder_output/view.cpp
+++ b/pv/views/decoder_output/view.cpp
@@ -316,11 +316,11 @@ void View::save_data_as_hex_dump(bool with_offset, bool with_ascii) const
 		QTextStream out_stream(&file);
 
 		uint64_t offset = selection.first;
-		unsigned int n = hex_view_->get_bytes_per_line();
+		uint64_t n = hex_view_->get_bytes_per_line();
 		QString s;
 
 		while (offset < selection.second) {
-			size_t end = std::min(selection.second, offset + n);
+			size_t end = std::min((uint64_t)(selection.second), offset + n);
 			offset = hex_view_->create_hex_line(offset, end, &s, with_offset, with_ascii);
 			out_stream << s << endl;
 		}