Merge pull request #4208 from seanm/misc-warnings

Fixed misc warnings
OSGeo · Jul 31, 2024 · 6400b75 · 6400b75
2 parents 79b4f28 + 9e8cdb7
commit 6400b75
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 19 deletions.
diff --git a/src/datums.cpp b/src/datums.cpp
@@ -29,7 +29,6 @@
 
 #include "proj.h"
 
-#define PJ_DATUMS_
 #include "proj_internal.h"
 
 /*

diff --git a/src/filemanager.cpp b/src/filemanager.cpp
@@ -32,7 +32,7 @@
 // proj_config.h must be included before testing HAVE_LIBDL
 #include "proj_config.h"
 
-#if defined(HAVE_LIBDL) && !defined(_GNU_SOURCE)
+#if defined(__CYGWIN__) && defined(HAVE_LIBDL) && !defined(_GNU_SOURCE)
 // Required for dladdr() on Cygwin
 #define _GNU_SOURCE
 #endif

diff --git a/src/grids.cpp b/src/grids.cpp
@@ -44,6 +44,7 @@
 #include <algorithm>
 #include <cmath>
 #include <cstdint>
+#include <cstring>
 
 NS_PROJ_START
 
@@ -1363,8 +1364,6 @@ class GTiffVGridShiftSet : public VerticalShiftGridSet {
     }
 };
 
-#endif // TIFF_ENABLED
-
 // ---------------------------------------------------------------------------
 
 template <class GridType, class GenericGridType>
@@ -1429,7 +1428,6 @@ insertIntoHierarchy(PJ_CONTEXT *ctx, std::unique_ptr<GridType> &&grid,
     topGrids.emplace_back(std::move(grid));
 }
 
-#ifdef TIFF_ENABLED
 // ---------------------------------------------------------------------------
 
 class GTiffVGrid : public VerticalShiftGrid {
@@ -1857,7 +1855,9 @@ NTv1Grid *NTv1Grid::open(PJ_CONTEXT *ctx, std::unique_ptr<File> fp,
         swap_words(header + 104, sizeof(double), 1);
     }
 
-    if (*((int *)(header + 8)) != 12) {
+    int recordCount;
+    memcpy(&recordCount, header + 8, sizeof(recordCount));
+    if (recordCount != 12) {
         pj_log(ctx, PJ_LOG_ERROR,
                _("NTv1 grid shift file has wrong record count, corrupt?"));
         proj_context_errno_set(ctx,

diff --git a/test/unit/test_coordinates.cpp b/test/unit/test_coordinates.cpp
@@ -60,10 +60,6 @@ struct ObjectKeeper {
     PJ *m_obj = nullptr;
     explicit ObjectKeeper(PJ *obj) : m_obj(obj) {}
     ~ObjectKeeper() { proj_destroy(m_obj); }
-    void clear() {
-        proj_destroy(m_obj);
-        m_obj = nullptr;
-    }
 
     ObjectKeeper(const ObjectKeeper &) = delete;
     ObjectKeeper &operator=(const ObjectKeeper &) = delete;

diff --git a/test/unit/test_factory.cpp b/test/unit/test_factory.cpp
@@ -2153,15 +2153,6 @@ class FactoryWithTmpDatabase : public ::testing::Test {
         }
     }
 
-    bool get_table(const char *sql, sqlite3 *db = nullptr) {
-        sqlite3_free_table(m_papszResult);
-        m_papszResult = nullptr;
-        m_nRows = 0;
-        m_nCols = 0;
-        return sqlite3_get_table(db ? db : m_ctxt, sql, &m_papszResult,
-                                 &m_nRows, &m_nCols, nullptr) == SQLITE_OK;
-    }
-
     bool execute(const std::string &sql) {
         return sqlite3_exec(m_ctxt, sql.c_str(), nullptr, nullptr, nullptr) ==
                SQLITE_OK;