ffi-gdal 1.0.0.beta3 → 1.0.0.beta4

data/lib/ffi/gdal/grid.rb

@@ -0,0 +1,58 @@
+require 'ffi'
+require_relative '../../ext/ffi_library_function_checks'
+
+module FFI
+  module GDAL
+    module Grid
+      extend ::FFI::Library
+      ffi_lib [::FFI::CURRENT_PROCESS, ::FFI::GDAL.gdal_library_path]
+
+      #------------------------------------------------------------------------
+      # Typedefs
+      #------------------------------------------------------------------------
+      callback :GDALGridFunction,
+        %i[pointer GUInt32 pointer pointer pointer double double pointer pointer],
+        CPLErr
+
+      #------------------------------------------------------------------------
+      # Functions
+      #------------------------------------------------------------------------
+      attach_function :GDALGridInverseDistanceToAPower,
+        %i[pointer GUInt32 pointer pointer pointer double double pointer pointer],
+        CPLErr
+      attach_function :GDALGridInverseDistanceToAPointerNoSearch,
+        %i[pointer GUInt32 pointer pointer pointer double double pointer pointer],
+        CPLErr
+
+      attach_function :GDALGridMovingAverage,
+        %i[pointer GUInt32 pointer pointer pointer double double pointer pointer],
+        CPLErr
+
+      attach_function :GDALGridNearestNeighbor,
+        %i[pointer GUInt32 pointer pointer pointer double double pointer pointer],
+        CPLErr
+
+      attach_function :GDALGridDataMetricMinimum,
+        %i[pointer GUInt32 pointer pointer pointer double double pointer pointer],
+        CPLErr
+      attach_function :GDALGridDataMetricMaximum,
+        %i[pointer GUInt32 pointer pointer pointer double double pointer pointer],
+        CPLErr
+      attach_function :GDALGridDataMetricRange,
+        %i[pointer GUInt32 pointer pointer pointer double double pointer pointer],
+        CPLErr
+      attach_function :GDALGridDataMetricCount,
+        %i[pointer GUInt32 pointer pointer pointer double double pointer pointer],
+        CPLErr
+      attach_function :GDALGridDataMetricAverageDistance,
+        %i[pointer GUInt32 pointer pointer pointer double double pointer pointer],
+        CPLErr
+      attach_function :GDALGridDataMetricAverageDistancePts,
+        %i[pointer GUInt32 pointer pointer pointer double double pointer pointer],
+        CPLErr
+      attach_function :ParseAlgorithmAndOptions,
+        [:string, GDALGridAlgorithm, :pointer],
+        CPLErr
+    end
+  end
+end

data/lib/ffi/gdal/{gdal_grid_data_metrics_options.rb → grid_data_metrics_options.rb}

@@ -1,9 +1,8 @@
 require 'ffi'
 
-
 module FFI
   module GDAL
-    class GDALGridDataMetricsOptions < FFI::Struct
+    class GridDataMetricsOptions < FFI::Struct
       layout :radius1, :double,
         :radius2, :double,
         :angle, :double,

data/lib/ffi/gdal/{gdal_grid_inverse_distance_to_a_power_options.rb → grid_inverse_distance_to_a_power_options.rb}

@@ -1,9 +1,8 @@
 require 'ffi'
 
-
 module FFI
   module GDAL
-    class GDALGridInverseDistanceToAPowerOptions < FFI::Struct
+    class GridInverseDistanceToAPowerOptions < FFI::Struct
       layout :power, :double,
         :smoothing, :double,
         :anisotropy_ratio, :double,

data/lib/ffi/gdal/{gdal_grid_moving_average_options.rb → grid_moving_average_options.rb}

@@ -1,9 +1,8 @@
 require 'ffi'
 
-
 module FFI
   module GDAL
-    class GDALGridMovingAverageOptions < FFI::Struct
+    class GridMovingAverageOptions < FFI::Struct
       layout :radius1, :double,
         :radius2, :double,
         :angle, :double,

