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

LibGfx: Move ICC::Profile::read_header() out of class

Browse source 
This one is slightly more involved: To make it nice, extract
all the Profile fields that belong to the header into a separate
struct.
This commit is contained in:
Nico Weber 2023-02-14 13:06:01 -05:00 • committed by Andreas Kling
parent 272e5321e3
commit db614b47dd
2 changed files with 59 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

70
Userland/Libraries/LibGfx/ICC/Profile.h
View file

@ -187,29 +187,48 @@ private:
u64 m_bits = 0;
};
struct ProfileHeader {
u32 on_disk_size { 0 };
Optional<PreferredCMMType> preferred_cmm_type;
Version version;
DeviceClass device_class {};
ColorSpace data_color_space {};
ColorSpace connection_space {};
time_t creation_timestamp { 0 };
Optional<PrimaryPlatform> primary_platform {};
Flags flags;
Optional<DeviceManufacturer> device_manufacturer;
Optional<DeviceModel> device_model;
DeviceAttributes device_attributes;
RenderingIntent rendering_intent {};
XYZ pcs_illuminant;
Optional<Creator> creator;
Optional<Crypto::Hash::MD5::DigestType> id;
};
class Profile : public RefCounted<Profile> {
public:
static ErrorOr<NonnullRefPtr<Profile>> try_load_from_externally_owned_memory(ReadonlyBytes);
Optional<PreferredCMMType> preferred_cmm_type() const { return m_preferred_cmm_type; }
Version version() const { return m_version; }
DeviceClass device_class() const { return m_device_class; }
ColorSpace data_color_space() const { return m_data_color_space; }
Optional<PreferredCMMType> preferred_cmm_type() const { return m_header.preferred_cmm_type; }
Version version() const { return m_header.version; }
DeviceClass device_class() const { return m_header.device_class; }
ColorSpace data_color_space() const { return m_header.data_color_space; }
// For non-DeviceLink profiles, always PCSXYZ or PCSLAB.
ColorSpace connection_space() const { return m_connection_space; }
ColorSpace connection_space() const { return m_header.connection_space; }
u32 on_disk_size() const { return m_on_disk_size; }
time_t creation_timestamp() const { return m_creation_timestamp; }
Optional<PrimaryPlatform> primary_platform() const { return m_primary_platform; }
Flags flags() const { return m_flags; }
Optional<DeviceManufacturer> device_manufacturer() const { return m_device_manufacturer; }
Optional<DeviceModel> device_model() const { return m_device_model; }
DeviceAttributes device_attributes() const { return m_device_attributes; }
RenderingIntent rendering_intent() const { return m_rendering_intent; }
XYZ const& pcs_illuminant() const { return m_pcs_illuminant; }
Optional<Creator> creator() const { return m_creator; }
Optional<Crypto::Hash::MD5::DigestType> const& id() const { return m_id; }
u32 on_disk_size() const { return m_header.on_disk_size; }
time_t creation_timestamp() const { return m_header.creation_timestamp; }
Optional<PrimaryPlatform> primary_platform() const { return m_header.primary_platform; }
Flags flags() const { return m_header.flags; }
Optional<DeviceManufacturer> device_manufacturer() const { return m_header.device_manufacturer; }
Optional<DeviceModel> device_model() const { return m_header.device_model; }
DeviceAttributes device_attributes() const { return m_header.device_attributes; }
RenderingIntent rendering_intent() const { return m_header.rendering_intent; }
XYZ const& pcs_illuminant() const { return m_header.pcs_illuminant; }
Optional<Creator> creator() const { return m_header.creator; }
Optional<Crypto::Hash::MD5::DigestType> const& id() const { return m_header.id; }
static Crypto::Hash::MD5::DigestType compute_id(ReadonlyBytes);
@ -225,27 +244,10 @@ public:
bool is_v4() const { return version().major_version() == 4; }
private:
ErrorOr<void> read_header(ReadonlyBytes);
ErrorOr<void> check_required_tags();
ErrorOr<void> check_tag_types();
u32 m_on_disk_size { 0 };
Optional<PreferredCMMType> m_preferred_cmm_type;
Version m_version;
DeviceClass m_device_class {};
ColorSpace m_data_color_space {};
ColorSpace m_connection_space {};
time_t m_creation_timestamp { 0 };
Optional<PrimaryPlatform> m_primary_platform {};
Flags m_flags;
Optional<DeviceManufacturer> m_device_manufacturer;
Optional<DeviceModel> m_device_model;
DeviceAttributes m_device_attributes;
RenderingIntent m_rendering_intent {};
XYZ m_pcs_illuminant;
Optional<Creator> m_creator;
Optional<Crypto::Hash::MD5::DigestType> m_id;
ProfileHeader m_header;
OrderedHashMap<TagSignature, NonnullRefPtr<TagData>> m_tag_table;
};