ffi-gdal 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5687af49ac85e98515af311f02534829272c66d86c1d6b94446a8cb5e29870f7
-  data.tar.gz: e92e6bb4adc98c2d2dbbaba15d33e2ba15cf186efc0204b9645918f251cbb9be
+  metadata.gz: 8fca9f1c2bf76cee230d16796e3b8bc40e6c70316fdede5d3c8d8b7579acdb02
+  data.tar.gz: ecc6546df2d668dc6acb63a0b4fd927448d8b1b517fd2ea125b71b328cf8f5f3
 SHA512:
-  metadata.gz: d1d0340ac0e2e58bc9972a95980b337f3f47c8f148fbb9e9a40b5bdb7b64de91b77afda82760c737a0894a8f09f88612148efbf5e6430720c4535163472f39ed
-  data.tar.gz: '02245493a040172999137d0876710500c5453ead4e208bd8157525890410e320f782ef7fa13d000c9c74bd3e41d67f5aef6bbd1a93d3484df932a690797f9906'
+  metadata.gz: 797597b14f486516715e7997eae6b465ce7c1246f01db0b4687b369e82febf6100d0787f0f4096eb216bb6752d22fd58ced4b353eb143622c39136385fad3813
+  data.tar.gz: fbc4a452c6c95ccba8aa3a272419638702af8174d6b93f86b87dbeca92c9016cfe0ec7d35019f1146d4cbd5677e560afe0a09f97a6c6b2060450eefc0f00b0fc

data/.devcontainer/Dockerfile

@@ -0,0 +1,9 @@
+FROM mcr.microsoft.com/devcontainers/ruby:1-3.3-bookworm
+
+RUN ( \
+  export DEBIAN_FRONTEND=noninteractive \
+  && apt-get update \
+  && apt-get -y install --no-install-recommends \
+        libgdal-dev \
+        librttopo-dev \
+  )

data/.devcontainer/devcontainer.json

@@ -0,0 +1,98 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/ruby
+{
+	"name": "ffi-gdal dev container",
+
+	// Use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"build": {
+		"dockerfile": "Dockerfile"
+	},
+
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	// "features": {},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "ruby --version",
+
+	// Configure tool-specific properties.
+	"customizations": {
+		"vscode": {
+			// Basic settings config.
+			// Fine-tune inside the project with `.vscode/settings.json` file.
+
+			// Use 'settings' to set *default* container specific settings.json values on container create.
+			// You can edit these settings after create using File > Preferences > Settings > Remote.
+			"settings": {
+				// You could redefine this settings with .vscode/settings.json file
+				// inside workspace folder.
+
+				// Controls the maximum amount of lines the terminal keeps in its buffer.
+				// Increase to 50000. Default 1000 is too low.
+				"terminal.integrated.scrollback": 50000,
+
+				// Basic formatting settings.
+				"files.insertFinalNewline": true,
+				"files.trimTrailingWhitespace": true,
+
+				// Colorize and highlight bracket pairs.
+				"editor.guides.bracketPairs": true,
+				"editor.bracketPairColorization.enabled": true,
+
+				// Ruby LSP settings
+				"rubyLsp.formatter": "rubocop",
+				"rubyLsp.enableExperimentalFeatures": true,
+
+				// Ruby LSP advanced semantic highlighting.
+				"workbench.colorTheme": "Spinel",
+
+				"[ruby]": {
+					"editor.formatOnSave": true,
+					"editor.formatOnType": true,
+					"editor.defaultFormatter": "Shopify.ruby-lsp",
+					"editor.rulers": [
+						120
+					],
+					"editor.tabSize": 2,
+					"editor.insertSpaces": true,
+					"editor.semanticHighlighting.enabled": true,
+					"files.trimFinalNewlines": true
+				},
+
+				// Basic launch config for Run and Debug.
+				// Fine-tune inside the project with `.vscode/launch.json` file.
+				"launch": {
+					// Use IntelliSense to learn about possible attributes.
+					// Hover to view descriptions of existing attributes.
+					// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+					"version": "0.2.0",
+					"configurations": [
+						{
+							"type": "ruby_lsp",
+							"name": "Run specs with debugger",
+							"request": "launch",
+							"program": "bin/rspec"
+						},
+						{
+							"type": "ruby_lsp",
+							"name": "Run current spec line with debugger",
+							"request": "launch",
+							"program": "bin/rspec ${file}:${lineNumber}"
+						}
+					]
+				}
+			},
+
+			// Add the IDs of extensions you want installed when the container is created in the array below.
+			"extensions": [
+				"Shopify.ruby-extensions-pack",
+				"eamodio.gitlens"
+			]
+		}
+	}
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}