data/lib/ffi/gdal/{gdal_grid_nearest_neighbor_options.rb → grid_nearest_neighbor_options.rb}

@@ -1,9 +1,8 @@
 require 'ffi'
 
-
 module FFI
   module GDAL
-    class GDALGridNearestNeighborOptions < FFI::Struct
+    class GridNearestNeighborOptions < FFI::Struct
       layout :radius1, :double,
         :radius2, :double,
         :angle, :double,

data/lib/ffi/gdal/matching.rb

@@ -0,0 +1,20 @@
+require 'ffi'
+require_relative '../../ext/ffi_library_function_checks'
+require_relative 'gdal'
+require_relative 'gcp'
+
+module FFI
+  module GDAL
+    module Matching
+      extend ::FFI::Library
+      ffi_lib [::FFI::CURRENT_PROCESS, ::FFI::GDAL.gdal_library_path]
+
+      # TODO: Seems like this should return an array of GCPs, not just a single
+      # GCP.
+      attach_function :GDALComputeMatchingPoints,
+        [GDAL.find_type(:GDALDatasetH), GDAL.find_type(:GDALDatasetH), :pointer, :pointer],
+        # :pointer
+        GCP.ptr
+    end
+  end
+end

data/lib/ffi/gdal/{gdal_rpc_info.rb → rpc_info.rb}

@@ -1,9 +1,8 @@
 require 'ffi'
 
-
 module FFI
   module GDAL
-    class GDALRPCInfo < FFI::Struct
+    class RPCInfo < FFI::Struct
       layout :line_off, :double,
         :samp_off, :double,
         :lat_off, :double,

data/lib/ffi/gdal/{gdal_transformer_info.rb → transformer_info.rb}

@@ -1,9 +1,8 @@
 require 'ffi'
 
-
 module FFI
   module GDAL
-    class GDALTransformerInfo < FFI::Struct
+    class TransformerInfo < FFI::Struct
       layout :signature, :string,
         :class_name, :string,
         :transform, :GDALTransformerFunc,

data/lib/ffi/gdal/version.rb

@@ -1,5 +1,5 @@
 module FFI
   module GDAL
-    VERSION = '1.0.0.beta3'
+    VERSION = '1.0.0.beta4'
   end
 end

data/lib/ffi/gdal/vrt.rb

