ffi-gdal 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5be516e43cc426c9f1fe2f0f0b701b971597d8e6
-  data.tar.gz: 53d5d44e1450f3e3f4de809eb025723f1e2945d8
+  metadata.gz: bfa34b84ed0070848c6fde3721e8ef247a0c6ff9
+  data.tar.gz: f458c3e3f8c0f9d4e3ff0381f75017b6e123e03e
 SHA512:
-  metadata.gz: 434c97cb29adc90a5f3daee4e5ac47a9560b7cb4959301b342988deb9976d4f579b0bc3a117d596f522e31725ecc2aa5f1519cf2d3bfb338677bee2fe8b447fc
-  data.tar.gz: 186963aecb3376291c75694f2628393a36b3c31603bd79897610a0796c7dabcbbb1f5f2e6332bd269c4f5b143200e405ae3a5453f1cb558f0c7a8b1e1d0723e7
+  metadata.gz: d337efd0962ecf22a455026cdafcf76ea97ab12b173d270763d5eb9bce592778b61ce43b72ea932b380b926a0f77dd5091bb834a42dc7d41780ec1a9d6668b7e
+  data.tar.gz: dd9f8ecd705648a22a5a480b9b8f6e0a34a90eda87da49f95d9298b8989b1171f648878a32c12640d6103aa42cff788823cdb378f6caa8fb423b58f73b836d9d

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in ffi-gdal.gemspec
 gemspec
+
+gem 'pry'

data/History.md

@@ -1,3 +1,8 @@
+### 0.0.4 / 2014-09-27
+
+* Bug fixes
+    * Fixed failure to load on Ubuntu 12.04 (GDAL v1.7.3).
+
 ### 0.0.3 / 2014-09-26
 
 * Improvements

data/lib/ffi-gdal/major_object.rb

@@ -7,6 +7,11 @@ module GDAL
 
     # @return [Array<String>]
     def metadata_domain_list
+      unless defined? FFI::GDAL::GDALGetMetadataDomainList
+        warn "GDALGetMetadataDomainList is't defined. GDAL::MajorObject#metadata_domain_list disabled."
+        return []
+      end
+
       # I don't quite get it, but if #GDALGetMetadataDomainList isn't called
       # twice, the last domain in the list sometimes doesn't get read.
       GDALGetMetadataDomainList(c_pointer)

data/lib/ffi-gdal/raster_band.rb

@@ -300,7 +300,11 @@ module GDAL
     #   is feet; other non-standard values are allowed.
     # @return [FFI::GDAL::CPLErr]
     def unit_type=(new_unit_type)
-      GDALSetRasterUnitType(@gdal_raster_band, new_unit_type)
+      if defined? FFI::GDAL::GDALSetRasterUnitType
+        GDALSetRasterUnitType(@gdal_raster_band, new_unit_type)
+      else
+        warn "GDALSetRasterUnitType is not defined.  Can't call RasterBand#unit_type="
+      end
     end
 
     # @return [GDAL::RasterAttributeTable]

data/lib/ffi/gdal.rb

@@ -1,4 +1,41 @@
 require 'ffi'
+
+module FFI
+  module GDAL
+    extend ::FFI::Library
+
+    def self.search_paths
+      @search_paths ||= begin
+        return if ENV['GDAL_LIBRARY_PATH']
+
+        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]
+        end
+      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
+    end
+
+    def self.gdal_library_path
+      return @gdal_library_path if @gdal_library_path
+
+      @gdal_library_path = find_lib('{lib,}gdal*')
+    end
+
+    ffi_lib(gdal_library_path)
+  end
+end
+
 require_relative 'gdal/version'
 require_relative 'gdal/cpl_conv'
 require_relative 'gdal/cpl_error'
@@ -13,16 +50,6 @@ require_relative '../ext/to_bool'
 
 module FFI
   module GDAL
-    extend ::FFI::Library
-    ffi_lib 'gdal'
-
-    include CPLError
-    include CPLConv
-    include CPLString
-    include CPLVSI
-    include OGRCore
-    include OGRAPI
-    include OGRSRSAPI
 
     #-----------------------------------------------------------------
     # Defines
@@ -188,8 +215,8 @@ module FFI
     attach_function :GDALDataTypeUnion, [GDALDataType, GDALDataType], GDALDataType
 
     # AsyncStatus