data/.github/CODEOWNERS

@@ -0,0 +1 @@
+* @turboladen @tindron

data/.github/workflows/codacy.yml

@@ -36,11 +36,11 @@ jobs:
     steps:
       # Checkout the repository to the GitHub Actions runner
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
       - name: Run Codacy Analysis CLI
-        uses: codacy/codacy-analysis-cli-action@d43127fe38d20c527dc1951ae5aea23148bab738
+        uses: codacy/codacy-analysis-cli-action@97bf5df3c09e75f5bcd72695998f96ebd701846e
         with:
           # Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository
           # You can also omit the token and run the tools that support default configurations
@@ -56,6 +56,6 @@ jobs:
 
       # Upload the SARIF file generated in the previous step
       - name: Upload SARIF results file
-        uses: github/codeql-action/upload-sarif@v2
+        uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: results.sarif

data/.github/workflows/codeql.yml

@@ -38,11 +38,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -56,7 +56,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -69,6 +69,6 @@ jobs:
     #   ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
       with:
         category: "/language:${{matrix.language}}"

data/.github/workflows/continuous-integration.yml

@@ -1,36 +1,47 @@
 name: Continuous Integration
 
 on:
+  pull_request:
   push:
 
 jobs:
-  test:
-    name: Test
-    runs-on: ubuntu-18.04
+  static_analysis:
+    name: Rubocop
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
+          ruby-version: "3.3"
           bundler-cache: true
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libgdal-dev librttopo-dev
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: bundle exec rspec spec --format RSpec::Github::Formatter --format progress
+      - name: Rubocop
+        run: bundle exec rubocop --format github --parallel
 
-  static_analysis:
-    name: Rubocop
-    runs-on: ubuntu-18.04
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        # NOTE:
+        # - ubuntu-20.04 has GDAL 3.0.4, PROJ 6.3.1, GEOS 3.8.0
+        # - ubuntu-22.04 has GDAL 3.4.1, PROJ 8.2.1, GEOS 3.10.2
+        # - ubuntu-24.04 has GDAL 3.8.4, PROJ 9.4.0, GEOS 3.12.1
+        os: ["ubuntu-20.04", "ubuntu-22.04", "ubuntu-24.04"]
+        ruby-version: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3"]
+    name: "Test on Ruby ${{ matrix.ruby-version }} on ${{ matrix.os }}"
+    runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
+      - name: Install GDAL
+        run:
+          sudo apt-get install -y --no-install-recommends libgdal-dev
+          librttopo-dev
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
+          ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true
-      - name: Install dependencies
-        run: bundle install --jobs 4 --retry 3
-      - name: Rubocop
-        run: bundle exec rubocop --format github --parallel
+      - name: Run specs
+        run:
+          bundle exec rspec spec --format RSpec::Github::Formatter --format
+          progress

data/.github/workflows/dependency-review.yml

@@ -15,6 +15,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout Repository'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@v3
+        uses: actions/dependency-review-action@v4

data/.github/workflows/specs-in-docker.yml

@@ -1,29 +1,35 @@
 name: Specs in Docker
 
 on:
+  pull_request:
   push:
 
 jobs:
