Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Utilities: Give imgcmp a --threshold flag #25672

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+15 −4
Open

Utilities: Give imgcmp a --threshold flag #25672

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3edc65
Utilities: Extract are_pixels_equal() helper in imgcmp
nico Jan 31, 2025
53e39b2
Utilities: Give imgcmp a --threshold flag
nico Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions Userland/Utilities/imgcmp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,15 @@ static ErrorOr<void> save_image(NonnullRefPtr<Gfx::Bitmap> bitmap, StringView ou
return Gfx::WebPWriter::encode(*buffered_stream, *bitmap);
}

static ErrorOr<NonnullRefPtr<Gfx::Bitmap>> make_diff_image(NonnullRefPtr<Gfx::Bitmap> first_image, NonnullRefPtr<Gfx::Bitmap> second_image)
static bool are_pixels_equal(Gfx::Color first_pixel, Gfx::Color second_pixel, int threshold)
{
return abs(first_pixel.red() - second_pixel.red()) <= threshold
&& abs(first_pixel.green() - second_pixel.green()) <= threshold
&& abs(first_pixel.blue() - second_pixel.blue()) <= threshold
&& abs(first_pixel.alpha() - second_pixel.alpha()) <= threshold;
}

static ErrorOr<NonnullRefPtr<Gfx::Bitmap>> make_diff_image(NonnullRefPtr<Gfx::Bitmap> first_image, NonnullRefPtr<Gfx::Bitmap> second_image, int threshold)
{
VERIFY(first_image->size() == second_image->size());

Expand All @@ -47,7 +55,7 @@ static ErrorOr<NonnullRefPtr<Gfx::Bitmap>> make_diff_image(NonnullRefPtr<Gfx::Bi
for (int x = 0; x < first_image->width(); ++x) {
auto first_pixel = first_image->get_pixel<Gfx::StorageFormat::BGRA8888>(x, y);
auto second_pixel = second_image->get_pixel<Gfx::StorageFormat::BGRA8888>(x, y);
if (first_pixel == second_pixel) {
if (are_pixels_equal(first_pixel, second_pixel, threshold)) {
diff_image->set_pixel(x, y, first_pixel.interpolate(Gfx::Color::White, 0.5f));
} else {
diff_image->set_pixel(x, y, Gfx::Color::Red);
Expand All @@ -65,6 +73,9 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
StringView write_diff_image_path;
args_parser.add_option(write_diff_image_path, "Write image that highlights differing pixels", "write-diff-image", {}, "FILE");

int threshold = 0;
args_parser.add_option(threshold, "Only consider pixels further apart than this (in any channel) as distinct (default: 0)", "threshold", {}, "THRESHOLD");

StringView first_image_path;
args_parser.add_positional_argument(first_image_path, "Path to first input image", "FILE1");

Expand All @@ -82,15 +93,15 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
}

if (!write_diff_image_path.is_empty()) {
auto diff_image = TRY(make_diff_image(*first_image, *second_image));
auto diff_image = TRY(make_diff_image(*first_image, *second_image, threshold));
TRY(save_image(diff_image, write_diff_image_path));
}

for (int y = 0; y < first_image->physical_height(); ++y) {
for (int x = 0; x < first_image->physical_width(); ++x) {
auto first_pixel = first_image->get_pixel(x, y);
auto second_pixel = second_image->get_pixel(x, y);
if (first_pixel != second_pixel) {
if (!are_pixels_equal(first_pixel, second_pixel, threshold)) {
warnln("different pixel at ({}, {}), {} vs {}", x, y, first_pixel, second_pixel);
return 1;
}
Expand Down