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.

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

set_attribute_filter shouild take &mut self #209

Merged
merged 3 commits into from
Aug 6, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## Unreleased

- **Breaking**: Make `set_attribute_filter` and `clear_attribute_filter` take `&mut self`
- <https://github.com/georust/gdal/pull/209/>

- **Breaking**: Drop pre-build bindings for GDAL versions < 2.4. The bindgen feature can be used to generate bindings for older versions.
- Fix memory leaks reported by Valgrind. This required re-generation of the pre-build bindings.
- <https://github.com/georust/gdal/pull/205>
Expand Down
9 changes: 7 additions & 2 deletions src/vector/layer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -339,10 +339,12 @@ impl<'a> Layer<'a> {

/// Set a new attribute query that restricts features when using the feature iterator.
///
/// From the GDAL docs: Note that installing a query string will generally result in resetting the current reading position
///
/// Parameters:
/// - `query` in restricted SQL WHERE format
///
pub fn set_attribute_filter(&self, query: &str) -> Result<()> {
pub fn set_attribute_filter(&mut self, query: &str) -> Result<()> {
let c_str = CString::new(query)?;
let rv = unsafe { gdal_sys::OGR_L_SetAttributeFilter(self.c_layer, c_str.as_ptr()) };

Expand All @@ -357,7 +359,10 @@ impl<'a> Layer<'a> {
}

/// Clear the attribute filter set on this layer
pub fn clear_attribute_filter(&self) {
///
/// From the GDAL docs: Note that installing a query string will generally result in resetting the current reading position
///
pub fn clear_attribute_filter(&mut self) {
unsafe {
gdal_sys::OGR_L_SetAttributeFilter(self.c_layer, null_mut());
}
Expand Down