ffi-gdal 1.0.0.beta5 → 1.0.0.beta6

data/lib/ffi/gdal/grid.rb

@@ -11,48 +11,165 @@ module FFI
       # Typedefs
       #------------------------------------------------------------------------
       callback :GDALGridFunction,
-        %i[pointer GUInt32 pointer pointer pointer double double pointer pointer],
-        CPLErr
+        [
+          :pointer,
+          CPL::Port.find_type(:GUInt32),
+          :pointer,
+          :pointer,
+          :pointer,
+          :double,
+          :double,
+          :pointer,
+          :pointer
+        ],
+        CPL::Error::CPLErr
 
       #------------------------------------------------------------------------
       # Functions
       #------------------------------------------------------------------------
       attach_function :GDALGridInverseDistanceToAPower,
-        %i[pointer GUInt32 pointer pointer pointer double double pointer pointer],
-        CPLErr
+        [
+          :pointer,
+          CPL::Port.find_type(:GUInt32),
+          :pointer,
+          :pointer,
+          :pointer,
+          :double,
+          :double,
+          :pointer,
+          :pointer
+        ],
+        CPL::Error::CPLErr
+
       attach_function :GDALGridInverseDistanceToAPointerNoSearch,
-        %i[pointer GUInt32 pointer pointer pointer double double pointer pointer],
-        CPLErr
+        [
+          :pointer,
+          CPL::Port.find_type(:GUInt32),
+          :pointer,
+          :pointer,
+          :pointer,
+          :double,
+          :double,
+          :pointer,
+          :pointer
+        ],
+        CPL::Error::CPLErr
 
       attach_function :GDALGridMovingAverage,
-        %i[pointer GUInt32 pointer pointer pointer double double pointer pointer],
-        CPLErr
+        [
+          :pointer,
+          CPL::Port.find_type(:GUInt32),
+          :pointer,
+          :pointer,
+          :pointer,
+          :double,
+          :double,
+          :pointer,
+          :pointer
+        ],
+        CPL::Error::CPLErr
 
       attach_function :GDALGridNearestNeighbor,
-        %i[pointer GUInt32 pointer pointer pointer double double pointer pointer],
-        CPLErr
+        [
+          :pointer,
+          CPL::Port.find_type(:GUInt32),
+          :pointer,
+          :pointer,
+          :pointer,
+          :double,
+          :double,
+          :pointer,
+          :pointer
+        ],
+        CPL::Error::CPLErr
 
       attach_function :GDALGridDataMetricMinimum,
-        %i[pointer GUInt32 pointer pointer pointer double double pointer pointer],
-        CPLErr
+        [
+          :pointer,
+          CPL::Port.find_type(:GUInt32),
+          :pointer,
+          :pointer,
+          :pointer,
+          :double,
+          :double,
+          :pointer,
+          :pointer
+        ],
+        CPL::Error::CPLErr
+
       attach_function :GDALGridDataMetricMaximum,
-        %i[pointer GUInt32 pointer pointer pointer double double pointer pointer],
-        CPLErr
+        [
+          :pointer,
+          CPL::Port.find_type(:GUInt32),
+          :pointer,
+          :pointer,
+          :pointer,
+          :double,
+          :double,
+          :pointer,
+          :pointer
+        ],
+        CPL::Error::CPLErr
+
       attach_function :GDALGridDataMetricRange,
-        %i[pointer GUInt32 pointer pointer pointer double double pointer pointer],
-        CPLErr
+        [
+          :pointer,
+          CPL::Port.find_type(:GUInt32),
+          :pointer,
+          :pointer,
+          :pointer,
+          :double,
+          :double,
+          :pointer,
+          :pointer
+        ],
+        CPL::Error::CPLErr
+
       attach_function :GDALGridDataMetricCount,
-        %i[pointer GUInt32 pointer pointer pointer double double pointer pointer],
-        CPLErr
+        [
+          :pointer,
+          CPL::Port.find_type(:GUInt32),
+          :pointer,
+          :pointer,
+          :pointer,
+          :double,
+          :double,
+          :pointer,
+          :pointer
+        ],
+        CPL::Error::CPLErr
+
       attach_function :GDALGridDataMetricAverageDistance,
