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

bugfixing of CCITT fax decoder

Browse Source
This commit is contained in:
Jakub Melka
2019-10-15 19:22:36 +02:00
parent b1b5780753
commit 5c3d568cc1
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
PdfForQtLib/sources/pdfccittfaxdecoder.cpp
View File

@ -312,10 +312,11 @@ PDFImageData PDFCCITTFaxDecoder::decode()
int row = 0; int row = 0;
const size_t lineSize = m_parameters.columns + 2; const size_t lineSize = m_parameters.columns + 2;
codingLine.resize(lineSize, 0); codingLine.resize(lineSize, m_parameters.columns);
referenceLine.resize(lineSize, m_parameters.columns); referenceLine.resize(lineSize, m_parameters.columns);
bool isUsing2DEncoding = m_parameters.K < 0; bool isUsing2DEncoding = m_parameters.K < 0;
bool isEndOfLineOccured = m_parameters.hasEndOfLine; bool isEndOfLineOccured = m_parameters.hasEndOfLine;
codingLine[0] = 0;
auto updateIsUsing2DEncoding = [this, &isUsing2DEncoding]() auto updateIsUsing2DEncoding = [this, &isUsing2DEncoding]()
{ {
@ -496,18 +497,32 @@ PDFImageData PDFCCITTFaxDecoder::decode()
updateIsUsing2DEncoding(); updateIsUsing2DEncoding();
if (m_parameters.hasEndOfBlock && foundEndOfLine) if (m_parameters.hasEndOfBlock)
{ {
if (m_reader.look(60) == 0x1001001001001ULL) if (!m_parameters.hasEndOfLine && m_parameters.hasEncodedByteAlign)
{ {
// End of block found, stop reading the data // We do not have look for EOL above. We check, if we get end-of-facsimile-block signal.
break; // It consists of two consecutive EOLs (see specification).
if (m_reader.look(24) == 0x1001)
{
// End of block found, stop reading the data
break;
}
}
else if (foundEndOfLine)
{
if (m_reader.look(12) == 1)
{
// End of block found, stop reading the data
break;
}
} }
} }
std::swap(codingLine, referenceLine); std::swap(codingLine, referenceLine);
std::fill(codingLine.begin(), codingLine.end(), 0); std::fill(codingLine.begin(), codingLine.end(), m_parameters.columns);
std::fill(std::next(referenceLine.begin(), a0_index + 1), referenceLine.end(), m_parameters.columns); std::fill(std::next(referenceLine.begin(), a0_index + 1), referenceLine.end(), m_parameters.columns);
codingLine[0] = 0;
} }
return PDFImageData(1, 1, m_parameters.columns, row, (m_parameters.columns + 7) / 8, m_parameters.maskingType, writer.takeByteArray(), { }, { }, { }); return PDFImageData(1, 1, m_parameters.columns, row, (m_parameters.columns + 7) / 8, m_parameters.maskingType, writer.takeByteArray(), { }, { }, { });