RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 08:07:34 +00:00
Code Issues Activity Actions

LibGfx: Extract a variable in ICC TextDescriptionTagData

Browse source
This commit is contained in:
Nico Weber 2023-02-05 09:14:08 -05:00 • committed by Andreas Kling
parent ed3420dc10
commit 1668d0da27
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Userland/Libraries/LibGfx/ICC/TagTypes.cpp
View file

@ -391,11 +391,12 @@ ErrorOr<NonnullRefPtr<TextDescriptionTagData>> TextDescriptionTagData::from_byte
// filled in as 0, with no data placed in the Unicode localizable profile description area. // filled in as 0, with no data placed in the Unicode localizable profile description area.
Optional<String> unicode_description; Optional<String> unicode_description;
if (unicode_description_length > 0) { if (unicode_description_length > 0) {
u16 last_code_point = (u16)(unicode_description_data[2 * (unicode_description_length - 1)] << 8) | (u16)unicode_description_data[2 * (unicode_description_length - 1) + 1]; u32 byte_size_without_nul = 2 * (unicode_description_length - 1);
u16 last_code_point = (u16)(unicode_description_data[byte_size_without_nul] << 8) | (u16)unicode_description_data[byte_size_without_nul + 1];
if (last_code_point != 0) if (last_code_point != 0)
return Error::from_string_literal("ICC::Profile: textDescriptionType Unicode description not \\0-terminated"); return Error::from_string_literal("ICC::Profile: textDescriptionType Unicode description not \\0-terminated");
StringView utf_16be_data { unicode_description_data, 2 * (unicode_description_length - 1) }; StringView utf_16be_data { unicode_description_data, byte_size_without_nul };
unicode_description = TRY(String::from_deprecated_string(TextCodec::decoder_for("utf-16be")->to_utf8(utf_16be_data))); unicode_description = TRY(String::from_deprecated_string(TextCodec::decoder_for("utf-16be")->to_utf8(utf_16be_data)));
} }