Skip to content

Fixes non-contiguous array resize #103

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

Open
broderio wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixes non-contiguous array resize #103

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
10 changes: 4 additions & 6 deletions include/record3d/Record3DStream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include <stdint.h>
#include <functional>
#include <string.h>
#include <iostream>

#ifdef PYTHON_BINDINGS_BUILD
#include <pybind11/pybind11.h>
Expand Down Expand Up @@ -162,12 +163,11 @@ namespace Record3D
size_t currentFrameHeight = currentFrameDepthHeight_;

size_t bufferSize = currentFrameWidth * currentFrameHeight * sizeof(float);
auto result = py::array_t<float>(currentFrameWidth * currentFrameHeight);
auto result = py::array_t<float>({static_cast<int>(currentFrameHeight), static_cast<int>(currentFrameWidth)});
auto result_buffer = result.request();
float *result_ptr = (float *) result_buffer.ptr;

std::memcpy(result_ptr, depthImageBuffer_.data(), bufferSize);
result.resize(std::vector<int>{static_cast<int>(currentFrameHeight), static_cast<int>(currentFrameWidth)});

return result;
}
Expand All @@ -183,12 +183,11 @@ namespace Record3D
size_t currentFrameHeight = currentFrameConfidenceHeight_;

size_t bufferSize = currentFrameWidth * currentFrameHeight * sizeof(uint8_t);
auto result = py::array_t<uint8_t>(currentFrameWidth * currentFrameHeight);
auto result = py::array_t<uint8_t>({static_cast<int>(currentFrameHeight), static_cast<int>(currentFrameWidth)});
auto result_buffer = result.request();
uint8_t *result_ptr = (uint8_t *) result_buffer.ptr;

std::memcpy(result_ptr, confidenceImageBuffer_.data(), bufferSize);
result.resize(std::vector<int>{static_cast<int>(currentFrameHeight), static_cast<int>(currentFrameWidth)});

return result;
}
Expand Down Expand Up @@ -222,12 +221,11 @@ namespace Record3D

constexpr int numChannels = 3;
size_t bufferSize = currentFrameWidth * currentFrameHeight * numChannels * sizeof(uint8_t);
auto result = py::array_t<uint8_t>(bufferSize);
auto result = py::array_t<uint8_t>({static_cast<int>(currentFrameHeight), static_cast<int>(currentFrameWidth), numChannels});
auto result_buffer = result.request();
uint8_t *result_ptr = (uint8_t *) result_buffer.ptr;

std::memcpy(result_ptr, RGBImageBuffer_.data(), bufferSize);
result.resize(std::vector<int>{static_cast<int>(currentFrameHeight), static_cast<int>(currentFrameWidth), numChannels});

return result;
}
Expand Down