-  test:
-    name: Test
+  docker_test:
+    name: Docker Test (GDAL2)
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@master
       - name: Cache Docker layers
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-buildx-
       - name: Log in to registry
-        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
+        run:
+          echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $
+          --password-stdin
       - name: Build gdal2 image
         run: |
           docker compose version
           docker compose build gdal2
       - name: Run specs
-        run: docker compose run --rm gdal2 bundle exec rspec spec --format RSpec::Github::Formatter --format progress
+        run:
+          docker compose run --rm gdal2 bundle exec rspec spec --format
+          RSpec::Github::Formatter --format progress
+

data/.gitignore

@@ -15,10 +15,13 @@
 .byebug_history
 .config
 .idea/
+.vscode/
 .rake_tasks
 .tags
 .yardoc
 
+.ruby-version
+
 Gemfile.lock
 InstalledFiles
 _yardoc
@@ -39,4 +42,4 @@ valgrind_output.log
 vendor/bundle
 vendor/sigs
 
-.odo
+.odo

data/Changelog.md

@@ -6,26 +6,61 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.0.4] - 2023-02-06
+## [1.1.0] — 2024-08-16
+
+### Added
+
+- [gh-76](https://github.com/telus-agcg/ffi-gdal/issues/76): Add VSI
+  `PathSpecificOptions` and `VSI` Credentials.
+- [gh-78](https://github.com/telus-agcg/ffi-gdal/issues/78): Add basic support
+  for Ractors.
+- [gh-79](https://github.com/telus-agcg/ffi-gdal/issues/79): Initial GDAL Utils
+  support.
+- [gh-81](https://github.com/telus-agcg/ffi-gdal/issues/81): Improve support for
+  GDAL 3.
+- [gh-84](https://github.com/telus-agcg/ffi-gdal/issues/84): Improve raster band
+  offset/scaling handling.
+- [gh-86](https://github.com/telus-agcg/ffi-gdal/issues/86): Add
+  `GDAL::GeoTransform#==`.
+- [gh-91](https://github.com/telus-agcg/ffi-gdal/issues/91): Add
+  `GDAL::MajorObject#description=`.
+- [gh-100](https://github.com/telus-agcg/ffi-gdal/issues/100): Add support for
+  `GDT_Int8`, `GDT_UInt64`, `GDT_Int64`.
+- [gh-103](https://github.com/telus-agcg/ffi-gdal/issues/103): Add support for
+  GDAL 3.6, 3.8.
+
+### Changed
+
+- [gh-102](https://github.com/telus-agcg/ffi-gdal/issues/102): Add support for
+  new CPLE error codes.
+
+### Fixed
+
+- [gh-74](https://github.com/telus-agcg/ffi-gdal/issues/74): Add
+  `/opt/homebrew/include` to header file search paths (fix for macOS).
+- [gh-77](https://github.com/telus-agcg/ffi-gdal/issues/77): Fix logging for
+  debug messages.
+
+## [1.0.4] — 2023-02-06
 
 ### Fixed
 
 - Move `OGR::GeometryMixins::Extensions#is_3d?` to `OGR::Geometry`.
 
-## [1.0.3] - 2023-01-27
+## [1.0.3] — 2023-01-27
 
 ### Fixed
 
 - Fix nil return value from `OGR::GeometryMixins::Extensions#utm_zone` when
-  spatial_reference is not 4326.
+  `spatial_reference` is not 4326.
 
-## [1.0.2] - 2023-01-13
+## [1.0.2] — 2023-01-13
 
 ### Fixed
 
 - Fix requires for lib/\*/extensions/all.rb.
 
-## [1.0.1] - 2023-01-13
+## [1.0.1] — 2023-01-13
 
 ### Fixed
 

data/Gemfile

@@ -12,7 +12,9 @@ gem "fakefs"
 gem "rake"
 gem "rspec", "~> 3.0"
 gem "rspec-github"
-gem "rubocop", ">= 1.0"
-gem "rubocop-performance"
+# NOTE: Current versions of rubocop and rubocop-performance do not support Ruby 2.6.
+# Allow some flexibility in the versions to avoid breaking the CI.
+gem "rubocop", "<= 1.63.1"
+gem "rubocop-performance", "<= 1.21.0"
 gem "simplecov", "~> 0.9"
 gem "thor"

data/README.md

@@ -2,6 +2,16 @@
 
 Ruby wrapper around GDAL, using FFI, along with some helper methods.
 
+## Status
+
+[![Gem Version](https://badge.fury.io/rb/ffi-gdal.svg)](https://badge.fury.io/rb/ffi-gdal)
+[![Github Actions CI](https://github.com/telus-agcg/ffi-gdal/actions/workflows/continuous-integration.yml/badge.svg?branch=develop)](https://github.com/telus-agcg/ffi-gdal/actions/workflows/continuous-integration.yml)
+[![Github CodeQL](https://github.com/telus-agcg/ffi-gdal/actions/workflows/codeql.yml/badge.svg?branch=develop)](https://github.com/telus-agcg/ffi-gdal/actions/workflows/codeql.yml)
+[![Ruby Style Guide](https://img.shields.io/badge/code_style-rubocop-brightgreen.svg)](https://github.com/rubocop/rubocop)
+
+- **GDAL 2.4** and **GDAL 3+** are supported.
+- Ruby **2.6+** supported.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -44,6 +54,31 @@ For classes that are enabled with logging capabilities, you can turn logging on
 and off like `GDAL::RasterBand.logging_enabled = true`. If you're using ffi-gdal
 in Rails, you can `GDAL::Logger.logger = Rails.logger`.
 
+### Debugging
+
+Additional error logging can be enabled through GDAL's [global configuration options](https://gdal.org/user/configoptions.html).
+
+```ruby
+FFI::CPL::Conv.CPLSetConfigOption('CPL_DEBUG', 'ON')
+FFI::CPL::Conv.CPLSetConfigOption('CPL_LOG_ERRORS', 'ON')
+```
+
+## Compatibility
+
+CI is run against:
+- Ruby 2.6, 2.7, 3.0, 3.1, 3.2, 3.3 for Ubuntu 24.04
+  (**GDAL 3.8.4**, PROJ 9.4.0, GEOS 3.12.1)
+- Ruby 2.6, 2.7, 3.0, 3.1, 3.2, 3.3 for Ubuntu 22.04
+  (**GDAL 3.4.1**, PROJ 8.2.1, GEOS 3.10.2)
+- Ruby 2.6, 2.7, 3.0, 3.1, 3.2, 3.3 for Ubuntu 20.04
+  (**GDAL 3.0.4**, PROJ 6.3.1, GEOS 3.8.0)
+- Ruby 3.2 with **GDAL 2.4.4**
+
+> GDAL itself has differences in behaviour between versions. This means that
+> upgrading your project to a newer version of GDAL may introduce some
+> breaking changes to your project due to changes in GDAL internal logic.
+> We document these differences in the specs when possible.
+
 ## Contributing
 
 1. Fork it ( https://github.com/telus-agcg/ffi-gdal/fork )

data/lib/ext/numeric_as_data_type.rb

@@ -4,7 +4,7 @@ module NumericAsDataType
   # @param data_type [FFI::GDAL::GDAL::DataType]
   def to_data_type(data_type)
     case data_type
-    when :GDT_Byte, :GDT_UInt16, :GDT_Int16, :GDT_UInt32, :GDT_Int32
+    when :GDT_Byte, :GDT_Int8, :GDT_UInt16, :GDT_Int16, :GDT_UInt32, :GDT_Int32, :GDT_UInt64, :GDT_Int64
       to_i
     when :GDT_Float32, :GDT_Float64
       to_f

data/lib/ffi/cpl/vsi.rb

@@ -111,6 +111,16 @@ module FFI
       attach_function :VSICTime, %i[ulong], :strptr
       attach_function :VSIGMTime, %i[pointer pointer], :pointer
       attach_function :VSILocalTime, %i[pointer pointer], :pointer
+
+      # GDAL 3.5+ VSI Credentials (legacy, VSI PathSpecificOptions should be used instead in GDAL 3.6+)
+      attach_function :VSISetCredential, %i[string string string], :void
+      attach_function :VSIClearCredentials, %i[string], :void
+      attach_function :VSIGetCredential, %i[string string string], :string
+
+      # GDAL 3.6+ VSI PathSpecificOptions
+      attach_function :VSISetPathSpecificOption, %i[string string string], :void
+      attach_function :VSIClearPathSpecificOptions, %i[string], :void
+      attach_function :VSIGetPathSpecificOption, %i[string string string], :string
     end
   end
 end

data/lib/ffi/gdal/gdal.rb

@@ -6,6 +6,7 @@ require_relative "color_entry"
 
 module FFI
   module GDAL
+    # rubocop:disable Metrics/ModuleLength
     module GDAL
       extend ::FFI::Library
       ffi_lib [::FFI::CURRENT_PROCESS, ::FFI::GDAL.gdal_library_path]
@@ -13,19 +14,24 @@ module FFI
       # ----------------------------------------------------------------
       # Enums
       # ----------------------------------------------------------------
-      DataType = enum :GDT_Unknown, 0,
+      # https://gdal.org/doxygen/gdal_8h_source.html
+      # NOTE: GDT_TypeCount is maximum type # + 1.
+      DataType = enum :GDT_Unknown,     0,
                       :GDT_Byte,        1,
+                      :GDT_Int8,        14,
                       :GDT_UInt16,      2,
                       :GDT_Int16,       3,
                       :GDT_UInt32,      4,
                       :GDT_Int32,       5,
+                      :GDT_UInt64,      12,
+                      :GDT_Int64,       13,
                       :GDT_Float32,     6,
                       :GDT_Float64,     7,
                       :GDT_CInt16,      8,
                       :GDT_CInt32,      9,
                       :GDT_CFloat32,    10,
                       :GDT_CFloat64,    11,
-                      :GDT_TypeCount,   12
+                      :GDT_TypeCount,   15
 
       AsyncStatusType = enum :GARIO_PENDING, 0,
                              :GARIO_UPDATE,     1,
@@ -679,5 +685,6 @@ module FFI
                       %i[pointer int int pointer int int int int],
                       :void
     end
+    # rubocop:enable Metrics/ModuleLength
   end
 end

data/lib/ffi/gdal/grid_data_metrics_options.rb

@@ -4,12 +4,34 @@ require "ffi"
 
 module FFI
   module GDAL
+    # FFI structure for GDALGridDataMetricsOptions.
+    # @see https://gdal.org/api/gdal_alg.html#_CPPv426GDALGridDataMetricsOptions
     class GridDataMetricsOptions < FFI::Struct
-      layout :radius1, :double,
-             :radius2, :double,
-             :angle, :double,
-             :min_points, CPL::Port.find_type(:GUInt32),
-             :no_data_value, :double
+      DEFAULT_LAYOUT = [
+        :radius1, :double,
+        :radius2, :double,
+        :angle, :double,
+        :min_points, CPL::Port.find_type(:GUInt32),
+        :no_data_value, :double
+      ].freeze
+
+      LAYOUT_VERSIONS = [
+        InternalHelpers::LayoutVersion.new(
+          version: "0000000", # Any old GDAL
+          layout: DEFAULT_LAYOUT
+        ),
+        InternalHelpers::LayoutVersion.new(
+          version: "3060000", # GDAL 3.6.0
+          layout: [
+            :n_size_of_structure, :size_t,
+            *DEFAULT_LAYOUT,
+            :max_points_per_quadrant, CPL::Port.find_type(:GUInt32),
+            :min_points_per_quadrant, CPL::Port.find_type(:GUInt32)
+          ]
+        )
+      ].freeze
+
+      layout(*InternalHelpers::LayoutVersionResolver.resolve(versions: LAYOUT_VERSIONS))
     end
   end
 end

data/lib/ffi/gdal/grid_inverse_distance_to_a_power_options.rb

@@ -4,17 +4,37 @@ require "ffi"
 
 module FFI
   module GDAL
+    # FFI structure for GDALGridInverseDistanceToAPowerOptions.
+    # @see https://gdal.org/api/gdal_alg.html#_CPPv438GDALGridInverseDistanceToAPowerOptions
     class GridInverseDistanceToAPowerOptions < FFI::Struct
-      layout :power, :double,
-             :smoothing, :double,
-             :anisotropy_ratio, :double,
-             :anisotropy_angle, :double,
-             :radius1, :double,
-             :radius2, :double,
-             :angle, :double,
-             :max_points, CPL::Port.find_type(:GUInt32),
-             :min_points, CPL::Port.find_type(:GUInt32),
-             :no_data_value, :double
+      DEFAULT_LAYOUT = [
+        :power, :double,
+        :smoothing, :double,
+        :anisotropy_ratio, :double,
+        :anisotropy_angle, :double,
+        :radius1, :double,
+        :radius2, :double,
+        :angle, :double,
+        :max_points, CPL::Port.find_type(:GUInt32),
+        :min_points, CPL::Port.find_type(:GUInt32),
+        :no_data_value, :double
+      ].freeze
+
+      LAYOUT_VERSIONS = [
+        InternalHelpers::LayoutVersion.new(
+          version: "0000000", # Any old GDAL
+          layout: DEFAULT_LAYOUT
+        ),
+        InternalHelpers::LayoutVersion.new(
+          version: "3060000", # GDAL 3.6.0
+          layout: [
+            :n_size_of_structure, :size_t,
+            *DEFAULT_LAYOUT
+          ]
+        )
+      ].freeze
+
+      layout(*InternalHelpers::LayoutVersionResolver.resolve(versions: LAYOUT_VERSIONS))
     end
   end
 end

data/lib/ffi/gdal/grid_moving_average_options.rb

@@ -4,12 +4,37 @@ require "ffi"
 
 module FFI
   module GDAL
+    # FFI structure for GDALGridMovingAverageOptions.
+    # @see https://gdal.org/api/gdal_alg.html#_CPPv428GDALGridMovingAverageOptions
     class GridMovingAverageOptions < FFI::Struct
-      layout :radius1, :double,
-             :radius2, :double,
-             :angle, :double,
-             :min_points, CPL::Port.find_type(:GUInt32),
-             :no_data_value, :double
+      LAYOUT_VERSIONS = [
+        InternalHelpers::LayoutVersion.new(
+          version: "0000000", # Any old GDAL
+          layout: [
+            :radius1, :double,
+            :radius2, :double,
+            :angle, :double,
+            :min_points, CPL::Port.find_type(:GUInt32),
+            :no_data_value, :double
+          ]
+        ),
+        InternalHelpers::LayoutVersion.new(
+          version: "3060000", # GDAL 3.6.0
+          layout: [
+            :n_size_of_structure, :size_t,
+            :radius1, :double,
+            :radius2, :double,
+            :angle, :double,
+            :max_points, CPL::Port.find_type(:GUInt32),
+            :min_points, CPL::Port.find_type(:GUInt32),
+            :no_data_value, :double,
+            :max_points_per_quadrant, CPL::Port.find_type(:GUInt32),
+            :min_points_per_quadrant, CPL::Port.find_type(:GUInt32)
+          ]
+        )
+      ].freeze
+
+      layout(*InternalHelpers::LayoutVersionResolver.resolve(versions: LAYOUT_VERSIONS))
     end
   end
 end