paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-22 02:29:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

freetype: fix font output, isuue 17156

Browse Source 
git-svn-id: trunk@49628 -
This commit is contained in:
ondrej 2021-07-22 04:03:43 +00:00
parent 83bb854f1e
commit 41d6374bb6
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/fcl-image/src/freetype.pp
View File

@ -807,7 +807,7 @@ begin
end; end;
// render the glyph // render the glyph
FTCheck(FT_Glyph_Copy (g^.glyph, gl),sErrMakingString1); FTCheck(FT_Glyph_Copy (g^.glyph, gl),sErrMakingString1);
FTCheck(FT_Glyph_To_Bitmap (gl, CurRenderMode, @pos, true),sErrMakingString4); FTCheck(FT_Glyph_To_Bitmap (gl, CurRenderMode, PFT_Vector(0), true),sErrMakingString4);
// Copy what is needed to record // Copy what is needed to record
bm := PFT_BitmapGlyph(gl); bm := PFT_BitmapGlyph(gl);
with ABitmaps.Bitmaps[r]^ do with ABitmaps.Bitmaps[r]^ do
@ -842,11 +842,8 @@ begin
end; end;
end; end;
// place position for next glyph // place position for next glyph
// The previous code in this place used shr 10, which // pos is in 26.6 format, whereas advance is in 16.16 format - we need (shr (16-6)) for the conversion
// produces wrongly spaced text and looks very ugly pos.x := pos.x + (gl^.advance.x shr 10);
// for more information see: http://bugs.freepascal.org/view.php?id=17156
pos.x := pos.x + (gl^.advance.x shr 11);
// pos.y := pos.y + (gl^.advance.y shr 6); // for angled texts also
if prevx > pos.x then if prevx > pos.x then
pos.x := prevx; pos.x := prevx;
// finish rendered glyph // finish rendered glyph