r14558 by cbradney - Clarify hack with surrounding comments
scribus-commit
scribus-commit at lists.scribus.net
Thu Jan 21 00:25:37 CET 2010
Revision: 14558
Author: cbradney
Date: 2010-01-20T23:24:55.142298Z
Commit message: Clarify hack with surrounding comments
Changeset:
M /trunk/Scribus/scribus/pdflib_core.cpp
Diffs:
Index: scribus/pdflib_core.cpp
===================================================================
--- scribus/pdflib_core.cpp (revision 14557)
+++ scribus/pdflib_core.cpp (revision 14558)
@@ -4719,8 +4719,9 @@
{
ScText hl3;
static_cast<CharStyle&>(hl3) = static_cast<const CharStyle&>(hl2);
- /* HACK to fix Bug #8446 */
+ //<< HACK to fix Bug #8446
hl3.setEffects(hl3.effects() & (~(ScStyle_Outline)));
+ //>>
hl3.ch = hl2.ch;
hl3.glyph.glyph = hl2.glyph.glyph;
hl3.setFillColor(hl2.strokeColor());
@@ -4756,8 +4757,9 @@
gl2 = gl2->more;
}
static_cast<CharStyle&>(hl2) = static_cast<const CharStyle&>(*hl);
- /* HACK to fix Bug #8446 */
+ //<< HACK to fix Bug #8446
hl2.setEffects(hl2.effects() & (~(ScStyle_Outline)));
+ //>>
hl2.setFillColor(hl->strokeColor());
hl2.setFillShade(hl->strokeShade());
hl2.glyph.xadvance = hl->glyph.xadvance;
@@ -4819,8 +4821,9 @@
{
ScText hl3;
static_cast<CharStyle&>(hl3) = static_cast<const CharStyle&>(hl2);
- /* HACK to fix Bug #8446 */
+ //<< HACK to fix Bug #8446
hl3.setEffects(hl3.effects() & (~(ScStyle_Outline)));
+ //>>
hl3.ch = hl2.ch;
hl3.glyph.glyph = hl2.glyph.glyph;
hl3.setFillColor(hl2.strokeColor());
@@ -4849,8 +4852,9 @@
hl2.ch = ch;
hl2.glyph.glyph = hl->glyph.glyph;
static_cast<CharStyle&>(hl2) = static_cast<const CharStyle&>(*hl);
- /* HACK to fix Bug #8446 */
+ //<< HACK to fix Bug #8446
hl2.setEffects(hl2.effects() & (~(ScStyle_Outline)));
+ //>>
hl2.setFillColor(hl->strokeColor());
hl2.setFillShade(hl->strokeShade());
hl2.glyph.yoffset = hl->glyph.yoffset - (chstyle.fontSize() * chstyle.shadowYOffset() / 10000.0);
More information about the scribus-commit
mailing list