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

LibGfx: Rename EMatrix to EMatrix3x3 in ICC code

Browse source 
There will be an EMatrix3x4 in a future change.
This commit is contained in:
Nico Weber 2023-01-28 21:40:49 -05:00 • committed by Linus Groh
parent f63ec8de68
commit 1329799d20
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Libraries/LibGfx/ICC/TagTypes.cpp
View file

@ -97,7 +97,7 @@ ErrorOr<NonnullRefPtr<Lut16TagData>> Lut16TagData::from_bytes(ReadonlyBytes byte
u16 number_of_output_table_entries = *bit_cast<BigEndian<u16> const*>(bytes.data() + 8 + sizeof(LUTHeader) + 2); u16 number_of_output_table_entries = *bit_cast<BigEndian<u16> const*>(bytes.data() + 8 + sizeof(LUTHeader) + 2);
ReadonlyBytes table_bytes = bytes.slice(8 + sizeof(LUTHeader) + 4); ReadonlyBytes table_bytes = bytes.slice(8 + sizeof(LUTHeader) + 4);
EMatrix e; EMatrix3x3 e;
for (int i = 0; i < 9; ++i) for (int i = 0; i < 9; ++i)
e.e[i] = S15Fixed16::create_raw(header.e_parameters[i]); e.e[i] = S15Fixed16::create_raw(header.e_parameters[i]);
@ -150,7 +150,7 @@ ErrorOr<NonnullRefPtr<Lut8TagData>> Lut8TagData::from_bytes(ReadonlyBytes bytes,
u16 number_of_output_table_entries = 256; u16 number_of_output_table_entries = 256;
ReadonlyBytes table_bytes = bytes.slice(8 + sizeof(LUTHeader)); ReadonlyBytes table_bytes = bytes.slice(8 + sizeof(LUTHeader));
EMatrix e; EMatrix3x3 e;
for (int i = 0; i < 9; ++i) for (int i = 0; i < 9; ++i)
e.e[i] = S15Fixed16::create_raw(header.e_parameters[i]); e.e[i] = S15Fixed16::create_raw(header.e_parameters[i]);

14
Userland/Libraries/LibGfx/ICC/TagTypes.h
View file

@ -86,7 +86,7 @@ private:
Vector<u16> m_values; Vector<u16> m_values;
}; };
struct EMatrix { struct EMatrix3x3 {
S15Fixed16 e[9]; S15Fixed16 e[9];
S15Fixed16 const& operator[](int i) const S15Fixed16 const& operator[](int i) const
@ -103,7 +103,7 @@ public:
static ErrorOr<NonnullRefPtr<Lut16TagData>> from_bytes(ReadonlyBytes, u32 offset, u32 size); static ErrorOr<NonnullRefPtr<Lut16TagData>> from_bytes(ReadonlyBytes, u32 offset, u32 size);
Lut16TagData(u32 offset, u32 size, EMatrix e, Lut16TagData(u32 offset, u32 size, EMatrix3x3 e,
u8 number_of_input_channels, u8 number_of_output_channels, u8 number_of_clut_grid_points, u8 number_of_input_channels, u8 number_of_output_channels, u8 number_of_clut_grid_points,
u16 number_of_input_table_entries, u16 number_of_output_table_entries, u16 number_of_input_table_entries, u16 number_of_output_table_entries,
Vector<u16> input_tables, Vector<u16> clut_values, Vector<u16> output_tables) Vector<u16> input_tables, Vector<u16> clut_values, Vector<u16> output_tables)
@ -122,7 +122,7 @@ public:
VERIFY(m_output_tables.size() == number_of_output_channels * number_of_output_table_entries); VERIFY(m_output_tables.size() == number_of_output_channels * number_of_output_table_entries);
} }
EMatrix const& e_matrix() const { return m_e; } EMatrix3x3 const& e_matrix() const { return m_e; }
u8 number_of_input_channels() const { return m_number_of_input_channels; } u8 number_of_input_channels() const { return m_number_of_input_channels; }
u8 number_of_output_channels() const { return m_number_of_output_channels; } u8 number_of_output_channels() const { return m_number_of_output_channels; }
@ -136,7 +136,7 @@ public:
Vector<u16> const& output_tables() const { return m_output_tables; } Vector<u16> const& output_tables() const { return m_output_tables; }
private: private:
EMatrix m_e; EMatrix3x3 m_e;
u8 m_number_of_input_channels; u8 m_number_of_input_channels;
u8 m_number_of_output_channels; u8 m_number_of_output_channels;
@ -157,7 +157,7 @@ public:
static ErrorOr<NonnullRefPtr<Lut8TagData>> from_bytes(ReadonlyBytes, u32 offset, u32 size); static ErrorOr<NonnullRefPtr<Lut8TagData>> from_bytes(ReadonlyBytes, u32 offset, u32 size);
Lut8TagData(u32 offset, u32 size, EMatrix e, Lut8TagData(u32 offset, u32 size, EMatrix3x3 e,
u8 number_of_input_channels, u8 number_of_output_channels, u8 number_of_clut_grid_points, u8 number_of_input_channels, u8 number_of_output_channels, u8 number_of_clut_grid_points,
u16 number_of_input_table_entries, u16 number_of_output_table_entries, u16 number_of_input_table_entries, u16 number_of_output_table_entries,
Vector<u8> input_tables, Vector<u8> clut_values, Vector<u8> output_tables) Vector<u8> input_tables, Vector<u8> clut_values, Vector<u8> output_tables)
@ -176,7 +176,7 @@ public:
VERIFY(m_output_tables.size() == number_of_output_channels * number_of_output_table_entries); VERIFY(m_output_tables.size() == number_of_output_channels * number_of_output_table_entries);
} }
EMatrix const& e_matrix() const { return m_e; } EMatrix3x3 const& e_matrix() const { return m_e; }
u8 number_of_input_channels() const { return m_number_of_input_channels; } u8 number_of_input_channels() const { return m_number_of_input_channels; }
u8 number_of_output_channels() const { return m_number_of_output_channels; } u8 number_of_output_channels() const { return m_number_of_output_channels; }
@ -190,7 +190,7 @@ public:
Vector<u8> const& output_tables() const { return m_output_tables; } Vector<u8> const& output_tables() const { return m_output_tables; }
private: private:
EMatrix m_e; EMatrix3x3 m_e;
u8 m_number_of_input_channels; u8 m_number_of_input_channels;
u8 m_number_of_output_channels; u8 m_number_of_output_channels;