Merge branch 'master' of https://github.com/gpsbabel/gpsbabel into main

Author: GPSBabelDeveloper

.github/workflows/codeql-analysis.yml

@@ -26,7 +26,10 @@ jobs:
   analyze:
     name: Analyze
     runs-on: ubuntu-latest
-    container: tsteven4/gpsbabel_build_environment_focal
+    container:
+      image: gpsbabel-docker.jfrog.io/tsteven4/gpsbabel_build_environment_focal
+      env:
+        CMAKE_GENERATOR: Ninja
 
     strategy:
       fail-fast: false

.github/workflows/fedora.yml

@@ -14,11 +14,20 @@ jobs:
       fail-fast: false
       matrix:
         # version 32, though obsolete, uses Qt 5.14 so we keep it for that.
-        version: ['32', '35', '37']
+        include:
+          - IMAGE: '32'
+            CMAKE_PREFIX_PATH: '/usr/lib64/cmake/Qt5'
+          - IMAGE: '35'
+            CMAKE_PREFIX_PATH: '/usr/lib64/cmake/Qt5'
+          - IMAGE: '37'
+            CMAKE_PREFIX_PATH: '/usr/lib64/cmake/Qt5'
+          - IMAGE: '37'
+            CMAKE_PREFIX_PATH: '/usr/lib64/cmake/Qt6'
     container:
-      image: gpsbabel-docker.jfrog.io/tsteven4/gpsbabel_build_environment_f${{ matrix.version }}
+      image: gpsbabel-docker.jfrog.io/tsteven4/gpsbabel_build_environment_f${{ matrix.IMAGE }}
       env:
-        LC_ALL: C.UTF-8
+        LC_ALL: 'C.UTF-8'
+        JOB_CMAKE_PREFIX_PATH: ${{ matrix.CMAKE_PREFIX_PATH }}
 
     steps:
     - name: Checkout repository
@@ -28,4 +37,8 @@ jobs:
       run: |
         # when using containers manually whitelist the checkout directory to allow git commands to work
         git config --global --add safe.directory "${GITHUB_WORKSPACE}"
+        if [ -n "${JOB_CMAKE_PREFIX_PATH}" ]; then
+          CMAKE_PREFIX_PATH="${JOB_CMAKE_PREFIX_PATH}"
+          export CMAKE_PREFIX_PATH
+        fi
         ./tools/build_and_test_cmake.sh

CMakeLists.txt

@@ -90,7 +90,6 @@ set(ALL_FMTS ${MINIMAL_FMTS}
   geocache.cc
   geojson.cc
   globalsat_sport.cc
-  gpssim.cc
   gtm.cc
   gtrnctr.cc
   holux.cc
@@ -396,7 +395,6 @@ set(TESTS
   geo
   globalsat_sport
   gpsdrive
-  gpssim
   gpx
   grapheme
   gtm
@@ -495,17 +493,20 @@ if((CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR) AND NOT _isMultiConfig)
   add_custom_target(gpsbabel.org
                     ${CMAKE_SOURCE_DIR}/tools/make_gpsbabel_org.sh ${WEB} ${DOCVERSION}
                     DEPENDS gpsbabel gpsbabel.pdf
-                    VERBATIM)
+                    VERBATIM
+                    USES_TERMINAL)
 
   add_custom_target(gpsbabel.html
                     ${CMAKE_SOURCE_DIR}/tools/make_gpsbabel_html.sh
                     DEPENDS gpsbabel
-                    VERBATIM)
+                    VERBATIM
+                    USES_TERMINAL)
 
   add_custom_target(gpsbabel.pdf
                     ${CMAKE_SOURCE_DIR}/tools/make_gpsbabel_pdf.sh
                     DEPENDS gpsbabel
-                    VERBATIM)
+                    VERBATIM
+                    USES_TERMINAL)
 else()
   message(WARNING "Document generation is only supported for in-source builds with single configuration generators.")
 endif()

defs.h

@@ -213,7 +213,7 @@ class UrlLink
   UrlLink(QString url) :
     url_(std::move(url))
   { }
-  UrlLink(const char* url) :
+  explicit UrlLink(const char* url) :
     url_(url)
   { }
   UrlLink(QString url, QString url_link_text) :
@@ -1018,8 +1018,6 @@ inline int case_ignore_strncmp(const QString& s1, const QString& s2, int n)
 
 int str_match(const char* str, const char* match);
 
