mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 14:27:35 +00:00
LibGfx: Use ErrorOr<T> for Bitmap::try_load_from_file()
This was used in a lot of places, so this patch makes liberal use of ErrorOr<T>::release_value_but_fixme_should_propagate_errors().
This commit is contained in:
parent
16f064d9be
commit
235f39e449
104 changed files with 412 additions and 397 deletions
|
@ -250,7 +250,9 @@ bool GLContextWidget::load_file(Core::File& file, String const& filename)
|
|||
// Attempt to open the texture file from disk
|
||||
RefPtr<Gfx::Bitmap> texture_image;
|
||||
if (Core::File::exists(texture_path)) {
|
||||
texture_image = Gfx::Bitmap::try_load_from_file(texture_path);
|
||||
auto bitmap_or_error = Gfx::Bitmap::try_load_from_file(texture_path);
|
||||
if (!bitmap_or_error.is_error())
|
||||
texture_image = bitmap_or_error.release_value_but_fixme_should_propagate_errors();
|
||||
} else {
|
||||
auto result = FileSystemAccessClient::Client::the().request_file(window()->window_id(), builder.string_view(), Core::OpenMode::ReadOnly);
|
||||
|
||||
|
@ -258,7 +260,9 @@ bool GLContextWidget::load_file(Core::File& file, String const& filename)
|
|||
return false;
|
||||
}
|
||||
|
||||
texture_image = Gfx::Bitmap::try_load_from_fd_and_close(*result.fd, *result.chosen_file);
|
||||
auto bitmap_or_error = Gfx::Bitmap::try_load_from_fd_and_close(*result.fd, *result.chosen_file);
|
||||
if (!bitmap_or_error.is_error())
|
||||
texture_image = bitmap_or_error.release_value_but_fixme_should_propagate_errors();
|
||||
}
|
||||
|
||||
GLuint tex;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue