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

LibGfx+LibPDF: Use LibCompress' implementation of the PackBits decoder

Browse source 
No need to have these three copies :^)
This commit is contained in:
Lucas CHOLLET 2023-12-21 00:17:37 -05:00 • committed by Tim Schumacher
parent d748edd994
commit f389c1cdba
3 changed files with 7 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Userland/Libraries/LibPDF/Filter.cpp
View file

@ -8,6 +8,7 @@
#include <AK/Hex.h>
#include <LibCompress/Deflate.h>
#include <LibCompress/LZWDecoder.h>
#include <LibCompress/PackBitsDecoder.h>
#include <LibGfx/ImageFormats/JPEGLoader.h>
#include <LibGfx/ImageFormats/PNGLoader.h>
#include <LibPDF/CommonNames.h>
@ -210,30 +211,7 @@ PDFErrorOr<ByteBuffer> Filter::decode_flate(ReadonlyBytes bytes, int predictor,
PDFErrorOr<ByteBuffer> Filter::decode_run_length(ReadonlyBytes bytes)
{
constexpr size_t END_OF_DECODING = 128;
ByteBuffer buffer {};
while (true) {
VERIFY(bytes.size() > 0);
auto length = bytes[0];
bytes = bytes.slice(1);
if (length == END_OF_DECODING) {
VERIFY(bytes.is_empty());
break;
}
if (length < 128) {
TRY(buffer.try_append(bytes.slice(0, length + 1)));
bytes = bytes.slice(length + 1);
} else {
VERIFY(bytes.size() > 1);
auto byte_to_append = bytes[0];
bytes = bytes.slice(1);
size_t n_chars = 257 - length;
for (size_t i = 0; i < n_chars; ++i) {
TRY(buffer.try_append(byte_to_append));
}
}
}
return buffer;
return TRY(Compress::PackBits::decode_all(bytes, OptionalNone {}, Compress::PackBits::CompatibilityMode::PDF));
}
PDFErrorOr<ByteBuffer> Filter::decode_ccitt(ReadonlyBytes)