LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-18 16:57:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

LibGfx/JBIG2: Make get_pixel static constexpr

Browse Source 
...so it doesn't need to be captured.
This commit is contained in:
Nico Weber 2024-03-21 08:49:48 -04:00 committed by Andreas Kling
parent b45a4508c7
commit 828c640087
Notes: sideshowbarker 2024-07-17 01:10:58 +09:00 
Author: https://github.com/nico
Commit: https://github.com/SerenityOS/serenity/commit/828c640087
Pull-request: https://github.com/SerenityOS/serenity/pull/23695
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Userland/Libraries/LibGfx/ImageFormats/JBIG2Loader.cpp
View File

@ -912,14 +912,14 @@ static ErrorOr<NonnullOwnPtr<BitBuffer>> generic_region_decoding_procedure(Gener
auto result = TRY(BitBuffer::create(inputs.region_width, inputs.region_height));
auto get_pixel = [&inputs](NonnullOwnPtr<BitBuffer> const& buffer, int x, int y) -> bool {
if (x < 0 || x >= (int)inputs.region_width || y < 0)
static constexpr auto get_pixel = [](NonnullOwnPtr<BitBuffer> const& buffer, int x, int y) -> bool {
if (x < 0 || x >= (int)buffer->width() || y < 0)
return false;
return buffer->get_bit(x, y);
};
// Figure 3(a) – Template when GBTEMPLATE = 0 and EXTTEMPLATE = 0,
auto compute_context_0 = [&get_pixel](NonnullOwnPtr<BitBuffer> const& buffer, int x, int y) -> u16 {
constexpr auto compute_context_0 = [](NonnullOwnPtr<BitBuffer> const& buffer, int x, int y) -> u16 {
u16 result = 0;
for (int i = 0; i < 5; ++i)
result = (result << 1) | (u16)get_pixel(buffer, x - 2 + i, y - 2);
@ -931,7 +931,7 @@ static ErrorOr<NonnullOwnPtr<BitBuffer>> generic_region_decoding_procedure(Gener
};
// Figure 4 – Template when GBTEMPLATE = 1
auto compute_context_1 = [&get_pixel](NonnullOwnPtr<BitBuffer> const& buffer, int x, int y) -> u16 {
auto compute_context_1 = [](NonnullOwnPtr<BitBuffer> const& buffer, int x, int y) -> u16 {
u16 result = 0;
for (int i = 0; i < 4; ++i)
result = (result << 1) | (u16)get_pixel(buffer, x - 1 + i, y - 2);
@ -943,7 +943,7 @@ static ErrorOr<NonnullOwnPtr<BitBuffer>> generic_region_decoding_procedure(Gener
};
// Figure 5 – Template when GBTEMPLATE = 2
auto compute_context_2 = [&get_pixel](NonnullOwnPtr<BitBuffer> const& buffer, int x, int y) -> u16 {
auto compute_context_2 = [](NonnullOwnPtr<BitBuffer> const& buffer, int x, int y) -> u16 {
u16 result = 0;
for (int i = 0; i < 3; ++i)
result = (result << 1) | (u16)get_pixel(buffer, x - 1 + i, y - 2);
@ -955,7 +955,7 @@ static ErrorOr<NonnullOwnPtr<BitBuffer>> generic_region_decoding_procedure(Gener
};
// Figure 6 – Template when GBTEMPLATE = 3
auto compute_context_3 = [&get_pixel](NonnullOwnPtr<BitBuffer> const& buffer, int x, int y) -> u16 {
auto compute_context_3 = [](NonnullOwnPtr<BitBuffer> const& buffer, int x, int y) -> u16 {
u16 result = 0;
for (int i = 0; i < 6; ++i)
result = (result << 1) | (u16)get_pixel(buffer, x - 3 + i, y - 1);