Werner Lemberg pushed to branch master at FreeType / FreeType Demo Programs
Commits:
-
0e606500
by Werner Lemberg at 2021-06-30T10:23:08+02:00
3 changed files:
Changes:
| 1 |
+2021-06-30 Werner Lemberg <wl@gnu.org>
|
|
| 2 |
+ |
|
| 3 |
+ [ftlint] Improve output.
|
|
| 4 |
+ |
|
| 5 |
+ * src/ftlint.c (main): Add header to output and remove repetitive
|
|
| 6 |
+ strings.
|
|
| 7 |
+ (Analyze): Updated.
|
|
| 8 |
+ |
|
| 1 | 9 |
2021-06-22 Alexei Podtelezhnikov <apodtele@gmail.com>
|
| 2 | 10 |
|
| 3 | 11 |
[ftlint] Improve error reporting.
|
| ... | ... | @@ -107,7 +107,7 @@ |
| 107 | 107 |
s1 += d1;
|
| 108 | 108 |
}
|
| 109 | 109 |
|
| 110 |
- printf( "X=%.4lf ", s1 ? (double)s2 / s1 : 2.0 );
|
|
| 110 |
+ printf( "%.4lf ", s1 ? (double)s2 / s1 : 2.0 );
|
|
| 111 | 111 |
|
| 112 | 112 |
/* Y-acutance */
|
| 113 | 113 |
for ( s1 = s2 = 0, j = 0; j < bitmap->width; j++ )
|
| ... | ... | @@ -126,7 +126,7 @@ |
| 126 | 126 |
s1 += d1;
|
| 127 | 127 |
}
|
| 128 | 128 |
|
| 129 |
- printf( "Y=%.4lf ", s1 ? (double)s2 / s1 : 2.0 );
|
|
| 129 |
+ printf( "%.4lf ", s1 ? (double)s2 / s1 : 2.0 );
|
|
| 130 | 130 |
}
|
| 131 | 131 |
|
| 132 | 132 |
|
| ... | ... | @@ -248,7 +248,7 @@ |
| 248 | 248 |
continue;
|
| 249 | 249 |
}
|
| 250 | 250 |
|
| 251 |
- printf( quiet ? " %s %s:" : " %s %s:\n",
|
|
| 251 |
+ printf( quiet ? " %s %s:" : " %s %s\n\n",
|
|
| 252 | 252 |
face->family_name, face->style_name );
|
| 253 | 253 |
|
| 254 | 254 |
error = FT_Set_Char_Size( face, ptsize << 6, ptsize << 6, 72, 72 );
|
| ... | ... | @@ -262,6 +262,13 @@ |
| 262 | 262 |
li = last_index < (unsigned int)face->num_glyphs ?
|
| 263 | 263 |
last_index : (unsigned int)face->num_glyphs - 1;
|
| 264 | 264 |
|
| 265 |
+ if ( !quiet )
|
|
| 266 |
+ {
|
|
| 267 |
+ /* "NNNNN AAAxBBBB X.XXXX Y.YYYY MMDD55MMDD55MMDD55MMDD55MMDD55MM" */
|
|
| 268 |
+ printf( " GID imgsize Xacut Yacut MD5 hashsum\n" );
|
|
| 269 |
+ printf( "-------------------------------------------------------------\n" );
|
|
| 270 |
+ }
|
|
| 271 |
+ |
|
| 265 | 272 |
Fail = 0;
|
| 266 | 273 |
for ( id = fi; id <= li; id++ )
|
| 267 | 274 |
{
|
| ... | ... | @@ -283,7 +290,7 @@ |
| 283 | 290 |
if ( quiet )
|
| 284 | 291 |
continue;
|
| 285 | 292 |
|
| 286 |
- printf( "%5u: ", id );
|
|
| 293 |
+ printf( "%5u ", id );
|
|
| 287 | 294 |
|
| 288 | 295 |
error = FT_Render_Glyph( face->glyph, render_mode );
|
| 289 | 296 |
if ( error && error != FT_Err_Cannot_Render_Glyph )
|
| ... | ... | @@ -109,9 +109,9 @@ |
| 109 | 109 |
static FT_MM_Var *multimaster = NULL;
|
| 110 | 110 |
static FT_Fixed design_pos [MAX_MM_AXES];
|
| 111 | 111 |
static FT_Fixed requested_pos[MAX_MM_AXES];
|
| 112 |
- static unsigned int requested_cnt = 0;
|
|
| 113 |
- static unsigned int used_num_axis = 0;
|
|
| 114 |
- static int increment = 20; /* for axes */
|
|
| 112 |
+ static unsigned int requested_cnt = 0;
|
|
| 113 |
+ static unsigned int used_num_axis = 0;
|
|
| 114 |
+ static int increment = 20; /* for axes */
|
|
| 115 | 115 |
|
| 116 | 116 |
/*
|
| 117 | 117 |
* We use the following arrays to support both the display of all axes and
|