Revert "Micro-optimizations"

This reverts commit f90ac6a37efa6480194912440cc0e034dd06cf81.
Merge branch 'origin/master' into Weblate.
2025-06-07 18:53:02 +02:00 · 2025-04-25 00:41:21 +02:00 · 2025-04-24 23:52:35 +02:00 · 2025-04-24 23:51:31 +02:00 · 2025-04-24 22:57:03 +02:00 · 2025-04-24 22:39:17 +02:00
6 changed files with 9 additions and 5 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@ -1,4 +1,4 @@
-version: 13.41.{build}
+version: 13.42.{build}

 configuration:
  - Release
--- a/gpxsee.pro
+++ b/gpxsee.pro
@ -3,7 +3,7 @@ unix:!macx:!android {
 } else {
    TARGET = GPXSee
 }
-VERSION = 13.41
+VERSION = 13.42

 QT += core \
    gui \
--- a/lang/gpxsee_ca.ts
+++ b/lang/gpxsee_ca.ts
@ -172,7 +172,7 @@
    <message>
        <location filename="../src/data/data.cpp" line="254"/>
        <source>VKX files</source>
-        <translation type="unfinished"></translation>
+        <translation>Arxius VKX</translation>
    </message>
    <message>
        <location filename="../src/data/data.cpp" line="255"/>
--- a/pkg/windows/gpxsee64.nsi
+++ b/pkg/windows/gpxsee64.nsi
@ -49,7 +49,7 @@ Unicode true
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "13.41"
+!define VERSION "13.42"

 ; The file to write
 OutFile "GPXSee-${VERSION}_x64.exe"
--- a/src/map/ENC/mapdata.cpp
+++ b/src/map/ENC/mapdata.cpp
@ -188,7 +188,7 @@ static bool polygonPointCb(const MapData::Poly *polygon, void *context)

 	if (baseType == TSSLPT || baseType == RCTLPT || baseType == I_TRNBSN
 	  || baseType == BRIDGE || baseType == I_BRIDGE || baseType == BUAARE
-	  || baseType == LNDARE || baseType == LNDRGN
+	  || baseType == LNDARE || baseType == LNDRGN || baseType == I_BUNSTA
 	  || type == SUBTYPE(ACHARE, 2) || type == SUBTYPE(I_ACHARE, 2)
 	  || type == SUBTYPE(ACHARE, 3) || type == SUBTYPE(I_ACHARE, 3)
 	  || type == SUBTYPE(ACHARE, 9) || type == SUBTYPE(I_ACHARE, 9)
--- a/src/map/ozf.cpp
+++ b/src/map/ozf.cpp
@ -232,7 +232,11 @@ QPixmap OZF::tile(int zoom, int x, int y)
 	  tileSize().height(), QImage::Format_Indexed8);
 	img.setColorTable(z.palette);

+#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
 	return QPixmap::fromImage(img.mirrored());
+#else // QT 6.9
+	return QPixmap::fromImage(img.flipped());
+#endif // QT 6.9
 }

 QSize OZF::size(int zoom) const
Author	SHA1	Message	Date
Martin Tůma	0c0d5dd273	Revert "Micro-optimizations" This reverts commit f90ac6a37efa6480194912440cc0e034dd06cf81.	2025-04-25 00:41:21 +02:00
Hosted Weblate	7059eafc81	Merge branch 'origin/master' into Weblate.	2025-04-24 23:52:35 +02:00
Martin Tůma	b4497aaa3e	Silence warning when compiling on Qt >= 6.9	2025-04-24 23:51:31 +02:00
Martin Tůma	f90ac6a37e	Micro-optimizations	2025-04-24 22:57:03 +02:00
Martin Tůma	28caeef105	Render BUNSTA areas	2025-04-24 22:39:17 +02:00
Martin Tůma	e2988d4621	Version++	2025-04-24 22:38:56 +02:00
raf	285ffd680e	Translated using Weblate (Catalan) Currently translated at 100.0% (492 of 492 strings) Translation: GPXSee/Translations Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ca/	2025-04-24 11:01:42 +02:00