beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-23 08:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

LibGfx/JPEG2000: Store some tile and tile part data on context

Browse source
This commit is contained in:
Nico Weber 2024-04-08 21:26:42 -04:00 committed by Tim Flynn
parent 0df01dea4a
commit 38be93c9a1
Notes: sideshowbarker 2024-07-17 18:23:22 +09:00 
Author: https://github.com/nico
Commit: https://github.com/SerenityOS/serenity/commit/38be93c9a1
Pull-request: https://github.com/SerenityOS/serenity/pull/23901
Reviewed-by: https://github.com/trflynn89 ✅
1 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Userland/Libraries/LibGfx/ImageFormats/JPEG2000Loader.cpp
View file

@ -438,6 +438,15 @@ static ErrorOr<Comment> read_comment(ReadonlyBytes data)
return com;
}
struct TilePartData {
StartOfTilePart sot;
ReadonlyBytes data;
};
struct TileData {
Vector<TilePartData> tile_parts;
};
struct JPEG2000LoadingContext {
enum class State {
NotDecoded = 0,
@ -458,6 +467,7 @@ struct JPEG2000LoadingContext {
CodingStyleDefault cod;
QuantizationDefault qcd;
Vector<Comment> coms;
Vector<TileData> tiles;
};
struct MarkerSegment {
@ -591,6 +601,15 @@ static ErrorOr<void> parse_codestream_tile_header(JPEG2000LoadingContext& contex
auto start_of_tile = TRY(read_start_of_tile_part(marker.data.value()));
// FIXME: Store start_of_tile on context somewhere.
context.tiles.resize(max(context.tiles.size(), (size_t)start_of_tile.tile_index + 1));
auto& tile = context.tiles[start_of_tile.tile_index];
if (tile.tile_parts.size() != start_of_tile.tile_part_index)
return Error::from_string_literal("JPEG2000ImageDecoderPlugin: Tile part index out of order");
tile.tile_parts.append({});
auto& tile_part = tile.tile_parts.last();
tile_part.sot = start_of_tile;
bool found_start_of_data = false;
while (!found_start_of_data) {
u16 marker = TRY(peek_marker(context));
@ -637,7 +656,7 @@ static ErrorOr<void> parse_codestream_tile_header(JPEG2000LoadingContext& contex
if (context.codestream_cursor + tile_bitstream_length > context.codestream_data.size())
return Error::from_string_literal("JPEG2000ImageDecoderPlugin: Not enough data for tile bitstream");
// FIXME: Store context.codestream_data.slice(context.codestream_cursor, tile_bitstream_length) somewhere on the context.
tile_part.data = context.codestream_data.slice(context.codestream_cursor, tile_bitstream_length);
context.codestream_cursor += tile_bitstream_length;
dbgln_if(JPEG2000_DEBUG, "JPEG2000ImageDecoderPlugin: Tile bitstream length: {}", tile_bitstream_length);