RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 08:58:11 +00:00
Code Issues Activity Actions

image: Remove "do_" prefix on two function names

Browse source 
These were here due to the prefix-less name conflicting with a local
bool, but now that options are in a struct that's no longer a problem.

No behavior change.
This commit is contained in:
Nico Weber 2024-02-01 21:40:14 -05:00 • committed by Andreas Kling
parent d575d4fb9b
commit eeb0d6f52b
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Userland/Utilities/image.cpp
View file

@ -42,7 +42,7 @@ static ErrorOr<LoadedImage> load_image(RefPtr<Gfx::ImageDecoder> const& decoder,
return LoadedImage { internal_format, move(bitmap), TRY(decoder->icc_data()) }; return LoadedImage { internal_format, move(bitmap), TRY(decoder->icc_data()) };
} }
static ErrorOr<void> do_move_alpha_to_rgb(LoadedImage& image) static ErrorOr<void> move_alpha_to_rgb(LoadedImage& image)
{ {
if (!image.bitmap.has<RefPtr<Gfx::Bitmap>>()) if (!image.bitmap.has<RefPtr<Gfx::Bitmap>>())
return Error::from_string_view("Can't --move-alpha-to-rgb with CMYK bitmaps"sv); return Error::from_string_view("Can't --move-alpha-to-rgb with CMYK bitmaps"sv);
@ -67,7 +67,7 @@ static ErrorOr<void> do_move_alpha_to_rgb(LoadedImage& image)
return {}; return {};
} }
static ErrorOr<void> do_strip_alpha(LoadedImage& image) static ErrorOr<void> strip_alpha(LoadedImage& image)
{ {
if (!image.bitmap.has<RefPtr<Gfx::Bitmap>>()) if (!image.bitmap.has<RefPtr<Gfx::Bitmap>>())
return Error::from_string_view("Can't --strip-alpha with CMYK bitmaps"sv); return Error::from_string_view("Can't --strip-alpha with CMYK bitmaps"sv);
@ -207,7 +207,7 @@ static ErrorOr<Options> parse_options(Main::Arguments arguments)
ErrorOr<int> serenity_main(Main::Arguments arguments) ErrorOr<int> serenity_main(Main::Arguments arguments)
{ {
Options options = TRY(parse_options(move(arguments))); Options options = TRY(parse_options(arguments));
auto file = TRY(Core::MappedFile::map(options.in_path)); auto file = TRY(Core::MappedFile::map(options.in_path));
auto decoder = Gfx::ImageDecoder::try_create_for_raw_bytes(file->bytes()); auto decoder = Gfx::ImageDecoder::try_create_for_raw_bytes(file->bytes());
@ -217,10 +217,10 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
LoadedImage image = TRY(load_image(*decoder, options.frame_index)); LoadedImage image = TRY(load_image(*decoder, options.frame_index));
if (options.move_alpha_to_rgb) if (options.move_alpha_to_rgb)
TRY(do_move_alpha_to_rgb(image)); TRY(move_alpha_to_rgb(image));
if (options.strip_alpha) if (options.strip_alpha)
TRY(do_strip_alpha(image)); TRY(strip_alpha(image));
OwnPtr<Core::MappedFile> icc_file; OwnPtr<Core::MappedFile> icc_file;
if (!options.assign_color_profile_path.is_empty()) { if (!options.assign_color_profile_path.is_empty()) {