ffi-gdal 1.0.0.beta16 → 1.0.0

data/lib/ffi/ogr/core.rb

@@ -18,133 +18,133 @@ module FFI
       # taking the liberty to turn this into an enum.
       # https://trac.osgeo.org/gdal/ticket/3153
       Err = enum :OGRERR_NONE,
-        :OGRERR_NOT_ENOUGH_DATA,
-        :OGRERR_NOT_ENOUGH_MEMORY,
-        :OGRERR_UNSUPPORTED_GEOMETRY_TYPE,
-        :OGRERR_UNSUPPORTED_OPERATION,
-        :OGRERR_CORRUPT_DATA,
-        :OGRERR_FAILURE,
-        :OGRERR_UNSUPPORTED_SRS,
-        :OGRERR_INVALID_HANDLE
+                 :OGRERR_NOT_ENOUGH_DATA,
+                 :OGRERR_NOT_ENOUGH_MEMORY,
+                 :OGRERR_UNSUPPORTED_GEOMETRY_TYPE,
+                 :OGRERR_UNSUPPORTED_OPERATION,
+                 :OGRERR_CORRUPT_DATA,
+                 :OGRERR_FAILURE,
+                 :OGRERR_UNSUPPORTED_SRS,
+                 :OGRERR_INVALID_HANDLE
 
       WKBGeometryType = enum FFI::Type::UINT,
-        :wkbUnknown,                0,
-        :wkbPoint,                  1,
-        :wkbLineString,             2,
-        :wkbPolygon,                3,
-        :wkbMultiPoint,             4,
-        :wkbMultiLineString,        5,
-        :wkbMultiPolygon,           6,
-        :wkbGeometryCollection,     7,
-        :wkbNone,                   100,    # non-standard, for pure attribute records
-        :wkbLinearRing,             101,    # non-standard, just for createGeometry
-        :wkbPoint25D,               0x8000_0001,
-        :wkbLineString25D,          0x8000_0002,
-        :wkbPolygon25D,             0x8000_0003,
-        :wkbMultiPoint25D,          0x8000_0004,
-        :wkbMultiLineString25D,     0x8000_0005,
-        :wkbMultiPolygon25D,        0x8000_0006,
-        :wkbGeometryCollection25D,  0x8000_0007
+                             :wkbUnknown,                0,
+                             :wkbPoint,                  1,
+                             :wkbLineString,             2,
+                             :wkbPolygon,                3,
+                             :wkbMultiPoint,             4,
+                             :wkbMultiLineString,        5,
+                             :wkbMultiPolygon,           6,
+                             :wkbGeometryCollection,     7,
+                             :wkbNone,                   100,    # non-standard, for pure attribute records
+                             :wkbLinearRing,             101,    # non-standard, just for createGeometry
+                             :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,
-        :wkbNDR, 1
+                          :wkbNDR, 1
 
       FieldType = enum :OFTInteger, 0,
-        :OFTIntegerList,     1,
-        :OFTReal,            2,
-        :OFTRealList,        3,
-        :OFTString,          4,
-        :OFTStringList,      5,
-        :OFTWideString,      6,
-        :OFTWideStringList,  7,
-        :OFTBinary,          8,
-        :OFTDate,            9,
-        :OFTTime,            10,
-        :OFTDateTime,        11,
-        :OFTInteger64,       12,
-        :OFTInteger64List,   13,
-        :OFTMaxType,         13
+                       :OFTIntegerList,     1,
+                       :OFTReal,            2,
+                       :OFTRealList,        3,
+                       :OFTString,          4,
+                       :OFTStringList,      5,
+                       :OFTWideString,      6,
+                       :OFTWideStringList,  7,
+                       :OFTBinary,          8,
+                       :OFTDate,            9,
+                       :OFTTime,            10,
+                       :OFTDateTime,        11,
+                       :OFTInteger64,       12,
+                       :OFTInteger64List,   13,
+                       :OFTMaxType,         13
 
       FieldSubType = enum :OFSTNone,
