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

LibGfx/TIFF: Rename Metadata => ExifMetadata

Browse source 
I originally thought that this would be our global `Metadata` class, but
that won't happen so let's give it a less general name.
This commit is contained in:
Lucas CHOLLET 2023-12-28 17:47:58 -05:00 • committed by Andrew Kaster
parent b242fe20cc
commit f47666a93b
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -82,7 +82,7 @@ public:
return ExifOrientedBitmap::oriented_size({ *m_metadata.image_width(), *m_metadata.image_height() }, *m_metadata.orientation()); return ExifOrientedBitmap::oriented_size({ *m_metadata.image_width(), *m_metadata.image_height() }, *m_metadata.orientation());
} }
Metadata const& metadata() const ExifMetadata const& metadata() const
{ {
return m_metadata; return m_metadata;
} }
@ -518,7 +518,7 @@ private:
ByteOrder m_byte_order {}; ByteOrder m_byte_order {};
Optional<u32> m_next_ifd {}; Optional<u32> m_next_ifd {};
Metadata m_metadata {}; ExifMetadata m_metadata {};
}; };
} }

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

@ -140,12 +140,12 @@ known_tags: List[Tag] = [
Tag('34675', [TIFFType.Undefined], [], None, "ICCProfile"), Tag('34675', [TIFFType.Undefined], [], None, "ICCProfile"),
] ]
HANDLE_TAG_SIGNATURE_TEMPLATE = ("ErrorOr<void> {namespace}handle_tag(Metadata& metadata, u16 tag," HANDLE_TAG_SIGNATURE_TEMPLATE = ("ErrorOr<void> {namespace}handle_tag(ExifMetadata& metadata, u16 tag,"
" {namespace}Type type, u32 count, Vector<{namespace}Value>&& value)") " {namespace}Type type, u32 count, Vector<{namespace}Value>&& value)")
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_are_present(Metadata const& metadata)" ENSURE_BASELINE_TAG_PRESENCE = "ErrorOr<void> ensure_baseline_tags_are_present(ExifMetadata const& metadata)"
TIFF_TYPE_FROM_U16 = "ErrorOr<Type> tiff_type_from_u16(u16 type)" TIFF_TYPE_FROM_U16 = "ErrorOr<Type> tiff_type_from_u16(u16 type)"
SIZE_OF_TIFF_TYPE = "u8 size_of_type(Type type)" SIZE_OF_TIFF_TYPE = "u8 size_of_type(Type type)"
@ -210,7 +210,7 @@ def promote_type(t: TIFFType) -> TIFFType:
def tiff_type_to_cpp(t: TIFFType, with_promotion: bool = True) -> str: def tiff_type_to_cpp(t: TIFFType, with_promotion: bool = True) -> str:
# To simplify the code generator and the Metadata class API, all u16 are promoted to u32 # To simplify the code generator and the ExifMetadata class API, all u16 are promoted to u32
# Note that the Value<> type doesn't include u16 for this reason # Note that the Value<> type doesn't include u16 for this reason
if with_promotion: if with_promotion:
t = promote_type(t) t = promote_type(t)
@ -328,7 +328,7 @@ def generate_getter(tag: Tag) -> str:
def generate_metadata_class(tags: List[Tag]) -> str: def generate_metadata_class(tags: List[Tag]) -> str:
getters = '\n'.join([generate_getter(tag) for tag in tags]) getters = '\n'.join([generate_getter(tag) for tag in tags])
output = fR"""class Metadata {{ output = fR"""class ExifMetadata {{
public: public:
{getters} {getters}
private: private:
@ -357,7 +357,7 @@ def generate_metadata_file(tags: List[Tag]) -> str:
namespace Gfx {{ namespace Gfx {{
class Metadata; class ExifMetadata;
namespace TIFF {{ namespace TIFF {{