diff options
author | liamwhite <liamwhite@users.noreply.github.com> | 2024-02-06 10:24:30 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-06 10:24:30 -0500 |
commit | d5fb9fd12cfd06503c61326e03359b43b73aefc2 (patch) | |
tree | 6c9b474100c03c9dcb82cdfab12d4f4ffc5fb855 /src/hid_core | |
parent | c79b3af6109d393717a38e6cf9c035f328f9751b (diff) | |
parent | 12b616285238361dd7fa51cb8b4c281c1dcaaeb4 (diff) |
Merge pull request #12933 from german77/irs-interface
service: irs: Migrate service to new interface
Diffstat (limited to 'src/hid_core')
-rw-r--r-- | src/hid_core/irsensor/image_transfer_processor.cpp | 5 | ||||
-rw-r--r-- | src/hid_core/irsensor/image_transfer_processor.h | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/hid_core/irsensor/image_transfer_processor.cpp b/src/hid_core/irsensor/image_transfer_processor.cpp index d6573f8dc..2b5a50ef6 100644 --- a/src/hid_core/irsensor/image_transfer_processor.cpp +++ b/src/hid_core/irsensor/image_transfer_processor.cpp @@ -145,9 +145,8 @@ void ImageTransferProcessor::SetTransferMemoryAddress(Common::ProcessAddress t_m } Core::IrSensor::ImageTransferProcessorState ImageTransferProcessor::GetState( - std::vector<u8>& data) const { - const auto size = GetDataSize(current_config.trimming_format); - data.resize(size); + std::span<u8> data) const { + const auto size = std::min(GetDataSize(current_config.trimming_format), data.size()); system.ApplicationMemory().ReadBlock(transfer_memory, data.data(), size); return processor_state; } diff --git a/src/hid_core/irsensor/image_transfer_processor.h b/src/hid_core/irsensor/image_transfer_processor.h index 4e0117084..df1c9d920 100644 --- a/src/hid_core/irsensor/image_transfer_processor.h +++ b/src/hid_core/irsensor/image_transfer_processor.h @@ -3,6 +3,8 @@ #pragma once +#include <span> + #include "common/typed_address.h" #include "hid_core/irsensor/irs_types.h" #include "hid_core/irsensor/processor_base.h" @@ -39,7 +41,7 @@ public: // Transfer memory where the image data will be stored void SetTransferMemoryAddress(Common::ProcessAddress t_mem); - Core::IrSensor::ImageTransferProcessorState GetState(std::vector<u8>& data) const; + Core::IrSensor::ImageTransferProcessorState GetState(std::span<u8> data) const; private: // This is nn::irsensor::ImageTransferProcessorConfig |