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

LibPDF: Rename ColorSpaceFamily function to may_be_specified_directly()

Browse source 
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.
This commit is contained in:
Nico Weber 2023-10-20 11:11:03 -04:00 • committed by Andrew Kaster
parent 095a2a17ed
commit aea0e2f313
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Userland/Libraries/LibPDF/ColorSpace.cpp
View file

@ -14,16 +14,16 @@ namespace PDF {
RefPtr<Gfx::ICC::Profile> ICCBasedColorSpace::s_srgb_profile; RefPtr<Gfx::ICC::Profile> ICCBasedColorSpace::s_srgb_profile;
#define ENUMERATE(name, ever_needs_parameters) \ #define ENUMERATE(name, may_be_specified_directly) \
ColorSpaceFamily ColorSpaceFamily::name { #name, ever_needs_parameters }; ColorSpaceFamily ColorSpaceFamily::name { #name, may_be_specified_directly };
ENUMERATE_COLOR_SPACE_FAMILIES(ENUMERATE); ENUMERATE_COLOR_SPACE_FAMILIES(ENUMERATE);
#undef ENUMERATE #undef ENUMERATE
PDFErrorOr<ColorSpaceFamily> ColorSpaceFamily::get(DeprecatedFlyString const& family_name) PDFErrorOr<ColorSpaceFamily> ColorSpaceFamily::get(DeprecatedFlyString const& family_name)
{ {
#define ENUMERATE(f_name, ever_needs_parameters) \ #define ENUMERATE(f_name, may_be_specified_directly) \
if (family_name == f_name.name()) { \ if (family_name == f_name.name()) { \
return ColorSpaceFamily::f_name; \ return ColorSpaceFamily::f_name; \
} }
ENUMERATE_COLOR_SPACE_FAMILIES(ENUMERATE) ENUMERATE_COLOR_SPACE_FAMILIES(ENUMERATE)
#undef ENUMERATE #undef ENUMERATE

10
Userland/Libraries/LibPDF/ColorSpace.h
View file

@ -29,23 +29,23 @@ namespace PDF {
class ColorSpaceFamily { class ColorSpaceFamily {
public: public:
ColorSpaceFamily(DeprecatedFlyString name, bool never_needs_paramaters_p) ColorSpaceFamily(DeprecatedFlyString name, bool may_be_specified_directly)
: m_name(move(name)) : 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; } 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<ColorSpaceFamily> get(DeprecatedFlyString const&); static PDFErrorOr<ColorSpaceFamily> 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) ENUMERATE_COLOR_SPACE_FAMILIES(ENUMERATE)
#undef ENUMERATE #undef ENUMERATE
private: private:
DeprecatedFlyString m_name; DeprecatedFlyString m_name;
bool m_never_needs_parameters; bool m_may_be_specified_directly;
}; };
class ColorSpace : public RefCounted<ColorSpace> { class ColorSpace : public RefCounted<ColorSpace> {

2
Userland/Libraries/LibPDF/Renderer.cpp
View file

@ -958,7 +958,7 @@ PDFErrorOr<NonnullRefPtr<ColorSpace>> Renderer::get_color_space_from_resources(V
auto maybe_color_space_family = ColorSpaceFamily::get(color_space_name); auto maybe_color_space_family = ColorSpaceFamily::get(color_space_name);
if (!maybe_color_space_family.is_error()) { if (!maybe_color_space_family.is_error()) {
auto color_space_family = maybe_color_space_family.release_value(); 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); return ColorSpace::create(color_space_name);
} }
} }