Un-static-ify FreeType font transforms.

QuLogic · QuLogic · commit cd371192aaf3 · 2017-10-20T04:47:12.000-04:00
Static initializers are only applied the first time, so any subsequent
calls with alternate hinting_factor would use the first value. FreeType
copies the matrix values into an internal structure, so these do not
really need to be static.
diff --git a/src/ft2font.cpp b/src/ft2font.cpp
@@ -515,7 +515,7 @@ FT2Font::FT2Font(FT_Open_Args &open_args, long hinting_factor_) : image(), face(
         face->face_flags |= FT_FACE_FLAG_EXTERNAL_STREAM;
     }
 
-    static FT_Matrix transform = { 65536 / hinting_factor, 0, 0, 65536 };
+    FT_Matrix transform = { 65536 / hinting_factor, 0, 0, 65536 };
     FT_Set_Transform(face, &transform, 0);
 }
 
@@ -548,7 +548,7 @@ void FT2Font::set_size(double ptsize, double dpi)
 {
     int error = FT_Set_Char_Size(
         face, (long)(ptsize * 64), 0, (unsigned int)(dpi * hinting_factor), (unsigned int)dpi);
-    static FT_Matrix transform = { 65536 / hinting_factor, 0, 0, 65536 };
+    FT_Matrix transform = { 65536 / hinting_factor, 0, 0, 65536 };
     FT_Set_Transform(face, &transform, 0);
 
     if (error) {

Original file line number	Diff line number	Diff line change
`@@ -515,7 +515,7 @@ FT2Font::FT2Font(FT_Open_Args &open_args, long hinting_factor_) : image(), face(`
`515`	`515`	`face->face_flags \|= FT_FACE_FLAG_EXTERNAL_STREAM;`
`516`	`516`	`}`
`517`	`517`
`518`		`- static FT_Matrix transform = { 65536 / hinting_factor, 0, 0, 65536 };`
	`518`	`+ FT_Matrix transform = { 65536 / hinting_factor, 0, 0, 65536 };`
`519`	`519`	`FT_Set_Transform(face, &transform, 0);`
`520`	`520`	`}`
`521`	`521`
`@@ -548,7 +548,7 @@ void FT2Font::set_size(double ptsize, double dpi)`
`548`	`548`	`{`
`549`	`549`	`int error = FT_Set_Char_Size(`
`550`	`550`	`face, (long)(ptsize * 64), 0, (unsigned int)(dpi * hinting_factor), (unsigned int)dpi);`
`551`		`- static FT_Matrix transform = { 65536 / hinting_factor, 0, 0, 65536 };`
	`551`	`+ FT_Matrix transform = { 65536 / hinting_factor, 0, 0, 65536 };`
`552`	`552`	`FT_Set_Transform(face, &transform, 0);`
`553`	`553`
`554`	`554`	`if (error) {`