extras/source/truetype/symbol/README | 6 +++---
vcl/source/gdi/CommonSalLayout.cxx | 10 ++++++----
2 files changed, 9 insertions(+), 7 deletions(-)
New commits:
commit 7a072614b234529d24515464c3f6575bb33480e5
Author: Khaled Hosny <khaledho...@eglug.org>
Date: Sat Nov 19 15:35:59 2016 +0200
Typos
Change-Id: Iff293841047a945107033ed81d4e81fb8bbe67b8
diff --git a/extras/source/truetype/symbol/README
b/extras/source/truetype/symbol/README
index b69b721..80d8975 100644
--- a/extras/source/truetype/symbol/README
+++ b/extras/source/truetype/symbol/README
@@ -9,7 +9,7 @@ important so that when two versions of the font are installed,
e.g. one
bundled inside the office installation, and one already installed on the system
that the most recent font can be detected and favoured.
-Bumping the font version is easiest done manually by bumping the the place in
+Bumping the font version is easiest done manually by bumping the place in
the .sfd where the version is mentioned, e.g.
-Version: 102.3
@@ -21,5 +21,5 @@ The glyph names in the font should follow Adobe Glyph list
for new fonts
Fragments of OpenSymbol are mapped internally to a number of other
fonts for interoperability purposes. See
-unotools/source/misc/fontcvt.cxx pwrt. the StarSymbol conversion
-tables.
\ No newline at end of file
+unotools/source/misc/fontcvt.cxx pwrt, the StarSymbol conversion
+tables.
commit d35b5c8db00afb0316b7ae4c43126a5dad194cbb
Author: Khaled Hosny <khaledho...@eglug.org>
Date: Sat Nov 19 15:07:03 2016 +0200
tdf#103891: Fix DX array calculation
This partially reverts:
commit c49d5dea164b09b05a898495fa2dd48b7ca4f0e4
Author: Khaled Hosny <khaledho...@eglug.org>
Date: Fri Nov 11 18:24:11 2016 +0200
tdf#103765: Minimize the effect of rounding to int
Instead of scaling the relative coordinates and accumulating rounding
errors, scale the absolute coordinates. Also round to int instead of
truncating.
as it results in OutputDevice::GetTextArray() calculating wrong absolute
DX array. Again the whole DX array thing is brain dead.
Change-Id: Ia257b73062315b797b5ed52e434562fad3b3fb90
diff --git a/vcl/source/gdi/CommonSalLayout.cxx
b/vcl/source/gdi/CommonSalLayout.cxx
index 9ad1967..b9240e7 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -595,11 +595,13 @@ bool CommonSalLayout::LayoutText(ImplLayoutArgs& rArgs)
nYOffset = -pHbPositions[i].y_offset;
}
- Point aNewPos(lround((aCurrPos.X() + nXOffset) * nXScale),
- lround((aCurrPos.Y() + nYOffset) * nYScale));
+ nAdvance *= nXScale;
+ nXOffset *= nXScale;
+ nYOffset *= nYScale;
+
+ Point aNewPos(aCurrPos.X() + nXOffset, aCurrPos.Y() +
nYOffset);
const GlyphItem aGI(nCharPos, nGlyphIndex, aNewPos,
nGlyphFlags,
- lround(nAdvance * nXScale),
- lround(nXOffset * nXScale));
+ nAdvance, nXOffset);
AppendGlyph(aGI);
aCurrPos.X() += nAdvance;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
