From 8e5392f9c03df30162fbf45cb0ba39f8b586c527 Mon Sep 17 00:00:00 2001
From: Nico Weber <thakis@chromium.org>
Date: Fri, 17 Feb 2023 22:10:01 -0500
Subject: [PATCH] LibGfx: Move ICC MeasurementHeader to BinaryFormat.h

---
 Userland/Libraries/LibGfx/ICC/BinaryFormat.h | 10 ++++++++++
 Userland/Libraries/LibGfx/ICC/TagTypes.cpp   | 10 ----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Userland/Libraries/LibGfx/ICC/BinaryFormat.h b/Userland/Libraries/LibGfx/ICC/BinaryFormat.h
index f4a3bd3442..f78525412f 100644
--- a/Userland/Libraries/LibGfx/ICC/BinaryFormat.h
+++ b/Userland/Libraries/LibGfx/ICC/BinaryFormat.h
@@ -130,6 +130,16 @@ struct CLUTHeader {
 };
 static_assert(AssertSize<CLUTHeader, 20>());
 
+// Table 49 — measurementType structure
+struct MeasurementHeader {
+    BigEndian<MeasurementTagData::StandardObserver> standard_observer;
+    XYZNumber tristimulus_value_for_measurement_backing;
+    BigEndian<MeasurementTagData::MeasurementGeometry> measurement_geometry;
+    BigEndian<u16Fixed16Number> measurement_flare;
+    BigEndian<MeasurementTagData::StandardIlluminant> standard_illuminant;
+};
+static_assert(AssertSize<MeasurementHeader, 28>());
+
 // ICC v4, 10.15 multiLocalizedUnicodeType
 struct MultiLocalizedUnicodeRawRecord {
     BigEndian<u16> language_code;
diff --git a/Userland/Libraries/LibGfx/ICC/TagTypes.cpp b/Userland/Libraries/LibGfx/ICC/TagTypes.cpp
index 57d64bbe45..f8fb83dc6e 100644
--- a/Userland/Libraries/LibGfx/ICC/TagTypes.cpp
+++ b/Userland/Libraries/LibGfx/ICC/TagTypes.cpp
@@ -551,16 +551,6 @@ ErrorOr<NonnullRefPtr<MeasurementTagData>> MeasurementTagData::from_bytes(Readon
     VERIFY(tag_type(bytes) == Type);
     TRY(check_reserved(bytes));
 
-    // Table 49 — measurementType structure
-    struct MeasurementHeader {
-        BigEndian<StandardObserver> standard_observer;
-        XYZNumber tristimulus_value_for_measurement_backing;
-        BigEndian<MeasurementGeometry> measurement_geometry;
-        BigEndian<u16Fixed16Number> measurement_flare;
-        BigEndian<StandardIlluminant> standard_illuminant;
-    };
-    static_assert(AssertSize<MeasurementHeader, 28>());
-
     if (bytes.size() < 2 * sizeof(u32) + sizeof(MeasurementHeader))
         return Error::from_string_literal("ICC::Profile: measurementTag has not enough data");