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

Jump to bottom

Handle dtypes like =d correctly. #44

Merged
merged 2 commits into from
May 5, 2024
Merged

Handle dtypes like =d correctly. #44

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e114381
Handle dtypes like =d correctly.
chpatrick Mar 31, 2023
9b82078
Add comments
dancergraham May 5, 2024
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
21 changes: 12 additions & 9 deletions src/pye57/libe57_wrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,7 @@ PYBIND11_MODULE(libe57, m) {
bool doScaling,
size_t stride=0) {
py::buffer_info info = np_array.request();
const std::string dtype = info.format;

if (info.ndim != 1)
throw std::runtime_error("Incompatible buffer dimension!");
Expand All @@ -274,24 +275,26 @@ PYBIND11_MODULE(libe57, m) {
new (&s) SourceDestBuffer(imf, pathName, static_cast<int8_t *>(info.ptr), capacity, doConversion, doScaling, (stride == 0) ? sizeof(int8_t) : stride);
else if (info.format == "B")
new (&s) SourceDestBuffer(imf, pathName, static_cast<uint8_t *>(info.ptr), capacity, doConversion, doScaling, (stride == 0) ? sizeof(uint8_t) : stride);
else if (info.format == "h")
// Handle fixed or native byte order from https://docs.python.org/3/library/struct.html
// Note - these may be platform dependent. Could they cause strange bugs on some platforms ?
else if (dtype == "h" || dtype == "=h")
new (&s) SourceDestBuffer(imf, pathName, static_cast<int16_t *>(info.ptr), capacity, doConversion, doScaling, (stride == 0) ? sizeof(int16_t) : stride);
else if (info.format == "H")
else if (dtype == "H" || dtype == "=H")
new (&s) SourceDestBuffer(imf, pathName, static_cast<uint16_t *>(info.ptr), capacity, doConversion, doScaling, (stride == 0) ? sizeof(uint16_t) : stride);
else if (info.format == "l")
else if (dtype == "l" || dtype == "=l")
new (&s) SourceDestBuffer(imf, pathName, static_cast<int32_t *>(info.ptr), capacity, doConversion, doScaling, (stride == 0) ? sizeof(int32_t) : stride);
else if (info.format == "L")
else if (dtype == "L" || dtype == "=L")
new (&s) SourceDestBuffer(imf, pathName, static_cast<uint32_t *>(info.ptr), capacity, doConversion, doScaling, (stride == 0) ? sizeof(uint32_t) : stride);
else if (info.format == "q")
else if (dtype == "q" || dtype == "=q")
new (&s) SourceDestBuffer(imf, pathName, static_cast<int64_t *>(info.ptr), capacity, doConversion, doScaling, (stride == 0) ? sizeof(int64_t) : stride);
else if (info.format == "?")
else if (dtype == "?")
new (&s) SourceDestBuffer(imf, pathName, static_cast<bool *>(info.ptr), capacity, doConversion, doScaling, (stride == 0) ? sizeof(bool) : stride);
else if (info.format == "f")
else if (dtype == "f" || dtype == "=f")
new (&s) SourceDestBuffer(imf, pathName, static_cast<float *>(info.ptr), capacity, doConversion, doScaling, (stride == 0) ? sizeof(float) : stride);
else if (info.format == "d")
else if (dtype == "d" || dtype == "=d")
new (&s) SourceDestBuffer(imf, pathName, static_cast<double *>(info.ptr), capacity, doConversion, doScaling, (stride == 0) ? sizeof(double) : stride);
else
throw py::value_error("Incompatible type (integers: bBhHlLq, bool: ?, floats: fd)");
throw py::value_error("Incompatible type (integers: bBhHlLq, bool: ?, floats: fd), got: " + dtype);
},
"destImageFile"_a, "pathName"_a, "b"_a, "capacity"_a, "doConversion"_a=false, "doScaling"_a=false, "stride"_a=0);
// cls_SourceDestBuffer.def(py::init<e57::ImageFile, const std::string, int8_t *, const size_t, bool, bool, size_t>(), "destImageFile"_a, "pathName"_a, "b"_a, "capacity"_a, "doConversion"_a=false, "doScaling"_a=false, "stride"_a=sizeof(int8_t));
Expand Down
Loading