fenix/PDF4QT
1
0
Fork 0
mirror of https://github.com/JakubMelka/PDF4QT.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

JBIG2 bugfixing

Browse Source
This commit is contained in:
Jakub Melka
2021-04-10 17:21:45 +02:00
parent 39ed28706e
commit 2d1492f4cd
2 changed files with 75 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
Pdf4QtLib/sources/pdfjbig2decoder.cpp
View File

@@ -2955,9 +2955,9 @@ PDFJBIG2Bitmap PDFJBIG2Decoder::readBitmap(PDFJBIG2BitmapDecodingParameters& par
// //
// ┌───┬───┬───┬───┬───┬───┐ // ┌───┬───┬───┬───┬───┬───┐
// │ 0 │ 1 │ 1 │ 0 │ 0 │ 1 │ // │ 0 │ 1 │ 1 │ 0 │ 0 │ 1 │
// ┌───┼───├───┼───┼───┼───┴───┘ // ┌───┼───┼───┼───┼───┼───┴───┘
// │ 0 │ 1 │ 0 │ 1 │ x │ // │ 0 │ 1 │ 0 │ 1 │ x │
// └───┴───└───┴───┴───┘ // └───┴───┴───┴───┴───┘
// //
// Bottom row from right to left: 1010 // Bottom row from right to left: 1010
// Top row from right to left: 100110 // Top row from right to left: 100110
@@ -3016,6 +3016,16 @@ PDFJBIG2Bitmap PDFJBIG2Decoder::readBitmap(PDFJBIG2BitmapDecodingParameters& par
{ {
case 0: case 0:
{ {
// Figure 8. Reused context for coding the SLTP value
//
// ┌───┬───┬───┬───┬───┐
// │A15│ 14│ 13│ 12│A11│
// ┌───┼───┼───┼───┼───┼───┼───┐
// │A10│ 9 │ 8 │ 7 │ 6 │ 5 │A4 │
// ┌───┼───┼───┼───┼───┼───┴───┴───┘
// │ 3 │ 2 │ 1 │ 0 │ X │
// └───┴───┴───┴───┴───┘
// 16-bit context // 16-bit context
createContextBit(x - 1, y); createContextBit(x - 1, y);
createContextBit(x - 2, y); createContextBit(x - 2, y);
@@ -3038,6 +3048,16 @@ PDFJBIG2Bitmap PDFJBIG2Decoder::readBitmap(PDFJBIG2BitmapDecodingParameters& par
case 1: case 1:
{ {
// Figure 9. Reused context for coding the SLTP value
//
// ┌───┬───┬───┬───┐
// │ 12│ 11│ 10│ 9 │
// ┌───┼───┼───┼───┼───┼───┐
// │ 8 │ 7 │ 6 │ 5 │ 4 │A3 │
// ┌───┼───┼───┼───┼───┴───┴───┘
// │ 2 │ 1 │ 0 │ x │
// └───┴───┴───┴───┘
// 13-bit context // 13-bit context
createContextBit(x - 1, y); createContextBit(x - 1, y);
createContextBit(x - 2, y); createContextBit(x - 2, y);
@@ -3057,6 +3077,16 @@ PDFJBIG2Bitmap PDFJBIG2Decoder::readBitmap(PDFJBIG2BitmapDecodingParameters& par
case 2: case 2:
{ {
// Figure 10. Reused context for coding the SLTP value
//
// ┌───┬───┬───┐
// │ 9 │ 8 │ 7 │
// ┌───┼───┼───┼───┼───┐
// │ 6 │ 5 │ 4 │ 3 │A2 │
// ├───┼───┼───┼───┴───┘
// │ 1 │ 0 │ x │
// └───┴───┴───┘
// 10-bit context // 10-bit context
createContextBit(x - 1, y); createContextBit(x - 1, y);
createContextBit(x - 2, y); createContextBit(x - 2, y);
@@ -3073,6 +3103,14 @@ PDFJBIG2Bitmap PDFJBIG2Decoder::readBitmap(PDFJBIG2BitmapDecodingParameters& par
case 3: case 3:
{ {
// Figure 11. Reused context for coding the SLTP value
//
// ┌───┬───┬───┬───┬───┬───┐
// │ 9 │ 8 │ 7 │ 6 │ 5 │A4 │
// ┌───┼───┼───┼───┼───┼───┴───┘
// │ 3 │ 2 │ 1 │ 0 │ x │
// └───┴───┴───┴───┴───┘
// 10-bit context // 10-bit context
createContextBit(x - 1, y); createContextBit(x - 1, y);
createContextBit(x - 2, y); createContextBit(x - 2, y);
@@ -3799,6 +3837,35 @@ PDFJBIG2HuffmanDecoder::PDFJBIG2HuffmanDecoder(PDFBitReader* reader, std::vector
} }
} }
PDFJBIG2HuffmanDecoder::PDFJBIG2HuffmanDecoder(PDFJBIG2HuffmanDecoder&& other) :
m_reader(other.m_reader),
m_begin(other.m_begin),
m_end(other.m_end),
m_entries(qMove(other.m_entries))
{
if (!m_entries.empty())
{
m_begin = m_entries.data();
m_end = m_entries.data() + m_entries.size();
}
}
PDFJBIG2HuffmanDecoder& PDFJBIG2HuffmanDecoder::operator=(PDFJBIG2HuffmanDecoder&& other)
{
m_reader = other.m_reader;
m_begin = other.m_begin;
m_end = other.m_end;
m_entries = qMove(other.m_entries);
if (!m_entries.empty())
{
m_begin = m_entries.data();
m_end = m_entries.data() + m_entries.size();
}
return *this;
}
bool PDFJBIG2HuffmanDecoder::isOutOfBandSupported() const bool PDFJBIG2HuffmanDecoder::isOutOfBandSupported() const
{ {
if (!isValid()) if (!isValid())

6
Pdf4QtLib/sources/pdfjbig2decoder.h
View File

@@ -298,6 +298,12 @@ public:
/// Constructs huffman decoder from huffman code table, in this case, memory is allocated /// Constructs huffman decoder from huffman code table, in this case, memory is allocated
explicit PDFJBIG2HuffmanDecoder(PDFBitReader* reader, std::vector<PDFJBIG2HuffmanTableEntry>&& table); explicit PDFJBIG2HuffmanDecoder(PDFBitReader* reader, std::vector<PDFJBIG2HuffmanTableEntry>&& table);
PDFJBIG2HuffmanDecoder(const PDFJBIG2HuffmanDecoder&) = delete;
PDFJBIG2HuffmanDecoder(PDFJBIG2HuffmanDecoder&& other);
PDFJBIG2HuffmanDecoder& operator=(const PDFJBIG2HuffmanDecoder&) = delete;
PDFJBIG2HuffmanDecoder& operator=(PDFJBIG2HuffmanDecoder&& other);
/// Returns true, if huffman table is valid (and usable) /// Returns true, if huffman table is valid (and usable)
bool isValid() const { return m_begin != m_end; } bool isValid() const { return m_begin != m_end; }