-    attach_function :GDALGetAsyncStatusTypeName, [GDALAsyncStatusType], :string
-    attach_function :GDALGetAsyncStatusTypeByName, [:string], GDALAsyncStatusType
+    #attach_function :GDALGetAsyncStatusTypeName, [GDALAsyncStatusType], :string
+    #attach_function :GDALGetAsyncStatusTypeByName, [:string], GDALAsyncStatusType
 
     # ColorInterpretation
     attach_function :GDALGetColorInterpretationName, [GDALColorInterp], :string
@@ -259,11 +286,11 @@ module FFI
     attach_function :GDALApplyGeoTransform,
       [:pointer, :double, :double, :pointer, :pointer],
       :void
-    attach_function :GDALComposeGeoTransforms,
-      [:pointer, :pointer, :pointer],
-      :void
+    #attach_function :GDALComposeGeoTransforms,
+    #  [:pointer, :pointer, :pointer],
+    #  :void
 
-    attach_function :GDALGetMetadataDomainList, [:GDALMajorObjectH], :pointer
+    #attach_function :GDALGetMetadataDomainList, [:GDALMajorObjectH], :pointer
     attach_function :GDALGetMetadata, [:GDALMajorObjectH, :string], :pointer
     attach_function :GDALSetMetadata,
       [:GDALMajorObjectH, :pointer, :string],
@@ -293,28 +320,28 @@ module FFI
       [:GDALDatasetH, GDALDataType, :pointer],
       CPLErr
 
