From f0545c440e6c3abf05109280a9aa3ac6f79cf573 Mon Sep 17 00:00:00 2001 From: Cellie Date: Sat, 24 May 2025 09:55:08 +0200 Subject: [PATCH 1/4] Fix codacy unused class member --- src/OpenStreetMap-esp32.cpp | 4 ++-- src/OpenStreetMap-esp32.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/OpenStreetMap-esp32.cpp b/src/OpenStreetMap-esp32.cpp index 8fb1de9..6ff36d1 100644 --- a/src/OpenStreetMap-esp32.cpp +++ b/src/OpenStreetMap-esp32.cpp @@ -456,8 +456,8 @@ std::optional> OpenStreetMap::urlToBuffer(const ch return buffer; } -thread_local OpenStreetMap *OpenStreetMap::currentInstance = nullptr; -thread_local uint16_t *OpenStreetMap::currentTileBuffer = nullptr; +//thread_local OpenStreetMap *OpenStreetMap::currentInstance = nullptr; +//thread_local uint16_t *OpenStreetMap::currentTileBuffer = nullptr; void OpenStreetMap::PNGDraw(PNGDRAW *pDraw) { diff --git a/src/OpenStreetMap-esp32.hpp b/src/OpenStreetMap-esp32.hpp index 4b41967..2b8e254 100644 --- a/src/OpenStreetMap-esp32.hpp +++ b/src/OpenStreetMap-esp32.hpp @@ -87,8 +87,8 @@ class OpenStreetMap private: SemaphoreHandle_t cacheMutex = nullptr; std::vector tilesCache; - thread_local static uint16_t *currentTileBuffer; - thread_local static OpenStreetMap *currentInstance; + static inline thread_local uint16_t *currentTileBuffer = nullptr; + static inline thread_local OpenStreetMap *currentInstance = nullptr; static void PNGDraw(PNGDRAW *pDraw); double lon2tile(double lon, uint8_t zoom); double lat2tile(double lat, uint8_t zoom); From 04efe498c56d1ed1551026b0c0bb3a03684d8c01 Mon Sep 17 00:00:00 2001 From: Cellie Date: Sat, 24 May 2025 10:17:24 +0200 Subject: [PATCH 2/4] Try [[maybe_unused]] --- src/OpenStreetMap-esp32.cpp | 3 --- src/OpenStreetMap-esp32.hpp | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/OpenStreetMap-esp32.cpp b/src/OpenStreetMap-esp32.cpp index 6ff36d1..6149d13 100644 --- a/src/OpenStreetMap-esp32.cpp +++ b/src/OpenStreetMap-esp32.cpp @@ -456,9 +456,6 @@ std::optional> OpenStreetMap::urlToBuffer(const ch return buffer; } -//thread_local OpenStreetMap *OpenStreetMap::currentInstance = nullptr; -//thread_local uint16_t *OpenStreetMap::currentTileBuffer = nullptr; - void OpenStreetMap::PNGDraw(PNGDRAW *pDraw) { if (!currentInstance || !currentInstance->currentTileBuffer) diff --git a/src/OpenStreetMap-esp32.hpp b/src/OpenStreetMap-esp32.hpp index 2b8e254..43a5a2f 100644 --- a/src/OpenStreetMap-esp32.hpp +++ b/src/OpenStreetMap-esp32.hpp @@ -87,8 +87,8 @@ class OpenStreetMap private: SemaphoreHandle_t cacheMutex = nullptr; std::vector tilesCache; - static inline thread_local uint16_t *currentTileBuffer = nullptr; - static inline thread_local OpenStreetMap *currentInstance = nullptr; + [[maybe_unused]] static inline thread_local uint16_t *currentTileBuffer = nullptr; + [[maybe_unused]] static inline thread_local OpenStreetMap *currentInstance = nullptr; static void PNGDraw(PNGDRAW *pDraw); double lon2tile(double lon, uint8_t zoom); double lat2tile(double lat, uint8_t zoom); From f4846d3c21bcb97c70471644163507bbdce2515c Mon Sep 17 00:00:00 2001 From: Cellie Date: Sat, 24 May 2025 10:23:17 +0200 Subject: [PATCH 3/4] No difference --- src/OpenStreetMap-esp32.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/OpenStreetMap-esp32.hpp b/src/OpenStreetMap-esp32.hpp index 43a5a2f..2b8e254 100644 --- a/src/OpenStreetMap-esp32.hpp +++ b/src/OpenStreetMap-esp32.hpp @@ -87,8 +87,8 @@ class OpenStreetMap private: SemaphoreHandle_t cacheMutex = nullptr; std::vector tilesCache; - [[maybe_unused]] static inline thread_local uint16_t *currentTileBuffer = nullptr; - [[maybe_unused]] static inline thread_local OpenStreetMap *currentInstance = nullptr; + static inline thread_local uint16_t *currentTileBuffer = nullptr; + static inline thread_local OpenStreetMap *currentInstance = nullptr; static void PNGDraw(PNGDRAW *pDraw); double lon2tile(double lon, uint8_t zoom); double lat2tile(double lat, uint8_t zoom); From 919bd8068b9f1e8b605eef99067fd8bb59f8fa11 Mon Sep 17 00:00:00 2001 From: Cellie Date: Sat, 24 May 2025 10:29:20 +0200 Subject: [PATCH 4/4] Change order --- src/OpenStreetMap-esp32.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OpenStreetMap-esp32.hpp b/src/OpenStreetMap-esp32.hpp index 2b8e254..ccfb523 100644 --- a/src/OpenStreetMap-esp32.hpp +++ b/src/OpenStreetMap-esp32.hpp @@ -87,8 +87,8 @@ class OpenStreetMap private: SemaphoreHandle_t cacheMutex = nullptr; std::vector tilesCache; - static inline thread_local uint16_t *currentTileBuffer = nullptr; static inline thread_local OpenStreetMap *currentInstance = nullptr; + static inline thread_local uint16_t *currentTileBuffer = nullptr; static void PNGDraw(PNGDRAW *pDraw); double lon2tile(double lon, uint8_t zoom); double lat2tile(double lat, uint8_t zoom);