RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 06:37:43 +00:00
Code Issues Activity Actions

image: Move profile conversion code into helper function

Browse source 
No behavior change.
This commit is contained in:
Nico Weber 2024-01-24 09:57:16 -05:00 • committed by Andreas Kling
parent 48a0fb1e8e
commit 0681df7f3b
1 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Userland/Utilities/image.cpp
View file

@ -60,6 +60,23 @@ static ErrorOr<void> do_strip_alpha(LoadedImage& image)
return {}; return {};
} }
static ErrorOr<OwnPtr<Core::MappedFile>> convert_image_profile(LoadedImage& image, StringView convert_color_profile_path, OwnPtr<Core::MappedFile> maybe_source_icc_file)
{
if (!image.icc_data.has_value())
return Error::from_string_view("No source color space embedded in image. Pass one with --assign-color-profile."sv);
auto source_icc_file = move(maybe_source_icc_file);
auto source_icc_data = image.icc_data.value();
auto icc_file = TRY(Core::MappedFile::map(convert_color_profile_path));
image.icc_data = icc_file->bytes();
auto source_profile = TRY(Gfx::ICC::Profile::try_load_from_externally_owned_memory(source_icc_data));
auto destination_profile = TRY(Gfx::ICC::Profile::try_load_from_externally_owned_memory(icc_file->bytes()));
TRY(destination_profile->convert_image(*image.bitmap, *source_profile));
return icc_file;
}
ErrorOr<int> serenity_main(Main::Arguments arguments) ErrorOr<int> serenity_main(Main::Arguments arguments)
{ {
Core::ArgsParser args_parser; Core::ArgsParser args_parser;
@ -121,19 +138,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
image.icc_data = icc_file->bytes(); image.icc_data = icc_file->bytes();
} }
if (!convert_color_profile_path.is_empty()) { if (!convert_color_profile_path.is_empty())
if (!image.icc_data.has_value()) icc_file = TRY(convert_image_profile(image, convert_color_profile_path, move(icc_file)));
return Error::from_string_view("No source color space embedded in image. Pass one with --assign-color-profile."sv);
auto source_icc_file = move(icc_file);
auto source_icc_data = image.icc_data.value();
icc_file = TRY(Core::MappedFile::map(convert_color_profile_path));
image.icc_data = icc_file->bytes();
auto source_profile = TRY(Gfx::ICC::Profile::try_load_from_externally_owned_memory(source_icc_data));
auto destination_profile = TRY(Gfx::ICC::Profile::try_load_from_externally_owned_memory(icc_file->bytes()));
TRY(destination_profile->convert_image(*image.bitmap, *source_profile));
}
if (strip_color_profile) if (strip_color_profile)
image.icc_data.clear(); image.icc_data.clear();