-void rtrim(char* s);
-char* lrtrim(char* buff);
 int xasprintf(char** strp, const char* fmt, ...) PRINTFLIKE(2, 3);
 int xasprintf(QString* strp, const char* fmt, ...) PRINTFLIKE(2, 3);
 int xasprintf(QScopedPointer<char, QScopedPointerPodDeleter>& strp, const char* fmt, ...) PRINTFLIKE(2, 3);

gpssim.cc renamed to deprecated/gpssim.cc

@@ -677,7 +677,7 @@ ExifFormat::exif_find_tag(ExifApp* app, const uint16_t ifd_nr, const uint16_t ta
 }
 
 QDateTime
-ExifFormat::exif_get_exif_time(ExifApp* app)
+ExifFormat::exif_get_exif_time(ExifApp* app) const
 {
   QDateTime res;
 
@@ -700,20 +700,24 @@ ExifFormat::exif_get_exif_time(ExifApp* app)
     // Exif 2.31 added offset tags to record the offset to UTC.
     // If these are present use them, otherwise assume local time.
     ExifTag* offset_tag = nullptr;
+    ExifTag* subsec_tag = nullptr;
     switch (tag->id) {
     case 0x9003:
       offset_tag = exif_find_tag(app, EXIF_IFD, 0x9011);  /* OffsetTimeOriginal from EXIF */
+      subsec_tag = exif_find_tag(app, EXIF_IFD, 0x9291);  /* SubSecTimeOriginal from EXIF */
       break;
     case 0x0132:
       offset_tag = exif_find_tag(app, EXIF_IFD, 0x9010);  /* OffsetTime from EXIF */
+      subsec_tag = exif_find_tag(app, EXIF_IFD, 0x9290);  /* SubSecTime from EXIF */
       break;
     case 0x9004:
       offset_tag = exif_find_tag(app, EXIF_IFD, 0x9012);  /* OffsetTimeDigitized from EXIF */
+      subsec_tag = exif_find_tag(app, EXIF_IFD, 0x9292);  /* SubSecTimeDigitized from EXIF */
       break;
     }
 
-    if (offset_tag) {
-      QByteArray time_tag = exif_read_str(offset_tag);
+    if (offset_tag || opt_offsettime) {
+      QByteArray time_tag = opt_offsettime? QByteArray(opt_offsettime) : exif_read_str(offset_tag);
       // string should be +HH:MM or -HH:MM
       static const QRegularExpression re(R"(^([+-])(\d{2}):(\d{2})$)");
       assert(re.isValid());
@@ -723,10 +727,24 @@ ExifFormat::exif_get_exif_time(ExifApp* app)
         int offset_hours = match.captured(1).append(match.captured(2)).toInt();
         int offset_mins = match.captured(1).append(match.captured(3)).toInt();
         res.setOffsetFromUtc(((offset_hours * 60) + offset_mins) * 60);
+      } else if (opt_offsettime) {
+        // Only warn for user supplied offsets.
+        // Offset tags may indicate the offset was unknown, e.g. "   :  ".
+        warning(MYNAME ": OffsetTime is expected to be +HH:MM or -HH:MM, but was %s.\n", time_tag.constData());
       }
     }
+
+    if (subsec_tag) {
+      QByteArray subsec = exif_read_str(subsec_tag);
+      bool ok;
+      double ss = subsec.prepend("0.").toDouble(&ok);
+      if (ok) {
+        res = res.addMSecs(lround(1000.0 * ss));
+      }
+    }
+
   }
-  return res;
+  return res.toUTC();
 }
 
 Waypoint*
