gdal 1.0.0 → 2.0.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/ext/gdal-ruby/gdal/extconf.rb +5 -0
- data/ext/gdal-ruby/gdal/gdal.cpp +3 -2
- data/ext/gdal-ruby/gdalconst/gdalconst.c +2 -0
- data/ext/gdal-ruby/ogr/extconf.rb +5 -0
- data/ext/gdal-ruby/ogr/ogr.cpp +7 -4
- data/ext/gdal-ruby/osr/extconf.rb +5 -0
- data/ext/gdal-ruby/osr/osr.cpp +4 -2
- data/lib/gdal-ruby/version.rb +1 -1
- metadata +3 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
|
-
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
2
|
+
SHA256:
|
3
|
+
metadata.gz: 92af36896abf24956b9873c20633e4eef5b807d00480edb8a5aa81081387c36c
|
4
|
+
data.tar.gz: 5de734af3b9fe6e3046333e2014486a7848e519a7aca5ee226e4956ac4104af7
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 971b99a920437e6cc25838a9298eb463baf078893210601853119ae0e4b2dc87f1909b73381ba5bd3674a94430e7082ef368c34cc7f51d62f506e2ca0da0ed4f
|
7
|
+
data.tar.gz: 39084d4d813b4ed1671db4b521de175de4e17196fe6a96eb08427cdaa9db9ada6fd9d8c701e723a282a552802b64576bf829a1318d8cf7fb1fbf3e1a4aed4772
|
@@ -21,5 +21,10 @@ $CXXFLAGS = CONFIG["CXXFLAGS"] unless defined?($CXXFLAGS)
|
|
21
21
|
$CFLAGS << ' -Wno-format-security'
|
22
22
|
$CXXFLAGS << ' -Wno-format-security'
|
23
23
|
|
24
|
+
if !(`gdal-config --version`.strip =~ /^1/)
|
25
|
+
$CFLAGS << ' -Wno-reserved-user-defined-literal -std=c++11'
|
26
|
+
$CXXFLAGS << ' -Wno-reserved-user-defined-literal -std=c++11'
|
27
|
+
end
|
28
|
+
|
24
29
|
create_makefile 'gdal-ruby/gdal'
|
25
30
|
|
data/ext/gdal-ruby/gdal/gdal.cpp
CHANGED
@@ -8,8 +8,9 @@
|
|
8
8
|
* interface file instead.
|
9
9
|
* ----------------------------------------------------------------------------- */
|
10
10
|
|
11
|
-
#
|
11
|
+
#include "cpl_port.h"
|
12
12
|
|
13
|
+
#define SWIGRUBY
|
13
14
|
|
14
15
|
#ifdef __cplusplus
|
15
16
|
/* SwigValueWrapper is described in swig.swg */
|
@@ -1863,7 +1864,7 @@ using namespace std;
|
|
1863
1864
|
#include "cpl_http.h"
|
1864
1865
|
|
1865
1866
|
#include "gdal.h"
|
1866
|
-
#include "gdal_priv.h"
|
1867
|
+
/* #include "gdal_priv.h" */
|
1867
1868
|
#include "gdal_alg.h"
|
1868
1869
|
#include "gdalwarper.h"
|
1869
1870
|
|
@@ -21,4 +21,9 @@ $CXXFLAGS = CONFIG["CXXFLAGS"] unless defined?($CXXFLAGS)
|
|
21
21
|
$CFLAGS << ' -Wno-format-security'
|
22
22
|
$CXXFLAGS << ' -Wno-format-security'
|
23
23
|
|
24
|
+
if !(`gdal-config --version`.strip =~ /^1/)
|
25
|
+
$CFLAGS << ' -Wno-reserved-user-defined-literal -std=c++11'
|
26
|
+
$CXXFLAGS << ' -Wno-reserved-user-defined-literal -std=c++11'
|
27
|
+
end
|
28
|
+
|
24
29
|
create_makefile('gdal-ruby/ogr')
|
data/ext/gdal-ruby/ogr/ogr.cpp
CHANGED
@@ -8,8 +8,9 @@
|
|
8
8
|
* interface file instead.
|
9
9
|
* ----------------------------------------------------------------------------- */
|
10
10
|
|
11
|
-
#
|
11
|
+
#include "cpl_port.h"
|
12
12
|
|
13
|
+
#define SWIGRUBY
|
13
14
|
|
14
15
|
#ifdef __cplusplus
|
15
16
|
/* SwigValueWrapper is described in swig.swg */
|
@@ -1856,8 +1857,9 @@ typedef char retStringAndCPLFree;
|
|
1856
1857
|
#include <iostream>
|
1857
1858
|
using namespace std;
|
1858
1859
|
|
1860
|
+
#define CPL_SUPRESS_CPLUSPLUS
|
1859
1861
|
#include "ogr_api.h"
|
1860
|
-
#include "ogr_p.h"
|
1862
|
+
/* #include "ogr_p.h" */
|
1861
1863
|
#include "ogr_core.h"
|
1862
1864
|
#include "cpl_port.h"
|
1863
1865
|
#include "cpl_string.h"
|
@@ -3218,8 +3220,9 @@ OGRDriverShadow* GetDriver(int driver_number) {
|
|
3218
3220
|
char **GeneralCmdLineProcessor( char **papszArgv, int nOptions = 0 ) {
|
3219
3221
|
int nResArgCount;
|
3220
3222
|
|
3221
|
-
nResArgCount =
|
3222
|
-
|
3223
|
+
nResArgCount = 0;
|
3224
|
+
/* TODO(zhm) REMOVED because this is not part of the C API in 2.x */
|
3225
|
+
/* OGRGeneralCmdLineProcessor( CSLCount(papszArgv), &papszArgv, nOptions ); */
|
3223
3226
|
|
3224
3227
|
if( nResArgCount <= 0 )
|
3225
3228
|
return NULL;
|
@@ -21,4 +21,9 @@ $CXXFLAGS = CONFIG["CXXFLAGS"] unless defined?($CXXFLAGS)
|
|
21
21
|
$CFLAGS << ' -Wno-format-security'
|
22
22
|
$CXXFLAGS << ' -Wno-format-security'
|
23
23
|
|
24
|
+
if !(`gdal-config --version`.strip =~ /^1/)
|
25
|
+
$CFLAGS << ' -Wno-reserved-user-defined-literal -std=c++11'
|
26
|
+
$CXXFLAGS << ' -Wno-reserved-user-defined-literal -std=c++11'
|
27
|
+
end
|
28
|
+
|
24
29
|
create_makefile('gdal-ruby/osr')
|
data/ext/gdal-ruby/osr/osr.cpp
CHANGED
@@ -8,8 +8,9 @@
|
|
8
8
|
* interface file instead.
|
9
9
|
* ----------------------------------------------------------------------------- */
|
10
10
|
|
11
|
-
#
|
11
|
+
#include "cpl_port.h"
|
12
12
|
|
13
|
+
#define SWIGRUBY
|
13
14
|
|
14
15
|
#ifdef __cplusplus
|
15
16
|
/* SwigValueWrapper is described in swig.swg */
|
@@ -2473,7 +2474,8 @@ SWIGINTERN OGRErr OSRSpatialReferenceShadow_ImportFromMICoordSys(OSRSpatialRefer
|
|
2473
2474
|
return OSRImportFromMICoordSys( self, pszCoordSys );
|
2474
2475
|
}
|
2475
2476
|
SWIGINTERN OGRErr OSRSpatialReferenceShadow_ImportFromOzi(OSRSpatialReferenceShadow *self,char const *datum,char const *proj,char const *projParms){
|
2476
|
-
return
|
2477
|
+
return 0; // TODO(zhm) Removed becaues this function's signature has changed between GDAL 1.x and 2.x. Not worth figuring it out since it's a very exotic function.
|
2478
|
+
/* return OSRImportFromOzi( self, datum, proj, projParms ); */
|
2477
2479
|
}
|
2478
2480
|
SWIGINTERN OGRErr OSRSpatialReferenceShadow_ExportToWkt(OSRSpatialReferenceShadow *self,char **argout){
|
2479
2481
|
return OSRExportToWkt( self, argout );
|
data/lib/gdal-ruby/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: gdal
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version:
|
4
|
+
version: 2.0.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Zac McCormick
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2019-06-18 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rake
|
@@ -103,8 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
103
103
|
- !ruby/object:Gem::Version
|
104
104
|
version: '0'
|
105
105
|
requirements: []
|
106
|
-
|
107
|
-
rubygems_version: 2.4.2
|
106
|
+
rubygems_version: 3.0.3
|
108
107
|
signing_key:
|
109
108
|
specification_version: 4
|
110
109
|
summary: GDAL/OGR bindings for ruby. Currently contains native extensions for GDAL
|