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

LibGfx/JPEGLoader: Make byte_offset() return offset from start of stream

Browse source 
JPEGStream::byte_offset() now returns an offset relative to the start
of the stream, instead of relative to the buffered part.

No behavior change except if JPEG_DEBUG is set.
This commit is contained in:
Nico Weber 2024-01-29 09:52:53 -05:00 committed by Andrew Kaster
parent 113c6dc48b
commit d7f04c9aa1
Notes: sideshowbarker 2024-07-17 05:19:06 +09:00 
Author: https://github.com/nico
Commit: https://github.com/SerenityOS/serenity/commit/d7f04c9aa1
Pull-request: https://github.com/SerenityOS/serenity/pull/22985
Reviewed-by: https://github.com/ADKaster ✅
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -182,6 +182,7 @@ public:
JPEGStream jpeg_stream { move(stream), move(buffer) };
TRY(jpeg_stream.refill_buffer());
jpeg_stream.m_offset_from_start = 0;
return jpeg_stream;
}
@ -205,8 +206,10 @@ public:
auto const discarded_from_buffer = min(m_current_size - m_byte_offset, bytes);
m_byte_offset += discarded_from_buffer;
if (discarded_from_buffer < bytes)
if (discarded_from_buffer < bytes) {
m_offset_from_start += bytes - discarded_from_buffer;
TRY(m_stream->discard(bytes - discarded_from_buffer));
}
return {};
}
@ -216,8 +219,10 @@ public:
auto const copied = m_buffer.span().slice(m_byte_offset).copy_trimmed_to(bytes);
m_byte_offset += copied;
if (copied < bytes.size())
if (copied < bytes.size()) {
m_offset_from_start += bytes.size() - copied;
TRY(m_stream->read_until_filled(bytes.slice(copied)));
}
return {};
}
@ -229,7 +234,7 @@ public:
u64 byte_offset() const
{
return m_byte_offset;
return m_offset_from_start + m_byte_offset;
}
private:
@ -243,6 +248,8 @@ private:
{
VERIFY(m_byte_offset == m_current_size);
m_offset_from_start += m_byte_offset;
m_current_size = TRY(m_stream->read_some(m_buffer.span())).size();
if (m_current_size == 0)
return Error::from_string_literal("Unexpected end of file");
@ -259,6 +266,7 @@ private:
Optional<u16> m_saved_marker {};
Vector<u8> m_buffer {};
u64 m_offset_from_start { 0 };
u64 m_byte_offset { buffer_size };
u64 m_current_size { buffer_size };
};