Werner Lemberg pushed to branch master
at FreeType / FreeType
Commits:
12 changed files:
Changes:
docs/oldlogs/ChangeLog.210
... |
... |
@@ -2411,9 +2411,9 @@ |
2411
|
2411
|
units per em (e.g. Inter). This patch fixes it.
|
2412
|
2412
|
|
2413
|
2413
|
The return value of af_loader_compute_darkening was also changed to
|
2414
|
|
- use 16.16 fixed point to get rid of a redundant truncation operation.
|
|
2414
|
+ use 16.16 fixed-point to get rid of a redundant truncation operation.
|
2415
|
2415
|
This should slightly improve the precision, although it's still
|
2416
|
|
- bottlenecked by the emboldening function, which uses 26.6 fixed point.
|
|
2416
|
+ bottlenecked by the emboldening function, which uses 26.6 fixed-point.
|
2417
|
2417
|
|
2418
|
2418
|
* src/autofit/afloader.[ch]
|
2419
|
2419
|
(af_loader_compute_darkening): Return FT_Fixed.
|
docs/oldlogs/ChangeLog.24
... |
... |
@@ -707,7 +707,7 @@ |
707
|
707
|
[base] Fix integer overflow.
|
708
|
708
|
|
709
|
709
|
* src/base/ftoutln.c (FT_Outline_EmboldenXY): Normalize incoming and
|
710
|
|
- outgoing vectors and use fixed point arithmetic.
|
|
710
|
+ outgoing vectors and use fixed-point arithmetic.
|
711
|
711
|
|
712
|
712
|
2013-01-23 Alexei Podtelezhnikov <apodtele@gmail.com>
|
713
|
713
|
|
include/freetype/ftstroke.h
... |
... |
@@ -293,7 +293,7 @@ FT_BEGIN_HEADER |
293
|
293
|
*
|
294
|
294
|
* miter_limit ::
|
295
|
295
|
* The maximum reciprocal sine of half-angle at the miter join,
|
296
|
|
- * expressed as 16.16 fixed point value.
|
|
296
|
+ * expressed as 16.16 fixed-point value.
|
297
|
297
|
*
|
298
|
298
|
* @note:
|
299
|
299
|
* The `radius` is expressed in the same units as the outline
|
include/freetype/internal/cfftypes.h
... |
... |
@@ -315,7 +315,7 @@ FT_BEGIN_HEADER |
315
|
315
|
/* The normal stack then points to these values instead of the DICT */
|
316
|
316
|
/* because all other operators in Private DICT clear the stack. */
|
317
|
317
|
/* `blend_stack' could be cleared at each operator other than blend. */
|
318
|
|
- /* Blended values are stored as 5-byte fixed point values. */
|
|
318
|
+ /* Blended values are stored as 5-byte fixed-point values. */
|
319
|
319
|
|
320
|
320
|
FT_Byte* blend_stack; /* base of stack allocation */
|
321
|
321
|
FT_Byte* blend_top; /* first empty slot */
|
src/cff/cffload.c
... |
... |
@@ -1288,7 +1288,7 @@ |
1288
|
1288
|
/* Blended values are written to a different buffer, */
|
1289
|
1289
|
/* using reserved operator 255. */
|
1290
|
1290
|
/* */
|
1291
|
|
- /* Blend calculation is done in 16.16 fixed point. */
|
|
1291
|
+ /* Blend calculation is done in 16.16 fixed-point. */
|
1292
|
1292
|
FT_LOCAL_DEF( FT_Error )
|
1293
|
1293
|
cff_blend_doBlend( CFF_SubFont subFont,
|
1294
|
1294
|
CFF_Parser parser,
|
... |
... |
@@ -1364,7 +1364,7 @@ |
1364
|
1364
|
FT_UInt32 sum;
|
1365
|
1365
|
|
1366
|
1366
|
|
1367
|
|
- /* convert inputs to 16.16 fixed point */
|
|
1367
|
+ /* convert inputs to 16.16 fixed-point */
|
1368
|
1368
|
sum = cff_parse_num( parser, &parser->stack[i + base] ) * 0x10000;
|
1369
|
1369
|
|
1370
|
1370
|
for ( j = 1; j < blend->lenBV; j++ )
|
... |
... |
@@ -1373,7 +1373,7 @@ |
1373
|
1373
|
/* point parser stack to new value on blend_stack */
|
1374
|
1374
|
parser->stack[i + base] = subFont->blend_top;
|
1375
|
1375
|
|
1376
|
|
- /* Push blended result as Type 2 5-byte fixed point number. This */
|
|
1376
|
+ /* Push blended result as Type 2 5-byte fixed-point number. This */
|
1377
|
1377
|
/* will not conflict with actual DICTs because 255 is a reserved */
|
1378
|
1378
|
/* opcode in both CFF and CFF2 DICTs. See `cff_parse_num' for */
|
1379
|
1379
|
/* decode of this, which rounds to an integer. */
|
src/cff/cffparse.c
... |
... |
@@ -530,7 +530,7 @@ |
530
|
530
|
|
531
|
531
|
else if ( **d == 255 )
|
532
|
532
|
{
|
533
|
|
- /* 16.16 fixed point is used internally for CFF2 blend results. */
|
|
533
|
+ /* 16.16 fixed-point is used internally for CFF2 blend results. */
|
534
|
534
|
/* Since these are trusted values, a limit check is not needed. */
|
535
|
535
|
|
536
|
536
|
/* After the 255, 4 bytes give the number. */
|
src/psaux/psfixed.h
... |
... |
@@ -2,7 +2,7 @@ |
2
|
2
|
*
|
3
|
3
|
* psfixed.h
|
4
|
4
|
*
|
5
|
|
- * Adobe's code for Fixed Point Mathematics (specification only).
|
|
5
|
+ * Adobe's code for Fixed-Point Mathematics (specification only).
|
6
|
6
|
*
|
7
|
7
|
* Copyright 2007-2013 Adobe Systems Incorporated.
|
8
|
8
|
*
|
... |
... |
@@ -43,10 +43,10 @@ |
43
|
43
|
FT_BEGIN_HEADER
|
44
|
44
|
|
45
|
45
|
|
46
|
|
- /* rasterizer integer and fixed point arithmetic must be 32-bit */
|
|
46
|
+ /* rasterizer integer and fixed-point arithmetic must be 32-bit */
|
47
|
47
|
|
48
|
48
|
#define CF2_Fixed CF2_F16Dot16
|
49
|
|
- typedef FT_Int32 CF2_Frac; /* 2.30 fixed point */
|
|
49
|
+ typedef FT_Int32 CF2_Frac; /* 2.30 fixed-point */
|
50
|
50
|
|
51
|
51
|
|
52
|
52
|
#define CF2_FIXED_MAX ( (CF2_Fixed)0x7FFFFFFFL )
|
src/psaux/psglue.h
... |
... |
@@ -72,7 +72,7 @@ FT_BEGIN_HEADER |
72
|
72
|
} CF2_PathOp;
|
73
|
73
|
|
74
|
74
|
|
75
|
|
- /* a matrix of fixed point values */
|
|
75
|
+ /* a matrix of fixed-point values */
|
76
|
76
|
typedef struct CF2_Matrix_
|
77
|
77
|
{
|
78
|
78
|
CF2_F16Dot16 a;
|
src/psaux/psstack.h
... |
... |
@@ -49,8 +49,8 @@ FT_BEGIN_HEADER |
49
|
49
|
{
|
50
|
50
|
union
|
51
|
51
|
{
|
52
|
|
- CF2_Fixed r; /* 16.16 fixed point */
|
53
|
|
- CF2_Frac f; /* 2.30 fixed point (for font matrix) */
|
|
52
|
+ CF2_Fixed r; /* 16.16 fixed-point */
|
|
53
|
+ CF2_Frac f; /* 2.30 fixed-point (for font matrix) */
|
54
|
54
|
CF2_Int i;
|
55
|
55
|
} u;
|
56
|
56
|
|
src/sdf/ftsdf.c
... |
... |
@@ -1939,7 +1939,7 @@ |
1939
|
1939
|
/* now factor is 16.16 */
|
1940
|
1940
|
factor = FT_DivFix( factor, sq_line_length );
|
1941
|
1941
|
|
1942
|
|
- /* clamp the factor between 0.0 and 1.0 in fixed point */
|
|
1942
|
+ /* clamp the factor between 0.0 and 1.0 in fixed-point */
|
1943
|
1943
|
if ( factor > FT_INT_16D16( 1 ) )
|
1944
|
1944
|
factor = FT_INT_16D16( 1 );
|
1945
|
1945
|
if ( factor < 0 )
|
... |
... |
@@ -3164,7 +3164,7 @@ |
3164
|
3164
|
if ( min_dist.distance > sp_sq )
|
3165
|
3165
|
min_dist.distance = sp_sq;
|
3166
|
3166
|
|
3167
|
|
- /* square_root the values and fit in a 6.10 fixed point */
|
|
3167
|
+ /* square_root the values and fit in a 6.10 fixed-point */
|
3168
|
3168
|
if ( USE_SQUARED_DISTANCES )
|
3169
|
3169
|
min_dist.distance = square_root( min_dist.distance );
|
3170
|
3170
|
|
src/sdf/ftsdfcommon.c
... |
... |
@@ -33,7 +33,7 @@ |
33
|
33
|
*
|
34
|
34
|
* https://github.com/chmike/fpsqrt
|
35
|
35
|
*
|
36
|
|
- * Use this to compute the square root of a 16.16 fixed point number.
|
|
36
|
+ * Use this to compute the square root of a 16.16 fixed-point number.
|
37
|
37
|
*/
|
38
|
38
|
FT_LOCAL_DEF( FT_16D16 )
|
39
|
39
|
square_root( FT_16D16 val )
|
... |
... |
@@ -72,8 +72,8 @@ |
72
|
72
|
*/
|
73
|
73
|
|
74
|
74
|
/*
|
75
|
|
- * Convert 16.16 fixed point values to the desired output format.
|
76
|
|
- * In this case we reduce 16.16 fixed point values to normalized
|
|
75
|
+ * Convert 16.16 fixed-point values to the desired output format.
|
|
76
|
+ * In this case we reduce 16.16 fixed-point values to normalized
|
77
|
77
|
* 8-bit values.
|
78
|
78
|
*
|
79
|
79
|
* The `max_value` in the parameter is the maximum value in the
|
src/sfnt/sfdriver.c
... |
... |
@@ -657,7 +657,7 @@ |
657
|
657
|
|
658
|
658
|
|
659
|
659
|
/*
|
660
|
|
- * Find the shortest decimal representation of a 16.16 fixed point
|
|
660
|
+ * Find the shortest decimal representation of a 16.16 fixed-point
|
661
|
661
|
* number. The function fills `buf' with the result, returning a pointer
|
662
|
662
|
* to the position after the representation's last byte.
|
663
|
663
|
*/
|
... |
... |
@@ -733,7 +733,7 @@ |
733
|
733
|
an equivalent representation of `fixed'.
|
734
|
734
|
|
735
|
735
|
The above FOR loop always finds the larger of the two values; I
|
736
|
|
- verified this by iterating over all possible fixed point numbers.
|
|
736
|
+ verified this by iterating over all possible fixed-point numbers.
|
737
|
737
|
|
738
|
738
|
If the remainder is 17232*10, both values are equally good, and we
|
739
|
739
|
take the next even number (following IEEE 754's `round to nearest,
|
... |
... |
@@ -741,7 +741,7 @@ |
741
|
741
|
|
742
|
742
|
If the remainder is smaller than 17232*10, the lower of the two
|
743
|
743
|
numbers is nearer to the exact result (values 17232 and 34480 were
|
744
|
|
- also found by testing all possible fixed point values).
|
|
744
|
+ also found by testing all possible fixed-point values).
|
745
|
745
|
|
746
|
746
|
We use this to find a shorter decimal representation. If not ending
|
747
|
747
|
with digit zero, we take the representation with less error.
|
|