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

LibGfx: Allow images to report that they are originally grayscale

Browse source 
...and implement it in JPEGLoader.

Since it's easy to get the grayscale data off a Bitmap, don't
add a grayscale_frame() accessor.
This commit is contained in:
Nico Weber 2024-01-07 22:18:18 -05:00 • committed by Andreas Kling
parent 239da5132d
commit d8ada20bae
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Userland/Libraries/LibGfx/ImageFormats/ImageDecoder.h
View file

@ -31,6 +31,7 @@ struct VectorImageFrameDescriptor {
enum class NaturalFrameFormat {
RGB,
Grayscale,
CMYK,
Vector,
};

6
Userland/Libraries/LibGfx/ImageFormats/JPEGLoader.cpp
View file

@ -2010,7 +2010,11 @@ NaturalFrameFormat JPEGImageDecoderPlugin::natural_frame_format() const
if (m_context->state == JPEGLoadingContext::State::Error)
return NaturalFrameFormat::RGB;
VERIFY(m_context->state >= JPEGLoadingContext::State::HeaderDecoded);
return m_context->components.size() == 4 ? NaturalFrameFormat::CMYK : NaturalFrameFormat::RGB;
if (m_context->components.size() == 1)
return NaturalFrameFormat::Grayscale;
if (m_context->components.size() == 4)
return NaturalFrameFormat::CMYK;
return NaturalFrameFormat::RGB;
}
ErrorOr<NonnullRefPtr<CMYKBitmap>> JPEGImageDecoderPlugin::cmyk_frame()