-        :OFSTBoolean,
-        :OFSTInt16,
-        :OFSTFloat32
+                          :OFSTBoolean,
+                          :OFSTInt16,
+                          :OFSTFloat32
 
       Justification = enum :OJUndefined, 0,
-        :OJLeft,   1,
-        :OJRight,  2
+                           :OJLeft,   1,
+                           :OJRight,  2
 
       STClassId = enum :OGRSTCNone, 0,
-        :OGRSTCPen,     1,
-        :OGRSTCBrush,   2,
-        :OGRSTCSymbol,  3,
-        :OGRSTCLabel,   4,
-        :OGRSTCVector,  5
+                       :OGRSTCPen,     1,
+                       :OGRSTCBrush,   2,
+                       :OGRSTCSymbol,  3,
+                       :OGRSTCLabel,   4,
+                       :OGRSTCVector,  5
 
       STUnitId = enum :OGRSTUGround, 0,
-        :OGRSTUPixel,   1,
-        :OGRSTUPoints,  2,
-        :OGRSTUMM,      3,
-        :OGRSTUCM,      4,
-        :OGRSTUInches,  5
+                      :OGRSTUPixel,   1,
+                      :OGRSTUPoints,  2,
+                      :OGRSTUMM,      3,
+                      :OGRSTUCM,      4,
+                      :OGRSTUInches,  5
 
       STPenParam = enum :OGRSTPenColor, 0,
-        :OGRSTPenWidth,       1,
-        :OGRSTPenPattern,     2,
-        :OGRSTPenId,          3,
-        :OGRSTPenPerOffset,   4,
-        :OGRSTPenPerCap,      5,
-        :OGRSTPenPerJoin,     6,
-        :OGRSTPenPerPriority, 7,
-        :OGRSTPenLast,        8
+                        :OGRSTPenWidth,       1,
+                        :OGRSTPenPattern,     2,
+                        :OGRSTPenId,          3,
+                        :OGRSTPenPerOffset,   4,
+                        :OGRSTPenPerCap,      5,
+                        :OGRSTPenPerJoin,     6,
+                        :OGRSTPenPerPriority, 7,
+                        :OGRSTPenLast,        8
 
       STBrushParam = enum :OGRSTBrushFColor, 0,
-        :OGRSTBrushBColor,    1,
-        :OGRSTBrushId,        2,
-        :OGRSTBrushAngle,     3,
-        :OGRSTBrushSize,      4,
-        :OGRSTBrushDx,        5,
-        :OGRSTBrushDy,        6,
-        :OGRSTBrushPriority,  7,
-        :OGRSTBrushLast,      8
+                          :OGRSTBrushBColor,    1,
+                          :OGRSTBrushId,        2,
+                          :OGRSTBrushAngle,     3,
+                          :OGRSTBrushSize,      4,
+                          :OGRSTBrushDx,        5,
+                          :OGRSTBrushDy,        6,
+                          :OGRSTBrushPriority,  7,
+                          :OGRSTBrushLast,      8
 
       STSymbolParam = enum :OGRSTSymbolId, 0,
-        :OGRSTSymbolAngle,     1,
-        :OGRSTSymbolColor,     2,
-        :OGRSTSymbolSize,      3,
-        :OGRSTSymbolDx,        4,
-        :OGRSTSymbolDy,        5,
-        :OGRSTSymbolStep,      6,
-        :OGRSTSymbolPerp,      7,
-        :OGRSTSymbolOffset,    8,
-        :OGRSTSymbolPriority,  9,
-        :OGRSTSymbolFontName, 10,
-        :OGRSTSymbolOColor,   11,
-        :OGRSTSymbolLast,      12
+                           :OGRSTSymbolAngle,     1,
+                           :OGRSTSymbolColor,     2,
+                           :OGRSTSymbolSize,      3,
+                           :OGRSTSymbolDx,        4,
+                           :OGRSTSymbolDy,        5,
+                           :OGRSTSymbolStep,      6,
+                           :OGRSTSymbolPerp,      7,
+                           :OGRSTSymbolOffset,    8,
+                           :OGRSTSymbolPriority,  9,
+                           :OGRSTSymbolFontName, 10,
+                           :OGRSTSymbolOColor,   11,
+                           :OGRSTSymbolLast,      12
 
       STLabelParam = enum :OGRSTLabelFontName, 0,