@@ -0,0 +1,92 @@
+require 'ffi'
+require_relative '../../ext/ffi_library_function_checks'
+require_relative '../cpl/error'
+require_relative '../cpl/xml_node'
+
+module FFI
+  module GDAL
+    module VRT
+      extend ::FFI::Library
+      ffi_lib [::FFI::CURRENT_PROCESS, ::FFI::GDAL.gdal_library_path]
+
+      #-------------------------------------------------------------------------
+      # Typedefs
+      #-------------------------------------------------------------------------
+      typedef :pointer, :VRTDriverH
+
+      typedef :pointer, :VRTSourceH
+      typedef :pointer, :VRTSimpleSourceH
+      typedef :pointer, :VRTAveragedSourceH
+      typedef :pointer, :VRTComplexSourceH
+      typedef :pointer, :VRTFilteredSourceH
+      typedef :pointer, :VRTKernelFilteredSourceH
+      typedef :pointer, :VRTAverageFilteredSourceH
+      typedef :pointer, :VRTFuncSourceH
+
+      typedef :pointer, :VRTDatasetH
+      typedef :pointer, :VRTWarpedDatasetH
+
+      typedef :pointer, :VRTRasterBandH
+      typedef :pointer, :VRTSourcedRasterBandH
+      typedef :pointer, :VRTWarpedRasterBandH
+      typedef :pointer, :VRTDerivedRasterBandH
+      typedef :pointer, :VRTRawRasterBandH
+
+      callback :VRTImageReadFunc,
+        %i[pointer int int int int pointer],
+        CPL::Error::CPLErr
+
+      #-------------------------------------------------------------------------
+      # Functions
+      #-------------------------------------------------------------------------
+      attach_function :GDALRegister_VRT, [], :void
+      attach_function :VRTCreate, %i[int int], :VRTDatasetH
+      attach_function :VRTFlushCache, %i[VRTDatasetH], :void
+      attach_function :VRTSerializeToXML, %i[VRTDatasetH string], CPL::XMLNode.ptr
+
+      attach_function :VRTAddBand,
+        [:VRTDatasetH, GDAL::DataType, :pointer],
+        :int
+
+      attach_function :VRTAddSource,
+        %i[VRTSourcedRasterBandH VRTSourceH],
+        CPL::Error::CPLErr
+      attach_function :VRTAddSimpleSource,
+        [
+          :VRTSourcedRasterBandH,             # hVRTBand
+          GDAL.find_type(:GDALRasterBandH),   # hSrcBand
+          :int,                               # nSrcXOff
+          :int,                               # nSrcYOff
+          :int,                               # nSrcXSize
+          :int,                               # nSrcYSize
+          :int,                               # nDstXOff
+          :int,                               # nDstYOff
+          :int,                               # nDstXSize
+          :int,                               # nDstYSize
+          :string,                            # pszResampling
+          :double                             # dfNoDataValue
+        ],
+        CPL::Error::CPLErr
+      attach_function :VRTAddComplexSource,
+        [
+          :VRTSourcedRasterBandH,             # hVRTBand
+          GDAL.find_type(:GDALRasterBandH),   # hSrcBand
+          :int,                               # nSrcXOff
+          :int,                               # nSrcYOff
+          :int,                               # nSrcXSize
+          :int,                               # nSrcYSize
+          :int,                               # nDstXOff
+          :int,                               # nDstYOff
+          :int,                               # nDstXSize
+          :int,                               # nDstYSize
+          :double,                            # dfScaleOff
+          :double,                            # dfScaleRation
+          :double                             # dfNoDataValue
+        ],
+        CPL::Error::CPLErr
+      attach_function :VRTAddFuncSource,
+        %i[VRTSourcedRasterBandH VRTImageReadFunc pointer double],
+        CPL::Error::CPLErr
+    end
+  end
+end

data/lib/ffi/gdal/{gdal_warp_options.rb → warp_options.rb}

@@ -1,12 +1,16 @@
 require 'ffi'
+require_relative 'gdal'
+require_relative 'alg'
 
 module FFI
   module GDAL
-    class GDALWarpOptions < FFI::Struct
+    autoload :Warper, File.expand_path('warper', __dir__)
+
+    class WarpOptions < FFI::Struct
       layout :warp_options, :pointer,
         :warp_memory_limit, :double,
-        :resample_alg, FFI::GDAL::GDALResampleAlg,
-        :working_data_type, FFI::GDAL::GDALDataType,
+        :resample_alg, FFI::GDAL::Warper::ResampleAlg,
+        :working_data_type, FFI::GDAL::DataType,
         :source_dataset, :GDALDatasetH,
         :destination_dataset, :GDALDatasetH,
         :band_count, :int,
@@ -20,7 +24,7 @@ module FFI
         :destination_no_data_imaginary, :pointer,
         :progress, :GDALProgressFunc,
         :progress_arg, :pointer,
-        :transformer, :GDALTransformerFunc,
+        :transformer, GDAL::Alg.find_type(:GDALTransformerFunc),
         :transformer_arg, :pointer,
         :source_per_band_validity_mask_function, :pointer,
         :source_per_band_validity_mask_function_arg, :pointer,

data/lib/ffi/gdal/warper.rb

