From aaf7a249c6b8e3f2386c7ed53bd98480e1948efa Mon Sep 17 00:00:00 2001 From: Bananymous Date: Mon, 17 Jun 2024 18:05:39 +0300 Subject: [PATCH] image: Add nicer error message if image could not be parsed --- userspace/image/main.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/userspace/image/main.cpp b/userspace/image/main.cpp index 219712cc..a44cf23e 100644 --- a/userspace/image/main.cpp +++ b/userspace/image/main.cpp @@ -88,8 +88,20 @@ int main(int argc, char** argv) return usage(argv[0], 1); } - auto image = MUST(LibImage::Image::load_from_file(argv[argc - 1])); - render_to_framebuffer(BAN::move(image), scale); + auto image_path = BAN::StringView(argv[argc - 1]); + + auto image_or_error = LibImage::Image::load_from_file(image_path); + if (image_or_error.is_error()) + { + fprintf(stderr, "Could not load image '%.*s': %s\n", + (int)image_path.size(), + image_path.data(), + strerror(image_or_error.error().get_error_code()) + ); + return 1; + } + + render_to_framebuffer(image_or_error.release_value(), scale); for (;;) sleep(1);