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

Color spaces and images - bugfixing, compliance to PDF 2.0 specification

Browse Source
This commit is contained in:
Jakub Melka
2020-08-15 15:57:55 +02:00
parent 8eedb45576
commit 7129793109
5 changed files with 115 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
PdfForQtLib/sources/pdfimage.cpp
View File

@ -73,6 +73,17 @@ PDFImage PDFImage::createImage(const PDFDocument* document,
bool imageMask = loader.readBooleanFromDictionary(dictionary, "ImageMask", false);
std::vector<PDFReal> matte = loader.readNumberArrayFromDictionary(dictionary, "Matte");
PDFInteger sMaskInData = loader.readIntegerFromDictionary(dictionary, "SMaskInData", 0);
image.m_interpolate = loader.readBooleanFromDictionary(dictionary, "Interpolate", false);
image.m_alternates = loader.readObjectList<PDFAlternateImage>(dictionary->get("Alternates"));
image.m_name = loader.readNameFromDictionary(dictionary, "Name");
image.m_structuralParent = loader.readIntegerFromDictionary(dictionary, "StructParent", 0);
image.m_webCaptureContentSetId = loader.readStringFromDictionary(dictionary, "ID");
image.m_OPI = dictionary->get("OPI");
image.m_OC = dictionary->get("OC");
image.m_metadata = dictionary->get("Metadata");
image.m_associatedFiles = dictionary->get("AF");
image.m_measure = dictionary->get("Measure");
image.m_pointData = dictionary->get("PtData");
if (isSoftMask && (imageMask || dictionary->hasKey("Mask") || dictionary->hasKey("SMask")))
{
@ -706,9 +717,9 @@ PDFImage PDFImage::createImage(const PDFDocument* document,
}
else if (imageMask)
{
// We intentionally have 8 bits in the following code, because if ImageMask is set to true, then "BitsPerComponent"
// should have always value of 1.
const unsigned int bitsPerComponent = static_cast<unsigned int>(loader.readIntegerFromDictionary(dictionary, "BitsPerComponent", 8));
// If ImageMask is set to true, then "BitsPerComponent" should have always value of 1.
// If this entry is not specified, then the value should be implicitly 1.
const unsigned int bitsPerComponent = static_cast<unsigned int>(loader.readIntegerFromDictionary(dictionary, "BitsPerComponent", 1));
if (bitsPerComponent != 1)
{
@ -840,6 +851,19 @@ OPJ_OFF_T PDFJPEG2000ImageData::skip(OPJ_OFF_T p_nb_bytes, void* p_user_data)
return length;
}
// Implement image rendering intent
PDFAlternateImage PDFAlternateImage::parse(const PDFObjectStorage* storage, PDFObject object)
{
PDFAlternateImage result;
if (const PDFDictionary* dictionary = storage->getDictionaryFromObject(object))
{
PDFDocumentDataLoaderDecorator loader(storage);
result.m_image = loader.readReferenceFromDictionary(dictionary, "Image");
result.m_oc = loader.readReferenceFromDictionary(dictionary, "OC");
result.m_defaultForPrinting = loader.readBooleanFromDictionary(dictionary, "DefaultForPrinting", false);
}
return result;
}
} // namespace pdf