@@ -0,0 +1,70 @@
+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]
+
+      #------------------------------------------------------------------------
+      # Typedefs
+      #------------------------------------------------------------------------
+      typedef :pointer, :GDALWarpOperationH
+      callback :GDALMaskFunc,
+        [
+          :pointer,
+          :int,
+          FFI::GDAL::DataType,
+          :int,
+          :int,
+          :int,
+          :int,
+          :pointer,
+          :int,
+          :pointer
+        ],
+        :pointer
+
+      #------------------------------------------------------------------------
+      # Enums
+      #------------------------------------------------------------------------
+      ResampleAlg = enum :GRA_NearestNeighbor, 0,
+        :GRA_Bilinear, 1,
+        :GRA_Cubic, 2,
+        :GRA_CubicSpline, 3,
+        :GRA_Lanczos, 4,
+        :GRA_Average, 5,
+        :GRA_Mode, 6
+
+      #------------------------------------------------------------------------
+      # Functions
+      #------------------------------------------------------------------------
+      attach_function :GDALCreateWarpOptions, [], FFI::GDAL::WarpOptions.ptr
+      attach_function :GDALSerializeWarpOptions,
+        [FFI::GDAL::WarpOptions.ptr],
+        FFI::CPL::XMLNode.ptr
+
+      attach_function :GDALCreateWarpOperation,
+        [FFI::GDAL::WarpOptions.ptr],
+        :GDALWarpOperationH
+      attach_function :GDALDestroyWarpOperation, [:GDALWarpOperationH], :void
+
+      attach_function :GDALChunkAndWarpImage,
+        %i[GDALWarpOperationH int int int int],
+        CPL::Error::CPLErr
+      attach_function :GDALChunkAndWarpMulti,
+        %i[GDALWarpOperationH int int int int],
+        CPL::Error::CPLErr
+      attach_function :GDALWarpRegion,
+        %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],
+        CPL::Error::CPLErr
+    end
+  end
+end

data/lib/ffi/gdal.rb

@@ -1,83 +1,75 @@
 require 'ffi'
+require 'ffi/tools/const_generator'
+require_relative 'gdal/exceptions'
+require_relative '../ext/ffi_library_function_checks'
 
 module FFI
-  module Library
-    alias_method :old_attach_function, :attach_function
-
-    def attach_function(*args)
-      old_attach_function(*args)
-    rescue FFI::NotFoundError
-      @unsupported_gdal_functions ||= []
-      warn "ffi-gdal warning: function '#{args.first}' is not available in this build of GDAL/OGR (v#{FFI::GDAL.GDALVersionInfo('RELEASE_NAME')})"
-      @unsupported_gdal_functions << args.first
-    end
+  module GDAL
+    extend ::FFI::Library
 
-    def unsupported_gdal_functions
-      @unsupported_gdal_functions ||= []
+    # @return [String]
+    def self.gdal_library_path
+      @gdal_library_path ||= find_lib('{lib,}gdal*')
     end
-  end
 
-  module GDAL
-    extend ::FFI::Library
+    # @param [String] lib Name of the library file to find.
+    # @return [String] Path to the library file.
+    def self.find_lib(lib)
+      lib_file_name = "#{lib}.#{FFI::Platform::LIBSUFFIX}*"
 
-    autoload :GDALColorEntry,
-      File.expand_path('gdal/gdal_color_entry', __dir__)
-    autoload :GDALGCP,
-      File.expand_path('gdal/gdal_gcp', __dir__)
-    autoload :GDALGridDataMetricsOptions,
-      File.expand_path('gdal/gdal_grid_data_metrics_options', __dir__)
-    autoload :GDALGridInverseDistanceToAPowerOptions,
-      File.expand_path('gdal/gdal_grid_inverse_distance_to_a_power_options', __dir__)
-    autoload :GDALGridMovingAverageOptions,
-      File.expand_path('gdal/gdal_grid_moving_average_options', __dir__)
-    autoload :GDALGridNearestNeighborOptions,
-      File.expand_path('gdal/gdal_grid_nearest_neighbor_options', __dir__)
-    autoload :GDALRPCInfo,
-      File.expand_path('gdal/gdal_rpc_info', __dir__)
-    autoload :GDALTransformerInfo,
-      File.expand_path('gdal/gdal_transformer_info', __dir__)
-    autoload :GDALWarpOptions,
-      File.expand_path('gdal/gdal_warp_options', __dir__)
-
-    autoload :OGRContourWriterInfo,
-      File.expand_path('ogr/ogr_contour_writer_info', __dir__)
-    autoload :OGREnvelope,
-      File.expand_path('ogr/ogr_envelope', __dir__)
-    autoload :OGREnvelope3D,
-      File.expand_path('ogr/ogr_envelope_3d', __dir__)
-    autoload :OGRField,
-      File.expand_path('ogr/ogr_field', __dir__)
-    autoload :OGRStyleParam,
-      File.expand_path('ogr/ogr_style_param', __dir__)
-    autoload :OGRStyleValue,
-      File.expand_path('ogr/ogr_style_value', __dir__)
+      if ENV['GDAL_LIBRARY_PATH']
+        return File.join(ENV['GDAL_LIBRARY_PATH'], lib_file_name)
+      end
+
+      search_paths.map do |search_path|
+        Dir.glob(search_path).map do |path|
+          Dir.glob(File.join(path, lib_file_name))
+        end
+      end.flatten.uniq.first
+    end
 
