fenix/PDF4QT
1
0
Fork 0
mirror of https://github.com/JakubMelka/PDF4QT.git synced 2025-03-12 09:20:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bugfixing

Browse Source
This commit is contained in:
Jakub Melka 2024-04-01 18:05:18 +02:00
parent 34f64c3a85
commit 36b7a99deb
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Pdf4QtLibCore/sources/pdfpagecontenteditorprocessor.cpp
View File

@ -46,7 +46,7 @@ void PDFPageContentEditorProcessor::performInterceptInstruction(Operator current
ProcessOrder processOrder, ProcessOrder processOrder,
const QByteArray& operatorAsText) const QByteArray& operatorAsText)
{ {
Q_UNUSED(operatorAsText); BaseClass::performInterceptInstruction(currentOperator, processOrder, operatorAsText);
if (processOrder == ProcessOrder::BeforeOperation) if (processOrder == ProcessOrder::BeforeOperation)
{ {
@ -75,19 +75,16 @@ void PDFPageContentEditorProcessor::performInterceptInstruction(Operator current
void PDFPageContentEditorProcessor::performPathPainting(const QPainterPath& path, bool stroke, bool fill, bool text, Qt::FillRule fillRule) void PDFPageContentEditorProcessor::performPathPainting(const QPainterPath& path, bool stroke, bool fill, bool text, Qt::FillRule fillRule)
{ {
BaseClass::performPathPainting(path, stroke, fill, text, fillRule);
if (path.isEmpty()) if (path.isEmpty())
{ {
return; return;
} }
Q_UNUSED(fillRule);
Q_UNUSED(stroke);
Q_UNUSED(fill);
Q_UNUSED(text);
if (text) if (text)
{ {
QPainterPath mappedPath = getCurrentWorldMatrix().map(path); QPainterPath mappedPath = getGraphicState()->getCurrentTransformationMatrix().map(path);
QRectF boundingRect = mappedPath.boundingRect(); QRectF boundingRect = mappedPath.boundingRect();
m_textBoundingRect = m_textBoundingRect.united(boundingRect); m_textBoundingRect = m_textBoundingRect.united(boundingRect);
m_textPath.addPath(mappedPath); m_textPath.addPath(mappedPath);
@ -100,6 +97,8 @@ void PDFPageContentEditorProcessor::performPathPainting(const QPainterPath& path
void PDFPageContentEditorProcessor::performUpdateGraphicsState(const PDFPageContentProcessorState& state) void PDFPageContentEditorProcessor::performUpdateGraphicsState(const PDFPageContentProcessorState& state)
{ {
BaseClass::performUpdateGraphicsState(state);
if (isTextProcessing() && m_contentElementText) if (isTextProcessing() && m_contentElementText)
{ {
PDFEditedPageContentElementText::Item item; PDFEditedPageContentElementText::Item item;
@ -112,6 +111,8 @@ void PDFPageContentEditorProcessor::performUpdateGraphicsState(const PDFPageCont
void PDFPageContentEditorProcessor::performProcessTextSequence(const TextSequence& textSequence, ProcessOrder order) void PDFPageContentEditorProcessor::performProcessTextSequence(const TextSequence& textSequence, ProcessOrder order)
{ {
BaseClass::performProcessTextSequence(textSequence, order);
if (order == ProcessOrder::BeforeOperation) if (order == ProcessOrder::BeforeOperation)
{ {
PDFEditedPageContentElementText::Item item; PDFEditedPageContentElementText::Item item;
@ -124,7 +125,7 @@ void PDFPageContentEditorProcessor::performProcessTextSequence(const TextSequenc
bool PDFPageContentEditorProcessor::performOriginalImagePainting(const PDFImage& image, const PDFStream* stream) bool PDFPageContentEditorProcessor::performOriginalImagePainting(const PDFImage& image, const PDFStream* stream)
{ {
Q_UNUSED(image); BaseClass::performOriginalImagePainting(image, stream);
QRectF boundingBox = getCurrentWorldMatrix().mapRect(QRectF(0.0, 0.0, 1.0, 1.0)); QRectF boundingBox = getCurrentWorldMatrix().mapRect(QRectF(0.0, 0.0, 1.0, 1.0));
PDFObject imageObject = PDFObject::createStream(std::make_shared<PDFStream>(*stream)); PDFObject imageObject = PDFObject::createStream(std::make_shared<PDFStream>(*stream));
@ -135,6 +136,8 @@ bool PDFPageContentEditorProcessor::performOriginalImagePainting(const PDFImage&
void PDFPageContentEditorProcessor::performImagePainting(const QImage& image) void PDFPageContentEditorProcessor::performImagePainting(const QImage& image)
{ {
BaseClass::performImagePainting(image);
PDFEditedPageContentElement* backElement = m_content.getBackElement(); PDFEditedPageContentElement* backElement = m_content.getBackElement();
Q_ASSERT(backElement); Q_ASSERT(backElement);
@ -144,6 +147,8 @@ void PDFPageContentEditorProcessor::performImagePainting(const QImage& image)
void PDFPageContentEditorProcessor::performSaveGraphicState(ProcessOrder order) void PDFPageContentEditorProcessor::performSaveGraphicState(ProcessOrder order)
{ {
BaseClass::performSaveGraphicState(order);
if (order == ProcessOrder::BeforeOperation) if (order == ProcessOrder::BeforeOperation)
{ {
m_clippingPaths.push(m_clippingPaths.top()); m_clippingPaths.push(m_clippingPaths.top());
@ -152,6 +157,8 @@ void PDFPageContentEditorProcessor::performSaveGraphicState(ProcessOrder order)
void PDFPageContentEditorProcessor::performRestoreGraphicState(ProcessOrder order) void PDFPageContentEditorProcessor::performRestoreGraphicState(ProcessOrder order)
{ {
BaseClass::performRestoreGraphicState(order);
if (order == ProcessOrder::AfterOperation) if (order == ProcessOrder::AfterOperation)
{ {
m_clippingPaths.pop(); m_clippingPaths.pop();
@ -160,7 +167,7 @@ void PDFPageContentEditorProcessor::performRestoreGraphicState(ProcessOrder orde
void PDFPageContentEditorProcessor::performClipping(const QPainterPath& path, Qt::FillRule fillRule) void PDFPageContentEditorProcessor::performClipping(const QPainterPath& path, Qt::FillRule fillRule)
{ {
Q_UNUSED(fillRule); BaseClass::performClipping(path, fillRule);
if (m_clippingPaths.top().isEmpty()) if (m_clippingPaths.top().isEmpty())
{ {