ffi-gdal 1.0.0.beta16 → 1.0.0

data/lib/ffi/gdal/warper.rb

@@ -14,30 +14,30 @@ module FFI
       #------------------------------------------------------------------------
       typedef :pointer, :GDALWarpOperationH
       MaskFunc = callback :GDALMaskFunc,
-        [
-          :pointer,
-          :int,
-          FFI::GDAL::GDAL::DataType,
-          :int,
-          :int,
-          :int,
-          :int,
-          :pointer,
-          :int,
-          :pointer
-        ],
-        :pointer
+                          [
+                            :pointer,
+                            :int,
+                            FFI::GDAL::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
+                         :GRA_Bilinear, 1,
+                         :GRA_Cubic, 2,
+                         :GRA_CubicSpline, 3,
+                         :GRA_Lanczos, 4,
+                         :GRA_Average, 5,
+                         :GRA_Mode, 6
 
       #------------------------------------------------------------------------
       # Functions
@@ -46,98 +46,98 @@ module FFI
       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
+                      [FFI::GDAL::WarpOptions.ptr],
+                      FFI::CPL::XMLNode.ptr
       attach_function :GDALDeserializeWarpOptions,
-        [FFI::CPL::XMLNode.ptr],
-        FFI::GDAL::WarpOptions.ptr
+                      [FFI::CPL::XMLNode.ptr],
+                      FFI::GDAL::WarpOptions.ptr
 
       attach_function :GDALCreateWarpOperation,
-        [FFI::GDAL::WarpOptions.ptr],
-        :GDALWarpOperationH
+                      [FFI::GDAL::WarpOptions.ptr],
+                      :GDALWarpOperationH
       attach_function :GDALDestroyWarpOperation, %i[GDALWarpOperationH], :void
 
       attach_function :GDALWarpNoDataMasker,
-        [:pointer, :int, GDAL::DataType, :int, :int, :int, :int, :pointer, :int, :pointer],
-        CPL::Error::CPLErr
+                      [: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
+                      [: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
+                      [: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
+                      [: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
+                      [: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
+                      [
+                        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 :GDALCreateAndReprojectImage,
-        [
-          FFI::GDAL::GDAL.find_type(:GDALDatasetH),
-          :string,
-          :string,
-          :string,
-          FFI::GDAL::GDAL.find_type(:GDALDriverH),
-          :pointer,
-          ResampleAlg,
-          :double,
-          :double,
-          FFI::GDAL::GDAL.find_type(:GDALProgressFunc),
-          :pointer,
-          FFI::GDAL::WarpOptions.ptr
-        ],
-        CPL::Error::CPLErr
+                      [
+                        FFI::GDAL::GDAL.find_type(:GDALDatasetH),
+                        :string,
+                        :string,
+                        :string,
+                        FFI::GDAL::GDAL.find_type(:GDALDriverH),
+                        :pointer,
+                        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)
+                      [
+                        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)
+                      [
+                        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
+                      [FFI::GDAL::GDAL.find_type(:GDALDatasetH), FFI::GDAL::WarpOptions.ptr],
+                      CPL::Error::CPLErr
 
       attach_function :GDALChunkAndWarpImage,
-        %i[GDALWarpOperationH int int int int],
-        CPL::Error::CPLErr
+                      %i[GDALWarpOperationH int int int int],
+                      CPL::Error::CPLErr
       attach_function :GDALChunkAndWarpMulti,
-        %i[GDALWarpOperationH int int int int],
-        CPL::Error::CPLErr
+                      %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
+                      %i[GDALWarpOperationH int int int int int int int int],
+                      CPL::Error::CPLErr
       attach_function :GDALWarpRegionToBuffer,
-        [:GDALWarpOperationH, :int, :int, :int, :int, :pointer, GDAL::DataType, :int, :int, :int, :int],
-        CPL::Error::CPLErr
+                      [:GDALWarpOperationH, :int, :int, :int, :int, :pointer, GDAL::DataType, :int, :int, :int, :int],
+                      CPL::Error::CPLErr
     end
   end
 end

data/lib/ffi/gdal.rb

@@ -16,7 +16,7 @@ module FFI
     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__)
+             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__)
@@ -28,36 +28,7 @@ module FFI
 
     # @return [String]
     def self.gdal_library_path
-      @gdal_library_path ||= find_lib('{lib,}gdal*')
-    end
-
-    # @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}*"
-
-      return Dir[File.join(ENV['GDAL_LIBRARY_PATH'], lib_file_name)] if ENV['GDAL_LIBRARY_PATH']
-
-      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
-        paths = ENV['PATH'].split(File::PATH_SEPARATOR)
-
-        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
+      @gdal_library_path ||= ENV.fetch('GDAL_LIBRARY_PATH', 'gdal')
     end
 
     # @return [Array<String>] Related files that contain C constants.