Updated to 2025 copyrights and small clean up

Author: rijnb

CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2017 Stichting Mapcode Foundation (http://www.mapcode.com)
+# Copyright (C) 2014-2025 Stichting Mapcode Foundation (http://www.mapcode.com)
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

NOTICE

@@ -1,4 +1,4 @@
 Original C library created by Pieter Geelen. Work on Java version
 of the Mapcode library by Rijn Buve (original port by Matthew Lowden).
 
-Copyright (C) 2014-2017 Stichting Mapcode Foundation (http://www.mapcode.com)
+Copyright (C) 2014-2025 Stichting Mapcode Foundation (http://www.mapcode.com)

README.md

@@ -3,7 +3,7 @@
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/d2e3d7a469484bfd8b801ce94d3f1737)](https://www.codacy.com/app/rijnb/mapcode-cpp?utm_source=github.com&utm_medium=referral&utm_content=mapcode-foundation/mapcode-cpp&utm_campaign=Badge_Grade)
 [![License](http://img.shields.io/badge/license-APACHE2-blue.svg)]()
 
-**Copyright (C) 2014-2017 Stichting Mapcode Foundation (http://www.mapcode.com)**
+**Copyright (C) 2014-2025 Stichting Mapcode Foundation (http://www.mapcode.com)**
 
 
 **Online documentation: http://mapcode-foundation.github.io/mapcode-cpp/**
@@ -64,8 +64,8 @@ decode Mapcodes.
 
 This produces the following help text:
 
-    MAPCODE (version 2.5.5)
-    Copyright (C) 2014-2017 Stichting Mapcode Foundation
+    MAPCODE (version 2.5.6)
+    Copyright (C) 2014-2025 Stichting Mapcode Foundation
 
     Usage:
         mapcode [-d| --decode] <default-territory> <mapcode> [<mapcode> ...]
@@ -243,6 +243,10 @@ let fullName = String.init(cString: buffer)
 
 ## Release Notes
 
+### 2.5.6
+
+* Updated to latest compilers.
+
 ### 2.5.4 - 2.5.5
 
 * Added `encodeLatLonToSelectedMapcode` as a convenience for languages that use the

mapcodelib/mapcoder.h

@@ -57,7 +57,7 @@ extern "C" {
 #define MAPCODE_SUPPORT_LANGUAGE_UK
 #endif
 
-#define MAPCODE_C_VERSION                   "2.5.5"
+#define MAPCODE_C_VERSION                   "2.5.6"
 #define UWORD                               unsigned short int  // 2-byte unsigned integer.
 
 #define MAX_NR_OF_MAPCODE_RESULTS           22                  // Max. number of results ever returned by encoder (e.g. for 26.904899, 95.138515).

test/no_warnings.env

@@ -0,0 +1 @@
+-Wall -Wextra -Wno-pointer-to-int-cast -Wno-deprecated-declarations -Wno-unused-but-set-variable

test/run_compare.sh

@@ -15,9 +15,8 @@
 # limitations under the License.
 #
 
-OPTS="-Wall -Wextra -Wno-pointer-to-int-cast"
-
-NEW=../mapcode-2.5.5
+OPTS="$(cat ./no_warnings.env)"
+NEW=../mapcode-2.5.6
 OLD=../mapcode-2.5.2
 NEWFILE=_new.txt
 OLDFILE=_old.txt
@@ -26,10 +25,20 @@ OPTS1="--grid 1000000 8"
 OPTS2="--random 1000000 8 1234"
 OPTS3="--random 1000000 8 11223344"
 
+comparison_error() {
+    echo "If you want to run the comparison test script, please create symbolic links"
+    echo "to two version of the mapcode utility:"
+    echo "  $OLD"
+    echo "  $NEW"
+    echo "These must be placed in the root directory of this project."
+    exit
+}
+
 TEST=$(which $OLD)
 if [ "$TEST" = "" ]
 then
     echo "No $OLD found on this machine - skipping script..."
+    comparison_error
     exit 1
 fi
 
@@ -50,6 +59,7 @@ TEST=$(which $NEW)
 if [ "$TEST" = "" ]
 then
     echo "No $NEW found on this machine - skipping script..."
+    comparison_error
     exit 1
 fi
 

test/run_gcov.sh

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-OPTS="-Wall -Wextra -Wno-pointer-to-int-cast -fprofile-arcs -ftest-coverage"
+OPTS="$(cat ./no_warnings.env) -fprofile-arcs -ftest-coverage"
 LIB="../mapcodelib/mapcoder.o"
 
 TEST=$(which gcov)

test/run_gprof.sh

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-OPTS="-Wall -Wextra -Wno-pointer-to-int-cast"
+OPTS="$(cat ./no_warnings.env)"
 LIB="../mapcodelib/mapcoder.o"
 
 TEST=$(which gprof)

test/run_normal.sh

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-OPTS="-Wall -Wextra -Wno-pointer-to-int-cast"
+OPTS="$(cat ./no_warnings.env)"
 
 echo "!! -------------------------------------------------------------"
 echo "Run normal..."

test/run_sanitizer.sh

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-OPTS="-Wall -Wextra -Wno-pointer-to-int-cast"
+OPTS="$(cat ./no_warnings.env)"
 LIB="../mapcodelib/mapcoder.o"
 
 export ASAN_OPTIONS=debug=true:strict_string_checks=1:detect_stack_use_after_return=true:detect_invalid_pointer_pairs=99999:detect_container_overflow=true:detect_odr_violation=2:check_initialization_order=true:strict_init_order=true