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

LibGfx/DDS: Only use a FixedMemoryStream

Browse source 
This allows us to drop the data pointer in the `DDSLoadingContext`.
This commit is contained in:
Lucas CHOLLET 2023-07-06 23:06:39 -04:00 • committed by Sam Atkins
parent 8946c0c104
commit 4cb7573582
2 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Userland/Libraries/LibGfx/ImageFormats/DDSLoader.cpp
View file

@ -23,6 +23,11 @@
namespace Gfx { namespace Gfx {
struct DDSLoadingContext { struct DDSLoadingContext {
DDSLoadingContext(FixedMemoryStream stream)
: stream(move(stream))
{
}
enum State { enum State {
NotDecoded = 0, NotDecoded = 0,
Error, Error,
@ -31,8 +36,7 @@ struct DDSLoadingContext {
State state { State::NotDecoded }; State state { State::NotDecoded };
u8 const* data { nullptr }; FixedMemoryStream stream;
size_t data_size { 0 };
DDSHeader header; DDSHeader header;
DDSHeaderDXT10 header10; DDSHeaderDXT10 header10;
@ -408,15 +412,13 @@ static ErrorOr<void> decode_bitmap(Stream& stream, DDSLoadingContext& context, D
static ErrorOr<void> decode_dds(DDSLoadingContext& context) static ErrorOr<void> decode_dds(DDSLoadingContext& context)
{ {
// All valid DDS files are at least 128 bytes long. // All valid DDS files are at least 128 bytes long.
if (context.data_size < 128) { if (TRY(context.stream.size()) < 128) {
dbgln_if(DDS_DEBUG, "File is too short for DDS"); dbgln_if(DDS_DEBUG, "File is too short for DDS");
context.state = DDSLoadingContext::State::Error; context.state = DDSLoadingContext::State::Error;
return Error::from_string_literal("File is too short for DDS"); return Error::from_string_literal("File is too short for DDS");
} }
FixedMemoryStream stream { ReadonlyBytes { context.data, context.data_size } }; auto magic = TRY(context.stream.read_value<u32>());
auto magic = TRY(stream.read_value<u32>());
if (magic != create_four_cc('D', 'D', 'S', ' ')) { if (magic != create_four_cc('D', 'D', 'S', ' ')) {
dbgln_if(DDS_DEBUG, "Missing magic number"); dbgln_if(DDS_DEBUG, "Missing magic number");
@ -424,7 +426,7 @@ static ErrorOr<void> decode_dds(DDSLoadingContext& context)
return Error::from_string_literal("Missing magic number"); return Error::from_string_literal("Missing magic number");
} }
context.header = TRY(stream.read_value<DDSHeader>()); context.header = TRY(context.stream.read_value<DDSHeader>());
if (context.header.size != 124) { if (context.header.size != 124) {
dbgln_if(DDS_DEBUG, "Header size is malformed"); dbgln_if(DDS_DEBUG, "Header size is malformed");
@ -439,13 +441,13 @@ static ErrorOr<void> decode_dds(DDSLoadingContext& context)
if ((context.header.pixel_format.flags & PixelFormatFlags::DDPF_FOURCC) == PixelFormatFlags::DDPF_FOURCC) { if ((context.header.pixel_format.flags & PixelFormatFlags::DDPF_FOURCC) == PixelFormatFlags::DDPF_FOURCC) {
if (context.header.pixel_format.four_cc == create_four_cc('D', 'X', '1', '0')) { if (context.header.pixel_format.four_cc == create_four_cc('D', 'X', '1', '0')) {
if (context.data_size < 148) { if (TRY(context.stream.size()) < 148) {
dbgln_if(DDS_DEBUG, "DX10 header is too short"); dbgln_if(DDS_DEBUG, "DX10 header is too short");
context.state = DDSLoadingContext::State::Error; context.state = DDSLoadingContext::State::Error;
return Error::from_string_literal("DX10 header is too short"); return Error::from_string_literal("DX10 header is too short");
} }
context.header10 = TRY(stream.read_value<DDSHeaderDXT10>()); context.header10 = TRY(context.stream.read_value<DDSHeaderDXT10>());
} }
} }
@ -469,7 +471,7 @@ static ErrorOr<void> decode_dds(DDSLoadingContext& context)
context.bitmap = TRY(Bitmap::create(BitmapFormat::BGRA8888, { width, height })); context.bitmap = TRY(Bitmap::create(BitmapFormat::BGRA8888, { width, height }));
TRY(decode_bitmap(stream, context, format, width, height)); TRY(decode_bitmap(context.stream, context, format, width, height));
} }
context.state = DDSLoadingContext::State::BitmapDecoded; context.state = DDSLoadingContext::State::BitmapDecoded;
@ -612,11 +614,9 @@ void DDSLoadingContext::dump_debug()
dbgln("{}", builder.to_deprecated_string()); dbgln("{}", builder.to_deprecated_string());
} }
DDSImageDecoderPlugin::DDSImageDecoderPlugin(u8 const* data, size_t size) DDSImageDecoderPlugin::DDSImageDecoderPlugin(FixedMemoryStream stream)
{ {
m_context = make<DDSLoadingContext>(); m_context = make<DDSLoadingContext>(move(stream));
m_context->data = data;
m_context->data_size = size;
} }
DDSImageDecoderPlugin::~DDSImageDecoderPlugin() = default; DDSImageDecoderPlugin::~DDSImageDecoderPlugin() = default;
@ -649,7 +649,8 @@ bool DDSImageDecoderPlugin::sniff(ReadonlyBytes data)
ErrorOr<NonnullOwnPtr<ImageDecoderPlugin>> DDSImageDecoderPlugin::create(ReadonlyBytes data) ErrorOr<NonnullOwnPtr<ImageDecoderPlugin>> DDSImageDecoderPlugin::create(ReadonlyBytes data)
{ {
return adopt_nonnull_own_or_enomem(new (nothrow) DDSImageDecoderPlugin(data.data(), data.size())); FixedMemoryStream stream { data };
return adopt_nonnull_own_or_enomem(new (nothrow) DDSImageDecoderPlugin(move(stream)));
} }
bool DDSImageDecoderPlugin::is_animated() bool DDSImageDecoderPlugin::is_animated()

3
Userland/Libraries/LibGfx/ImageFormats/DDSLoader.h
View file

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