fergalmoran/ladybird
1
0
Fork 0
mirror of https://github.com/fergalmoran/ladybird.git synced 2025-12-22 09:19:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

LibGfx/PortableFormat: Make read_whitespace return an ErrorOr

Browse Source
This commit is contained in:
Lucas CHOLLET
2023-03-12 16:05:12 -04:00
committed by Andreas Kling
parent 74f893e9f4
commit bab2113ec1
3 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Userland/Libraries/LibGfx/ImageFormats/PortableImageLoaderCommon.h
View File

@@ -109,25 +109,29 @@ static bool read_magic_number(TContext& context, Streamer& streamer)
}
template<typename TContext>
static bool read_whitespace(TContext& context, Streamer& streamer)
static ErrorOr<void> read_whitespace(TContext& context, Streamer& streamer)
{
bool exist = false;
bool is_first_char = true;
u8 byte {};
while (streamer.read(byte)) {
if (byte == ' ' || byte == '\t' || byte == '\n' || byte == '\r') {
exist = true;
} else if (byte == '#') {
if (byte == '#') {
streamer.step_back();
if (read_comment(context, streamer).is_error())
return false;
} else {
streamer.step_back();
return exist;
TRY(read_comment(context, streamer));
continue;
}
if (byte != ' ' && byte != '\t' && byte != '\n' && byte != '\r') {
streamer.step_back();
if (is_first_char)
return Error::from_string_literal("Can't read whitespace from stream");
break;
}
if (is_first_char)
is_first_char = false;
}
return exist;
return {};
}
template<typename TContext>
@@ -212,13 +216,13 @@ static bool decode(TContext& context)
if (!read_magic_number(context, streamer))
return false;
if (!read_whitespace(context, streamer))
if (read_whitespace(context, streamer).is_error())
return false;
if (!read_width(context, streamer))
return false;
if (!read_whitespace(context, streamer))
if (read_whitespace(context, streamer).is_error())
return false;
if (!read_height(context, streamer))
@@ -229,14 +233,14 @@ static bool decode(TContext& context)
return false;
}
if (!read_whitespace(context, streamer))
if (read_whitespace(context, streamer).is_error())
return false;
if constexpr (requires { context.format_details.max_val; }) {
if (!read_max_val(context, streamer))
return false;
if (!read_whitespace(context, streamer))
if (read_whitespace(context, streamer).is_error())
return false;
}