Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType
Commits:
15 changed files:
Changes:
builds/cmake/FindHarfBuzz.cmake
... |
... |
@@ -28,8 +28,8 @@ |
28
|
28
|
# Try to find Harfbuzz include and library directories.
|
29
|
29
|
#
|
30
|
30
|
# After successful discovery, this will set for inclusion where needed:
|
31
|
|
-# HarfBuzz_INCLUDE_DIRS - containg the HarfBuzz headers
|
32
|
|
-# HarfBuzz_LIBRARIES - containg the HarfBuzz library
|
|
31
|
+# HarfBuzz_INCLUDE_DIRS - containing the HarfBuzz headers
|
|
32
|
+# HarfBuzz_LIBRARIES - containing the HarfBuzz library
|
33
|
33
|
|
34
|
34
|
#[=======================================================================[.rst:
|
35
|
35
|
FindHarfBuzz
|
builds/wince/vc2005-ce/freetype.sln
... |
... |
@@ -146,7 +146,7 @@ Global |
146
|
146
|
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
|
147
|
147
|
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Professional SDK (ARMV4I)
|
148
|
148
|
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Release|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
|
149
|
|
- {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Releaase|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
|
|
149
|
+ {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Release|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
|
150
|
150
|
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Release|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Standard SDK (ARMV4I)
|
151
|
151
|
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Release|Windows Mobile 6 Standard SDK (ARMV4I).Build.0 = Release|Windows Mobile 6 Standard SDK (ARMV4I)
|
152
|
152
|
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Release|Windows Mobile 6 Standard SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Standard SDK (ARMV4I)
|
builds/windows/ftdebug.c
... |
... |
@@ -64,7 +64,7 @@ |
64
|
64
|
* with the actual log message if set to true.
|
65
|
65
|
*
|
66
|
66
|
* 5. The flag `ft_timestamp_flag` prints time along with the actual log
|
67
|
|
- * message if set to ture.
|
|
67
|
+ * message if set to true.
|
68
|
68
|
*
|
69
|
69
|
* 6. `ft_have_newline_char` is used to differentiate between a log
|
70
|
70
|
* message with and without a trailing newline character.
|
docs/markdown/_javascript_s/extra.js
1
|
1
|
/*
|
2
|
|
-Internal link topbar offest adjust _javascript_
|
|
2
|
+Internal link topbar offset adjust _javascript_
|
3
|
3
|
Code provided by @makshh on GitHub
|
4
|
4
|
|
5
|
5
|
Bug report on material-mkdocs
|
docs/oldlogs/ChangeLog.210
... |
... |
@@ -2983,7 +2983,7 @@ |
2983
|
2983
|
[raster] Tune SMART macro (#58352).
|
2984
|
2984
|
|
2985
|
2985
|
Windows seems to perform smart dropout control at 26.6 precision.
|
2986
|
|
- To mimick Windows independent of increased precision, we need to tweak
|
|
2986
|
+ To mimic Windows independent of increased precision, we need to tweak
|
2987
|
2987
|
the macro so that some close calls break down rather than up.
|
2988
|
2988
|
|
2989
|
2989
|
* src/raster/ftraster.c (SMART): Tweak the macro.
|
... |
... |
@@ -6484,7 +6484,7 @@ |
6484
|
6484
|
|
6485
|
6485
|
Add internal functions `FT_Trace_Disable' and `FT_Trace_Enable'.
|
6486
|
6486
|
|
6487
|
|
- It sometimes makes sense to suppress tracing informations, for
|
|
6487
|
+ It sometimes makes sense to suppress tracing information, for
|
6488
|
6488
|
example, if it outputs identical messages again and again.
|
6489
|
6489
|
|
6490
|
6490
|
* include/freetype/internal/ftdebug.h: Make `ft_trace_levels' a
|
include/freetype/ftcolor.h
... |
... |
@@ -1518,7 +1518,7 @@ FT_BEGIN_HEADER |
1518
|
1518
|
*
|
1519
|
1519
|
* @return:
|
1520
|
1520
|
* Value~1 if a clip box is found. If no clip box is found or an error
|
1521
|
|
- * occured, value~0 is returned.
|
|
1521
|
+ * occurred, value~0 is returned.
|
1522
|
1522
|
*
|
1523
|
1523
|
* @note:
|
1524
|
1524
|
* To retrieve the clip box in font units, reset scale to units-per-em
|
... |
... |
@@ -1646,7 +1646,7 @@ FT_BEGIN_HEADER |
1646
|
1646
|
*
|
1647
|
1647
|
* @return:
|
1648
|
1648
|
* Value~1 if everything is OK. Value~0 if no details can be found for
|
1649
|
|
- * this paint or any other error occured.
|
|
1649
|
+ * this paint or any other error occurred.
|
1650
|
1650
|
*
|
1651
|
1651
|
* @since:
|
1652
|
1652
|
* 2.13
|
include/freetype/internal/fttrace.h
... |
... |
@@ -19,7 +19,7 @@ |
19
|
19
|
/* definitions of trace levels for FreeType 2 */
|
20
|
20
|
|
21
|
21
|
/* the maximum string length (if the argument to `FT_TRACE_DEF` */
|
22
|
|
- /* gets used as a string) plus one charachter for ':' plus */
|
|
22
|
+ /* gets used as a string) plus one character for ':' plus */
|
23
|
23
|
/* another one for the trace level */
|
24
|
24
|
#define FT_MAX_TRACE_LEVEL_LENGTH (9 + 1 + 1)
|
25
|
25
|
|
include/freetype/internal/sfnt.h
... |
... |
@@ -612,7 +612,7 @@ FT_BEGIN_HEADER |
612
|
612
|
*
|
613
|
613
|
* @return:
|
614
|
614
|
* Value~1 if a ClipBox is found. If no clip box is found or an
|
615
|
|
- * error occured, value~0 is returned.
|
|
615
|
+ * error occurred, value~0 is returned.
|
616
|
616
|
*/
|
617
|
617
|
typedef FT_Bool
|
618
|
618
|
( *TT_Get_Color_Glyph_ClipBox_Func )( TT_Face face,
|
... |
... |
@@ -707,7 +707,7 @@ FT_BEGIN_HEADER |
707
|
707
|
*
|
708
|
708
|
* @return:
|
709
|
709
|
* Value~1 if everything is OK. Value~0 if no details can be found for
|
710
|
|
- * this paint or any other error occured.
|
|
710
|
+ * this paint or any other error occurred.
|
711
|
711
|
*/
|
712
|
712
|
typedef FT_Bool
|
713
|
713
|
( *TT_Get_Paint_Func )( TT_Face face,
|
... |
... |
@@ -808,7 +808,7 @@ FT_BEGIN_HEADER |
808
|
808
|
* corresponding (1,0) Apple entry.
|
809
|
809
|
*
|
810
|
810
|
* @return:
|
811
|
|
- * 1 if there is either a win or apple entry (or both), 0 otheriwse.
|
|
811
|
+ * 1 if there is either a win or apple entry (or both), 0 otherwise.
|
812
|
812
|
*/
|
813
|
813
|
typedef FT_Bool
|
814
|
814
|
(*TT_Get_Name_ID_Func)( TT_Face face,
|
src/autofit/afcjk.c
... |
... |
@@ -1378,7 +1378,7 @@ |
1378
|
1378
|
}
|
1379
|
1379
|
|
1380
|
1380
|
|
1381
|
|
- /* Initalize hinting engine. */
|
|
1381
|
+ /* Initialize hinting engine. */
|
1382
|
1382
|
|
1383
|
1383
|
FT_LOCAL_DEF( FT_Error )
|
1384
|
1384
|
af_cjk_hints_init( AF_GlyphHints hints,
|
src/autofit/aflatin.c
... |
... |
@@ -2610,7 +2610,7 @@ |
2610
|
2610
|
}
|
2611
|
2611
|
|
2612
|
2612
|
|
2613
|
|
- /* Initalize hinting engine. */
|
|
2613
|
+ /* Initialize hinting engine. */
|
2614
|
2614
|
|
2615
|
2615
|
static FT_Error
|
2616
|
2616
|
af_latin_hints_init( AF_GlyphHints hints,
|
src/base/ftdebug.c
... |
... |
@@ -64,7 +64,7 @@ |
64
|
64
|
* with the actual log message if set to true.
|
65
|
65
|
*
|
66
|
66
|
* 5. The flag `ft_timestamp_flag` prints time along with the actual log
|
67
|
|
- * message if set to ture.
|
|
67
|
+ * message if set to true.
|
68
|
68
|
*
|
69
|
69
|
* 6. `ft_have_newline_char` is used to differentiate between a log
|
70
|
70
|
* message with and without a trailing newline character.
|
src/base/ftsynth.c
... |
... |
@@ -141,7 +141,7 @@ |
141
|
141
|
/*
|
142
|
142
|
* XXX: overflow check for 16-bit system, for compatibility
|
143
|
143
|
* with FT_GlyphSlot_Embolden() since FreeType 2.1.10.
|
144
|
|
- * unfortunately, this function return no informations
|
|
144
|
+ * unfortunately, this function return no information
|
145
|
145
|
* about the cause of error.
|
146
|
146
|
*/
|
147
|
147
|
if ( ( ystr >> 6 ) > FT_INT_MAX || ( ystr >> 6 ) < FT_INT_MIN )
|
src/sdf/ftbsdf.c
... |
... |
@@ -373,7 +373,7 @@ |
373
|
373
|
* @Input:
|
374
|
374
|
* current ::
|
375
|
375
|
* Array of Euclidean distances. `current` must point to the position
|
376
|
|
- * for which the distance is to be caculated. We treat this array as
|
|
376
|
+ * for which the distance is to be calculated. We treat this array as
|
377
|
377
|
* a two-dimensional array mapped to a one-dimensional array.
|
378
|
378
|
*
|
379
|
379
|
* x ::
|
... |
... |
@@ -550,7 +550,7 @@ |
550
|
550
|
*
|
551
|
551
|
* @Description:
|
552
|
552
|
* Loops over all the pixels and call `compute_edge_distance` only for
|
553
|
|
- * edge pixels. This maked the process a lot faster since
|
|
553
|
+ * edge pixels. This makes the process a lot faster since
|
554
|
554
|
* `compute_edge_distance` uses functions such as `FT_Vector_NormLen',
|
555
|
555
|
* which are quite slow.
|
556
|
556
|
*
|
src/sdf/ftsdf.c
... |
... |
@@ -3456,7 +3456,7 @@ |
3456
|
3456
|
* A complete shape which is used to generate SDF.
|
3457
|
3457
|
*
|
3458
|
3458
|
* spread ::
|
3459
|
|
- * Maximum distances to be allowed inthe output bitmap.
|
|
3459
|
+ * Maximum distances to be allowed in the output bitmap.
|
3460
|
3460
|
*
|
3461
|
3461
|
* @Output:
|
3462
|
3462
|
* bitmap ::
|
src/sdf/ftsdf.h
... |
... |
@@ -57,7 +57,7 @@ FT_BEGIN_HEADER |
57
|
57
|
* indicate positions inside of contours.
|
58
|
58
|
*
|
59
|
59
|
* flip_y ::
|
60
|
|
- * Setting this parameter to true maked the output image flipped
|
|
60
|
+ * Setting this parameter to true makes the output image flipped
|
61
|
61
|
* along the y-axis.
|
62
|
62
|
*
|
63
|
63
|
* overlaps ::
|
|