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

LibGfx/JBIG2: Implement decode_end_of_file()

Browse source
This commit is contained in:
Nico Weber 2024-03-11 09:27:11 -04:00 • committed by Andreas Kling
parent 323cacc593
commit e0af3ae8d9
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Userland/Libraries/LibGfx/ImageFormats/JBIG2Loader.cpp
View file

@ -561,9 +561,12 @@ static ErrorOr<void> decode_end_of_stripe(JBIG2LoadingContext&, SegmentData cons
return Error::from_string_literal("JBIG2ImageDecoderPlugin: Cannot decode end of stripe yet"); return Error::from_string_literal("JBIG2ImageDecoderPlugin: Cannot decode end of stripe yet");
} }
static ErrorOr<void> decode_end_of_file(JBIG2LoadingContext&, SegmentData const&) static ErrorOr<void> decode_end_of_file(JBIG2LoadingContext&, SegmentData const& segment)
{ {
return Error::from_string_literal("JBIG2ImageDecoderPlugin: Cannot decode end of file yet"); // 7.4.11 End of file segment syntax
if (segment.data.size() != 0)
return Error::from_string_literal("JBIG2ImageDecoderPlugin: End of file segment has non-zero size");
return {};
} }
static ErrorOr<void> decode_profiles(JBIG2LoadingContext&, SegmentData const&) static ErrorOr<void> decode_profiles(JBIG2LoadingContext&, SegmentData const&)
@ -649,7 +652,9 @@ static ErrorOr<void> decode_data(JBIG2LoadingContext& context)
{ {
TRY(warn_about_multiple_pages(context)); TRY(warn_about_multiple_pages(context));
for (auto const& segment : context.segments) { for (size_t i = 0; i < context.segments.size(); ++i) {
auto const& segment = context.segments[i];
if (segment.header.page_association != 0 && segment.header.page_association != 1) if (segment.header.page_association != 0 && segment.header.page_association != 1)
continue; continue;
@ -707,6 +712,9 @@ static ErrorOr<void> decode_data(JBIG2LoadingContext& context)
break; break;
case SegmentType::EndOfFile: case SegmentType::EndOfFile:
TRY(decode_end_of_file(context, segment)); TRY(decode_end_of_file(context, segment));
// "If a file contains an end of file segment, it must be the last segment."
if (i != context.segments.size() - 1)
return Error::from_string_literal("JBIG2ImageDecoderPlugin: End of file segment not last segment");
break; break;
case SegmentType::Profiles: case SegmentType::Profiles:
TRY(decode_profiles(context, segment)); TRY(decode_profiles(context, segment));