summaryrefslogtreecommitdiff
path: root/src/lib/CMXParser.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/CMXParser.cpp')
-rw-r--r--src/lib/CMXParser.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/lib/CMXParser.cpp b/src/lib/CMXParser.cpp
index 324ca0c..bf3f818 100644
--- a/src/lib/CMXParser.cpp
+++ b/src/lib/CMXParser.cpp
@@ -1411,9 +1411,9 @@ bool libcdr::CMXParser::readRenderingAttributes(librevenge::RVNGInputStream *inp
return false;
}
}
- CDRLineStyle lineStyle;
if (bitMask & 0x02) // outline
{
+ CDRLineStyle lineStyle;
if (m_precision == libcdr::PRECISION_32BIT)
{
do
@@ -1444,13 +1444,11 @@ bool libcdr::CMXParser::readRenderingAttributes(librevenge::RVNGInputStream *inp
CDR_DEBUG_MSG((" Outline specification\n"));
lineStyle = getLineStyle(readU16(input, m_bigEndian));
}
+ m_collector->collectLineStyle(lineStyle.lineType, lineStyle.capsType, lineStyle.joinType,
+ lineStyle.lineWidth, lineStyle.stretch, lineStyle.angle,
+ lineStyle.color, lineStyle.dashArray,
+ lineStyle.startMarker, lineStyle.endMarker);
}
- else
- lineStyle.lineType = 1;
- m_collector->collectLineStyle(lineStyle.lineType, lineStyle.capsType, lineStyle.joinType,
- lineStyle.lineWidth, lineStyle.stretch, lineStyle.angle,
- lineStyle.color, lineStyle.dashArray,
- lineStyle.startMarker, lineStyle.endMarker);
if (bitMask & 0x04) // lens
{
if (m_precision == libcdr::PRECISION_32BIT)