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: For multi-output SampledFunctions, fix output colors

Browse source 
For N outputs, the outputs aren't stored in N independent planes.
Instead, N output values are stored right next to each other in
the stream data.
This commit is contained in:
Nico Weber 2023-11-10 22:00:36 +01:00 • committed by Andreas Kling
parent ec739460e0
commit a9ef65e64a
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Tests/LibPDF/TestPDF.cpp
View file

@ -131,7 +131,7 @@ TEST_CASE(sampled)
EXPECT_EQ(MUST(f1->evaluate(Vector<float> { 0.75f })), Vector<float> { 5.0f }); EXPECT_EQ(MUST(f1->evaluate(Vector<float> { 0.75f })), Vector<float> { 5.0f });
EXPECT_EQ(MUST(f1->evaluate(Vector<float> { 1.0f })), Vector<float> { 0.0f }); EXPECT_EQ(MUST(f1->evaluate(Vector<float> { 1.0f })), Vector<float> { 0.0f });
auto f2 = MUST(make_sampled_function(Vector<u8> { { 0, 255, 0, 255, 0, 255 } }, { 0.0f, 1.0f }, { 0.0f, 10.0f, 0.0f, 8.0f }, { 3 })); auto f2 = MUST(make_sampled_function(Vector<u8> { { 0, 255, 255, 0, 0, 255 } }, { 0.0f, 1.0f }, { 0.0f, 10.0f, 0.0f, 8.0f }, { 3 }));
EXPECT_EQ(MUST(f2->evaluate(Vector<float> { 0.0f })), (Vector<float> { 0.0f, 8.0f })); EXPECT_EQ(MUST(f2->evaluate(Vector<float> { 0.0f })), (Vector<float> { 0.0f, 8.0f }));
EXPECT_EQ(MUST(f2->evaluate(Vector<float> { 0.25f })), (Vector<float> { 5.0f, 4.0f })); EXPECT_EQ(MUST(f2->evaluate(Vector<float> { 0.25f })), (Vector<float> { 5.0f, 4.0f }));
EXPECT_EQ(MUST(f2->evaluate(Vector<float> { 0.5f })), (Vector<float> { 10.0f, 0.0f })); EXPECT_EQ(MUST(f2->evaluate(Vector<float> { 0.5f })), (Vector<float> { 10.0f, 0.0f }));

6
Userland/Libraries/LibPDF/Function.cpp
View file

@ -178,10 +178,10 @@ PDFErrorOr<ReadonlySpan<float>> SampledFunction::evaluate(ReadonlySpan<float> x)
else else
e0 = e1 - 1.0f; e0 = e1 - 1.0f;
} }
size_t plane_size = m_sizes[0]; size_t plane_size = m_range.size();
for (size_t i = 0; i < m_range.size(); ++i) { for (size_t i = 0; i < m_range.size(); ++i) {
float s0 = m_sample_data[(size_t)e0 + i * plane_size]; float s0 = m_sample_data[(size_t)e0 * plane_size + i];
float s1 = m_sample_data[(size_t)e1 + i * plane_size]; float s1 = m_sample_data[(size_t)e1 * plane_size + i];
float r0 = interpolate(ec, e0, e1, s0, s1); float r0 = interpolate(ec, e0, e1, s0, s1);
r0 = interpolate(r0, 0.0f, 255.0f, m_decode[i].lower, m_decode[i].upper); r0 = interpolate(r0, 0.0f, 255.0f, m_decode[i].lower, m_decode[i].upper);
m_outputs[i] = clamp(r0, m_range[i].lower, m_range[i].upper); m_outputs[i] = clamp(r0, m_range[i].lower, m_range[i].upper);