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

LibGfx: Remove use of ByteBuffer::wrap() in PNG decoder

Browse source
This commit is contained in:
Andreas Kling 2020-12-19 12:00:17 +01:00
parent 0e4ecca336
commit 8cf6b75dd9
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Libraries/LibGfx/PNGLoader.cpp
View file

@ -62,7 +62,7 @@ static_assert(sizeof(PNG_IHDR) == 13);
struct Scanline { struct Scanline {
u8 filter { 0 }; u8 filter { 0 };
ByteBuffer data {}; ReadonlyBytes data {};
}; };
struct [[gnu::packed]] PaletteEntry struct [[gnu::packed]] PaletteEntry
@ -162,11 +162,11 @@ public:
return true; return true;
} }
bool wrap_bytes(ByteBuffer& buffer, size_t count) bool wrap_bytes(ReadonlyBytes& buffer, size_t count)
{ {
if (m_size_remaining < count) if (m_size_remaining < count)
return false; return false;
buffer = ByteBuffer::wrap(const_cast<u8*>(m_data_ptr), count); buffer = ReadonlyBytes { m_data_ptr, count };
m_data_ptr += count; m_data_ptr += count;
m_size_remaining -= count; m_size_remaining -= count;
return true; return true;
@ -368,7 +368,7 @@ NEVER_INLINE FLATTEN static void unfilter(PNGLoadingContext& context)
auto pixels_per_byte = 8 / context.bit_depth; auto pixels_per_byte = 8 / context.bit_depth;
auto mask = (1 << context.bit_depth) - 1; auto mask = (1 << context.bit_depth) - 1;
for (int y = 0; y < context.height; ++y) { for (int y = 0; y < context.height; ++y) {
auto* gray_values = (u8*)context.scanlines[y].data.data(); auto* gray_values = context.scanlines[y].data.data();
for (int x = 0; x < context.width; ++x) { for (int x = 0; x < context.width; ++x) {
auto bit_offset = (8 - context.bit_depth) - (context.bit_depth * (x % pixels_per_byte)); auto bit_offset = (8 - context.bit_depth) - (context.bit_depth * (x % pixels_per_byte));
auto value = (gray_values[x / pixels_per_byte] >> bit_offset) & mask; auto value = (gray_values[x / pixels_per_byte] >> bit_offset) & mask;
@ -424,7 +424,7 @@ NEVER_INLINE FLATTEN static void unfilter(PNGLoadingContext& context)
case 3: case 3:
if (context.bit_depth == 8) { if (context.bit_depth == 8) {
for (int y = 0; y < context.height; ++y) { for (int y = 0; y < context.height; ++y) {
auto* palette_index = (u8*)context.scanlines[y].data.data(); auto* palette_index = context.scanlines[y].data.data();
for (int i = 0; i < context.width; ++i) { for (int i = 0; i < context.width; ++i) {
auto& pixel = (Pixel&)context.bitmap->scanline(y)[i]; auto& pixel = (Pixel&)context.bitmap->scanline(y)[i];
auto& color = context.palette_data.at((int)palette_index[i]); auto& color = context.palette_data.at((int)palette_index[i]);
@ -441,7 +441,7 @@ NEVER_INLINE FLATTEN static void unfilter(PNGLoadingContext& context)
auto pixels_per_byte = 8 / context.bit_depth; auto pixels_per_byte = 8 / context.bit_depth;
auto mask = (1 << context.bit_depth) - 1; auto mask = (1 << context.bit_depth) - 1;
for (int y = 0; y < context.height; ++y) { for (int y = 0; y < context.height; ++y) {
auto* palette_indexes = (u8*)context.scanlines[y].data.data(); auto* palette_indexes = context.scanlines[y].data.data();
for (int i = 0; i < context.width; ++i) { for (int i = 0; i < context.width; ++i) {
auto bit_offset = (8 - context.bit_depth) - (context.bit_depth * (i % pixels_per_byte)); auto bit_offset = (8 - context.bit_depth) - (context.bit_depth * (i % pixels_per_byte));
auto palette_index = (palette_indexes[i / pixels_per_byte] >> bit_offset) & mask; auto palette_index = (palette_indexes[i / pixels_per_byte] >> bit_offset) & mask;
@ -811,7 +811,7 @@ static RefPtr<Gfx::Bitmap> load_png_impl(const u8* data, size_t data_size)
return context.bitmap; return context.bitmap;
} }
static bool process_IHDR(const ByteBuffer& data, PNGLoadingContext& context) static bool process_IHDR(ReadonlyBytes data, PNGLoadingContext& context)
{ {
if (data.size() < (int)sizeof(PNG_IHDR)) if (data.size() < (int)sizeof(PNG_IHDR))
return false; return false;
@ -877,19 +877,19 @@ static bool process_IHDR(const ByteBuffer& data, PNGLoadingContext& context)
return true; return true;
} }
static bool process_IDAT(const ByteBuffer& data, PNGLoadingContext& context) static bool process_IDAT(ReadonlyBytes data, PNGLoadingContext& context)
{ {
context.compressed_data.append(data.data(), data.size()); context.compressed_data.append(data.data(), data.size());
return true; return true;
} }
static bool process_PLTE(const ByteBuffer& data, PNGLoadingContext& context) static bool process_PLTE(ReadonlyBytes data, PNGLoadingContext& context)
{ {
context.palette_data.append((const PaletteEntry*)data.data(), data.size() / 3); context.palette_data.append((const PaletteEntry*)data.data(), data.size() / 3);
return true; return true;
} }
static bool process_tRNS(const ByteBuffer& data, PNGLoadingContext& context) static bool process_tRNS(ReadonlyBytes data, PNGLoadingContext& context)
{ {
switch (context.color_type) { switch (context.color_type) {
case 3: case 3:
@ -916,7 +916,7 @@ static bool process_chunk(Streamer& streamer, PNGLoadingContext& context)
#endif #endif
return false; return false;
} }
ByteBuffer chunk_data; ReadonlyBytes chunk_data;
if (!streamer.wrap_bytes(chunk_data, chunk_size)) { if (!streamer.wrap_bytes(chunk_data, chunk_size)) {
#ifdef PNG_DEBUG #ifdef PNG_DEBUG
printf("Bail at chunk_data\n"); printf("Bail at chunk_data\n");