Werner Lemberg pushed to branch master at FreeType / FreeType
Commits:
-
08f66322
by Werner Lemberg at 2021-06-08T18:23:16+02:00
9 changed files:
- docs/CHANGES
- include/freetype/ftlogging.h
- include/freetype/ftmodapi.h
- src/base/ftcalc.c
- src/base/ftlcdfil.c
- src/base/ftobjs.c
- src/cid/cidload.c
- src/sfnt/ttcolr.c
- src/sfnt/ttcolr.h
Changes:
... | ... | @@ -72,6 +72,9 @@ CHANGES BETWEEN 2.10.4 and 2.11.0 |
72 | 72 |
|
73 | 73 |
This work was Priyesh Kumar's GSoC 2020 project.
|
74 | 74 |
|
75 |
+ - PCF bitmap fonts compressed with LZW (these are usually files with
|
|
76 |
+ the extension `.pcf.Z`) are now handled correctly.
|
|
77 |
+ |
|
75 | 78 |
- Improved Meson build support for the library.
|
76 | 79 |
|
77 | 80 |
- Meson support to build The FreeType demo programs.
|
... | ... | @@ -68,6 +68,10 @@ FT_BEGIN_HEADER |
68 | 68 |
* @note:
|
69 | 69 |
* This function does nothing if compilation option `FT_DEBUG_LOGGING`
|
70 | 70 |
* isn't set.
|
71 |
+ *
|
|
72 |
+ * @since:
|
|
73 |
+ * 2.11
|
|
74 |
+ *
|
|
71 | 75 |
*/
|
72 | 76 |
FT_EXPORT( void )
|
73 | 77 |
FT_Trace_Set_Level( const char* tracing_level );
|
... | ... | @@ -83,10 +87,13 @@ FT_BEGIN_HEADER |
83 | 87 |
* (i.e., to the value of the `FT2_DEBUG` environment value or to NULL
|
84 | 88 |
* if `FT2_DEBUG` is not set).
|
85 | 89 |
*
|
86 |
- *
|
|
87 | 90 |
* @note:
|
88 | 91 |
* This function does nothing if compilation option `FT_DEBUG_LOGGING`
|
89 | 92 |
* isn't set.
|
93 |
+ *
|
|
94 |
+ * @since:
|
|
95 |
+ * 2.11
|
|
96 |
+ *
|
|
90 | 97 |
*/
|
91 | 98 |
FT_EXPORT( void )
|
92 | 99 |
FT_Trace_Set_Default_Level( void );
|
... | ... | @@ -111,6 +118,10 @@ FT_BEGIN_HEADER |
111 | 118 |
*
|
112 | 119 |
* args::
|
113 | 120 |
* Arguments of debug or tracing messages.
|
121 |
+ *
|
|
122 |
+ * @since:
|
|
123 |
+ * 2.11
|
|
124 |
+ *
|
|
114 | 125 |
*/
|
115 | 126 |
typedef void
|
116 | 127 |
(*FT_Custom_Log_Handler)( const char* ft_component,
|
... | ... | @@ -133,6 +144,10 @@ FT_BEGIN_HEADER |
133 | 144 |
* @note:
|
134 | 145 |
* This function does nothing if compilation option `FT_DEBUG_LOGGING`
|
135 | 146 |
* isn't set.
|
147 |
+ *
|
|
148 |
+ * @since:
|
|
149 |
+ * 2.11
|
|
150 |
+ *
|
|
136 | 151 |
*/
|
137 | 152 |
FT_EXPORT( void )
|
138 | 153 |
FT_Set_Log_Handler( FT_Custom_Log_Handler handler );
|
... | ... | @@ -150,6 +165,10 @@ FT_BEGIN_HEADER |
150 | 165 |
* @note:
|
151 | 166 |
* This function does nothing if compilation option `FT_DEBUG_LOGGING`
|
152 | 167 |
* isn't set.
|
168 |
+ *
|
|
169 |
+ * @since:
|
|
170 |
+ * 2.11
|
|
171 |
+ *
|
|
153 | 172 |
*/
|
154 | 173 |
FT_EXPORT( void )
|
155 | 174 |
FT_Set_Default_Log_Handler( void );
|
... | ... | @@ -343,6 +343,9 @@ FT_BEGIN_HEADER |
343 | 343 |
* The font driver name is a valid `module_name` for @FT_Property_Set
|
344 | 344 |
* and @FT_Property_Get. This is not the same as @FT_Get_Font_Format.
|
345 | 345 |
*
|
346 |
+ * @since:
|
|
347 |
+ * 2.11
|
|
348 |
+ *
|
|
346 | 349 |
*/
|
347 | 350 |
#define FT_FACE_DRIVER_NAME( face ) \
|
348 | 351 |
( ( *(FT_Module_Class**)( ( face )->driver ) )->module_name )
|
... | ... | @@ -109,7 +109,7 @@ |
109 | 109 |
|
110 | 110 |
#ifndef FT_MSB
|
111 | 111 |
|
112 |
- FT_BASE_DEF ( FT_Int )
|
|
112 |
+ FT_BASE_DEF( FT_Int )
|
|
113 | 113 |
FT_MSB( FT_UInt32 z )
|
114 | 114 |
{
|
115 | 115 |
FT_Int shift = 0;
|
... | ... | @@ -32,7 +32,7 @@ |
32 | 32 |
|
33 | 33 |
|
34 | 34 |
/* add padding according to filter weights */
|
35 |
- FT_BASE_DEF (void)
|
|
35 |
+ FT_BASE_DEF( void )
|
|
36 | 36 |
ft_lcd_padding( FT_BBox* cbox,
|
37 | 37 |
FT_GlyphSlot slot,
|
38 | 38 |
FT_Render_Mode mode )
|
... | ... | @@ -368,7 +368,7 @@ |
368 | 368 |
#else /* !FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
|
369 | 369 |
|
370 | 370 |
/* add padding to accommodate outline shifts */
|
371 |
- FT_BASE_DEF (void)
|
|
371 |
+ FT_BASE_DEF( void )
|
|
372 | 372 |
ft_lcd_padding( FT_BBox* cbox,
|
373 | 373 |
FT_GlyphSlot slot,
|
374 | 374 |
FT_Render_Mode mode )
|
... | ... | @@ -91,7 +91,7 @@ |
91 | 91 |
"LCD 8-bit bitmap",
|
92 | 92 |
"vertical LCD 8-bit bitmap",
|
93 | 93 |
"BGRA 32-bit color image bitmap",
|
94 |
- "SDF 16-bit bitmap"
|
|
94 |
+ "SDF 8-bit bitmap"
|
|
95 | 95 |
};
|
96 | 96 |
|
97 | 97 |
#endif /* FT_DEBUG_LEVEL_TRACE */
|
... | ... | @@ -5602,7 +5602,7 @@ |
5602 | 5602 |
|
5603 | 5603 |
/* documentation is in freetype.h */
|
5604 | 5604 |
|
5605 |
- FT_EXPORT_DEF ( FT_Bool )
|
|
5605 |
+ FT_EXPORT_DEF( FT_Bool )
|
|
5606 | 5606 |
FT_Get_Color_Glyph_Paint( FT_Face face,
|
5607 | 5607 |
FT_UInt base_glyph,
|
5608 | 5608 |
FT_Color_Root_Transform root_transform,
|
... | ... | @@ -5633,7 +5633,7 @@ |
5633 | 5633 |
|
5634 | 5634 |
/* documentation is in freetype.h */
|
5635 | 5635 |
|
5636 |
- FT_EXPORT_DEF ( FT_Bool )
|
|
5636 |
+ FT_EXPORT_DEF( FT_Bool )
|
|
5637 | 5637 |
FT_Get_Paint_Layers( FT_Face face,
|
5638 | 5638 |
FT_LayerIterator* layer_iterator,
|
5639 | 5639 |
FT_OpaquePaint* paint )
|
... | ... | @@ -5687,7 +5687,7 @@ |
5687 | 5687 |
|
5688 | 5688 |
/* documentation is in freetype.h */
|
5689 | 5689 |
|
5690 |
- FT_EXPORT_DEF ( FT_Bool )
|
|
5690 |
+ FT_EXPORT_DEF( FT_Bool )
|
|
5691 | 5691 |
FT_Get_Colorline_Stops ( FT_Face face,
|
5692 | 5692 |
FT_ColorStop * color_stop,
|
5693 | 5693 |
FT_ColorStopIterator *iterator )
|
... | ... | @@ -665,11 +665,11 @@ |
665 | 665 |
|
666 | 666 |
|
667 | 667 |
static FT_Error
|
668 |
- cid_hex_to_binary( FT_Byte* data,
|
|
669 |
- FT_ULong data_len,
|
|
670 |
- FT_ULong offset,
|
|
671 |
- CID_Face face,
|
|
672 |
- FT_ULong* data_written )
|
|
668 |
+ cid_hex_to_binary( FT_Byte* data,
|
|
669 |
+ FT_ULong data_len,
|
|
670 |
+ FT_ULong offset,
|
|
671 |
+ CID_Face face,
|
|
672 |
+ FT_ULong* data_written )
|
|
673 | 673 |
{
|
674 | 674 |
FT_Stream stream = face->root.stream;
|
675 | 675 |
FT_Error error;
|
... | ... | @@ -629,7 +629,7 @@ |
629 | 629 |
}
|
630 | 630 |
|
631 | 631 |
|
632 |
- FT_LOCAL_DEF ( FT_Bool )
|
|
632 |
+ FT_LOCAL_DEF( FT_Bool )
|
|
633 | 633 |
tt_face_get_colr_glyph_paint( TT_Face face,
|
634 | 634 |
FT_UInt base_glyph,
|
635 | 635 |
FT_Color_Root_Transform root_transform,
|
... | ... | @@ -745,7 +745,7 @@ |
745 | 745 |
}
|
746 | 746 |
|
747 | 747 |
|
748 |
- FT_LOCAL_DEF ( FT_Bool )
|
|
748 |
+ FT_LOCAL_DEF( FT_Bool )
|
|
749 | 749 |
tt_face_get_colorline_stops( TT_Face face,
|
750 | 750 |
FT_ColorStop* color_stop,
|
751 | 751 |
FT_ColorStopIterator *iterator )
|
... | ... | @@ -48,7 +48,7 @@ FT_BEGIN_HEADER |
48 | 48 |
FT_Color_Root_Transform root_transform,
|
49 | 49 |
FT_OpaquePaint* paint );
|
50 | 50 |
|
51 |
- FT_LOCAL ( FT_Bool )
|
|
51 |
+ FT_LOCAL( FT_Bool )
|
|
52 | 52 |
tt_face_get_paint_layers( TT_Face face,
|
53 | 53 |
FT_LayerIterator* iterator,
|
54 | 54 |
FT_OpaquePaint* paint );
|