mirror of
https://github.com/JakubMelka/PDF4QT.git
synced 2025-02-23 23:17:43 +01:00
Issue #190: PageMaster crash + black bubbles instead of bubbles with correct color
This commit is contained in:
parent
3728af3f41
commit
b6fda40128
@ -1284,6 +1284,19 @@ void PDFDocumentBuilder::mergeNames(PDFObjectReference a, PDFObjectReference b)
|
||||
const PDFDictionary* aDict = getDictionaryFromObject(aObject);
|
||||
const PDFDictionary* bDict = getDictionaryFromObject(bObject);
|
||||
|
||||
PDFDictionary aDictDummy;
|
||||
PDFDictionary bDictDummy;
|
||||
|
||||
if (!aDict)
|
||||
{
|
||||
aDict = &aDictDummy;
|
||||
}
|
||||
|
||||
if (!bDict)
|
||||
{
|
||||
bDict = &bDictDummy;
|
||||
}
|
||||
|
||||
// Store keys
|
||||
std::set<QByteArray> keys;
|
||||
for (size_t i = 0; i < aDict->getCount(); ++i)
|
||||
|
@ -1245,6 +1245,9 @@ bool PDFTransparencyRenderer::isContentKindSuppressed(ContentKind kind) const
|
||||
}
|
||||
break;
|
||||
|
||||
case ContentKind::Forms:
|
||||
return false;
|
||||
|
||||
default:
|
||||
Q_ASSERT(false);
|
||||
break;
|
||||
|
@ -107,8 +107,7 @@ void PageItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& opti
|
||||
continue;
|
||||
}
|
||||
|
||||
QColor color;
|
||||
color.fromString(splitted.front());
|
||||
QColor color = QColor::fromString(splitted.front());
|
||||
QRect bubbleRect = pdf::PDFPainterHelper::drawBubble(painter, tagPoint, color, splitted.back(), Qt::AlignLeft | Qt::AlignBottom);
|
||||
tagPoint.ry() += bubbleRect.height() + verticalSpacing;
|
||||
}
|
||||
|
@ -1,4 +1,5 @@
|
||||
CURRENT:
|
||||
- Issue #190: PageMaster crash + black bubbles instead of bubbles with correct color
|
||||
- Issue #183: Option to ignore PDF security settings
|
||||
- Issue #182: PDF4QT Document Diff command line cmd line arguments ignored
|
||||
- Issue #181: where is the dark mode?
|
||||
|
Loading…
x
Reference in New Issue
Block a user