Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace OGR_DS_xxxx() by GDALDatasetxxxx() #587

Merged
merged 1 commit into from
Nov 7, 2024
Merged

Replace OGR_DS_xxxx() by GDALDatasetxxxx() #587

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions src/vector/layer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ impl<'a> Iterator for LayerIterator<'a> {
if idx < self.count {
self.idx += 1;
let c_layer =
unsafe { gdal_sys::OGR_DS_GetLayer(self.dataset.c_dataset(), idx as c_int) };
unsafe { gdal_sys::GDALDatasetGetLayer(self.dataset.c_dataset(), idx as c_int) };
if !c_layer.is_null() {
let layer = unsafe { Layer::from_c_layer(self.dataset, c_layer) };
return Some(layer);
Expand Down Expand Up @@ -601,7 +601,7 @@ impl Dataset {

/// Get the number of layers in this dataset.
pub fn layer_count(&self) -> usize {
(unsafe { gdal_sys::OGR_DS_GetLayerCount(self.c_dataset()) }) as usize
(unsafe { gdal_sys::GDALDatasetGetLayerCount(self.c_dataset()) }) as usize
}

/// Fetch a layer by index.
Expand All @@ -610,9 +610,9 @@ impl Dataset {
/// _0-based_ index.
pub fn layer(&self, idx: usize) -> Result<Layer> {
let idx = c_int::try_from(idx)?;
let c_layer = unsafe { gdal_sys::OGR_DS_GetLayer(self.c_dataset(), idx) };
let c_layer = unsafe { gdal_sys::GDALDatasetGetLayer(self.c_dataset(), idx) };
if c_layer.is_null() {
return Err(_last_null_pointer_err("OGR_DS_GetLayer"));
return Err(_last_null_pointer_err("GDALDatasetGetLayer"));
}
Ok(self.child_layer(c_layer))
}
Expand All @@ -623,29 +623,31 @@ impl Dataset {
/// _0-based_ index.
pub fn into_layer(self, idx: usize) -> Result<OwnedLayer> {
let idx = c_int::try_from(idx)?;
let c_layer = unsafe { gdal_sys::OGR_DS_GetLayer(self.c_dataset(), idx) };
let c_layer = unsafe { gdal_sys::GDALDatasetGetLayer(self.c_dataset(), idx) };
if c_layer.is_null() {
return Err(_last_null_pointer_err("OGR_DS_GetLayer"));
return Err(_last_null_pointer_err("GDALDatasetGetLayer"));
}
Ok(self.into_child_layer(c_layer))
}

/// Fetch a layer by name.
pub fn layer_by_name(&self, name: &str) -> Result<Layer> {
let c_name = CString::new(name)?;
let c_layer = unsafe { gdal_sys::OGR_DS_GetLayerByName(self.c_dataset(), c_name.as_ptr()) };
let c_layer =
unsafe { gdal_sys::GDALDatasetGetLayerByName(self.c_dataset(), c_name.as_ptr()) };
if c_layer.is_null() {
return Err(_last_null_pointer_err("OGR_DS_GetLayerByName"));
return Err(_last_null_pointer_err("GDALDatasetGetLayerByName"));
}
Ok(self.child_layer(c_layer))
}

/// Fetch a layer by name.
pub fn into_layer_by_name(self, name: &str) -> Result<OwnedLayer> {
let c_name = CString::new(name)?;
let c_layer = unsafe { gdal_sys::OGR_DS_GetLayerByName(self.c_dataset(), c_name.as_ptr()) };
let c_layer =
unsafe { gdal_sys::GDALDatasetGetLayerByName(self.c_dataset(), c_name.as_ptr()) };
if c_layer.is_null() {
return Err(_last_null_pointer_err("OGR_DS_GetLayerByName"));
return Err(_last_null_pointer_err("GDALDatasetGetLayerByName"));
}
Ok(self.into_child_layer(c_layer))
}
Expand Down Expand Up @@ -715,7 +717,7 @@ impl Dataset {
// The C function takes `char **papszOptions` without mention of `const`, and this is
// propagated to the gdal_sys wrapper. The lack of `const` seems like a mistake in the
// GDAL API, so we just do a cast here.
gdal_sys::OGR_DS_CreateLayer(
gdal_sys::GDALDatasetCreateLayer(
self.c_dataset(),
c_name.as_ptr(),
c_srs,
Expand All @@ -724,7 +726,7 @@ impl Dataset {
)
};
if c_layer.is_null() {
return Err(_last_null_pointer_err("OGR_DS_CreateLayer"));
return Err(_last_null_pointer_err("GDALDatasetCreateLayer"));
};
Ok(self.child_layer(c_layer))
}
Expand Down