From 410d2514d5aed7d43b52422bb12c1855c17325aa Mon Sep 17 00:00:00 2001 From: Georg Hagen Date: Mon, 19 May 2025 23:14:32 +0200 Subject: [PATCH] Allow switch vector to span --- openVulkanoCpp/AR/ArRecorder.cpp | 5 +++-- openVulkanoCpp/IO/Archive/ArchiveWriter.cpp | 2 +- openVulkanoCpp/IO/Archive/ArchiveWriter.hpp | 2 +- openVulkanoCpp/IO/Archive/IArchiveWriter.hpp | 6 +++--- openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.cpp | 2 +- openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.hpp | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/openVulkanoCpp/AR/ArRecorder.cpp b/openVulkanoCpp/AR/ArRecorder.cpp index 8b6e693..bc93e86 100644 --- a/openVulkanoCpp/AR/ArRecorder.cpp +++ b/openVulkanoCpp/AR/ArRecorder.cpp @@ -18,6 +18,7 @@ #include "Image/ExifBuilder.hpp" #include "Image/XmpBuilder.hpp" #include "Image/JpegWithTagsWriter.hpp" +#include #include #include #if __has_include("turbojpeg.h") @@ -137,7 +138,7 @@ namespace OpenVulkano::AR colorWriter->AddFile(fileName.c_str(), outBuffer, size); if (jpgWriter) [[unlikely]] { - jpgWriter->WriteImageData({ outBuffer, size }, false); // Keep open, livetime is managed outside + jpgWriter->WriteImageData({ outBuffer, size }, false); // Keep open, lifetime is managed outside } } tjFree(outBuffer); @@ -150,7 +151,7 @@ namespace OpenVulkano::AR //BlockProfiler profile("Save AR Frame - Depth"); if (!depthWriter || !confWriter) return; auto depthImg = arFrame->GetDepthImage(); - std::vector> buffers(2); + std::array, 2> buffers; { // TODO handle alternative depth formats!!!! //BlockProfiler profile("Save AR Frame - Depth"); PfmHeader depthHeader(static_cast(depthImg.depth.resolution.x), static_cast(depthImg.depth.resolution.y), 5.0f, false); diff --git a/openVulkanoCpp/IO/Archive/ArchiveWriter.cpp b/openVulkanoCpp/IO/Archive/ArchiveWriter.cpp index 9d6bc4c..9c1d67a 100644 --- a/openVulkanoCpp/IO/Archive/ArchiveWriter.cpp +++ b/openVulkanoCpp/IO/Archive/ArchiveWriter.cpp @@ -118,7 +118,7 @@ namespace OpenVulkano return ok; } - bool ArchiveWriter::AddFile(const FileDescription& description, const std::vector>& buffers) + bool ArchiveWriter::AddFile(const FileDescription& description, const std::span>& buffers) { WriteHeader(description); for(const auto& buffer : buffers) diff --git a/openVulkanoCpp/IO/Archive/ArchiveWriter.hpp b/openVulkanoCpp/IO/Archive/ArchiveWriter.hpp index 7b201c4..601156e 100644 --- a/openVulkanoCpp/IO/Archive/ArchiveWriter.hpp +++ b/openVulkanoCpp/IO/Archive/ArchiveWriter.hpp @@ -48,7 +48,7 @@ namespace OpenVulkano [[nodiscard]] size_t GetTotalWrittenBytes() const { return m_bytesWritten; } bool AddFile(const FileDescription& description, const void* buffer) override; - bool AddFile(const FileDescription& description, const std::vector>& buffers) override; + bool AddFile(const FileDescription& description, const std::span>& buffers) override; bool AddFile(const char* fileName, const char* inArchiveName) override; [[nodiscard]] ArchiveOStream AddFileStream(const FileDescription& description) override; diff --git a/openVulkanoCpp/IO/Archive/IArchiveWriter.hpp b/openVulkanoCpp/IO/Archive/IArchiveWriter.hpp index 186537f..a2ac4c4 100644 --- a/openVulkanoCpp/IO/Archive/IArchiveWriter.hpp +++ b/openVulkanoCpp/IO/Archive/IArchiveWriter.hpp @@ -9,7 +9,7 @@ #include "ArchiveOStream.hpp" #include "IO/FileDescription.hpp" #include -#include +#include namespace OpenVulkano { @@ -24,7 +24,7 @@ namespace OpenVulkano virtual void SetShouldCompressFunction(const std::function& shouldComp) = 0; virtual bool AddFile(const FileDescription& description, const void* buffer) = 0; - virtual bool AddFile(const FileDescription& description, const std::vector>& buffers) = 0; + virtual bool AddFile(const FileDescription& description, const std::span>& buffers) = 0; virtual bool AddFile(const char* fileName, const char* inArchiveName) = 0; /** @@ -56,7 +56,7 @@ namespace OpenVulkano return AddFile(description, buffer); } - bool AddFile(const char* fileName, const std::vector>& buffers) + bool AddFile(const char* fileName, const std::span>& buffers) { size_t size = 0; for(const auto& buffer : buffers) diff --git a/openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.cpp b/openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.cpp index 9fd080e..011fe29 100644 --- a/openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.cpp +++ b/openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.cpp @@ -58,7 +58,7 @@ namespace OpenVulkano return m_writer->AddFile(description, buffer); } - bool MultiPartArchiveWriter::AddFile(const FileDescription& description, const std::vector>& buffers) + bool MultiPartArchiveWriter::AddFile(const FileDescription& description, const std::span>& buffers) { CheckSize(description.size); return m_writer->AddFile(description, buffers); diff --git a/openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.hpp b/openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.hpp index b837447..f6508d7 100644 --- a/openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.hpp +++ b/openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.hpp @@ -35,7 +35,7 @@ namespace OpenVulkano ~MultiPartArchiveWriter() override; bool AddFile(const FileDescription& description, const void* buffer) override; - bool AddFile(const FileDescription& description, const std::vector>& buffers) override; + bool AddFile(const FileDescription& description, const std::span>& buffers) override; [[deprecated]] bool AddFile(const char* fileName, const char* inArchiveName) override; using IArchiveWriter::AddFile; [[nodiscard]] virtual ArchiveOStream AddFileStream(const FileDescription& description) override;