fenix/PDF4QT
1
0
Fork 0
mirror of https://github.com/JakubMelka/PDF4QT.git synced 2025-02-16 03:30:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bugfixing

Browse Source
This commit is contained in:
Jakub Melka 2021-02-13 15:35:21 +01:00
parent 5cd493d19d
commit 14cd4c3dd0
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Pdf4QtLib/sources/pdftransparencyrenderer.cpp
View File

@ -975,7 +975,7 @@ void PDFTransparencyRenderer::performBeginTransparencyGroup(ProcessOrder order,
if (isTransparencyGroupIsolated()) if (isTransparencyGroupIsolated())
{ {
// Make initial backdrop transparent // Make initial backdrop transparent
data.initialBackdrop.makeTransparent(); data.makeInitialBackdropTransparent();
} }
else if (!isTransparencyGroupKnockout()) else if (!isTransparencyGroupKnockout())
{ {
@ -999,7 +999,7 @@ void PDFTransparencyRenderer::performBeginTransparencyGroup(ProcessOrder order,
// Prepare soft mask // Prepare soft mask
data.softMask = PDFFloatBitmap(oldBackdrop->getWidth(), oldBackdrop->getHeight(), PDFPixelFormat::createOpacityMask()); data.softMask = PDFFloatBitmap(oldBackdrop->getWidth(), oldBackdrop->getHeight(), PDFPixelFormat::createOpacityMask());
// TODO: Create soft mask // TODO: Create soft mask
data.softMask.makeOpaque(); data.makeSoftMaskOpaque();
data.initialBackdrop.convertToColorSpace(getCMS(), data.renderingIntent, data.blendColorSpace, this); data.initialBackdrop.convertToColorSpace(getCMS(), data.renderingIntent, data.blendColorSpace, this);
data.immediateBackdrop = data.initialBackdrop; data.immediateBackdrop = data.initialBackdrop;
@ -1007,7 +1007,7 @@ void PDFTransparencyRenderer::performBeginTransparencyGroup(ProcessOrder order,
// Jakub Melka: According to 11.4.8 of PDF 2.0 specification, we must // Jakub Melka: According to 11.4.8 of PDF 2.0 specification, we must
// initialize f_g_0 and alpha_g_0 to zero. We store f_g_0 and alpha_g_0 // initialize f_g_0 and alpha_g_0 to zero. We store f_g_0 and alpha_g_0
// in the immediate backdrop, so we will make it transparent. // in the immediate backdrop, so we will make it transparent.
data.immediateBackdrop.makeTransparent(); data.makeImmediateBackdropTransparent();
// Create draw buffer // Create draw buffer
m_drawBuffer = PDFDrawBuffer(data.immediateBackdrop.getWidth(), data.immediateBackdrop.getHeight(), data.immediateBackdrop.getPixelFormat()); m_drawBuffer = PDFDrawBuffer(data.immediateBackdrop.getWidth(), data.immediateBackdrop.getHeight(), data.immediateBackdrop.getPixelFormat());
@ -1682,13 +1682,17 @@ PDFColorComponent PDFPainterPathSampler::sampleByScanLine(QPoint point) const
{ {
ScanLineInfo info = m_scanLineInfo[scanLineIndex]; ScanLineInfo info = m_scanLineInfo[scanLineIndex];
auto it = std::next(m_scanLineSamples.cbegin(), info.indexStart); auto it = std::next(m_scanLineSamples.cbegin(), info.indexStart);
auto itEnd = std::next(m_scanLineSamples.cbegin(), info.indexEnd);
PDFReal ordinate = firstOrdinate; PDFReal ordinate = firstOrdinate;
PDFColorComponent value = 0.0; PDFColorComponent value = 0.0;
auto ordinateIt = std::lower_bound(it, itEnd, ordinate); auto ordinateIt = it;
for (int i = 0; i < sampleCount; ++i) for (int i = 0; i < sampleCount; ++i)
{ {
while (std::next(ordinateIt)->x < ordinate)
{
++ordinateIt;
}
int windingNumber = ordinateIt->windingNumber; int windingNumber = ordinateIt->windingNumber;
const bool inside = (fillRule == Qt::WindingFill) ? windingNumber != 0 : windingNumber % 2 != 0; const bool inside = (fillRule == Qt::WindingFill) ? windingNumber != 0 : windingNumber % 2 != 0;
@ -1698,7 +1702,6 @@ PDFColorComponent PDFPainterPathSampler::sampleByScanLine(QPoint point) const
} }
ordinate += step; ordinate += step;
ordinateIt = std::lower_bound(ordinateIt, itEnd, ordinate);
} }
return value; return value;
@ -1876,4 +1879,19 @@ void PDFDrawBuffer::modify(QRect rect, bool containsFilling, bool containsStroki
m_containsStroking |= containsStroking; m_containsStroking |= containsStroking;
} }
void PDFTransparencyRenderer::PDFTransparencyGroupPainterData::makeInitialBackdropTransparent()
{
initialBackdrop.makeTransparent();
}
void PDFTransparencyRenderer::PDFTransparencyGroupPainterData::makeImmediateBackdropTransparent()
{
immediateBackdrop.makeTransparent();
}
void PDFTransparencyRenderer::PDFTransparencyGroupPainterData::makeSoftMaskOpaque()
{
softMask.makeOpaque();
}
} // namespace pdf } // namespace pdf

4
Pdf4QtLib/sources/pdftransparencyrenderer.h
View File

@ -523,6 +523,10 @@ private:
struct PDFTransparencyGroupPainterData struct PDFTransparencyGroupPainterData
{ {
void makeInitialBackdropTransparent();
void makeImmediateBackdropTransparent();
void makeSoftMaskOpaque();
PDFTransparencyGroup group; PDFTransparencyGroup group;
bool alphaIsShape = false; bool alphaIsShape = false;
PDFReal alphaStroke = 1.0; PDFReal alphaStroke = 1.0;