Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 18454 → Rev 18495

/trunk/Scribus/scribus/pageitem.cpp
1642,12 → 1642,7
{
if (!isGroup())
{
#if (CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 9, 4))
p->setBlendModeFill(fillBlendmode());
#else
if (fillBlendmode() != 0)
p->beginLayer(1.0 - fillTransparency(), fillBlendmode());
#endif
p->setLineWidth(m_lineWidth);
if (GrType != 0)
{
1766,15 → 1761,8
}
else
p->setLineWidth(0);
#if (CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 9, 4))
p->setBrushOpacity(1.0 - fillTransparency());
p->setPenOpacity(1.0 - lineTransparency());
#else
if (fillBlendmode() == 0)
p->setBrushOpacity(1.0 - fillTransparency());
if (lineBlendmode() == 0)
p->setPenOpacity(1.0 - lineTransparency());
#endif
p->setFillRule(fillRule);
if ((GrMask == 1) || (GrMask == 2) || (GrMask == 4) || (GrMask == 5))
{
1853,12 → 1841,7
{
if (!isGroup())
{
#if (CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 9, 4))
if (fillBlendmode() != 0)
p->endLayer();
#else
p->setBlendModeFill(0);
#endif
p->setMaskMode(0);
// TODO: Investigate whether itemType()==Table should really be here. I got artifacts without it so keeping it here for now. /estan
if (itemType()==PathText || itemType()==PolyLine || itemType()==Spiral || itemType()==Line || itemType()==Symbol || itemType()==Group || itemType()==Table)
1865,13 → 1848,8
doStroke=false;
if ((doStroke) && (!m_Doc->RePos))
{
#if (CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 9, 4))
p->setBlendModeStroke(lineBlendmode());
p->setPenOpacity(1.0 - lineTransparency());
#else
if (lineBlendmode() != 0)
p->beginLayer(1.0 - lineTransparency(), lineBlendmode());
#endif
if ((lineColor() != CommonStrings::None) || (!patternStrokeVal.isEmpty()) || (GrTypeStroke > 0))
{
p->setPen(strokeQColor, m_lineWidth, PLineArt, PLineEnd, PLineJoin);
1956,12 → 1934,7
}
}
}
#if (CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 9, 4))
if (lineBlendmode() != 0)
p->endLayer();
#else
p->setBlendModeStroke(0);
#endif
}
}
}
2014,12 → 1987,7
}
}
else
// Ugly Hack to fix rendering problems with cairo >=1.5.10 && <1.8.0 follows
#if ((CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 5, 10)) && (CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 8, 0)))
p->setupSharpPolygon(&PoLine, false);
#else
p->setupSharpPolygon(&PoLine);
#endif
p->strokePath();
}
}
2026,12 → 1994,7
if ((m_Doc->guidesPrefs().framesShown) && textFlowUsesContourLine() && (ContourLine.size() != 0))
{
p->setPen(Qt::darkGray, 0, Qt::DotLine, Qt::FlatCap, Qt::MiterJoin);
// Ugly Hack to fix rendering problems with cairo >=1.5.10 && <1.8.0 follows
#if ((CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 5, 10)) && (CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 8, 0)))
p->setupSharpPolygon(&ContourLine, false);
#else
p->setupSharpPolygon(&ContourLine);
#endif
p->strokePath();
}
if (itemType()==ImageFrame)