+    # @return [Array<String>] List of paths to search for libs in.
     def self.search_paths
+      return ENV['GDAL_LIBRARY_PATH'] if ENV['GDAL_LIBRARY_PATH']
+
       @search_paths ||= begin
-        return if ENV['GDAL_LIBRARY_PATH']
+        paths = ENV['PATH'].split(File::PATH_SEPARATOR)
 
-        if FFI::Platform.windows?
-          ENV['PATH'].split(File::PATH_SEPARATOR)
-        else
-          %w[/usr/local/{lib64,lib} /opt/local/{lib64,lib} /usr/{lib64,lib} /usr/lib/{x86_64,i386}-linux-gnu]
+        unless FFI::Platform.windows?
+          paths += %w[/usr/local/{lib64,lib} /opt/local/{lib64,lib} /usr/{lib64,lib} /usr/lib/{x86_64,i386}-linux-gnu]
         end
+
+        paths
       end
     end
 
-    def self.find_lib(lib)
-      if ENV['GDAL_LIBRARY_PATH'] && File.file?(ENV['GDAL_LIBRARY_PATH'])
-        ENV['GDAL_LIBRARY_PATH']
-      else
-        Dir.glob(search_paths.map do |path|
-          File.expand_path(File.join(path, "#{lib}.#{FFI::Platform::LIBSUFFIX}"))
-        end).first
-      end
+    # @return [Array<String>] Related files that contain C constants.
+    def self._files_with_constants
+      header_files = %w[
+        cpl_conv.h cpl_error.h cpl_port.h cpl_string.h cpl_vsi.h
+        gdal.h gdal_alg.h gdal_vrt.h gdalwarper.h
+        ogr_core.h ogr_srs_api.h
+      ]
+
+      header_search_paths = %w[/usr/local/include /usr/include /usr/include/gdal]
+
+      header_files.map do |file|
+        dir = header_search_paths.find do |d|
+          File.exist?("#{d}/#{file}")
+        end
+        dir ? "#{dir}/#{file}" : nil
+      end.compact
     end
 
-    def self.gdal_library_path
-      return @gdal_library_path if @gdal_library_path
+    # Locates one of the files that has constants.
+    #
+    # @return [String] Full path to +file_name+.
+    def self._file_with_constants(file_name)
+      _files_with_constants.find { |f| f.end_with?(file_name) }
+    end
 
-      @gdal_library_path = find_lib('{lib,}gdal*')
+    if gdal_library_path.nil? || gdal_library_path.empty?
+      fail FFI::GDAL::LibraryNotFound, "Can't find required gdal library using path: '#{gdal_library_path}'"
     end
 
     ffi_lib(gdal_library_path)
@@ -87,12 +79,7 @@ module FFI
   end
 end
 
+require_relative 'cpl/conv'
+require_relative 'gdal/gdal'
 require_relative 'gdal/version'
-require_relative 'cpl/conv_h'
-require_relative 'cpl/error_h'
-require_relative 'cpl/minixml_h'
-require_relative 'cpl/string_h'
-require_relative 'cpl/vsi_h'
 require_relative '../ext/to_bool'
-
-require_relative 'gdal/gdal_h'