Tidy many stringy messes with std::format

1 files changed, 4 insertions, 2 deletions

diff --git a/gfx/image.cpp b/gfx/image.cpp
index fb86cb6..3b63054 100644
--- a/gfx/image.cpp
+++ b/gfx/image.cpp
@@ -1,5 +1,6 @@
 #include "image.h"
 #include <cstddef>
+#include <format>
 #include <stb/stb_image.h>
 #include <stdexcept>
 
@@ -13,7 +14,7 @@ Image::Image(const char * fileName, int flags) : width {}, height {}, numCompone
 	numComponents = static_cast<unsigned int>(nc);
 
 	if (!bytes) {
-		throw std::runtime_error {std::string {"Unable to load image: "} + fileName};
+		throw std::runtime_error {std::format("Unable to load image: {}", fileName)};
 	}
 
 	data = {bytes, static_cast<size_t>(width * height * numComponents)};
@@ -29,7 +30,8 @@ Image::Image(std::span<unsigned char> buffer, int flags)
 	numComponents = static_cast<unsigned int>(nc);
 
 	if (!bytes) {
-		throw std::runtime_error {"Unable to load image from memory buffer "};
+		throw std::runtime_error {std::format("Unable to load image from memory buffer @ {} ({} bytes)",
+				static_cast<void *>(buffer.data()), buffer.size_bytes())};
 	}
 
 	data = {bytes, static_cast<size_t>(width * height * numComponents)};