ffi-gdal 1.0.0.beta3 → 1.0.0.beta4

data/lib/ffi/gdal/{gdal_h.rb → gdal.rb}

@@ -1,12 +1,18 @@
 require 'ffi'
+require_relative '../../ext/ffi_library_function_checks'
+require_relative '../ogr/core'
+require_relative '../ogr/srs_api'
+require_relative 'color_entry'
 
 module FFI
   module GDAL
+    extend ::FFI::Library
+    ffi_lib [::FFI::CURRENT_PROCESS, ::FFI::GDAL.gdal_library_path]
 
-    #-----------------------------------------------------------------
+    # ----------------------------------------------------------------
     # Enums
-    #-----------------------------------------------------------------
-    GDALDataType = enum :GDT_Unknown, 0,
+    # ----------------------------------------------------------------
+    DataType = enum :GDT_Unknown, 0,
       :GDT_Byte,        1,
       :GDT_UInt16,      2,
       :GDT_Int16,       3,
@@ -20,19 +26,19 @@ module FFI
       :GDT_CFloat64,    11,
       :GDT_TypeCount,   12
 
-    GDALAsyncStatusType = enum :GARIO_PENDING, 0,
+    AsyncStatusType = enum :GARIO_PENDING, 0,
       :GARIO_UPDATE,     1,
       :GARIO_ERROR,      2,
       :GARIO_COMPLETE,   3,
       :GARIO_TypeCount,  4
 
-    GDALAccess = enum :GA_ReadOnly, 0,
+    Access = enum :GA_ReadOnly, 0,
       :GA_Update, 1
 
-    GDALRWFlag = enum :GF_Read, 0,
+    RWFlag = enum :GF_Read, 0,
       :GF_Write, 1
 
-    GDALColorInterp = enum :GCI_Undefined, 0,
+    ColorInterp = enum :GCI_Undefined, 0,
       :GCI_GrayIndex,      1,
       :GCI_PaletteIndex,   2,
       :GCI_RedBand,        3,
@@ -51,16 +57,16 @@ module FFI
       :GCI_YCbCr_CrBand,   16,
       :GCI_Max, 16      # Seems wrong that this is also 16...
 
-    GDALPaletteInterp = enum :GPI_Gray, 0,
+    PaletteInterp = enum :GPI_Gray, 0,
       :GPI_RGB,   1,
       :GPI_CMYK,  2,
       :GPI_HLS,   3
 
-    GDALRATFieldType = enum :GFT_Integer,
+    RATFieldType = enum :GFT_Integer,
       :GFT_Real,
       :GFT_String
 
-    GDALRATFieldUsage = enum :GFU_Generic, 0,
+    RATFieldUsage = enum :GFU_Generic, 0,
       :GFU_PixelCount,  1,
       :GFU_Name,        2,
       :GFU_Min,         3,
@@ -80,13 +86,13 @@ module FFI
       :GFU_AlphaMax,   17,
       :GFU_MaxCount
 
-    GDALTileOrganization = enum :GTO_TIP,
+    TileOrganization = enum :GTO_TIP,
       :GTO_BIT,
       :GTO_BSQ
 
-    #-----------------------------------------------------------------
+    # ----------------------------------------------------------------
     # typedefs
-    #-----------------------------------------------------------------
+    # ----------------------------------------------------------------
     typedef :pointer, :GDALMajorObjectH
     typedef :pointer, :GDALDatasetH
     typedef :pointer, :GDALRasterBandH
@@ -98,40 +104,29 @@ module FFI
     # When using, make sure to return +true+ if the operation should continue;
     #   +false+ if the user has cancelled.
     callback :GDALProgressFunc,
-      [:double, :string, :pointer],     # completion, message, progress_arg
+      %i[double string pointer],     # completion, message, progress_arg
       :bool
 
     callback :GDALDerivedPixelFunc,
-      [:pointer, :int, :pointer, :int, :int, GDALDataType, GDALDataType, :int, :int],
+      [:pointer, :int, :pointer, :int, :int, DataType, DataType, :int, :int],
       :int
-  end
-
-end
-
-# These requires depend on ^^^
-require_relative 'alg_h'
-require_relative 'grid_h'
-require_relative 'warper_h'
-
-module FFI
-  module GDAL
 
-    #-----------------------------------------------------------------
+    # ----------------------------------------------------------------
     # functions
-    #-----------------------------------------------------------------
+    # ----------------------------------------------------------------
     # AsyncStatus
-    attach_function :GDALGetAsyncStatusTypeName, [GDALAsyncStatusType], :string
-    attach_function :GDALGetAsyncStatusTypeByName, [:string], GDALAsyncStatusType
+    attach_function :GDALGetAsyncStatusTypeName, [AsyncStatusType], :string
+    attach_function :GDALGetAsyncStatusTypeByName, [:string], AsyncStatusType
 
-    #~~~~~~~~~~~~~~~~~~~~
+    # ~~~~~~~~~~~~~~~~~~~
     # ColorInterpretation
-    #~~~~~~~~~~~~~~~~~~~~
-    attach_function :GDALGetColorInterpretationName, [GDALColorInterp], :string
-    attach_function :GDALGetColorInterpretationByName, [:string], GDALColorInterp
+    # ~~~~~~~~~~~~~~~~~~~
+    attach_function :GDALGetColorInterpretationName, [ColorInterp], :string
+    attach_function :GDALGetColorInterpretationByName, [:string], ColorInterp
 
-    #~~~~~~~~~~~~~~~~~~~~
+    # ~~~~~~~~~~~~~~~~~~~
     # Driver
-    #~~~~~~~~~~~~~~~~~~~~
+    # ~~~~~~~~~~~~~~~~~~~
     attach_function :GDALAllRegister, [], :void
 
     # Class-level functions
@@ -139,16 +134,16 @@ module FFI
     attach_function :GDALGetDriverCount, [], :int
     attach_function :GDALIdentifyDriver, %i[string pointer], :GDALDriverH
     attach_function :GDALGetDriverByName, [:string], :GDALDriverH
-    attach_function :GDALDestroyDriverManager, [:void], :void
+    attach_function :GDALDestroyDriverManager, [], :void
 
     # Instance-level functions
     attach_function :GDALCreate,
-      [:GDALDriverH, :string, :int, :int, :int, GDALDataType, :pointer],
+      [:GDALDriverH, :string, :int, :int, :int, DataType, :pointer],
       :GDALDatasetH
     attach_function :GDALCreateCopy,
       %i[GDALDriverH string GDALDatasetH bool pointer GDALProgressFunc pointer],
       :GDALDatasetH
-    attach_function :GDALValidateCreationOptions, %i[GDALDriverH pointer], CPLErr
+    attach_function :GDALValidateCreationOptions, %i[GDALDriverH pointer], FFI::CPL::Error::CPLErr
     attach_function :GDALGetDriverShortName, [:GDALDriverH], :string
     attach_function :GDALGetDriverLongName, [:GDALDriverH], :string
     attach_function :GDALGetDriverHelpTopic, [:GDALDriverH], :string
@@ -157,33 +152,33 @@ module FFI
     attach_function :GDALDestroyDriver, [:GDALDriverH], :void
     attach_function :GDALRegisterDriver, [:GDALDriverH], :int
     attach_function :GDALDeregisterDriver, [:GDALDriverH], :void
-    attach_function :GDALDeleteDataset, [:GDALDriverH, :string], CPLErr
+    attach_function :GDALDeleteDataset, %i[GDALDriverH string], FFI::CPL::Error::CPLErr
     attach_function :GDALRenameDataset,
       %i[GDALDriverH string string],
-      CPLErr
+      FFI::CPL::Error::CPLErr
     attach_function :GDALCopyDatasetFiles,
       %i[GDALDriverH string string],
-      CPLErr
+      FFI::CPL::Error::CPLErr
 
-    #~~~~~~~~~~~~~~~~~~~~
+    # ~~~~~~~~~~~~~~~~~~~
     # Dataset
-    #~~~~~~~~~~~~~~~~~~~~
+    # ~~~~~~~~~~~~~~~~~~~
     # Class-level functions
-    attach_function :GDALOpen, [:string, GDALAccess], :GDALDatasetH
+    attach_function :GDALOpen, [:string, Access], :GDALDatasetH
     attach_function :GDALOpenShared,
-      [:string, GDALAccess],
+      [:string, Access],
       :GDALDatasetH
     attach_function :GDALOpenEx,
       %i[string uint string string string],
       :GDALDatasetH
     attach_function :GDALDumpOpenDatasets, [:pointer], :int
-    attach_function :GDALGetOpenDatasets, [:pointer, :pointer], :void
+    attach_function :GDALGetOpenDatasets, %i[pointer pointer], :void
 
     # Instance-level functions
     attach_function :GDALClose, [:GDALDatasetH], :void
     attach_function :GDALGetDatasetDriver, [:GDALDatasetH], :GDALDriverH
     attach_function :GDALGetFileList, [:GDALDatasetH], :pointer
-    attach_function :GDALGetInternalHandle, [:GDALDatasetH, :string], :pointer
+    attach_function :GDALGetInternalHandle, %i[GDALDatasetH string], :pointer
     attach_function :GDALReferenceDataset, [:GDALDatasetH], :int
     attach_function :GDALDereferenceDataset, [:GDALDatasetH], :int
 
@@ -193,14 +188,14 @@ module FFI
     attach_function :GDALGetRasterXSize, [:GDALDatasetH], :int
     attach_function :GDALGetRasterYSize, [:GDALDatasetH], :int
     attach_function :GDALGetRasterCount, [:GDALDatasetH], :int
-    attach_function :GDALGetRasterBand, [:GDALDatasetH, :int], :GDALRasterBandH
+    attach_function :GDALGetRasterBand, %i[GDALDatasetH int], :GDALRasterBandH
     attach_function :GDALAddBand,
-      [:GDALDatasetH, GDALDataType, :pointer],
-      CPLErr
+      [:GDALDatasetH, DataType, :pointer],
+      FFI::CPL::Error::CPLErr
     attach_function :GDALBeginAsyncReader,
       [
         :GDALDatasetH,
-        GDALRWFlag,
+        RWFlag,
         :int,
         :int,
         :int,
@@ -208,7 +203,7 @@ module FFI
         :pointer,
         :int,
         :int,
-        GDALDataType,
+        DataType,
         :int,
         :pointer,
         :int,
@@ -217,13 +212,13 @@ module FFI
       ], :GDALAsyncReaderH
 
     attach_function :GDALEndAsyncReader,
-      [:GDALDatasetH, :GDALAsyncReaderH],
+      %i[GDALDatasetH GDALAsyncReaderH],
       :void
 
     attach_function :GDALDatasetRasterIO,
       [
         :GDALDatasetH,
-        GDALRWFlag,
+        RWFlag,
         :int,
         :int,
         :int,
@@ -231,13 +226,13 @@ module FFI
         :pointer,
         :int,
         :int,
-        GDALDataType,
+        DataType,
         :int,
         :pointer,
         :int,
         :int,
         :int
-      ], CPLErr
+      ], FFI::CPL::Error::CPLErr
 
     attach_function :GDALDatasetAdviseRead,
       [
@@ -248,93 +243,99 @@ module FFI
         :int,
         :int,
         :int,
-        GDALDataType,
+        DataType,
         :int,
         :pointer,
         :pointer
-      ], CPLErr
+      ], FFI::CPL::Error::CPLErr
 
-    attach_function :GDALInitGCPs, [:int, :pointer], :void
-    attach_function :GDALDeinitGCPs, [:int, :pointer], :void
-    attach_function :GDALDuplicateGCPs, [:int, :pointer], :pointer
+    attach_function :GDALInitGCPs, %i[int pointer], :void
+    attach_function :GDALDeinitGCPs, %i[int pointer], :void
+    attach_function :GDALDuplicateGCPs, %i[int pointer], :pointer
     attach_function :GDALGCPsToGeoTransform,
-      [:int, :pointer, :pointer, :int],
+      %i[int pointer pointer int],
       :int
     attach_function :GDALGetGCPCount, [:GDALDatasetH], :int
     attach_function :GDALGetGCPProjection, [:GDALDatasetH], :string
     attach_function :GDALGetGCPs, [:GDALDatasetH], :pointer
     attach_function :GDALSetGCPs,
-      [:GDALDatasetH, :int, :pointer, :string],
-      CPLErr
+      %i[GDALDatasetH int pointer string],
+      FFI::CPL::Error::CPLErr
 
     attach_function :GDALGetProjectionRef, [:GDALDatasetH], :string
-    attach_function :GDALSetProjection, [:GDALDatasetH, :string], CPLErr
-    attach_function :GDALGetGeoTransform, [:GDALDatasetH, :pointer], CPLErr
+    attach_function :GDALSetProjection, %i[GDALDatasetH string], FFI::CPL::Error::CPLErr
+    attach_function :GDALGetGeoTransform, %i[GDALDatasetH pointer], FFI::CPL::Error::CPLErr
     attach_function :GDALSetGeoTransform,
-      [:GDALDatasetH, :pointer],
-      CPLErr
+      %i[GDALDatasetH pointer],
+      FFI::CPL::Error::CPLErr
 
     attach_function :GDALBuildOverviews,
-      [
-        :GDALDatasetH,
-        :string,
-        :int,
-        :pointer,
-        :int,
-        :pointer,
-        :GDALProgressFunc,
-        :pointer
-      ], CPLErr
+      %i[
+        GDALDatasetH
+        string
+        int
+        pointer
+        int
+        pointer
+        GDALProgressFunc
+        pointer
+      ], FFI::CPL::Error::CPLErr
 
     # OGR datasets.  Not found in v1.11.1
-    attach_function :GDALDatasetGetLayerCount, [:GDALDatasetH], :int
-    attach_function :GDALDatasetGetLayer, [:GDALDatasetH, :int], :OGRLayerH
-    attach_function :GDALDatasetGetLayerByName, [:GDALDatasetH, :string], :OGRLayerH
-    attach_function :GDALDatasetDeleteLayer, [:GDALDatasetH, :int], OGRErr
-    attach_function :GDALDatasetCreateLayer,
-      [:GDALDatasetH, :string, :OGRSpatialReferenceH, OGRwkbGeometryType, :pointer],
-      :OGRLayerH
-    attach_function :GDALDatasetCopyLayer,
-      %i[GDALDatasetH OGRLayerH string pointer],
-      :OGRLayerH
-    attach_function :GDALDatasetTestCapability, [:GDALDatasetH, :string], :int
-    attach_function :GDALDatasetExecuteSQL,
-      [:GDALDatasetH, :string, :OGRGeometryH, :string],
-      :OGRLayerH
-    attach_function :GDALDatasetReleaseResultSet,
-      %i[GDALDatasetH OGRLayerH],
-      :void
-    attach_function :GDALDatasetGetStyleTable, [:GDALDatasetH], :OGRStyleTableH
-    attach_function :GDALDatasetSetStyleTableDirectly,
-      %i[GDALDatasetH OGRStyleTableH],
-      :void
-    attach_function :GDALDatasetSetStyleTable,
-      %i[GDALDatasetH OGRStyleTableH],
-      :void
-
-    attach_function :GDALCreateDatasetMaskBand, [:GDALDatasetH, :int], CPLErr
+    # attach_function :GDALDatasetGetLayerCount, [:GDALDatasetH], :int
+    # attach_function :GDALDatasetGetLayer, [:GDALDatasetH, :int], :OGRLayerH
+    # attach_function :GDALDatasetGetLayerByName, [:GDALDatasetH, :string], :OGRLayerH
+    # attach_function :GDALDatasetDeleteLayer, [:GDALDatasetH, :int], FFI::OGR::::OGRErr
+    # attach_function :GDALDatasetCreateLayer,
+    #   [
+    #     :GDALDatasetH,
+    #     :string,
+    #     FFI::OGR::SRSAPI.find_type(:OGRSpatialReferenceH),
+    #     FFI::OGR::::OGRwkbGeometryType,
+    #     :pointer
+    #   ],
+    #   :OGRLayerH
+    # attach_function :GDALDatasetCopyLayer,
+    #   [:GDALDatasetH, :OGRLayerH, :string, :pointer],
+    #   :OGRLayerH
+    # attach_function :GDALDatasetTestCapability, [:GDALDatasetH, :string], :int
+    # attach_function :GDALDatasetExecuteSQL,
+    #   [:GDALDatasetH, :string, :OGRGeometryH, :string],
+    #   :OGRLayerH
+    # attach_function :GDALDatasetReleaseResultSet,
+    #   %i[GDALDatasetH OGRLayerH],
+    #   :void
+    # attach_function :GDALDatasetGetStyleTable, [:GDALDatasetH], :OGRStyleTableH
+    # attach_function :GDALDatasetSetStyleTableDirectly,
+    #   %i[GDALDatasetH OGRStyleTableH],
+    #   :void
+    # attach_function :GDALDatasetSetStyleTable,
+    #   %i[GDALDatasetH OGRStyleTableH],
+    #   :void
+
+    attach_function :GDALCreateDatasetMaskBand, %i[GDALDatasetH int], FFI::CPL::Error::CPLErr
     attach_function :GDALDatasetCopyWholeRaster,
       %i[GDALDatasetH GDALDatasetH pointer GDALProgressFunc pointer],
-      CPLErr
+      FFI::CPL::Error::CPLErr
 
-    #~~~~~~~~~~~~~~~~~~~~
+    # ~~~~~~~~~~~~~~~~~~~
     # MajorObject
-    #~~~~~~~~~~~~~~~~~~~~
+    # ~~~~~~~~~~~~~~~~~~~
     attach_function :GDALGetMetadataDomainList, [:GDALMajorObjectH], :pointer
     attach_function :GDALGetMetadata, %i[GDALMajorObjectH string], :pointer
-    attach_function :GDALSetMetadata, %i[GDALMajorObjectH pointer string], CPLErr
+    attach_function :GDALSetMetadata, %i[GDALMajorObjectH pointer string], FFI::CPL::Error::CPLErr
     attach_function :GDALGetMetadataItem,
       %i[GDALMajorObjectH string string],
       :string
     attach_function :GDALSetMetadataItem,
       %i[GDALMajorObjectH string string string],
-      CPLErr
+      FFI::CPL::Error::CPLErr
     attach_function :GDALGetDescription, [:GDALMajorObjectH], :string
     attach_function :GDALSetDescription, %i[GDALMajorObjectH string], :void
 
-    #~~~~~~~~~~~~~~~~~~~~
+    # ~~~~~~~~~~~~~~~~~~~
     # GeoTransform
-    #~~~~~~~~~~~~~~~~~~~~
+    # ~~~~~~~~~~~~~~~~~~~
     attach_function :GDALInvGeoTransform, %i[pointer pointer], :int
     attach_function :GDALApplyGeoTransform,
       %i[pointer double double pointer pointer],
@@ -343,36 +344,36 @@ module FFI
       %i[pointer pointer pointer],
       :void
 
-    #-----------------
+    # ----------------
     # Raster functions
-    #-----------------
+    # ----------------
     attach_function :GDALRasterBandCopyWholeRaster,
-      [
-        :GDALRasterBandH,
-        :GDALRasterBandH,
-        :pointer,
-        :GDALProgressFunc,
-        :pointer
-      ], CPLErr
+      %i[
+        GDALRasterBandH
+        GDALRasterBandH
+        pointer
+        GDALProgressFunc
+        pointer
+      ], FFI::CPL::Error::CPLErr
     attach_function :GDALRegenerateOverviews,
-      [
-        :GDALRasterBandH,
-        :int,
-        :pointer,
-        :string,
-        :GDALProgressFunc,
-        :pointer
-      ], CPLErr
+      %i[
+        GDALRasterBandH
+        int
+        pointer
+        string
+        GDALProgressFunc
+        pointer
+      ], FFI::CPL::Error::CPLErr
     attach_function :GDALGetMaskBand, [:GDALRasterBandH], :GDALRasterBandH
     attach_function :GDALGetMaskFlags, [:GDALRasterBandH], :int
     attach_function :GDALCreateMaskBand,
-      [:GDALRasterBandH, :int],
-      CPLErr
+      %i[GDALRasterBandH int],
+      FFI::CPL::Error::CPLErr
 
-    attach_function :GDALGetRasterDataType, [:GDALRasterBandH], GDALDataType
+    attach_function :GDALGetRasterDataType, [:GDALRasterBandH], DataType
     attach_function :GDALGetBlockSize,
-      [:GDALRasterBandH, :pointer, :pointer],
-      GDALDataType
+      %i[GDALRasterBandH pointer pointer],
+      DataType
 
     attach_function :GDALRasterAdviseRead,
       [
@@ -383,14 +384,14 @@ module FFI
         :int,
         :int,
         :int,
-        GDALDataType,
+        DataType,
         :pointer
-      ], CPLErr
+      ], FFI::CPL::Error::CPLErr
 
     attach_function :GDALRasterIO,
       [
         :GDALRasterBandH,
-        GDALRWFlag,
+        RWFlag,
         :int,
         :int,
         :int,
@@ -398,138 +399,138 @@ module FFI
         :pointer,
         :int,
         :int,
-        GDALDataType,
+        DataType,
         :int,
         :int
-      ], CPLErr
+      ], FFI::CPL::Error::CPLErr
     attach_function :GDALReadBlock,
-      [:GDALRasterBandH, :int, :int, :pointer],
-      CPLErr
+      %i[GDALRasterBandH int int pointer],
+      FFI::CPL::Error::CPLErr
     attach_function :GDALWriteBlock,
-      [:GDALRasterBandH, :int, :int, :pointer],
-      CPLErr
+      %i[GDALRasterBandH int int pointer],
+      FFI::CPL::Error::CPLErr
     attach_function :GDALGetRasterBandXSize, [:GDALRasterBandH], :int
     attach_function :GDALGetRasterBandYSize, [:GDALRasterBandH], :int
-    attach_function :GDALGetRasterAccess, [:GDALRasterBandH], GDALAccess
+    attach_function :GDALGetRasterAccess, [:GDALRasterBandH], Access
     attach_function :GDALGetBandNumber, [:GDALRasterBandH], :int
     attach_function :GDALGetBandDataset, [:GDALRasterBandH], :GDALDatasetH
     attach_function :GDALGetRasterColorInterpretation,
       [:GDALRasterBandH],
-      GDALColorInterp
+      ColorInterp
     attach_function :GDALSetRasterColorInterpretation,
-      [:GDALRasterBandH, GDALColorInterp],
-      CPLErr
+      [:GDALRasterBandH, ColorInterp],
+      FFI::CPL::Error::CPLErr
     attach_function :GDALGetRasterColorTable,
       [:GDALRasterBandH],
       :GDALColorTableH
     attach_function :GDALSetRasterColorTable,
-      [:GDALRasterBandH, :GDALColorTableH],
-      CPLErr
+      %i[GDALRasterBandH GDALColorTableH],
+      FFI::CPL::Error::CPLErr
 
     attach_function :GDALHasArbitraryOverviews, [:GDALRasterBandH], :int
     attach_function :GDALGetOverviewCount, [:GDALRasterBandH], :int
-    attach_function :GDALGetOverview, [:GDALRasterBandH, :int], :GDALRasterBandH
+    attach_function :GDALGetOverview, %i[GDALRasterBandH int], :GDALRasterBandH
     attach_function :GDALGetRasterNoDataValue,
-      [:GDALRasterBandH, :pointer],
+      %i[GDALRasterBandH pointer],
       :double
     attach_function :GDALSetRasterNoDataValue,
-      [:GDALRasterBandH, :double],
-      CPLErr
+      %i[GDALRasterBandH double],
+      FFI::CPL::Error::CPLErr
     attach_function :GDALGetRasterCategoryNames,
       [:GDALRasterBandH],
       :pointer
     attach_function :GDALSetRasterCategoryNames,
-      [:GDALRasterBandH, :pointer],
-      CPLErr
+      %i[GDALRasterBandH pointer],
+      FFI::CPL::Error::CPLErr
     attach_function :GDALGetRasterMinimum,
-      [:GDALRasterBandH, :pointer],
+      %i[GDALRasterBandH pointer],
       :double
     attach_function :GDALGetRasterMaximum,
-      [:GDALRasterBandH, :pointer],
+      %i[GDALRasterBandH pointer],
       :double
     attach_function :GDALGetRasterStatistics,
-      [:GDALRasterBandH, :bool, :bool, :pointer, :pointer, :pointer, :pointer],
-      CPLErr
+      %i[GDALRasterBandH bool bool pointer pointer pointer pointer],
+      FFI::CPL::Error::CPLErr
     attach_function :GDALComputeRasterStatistics,
-      [
-        :GDALRasterBandH,
-        :bool,
-        :pointer,
-        :pointer,
-        :pointer,
-        :pointer,
-        :GDALProgressFunc,
-        :pointer
-      ], CPLErr
+      %i[
+        GDALRasterBandH
+        bool
+        pointer
+        pointer
+        pointer
+        pointer
+        GDALProgressFunc
+        pointer
+      ], FFI::CPL::Error::CPLErr
     attach_function :GDALSetRasterStatistics,
-      [:GDALRasterBandH, :double, :double, :double, :double],
-      CPLErr
+      %i[GDALRasterBandH double double double double],
+      FFI::CPL::Error::CPLErr
     attach_function :GDALGetRasterUnitType, [:GDALRasterBandH], :string
-    attach_function :GDALSetRasterUnitType, [:GDALRasterBandH, :string], CPLErr
-    attach_function :GDALGetRasterOffset, [:GDALRasterBandH, :pointer], :double
-    attach_function :GDALSetRasterOffset, [:GDALRasterBandH, :double], CPLErr
-    attach_function :GDALGetRasterScale, [:GDALRasterBandH, :pointer], :double
-    attach_function :GDALSetRasterScale, [:GDALRasterBandH, :double], CPLErr
+    attach_function :GDALSetRasterUnitType, %i[GDALRasterBandH string], FFI::CPL::Error::CPLErr
+    attach_function :GDALGetRasterOffset, %i[GDALRasterBandH pointer], :double
+    attach_function :GDALSetRasterOffset, %i[GDALRasterBandH double], FFI::CPL::Error::CPLErr
+    attach_function :GDALGetRasterScale, %i[GDALRasterBandH pointer], :double
+    attach_function :GDALSetRasterScale, %i[GDALRasterBandH double], FFI::CPL::Error::CPLErr
     attach_function :GDALComputeRasterMinMax,
-      [:GDALRasterBandH, :int, :pointer],
+      %i[GDALRasterBandH bool pointer],
       :void
-    attach_function :GDALFlushRasterCache, [:GDALRasterBandH], CPLErr
+    attach_function :GDALFlushRasterCache, [:GDALRasterBandH], FFI::CPL::Error::CPLErr
     attach_function :GDALGetRasterHistogram,
