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

Minor bugfixes

Browse Source
This commit is contained in:
Jakub Melka 2019-07-24 19:15:03 +02:00
parent 9a17daa5ab
commit ed15e37a52
3 changed files with 61 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PdfForQtLib/sources/pdfimage.cpp
View File

@ -516,11 +516,12 @@ PDFImage PDFImage::createImage(const PDFDocument* document, const PDFStream* str
QImage PDFImage::getImage() const QImage PDFImage::getImage() const
{ {
if (m_colorSpace) const bool isImageMask = m_imageData.getMaskingType() == PDFImageData::MaskingType::ImageMask;
if (m_colorSpace && !isImageMask)
{ {
return m_colorSpace->getImage(m_imageData); return m_colorSpace->getImage(m_imageData);
} }
else if (m_imageData.getMaskingType() == PDFImageData::MaskingType::ImageMask) else if (isImageMask)
{ {
if (m_imageData.getBitsPerComponent() != 1) if (m_imageData.getBitsPerComponent() != 1)
{ {
@ -533,7 +534,6 @@ QImage PDFImage::getImage() const
} }
QImage image(m_imageData.getWidth(), m_imageData.getHeight(), QImage::Format_Alpha8); QImage image(m_imageData.getWidth(), m_imageData.getHeight(), QImage::Format_Alpha8);
image.fill(QColor(Qt::transparent));
const bool flip01 = !m_imageData.getDecode().empty() && qFuzzyCompare(m_imageData.getDecode().front(), 1.0); const bool flip01 = !m_imageData.getDecode().empty() && qFuzzyCompare(m_imageData.getDecode().front(), 1.0);
QDataStream stream(const_cast<QByteArray*>(&m_imageData.getData()), QIODevice::ReadOnly); QDataStream stream(const_cast<QByteArray*>(&m_imageData.getData()), QIODevice::ReadOnly);

21
PdfForQtLib/sources/pdfpagecontentprocessor.cpp
View File

@ -2037,6 +2037,15 @@ void PDFPageContentProcessor::paintXObjectImage(const PDFStream* stream)
PDFImage pdfImage = PDFImage::createImage(m_document, stream, qMove(colorSpace), this); PDFImage pdfImage = PDFImage::createImage(m_document, stream, qMove(colorSpace), this);
QImage image = pdfImage.getImage(); QImage image = pdfImage.getImage();
if (image.format() == QImage::Format_Alpha8)
{
QSize size = image.size();
QImage unmaskedImage(size, QImage::Format_ARGB32_Premultiplied);
unmaskedImage.fill(m_graphicState.getFillColor());
unmaskedImage.setAlphaChannel(image);
image = qMove(unmaskedImage);
}
if (!image.isNull()) if (!image.isNull())
{ {
performImagePainting(image); performImagePainting(image);
@ -2287,19 +2296,25 @@ void PDFPageContentProcessor::drawText(const TextSequence& textSequence)
{ {
// Type 3 Font // Type 3 Font
PDFPageContentProcessorStateGuard guard(this);
Q_ASSERT(dynamic_cast<const PDFType3Font*>(m_graphicState.getTextFont().get())); Q_ASSERT(dynamic_cast<const PDFType3Font*>(m_graphicState.getTextFont().get()));
const PDFType3Font* parentFont = static_cast<const PDFType3Font*>(m_graphicState.getTextFont().get()); const PDFType3Font* parentFont = static_cast<const PDFType3Font*>(m_graphicState.getTextFont().get());
QMatrix fontMatrix = parentFont->getFontMatrix(); QMatrix fontMatrix = parentFont->getFontMatrix();
if (!fontMatrix.isInvertible())
{
throw PDFRendererException(RenderErrorType::Error, PDFTranslationContext::tr("Type 3 font matrix is not invertible."));
}
PDFPageContentProcessorStateGuard guard(this);
QMatrix invertedFontMatrix = fontMatrix.inverted();
PDFObject resources = parentFont->getResources(); PDFObject resources = parentFont->getResources();
if (!resources.isNull()) if (!resources.isNull())
{ {
initDictionaries(resources); initDictionaries(resources);
} }
QMatrix fontAdjustedMatrix = fontMatrix * adjustMatrix; QMatrix fontAdjustedMatrix = invertedFontMatrix * adjustMatrix;
for (const TextSequenceItem& item : textSequence.items) for (const TextSequenceItem& item : textSequence.items)
{ {

38
PdfForQtLib/sources/pdfrenderer.cpp
View File

@ -50,10 +50,48 @@ QList<PDFRenderError> PDFRenderer::render(QPainter* painter, const QRectF& recta
Q_ASSERT(page); Q_ASSERT(page);
QRectF mediaBox = page->getMediaBox(); QRectF mediaBox = page->getMediaBox();
const PageRotation rotation = page->getPageRotation();
mediaBox = page->getRotatedBox(mediaBox, rotation);
QMatrix matrix; QMatrix matrix;
switch (rotation)
{
case PageRotation::None:
{
matrix.translate(rectangle.left(), rectangle.bottom()); matrix.translate(rectangle.left(), rectangle.bottom());
matrix.scale(rectangle.width() / mediaBox.width(), -rectangle.height() / mediaBox.height()); matrix.scale(rectangle.width() / mediaBox.width(), -rectangle.height() / mediaBox.height());
break;
}
case PageRotation::Rotate90:
{
matrix.translate(rectangle.left(), rectangle.top());
matrix.rotate(90);
matrix.scale(rectangle.width() / mediaBox.width(), -rectangle.height() / mediaBox.height());
break;
}
case PageRotation::Rotate270:
{
matrix.translate(rectangle.right(), rectangle.top());
matrix.rotate(-90);
matrix.scale(rectangle.width() / mediaBox.width(), -rectangle.height() / mediaBox.height());
break;
}
case PageRotation::Rotate180:
{
matrix.translate(rectangle.left(), rectangle.top());
matrix.scale(rectangle.width() / mediaBox.width(), rectangle.height() / mediaBox.height());
break;
}
default:
{
Q_ASSERT(false);
break;
}
}
PDFPainter processor(painter, m_features, matrix, page, m_document, m_fontCache, m_optionalContentActivity); PDFPainter processor(painter, m_features, matrix, page, m_document, m_fontCache, m_optionalContentActivity);
return processor.processContents(); return processor.processContents();