-        %i[pointer GUInt32 pointer pointer pointer double double pointer pointer],
-        CPLErr
+        [
+          :pointer,
+          CPL::Port.find_type(:GUInt32),
+          :pointer,
+          :pointer,
+          :pointer,
+          :double,
+          :double,
+          :pointer,
+          :pointer
+        ],
+        CPL::Error::CPLErr
+
       attach_function :GDALGridDataMetricAverageDistancePts,
-        %i[pointer GUInt32 pointer pointer pointer double double pointer pointer],
-        CPLErr
+        [
+          :pointer,
+          CPL::Port.find_type(:GUInt32),
+          :pointer,
+          :pointer,
+          :pointer,
+          :double,
+          :double,
+          :pointer,
+          :pointer
+        ],
+        CPL::Error::CPLErr
+
       attach_function :ParseAlgorithmAndOptions,
-        [:string, GDALGridAlgorithm, :pointer],
-        CPLErr
+        [:string, Alg::GridAlgorithm, :pointer],
+        CPL::Error::CPLErr
     end
   end
 end

data/lib/ffi/gdal/grid_data_metrics_options.rb

@@ -6,7 +6,7 @@ module FFI
       layout :radius1, :double,
         :radius2, :double,
         :angle, :double,
-        :min_points, :GUInt32,
+        :min_points, CPL::Port.find_type(:GUInt32),
         :no_data_value, :double
     end
   end

data/lib/ffi/gdal/grid_moving_average_options.rb

@@ -6,7 +6,7 @@ module FFI
       layout :radius1, :double,
         :radius2, :double,
         :angle, :double,
-        :min_points, :GUInt32,
+        :min_points, CPL::Port.find_type(:GUInt32),
         :no_data_value, :double
     end
   end

data/lib/ffi/gdal/matching.rb

@@ -1,7 +1,5 @@
 require 'ffi'
 require_relative '../../ext/ffi_library_function_checks'
-require_relative 'gdal'
-require_relative 'gcp'
 
 module FFI
   module GDAL

data/lib/ffi/gdal/transformer_info.rb

@@ -5,7 +5,7 @@ module FFI
     class TransformerInfo < FFI::Struct
       layout :signature, :string,
         :class_name, :string,
-        :transform, :GDALTransformerFunc,
+        :transform, Alg.find_type(:GDALTransformerFunc),
         :cleanup, :pointer,
         :serialize, :pointer
     end

data/lib/ffi/gdal/version.rb

@@ -1,5 +1,5 @@
 module FFI
   module GDAL
-    VERSION = '1.0.0.beta5'
+    VERSION = '1.0.0.beta6'.freeze
   end
 end

data/lib/ffi/gdal/vrt.rb

@@ -1,7 +1,5 @@
 require 'ffi'
 require_relative '../../ext/ffi_library_function_checks'
-require_relative '../cpl/error'
-require_relative '../cpl/xml_node'
 
 module FFI
   module GDAL

data/lib/ffi/gdal/warp_options.rb

@@ -1,18 +1,14 @@
 require 'ffi'
-require_relative 'gdal'
-require_relative 'alg'
 
 module FFI
   module GDAL
-    autoload :Warper, File.expand_path('warper', __dir__)
-
     class WarpOptions < FFI::Struct
-      layout :warp_options, :pointer,
+      layout :warp_operation_options, :pointer,
         :warp_memory_limit, :double,
         :resample_alg, FFI::GDAL::Warper::ResampleAlg,
-        :working_data_type, FFI::GDAL::DataType,
-        :source_dataset, :GDALDatasetH,
-        :destination_dataset, :GDALDatasetH,
+        :working_data_type, FFI::GDAL::GDAL::DataType,
+        :source_dataset, GDAL.find_type(:GDALDatasetH),
+        :destination_dataset, GDAL.find_type(:GDALDatasetH),
         :band_count, :int,
         :source_bands, :pointer,
         :destination_bands, :pointer,
@@ -22,22 +18,24 @@ module FFI
         :source_no_data_imaginary, :pointer,
         :destination_no_data_real, :pointer,
         :destination_no_data_imaginary, :pointer,
-        :progress, :GDALProgressFunc,
+        :progress, GDAL.find_type(:GDALProgressFunc),
         :progress_arg, :pointer,
