]>
Commit | Line | Data |
---|---|---|
2f13208e JB |
1 | --- freetype-2.5.1/ft2demos-2.5.1/src/ftgrid.c.orig 2013-11-21 16:56:59.920675040 +0100 |
2 | +++ freetype-2.5.1/ft2demos-2.5.1/src/ftgrid.c 2013-11-27 20:29:23.464470407 +0100 | |
3 | @@ -53,10 +53,12 @@ | |
4 | struct AF_GlyphHintsRec_; | |
5 | typedef struct AF_GlyphHintsRec_* AF_GlyphHints; | |
6 | ||
7 | +#ifdef FT_DEBUG_AUTOFIT | |
8 | extern int _af_debug_disable_horz_hints; | |
9 | extern int _af_debug_disable_vert_hints; | |
10 | extern int _af_debug_disable_blue_hints; | |
11 | extern AF_GlyphHints _af_debug_hints; | |
12 | +#endif | |
13 | ||
14 | #ifdef __cplusplus | |
15 | extern "C" { | |
16 | @@ -495,19 +497,26 @@ | |
17 | if ( status.do_segment ) | |
18 | { | |
19 | /* Force hinting first in order to collect segment info. */ | |
20 | +#ifdef FT_DEBUG_AUTOFIT | |
21 | _af_debug_disable_horz_hints = 0; | |
22 | _af_debug_disable_vert_hints = 0; | |
23 | +#endif | |
24 | ||
25 | if ( !FT_Load_Glyph( size->face, st->Num, | |
26 | FT_LOAD_DEFAULT | | |
27 | FT_LOAD_NO_BITMAP | | |
28 | FT_LOAD_FORCE_AUTOHINT | | |
29 | FT_LOAD_TARGET_NORMAL ) ) | |
30 | - grid_hint_draw_segment( &status, _af_debug_hints ); | |
31 | +#ifdef FT_DEBUG_AUTOFIT | |
32 | + grid_hint_draw_segment( &status, _af_debug_hints ) | |
33 | +#endif | |
34 | + ; | |
35 | } | |
36 | ||
37 | +#ifdef FT_DEBUG_AUTOFIT | |
38 | _af_debug_disable_horz_hints = !st->do_horz_hints; | |
39 | _af_debug_disable_vert_hints = !st->do_vert_hints; | |
40 | +#endif | |
41 | ||
42 | if ( FT_Load_Glyph( size->face, st->Num, | |
43 | handle->load_flags | FT_LOAD_NO_BITMAP ) ) | |
44 | @@ -862,7 +871,9 @@ | |
45 | ||
46 | ft_trace_levels[trace_afhints] = 7; | |
47 | status.header = "dumping glyph edges to stdout"; | |
48 | +#ifdef FT_DEBUG_AUTOFIT | |
49 | af_glyph_hints_dump_edges( _af_debug_hints ); | |
50 | +#endif | |
51 | ft_trace_levels[trace_afhints] = old_trace_level; | |
52 | } | |
53 | else | |
54 | @@ -882,7 +893,9 @@ | |
55 | ||
56 | ft_trace_levels[trace_afhints] = 7; | |
57 | status.header = "dumping glyph segments to stdout"; | |
58 | +#ifdef FT_DEBUG_AUTOFIT | |
59 | af_glyph_hints_dump_segments( _af_debug_hints ); | |
60 | +#endif | |
61 | ft_trace_levels[trace_afhints] = old_trace_level; | |
62 | } | |
63 | else | |
64 | @@ -902,7 +915,9 @@ | |
65 | ||
66 | ft_trace_levels[trace_afhints] = 7; | |
67 | status.header = "dumping glyph points to stdout"; | |
68 | +#ifdef FT_DEBUG_AUTOFIT | |
69 | af_glyph_hints_dump_points( _af_debug_hints ); | |
70 | +#endif | |
71 | ft_trace_levels[trace_afhints] = old_trace_level; | |
72 | } | |
73 | else |