-      [
-        :GDALRasterBandH,
-        :double,
-        :double,
-        :int,
-        :pointer,
-        :bool,
-        :bool,
-        :GDALProgressFunc,
-        :pointer
-      ], CPLErr
+      %i[
+        GDALRasterBandH
+        double
+        double
+        int
+        pointer
+        bool
+        bool
+        GDALProgressFunc
+        pointer
+      ], FFI::CPL::Error::CPLErr
 
     attach_function :GDALGetDefaultHistogram,
-      [
-        :GDALRasterBandH,
-        :pointer,
-        :pointer,
-        :pointer,
-        :pointer,
-        :bool,
-        :GDALProgressFunc,
-        :pointer
-      ], CPLErr
+      %i[
+        GDALRasterBandH
+        pointer
+        pointer
+        pointer
+        pointer
+        bool
+        GDALProgressFunc
+        pointer
+      ], FFI::CPL::Error::CPLErr
     attach_function :GDALSetDefaultHistogram,
-      [
-        :GDALRasterBandH,
-        :double,
-        :double,
-        :int,
-        :pointer
-      ], CPLErr
+      %i[
+        GDALRasterBandH
+        double
+        double
+        int
+        pointer
+      ], FFI::CPL::Error::CPLErr
 
     attach_function :GDALGetRandomRasterSample,
-      [:GDALRasterBandH, :int, :pointer],
+      %i[GDALRasterBandH int pointer],
       :int
     attach_function :GDALGetRasterSampleOverview,
-      [:GDALRasterBandH, :int],
+      %i[GDALRasterBandH int],
       :GDALRasterBandH
     attach_function :GDALFillRaster,
-      [:GDALRasterBandH, :double, :double],
-      CPLErr
+      %i[GDALRasterBandH double double],
+      FFI::CPL::Error::CPLErr
 
     attach_function :GDALGetDefaultRAT,
       [:GDALRasterBandH],
       :GDALRasterAttributeTableH
     attach_function :GDALSetDefaultRAT,
-      [:GDALRasterBandH, :GDALRasterAttributeTableH],
-      CPLErr
+      %i[GDALRasterBandH GDALRasterAttributeTableH],
+      FFI::CPL::Error::CPLErr
     attach_function :GDALAddDerivedBandPixelFunc,
-      [:string, :GDALDerivedPixelFunc],
-      CPLErr
+      %i[string GDALDerivedPixelFunc],
+      FFI::CPL::Error::CPLErr
 
-    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     # Raster Attribute Table functions
-    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     # Class-level functions
     attach_function :GDALCreateRasterAttributeTable,
       [],
@@ -550,20 +551,20 @@ module FFI
       [:GDALRasterAttributeTableH],
       :int
     attach_function :GDALRATGetNameOfCol,
-      [:GDALRasterAttributeTableH, :int],
+      %i[GDALRasterAttributeTableH int],
       :string
     attach_function :GDALRATGetUsageOfCol,
-      [:GDALRasterAttributeTableH, :int],
-      GDALRATFieldUsage
+      %i[GDALRasterAttributeTableH int],
+      RATFieldUsage
     attach_function :GDALRATGetTypeOfCol,
-      [:GDALRasterAttributeTableH, :int],
-      GDALRATFieldType
+      %i[GDALRasterAttributeTableH int],
+      RATFieldType
     attach_function :GDALRATGetColOfUsage,
-      [:GDALRasterAttributeTableH, GDALRATFieldUsage],
+      [:GDALRasterAttributeTableH, RATFieldUsage],
       :int
     attach_function :GDALRATCreateColumn,
-      [:GDALRasterAttributeTableH, :string, GDALRATFieldType, GDALRATFieldUsage],
-      CPLErr
+      [:GDALRasterAttributeTableH, :string, RATFieldType, RATFieldUsage],
+      FFI::CPL::Error::CPLErr
 
     attach_function :GDALRATGetValueAsString,
       %i[GDALRasterAttributeTableH int int],
@@ -584,14 +585,14 @@ module FFI
       %i[GDALRasterAttributeTableH int int double],
       :void
     attach_function :GDALRATValuesIOAsDouble,
-      [:GDALRasterAttributeTableH, GDALRWFlag, :int, :int, :int, :pointer],
-      CPLErr
+      [:GDALRasterAttributeTableH, RWFlag, :int, :int, :int, :pointer],
+      FFI::CPL::Error::CPLErr
     attach_function :GDALRATValuesIOAsInteger,
-      [:GDALRasterAttributeTableH, GDALRWFlag, :int, :int, :int, :pointer],
-      CPLErr
+      [:GDALRasterAttributeTableH, RWFlag, :int, :int, :int, :pointer],
+      FFI::CPL::Error::CPLErr
     attach_function :GDALRATValuesIOAsString,
