mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-09-19 15:58:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibGfx/JBIG2: Have just one CombinationOperator enum class

Browse source 
We already had two, and we would need another one for text segments.

No behavior change.
This commit is contained in:
Nico Weber 2024-03-20 19:00:07 -04:00 • committed by Tim Flynn
commit 376b1a2309
Notes: sideshowbarker 2024-07-17 05:02:35 +09:00
1 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -440,11 +440,15 @@ enum class CombinationOperator {
And = 1, And = 1,
Xor = 2, Xor = 2,
XNor = 3, XNor = 3,
Replace = 4,
}; };
struct Page { struct Page {
IntSize size; IntSize size;
// This is never CombinationOperator::Replace for Pages.
CombinationOperator default_combination_operator { CombinationOperator::Or }; CombinationOperator default_combination_operator { CombinationOperator::Or };
OwnPtr<BitBuffer> bits; OwnPtr<BitBuffer> bits;
}; };
@ -656,15 +660,6 @@ struct [[gnu::packed]] RegionSegmentInformationField {
BigEndian<u32> y_location; BigEndian<u32> y_location;
u8 flags; u8 flags;
// FIXME: Or have just ::CombinationOperator represent both page and segment operators?
enum class CombinationOperator {
Or = 0,
And = 1,
Xor = 2,
XNor = 3,
Replace = 4,
};
CombinationOperator external_combination_operator() const CombinationOperator external_combination_operator() const
{ {
VERIFY((flags & 0x7) <= 4); VERIFY((flags & 0x7) <= 4);
@ -690,7 +685,7 @@ static ErrorOr<RegionSegmentInformationField> decode_region_segment_information_
return Error::from_string_literal("JBIG2ImageDecoderPlugin: Invalid region segment information field operator"); return Error::from_string_literal("JBIG2ImageDecoderPlugin: Invalid region segment information field operator");
// NOTE 3 – If the colour extension flag (COLEXTFLAG) is equal to 1, the external combination operator must be REPLACE. // NOTE 3 – If the colour extension flag (COLEXTFLAG) is equal to 1, the external combination operator must be REPLACE.
if (result.is_color_bitmap() && result.external_combination_operator() != RegionSegmentInformationField::CombinationOperator::Replace) if (result.is_color_bitmap() && result.external_combination_operator() != CombinationOperator::Replace)
return Error::from_string_literal("JBIG2ImageDecoderPlugin: Invalid colored region segment information field operator"); return Error::from_string_literal("JBIG2ImageDecoderPlugin: Invalid colored region segment information field operator");
return result; return result;
@ -996,9 +991,9 @@ static ErrorOr<void> decode_immediate_generic_region(JBIG2LoadingContext& contex
|| information_field.y_location + information_field.height > (u32)context.page.size.height()) { || information_field.y_location + information_field.height > (u32)context.page.size.height()) {
return Error::from_string_literal("JBIG2ImageDecoderPlugin: Region bounds outsize of page bounds"); return Error::from_string_literal("JBIG2ImageDecoderPlugin: Region bounds outsize of page bounds");
} }
if (information_field.external_combination_operator() != RegionSegmentInformationField::CombinationOperator::Or if (information_field.external_combination_operator() != CombinationOperator::Or
&& information_field.external_combination_operator() != RegionSegmentInformationField::CombinationOperator::Xor && information_field.external_combination_operator() != CombinationOperator::Xor
&& information_field.external_combination_operator() != RegionSegmentInformationField::CombinationOperator::Replace) && information_field.external_combination_operator() != CombinationOperator::Replace)
return Error::from_string_literal("JBIG2ImageDecoderPlugin: Cannot handle external combination operator other than OR, XOR, and REPLACE yet"); return Error::from_string_literal("JBIG2ImageDecoderPlugin: Cannot handle external combination operator other than OR, XOR, and REPLACE yet");
for (size_t y = 0; y < information_field.height; ++y) { for (size_t y = 0; y < information_field.height; ++y) {