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

LibGfx: Let BMPWriter optionally embed an ICC profile

Browse source
This commit is contained in:
Nico Weber 2023-03-15 12:05:36 +01:00 • committed by Linus Groh
parent a93a88c73c
commit 6189994b24
2 changed files with 28 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Userland/Libraries/LibGfx/BMPWriter.cpp
View file

@ -83,6 +83,10 @@ ErrorOr<ByteBuffer> BMPWriter::dump(Bitmap const& bitmap, Options options)
{ {
Options::DibHeader dib_header = options.dib_header; Options::DibHeader dib_header = options.dib_header;
auto icc_data = options.icc_data;
if (icc_data.has_value() && dib_header < Options::DibHeader::V5)
return Error::from_string_literal("can only embed ICC profiles in v5+ bmps");
switch (dib_header) { switch (dib_header) {
case Options::DibHeader::Info: case Options::DibHeader::Info:
m_compression = Compression::BI_RGB; m_compression = Compression::BI_RGB;
@ -98,15 +102,20 @@ ErrorOr<ByteBuffer> BMPWriter::dump(Bitmap const& bitmap, Options options)
} }
const size_t file_header_size = 14; const size_t file_header_size = 14;
size_t pixel_data_offset = file_header_size + (u32)dib_header; size_t header_size = file_header_size + (u32)dib_header;
int pixel_row_data_size = (m_bytes_per_pixel * 8 * bitmap.width() + 31) / 32 * 4; int pixel_row_data_size = (m_bytes_per_pixel * 8 * bitmap.width() + 31) / 32 * 4;
int image_size = pixel_row_data_size * bitmap.height(); int image_size = pixel_row_data_size * bitmap.height();
auto buffer = TRY(ByteBuffer::create_uninitialized(pixel_data_offset)); auto buffer = TRY(ByteBuffer::create_uninitialized(header_size));
auto pixel_data = TRY(write_pixel_data(bitmap, pixel_row_data_size, m_bytes_per_pixel, m_include_alpha_channel)); auto pixel_data = TRY(write_pixel_data(bitmap, pixel_row_data_size, m_bytes_per_pixel, m_include_alpha_channel));
pixel_data = compress_pixel_data(move(pixel_data), m_compression); pixel_data = compress_pixel_data(move(pixel_data), m_compression);
size_t icc_profile_size = 0;
if (icc_data.has_value())
icc_profile_size = icc_data->size();
size_t pixel_data_offset = header_size + icc_profile_size;
size_t file_size = pixel_data_offset + pixel_data.size(); size_t file_size = pixel_data_offset + pixel_data.size();
OutputStreamer streamer(buffer.data()); OutputStreamer streamer(buffer.data());
streamer.write_u8('B'); streamer.write_u8('B');
@ -135,7 +144,10 @@ ErrorOr<ByteBuffer> BMPWriter::dump(Bitmap const& bitmap, Options options)
} }
if (dib_header >= Options::DibHeader::V4) { if (dib_header >= Options::DibHeader::V4) {
streamer.write_u32(0); // Colorspace if (icc_data.has_value())
streamer.write_u32(0x4D424544); // Colorspace EMBEDDED
else
streamer.write_u32(0); // Colorspace CALIBRATED_RGB
for (int i = 0; i < 12; i++) { for (int i = 0; i < 12; i++) {
streamer.write_u32(0); // Endpoints streamer.write_u32(0); // Endpoints
@ -144,11 +156,20 @@ ErrorOr<ByteBuffer> BMPWriter::dump(Bitmap const& bitmap, Options options)
if (dib_header >= Options::DibHeader::V5) { if (dib_header >= Options::DibHeader::V5) {
streamer.write_u32(4); // Rendering intent IMAGES / Perceptual. streamer.write_u32(4); // Rendering intent IMAGES / Perceptual.
streamer.write_u32(0); // Profile data
streamer.write_u32(0); // Profile size if (icc_data.has_value()) {
streamer.write_u32((u32)dib_header); // Profile data (relative to file_header_size)
streamer.write_u32(icc_data->size()); // Profile size
} else {
streamer.write_u32(0); // Profile data
streamer.write_u32(0); // Profile size
}
streamer.write_u32(0); // Reserved streamer.write_u32(0); // Reserved
} }
if (icc_data.has_value())
TRY(buffer.try_append(icc_data.value()));
TRY(buffer.try_append(pixel_data.data(), pixel_data.size())); TRY(buffer.try_append(pixel_data.data(), pixel_data.size()));
return buffer; return buffer;
} }

2
Userland/Libraries/LibGfx/BMPWriter.h
View file

@ -21,6 +21,8 @@ struct BMPWriterOptions {
V5 = 124, V5 = 124,
}; };
DibHeader dib_header = DibHeader::V5; DibHeader dib_header = DibHeader::V5;
Optional<ReadonlyBytes> icc_data;
}; };
class BMPWriter { class BMPWriter {