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

LibGfx/JPEG: Make JPEGImageDecoderPlugin's constructor take a Stream

Browse source 
This allows us to get rid of the raw pointer and size in the JPEG
context struct.
This commit is contained in:
Lucas CHOLLET 2023-03-18 16:56:36 -04:00 • committed by Linus Groh
parent bc23b07570
commit b084759690
2 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Userland/Libraries/LibGfx/JPEGLoader.cpp
View file

@ -232,8 +232,7 @@ struct JPEGLoadingContext {
}; };
State state { State::NotDecoded }; State state { State::NotDecoded };
u8 const* data { nullptr };
size_t data_size { 0 };
u32 luma_table[64] = { 0 }; u32 luma_table[64] = { 0 };
u32 chroma_table[64] = { 0 }; u32 chroma_table[64] = { 0 };
StartOfFrame frame; StartOfFrame frame;
@ -623,7 +622,7 @@ static ErrorOr<void> read_start_of_scan(AK::SeekableStream& stream, JPEGLoadingC
} }
u16 bytes_to_read = TRY(stream.read_value<BigEndian<u16>>()) - 2; u16 bytes_to_read = TRY(stream.read_value<BigEndian<u16>>()) - 2;
TRY(ensure_bounds_okay(TRY(stream.tell()), bytes_to_read, context.data_size)); TRY(ensure_bounds_okay(TRY(stream.tell()), bytes_to_read, TRY(stream.size())));
u8 const component_count = TRY(stream.read_value<u8>()); u8 const component_count = TRY(stream.read_value<u8>());
Scan current_scan; Scan current_scan;
@ -690,7 +689,7 @@ static ErrorOr<void> read_restart_interval(AK::SeekableStream& stream, JPEGLoadi
static ErrorOr<void> read_huffman_table(AK::SeekableStream& stream, JPEGLoadingContext& context) static ErrorOr<void> read_huffman_table(AK::SeekableStream& stream, JPEGLoadingContext& context)
{ {
i32 bytes_to_read = TRY(stream.read_value<BigEndian<u16>>()); i32 bytes_to_read = TRY(stream.read_value<BigEndian<u16>>());
TRY(ensure_bounds_okay(TRY(stream.tell()), bytes_to_read, context.data_size)); TRY(ensure_bounds_okay(TRY(stream.tell()), bytes_to_read, TRY(stream.size())));
bytes_to_read -= 2; bytes_to_read -= 2;
while (bytes_to_read > 0) { while (bytes_to_read > 0) {
HuffmanTableSpec table; HuffmanTableSpec table;
@ -844,7 +843,7 @@ static ErrorOr<void> read_colour_encoding(SeekableStream& stream, [[maybe_unused
static ErrorOr<void> read_app_marker(SeekableStream& stream, JPEGLoadingContext& context, int app_marker_number) static ErrorOr<void> read_app_marker(SeekableStream& stream, JPEGLoadingContext& context, int app_marker_number)
{ {
i32 bytes_to_read = TRY(stream.read_value<BigEndian<u16>>()); i32 bytes_to_read = TRY(stream.read_value<BigEndian<u16>>());
TRY(ensure_bounds_okay(TRY(stream.tell()), bytes_to_read, context.data_size)); TRY(ensure_bounds_okay(TRY(stream.tell()), bytes_to_read, TRY(stream.size())));
if (bytes_to_read <= 2) if (bytes_to_read <= 2)
return Error::from_string_literal("app marker size too small"); return Error::from_string_literal("app marker size too small");
@ -913,7 +912,7 @@ static ErrorOr<void> read_start_of_frame(AK::SeekableStream& stream, JPEGLoading
i32 bytes_to_read = TRY(stream.read_value<BigEndian<u16>>()); i32 bytes_to_read = TRY(stream.read_value<BigEndian<u16>>());
bytes_to_read -= 2; bytes_to_read -= 2;
TRY(ensure_bounds_okay(TRY(stream.tell()), bytes_to_read, context.data_size)); TRY(ensure_bounds_okay(TRY(stream.tell()), bytes_to_read, TRY(stream.size())));
context.frame.precision = TRY(stream.read_value<u8>()); context.frame.precision = TRY(stream.read_value<u8>());
if (context.frame.precision != 8) { if (context.frame.precision != 8) {
@ -985,7 +984,7 @@ static ErrorOr<void> read_start_of_frame(AK::SeekableStream& stream, JPEGLoading
static ErrorOr<void> read_quantization_table(AK::SeekableStream& stream, JPEGLoadingContext& context) static ErrorOr<void> read_quantization_table(AK::SeekableStream& stream, JPEGLoadingContext& context)
{ {
i32 bytes_to_read = TRY(stream.read_value<BigEndian<u16>>()) - 2; i32 bytes_to_read = TRY(stream.read_value<BigEndian<u16>>()) - 2;
TRY(ensure_bounds_okay(TRY(stream.tell()), bytes_to_read, context.data_size)); TRY(ensure_bounds_okay(TRY(stream.tell()), bytes_to_read, TRY(stream.size())));
while (bytes_to_read > 0) { while (bytes_to_read > 0) {
u8 info_byte = TRY(stream.read_value<u8>()); u8 info_byte = TRY(stream.read_value<u8>());
u8 element_unit_hint = info_byte >> 4; u8 element_unit_hint = info_byte >> 4;
@ -1472,8 +1471,6 @@ static ErrorOr<void> scan_huffman_stream(AK::SeekableStream& stream, HuffmanStre
static ErrorOr<void> decode_header(JPEGLoadingContext& context) static ErrorOr<void> decode_header(JPEGLoadingContext& context)
{ {
if (context.state < JPEGLoadingContext::State::HeaderDecoded) { if (context.state < JPEGLoadingContext::State::HeaderDecoded) {
context.stream = TRY(try_make<FixedMemoryStream>(ReadonlyBytes { context.data, context.data_size }));
if (auto result = parse_header(*context.stream, context); result.is_error()) { if (auto result = parse_header(*context.stream, context); result.is_error()) {
context.state = JPEGLoadingContext::State::Error; context.state = JPEGLoadingContext::State::Error;
return result.release_error(); return result.release_error();
@ -1532,11 +1529,10 @@ static ErrorOr<void> decode_jpeg(JPEGLoadingContext& context)
return {}; return {};
} }
JPEGImageDecoderPlugin::JPEGImageDecoderPlugin(u8 const* data, size_t size) JPEGImageDecoderPlugin::JPEGImageDecoderPlugin(NonnullOwnPtr<FixedMemoryStream> stream)
{ {
m_context = make<JPEGLoadingContext>(); m_context = make<JPEGLoadingContext>();
m_context->data = data; m_context->stream = move(stream);
m_context->data_size = size;
} }
JPEGImageDecoderPlugin::~JPEGImageDecoderPlugin() = default; JPEGImageDecoderPlugin::~JPEGImageDecoderPlugin() = default;
@ -1579,7 +1575,8 @@ bool JPEGImageDecoderPlugin::sniff(ReadonlyBytes data)
ErrorOr<NonnullOwnPtr<ImageDecoderPlugin>> JPEGImageDecoderPlugin::create(ReadonlyBytes data) ErrorOr<NonnullOwnPtr<ImageDecoderPlugin>> JPEGImageDecoderPlugin::create(ReadonlyBytes data)
{ {
return adopt_nonnull_own_or_enomem(new (nothrow) JPEGImageDecoderPlugin(data.data(), data.size())); auto stream = TRY(try_make<FixedMemoryStream>(data));
return adopt_nonnull_own_or_enomem(new (nothrow) JPEGImageDecoderPlugin(move(stream)));
} }
bool JPEGImageDecoderPlugin::is_animated() bool JPEGImageDecoderPlugin::is_animated()

3
Userland/Libraries/LibGfx/JPEGLoader.h
View file

@ -6,6 +6,7 @@
#pragma once #pragma once
#include <AK/MemoryStream.h>
#include <LibGfx/ImageDecoder.h> #include <LibGfx/ImageDecoder.h>
namespace Gfx { namespace Gfx {
@ -31,7 +32,7 @@ public:
virtual ErrorOr<Optional<ReadonlyBytes>> icc_data() override; virtual ErrorOr<Optional<ReadonlyBytes>> icc_data() override;
private: private:
JPEGImageDecoderPlugin(u8 const*, size_t); JPEGImageDecoderPlugin(NonnullOwnPtr<FixedMemoryStream>);
OwnPtr<JPEGLoadingContext> m_context; OwnPtr<JPEGLoadingContext> m_context;
}; };