@@ -895,7 +913,7 @@ ExifFormat::exif_waypt_from_exif_app(ExifApp* app) const
   gps_datetime = QDateTime(datestamp, timestamp, Qt::UTC);
   if (gps_datetime.isValid()) {
     if (global_opts.debug_level >= 3) {
-      printf(MYNAME "-GPSTimeStamp =   %s\n", qPrintable(gps_datetime.toString(Qt::ISODate)));
+      printf(MYNAME "-GPSTimeStamp =   %s\n", qPrintable(gps_datetime.toString(Qt::ISODateWithMs)));
     }
     wpt->SetCreationTime(gps_datetime);
   } else {
@@ -1555,7 +1573,9 @@ ExifFormat::write()
 
       exif_put_double(GPS_IFD, GPS_IFD_TAG_TIMESTAMP, 0, dt.time().hour());
       exif_put_double(GPS_IFD, GPS_IFD_TAG_TIMESTAMP, 1, dt.time().minute());
-      exif_put_double(GPS_IFD, GPS_IFD_TAG_TIMESTAMP, 2, dt.time().second());
+      exif_put_double(GPS_IFD, GPS_IFD_TAG_TIMESTAMP, 2,
+                      static_cast<double>(dt.time().second()) + 
+                      static_cast<double>(dt.time().msec())/1000.0);
 
       exif_put_str(GPS_IFD, GPS_IFD_TAG_DATESTAMP, CSTR(dt.toString(u"yyyy:MM:dd")));
     } else {

exif.cc

@@ -172,7 +172,7 @@ class ExifFormat : public Format
   static void exif_examine_app(ExifApp* app);
   static ExifIfd* exif_find_ifd(ExifApp* app, uint16_t ifd_nr);
   static ExifTag* exif_find_tag(ExifApp* app, uint16_t ifd_nr, uint16_t tag_id);
-  static QDateTime exif_get_exif_time(ExifApp* app);
+  QDateTime exif_get_exif_time(ExifApp* app) const;
   Waypoint* exif_waypt_from_exif_app(ExifApp* app) const;
   static Rational<int> exif_dec2frac(double val, double tolerance);
   ExifTag* exif_put_value(int ifd_nr, uint16_t tag_id, uint16_t type, int count, int index, const void* data) const;
@@ -205,12 +205,14 @@ class ExifFormat : public Format
   char* opt_overwrite{};
   char* opt_frame{};
   char* opt_name{};
+  char* opt_offsettime{};
 
   QVector<arglist_t> exif_args = {
     { "filename", &opt_filename, "Set waypoint name to source filename", "Y", ARGTYPE_BOOL, ARG_NOMINMAX, nullptr },
     { "frame", &opt_frame, "Time-frame (in seconds)", "10", ARGTYPE_INT, "0", nullptr, nullptr },
     { "name", &opt_name, "Locate waypoint for tagging by this name", nullptr, ARGTYPE_STRING, ARG_NOMINMAX, nullptr },
     { "overwrite", &opt_overwrite, "!OVERWRITE! the original file. Default=N", "N", ARGTYPE_BOOL, ARG_NOMINMAX, nullptr },
+    { "offset", &opt_offsettime, "Image Offset Time (+HH:MM or -HH:MM)", nullptr, ARGTYPE_STRING, ARG_NOMINMAX, nullptr },
   };
 };
 #endif // EXIF_H_INCLUDED_

exif.h

