Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ if("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
-Wduplicated-cond
-Wduplicated-branches
-Wlogical-op
-Wimplicit-fallthrough
)
set(PROJ_C_WARN_FLAGS ${PROJ_common_WARN_FLAGS}
-Wmissing-prototypes
Expand All @@ -71,6 +72,7 @@ if("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
# -Wold-style-cast
-Woverloaded-virtual
-Wzero-as-null-pointer-constant
-Wdeprecated-copy-dtor
)
elseif("${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
set(PROJ_common_WARN_FLAGS ${PROJ_common_WARN_FLAGS}
Expand All @@ -79,8 +81,14 @@ elseif("${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
-Wdocumentation -Wno-documentation-deprecated-sync
-Wfloat-conversion
-Wlogical-op-parentheses
# -Wweak-vtables
-Wimplicit-fallthrough
)

# Not sure about the minimum version, but clang 12 complains about \file, @cond Doxygen_Suppress, etc.
if("${CMAKE_CXX_COMPILER_VERSION}" VERSION_GREATER_EQUAL 18.0.0)
set(PROJ_common_WARN_FLAGS ${PROJ_common_WARN_FLAGS} -Wdocumentation-unknown-command)
endif()

set(PROJ_C_WARN_FLAGS ${PROJ_common_WARN_FLAGS}
-Wmissing-prototypes
-Wc11-extensions
Expand All @@ -93,6 +101,8 @@ elseif("${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
-Wshorten-64-to-32
-Wunused-private-field
-Wzero-as-null-pointer-constant
-Wdeprecated-copy-dtor
-Wweak-vtables
)
elseif("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC")
add_definitions(/D_CRT_SECURE_NO_WARNINGS) # Eliminate deprecation warnings
Expand Down
2 changes: 1 addition & 1 deletion src/projections/aitoff.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ static PJ_XY aitoff_s_forward(PJ_LP lp, PJ *P) { /* Spheroidal, forward */
* Inverse for Aitoff projection in poles is undefined, longitude value of 0 is
*assumed.
*
* Contact : dtutic@geof.hr
* Contact : dtutic at geof.hr
* Date: 2015-02-16
*
************************************************************************************/
Expand Down
8 changes: 5 additions & 3 deletions src/sqlite3_utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -236,11 +236,13 @@ std::unique_ptr<SQLite3VFS> SQLite3VFS::create(bool fakeSync, bool fakeLock,
#ifdef EMBED_RESOURCE_FILES

struct pj_sqlite3_memvfs : public pj_sqlite3_vfs {
~pj_sqlite3_memvfs() override {
pj_sqlite3_memvfs_deallocate_user_data(&base);
}
~pj_sqlite3_memvfs() override;
};

pj_sqlite3_memvfs::~pj_sqlite3_memvfs() {
pj_sqlite3_memvfs_deallocate_user_data(&base);
}

/* static */
std::unique_ptr<SQLite3VFS> SQLite3VFS::createMem(const void *membuffer,
size_t bufferSize) {
Expand Down
6 changes: 6 additions & 0 deletions test/unit/test_operationfactory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9929,6 +9929,9 @@ TEST(operation, createOperation_ossfuzz_18587) {

class derivedGeographicCRS_with_to_wgs84_to_geographicCRS
: public ::testing::Test {
public:
~derivedGeographicCRS_with_to_wgs84_to_geographicCRS() override;

protected:
void run(const CRSNNPtr &src) {
auto objDst = PROJStringParser().createFromPROJString(
Expand Down Expand Up @@ -9992,6 +9995,9 @@ class derivedGeographicCRS_with_to_wgs84_to_geographicCRS
}
};

derivedGeographicCRS_with_to_wgs84_to_geographicCRS::
~derivedGeographicCRS_with_to_wgs84_to_geographicCRS() = default;

// ---------------------------------------------------------------------------

TEST_F(derivedGeographicCRS_with_to_wgs84_to_geographicCRS, src_from_proj) {
Expand Down