Update GDAL API to 3.1. Version 0.08

ajolma · May 15, 2020 · be900d3 · be900d3
1 parent 9b1a6a5
commit be900d3
Show file tree

Hide file tree

Showing 17 changed files with 227 additions and 27 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,13 @@
 Revision history for Perl extension Geo::GDAL::FFI
 
+0.08 May 15, 2020
+     - Update GDAL API to 3.1.0
+     - add a Dataset::GetLayerCount method
+     - Add POD for GetLayerCount
+     - Add Dataset::GetLayerCount method
+     - Raise exceptions when invalid layers are accessed via Dataset::GetLayer
+     - Better handling of GDAL warnings and debug messages.
+
 0.07 Dec 9, 2018
      - Layer GetExtent, GetName, GetParentDataset
      - Dataset ExecuteSQL

diff --git a/build-tools/parse_h.pl b/build-tools/parse_h.pl
@@ -68,6 +68,7 @@
     GDALCreateCopy => 1,
     GDALGetMetadataDomainList => 1,
     GDALIdentifyDriver => 1,
+    GDALIdentifyDriverEx => 1,
     GDALValidateCreationOptions => 1,
     GDALGetMetadata => 1,
     GDALSetMetadata => 1,
@@ -370,12 +371,20 @@ sub parse_type {
         $arg = 'int';
     } elsif ($arg =~ /^size_t/) {
         $arg = 'size_t';
+    } elsif ($arg =~ /^const size_t/) {
+        $arg = 'size_t';
     } elsif ($arg =~ /GByte\s*\*/) {
         $arg = 'pointer';
     } elsif ($arg =~ /^GUInt32\s*\*/) {
         $arg = 'uint32*';
     } elsif ($arg =~ /^GUInt32/) {
         $arg = 'uint32';
+    } elsif ($arg =~ /^const GInt64\s*\*/) {
+        $arg = 'int64';
+    } elsif ($arg =~ /^GUInt64/) {
+        $arg = 'uint64';
+    } elsif ($arg =~ /^const GUInt64\s*\*/) {
+        $arg = 'uint64*';
     } elsif ($arg =~ /^GUIntBig\s*\*/) {
         $arg = 'uint64*';
     } elsif ($arg =~ /^GUIntBig/) {
@@ -394,6 +403,22 @@ sub parse_type {
         $arg = 'void';
     } elsif ($arg =~ /^CSLConstList/) {
         $arg = 'opaque';
+    } elsif ($arg =~ /^GPtrDiff_t/) {
+        $arg = 'int';
+    } elsif ($arg =~ /^const GPtrDiff_t\s*\*/) {
+        $arg = 'int*';
+    } elsif ($arg =~ /^GDALExtendedDataTypeClass/) {
+        $arg = 'int';
+    } elsif ($arg =~ /^OSRAxisMappingStrategy/) {
+        $arg = 'int';
+    } elsif ($arg =~ /^OSRCRSInfo/) {
+        $arg = 'opaque';
+    } elsif ($arg =~ /^(const )?OSRCRSListParameters/) {
+        $arg = 'opaque';
+    } elsif ($arg =~ /^(const )?GDALMultiDimInfoOptions/) {
+        $arg = 'opaque';
+    } elsif ($arg =~ /^(const )?GDALMultiDimTranslateOptions/) {
+        $arg = 'opaque';
     } else {
         die "can't parse arg '$arg'";
     }
@@ -421,7 +446,12 @@ sub pre_process {
             next;
         }
         if ($s =~ /^#ifdef (\w+)/ or $s =~ /^#if defined\((\w+)\)/) {
-            if ($1 eq 'DEBUG' or $1 eq 'undef' or $1 eq 'GDAL_COMPILATION') {
+            if (
+                $1 eq 'DEBUG'
+                or $1 eq 'undef'
+                or $1 eq 'GDAL_COMPILATION'
+                or $1 eq 'USE_DEPRECATED_SRS_WKT_WGS84'
+                ) {
                 $skip = 1;
                 next;
             }

diff --git a/lib/Geo/GDAL/FFI.pm b/lib/Geo/GDAL/FFI.pm
diff --git a/lib/Geo/GDAL/FFI/Band.pm b/lib/Geo/GDAL/FFI/Band.pm
@@ -5,7 +5,7 @@ use warnings;
 use Carp;
 use FFI::Platypus::Buffer;
 
-our $VERSION = 0.0700;
+our $VERSION = 0.0800;
 
 sub DESTROY {
     my $self = shift;

diff --git a/lib/Geo/GDAL/FFI/Dataset.pm b/lib/Geo/GDAL/FFI/Dataset.pm
@@ -6,7 +6,7 @@ use Carp;
 use base 'Geo::GDAL::FFI::Object';
 use Scalar::Util qw /blessed/;
 
-our $VERSION = 0.0700;
+our $VERSION = 0.0800;
 
 sub DESTROY {
     my $self = shift;

diff --git a/lib/Geo/GDAL/FFI/Driver.pm b/lib/Geo/GDAL/FFI/Driver.pm
@@ -5,7 +5,7 @@ use warnings;
 use Carp;
 use base 'Geo::GDAL::FFI::Object';
 
-our $VERSION = 0.0700;
+our $VERSION = 0.0800;
 
 sub GetName {
     my $self = shift;

diff --git a/lib/Geo/GDAL/FFI/Feature.pm b/lib/Geo/GDAL/FFI/Feature.pm
@@ -7,7 +7,7 @@ use Carp;
 use Encode qw(decode encode);
 use FFI::Platypus::Buffer;
 
-our $VERSION = 0.0700;
+our $VERSION = 0.0800;
 
 sub new {
     my ($class, $defn) = @_;

diff --git a/lib/Geo/GDAL/FFI/FeatureDefn.pm b/lib/Geo/GDAL/FFI/FeatureDefn.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use Carp;
 
-our $VERSION = 0.0700;
+our $VERSION = 0.0800;
 
 sub new {
     my ($class, $args) = @_;

diff --git a/lib/Geo/GDAL/FFI/FieldDefn.pm b/lib/Geo/GDAL/FFI/FieldDefn.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use Carp;
 
-our $VERSION = 0.0700;
+our $VERSION = 0.0800;
 
 sub new {
     my ($class, $args) = @_;

diff --git a/lib/Geo/GDAL/FFI/GeomFieldDefn.pm b/lib/Geo/GDAL/FFI/GeomFieldDefn.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use Carp;
 
-our $VERSION = 0.0700;
+our $VERSION = 0.0800;
 
 sub new {
     my ($class, $args) = @_;

diff --git a/lib/Geo/GDAL/FFI/Geometry.pm b/lib/Geo/GDAL/FFI/Geometry.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use Carp;
 
-our $VERSION = 0.0700;
+our $VERSION = 0.0800;
 
 my %ref;
 

diff --git a/lib/Geo/GDAL/FFI/Layer.pm b/lib/Geo/GDAL/FFI/Layer.pm
@@ -5,7 +5,7 @@ use warnings;
 use Carp;
 use base 'Geo::GDAL::FFI::Object';
 
-our $VERSION = 0.0700;
+our $VERSION = 0.0800;
 
 sub DESTROY {
     my $self = shift;

diff --git a/lib/Geo/GDAL/FFI/Object.pm b/lib/Geo/GDAL/FFI/Object.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use Carp;
 
-our $VERSION = 0.0700;
+our $VERSION = 0.0800;
 
 sub GetDescription {
     my $self = shift;

diff --git a/lib/Geo/GDAL/FFI/SpatialReference.pm b/lib/Geo/GDAL/FFI/SpatialReference.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use Carp;
 
-our $VERSION = 0.0700;
+our $VERSION = 0.0800;
 
 sub new {
     my ($class, $arg, @arg) = @_;

diff --git a/lib/Geo/GDAL/FFI/VSI.pm b/lib/Geo/GDAL/FFI/VSI.pm
@@ -7,7 +7,7 @@ use Carp;
 use FFI::Platypus::Buffer;
 require Exporter;
 
-our $VERSION = 0.0700;
+our $VERSION = 0.0800;
 
 our @ISA = qw(Exporter);
 our @EXPORT_OK = qw(Mkdir Rmdir ReadDir FOpen Unlink Rename);

diff --git a/lib/Geo/GDAL/FFI/VSI/File.pm b/lib/Geo/GDAL/FFI/VSI/File.pm
@@ -7,7 +7,7 @@ use Carp;
 use FFI::Platypus::Buffer;
 use FFI::Platypus::Declare;
 
-our $VERSION = 0.0700;
+our $VERSION = 0.0800;
 
 sub Open {
     my ($class, $path, $access) = @_;

diff --git a/t/sr.t b/t/sr.t
@@ -15,7 +15,7 @@ my $gdal = Geo::GDAL::FFI->get_instance();
     SKIP: {
       skip "GDAL support files not found.", 1 if !$gdal->FindFile('gcs.csv');
       my $sr = Geo::GDAL::FFI::SpatialReference->new(EPSG => 3067);
-      ok($sr->Export('Wkt') eq 'PROJCS["ETRS89 / TM35FIN(E,N)",GEOGCS["ETRS89",DATUM["European_Terrestrial_Reference_System_1989",SPHEROID["GRS 1980",6378137,298.257222101,AUTHORITY["EPSG","7019"]],TOWGS84[0,0,0,0,0,0,0],AUTHORITY["EPSG","6258"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4258"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",27],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["Easting",EAST],AXIS["Northing",NORTH],AUTHORITY["EPSG","3067"]]',
+      ok($sr->Export('Wkt') eq 'PROJCS["ETRS89 / TM35FIN(E,N)",GEOGCS["ETRS89",DATUM["European_Terrestrial_Reference_System_1989",SPHEROID["GRS 1980",6378137,298.257222101,AUTHORITY["EPSG","7019"]],AUTHORITY["EPSG","6258"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4258"]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",27],PARAMETER["scale_factor",0.9996],PARAMETER["false_easting",500000],PARAMETER["false_northing",0],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["Easting",EAST],AXIS["Northing",NORTH],AUTHORITY["EPSG","3067"]]',
       'Import/export');
     }
 }