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

LibGfx/PNG: Use ByteBuffer instead of Vector<u8>

Browse source
This commit is contained in:
Lucas CHOLLET 2023-06-11 19:26:41 -04:00 • committed by Andreas Kling
parent 15df0224e1
commit 36153136c4
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Userland/Libraries/LibGfx/ImageFormats/PNGLoader.cpp
View file

@ -130,7 +130,7 @@ enum RenderingIntent {
struct AnimationFrame { struct AnimationFrame {
fcTL_Chunk const& fcTL; fcTL_Chunk const& fcTL;
RefPtr<Bitmap> bitmap; RefPtr<Bitmap> bitmap;
Vector<u8> compressed_data; ByteBuffer compressed_data;
AnimationFrame(fcTL_Chunk const& fcTL) AnimationFrame(fcTL_Chunk const& fcTL)
: fcTL(fcTL) : fcTL(fcTL)
@ -187,9 +187,9 @@ struct PNGLoadingContext {
Vector<Scanline> scanlines; Vector<Scanline> scanlines;
ByteBuffer unfiltered_data; ByteBuffer unfiltered_data;
RefPtr<Gfx::Bitmap> bitmap; RefPtr<Gfx::Bitmap> bitmap;
Vector<u8> compressed_data; ByteBuffer compressed_data;
Vector<PaletteEntry> palette_data; Vector<PaletteEntry> palette_data;
Vector<u8> palette_transparency_data; ByteBuffer palette_transparency_data;
Vector<AnimationFrame> animation_frames; Vector<AnimationFrame> animation_frames;
Optional<ChromaticitiesAndWhitepoint> chromaticities_and_whitepoint; Optional<ChromaticitiesAndWhitepoint> chromaticities_and_whitepoint;
@ -537,7 +537,7 @@ NEVER_INLINE FLATTEN static ErrorOr<void> unfilter(PNGLoadingContext& context)
return Error::from_string_literal("PNGImageDecoderPlugin: Palette index out of range"); return Error::from_string_literal("PNGImageDecoderPlugin: Palette index out of range");
auto& color = context.palette_data.at((int)palette_index[i]); auto& color = context.palette_data.at((int)palette_index[i]);
auto transparency = context.palette_transparency_data.size() >= palette_index[i] + 1u auto transparency = context.palette_transparency_data.size() >= palette_index[i] + 1u
? context.palette_transparency_data.data()[palette_index[i]] ? context.palette_transparency_data[palette_index[i]]
: 0xff; : 0xff;
pixel.r = color.r; pixel.r = color.r;
pixel.g = color.g; pixel.g = color.g;
@ -558,7 +558,7 @@ NEVER_INLINE FLATTEN static ErrorOr<void> unfilter(PNGLoadingContext& context)
return Error::from_string_literal("PNGImageDecoderPlugin: Palette index out of range"); return Error::from_string_literal("PNGImageDecoderPlugin: Palette index out of range");
auto& color = context.palette_data.at(palette_index); auto& color = context.palette_data.at(palette_index);
auto transparency = context.palette_transparency_data.size() >= palette_index + 1u auto transparency = context.palette_transparency_data.size() >= palette_index + 1u
? context.palette_transparency_data.data()[palette_index] ? context.palette_transparency_data[palette_index]
: 0xff; : 0xff;
pixel.r = color.r; pixel.r = color.r;
pixel.g = color.g; pixel.g = color.g;
@ -1023,7 +1023,7 @@ static ErrorOr<void> process_IHDR(ReadonlyBytes data, PNGLoadingContext& context
static ErrorOr<void> process_IDAT(ReadonlyBytes data, PNGLoadingContext& context) static ErrorOr<void> process_IDAT(ReadonlyBytes data, PNGLoadingContext& context)
{ {
context.compressed_data.append(data.data(), data.size()); context.compressed_data.append(data);
if (context.state < PNGLoadingContext::State::ImageDataChunkDecoded) if (context.state < PNGLoadingContext::State::ImageDataChunkDecoded)
context.state = PNGLoadingContext::State::ImageDataChunkDecoded; context.state = PNGLoadingContext::State::ImageDataChunkDecoded;
return {}; return {};
@ -1041,7 +1041,7 @@ static ErrorOr<void> process_tRNS(ReadonlyBytes data, PNGLoadingContext& context
case PNG::ColorType::Greyscale: case PNG::ColorType::Greyscale:
case PNG::ColorType::Truecolor: case PNG::ColorType::Truecolor:
case PNG::ColorType::IndexedColor: case PNG::ColorType::IndexedColor:
TRY(context.palette_transparency_data.try_append(data.data(), data.size())); TRY(context.palette_transparency_data.try_append(data));
break; break;
default: default:
break; break;