Merge branch 'master' into fix/plot-A

Author: seisman

ci/install-dependencies-windows.sh

@@ -19,7 +19,7 @@ PACKAGE="${PACKAGE:-false}"
 WIN_PLATFORM=x64-windows
 
 # install libraries
-vcpkg install netcdf-c gdal[core,tools,default-features] pcre2 fftw3[core,threads] clapack openblas --triplet ${WIN_PLATFORM}
+vcpkg install netcdf-c gdal[core,tools,geos,netcdf] pcre2 fftw3[core,threads] clapack openblas --triplet ${WIN_PLATFORM}
 # Executable files search for DLL files in the directories listed in the PATH environment variable.
 echo "${VCPKG_INSTALLATION_ROOT}/installed/${WIN_PLATFORM}/bin" >> $GITHUB_PATH
 # Tools like gdal_translate, ogr2ogr are located in tools/gdal

src/sphdistance.c

@@ -52,11 +52,6 @@ enum sphdist_modes {
 	SPHD_VALUES = 2};
 
 struct SPHDISTANCE_CTRL {
-	struct SPHDISTANCE_A {	/* -A[m|p|x|y|step] */
-		bool active;
-		unsigned int mode;
-		double step;
-	} A;
 	struct SPHDISTANCE_C {	/* -C */
 		bool active;
 	} C;