Issue #190: PageMaster crash + black bubbles instead of bubbles with correct color

This commit is contained in:
Jakub Melka 2024-06-28 17:13:23 +02:00
parent 3728af3f41
commit b6fda40128
4 changed files with 18 additions and 2 deletions

View File

@ -1284,6 +1284,19 @@ void PDFDocumentBuilder::mergeNames(PDFObjectReference a, PDFObjectReference b)
const PDFDictionary* aDict = getDictionaryFromObject(aObject); const PDFDictionary* aDict = getDictionaryFromObject(aObject);
const PDFDictionary* bDict = getDictionaryFromObject(bObject); const PDFDictionary* bDict = getDictionaryFromObject(bObject);
PDFDictionary aDictDummy;
PDFDictionary bDictDummy;
if (!aDict)
{
aDict = &aDictDummy;
}
if (!bDict)
{
bDict = &bDictDummy;
}
// Store keys // Store keys
std::set<QByteArray> keys; std::set<QByteArray> keys;
for (size_t i = 0; i < aDict->getCount(); ++i) for (size_t i = 0; i < aDict->getCount(); ++i)

View File

@ -1245,6 +1245,9 @@ bool PDFTransparencyRenderer::isContentKindSuppressed(ContentKind kind) const
} }
break; break;
case ContentKind::Forms:
return false;
default: default:
Q_ASSERT(false); Q_ASSERT(false);
break; break;

View File

@ -107,8 +107,7 @@ void PageItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& opti
continue; continue;
} }
QColor color; QColor color = QColor::fromString(splitted.front());
color.fromString(splitted.front());
QRect bubbleRect = pdf::PDFPainterHelper::drawBubble(painter, tagPoint, color, splitted.back(), Qt::AlignLeft | Qt::AlignBottom); QRect bubbleRect = pdf::PDFPainterHelper::drawBubble(painter, tagPoint, color, splitted.back(), Qt::AlignLeft | Qt::AlignBottom);
tagPoint.ry() += bubbleRect.height() + verticalSpacing; tagPoint.ry() += bubbleRect.height() + verticalSpacing;
} }

View File

@ -1,4 +1,5 @@
CURRENT: CURRENT:
- Issue #190: PageMaster crash + black bubbles instead of bubbles with correct color
- Issue #183: Option to ignore PDF security settings - Issue #183: Option to ignore PDF security settings
- Issue #182: PDF4QT Document Diff command line cmd line arguments ignored - Issue #182: PDF4QT Document Diff command line cmd line arguments ignored
- Issue #181: where is the dark mode? - Issue #181: where is the dark mode?