ffi-gdal 1.0.0.beta13 → 1.0.0.beta14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/History.md +6 -0
- data/lib/ffi/gdal/version.rb +1 -1
- data/lib/gdal/dataset.rb +2 -10
- data/lib/ogr/data_source.rb +2 -5
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 3afcc101b07f1be65e2cce03ed7d925ae1d94a2fb8f36e6b32c9738f97002619
|
|
4
|
+
data.tar.gz: caeedcff346cadb107ed4a91970b61a93f61959d6e0f0e69cc96dafc290a8851
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 55f9c4e293410626d9fda5e624589f24fede9aeb8faff2378ab72c2fe2cd9d7f412eebfa3dddb313719710d950167e894b4a6abe4833997d27483046cf4f65c5
|
|
7
|
+
data.tar.gz: b315fe3b339d8d7c1479fd609660cb38e2872e5007500bb896175cd47fbd9322f8ac19f584cd9a8cf55163c5121574670ace63d5d6c6a33e300190a35ad46a04
|
data/History.md
CHANGED
|
@@ -2,6 +2,12 @@
|
|
|
2
2
|
|
|
3
3
|
Format for this file derived from [http://keepachangelog.com](http://keepachangelog.com).
|
|
4
4
|
|
|
5
|
+
## 1.0.0.beta14 / 2022-05-06
|
|
6
|
+
|
|
7
|
+
### Bug Fixes
|
|
8
|
+
|
|
9
|
+
* [DEV-34133] Don't URI.parse path in `GDAL::Dataset#initialize` and `OGR::DataSource#initialize`.
|
|
10
|
+
|
|
5
11
|
## 1.0.0.beta13 / 2022-04-20
|
|
6
12
|
|
|
7
13
|
### Bug Fixes
|
data/lib/ffi/gdal/version.rb
CHANGED
data/lib/gdal/dataset.rb
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
|
-
require 'uri'
|
|
4
3
|
require_relative '../gdal'
|
|
5
4
|
require_relative '../ogr'
|
|
6
5
|
require_relative 'major_object'
|
|
@@ -60,17 +59,10 @@ module GDAL
|
|
|
60
59
|
def initialize(path_or_pointer, access_flag, shared_open = true)
|
|
61
60
|
@c_pointer =
|
|
62
61
|
if path_or_pointer.is_a? String
|
|
63
|
-
file_path = begin
|
|
64
|
-
uri = URI.parse(path_or_pointer)
|
|
65
|
-
uri.scheme.nil? ? ::File.expand_path(path_or_pointer) : path_or_pointer
|
|
66
|
-
rescue URI::InvalidURIError
|
|
67
|
-
path_or_pointer
|
|
68
|
-
end
|
|
69
|
-
|
|
70
62
|
if shared_open
|
|
71
|
-
FFI::GDAL::GDAL.GDALOpenShared(
|
|
63
|
+
FFI::GDAL::GDAL.GDALOpenShared(path_or_pointer, ACCESS_FLAGS[access_flag])
|
|
72
64
|
else
|
|
73
|
-
FFI::GDAL::GDAL.GDALOpen(
|
|
65
|
+
FFI::GDAL::GDAL.GDALOpen(path_or_pointer, ACCESS_FLAGS[access_flag])
|
|
74
66
|
end
|
|
75
67
|
else
|
|
76
68
|
path_or_pointer
|
data/lib/ogr/data_source.rb
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
|
-
require 'uri'
|
|
4
3
|
require 'json'
|
|
5
4
|
require_relative '../gdal'
|
|
6
5
|
require_relative '../ogr'
|
|
@@ -41,14 +40,12 @@ module OGR
|
|
|
41
40
|
def initialize(path_or_pointer, access_flag)
|
|
42
41
|
@c_pointer =
|
|
43
42
|
if path_or_pointer.is_a?(String)
|
|
44
|
-
|
|
45
|
-
file_path = uri.scheme.nil? ? ::File.expand_path(path_or_pointer) : path_or_pointer
|
|
46
|
-
FFI::OGR::API.OGROpen(file_path, OGR._boolean_access_flag(access_flag), nil)
|
|
43
|
+
FFI::OGR::API.OGROpen(path_or_pointer, OGR._boolean_access_flag(access_flag), nil)
|
|
47
44
|
else
|
|
48
45
|
path_or_pointer
|
|
49
46
|
end
|
|
50
47
|
|
|
51
|
-
raise OGR::OpenFailure,
|
|
48
|
+
raise OGR::OpenFailure, path_or_pointer if @c_pointer.null?
|
|
52
49
|
|
|
53
50
|
@layers = []
|
|
54
51
|
end
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: ffi-gdal
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.0.0.
|
|
4
|
+
version: 1.0.0.beta14
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Steve Loveless
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2022-
|
|
11
|
+
date: 2022-05-09 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: ffi
|