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

LibGfx/TIFF: Prefer a verbal form over a noun

Browse source
This commit is contained in:
Lucas CHOLLET 2024-01-09 23:08:52 -05:00 • committed by Andreas Kling
parent 800cb4eceb
commit 25c3f8cd8e
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Userland/Libraries/LibGfx/ImageFormats/TIFFLoader.cpp
View file

@ -43,7 +43,7 @@ public:
return {}; return {};
} }
ErrorOr<void> ensure_baseline_tags_correctness() const ErrorOr<void> ensure_baseline_tags_are_correct() const
{ {
if (m_metadata.strip_offsets()->size() != m_metadata.strip_byte_counts()->size()) if (m_metadata.strip_offsets()->size() != m_metadata.strip_byte_counts()->size())
return Error::from_string_literal("TIFFImageDecoderPlugin: StripsOffset and StripByteCount have different sizes"); return Error::from_string_literal("TIFFImageDecoderPlugin: StripsOffset and StripByteCount have different sizes");
@ -56,8 +56,8 @@ public:
ErrorOr<void> decode_frame() ErrorOr<void> decode_frame()
{ {
TRY(ensure_baseline_tags_presence(m_metadata)); TRY(ensure_baseline_tags_are_present(m_metadata));
TRY(ensure_baseline_tags_correctness()); TRY(ensure_baseline_tags_are_correct());
auto maybe_error = decode_frame_impl(); auto maybe_error = decode_frame_impl();
if (maybe_error.is_error()) { if (maybe_error.is_error()) {

6
Userland/Libraries/LibGfx/TIFFGenerator.py
View file

@ -135,7 +135,7 @@ HANDLE_TAG_SIGNATURE_TEMPLATE = ("ErrorOr<void> {namespace}handle_tag(Metadata&
HANDLE_TAG_SIGNATURE = HANDLE_TAG_SIGNATURE_TEMPLATE.format(namespace="") HANDLE_TAG_SIGNATURE = HANDLE_TAG_SIGNATURE_TEMPLATE.format(namespace="")
HANDLE_TAG_SIGNATURE_TIFF_NAMESPACE = HANDLE_TAG_SIGNATURE_TEMPLATE.format(namespace="TIFF::") HANDLE_TAG_SIGNATURE_TIFF_NAMESPACE = HANDLE_TAG_SIGNATURE_TEMPLATE.format(namespace="TIFF::")
ENSURE_BASELINE_TAG_PRESENCE = "ErrorOr<void> ensure_baseline_tags_presence(Metadata const& metadata)" ENSURE_BASELINE_TAG_PRESENCE = "ErrorOr<void> ensure_baseline_tags_are_present(Metadata const& metadata)"
LICENSE = R"""/* LICENSE = R"""/*
* Copyright (c) 2023, Lucas Chollet <lucas.chollet@serenityos.org> * Copyright (c) 2023, Lucas Chollet <lucas.chollet@serenityos.org>
@ -455,7 +455,7 @@ def generate_tag_handler_file(tags: List[Tag]) -> str:
name_for_enum_tag_value(static_cast<{tag.associated_enum.export_name()}>(v.get<u32>()))));""" name_for_enum_tag_value(static_cast<{tag.associated_enum.export_name()}>(v.get<u32>()))));"""
for tag in tags if tag.associated_enum]) for tag in tags if tag.associated_enum])
ensure_tag_presence = '\n'.join([fR""" if (!metadata.{pascal_case_to_snake_case(tag.name)}().has_value()) ensure_tags_are_present = '\n'.join([fR""" if (!metadata.{pascal_case_to_snake_case(tag.name)}().has_value())
return Error::from_string_literal("Unable to decode image, missing required tag {tag.name}."); return Error::from_string_literal("Unable to decode image, missing required tag {tag.name}.");
""" for tag in filter(lambda tag: tag.is_required, known_tags)]) """ for tag in filter(lambda tag: tag.is_required, known_tags)])
@ -494,7 +494,7 @@ static String value_formatter(u32 tag_id, Value const& v) {{
{ENSURE_BASELINE_TAG_PRESENCE} {ENSURE_BASELINE_TAG_PRESENCE}
{{ {{
{ensure_tag_presence} {ensure_tags_are_present}
return {{}}; return {{}};
}} }}