From aea0e2f31396b726955354e48ae88f3f4990e854 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Fri, 20 Oct 2023 11:11:03 -0400 Subject: [PATCH] LibPDF: Rename ColorSpaceFamily function to may_be_specified_directly() It used to be called ColorSpaceFamily::never_needs_parameters(). But in the cpp file, the macro arg was called ever_needs_parameters, and the spec says "If the color space is one that can be specified by a name and no additional parameters (DeviceGray, DeviceRGB, DeviceCMYK, and certain cases of Pattern), the name may be specified directly." so let's use that language here. No behavior change. --- Userland/Libraries/LibPDF/ColorSpace.cpp | 10 +++++----- Userland/Libraries/LibPDF/ColorSpace.h | 10 +++++----- Userland/Libraries/LibPDF/Renderer.cpp | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Userland/Libraries/LibPDF/ColorSpace.cpp b/Userland/Libraries/LibPDF/ColorSpace.cpp index 2e2edd6e52..60ffff7d43 100644 --- a/Userland/Libraries/LibPDF/ColorSpace.cpp +++ b/Userland/Libraries/LibPDF/ColorSpace.cpp @@ -14,16 +14,16 @@ namespace PDF { RefPtr ICCBasedColorSpace::s_srgb_profile; -#define ENUMERATE(name, ever_needs_parameters) \ - ColorSpaceFamily ColorSpaceFamily::name { #name, ever_needs_parameters }; +#define ENUMERATE(name, may_be_specified_directly) \ + ColorSpaceFamily ColorSpaceFamily::name { #name, may_be_specified_directly }; ENUMERATE_COLOR_SPACE_FAMILIES(ENUMERATE); #undef ENUMERATE PDFErrorOr ColorSpaceFamily::get(DeprecatedFlyString const& family_name) { -#define ENUMERATE(f_name, ever_needs_parameters) \ - if (family_name == f_name.name()) { \ - return ColorSpaceFamily::f_name; \ +#define ENUMERATE(f_name, may_be_specified_directly) \ + if (family_name == f_name.name()) { \ + return ColorSpaceFamily::f_name; \ } ENUMERATE_COLOR_SPACE_FAMILIES(ENUMERATE) #undef ENUMERATE diff --git a/Userland/Libraries/LibPDF/ColorSpace.h b/Userland/Libraries/LibPDF/ColorSpace.h index 1e110bb474..5a01cc5beb 100644 --- a/Userland/Libraries/LibPDF/ColorSpace.h +++ b/Userland/Libraries/LibPDF/ColorSpace.h @@ -29,23 +29,23 @@ namespace PDF { class ColorSpaceFamily { public: - ColorSpaceFamily(DeprecatedFlyString name, bool never_needs_paramaters_p) + ColorSpaceFamily(DeprecatedFlyString name, bool may_be_specified_directly) : m_name(move(name)) - , m_never_needs_parameters(never_needs_paramaters_p) + , m_may_be_specified_directly(may_be_specified_directly) { } DeprecatedFlyString name() const { return m_name; } - bool never_needs_parameters() const { return m_never_needs_parameters; } + bool may_be_specified_directly() const { return m_may_be_specified_directly; } static PDFErrorOr get(DeprecatedFlyString const&); -#define ENUMERATE(name, ever_needs_parameters) static ColorSpaceFamily name; +#define ENUMERATE(name, may_be_specified_directly) static ColorSpaceFamily name; ENUMERATE_COLOR_SPACE_FAMILIES(ENUMERATE) #undef ENUMERATE private: DeprecatedFlyString m_name; - bool m_never_needs_parameters; + bool m_may_be_specified_directly; }; class ColorSpace : public RefCounted { diff --git a/Userland/Libraries/LibPDF/Renderer.cpp b/Userland/Libraries/LibPDF/Renderer.cpp index 4f12fa544a..df310f61c2 100644 --- a/Userland/Libraries/LibPDF/Renderer.cpp +++ b/Userland/Libraries/LibPDF/Renderer.cpp @@ -958,7 +958,7 @@ PDFErrorOr> Renderer::get_color_space_from_resources(V auto maybe_color_space_family = ColorSpaceFamily::get(color_space_name); if (!maybe_color_space_family.is_error()) { auto color_space_family = maybe_color_space_family.release_value(); - if (color_space_family.never_needs_parameters()) { + if (color_space_family.may_be_specified_directly()) { return ColorSpace::create(color_space_name); } }