-      [:GDALRasterAttributeTableH, GDALRWFlag, :int, :int, :int, :pointer],
-      CPLErr
+      [:GDALRasterAttributeTableH, RWFlag, :int, :int, :int, :pointer],
+      FFI::CPL::Error::CPLErr
 
     attach_function :GDALRATGetRowCount,
       [:GDALRasterAttributeTableH],
@@ -614,52 +615,52 @@ module FFI
       :GDALColorTableH
     attach_function :GDALRATInitializeFromColorTable,
       %i[GDALRasterAttributeTableH GDALColorTableH],
-      CPLErr
+      FFI::CPL::Error::CPLErr
 
     attach_function :GDALRATDumpReadable,
       %i[GDALRasterAttributeTableH pointer],
       :void
 
-    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     # ColorTable functions
-    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     # Class-level functions
-    attach_function :GDALCreateColorTable, [GDALPaletteInterp], :GDALColorTableH
+    attach_function :GDALCreateColorTable, [PaletteInterp], :GDALColorTableH
 
     # Instance-level functions
     attach_function :GDALDestroyColorTable, [:GDALColorTableH], :void
     attach_function :GDALCloneColorTable, [:GDALColorTableH], :GDALColorTableH
 
-    attach_function :GDALGetPaletteInterpretation, [:GDALColorTableH], GDALPaletteInterp
+    attach_function :GDALGetPaletteInterpretation, [:GDALColorTableH], PaletteInterp
     attach_function :GDALGetColorEntryCount, [:GDALColorTableH], :int
-    attach_function :GDALGetColorEntry, [:GDALColorTableH, :int], GDALColorEntry.ptr
-    attach_function :GDALGetColorEntryAsRGB, [:GDALColorTableH, :int, GDALColorEntry], :int
-    attach_function :GDALSetColorEntry, [:GDALColorTableH, :int, GDALColorEntry.ptr], :void
+    attach_function :GDALGetColorEntry, %i[GDALColorTableH int], FFI::GDAL::ColorEntry.ptr
+    attach_function :GDALGetColorEntryAsRGB, [:GDALColorTableH, :int, FFI::GDAL::ColorEntry], :int
+    attach_function :GDALSetColorEntry, [:GDALColorTableH, :int, FFI::GDAL::ColorEntry.ptr], :void
 
     attach_function :GDALCreateColorRamp,
-      [:GDALColorTableH, :int, GDALColorEntry.ptr, :int, GDALColorEntry.ptr],
+      [:GDALColorTableH, :int, FFI::GDAL::ColorEntry.ptr, :int, FFI::GDAL::ColorEntry.ptr],
       :void
 
-    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     # PaletteInterp functions
-    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    attach_function :GDALGetPaletteInterpretationName, [GDALPaletteInterp], :string
+    # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    attach_function :GDALGetPaletteInterpretationName, [PaletteInterp], :string
 
-    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     # General stuff
-    #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    attach_function :GDALGetDataTypeSize, [GDALDataType], :int
-    attach_function :GDALDataTypeIsComplex, [GDALDataType], :bool
-    attach_function :GDALGetDataTypeName, [GDALDataType], :string
-    attach_function :GDALGetDataTypeByName, [:string], GDALDataType
-    attach_function :GDALDataTypeUnion, [GDALDataType, GDALDataType], GDALDataType
+    # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    attach_function :GDALGetDataTypeSize, [DataType], :int
+    attach_function :GDALDataTypeIsComplex, [DataType], :bool
+    attach_function :GDALGetDataTypeName, [DataType], :string
+    attach_function :GDALGetDataTypeByName, [:string], DataType
+    attach_function :GDALDataTypeUnion, [DataType, DataType], DataType
 
     attach_function :GDALSetCacheMax, %i[int], :void
-    attach_function :GDALSetCacheMax64, %i[GIntBig], :void
+    attach_function :GDALSetCacheMax64, [CPL::Port.find_type(:GIntBig)], :void
     attach_function :GDALGetCacheMax, [], :int
-    attach_function :GDALGetCacheMax64, [], :GIntBig
+    attach_function :GDALGetCacheMax64, [], CPL::Port.find_type(:GIntBig)
     attach_function :GDALGetCacheUsed, [], :int
-    attach_function :GDALGetCacheUsed64, [], :GIntBig
+    attach_function :GDALGetCacheUsed64, [], CPL::Port.find_type(:GIntBig)
     attach_function :GDALFlushCacheBlock, [], :bool
 
     attach_function :GDALLoadWorldFile, %i[string pointer], :bool