@@ -45,6 +45,7 @@ class Format
 {
 public:
   Format() = default;
+  Format(const QString& filename) : fname{filename} {}
   // Provide virtual public destructor to avoid undefined behavior when
   // an object of derived class type is deleted through a pointer to
   // its base class type.
@@ -169,28 +170,7 @@ class Format
   virtual ff_type get_type() const = 0;
   virtual QVector<ff_cap> get_cap() const = 0;
 
-  QString get_name() const
-  {
-    return name;
-  }
-
-  void set_name(const QString& nm)
-  {
-    name = nm;
-  }
-
-  QString get_argstring() const
-  {
-    return argstring;
-  }
-
-  void set_argstring(const QString& string)
-  {
-    argstring = string;
-  }
-private:
-  QString name;
-  QString argstring;
+  QString fname;
 
 protected:
   template <class MyFormat>

format.h

@@ -81,7 +81,7 @@ static int categorybits;
 static int receiver_must_upper = 1;
 static QTextCodec* codec{nullptr};
 
-static Format* gpx_vec;
+static Vecs::fmtinfo_t gpx_vec;
 
 #define MILITANT_VALID_WAYPT_CHARS "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
@@ -355,10 +355,12 @@ rd_init(const QString& fname)
 {
   if (setjmp(gdx_jmp_buf)) {
     const gdx_info* gi = gdx_get_info();
+    // FIXME: dynamic not implemented.
     gpx_vec = Vecs::Instance().find_vec("gpx");
+    Vecs::prepare_format(gpx_vec);
     gpx_vec->rd_init(gi->from_device.canon);
   } else {
-    gpx_vec = nullptr;
+    gpx_vec = Vecs::fmtinfo_t();
     rw_init(fname);
   }
 }

garmin.cc

@@ -116,7 +116,7 @@ inline gt_display_modes_e operator++(gt_display_modes_e& s, int) // postfix
 
 #define MAX_HEADER_FIELDS 36
 
-static char* header_lines[unknown_header + 1][MAX_HEADER_FIELDS];
+static QString header_lines[unknown_header + 1][MAX_HEADER_FIELDS];
 static int header_fields[unknown_header + 1][MAX_HEADER_FIELDS];
 static int header_ct[unknown_header + 1];
 
@@ -869,11 +869,7 @@ static void
 free_header(const header_type ht)
 {
   for (int i = 0; i < MAX_HEADER_FIELDS; i++) {
-    char* c = header_lines[ht][i];
-    if (c != nullptr) {
-      xfree(c);
-      header_lines[ht][i] = nullptr;
-    }
+    header_lines[ht][i].clear();
   }
   header_ct[ht] = 0;
   memset(header_fields[ht], 0, sizeof(header_fields[ht]));
@@ -995,7 +991,8 @@ parse_header(const QStringList& lineparts)
 
   for (const auto& str : lineparts) {
     column++;
-    header_lines[unknown_header][column] = strupper(xstrdup(str));
+    header_lines[unknown_header][column] = str;
+    header_lines[unknown_header][column] = header_lines[unknown_header][column].toUpper();
     header_ct[unknown_header]++;
     if (header_ct[unknown_header] >= MAX_HEADER_FIELDS) {
       break;
@@ -1044,13 +1041,13 @@ bind_fields(const header_type ht)
   }
 
   for (i = 0; i < header_ct[unknown_header]; i++) {
-    char* name = header_lines[ht][i] = header_lines[unknown_header][i];
-    header_lines[unknown_header][i] = nullptr;
+    auto name = header_lines[ht][i] = header_lines[unknown_header][i];
+    header_lines[unknown_header][i].clear();
 
     c = fields;
     int field_no = 1;
     while (*c) {
-      if (strcmp(c, name) == 0) {
+      if (name.compare(c) == 0) {
         header_fields[ht][i] = field_no;
 #if 0
         printf("Binding field \"%s\" to internal number %d (%d,%d)\n", name, field_no, ht, i);

garmin_txt.cc

@@ -84,19 +84,9 @@ void GeoFormat::GeoReadLoc(QXmlStreamReader& reader) const
   }
 }
 
-void GeoFormat::rd_init(const QString& fname)
-{
-  geo_fname = fname;
-}
-
-void GeoFormat::rd_deinit()
-{
-  geo_fname.clear();
-}
-
 void GeoFormat::read()
 {
-  gpsbabel::File ifile = gpsbabel::File(geo_fname);
+  gpsbabel::File ifile = gpsbabel::File(fname);
   ifile.open(QIODevice::ReadOnly);
   QXmlStreamReader reader = QXmlStreamReader(&ifile);
 
@@ -143,16 +133,6 @@ Geocache::container_t GeoFormat::wpt_container(const QString& args)
   return v;
 }
 
-void GeoFormat::wr_init(const QString& fname)
-{
-  geo_fname = fname;
-}
-
-void GeoFormat::wr_deinit()
-{
-  geo_fname.clear();
-}
-
 void GeoFormat::geo_waypt_pr(const Waypoint* waypointp, QXmlStreamWriter& writer)
 {
   writer.writeStartElement(QStringLiteral("waypoint"));
@@ -221,7 +201,7 @@ void GeoFormat::geo_waypt_pr(const Waypoint* waypointp, QXmlStreamWriter& writer
 
 void GeoFormat::write()
 {
-  gpsbabel::File ofile = gpsbabel::File(geo_fname);
+  gpsbabel::File ofile = gpsbabel::File(fname);
   ofile.open(QIODevice::WriteOnly | QIODevice::Text);
   QXmlStreamWriter writer = QXmlStreamWriter(&ofile);
 

geo.cc

@@ -32,6 +32,8 @@
 class GeoFormat : public Format
 {
 public:
+  using Format::Format;
+
   QVector<arglist_t>* get_args() override
   {
     return &geo_args;
@@ -47,12 +49,12 @@ class GeoFormat : public Format
     return { (ff_cap)(ff_cap_read | ff_cap_write), ff_cap_none, ff_cap_none };
   }
 
-  void rd_init(const QString& fname) override;
+  void rd_init(const QString& fname) override
+  {}
   void read() override;
-  void rd_deinit() override;
-  void wr_init(const QString& fname) override;
+  void wr_init(const QString& fname) override
+  {}
   void write() override;
-  void wr_deinit() override;
 
 private:
 
@@ -66,7 +68,6 @@ class GeoFormat : public Format
 
   char* deficon = nullptr;
   char* nuke_placer{};
-  QString geo_fname;
 
   QVector<arglist_t> geo_args = {
     {"deficon", &deficon, "Default icon name", nullptr, ARGTYPE_STRING, ARG_NOMINMAX, nullptr },