Werner Lemberg pushed to branch master at FreeType / FreeType
Commits:
9 changed files:
Changes:
docs/raster.txt
... |
... |
@@ -63,7 +63,7 @@ II. Rendering Technology |
63
|
63
|
`26.6' means that 26 bits are used for the integer part of a
|
64
|
64
|
value and 6 bits are used for the fractional part.
|
65
|
65
|
Consequently, the `distance' between two neighbouring pixels is
|
66
|
|
- 64 `units' (1 unit = 1/64th of a pixel).
|
|
66
|
+ 64 `units' (1 unit = 1/64 of a pixel).
|
67
|
67
|
|
68
|
68
|
Note that, for the rasterizer, pixel centers are located at
|
69
|
69
|
integer coordinates. The TrueType bytecode interpreter,
|
include/freetype/ftcache.h
... |
... |
@@ -424,7 +424,7 @@ FT_BEGIN_HEADER |
424
|
424
|
* pixel ::
|
425
|
425
|
* A Boolean. If 1, the `width` and `height` fields are interpreted as
|
426
|
426
|
* integer pixel character sizes. Otherwise, they are expressed as
|
427
|
|
- * 1/64th of points.
|
|
427
|
+ * 1/64 of points.
|
428
|
428
|
*
|
429
|
429
|
* x_res ::
|
430
|
430
|
* Only used when `pixel` is value~0 to indicate the horizontal
|
include/freetype/ftglyph.h
... |
... |
@@ -413,7 +413,7 @@ FT_BEGIN_HEADER |
413
|
413
|
*
|
414
|
414
|
* delta ::
|
415
|
415
|
* A pointer to a 2d vector to apply. Coordinates are expressed in
|
416
|
|
- * 1/64th of a pixel.
|
|
416
|
+ * 1/64 of a pixel.
|
417
|
417
|
*
|
418
|
418
|
* @return:
|
419
|
419
|
* FreeType error code (if not 0, the glyph format is not scalable).
|
... |
... |
@@ -500,7 +500,7 @@ FT_BEGIN_HEADER |
500
|
500
|
* @output:
|
501
|
501
|
* acbox ::
|
502
|
502
|
* The glyph coordinate bounding box. Coordinates are expressed in
|
503
|
|
- * 1/64th of pixels if it is grid-fitted.
|
|
503
|
+ * 1/64 of pixels if it is grid-fitted.
|
504
|
504
|
*
|
505
|
505
|
* @note:
|
506
|
506
|
* Coordinates are relative to the glyph origin, using the y~upwards
|
include/freetype/ftlcdfil.h
... |
... |
@@ -137,11 +137,11 @@ FT_BEGIN_HEADER |
137
|
137
|
*
|
138
|
138
|
* FT_LCD_FILTER_DEFAULT ::
|
139
|
139
|
* This is a beveled, normalized, and color-balanced five-tap filter
|
140
|
|
- * with weights of [0x08 0x4D 0x56 0x4D 0x08] in 1/256th units.
|
|
140
|
+ * with weights of [0x08 0x4D 0x56 0x4D 0x08] in 1/256 units.
|
141
|
141
|
*
|
142
|
142
|
* FT_LCD_FILTER_LIGHT ::
|
143
|
143
|
* this is a boxy, normalized, and color-balanced three-tap filter with
|
144
|
|
- * weights of [0x00 0x55 0x56 0x55 0x00] in 1/256th units.
|
|
144
|
+ * weights of [0x00 0x55 0x56 0x55 0x00] in 1/256 units.
|
145
|
145
|
*
|
146
|
146
|
* FT_LCD_FILTER_LEGACY ::
|
147
|
147
|
* FT_LCD_FILTER_LEGACY1 ::
|
... |
... |
@@ -226,7 +226,7 @@ FT_BEGIN_HEADER |
226
|
226
|
*
|
227
|
227
|
* weights ::
|
228
|
228
|
* A pointer to an array; the function copies the first five bytes and
|
229
|
|
- * uses them to specify the filter weights in 1/256th units.
|
|
229
|
+ * uses them to specify the filter weights in 1/256 units.
|
230
|
230
|
*
|
231
|
231
|
* @return:
|
232
|
232
|
* FreeType error code. 0~means success.
|
include/freetype/ftpfr.h
... |
... |
@@ -161,7 +161,7 @@ FT_BEGIN_HEADER |
161
|
161
|
*
|
162
|
162
|
* @note:
|
163
|
163
|
* You can use the `x_scale` or `y_scale` results of @FT_Get_PFR_Metrics
|
164
|
|
- * to convert the advance to device subpixels (i.e., 1/64th of pixels).
|
|
164
|
+ * to convert the advance to device subpixels (i.e., 1/64 of pixels).
|
165
|
165
|
*/
|
166
|
166
|
FT_EXPORT( FT_Error )
|
167
|
167
|
FT_Get_PFR_Advance( FT_Face face,
|
include/freetype/internal/pshints.h
... |
... |
@@ -294,7 +294,7 @@ FT_BEGIN_HEADER |
294
|
294
|
*
|
295
|
295
|
* @note:
|
296
|
296
|
* On input, all points within the outline are in font coordinates. On
|
297
|
|
- * output, they are in 1/64th of pixels.
|
|
297
|
+ * output, they are in 1/64 of pixels.
|
298
|
298
|
*
|
299
|
299
|
* The scaling transformation is taken from the 'globals' object which
|
300
|
300
|
* must correspond to the same font as the glyph.
|
... |
... |
@@ -607,7 +607,7 @@ FT_BEGIN_HEADER |
607
|
607
|
*
|
608
|
608
|
* @note:
|
609
|
609
|
* On input, all points within the outline are in font coordinates. On
|
610
|
|
- * output, they are in 1/64th of pixels.
|
|
610
|
+ * output, they are in 1/64 of pixels.
|
611
|
611
|
*
|
612
|
612
|
* The scaling transformation is taken from the 'globals' object which
|
613
|
613
|
* must correspond to the same font than the glyph.
|
include/freetype/tttables.h
... |
... |
@@ -424,8 +424,8 @@ FT_BEGIN_HEADER |
424
|
424
|
|
425
|
425
|
/* only version 5 and higher: */
|
426
|
426
|
|
427
|
|
- FT_UShort usLowerOpticalPointSize; /* in twips (1/20th points) */
|
428
|
|
- FT_UShort usUpperOpticalPointSize; /* in twips (1/20th points) */
|
|
427
|
+ FT_UShort usLowerOpticalPointSize; /* in twips (1/20 points) */
|
|
428
|
+ FT_UShort usUpperOpticalPointSize; /* in twips (1/20 points) */
|
429
|
429
|
|
430
|
430
|
} TT_OS2;
|
431
|
431
|
|
src/autofit/aftypes.h
... |
... |
@@ -119,13 +119,13 @@ extern void* _af_debug_hints; |
119
|
119
|
|
120
|
120
|
typedef struct AF_ScalerRec_
|
121
|
121
|
{
|
122
|
|
- FT_Face face; /* source font face */
|
123
|
|
- FT_Fixed x_scale; /* from font units to 1/64th device pixels */
|
124
|
|
- FT_Fixed y_scale; /* from font units to 1/64th device pixels */
|
125
|
|
- FT_Pos x_delta; /* in 1/64th device pixels */
|
126
|
|
- FT_Pos y_delta; /* in 1/64th device pixels */
|
127
|
|
- FT_Render_Mode render_mode; /* monochrome, anti-aliased, LCD, etc. */
|
128
|
|
- FT_UInt32 flags; /* additional control flags, see above */
|
|
122
|
+ FT_Face face; /* source font face */
|
|
123
|
+ FT_Fixed x_scale; /* from font units to 1/64 device pixels */
|
|
124
|
+ FT_Fixed y_scale; /* from font units to 1/64 device pixels */
|
|
125
|
+ FT_Pos x_delta; /* in 1/64 device pixels */
|
|
126
|
+ FT_Pos y_delta; /* in 1/64 device pixels */
|
|
127
|
+ FT_Render_Mode render_mode; /* monochrome, anti-aliased, LCD, etc. */
|
|
128
|
+ FT_UInt32 flags; /* additional control flags, see above */
|
129
|
129
|
|
130
|
130
|
} AF_ScalerRec, *AF_Scaler;
|
131
|
131
|
|
src/sdf/ftsdf.c
... |
... |
@@ -1293,7 +1293,7 @@ |
1293
|
1293
|
/* Calculate the number of necessary bisections. Each */
|
1294
|
1294
|
/* bisection causes a four-fold reduction of the deviation, */
|
1295
|
1295
|
/* hence we bisect the Bezier curve until the deviation */
|
1296
|
|
- /* becomes less than 1/8th of a pixel. For more details */
|
|
1296
|
+ /* becomes less than 1/8 of a pixel. For more details */
|
1297
|
1297
|
/* check file `ftgrays.c`. */
|
1298
|
1298
|
num_splits = 1;
|
1299
|
1299
|
while ( dx > ONE_PIXEL / 8 )
|
|