-        :transformer, GDAL::Alg.find_type(:GDALTransformerFunc),
+        :transformer, Alg.find_type(:GDALTransformerFunc),
         :transformer_arg, :pointer,
         :source_per_band_validity_mask_function, :pointer,
         :source_per_band_validity_mask_function_arg, :pointer,
-        :source_validity_mask_function, :pointer,
+        :source_validity_mask_function, Warper.find_type(:GDALMaskFunc),
         :source_validity_mask_function_arg, :pointer,
-        :source_density_mask_function, :pointer,
+        :source_density_mask_function, Warper.find_type(:GDALMaskFunc),
         :source_density_mask_function_arg, :pointer,
-        :destination_density_mask_function, :pointer,
+        :destination_density_mask_function, Warper.find_type(:GDALMaskFunc),
         :destination_density_mask_function_arg, :pointer,
-        :destination_validity_mask_function, :pointer,
+        :destination_validity_mask_function, Warper.find_type(:GDALMaskFunc),
         :destination_validity_mask_function_arg, :pointer,
+        # :pre_warp_chunk_processor, CPL::Error::CPLErr,
         :pre_warp_chunk_processor, :pointer,
         :pre_warp_processor_arg, :pointer,
+        # :post_warp_chunk_processor, CPL::Error::CPLErr,
         :post_warp_chunk_processor, :pointer,
         :post_warp_processor_arg, :pointer,
         :cutline, :pointer,

data/lib/ffi/gdal/warper.rb

@@ -1,11 +1,8 @@
 require 'ffi'
 require_relative '../../ext/ffi_library_function_checks'
-require_relative '../cpl/error'
 
 module FFI
   module GDAL
-    autoload :WarpOptions, File.expand_path('warp_options', __dir__)
-
     module Warper
       extend ::FFI::Library
       ffi_lib [FFI::CURRENT_PROCESS, FFI::GDAL.gdal_library_path]
