Skip to content

Restrict parser to only add images from Doxygen XML with an HTML type #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KeithBallard wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Restrict parser to only add images from Doxygen XML with an HTML type #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/DoxyXmlParser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,14 @@ class DoxyXmlParser: public xml::ExpatParser<DoxyXmlParser> {
const char** attributes
) {
T* type = AXL_MEM_NEW(T);
TypeStackEntry entry = { type, 0 };
m_typeStack.append(entry);
return type->create(this, context, name, attributes);
if (type->create(this, context, name, attributes)) {
TypeStackEntry entry = { type, 0 };
m_typeStack.append(entry);
return true;
}
else {
return false;
}
}

Compound*
Expand Down
5 changes: 4 additions & 1 deletion src/DoxyXmlType.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1242,7 +1242,6 @@ DocImageType::create(
m_parser = parser;
m_imageBlock = AXL_MEM_NEW(DocImageBlock);
m_imageBlock->m_blockKind = name;
list->insertTail(m_imageBlock);

while (*attributes) {
AttrKind attrKind = AttrKindMap::findValue(attributes[0], AttrKind_Undefined);
Expand All @@ -1267,6 +1266,10 @@ DocImageType::create(
attributes += 2;
}

if (m_imageBlock->m_imageKind == ImageKind_Html) {
list->insertTail(m_imageBlock);
}

return true;
}

Expand Down