RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 06:17:35 +00:00
Code Issues Activity Actions

LibGfx/PortableFormat: Propagate errors from read_image_data()

Browse source
This commit is contained in:
Lucas CHOLLET 2023-03-12 22:55:47 -04:00 • committed by Andreas Kling
parent 2356b48f13
commit 7ec310384a
7 changed files with 30 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Userland/Libraries/LibGfx/ImageFormats/PGMLoader.cpp
View file

@ -25,7 +25,7 @@ static void set_adjusted_pixels(PGMLoadingContext& context, Vector<Gfx::Color> c
}
}
bool read_image_data(PGMLoadingContext& context)
ErrorOr<void> read_image_data(PGMLoadingContext& context)
{
auto& stream = *context.stream;
Vector<Gfx::Color> color_data;
@ -35,32 +35,24 @@ bool read_image_data(PGMLoadingContext& context)
if (context.type == PGMLoadingContext::Type::ASCII) {
for (u64 i = 0; i < context_size; ++i) {
auto number_or_error = read_number(stream);
if (number_or_error.is_error())
return false;
auto value = number_or_error.value();
auto value = TRY(read_number(stream));
if (read_whitespace(context).is_error())
return false;
TRY(read_whitespace(context));
color_data[i] = { (u8)value, (u8)value, (u8)value };
}
} else if (context.type == PGMLoadingContext::Type::RAWBITS) {
for (u64 i = 0; i < context_size; ++i) {
auto pixel_or_error = stream.read_value<u8>();
if (pixel_or_error.is_error())
return false;
auto const pixel = pixel_or_error.value();
auto const pixel = TRY(stream.read_value<u8>());
color_data[i] = { pixel, pixel, pixel };
}
}
if (!create_bitmap(context))
return false;
TRY(create_bitmap(context));
set_adjusted_pixels(context, color_data);
context.state = PGMLoadingContext::State::Bitmap;
return true;
return {};
}
}