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

LibGfx+icc: Add profile connection space printing

Browse source 
This is a bit messy: The spec says that PCSXYZ and PCSLAB are the only
valid profile connection spaces -- except for DeviceLink profles, where
all data color spaces are valid.

So this uses the existing ColorSpace enum for profile connection spaces
instead of adding a dedicated enum, to not duplicate all the color space
parsing and printing code.  That matches what the spec does, too.
This saves about 100 lines of code, at the expense of less type
safety -- but further down the line we probably want to be able to
compare data color spaces and profile connection spaces, so the type
safety would likely get in the way then. (But if not, we can change
things around once we get to that point.)
This commit is contained in:
Nico Weber 2022-12-30 11:07:38 -05:00 • committed by Andreas Kling
parent 0b46e572b5
commit 47f29170b3
3 changed files with 51 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Userland/Libraries/LibGfx/ICCProfile.h
View file

@ -47,8 +47,10 @@ StringView device_class_name(DeviceClass);
// ICC v4, 7.2.6 Data colour space field, Table 19 — Data colour space signatures
enum class ColorSpace : u32 {
nCIEXYZ = 0x58595A20, // 'XYZ '
CIELAB = 0x4C616220, // 'Lab '
nCIEXYZ = 0x58595A20, // 'XYZ ', used in data color spaces.
PCSXYZ = nCIEXYZ, // Used in profile connection space instead.
CIELAB = 0x4C616220, // 'Lab ', used in data color spaces.
PCSLAB = CIELAB, // Used in profile connection space instead.
CIELUV = 0x4C757620, // 'Luv '
YCbCr = 0x59436272, // 'YCbr'
CIEYxy = 0x59787920, // 'Yxy '
@ -73,7 +75,8 @@ enum class ColorSpace : u32 {
FourteenColor = 0x45434C52, // 'ECLR'
FifteenColor = 0x46434C52, // 'FCLR'
};
StringView color_space_name(ColorSpace);
StringView data_color_space_name(ColorSpace);
StringView profile_connection_space_name(ColorSpace);
// ICC v4, 7.2.15 Rendering intent field
enum class RenderingIntent {
@ -119,6 +122,10 @@ public:
Version version() const { return m_version; }
DeviceClass device_class() const { return m_device_class; }
ColorSpace data_color_space() const { return m_data_color_space; }
// For non-DeviceLink profiles, always PCSXYZ or PCSLAB.
ColorSpace connection_space() const { return m_connection_space; }
time_t creation_timestamp() const { return m_creation_timestamp; }
Flags flags() const { return m_flags; }
RenderingIntent rendering_intent() const { return m_rendering_intent; }
@ -127,6 +134,7 @@ private:
Version m_version;
DeviceClass m_device_class;
ColorSpace m_data_color_space;
ColorSpace m_connection_space;
time_t m_creation_timestamp;
Flags m_flags;
RenderingIntent m_rendering_intent;