-        :OGRSTLabelSize,        1,
-        :OGRSTLabelTextString,  2,
-        :OGRSTLabelAngle,       3,
-        :OGRSTLabelFColor,      4,
-        :OGRSTLabelBColor,      5,
-        :OGRSTLabelPlacement,   6,
-        :OGRSTLabelAnchor,      7,
-        :OGRSTLabelDx,          8,
-        :OGRSTLabelDy,          9,
-        :OGRSTLabelPerp,        10,
-        :OGRSTLabelBold,        11,
-        :OGRSTLabelItalic,      12,
-        :OGRSTLabelUnderline,   13,
-        :OGRSTLabelPriority,    14,
-        :OGRSTLabelStrikeout,   15,
-        :OGRSTLabelStretch,     16,
-        :OGRSTLabelAdjHor,      17,
-        :OGRSTLabelAdjVert,     18,
-        :OGRSTLabelHColor,      19,
-        :OGRSTLabelOColor,      20,
-        :OGRSTLabelLast,        21
+                          :OGRSTLabelSize,        1,
+                          :OGRSTLabelTextString,  2,
+                          :OGRSTLabelAngle,       3,
+                          :OGRSTLabelFColor,      4,
+                          :OGRSTLabelBColor,      5,
+                          :OGRSTLabelPlacement,   6,
+                          :OGRSTLabelAnchor,      7,
+                          :OGRSTLabelDx,          8,
+                          :OGRSTLabelDy,          9,
+                          :OGRSTLabelPerp,        10,
+                          :OGRSTLabelBold,        11,
+                          :OGRSTLabelItalic,      12,
+                          :OGRSTLabelUnderline,   13,
+                          :OGRSTLabelPriority,    14,
+                          :OGRSTLabelStrikeout,   15,
+                          :OGRSTLabelStretch,     16,
+                          :OGRSTLabelAdjHor,      17,
+                          :OGRSTLabelAdjVert,     18,
+                          :OGRSTLabelHColor,      19,
+                          :OGRSTLabelOColor,      20,
+                          :OGRSTLabelLast,        21
 
       #------------------------------------------------------------------------
       # Constants
@@ -171,10 +171,10 @@ module FFI
       attach_function :OGRRealloc, %i[pointer size_t], :pointer
       attach_function :OGRFree, [:pointer], :void
 
-      attach_function :OGRGeometryTypeToName, [WKBGeometryType], :string
+      attach_function :OGRGeometryTypeToName, [WKBGeometryType], :strptr
       attach_function :OGRMergeGeometryTypes,
-        [WKBGeometryType, WKBGeometryType],
-        WKBGeometryType
+                      [WKBGeometryType, WKBGeometryType],
+                      WKBGeometryType
       attach_function :OGRParseDate, [:string, FFI::OGR::Field.ptr, :int], :int
     end
   end

data/lib/ffi/ogr/envelope.rb

@@ -6,9 +6,9 @@ module FFI
   module OGR
     class Envelope < FFI::Struct
       layout :min_x, :double,
-        :max_x, :double,
-        :min_y, :double,
-        :max_y, :double
+             :max_x, :double,
+             :min_y, :double,
+             :max_y, :double
     end
   end
 end

data/lib/ffi/ogr/envelope_3d.rb

@@ -6,11 +6,11 @@ module FFI
   module OGR
     class Envelope3D < FFI::Struct
       layout :min_x, :double,
-        :max_x, :double,
-        :min_y, :double,
-        :max_y, :double,
-        :min_z, :double,
-        :max_z, :double
+             :max_x, :double,
+             :min_y, :double,
+             :max_y, :double,
+             :min_z, :double,
+             :max_z, :double
     end
   end
 end

data/lib/ffi/ogr/featurestyle.rb

@@ -12,9 +12,9 @@ module FFI
       # Enums
       #------------------------------------------------------------------------
       StyleType = enum :OGRSTypeString,
