From 5a80105555b3602cf4547654a3c9ac4d5af0c427 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sat, 3 May 2025 17:36:22 -0500 Subject: Common and VideoCommon: Change texture data from std::vector to Common::UniqueBuffer. --- Source/Core/InputCommon/ImageOperations.cpp | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'Source/Core/InputCommon/ImageOperations.cpp') diff --git a/Source/Core/InputCommon/ImageOperations.cpp b/Source/Core/InputCommon/ImageOperations.cpp index 04293c9183..907cb52b8d 100644 --- a/Source/Core/InputCommon/ImageOperations.cpp +++ b/Source/Core/InputCommon/ImageOperations.cpp @@ -5,12 +5,9 @@ #include #include -#include -#include #include #include -#include "Common/FileUtil.h" #include "Common/IOFile.h" #include "Common/Image.h" @@ -49,11 +46,11 @@ std::optional LoadImage(const std::string& path) { File::IOFile file; file.Open(path, "rb"); - std::vector buffer(file.GetSize()); + Common::UniqueBuffer buffer(file.GetSize()); file.ReadBytes(buffer.data(), file.GetSize()); ImagePixelData image; - std::vector data; + Common::UniqueBuffer data; if (!Common::LoadPNG(buffer, &data, &image.width, &image.height)) return std::nullopt; @@ -74,19 +71,20 @@ std::optional LoadImage(const std::string& path) bool WriteImage(const std::string& path, const ImagePixelData& image) { - std::vector buffer; - buffer.reserve(image.width * image.height * 4); + Common::UniqueBuffer buffer; + buffer.reset(image.width * image.height * 4); + std::size_t buffer_index = 0; for (u32 y = 0; y < image.height; ++y) { for (u32 x = 0; x < image.width; ++x) { const auto index = x + y * image.width; const auto pixel = image.pixels[index]; - buffer.push_back(pixel.r); - buffer.push_back(pixel.g); - buffer.push_back(pixel.b); - buffer.push_back(pixel.a); + buffer[buffer_index++] = pixel.r; + buffer[buffer_index++] = pixel.g; + buffer[buffer_index++] = pixel.b; + buffer[buffer_index++] = pixel.a; } } -- cgit v1.2.3