-    attach_function :GDALBeginAsyncReader,
-      [
-        :GDALDatasetH,
-        GDALRWFlag,
-        :int,
-        :int,
-        :int,
-        :int,
-        :pointer,
-        :int,
-        :int,
-        GDALDataType,
-        :int,
-        :pointer,
-        :int,
-        :int,
-        :int
-    ], :GDALAsyncReaderH
-
-    attach_function :GDALEndAsyncReader,
-      [:GDALDatasetH, :GDALAsyncReaderH],
-      :void
+    #attach_function :GDALBeginAsyncReader,
+    #  [
+    #    :GDALDatasetH,
+    #    GDALRWFlag,
+    #    :int,
+    #    :int,
+    #    :int,
+    #    :int,
+    #    :pointer,
+    #    :int,
+    #    :int,
+    #    GDALDataType,
+    #    :int,
+    #    :pointer,
+    #    :int,
+    #    :int,
+    #    :int
+    #], :GDALAsyncReaderH
+
+    #attach_function :GDALEndAsyncReader,
+    #  [:GDALDatasetH, :GDALAsyncReaderH],
+    #  :void
 
     attach_function :GDALDatasetRasterIO,
       [
@@ -389,14 +416,14 @@ module FFI
     attach_function :GDALDatasetCopyWholeRaster,
       [:GDALDatasetH, :GDALDatasetH, :pointer, :GDALProgressFunc, :pointer],
       CPLErr
-    attach_function :GDALRasterBandCopyWholeRaster,
-      [
-        :GDALRasterBandH,
-        :GDALRasterBandH,
-        :pointer,
-        :GDALProgressFunc,
-        :pointer
-      ], CPLErr
+    #attach_function :GDALRasterBandCopyWholeRaster,
+    #  [
+    #    :GDALRasterBandH,
+    #    :GDALRasterBandH,
+    #    :pointer,
+    #    :GDALProgressFunc,
+    #    :pointer
+    #  ], CPLErr
     attach_function :GDALRegenerateOverviews,
       [
         :GDALRasterBandH,
@@ -517,7 +544,7 @@ module FFI
       [:GDALRasterBandH, :double, :double, :double, :double],
       CPLErr
     attach_function :GDALGetRasterUnitType, [:GDALRasterBandH], :string
-    attach_function :GDALSetRasterUnitType, [:GDALRasterBandH, :string], CPLErr
+    #attach_function :GDALSetRasterUnitType, [:GDALRasterBandH, :string], CPLErr
     attach_function :GDALGetRasterOffset, [:GDALRasterBandH, :pointer], :double
     attach_function :GDALSetRasterOffset, [:GDALRasterBandH, :double], CPLErr
     attach_function :GDALGetRasterScale, [:GDALRasterBandH, :pointer], :double

data/lib/ffi/gdal/cpl_conv.rb

@@ -1,151 +1,144 @@
-require 'ffi'
 require_relative 'cpl_error'
 require_relative 'cpl_vsi'
 
 
 module FFI
   module GDAL
-    module CPLConv
-      extend ::FFI::Library
-      ffi_lib 'gdal'
 
-      include CPLError
-
-      def CPLFree(pointer)
-        extend CPLVSI
-        VSIFree(pointer)
-      end
+    def CPLFree(pointer)
+      extend CPLVSI
+      VSIFree(pointer)
+    end
 
-      #------------------------------------------------------------------------
-      # cpl_port Typedefs
-      #------------------------------------------------------------------------
-      typedef :int, :GInt32
-      typedef :uint, :GUInt32
-      typedef :short, :GInt16
-      typedef :ushort, :GUInt16
-      typedef :uchar, :GByte
-      typedef :int, :GBool
-      typedef :long_long, :GIntBig
-      typedef :ulong_long, :GUIntBig
+    #------------------------------------------------------------------------
+    # cpl_port Typedefs
+    #------------------------------------------------------------------------
+    typedef :int, :GInt32
+    typedef :uint, :GUInt32
+    typedef :short, :GInt16
+    typedef :ushort, :GUInt16
+    typedef :uchar, :GByte
+    typedef :int, :GBool
+    typedef :long_long, :GIntBig
+    typedef :ulong_long, :GUIntBig
 
-      #--------------------------------------------------------------------------
-      # Functions
-      #--------------------------------------------------------------------------
-      callback :CPLFileFinder, %i[string string], :string
+    #--------------------------------------------------------------------------
+    # Functions
+    #--------------------------------------------------------------------------
+    callback :CPLFileFinder, %i[string string], :string
 
-      #---------
-      # Config
-      #---------
-      attach_function :CPLVerifyConfiguration, %i[], :void
-      attach_function :CPLGetConfigOption, %i[string string], :string
-      attach_function :CPLSetConfigOption, %i[string string], :void
-      attach_function :CPLSetThreadLocalConfigOption, %i[string string], :void
-      attach_function :CPLFreeConfig, %i[], :void
+    #---------
+    # Config
+    #---------
+    attach_function :CPLVerifyConfiguration, %i[], :void
+    attach_function :CPLGetConfigOption, %i[string string], :string
+    attach_function :CPLSetConfigOption, %i[string string], :void
+    attach_function :CPLSetThreadLocalConfigOption, %i[string string], :void
+    attach_function :CPLFreeConfig, %i[], :void
 
-      #---------
-      # Memory
-      #---------
-      attach_function :CPLMalloc, %i[size_t], :pointer
-      attach_function :CPLCalloc, %i[size_t size_t], :pointer
-      attach_function :CPLRealloc, %i[pointer size_t], :pointer
+    #---------
+    # Memory
+    #---------
+    attach_function :CPLMalloc, %i[size_t], :pointer
+    attach_function :CPLCalloc, %i[size_t size_t], :pointer
+    attach_function :CPLRealloc, %i[pointer size_t], :pointer
 
-      #---------
-      # Strings
-      #---------
-      attach_function :CPLStrdup, %i[string], :string
-      attach_function :CPLStrlwr, %i[string], :string
-      attach_function :CPLFGets, %i[string int pointer], :string
-      attach_function :CPLReadLine, %i[pointer], :string
-      attach_function :CPLReadLineL, %i[pointer], :string
-      attach_function :CPLReadLine2L, %i[pointer int pointer], :string
-      attach_function :CPLAtof, %i[string], :double
-      attach_function :CPLAtofDelim, %i[string char], :double
-      attach_function :CPLStrtod, %i[string pointer], :double
-      attach_function :CPLStrtodDelim, %i[string pointer char], :double
-      attach_function :CPLStrtof, %i[string pointer], :float
-      attach_function :CPLStrtofDelim, %i[string pointer char], :float
-      attach_function :CPLAtofM, %i[string], :double
-      attach_function :CPLScanString, %i[string int int int], :string
-      attach_function :CPLScanDouble, %i[string int], :double
-      attach_function :CPLScanLong, %i[string int], :long
-      attach_function :CPLScanLong, %i[string int], :ulong
-      attach_function :CPLScanUIntBig, %i[string int], :GUIntBig
-      attach_function :CPLScanPointer, %i[string int], :pointer
-      attach_function :CPLPrintString, %i[string string int], :int
-      attach_function :CPLPrintStringFill, %i[string string int], :int
+    #---------
+    # Strings
+    #---------
+    attach_function :CPLStrdup, %i[string], :string
+    attach_function :CPLStrlwr, %i[string], :string
+    attach_function :CPLFGets, %i[string int pointer], :string
+    attach_function :CPLReadLine, %i[pointer], :string
+    attach_function :CPLReadLineL, %i[pointer], :string
+    attach_function :CPLReadLine2L, %i[pointer int pointer], :string
+    attach_function :CPLAtof, %i[string], :double
+    attach_function :CPLAtofDelim, %i[string char], :double
+    attach_function :CPLStrtod, %i[string pointer], :double
+    attach_function :CPLStrtodDelim, %i[string pointer char], :double
+    attach_function :CPLStrtof, %i[string pointer], :float
+    attach_function :CPLStrtofDelim, %i[string pointer char], :float
+    attach_function :CPLAtofM, %i[string], :double
+    attach_function :CPLScanString, %i[string int int int], :string
+    attach_function :CPLScanDouble, %i[string int], :double
+    attach_function :CPLScanLong, %i[string int], :long
+    attach_function :CPLScanLong, %i[string int], :ulong
+    attach_function :CPLScanUIntBig, %i[string int], :GUIntBig
+    attach_function :CPLScanPointer, %i[string int], :pointer
+    attach_function :CPLPrintString, %i[string string int], :int
+    attach_function :CPLPrintStringFill, %i[string string int], :int
 
-      #---------
-      # Numbers to strings
-      #---------
-      attach_function :CPLPrintInt32, %i[string GInt32 int], :int
-      attach_function :CPLPrintUIntBig, %i[string GUIntBig int], :int
-      attach_function :CPLPrintDouble, %i[string string double string], :int
-      attach_function :CPLPrintTime, %i[string int string pointer string], :int
-      attach_function :CPLPrintPointer, %i[string pointer int], :int
-      attach_function :CPLGetSymbol, %i[string string], :pointer
+    #---------
+    # Numbers to strings
+    #---------
+    attach_function :CPLPrintInt32, %i[string GInt32 int], :int
+    attach_function :CPLPrintUIntBig, %i[string GUIntBig int], :int
+    attach_function :CPLPrintDouble, %i[string string double string], :int
+    attach_function :CPLPrintTime, %i[string int string pointer string], :int
+    attach_function :CPLPrintPointer, %i[string pointer int], :int
+    attach_function :CPLGetSymbol, %i[string string], :pointer
 
-      #---------
-      # Files
-      #---------
-      attach_function :CPLGetExecPath, %i[string int], :int
-      attach_function :CPLGetPath, %i[string], :string
-      attach_function :CPLGetDirname, %i[string], :string
-      attach_function :CPLGetFilename, %i[string], :string
-      attach_function :CPLGetBasename, %i[string], :string
-      attach_function :CPLGetExtension, %i[string], :string
-      attach_function :CPLGetCurrentDir, [], :string
-      attach_function :CPLFormFilename, %i[string string string], :string
-      attach_function :CPLFormCIFilename, %i[string string string], :string
-      attach_function :CPLResetExtension, %i[string string], :string
-      attach_function :CPLProjectRelativeFilename, %i[string string], :string
-      attach_function :CPLIsFilenameRelative, %i[string], :int
-      attach_function :CPLExtractRelativePath, %i[string string pointer], :string
-      attach_function :CPLCleanTrailingSlash, %i[string], :string
-      attach_function :CPLCorrespondingPaths, %i[string string pointer], :pointer
-      attach_function :CPLCheckForFile, %i[string string], :int
-      attach_function :CPLGenerateTempFilename, %i[string], :string
-      attach_function :CPLFindFile, %i[string string], :string
-      attach_function :CPLDefaultFindFile, %i[string string], :string
-      attach_function :CPLPushFileFinder, %i[CPLFileFinder], :void
-      attach_function :CPLPopFileFinder, %i[], :CPLFileFinder
-      attach_function :CPLPushFinderLocation, %i[string], :void
-      attach_function :CPLPopFinderLocation, %i[], :void
-      attach_function :CPLFinderClean, %i[], :void
-      attach_function :CPLStat, %i[string pointer], :int
-      attach_function :CPLOpenShared, %i[string string int], :pointer
-      attach_function :CPLCloseShared, %i[pointer], :void
-      attach_function :CPLGetSharedList, %i[pointer], :pointer
-      attach_function :CPLDumpSharedList, %i[pointer], :void
-      attach_function :CPLCleanupSharedFileMutex, %i[], :void
+    #---------
+    # Files
+    #---------
+    attach_function :CPLGetExecPath, %i[string int], :int
+    attach_function :CPLGetPath, %i[string], :string
+    attach_function :CPLGetDirname, %i[string], :string
+    attach_function :CPLGetFilename, %i[string], :string
+    attach_function :CPLGetBasename, %i[string], :string
+    attach_function :CPLGetExtension, %i[string], :string
+    attach_function :CPLGetCurrentDir, [], :string
+    attach_function :CPLFormFilename, %i[string string string], :string
+    attach_function :CPLFormCIFilename, %i[string string string], :string
+    attach_function :CPLResetExtension, %i[string string], :string
+    attach_function :CPLProjectRelativeFilename, %i[string string], :string
+    attach_function :CPLIsFilenameRelative, %i[string], :int
+    attach_function :CPLExtractRelativePath, %i[string string pointer], :string
+    attach_function :CPLCleanTrailingSlash, %i[string], :string
+    attach_function :CPLCorrespondingPaths, %i[string string pointer], :pointer
+    attach_function :CPLCheckForFile, %i[string string], :int
+    attach_function :CPLGenerateTempFilename, %i[string], :string
+    attach_function :CPLFindFile, %i[string string], :string
+    attach_function :CPLDefaultFindFile, %i[string string], :string
+    attach_function :CPLPushFileFinder, %i[CPLFileFinder], :void
+    attach_function :CPLPopFileFinder, %i[], :CPLFileFinder
+    attach_function :CPLPushFinderLocation, %i[string], :void
+    attach_function :CPLPopFinderLocation, %i[], :void
+    attach_function :CPLFinderClean, %i[], :void
+    attach_function :CPLStat, %i[string pointer], :int
+    attach_function :CPLOpenShared, %i[string string int], :pointer
+    attach_function :CPLCloseShared, %i[pointer], :void
+    attach_function :CPLGetSharedList, %i[pointer], :pointer
+    attach_function :CPLDumpSharedList, %i[pointer], :void
+    #attach_function :CPLCleanupSharedFileMutex, %i[], :void
 
-      attach_function :CPLDMSToDec, %i[string], :double
-      attach_function :CPLDecToDMS, %i[double string int], :string
-      attach_function :CPLPackedDMSToDec, %i[double], :double
-      attach_function :CPLDecToPackedDMS, %i[double], :string
-      attach_function :CPLStringToComplex, %i[string pointer pointer], :void
-      attach_function :CPLUnlinkTree, %i[string], :int
-      attach_function :CPLCopyFile, %i[string string], :int
-      attach_function :CPLMoveFile, %i[string string], :int
+    attach_function :CPLDMSToDec, %i[string], :double
+    attach_function :CPLDecToDMS, %i[double string int], :string
+    attach_function :CPLPackedDMSToDec, %i[double], :double
+    attach_function :CPLDecToPackedDMS, %i[double], :string
+    attach_function :CPLStringToComplex, %i[string pointer pointer], :void
+    attach_function :CPLUnlinkTree, %i[string], :int
+    attach_function :CPLCopyFile, %i[string string], :int
+    attach_function :CPLMoveFile, %i[string string], :int
 
-      #---------
-      # Zip Files
-      #---------
-      attach_function :CPLCreateZip, %i[string pointer], :pointer
-      attach_function :CPLCreateFileInZip, %i[pointer string pointer], CPLErr
-      attach_function :CPLWriteFileInZip, %i[pointer pointer int], CPLErr
-      attach_function :CPLCloseFileInZip, %i[pointer], CPLErr
-      attach_function :CPLCloseZip, %i[pointer], CPLErr
-      attach_function :CPLZLibDeflate,
-        %i[pointer size_t int pointer size_t pointer],
-        :pointer
-      attach_function :CPLZLibInflate,
-        %i[pointer size_t pointer size_t pointer],
-        :pointer
+    #---------
+    # Zip Files
+    #---------
+    #attach_function :CPLCreateZip, %i[string pointer], :pointer
+    #attach_function :CPLCreateFileInZip, %i[pointer string pointer], CPLErr
+    #attach_function :CPLWriteFileInZip, %i[pointer pointer int], CPLErr
+    #attach_function :CPLCloseFileInZip, %i[pointer], CPLErr
+    #attach_function :CPLCloseZip, %i[pointer], CPLErr
+    #attach_function :CPLZLibDeflate,
+    #  %i[pointer size_t int pointer size_t pointer],
+    #  :pointer
+    #attach_function :CPLZLibInflate,
+    #  %i[pointer size_t pointer size_t pointer],
+    #  :pointer
 
-      attach_function :CPLValidateXML, %i[string string pointer], :int
-      attach_function :CPLsetlocale, %i[int string], :string
+    #attach_function :CPLValidateXML, %i[string string pointer], :int
+    #attach_function :CPLsetlocale, %i[int string], :string
 
-      attach_function :CPLCleanupSetlocaleMutex, %i[], :void
-    end
+    #attach_function :CPLCleanupSetlocaleMutex, %i[], :void
   end
 end