-        :OGRSTypeDouble,
-        :OGRSTypeInteger,
-        :OGRSTypeBoolean
+                       :OGRSTypeDouble,
+                       :OGRSTypeInteger,
+                       :OGRSTypeBoolean
 
       #------------------------------------------------------------------------
       # Typedefs

data/lib/ffi/ogr/field.rb

@@ -7,42 +7,42 @@ module FFI
     module FieldTypes
       class IntegerList < FFI::Struct
         layout :count, :int,
-          :list, :pointer
+               :list, :pointer
       end
 
       class Integer64List < FFI::Struct
         layout :count, CPL::Port.find_type(:GIntBig),
-          :list, :pointer
+               :list, :pointer
       end
 
       class RealList < FFI::Struct
         layout :count, :int,
-          :list, :pointer
+               :list, :pointer
       end
 
       class StringList < FFI::Struct
         layout :count, :int,
-          :list, :pointer
+               :list, :pointer
       end
 
       class Binary < FFI::Struct
         layout :count, :int,
-          :data, :pointer
+               :data, :pointer
       end
 
       class Set < FFI::Struct
         layout :marker1, :int,
-          :marker2, :int
+               :marker2, :int
       end
 
       class Date < FFI::Struct
         layout :year, CPL::Port.find_type(:GInt16),
-          :month, CPL::Port.find_type(:GByte),
-          :day, CPL::Port.find_type(:GByte),
-          :hour, CPL::Port.find_type(:GByte),
-          :minute, CPL::Port.find_type(:GByte),
-          :second, CPL::Port.find_type(:GByte),
-          :tz_flag, CPL::Port.find_type(:GByte)
+               :month, CPL::Port.find_type(:GByte),
+               :day, CPL::Port.find_type(:GByte),
+               :hour, CPL::Port.find_type(:GByte),
+               :minute, CPL::Port.find_type(:GByte),
+               :second, CPL::Port.find_type(:GByte),
+               :tz_flag, CPL::Port.find_type(:GByte)
       end
     end
 
@@ -50,16 +50,16 @@ module FFI
       include FieldTypes
 
       layout :integer, :int,
-        :integer64, CPL::Port.find_type(:GIntBig),
-        :real, :double,
-        :string, :pointer,
-        :integer_list, FieldTypes::IntegerList,
-        :integer64_list, FieldTypes::Integer64List,
-        :real_list, FieldTypes::RealList,
-        :string_list, FieldTypes::StringList,
-        :binary, FieldTypes::Binary,
-        :set, FieldTypes::Set,
-        :date, FieldTypes::Date
+             :integer64, CPL::Port.find_type(:GIntBig),
+             :real, :double,
+             :string, :pointer,
+             :integer_list, FieldTypes::IntegerList,
+             :integer64_list, FieldTypes::Integer64List,
+             :real_list, FieldTypes::RealList,
+             :string_list, FieldTypes::StringList,
+             :binary, FieldTypes::Binary,
+             :set, FieldTypes::Set,
+             :date, FieldTypes::Date
     end
   end
 end

data/lib/ffi/ogr/geocoding.rb

@@ -20,11 +20,11 @@ module FFI
       attach_function :OGRGeocodeCreateSession, %i[pointer], :OGRGeocodingSessionH
       attach_function :OGRGeocodeDestroySession, %i[OGRGeocodingSessionH], :void
       attach_function :OGRGeocode,
-        %i[OGRGeocodingSessionH string pointer pointer],
-        FFI::OGR::API.find_type(:OGRLayerH)
+                      %i[OGRGeocodingSessionH string pointer pointer],
+                      FFI::OGR::API.find_type(:OGRLayerH)
       attach_function :OGRGeocodeReverse,
-        %i[OGRGeocodingSessionH double double pointer],
-        FFI::OGR::API.find_type(:OGRLayerH)
+                      %i[OGRGeocodingSessionH double double pointer],
+                      FFI::OGR::API.find_type(:OGRLayerH)
       attach_function :OGRGeocodeFreeResult, [FFI::OGR::API.find_type(:OGRLayerH)], :void
     end
   end