paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-18 05:59:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

LazUtils: Initialize LazFreeType graphics state correctly. Issue #37033, patch from circular.

Browse Source 
git-svn-id: trunk@63128 -
This commit is contained in:
juha 2020-05-09 18:34:47 +00:00
parent e3569b9c13
commit 74b8021cc2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/lazutils/ttgload.pas
View File

@ -745,10 +745,6 @@ const
end; end;
Context_Load( exec, instance ); Context_Load( exec, instance );
if instance^.GS.instruct_control and 2 <> 0 then
exec^.GS := Default_GraphicsState
else
exec^.GS := instance^.GS;
glyph^.outline.high_precision := ( instance^.metrics.y_ppem < 24 ); glyph^.outline.high_precision := ( instance^.metrics.y_ppem < 24 );
@ -925,6 +921,11 @@ const
if load_top > 0 then if load_top > 0 then
new_flags := new_flags and not TT_Load_Debug; new_flags := new_flags and not TT_Load_Debug;
if instance^.GS.instruct_control and 2 <> 0 then
exec^.GS := Default_GraphicsState
else
exec^.GS := instance^.GS;
if Load_Simple_Glyph( if Load_Simple_Glyph(
ftstream, ftstream,
exec, exec,

3
components/lazutils/ttobjs.pas
View File

@ -335,7 +335,7 @@ type
(* *) (* *)
(* - if projVector is horizontal, ratio = x_ratio = 1.0 *) (* - if projVector is horizontal, ratio = x_ratio = 1.0 *)
(* - if projVector is vertical, ratop = y_ratio *) (* - if projVector is vertical, ratop = y_ratio *)
(* - else, ratio = sqrt( (proj.x*x_ratio)ý+(proj.y*y_ratio)ý ) *) (* - else, ratio = sqrt( (proj.x*x_ratio)**2+(proj.y*y_ratio)**2 ) *)
(* *) (* *)
(* reading a cvt value returns ratio*cvt[index] *) (* reading a cvt value returns ratio*cvt[index] *)
(* writing a cvt value in pixels cvt[index]/ratio *) (* writing a cvt value in pixels cvt[index]/ratio *)
@ -1722,7 +1722,6 @@ const
( (not debug) and Run_Ins( @exec^ ) ) then ( (not debug) and Run_Ins( @exec^ ) ) then
goto Fin; goto Fin;
ins^.GS := exec^.GS;
Instance_Reset := Success; Instance_Reset := Success;
Fin: Fin: