Skip to content

fix: address compilation warnings #31

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

Merged
dancergraham merged 1 commit into from
Oct 27, 2024
Merged

fix: address compilation warnings #31

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
20 changes: 10 additions & 10 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::io::BufReader;

use ::e57::{CartesianCoordinate, E57Reader};
use ndarray::Ix2;
use numpy::PyArray;
use numpy::{PyArray, PyArrayMethods};
use pyo3::prelude::*;

#[pyclass]
Expand Down Expand Up @@ -81,24 +81,24 @@ unsafe fn read_points(py: Python<'_>, filepath: &str) -> PyResult<E57> {
let n_intensities = intensity_vec.len();
let mut e57 = E57 {
points: Py::from(
PyArray::from_vec(py, point_vec)
.reshape((nrows, 3))
PyArray::from_vec_bound(py, point_vec)
.reshape([nrows, 3])
.unwrap(),
),
color: Py::from(PyArray::new(py, (0, 3), false)),
intensity: Py::from(PyArray::new(py, (0, 1), false)),
color: Py::from(PyArray::new_bound(py, (0, 3), false)),
intensity: Py::from(PyArray::new_bound(py, (0, 1), false)),
};
if n_colors == n_points {
e57.color = Py::from(
PyArray::from_vec(py, color_vec)
.reshape((nrows, 3))
PyArray::from_vec_bound(py, color_vec)
.reshape([nrows, 3])
.unwrap(),
)
}
if n_intensities == n_points {
e57.intensity = Py::from(
PyArray::from_vec(py, intensity_vec)
.reshape((nrows, 1))
PyArray::from_vec_bound(py, intensity_vec)
.reshape([nrows, 1])
.unwrap(),
)
}
Expand All @@ -107,7 +107,7 @@ unsafe fn read_points(py: Python<'_>, filepath: &str) -> PyResult<E57> {

/// e57 pointcloud file reading.
#[pymodule]
fn e57(_py: Python<'_>, m: &PyModule) -> PyResult<()> {
fn e57(_py: Python<'_>, m: &Bound<'_, PyModule>) -> PyResult<()> {
m.add_class::<E57>()?;
m.add_function(wrap_pyfunction!(raw_xml, m)?)?;
m.add_function(wrap_pyfunction!(read_points, m)?)?;
Expand Down