Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gpxsee for openSUSE:Factory checked in at 2023-05-13 17:18:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gpxsee (Old) and /work/SRC/openSUSE:Factory/.gpxsee.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gpxsee" Sat May 13 17:18:04 2023 rev:106 rq:1086883 version:13.2 Changes: -------- --- /work/SRC/openSUSE:Factory/gpxsee/gpxsee.changes 2023-05-06 22:09:51.472939244 +0200 +++ /work/SRC/openSUSE:Factory/.gpxsee.new.1533/gpxsee.changes 2023-05-13 17:18:08.054551298 +0200 @@ -1,0 +2,6 @@ +Fri May 12 20:47:05 CEST 2023 - tu...@cbox.cz +- Update to version 13.2 + * Fixed crash on empty routes (introduced in 12.4) + * Minor fixes. + +------------------------------------------------------------------- Old: ---- GPXSee-13.1.tar.gz New: ---- GPXSee-13.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gpxsee.spec ++++++ --- /var/tmp/diff_new_pack.tUUn7i/_old 2023-05-13 17:18:09.022556867 +0200 +++ /var/tmp/diff_new_pack.tUUn7i/_new 2023-05-13 17:18:09.026556891 +0200 @@ -19,7 +19,7 @@ # See also http://en.opensuse.org/openSUSE:Specfile_guidelines Name: gpxsee -Version: 13.1 +Version: 13.2 Release: 1 Summary: GPS log file visualization and analysis tool License: GPL-3.0-only ++++++ GPXSee-13.1.tar.gz -> GPXSee-13.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-13.1/.appveyor.yml new/GPXSee-13.2/.appveyor.yml --- old/GPXSee-13.1/.appveyor.yml 2023-05-04 21:49:02.000000000 +0200 +++ new/GPXSee-13.2/.appveyor.yml 2023-05-12 10:19:52.000000000 +0200 @@ -1,4 +1,4 @@ -version: 13.1.{build} +version: 13.2.{build} configuration: - Release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-13.1/gpxsee.pro new/GPXSee-13.2/gpxsee.pro --- old/GPXSee-13.1/gpxsee.pro 2023-05-04 21:49:02.000000000 +0200 +++ new/GPXSee-13.2/gpxsee.pro 2023-05-12 10:19:52.000000000 +0200 @@ -3,7 +3,7 @@ } else { TARGET = GPXSee } -VERSION = 13.1 +VERSION = 13.2 QT += core \ gui \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-13.1/lang/gpxsee_ca.ts new/GPXSee-13.2/lang/gpxsee_ca.ts --- old/GPXSee-13.1/lang/gpxsee_ca.ts 2023-05-04 21:49:02.000000000 +0200 +++ new/GPXSee-13.2/lang/gpxsee_ca.ts 2023-05-12 10:19:52.000000000 +0200 @@ -866,7 +866,7 @@ <location filename="../src/GUI/gui.cpp" line="907"/> <location filename="../src/GUI/gui.cpp" line="925"/> <source>CRS directory:</source> - <translation type="unfinished"></translation> + <translation>Directori CRS:</translation> </message> <message> <location filename="../src/GUI/gui.cpp" line="909"/> @@ -1020,6 +1020,7 @@ <translation> <numerusform>%n fitxer</numerusform> <numerusform>%n fitxers</numerusform> + <numerusform>%n fitxers</numerusform> </translation> </message> </context> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-13.1/lang/gpxsee_nb.ts new/GPXSee-13.2/lang/gpxsee_nb.ts --- old/GPXSee-13.1/lang/gpxsee_nb.ts 2023-05-04 21:49:02.000000000 +0200 +++ new/GPXSee-13.2/lang/gpxsee_nb.ts 2023-05-12 10:19:52.000000000 +0200 @@ -712,7 +712,7 @@ <location filename="../src/GUI/gui.cpp" line="907"/> <location filename="../src/GUI/gui.cpp" line="925"/> <source>CRS directory:</source> - <translation type="unfinished"></translation> + <translation>CRS-mappe:</translation> </message> <message> <location filename="../src/GUI/gui.cpp" line="913"/> @@ -1718,12 +1718,12 @@ <message> <location filename="../src/GUI/optionsdialog.cpp" line="70"/> <source>Select the proper coordinate reference system (CRS) of maps without a CRS definition (JNX, KMZ and World file maps).</source> - <translation type="unfinished"></translation> + <translation>Velg riktig koordinatreferansesystem (CRS) for kart uten en CRS-definisjon (JNX, KMZ og World-file kart).</translation> </message> <message> <location filename="../src/GUI/optionsdialog.cpp" line="73"/> <source>Select the desired projection of vector maps (IMG, Mapsforge and ENC maps). The projection must be valid for the whole map area.</source> - <translation type="unfinished"></translation> + <translation>Velg ønsket projeksjon for vektorkart (IMG, Mapsforge og ENC-kart). Projeksjonen må være gyldig for hele kartområdet.</translation> </message> <message> <location filename="../src/GUI/optionsdialog.cpp" line="104"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-13.1/pkg/windows/gpxsee64.nsi new/GPXSee-13.2/pkg/windows/gpxsee64.nsi --- old/GPXSee-13.1/pkg/windows/gpxsee64.nsi 2023-05-04 21:49:02.000000000 +0200 +++ new/GPXSee-13.2/pkg/windows/gpxsee64.nsi 2023-05-12 10:19:52.000000000 +0200 @@ -37,7 +37,7 @@ ; The name of the installer Name "GPXSee" ; Program version -!define VERSION "13.1" +!define VERSION "13.2" ; The file to write OutFile "GPXSee-${VERSION}_x64.exe" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-13.1/src/common/hash.h new/GPXSee-13.2/src/common/hash.h --- old/GPXSee-13.1/src/common/hash.h 2023-05-04 21:49:02.000000000 +0200 +++ new/GPXSee-13.2/src/common/hash.h 2023-05-12 10:19:52.000000000 +0200 @@ -6,13 +6,13 @@ #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #define HASH_T uint -#else // QT6 -#define HASH_T size_t -#endif // QT6 -inline HASH_T qHash(const QPoint &p) +inline uint qHash(const QPoint &p) { - return ::qHash(p.x()) ^ ::qHash(p.y()); + return qHash(QPair<int, int>(p.x(), p.y())); } +#else // QT6 +#define HASH_T size_t +#endif // QT6 #endif // HASH_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-13.1/src/data/route.cpp new/GPXSee-13.2/src/data/route.cpp --- old/GPXSee-13.1/src/data/route.cpp 2023-05-04 21:49:02.000000000 +0200 +++ new/GPXSee-13.2/src/data/route.cpp 2023-05-12 10:19:52.000000000 +0200 @@ -33,13 +33,16 @@ Graph Route::gpsElevation() const { Graph graph; - graph.append(GraphSegment(QDateTime())); - GraphSegment &gs = graph.last(); + QDateTime date; + GraphSegment gs(date); for (int i = 0; i < _data.size(); i++) if (_data.at(i).hasElevation()) gs.append(GraphPoint(_distance.at(i), NAN, _data.at(i).elevation())); + if (gs.size() >= 2) + graph.append(gs); + if (_data.style().color().isValid()) graph.setColor(_data.style().color()); @@ -49,8 +52,8 @@ Graph Route::demElevation() const { Graph graph; - graph.append(GraphSegment(QDateTime())); - GraphSegment &gs = graph.last(); + QDateTime date; + GraphSegment gs(date); for (int i = 0; i < _data.size(); i++) { qreal dem = DEM::elevation(_data.at(i).coordinates()); @@ -58,6 +61,9 @@ gs.append(GraphPoint(_distance.at(i), NAN, dem)); } + if (gs.size() >= 2) + graph.append(gs); + if (_data.style().color().isValid()) graph.setColor(_data.style().color()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-13.1/src/map/IMG/rastertile.cpp new/GPXSee-13.2/src/map/IMG/rastertile.cpp --- old/GPXSee-13.1/src/map/IMG/rastertile.cpp 2023-05-04 21:49:02.000000000 +0200 +++ new/GPXSee-13.2/src/map/IMG/rastertile.cpp 2023-05-12 10:19:52.000000000 +0200 @@ -446,12 +446,14 @@ : font(style.textFontSize()); const QColor *color = style.textColor().isValid() ? &style.textColor() : &textColor; + const QColor *hcolor = Style::isDepthPoint(point.type) + ? 0 : &haloColor; if ((!label || !fnt) && !img) continue; TextPointItem *item = new TextPointItem(QPoint(point.coordinates.lon(), - point.coordinates.lat()), label, fnt, img, color, &haloColor, 0, + point.coordinates.lat()), label, fnt, img, color, hcolor, 0, ICON_PADDING); if (item->isValid() && !item->collides(textItems)) textItems.append(item); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-13.1/src/map/IMG/rgnfile.cpp new/GPXSee-13.2/src/map/IMG/rgnfile.cpp --- old/GPXSee-13.1/src/map/IMG/rgnfile.cpp 2023-05-04 21:49:02.000000000 +0200 +++ new/GPXSee-13.2/src/map/IMG/rgnfile.cpp 2023-05-12 10:19:52.000000000 +0200 @@ -1,5 +1,6 @@ #include "common/rectc.h" #include "common/garmin.h" +#include "common/hash.h" #include "deltastream.h" #include "huffmanstream.h" #include "style.h" @@ -13,12 +14,10 @@ #define MASK(bits) ((1U << (bits)) - 1U) -static quint64 pointId(const QPoint &pos, quint32 type) +static quint64 pointId(const QPoint &pos, quint32 type, const QString &label) { - quint64 id; - - uint hash = (uint)qHash(QPair<int, int>(pos.x(), pos.y())); - id = ((quint64)type)<<32 | hash; + quint64 hash = qHash(pos) ^ qHash(label); + quint64 id = ((quint64)type)<<40 | (hash & 0xFFFFFFFFFF); // Increase rendering priorities for some special items if (!Style::isCountry(type) && !Style::isMarina(type)) @@ -484,11 +483,11 @@ point.type = (quint16)type<<8 | subtype; point.coordinates = Coordinates(toWGS24(pos.x()), toWGS24(pos.y())); - point.id = pointId(pos, point.type); if (lbl && (labelPtr & 0x3FFFFF)) point.label = lbl->label(lblHdl, labelPtr & 0x3FFFFF, labelPtr & 0x400000, !(Style::isCountry(point.type) || Style::isState(point.type)), Style::isSpot(point.type)); + point.id = pointId(pos, point.type, point.label.text()); points->append(point); } @@ -537,9 +536,9 @@ continue; point.coordinates = Coordinates(toWGS24(p.x()), toWGS24(p.y())); - point.id = pointId(p, point.type); if (lbl && (labelPtr & 0x3FFFFF)) point.label = lbl->label(lblHdl, labelPtr & 0x3FFFFF); + point.id = pointId(p, point.type, point.label.text()); points->append(point); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-13.1/src/map/map.cpp new/GPXSee-13.2/src/map/map.cpp --- old/GPXSee-13.1/src/map/map.cpp 2023-05-04 21:49:02.000000000 +0200 +++ new/GPXSee-13.2/src/map/map.cpp 2023-05-12 10:19:52.000000000 +0200 @@ -5,34 +5,26 @@ #define SAMPLES 100 -void Map::growLeft(const QPointF &p, RectC &rect) +static void growLeft(const Coordinates &c, RectC &rect) { - Coordinates c(xy2ll(p)); - if (c.lon() < rect.left()) rect.setLeft(c.lon()); } -void Map::growRight(const QPointF &p, RectC &rect) +static void growRight(const Coordinates &c, RectC &rect) { - Coordinates c(xy2ll(p)); - if (c.lon() > rect.right()) rect.setRight(c.lon()); } -void Map::growTop(const QPointF &p, RectC &rect) +static void growTop(const Coordinates &c, RectC &rect) { - Coordinates c(xy2ll(p)); - if (c.lat() > rect.top()) rect.setTop(c.lat()); } -void Map::growBottom(const QPointF &p, RectC &rect) +static void growBottom(const Coordinates &c, RectC &rect) { - Coordinates c(xy2ll(p)); - if (c.lat() < rect.bottom()) rect.setBottom(c.lat()); } @@ -53,14 +45,14 @@ for (int i = 0; i <= SAMPLES; i++) { double x = b.left() + i * dx; - growBottom(QPointF(x, b.bottom()), rect); - growTop(QPointF(x, b.top()), rect); + growBottom(xy2ll(QPointF(x, b.bottom())), rect); + growTop(xy2ll(QPointF(x, b.top())), rect); } for (int i = 0; i <= SAMPLES; i++) { double y = b.top() + i * dy; - growLeft(QPointF(b.left(), y), rect); - growRight(QPointF(b.right(), y), rect); + growLeft(xy2ll(QPointF(b.left(), y)), rect); + growRight(xy2ll(QPointF(b.right(), y)), rect); } return rect; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-13.1/src/map/map.h new/GPXSee-13.2/src/map/map.h --- old/GPXSee-13.1/src/map/map.h 2023-05-04 21:49:02.000000000 +0200 +++ new/GPXSee-13.2/src/map/map.h 2023-05-12 10:19:52.000000000 +0200 @@ -62,11 +62,6 @@ void mapLoaded(); private: - void growLeft(const QPointF &p, RectC &rect); - void growRight(const QPointF &p, RectC &rect); - void growTop(const QPointF &p, RectC &rect); - void growBottom(const QPointF &p, RectC &rect); - QString _path; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-13.1/src/map/tile.h new/GPXSee-13.2/src/map/tile.h --- old/GPXSee-13.1/src/map/tile.h 2023-05-04 21:49:02.000000000 +0200 +++ new/GPXSee-13.2/src/map/tile.h 2023-05-12 10:19:52.000000000 +0200 @@ -17,7 +17,7 @@ const QVariant &zoom() const {return _zoom;} const QPoint &xy() const {return _xy;} const RectD &bbox() const {return _bbox;} - QPixmap& pixmap() {return _pixmap;} + QPixmap &pixmap() {return _pixmap;} private: QPoint _xy; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GPXSee-13.1/src/map/tileloader.cpp new/GPXSee-13.2/src/map/tileloader.cpp --- old/GPXSee-13.1/src/map/tileloader.cpp 2023-05-04 21:49:02.000000000 +0200 +++ new/GPXSee-13.2/src/map/tileloader.cpp 2023-05-12 10:19:52.000000000 +0200 @@ -61,6 +61,7 @@ connect(_downloader, &Downloader::finished, this, &TileLoader::finished); } + void TileLoader::loadTilesAsync(QVector<FetchTile> &list) { QList<Download> dl; @@ -142,6 +143,11 @@ QFuture<void> future = QtConcurrent::map(imgs, &TileImage::load); future.waitForFinished(); + + for (int i = 0; i < imgs.size(); i++) { + TileImage &ti = imgs[i]; + QPixmapCache::insert(ti.file(), ti.tile()->pixmap()); + } } void TileLoader::clearCache() ++++++ PKGBUILD ++++++ --- /var/tmp/diff_new_pack.tUUn7i/_old 2023-05-13 17:18:09.586560113 +0200 +++ /var/tmp/diff_new_pack.tUUn7i/_new 2023-05-13 17:18:09.590560136 +0200 @@ -1,5 +1,5 @@ pkgname=gpxsee -pkgver=13.1 +pkgver=13.2 pkgrel=1 pkgdesc='GPS log files visualizing and analyzing tool' arch=('i686' 'x86_64') ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.tUUn7i/_old 2023-05-13 17:18:09.618560297 +0200 +++ /var/tmp/diff_new_pack.tUUn7i/_new 2023-05-13 17:18:09.622560320 +0200 @@ -1,3 +1,10 @@ +gpxsee (13.2) stable; urgency=medium + + * Fixed crash on empty routes (introduced in 12.4). + * Minor fixes. + + -- Martin Tuma <tu...@cbox.cz> Fri, 12 May 2023 20:50:11 +0200 + gpxsee (13.1) stable; urgency=low * Fixed wrong date info on tracks with segments. ++++++ gpxsee.dsc ++++++ --- /var/tmp/diff_new_pack.tUUn7i/_old 2023-05-13 17:18:09.686560687 +0200 +++ /var/tmp/diff_new_pack.tUUn7i/_new 2023-05-13 17:18:09.690560711 +0200 @@ -1,10 +1,10 @@ Format: 1.0 Source: gpxsee -Version: 13.1-1 +Version: 13.2-1 Binary: gpxsee Maintainer: Martin Tuma <tu...@cbox.cz> Architecture: any Build-Depends: debhelper (>= 9), qtbase5-dev, qtbase5-private-dev, qtbase5-dev-tools, qt5-qmake, qttools5-dev-tools, libqt5opengl5-dev, qtpositioning5-dev, libqt5svg5-dev, libqt5serialport5-dev Files: - 00000000000000000000000000000000 0 GPXSee-13.1.tar.gz + 00000000000000000000000000000000 0 GPXSee-13.2.tar.gz