@@ -18,7 +15,7 @@ module FFI
         [
           :pointer,
           :int,
-          FFI::GDAL::DataType,
+          FFI::GDAL::GDAL::DataType,
           :int,
           :int,
           :int,
@@ -44,14 +41,72 @@ module FFI
       # Functions
       #------------------------------------------------------------------------
       attach_function :GDALCreateWarpOptions, [], FFI::GDAL::WarpOptions.ptr
+      attach_function :GDALDestroyWarpOptions, [FFI::GDAL::WarpOptions.ptr], :void
+      attach_function :GDALCloneWarpOptions, [FFI::GDAL::WarpOptions.ptr], FFI::GDAL::WarpOptions.ptr
       attach_function :GDALSerializeWarpOptions,
         [FFI::GDAL::WarpOptions.ptr],
         FFI::CPL::XMLNode.ptr
+      attach_function :GDALDeserializeWarpOptions,
+        [FFI::CPL::XMLNode.ptr],
+        FFI::GDAL::WarpOptions.ptr
 
       attach_function :GDALCreateWarpOperation,
         [FFI::GDAL::WarpOptions.ptr],
         :GDALWarpOperationH
-      attach_function :GDALDestroyWarpOperation, [:GDALWarpOperationH], :void
+      attach_function :GDALDestroyWarpOperation, %i[GDALWarpOperationH], :void
+
+      attach_function :GDALWarpNoDataMasker,
+        [:pointer, :int, GDAL::DataType, :int, :int, :int, :int, :pointer, :int, :pointer],
+        CPL::Error::CPLErr
+      attach_function :GDALWarpDstAlphaMasker,
+        [:pointer, :int, GDAL::DataType, :int, :int, :int, :int, :pointer, :int, :pointer],
+        CPL::Error::CPLErr
+      attach_function :GDALWarpSrcAlphaMasker,
+        [:pointer, :int, GDAL::DataType, :int, :int, :int, :int, :pointer, :int, :pointer],
+        CPL::Error::CPLErr
+      attach_function :GDALWarpSrcMaskMasker,
+        [:pointer, :int, GDAL::DataType, :int, :int, :int, :int, :pointer, :int, :pointer],
+        CPL::Error::CPLErr
+      attach_function :GDALWarpCutlineMasker,
+        [:pointer, :int, GDAL::DataType, :int, :int, :int, :int, :pointer, :int, :pointer],
+        CPL::Error::CPLErr
+
+      attach_function :GDALReprojectImage,
+        [
+          FFI::GDAL::GDAL.find_type(:GDALDatasetH),
+          :string,
+          FFI::GDAL::GDAL.find_type(:GDALDatasetH),
+          :string,
+          ResampleAlg,
+          :double,
+          :double,
+          FFI::GDAL::GDAL.find_type(:GDALProgressFunc),
+          :pointer,
+          FFI::GDAL::WarpOptions.ptr
+        ],
+        CPL::Error::CPLErr
+      attach_function :GDALAutoCreateWarpedVRT,
+        [
+          FFI::GDAL::GDAL.find_type(:GDALDatasetH),
+          :string,
+          :string,
+          ResampleAlg,
+          :double,
+          FFI::GDAL::WarpOptions.ptr
+        ],
+        FFI::GDAL::GDAL.find_type(:GDALDatasetH)
+      attach_function :GDALCreateWarpedVRT,
+        [
+          FFI::GDAL::GDAL.find_type(:GDALDatasetH),
+          :int,
+          :int,
+          :double,
+          FFI::GDAL::WarpOptions.ptr
+        ],
+        FFI::GDAL::GDAL.find_type(:GDALDatasetH)
+      attach_function :GDALInitializeWarpedVRT,
+        [FFI::GDAL::GDAL.find_type(:GDALDatasetH), FFI::GDAL::WarpOptions.ptr],
+        CPL::Error::CPLErr
 
       attach_function :GDALChunkAndWarpImage,
         %i[GDALWarpOperationH int int int int],
@@ -63,7 +118,7 @@ module FFI
         %i[GDALWarpOperationH int int int int int int int int],
         CPL::Error::CPLErr
       attach_function :GDALWarpRegionToBuffer,
-        [:GDALWarpOperationH, :int, :int, :int, :int, :pointer, DataType, :int, :int, :int, :int],
+        [:GDALWarpOperationH, :int, :int, :int, :int, :pointer, GDAL::DataType, :int, :int, :int, :int],
         CPL::Error::CPLErr
     end
   end

data/lib/ffi/gdal.rb

@@ -7,6 +7,23 @@ module FFI
   module GDAL
     extend ::FFI::Library
 
+    autoload :Alg, File.expand_path('gdal/alg.rb', __dir__)
+    autoload :ColorEntry, File.expand_path('gdal/color_entry.rb', __dir__)
+    autoload :GDAL, File.expand_path('gdal/gdal.rb', __dir__)
+    autoload :GCP, File.expand_path('gdal/gcp.rb', __dir__)
+    autoload :Grid, File.expand_path('gdal/grid.rb', __dir__)
+    autoload :GridDataMetricsOptions, File.expand_path('gdal/grid_data_metrics_options.rb', __dir__)
+    autoload :GridInverseDistanceToAPowerOptions,
+      File.expand_path('gdal/grid_inverse_distance_to_a_power_options.rb', __dir__)
+    autoload :GridMovingAverageOptions, File.expand_path('gdal/grid_moving_average_options.rb', __dir__)
+    autoload :GridNearestNeighborOptions, File.expand_path('gdal/grid_nearest_neighbor_options.rb', __dir__)
+    autoload :Matching, File.expand_path('gdal/matching.rb', __dir__)
+    autoload :RPCInfo, File.expand_path('gdal/rpc_info.rb', __dir__)
+    autoload :TransformerInfo, File.expand_path('gdal/transformer_info.rb', __dir__)
+    autoload :VRT, File.expand_path('gdal/vrt.rb', __dir__)
+    autoload :Warper, File.expand_path('gdal/warper.rb', __dir__)
+    autoload :WarpOptions, File.expand_path('gdal/warp_options.rb', __dir__)
+
     # @return [String]
     def self.gdal_library_path
       @gdal_library_path ||= find_lib('{lib,}gdal*')
@@ -69,7 +86,7 @@ module FFI
     end
 
     if gdal_library_path.nil? || gdal_library_path.empty?
-      fail FFI::GDAL::LibraryNotFound, "Can't find required gdal library using path: '#{gdal_library_path}'"
+      raise FFI::GDAL::LibraryNotFound, "Can't find required gdal library using path: '#{gdal_library_path}'"
     end
 
     ffi_lib(gdal_library_path)
@@ -79,7 +96,5 @@ module FFI
   end
 end
 
-require_relative 'cpl/conv'
-require_relative 'gdal/gdal'
 require_relative 'gdal/version'
 require_relative '../ext/to_bool'

data/lib/ffi/ogr/api.rb

@@ -1,12 +1,4 @@
 require_relative '../../ext/ffi_library_function_checks'
-require_relative '../cpl/conv'
-require_relative 'core'
-require_relative 'envelope'
-require_relative 'envelope_3d'
-require_relative 'field'
-require_relative 'srs_api'
-require_relative '../cpl/xml_node'
-require_relative '../gdal/gdal'
 
 module FFI
   module OGR
@@ -34,7 +26,7 @@ module FFI
       # Functions
       # -----------------------------------------------------------------------
       attach_function :OGR_G_CreateFromWkb,
-        [:string, FFI::OGR::SRSAPI.find_type(:OGRSpatialReferenceH), :pointer, :int],
+        [:pointer, FFI::OGR::SRSAPI.find_type(:OGRSpatialReferenceH), :pointer, :int],
         FFI::OGR::Core::Err
       attach_function :OGR_G_CreateFromWkt,
         [:pointer, FFI::OGR::SRSAPI.find_type(:OGRSpatialReferenceH), :pointer],
@@ -87,7 +79,7 @@ module FFI
       attach_function :OGR_G_GetGeometryType, %i[OGRGeometryH], FFI::OGR::Core::WKBGeometryType
       attach_function :OGR_G_GetGeometryName, %i[OGRGeometryH], :string
       attach_function :OGR_G_DumpReadable,
-        %i[OGRGeometryH string string],
+        %i[OGRGeometryH pointer string],
         :void
       attach_function :OGR_G_FlattenTo2D, %i[OGRGeometryH], :void
       attach_function :OGR_G_CloseRings, %i[OGRGeometryH], :void
@@ -275,9 +267,6 @@ module FFI
       attach_function :OGR_FD_DeleteFieldDefn,
         %i[OGRFeatureDefnH int],
         FFI::OGR::Core::Err
-      attach_function :OGR_FD_ReorderFieldDefns,
-        %i[OGRFeatureDefnH pointer],
-        FFI::OGR::Core::Err
       attach_function :OGR_FD_GetGeomType, %i[OGRFeatureDefnH], FFI::OGR::Core::WKBGeometryType
       attach_function :OGR_FD_SetGeomType,
         [:OGRFeatureDefnH, FFI::OGR::Core::WKBGeometryType],
@@ -362,7 +351,7 @@ module FFI
 
       attach_function :OGR_F_GetFID, %i[OGRFeatureH], :long
       attach_function :OGR_F_SetFID, %i[OGRFeatureH long], FFI::OGR::Core::Err
-      attach_function :OGR_F_DumpReadable, %i[OGRFeatureH string], :void
+      attach_function :OGR_F_DumpReadable, %i[OGRFeatureH pointer], :void
       attach_function :OGR_F_SetFrom, %i[OGRFeatureH OGRFeatureH int], FFI::OGR::Core::Err
       attach_function :OGR_F_SetFromWithMap, %i[OGRFeatureH OGRFeatureH int pointer], FFI::OGR::Core::Err
 
@@ -433,25 +422,25 @@ module FFI
       attach_function :OGR_L_SetIgnoredFields, %i[OGRLayerH pointer], FFI::OGR::Core::Err
 
       attach_function :OGR_L_Intersection,
-        [:OGRLayerH, :OGRLayerH, :OGRLayerH, :pointer, FFI::GDAL.find_type(:GDALProgressFunc), :pointer],
+        [:OGRLayerH, :OGRLayerH, :OGRLayerH, :pointer, FFI::GDAL::GDAL.find_type(:GDALProgressFunc), :pointer],
         FFI::OGR::Core::Err
       attach_function :OGR_L_Union,
-        [:OGRLayerH, :OGRLayerH, :OGRLayerH, :pointer, FFI::GDAL.find_type(:GDALProgressFunc), :pointer],
+        [:OGRLayerH, :OGRLayerH, :OGRLayerH, :pointer, FFI::GDAL::GDAL.find_type(:GDALProgressFunc), :pointer],
         FFI::OGR::Core::Err
       attach_function :OGR_L_SymDifference,
-        [:OGRLayerH, :OGRLayerH, :OGRLayerH, :pointer, FFI::GDAL.find_type(:GDALProgressFunc), :pointer],
+        [:OGRLayerH, :OGRLayerH, :OGRLayerH, :pointer, FFI::GDAL::GDAL.find_type(:GDALProgressFunc), :pointer],
         FFI::OGR::Core::Err
       attach_function :OGR_L_Identity,
-        [:OGRLayerH, :OGRLayerH, :OGRLayerH, :pointer, FFI::GDAL.find_type(:GDALProgressFunc), :pointer],
+        [:OGRLayerH, :OGRLayerH, :OGRLayerH, :pointer, FFI::GDAL::GDAL.find_type(:GDALProgressFunc), :pointer],
         FFI::OGR::Core::Err
       attach_function :OGR_L_Update,
-        [:OGRLayerH, :OGRLayerH, :OGRLayerH, :pointer, FFI::GDAL.find_type(:GDALProgressFunc), :pointer],
+        [:OGRLayerH, :OGRLayerH, :OGRLayerH, :pointer, FFI::GDAL::GDAL.find_type(:GDALProgressFunc), :pointer],
         FFI::OGR::Core::Err
       attach_function :OGR_L_Clip,
-        [:OGRLayerH, :OGRLayerH, :OGRLayerH, :pointer, FFI::GDAL.find_type(:GDALProgressFunc), :pointer],
+        [:OGRLayerH, :OGRLayerH, :OGRLayerH, :pointer, FFI::GDAL::GDAL.find_type(:GDALProgressFunc), :pointer],
         FFI::OGR::Core::Err
       attach_function :OGR_L_Erase,
-        [:OGRLayerH, :OGRLayerH, :OGRLayerH, :pointer, FFI::GDAL.find_type(:GDALProgressFunc), :pointer],
+        [:OGRLayerH, :OGRLayerH, :OGRLayerH, :pointer, FFI::GDAL::GDAL.find_type(:GDALProgressFunc), :pointer],
         FFI::OGR::Core::Err
 
       # ~~~~~~~~~~~~~~~~

data/lib/ffi/ogr/core.rb

@@ -24,7 +24,8 @@ module FFI
         :OGRERR_UNSUPPORTED_SRS,
         :OGRERR_INVALID_HANDLE
 
-      WKBGeometryType = enum :wkbUnknown, 0,
+      WKBGeometryType = enum FFI::Type::UINT,
+        :wkbUnknown,                0,
         :wkbPoint,                  1,
         :wkbLineString,             2,
         :wkbPolygon,                3,
@@ -34,13 +35,13 @@ module FFI
         :wkbGeometryCollection,     7,
         :wkbNone,                   100,    # non-standard, for pure attribute records
         :wkbLinearRing,             101,    # non-standard, just for createGeometry
-        :wkbPoint25D,               -2_147_483_647,
-        :wkbLineString25D,          -2_147_483_646,
-        :wkbPolygon25D,             -2_147_483_645,
-        :wkbMultiPoint25D,          -2_147_483_644,
-        :wkbMultiLineString25D,     -2_147_483_643,
-        :wkbMultiPolygon25D,        -2_147_483_642,
-        :wkbGeometryCollection25D,  -2_147_483_641
+        :wkbPoint25D,               0x8000_0001,
+        :wkbLineString25D,          0x8000_0002,
+        :wkbPolygon25D,             0x8000_0003,
+        :wkbMultiPoint25D,          0x8000_0004,
+        :wkbMultiLineString25D,     0x8000_0005,
+        :wkbMultiPolygon25D,        0x8000_0006,
+        :wkbGeometryCollection25D,  0x8000_0007
 
       WKBVariant = enum :wkbVariantOgc, :wkbVariantIso
       WKBByteOrder = enum :wkbXDR, 0,
@@ -165,16 +166,12 @@ module FFI
       attach_function :OGRMalloc, [:size_t], :pointer
       attach_function :OGRCalloc, %i[size_t size_t], :pointer
       attach_function :OGRRealloc, %i[pointer size_t], :pointer
-      attach_function :OGRStrdup, [:string], :string
       attach_function :OGRFree, [:pointer], :void
 
       attach_function :OGRGeometryTypeToName, [WKBGeometryType], :string
       attach_function :OGRMergeGeometryTypes,
         [WKBGeometryType, WKBGeometryType],
         WKBGeometryType
-      attach_function :OGRMergeGeometryTypesEx,
-        [WKBGeometryType, WKBGeometryType, :bool],
-        WKBGeometryType
       attach_function :OGRParseDate, [:string, FFI::OGR::Field.ptr, :int], :int
     end
   end

data/lib/ffi/ogr/featurestyle.rb

@@ -2,11 +2,6 @@ require 'ffi'
 
 module FFI
   module OGR
-    autoload :StyleParam,
-      File.expand_path('style_param', __dir__)
-    autoload :StyleValue,
-      File.expand_path('style_value', __dir__)
-
     module Featurestyle
       extend ::FFI::Library
       ffi_lib [::FFI::CURRENT_PROCESS, ::FFI::GDAL.gdal_library_path]

data/lib/ffi/ogr/geocoding.rb

@@ -1,6 +1,5 @@
 require 'ffi'
 require_relative '../../ext/ffi_library_function_checks'
-require_relative 'api'
 
 module FFI
   module OGR

data/lib/ffi/ogr/srs_api.rb

@@ -1,5 +1,4 @@
 require_relative '../../ext/ffi_library_function_checks'
-require_relative '../ogr/core'
 
 module FFI
   module OGR
@@ -262,9 +261,6 @@ module FFI
       attach_function :OSRSetGnomonic,
         %i[OGRSpatialReferenceH double double double double],
         FFI::OGR::Core::Err
-      attach_function :OSRSetOM,
-        %i[OGRSpatialReferenceH double double double double double double double],
-        FFI::OGR::Core::Err
       attach_function :OSRSetHOM,
         %i[OGRSpatialReferenceH double double double double double double double],
         FFI::OGR::Core::Err

data/lib/ffi/ogr/style_value.rb

@@ -1,5 +1,4 @@
 require 'ffi'
-require_relative '../cpl/port'
 
 module FFI
   module OGR
@@ -8,7 +7,7 @@ module FFI
         :double_value, :double,
         :int_value, :int,
         :valid, FFI::CPL::Port.find_type(:GBool),
-        :unit, OGRSTUnitId
+        :unit, Core::STUnitId
     end
   end
 end

data/lib/ffi/ogr.rb

@@ -1,12 +1,15 @@
-require 'ffi'
-require_relative 'gdal'
-
-require_relative 'cpl/conv'
-require_relative 'cpl/minixml'
-require_relative 'ogr/core'
-require_relative 'ogr/api'
-
-# All of these depend on the above
-require_relative 'ogr/srs_api'
-require_relative 'ogr/featurestyle'
-require_relative 'ogr/geocoding'
+module FFI
+  module OGR
+    autoload :API, File.expand_path('ogr/api.rb', __dir__)
+    autoload :Core, File.expand_path('ogr/core.rb', __dir__)
+    autoload :ContourWriterInfo, File.expand_path('ogr/contour_writer_info.rb', __dir__)
+    autoload :Envelope, File.expand_path('ogr/envelope.rb', __dir__)
+    autoload :Envelope3D, File.expand_path('ogr/envelope_3d.rb', __dir__)
+    autoload :Featurestyle, File.expand_path('ogr/featurestyle.rb', __dir__)
+    autoload :Field, File.expand_path('ogr/field.rb', __dir__)
+    autoload :Geocoding, File.expand_path('ogr/geocoding.rb', __dir__)
+    autoload :SRSAPI, File.expand_path('ogr/srs_api.rb', __dir__)
+    autoload :StyleParam, File.expand_path('ogr/style_param.rb', __dir__)
+    autoload :StyleValue, File.expand_path('ogr/style_value.rb', __dir__)
+  end
+end

data/lib/ffi-gdal.rb

@@ -1,9 +1,11 @@
 require 'ffi'
-
 require_relative 'ext/ffi_library_function_checks'
 require_relative 'ext/narray_ext'
 require_relative 'ext/numeric_as_data_type'
 require_relative 'ext/float_ext'
 
-require_relative 'gdal'
-require_relative 'ogr'
+module FFI
+  autoload :CPL, File.expand_path('ffi/cpl.rb', __dir__)
+  autoload :GDAL, File.expand_path('ffi/gdal.rb', __dir__)
+  autoload :OGR, File.expand_path('ffi/ogr.rb', __dir__)
+end