From: Robert Lipe <robertlipe@gpsbabel.org>
Date: Wed, 19 Dec 2018 04:56:45 +0000 (-0600)
Subject: Make types in ggv_bin more safe for 32/64 systems.
X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2~8^2~51^2~4
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8eb97be96640824ce36b989a56f1851f09bab57e;p=gpsbabel.git

Make types in ggv_bin more safe for 32/64 systems.
---

diff --git a/ggv_bin.cc b/ggv_bin.cc
index 40cdfa1dc..d009b4f48 100644
--- a/ggv_bin.cc
+++ b/ggv_bin.cc
@@ -37,7 +37,7 @@ static QString read_fname;
  ***************************************************************************/
 
 static void
-ggv_bin_read_bytes(QDataStream& stream, QByteArray& buf, qint64 len, const char* descr = nullptr)
+ggv_bin_read_bytes(QDataStream& stream, QByteArray& buf, int len, const char* descr = nullptr)
 {
   buf.resize(len);
   if (stream.readRawData(buf.data(), len) != len || stream.status() != QDataStream::Ok)
@@ -133,7 +133,7 @@ ggv_bin_read_v2(QDataStream& stream)
     if (global_opts.debug_level > 1)
       qDebug("------------------------------------ 0x%llx", stream.device()->pos());
 
-    quint64 entry_pos = stream.device()->pos();
+    auto entry_pos = stream.device()->pos();
     quint16 entry_type = ggv_bin_read16(stream, "entry type");
     ggv_bin_read16(stream, "entry group");
     ggv_bin_read16(stream, "entry zoom");