Werner Lemberg pushed to branch master at FreeType / FreeType
Commits:
-
ed8b82ba
by Werner Lemberg at 2024-08-12T12:34:28+02:00
Various minor documentation or formatting fixes.
-
8fc8b131
by Werner Lemberg at 2024-08-12T12:34:28+02:00
* subprojects/*.wrap: Updated.
-
6b992aaa
by Werner Lemberg at 2024-08-12T12:34:28+02:00
* src/*/*: Fix C++ compilation; fix clang warnings.
-
a4b4e3ec
by Werner Lemberg at 2024-08-12T12:50:10+02:00
* meson.build: Install `freetype2.m4`.
Fixes #1290.
-
42608f77
by Werner Lemberg at 2024-08-12T12:50:14+02:00
* Version 2.13.3 released.
==========================
Tag sources with `VER-2-13-3'.
* docs/VERSION.TXT: Add entry for version 2.13.3.
* docs/CHANGES: Updated.
* docs/release, docs/README, builds/macs/README: Updated.
* README, src/base/ftver.rc, builds/windows/vc2010/index.html,
builds/windows/visualc/index.html, builds/windows/visualce/index.html,
builds/wince/vc2005-ce/index.html, builds/wince/vc2008-ce/index.html,
docs/freetype-config.1: s/2.13.2/2.13.3/, s/2132/2133/.
* include/freetype/freetype.h (FREETYPE_PATCH): Set to 3.
* builds/unix/configure.raw (version_info): Set to 26:2:20.
* CMakeLists.txt (VERSION_PATCH): Set to 3.
25 changed files:
Changes:
CMakeLists.txt
| ... |
... |
@@ -164,7 +164,7 @@ project(freetype C) |
|
164
|
164
|
|
|
165
|
165
|
set(VERSION_MAJOR "2")
|
|
166
|
166
|
set(VERSION_MINOR "13")
|
|
167
|
|
-set(VERSION_PATCH "2")
|
|
|
167
|
+set(VERSION_PATCH "3")
|
|
168
|
168
|
|
|
169
|
169
|
# Generate LIBRARY_VERSION and LIBRARY_SOVERSION.
|
|
170
|
170
|
set(LIBTOOL_REGEX "version_info='([0-9]+):([0-9]+):([0-9]+)'")
|
README
|
1
|
|
-FreeType 2.13.2
|
|
|
1
|
+FreeType 2.13.3
|
|
2
|
2
|
===============
|
|
3
|
3
|
|
|
4
|
4
|
Homepage: https://www.freetype.org
|
| ... |
... |
@@ -32,9 +32,9 @@ sites. Go to |
|
32
|
32
|
|
|
33
|
33
|
and download one of the following files.
|
|
34
|
34
|
|
|
35
|
|
- freetype-doc-2.13.2.tar.xz
|
|
36
|
|
- freetype-doc-2.13.2.tar.gz
|
|
37
|
|
- ftdoc2132.zip
|
|
|
35
|
+ freetype-doc-2.13.3.tar.xz
|
|
|
36
|
+ freetype-doc-2.13.3.tar.gz
|
|
|
37
|
+ ftdoc2133.zip
|
|
38
|
38
|
|
|
39
|
39
|
To view the documentation online, go to
|
|
40
|
40
|
|
builds/unix/configure.raw
| ... |
... |
@@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.h.in]) |
|
17
|
17
|
|
|
18
|
18
|
# Don't forget to update `docs/VERSIONS.TXT'!
|
|
19
|
19
|
|
|
20
|
|
-version_info='26:1:20'
|
|
|
20
|
+version_info='26:2:20'
|
|
21
|
21
|
AC_SUBST([version_info])
|
|
22
|
22
|
ft_version=`echo $version_info | tr : .`
|
|
23
|
23
|
AC_SUBST([ft_version])
|
builds/wince/vc2005-ce/index.html
| ... |
... |
@@ -21,7 +21,7 @@ the following targets: |
|
21
|
21
|
<li>PPC/SP WM6 (Windows Mobile 6)</li>
|
|
22
|
22
|
</ul>
|
|
23
|
23
|
|
|
24
|
|
-It compiles the following libraries from the FreeType 2.13.2 sources:</p>
|
|
|
24
|
+It compiles the following libraries from the FreeType 2.13.3 sources:</p>
|
|
25
|
25
|
|
|
26
|
26
|
<ul>
|
|
27
|
27
|
<pre>
|
builds/wince/vc2008-ce/index.html
| ... |
... |
@@ -21,7 +21,7 @@ the following targets: |
|
21
|
21
|
<li>PPC/SP WM6 (Windows Mobile 6)</li>
|
|
22
|
22
|
</ul>
|
|
23
|
23
|
|
|
24
|
|
-It compiles the following libraries from the FreeType 2.13.2 sources:</p>
|
|
|
24
|
+It compiles the following libraries from the FreeType 2.13.3 sources:</p>
|
|
25
|
25
|
|
|
26
|
26
|
<ul>
|
|
27
|
27
|
<pre>
|
builds/windows/vc2010/index.html
| ... |
... |
@@ -12,7 +12,7 @@ |
|
12
|
12
|
<p>This directory contains solution and project files for
|
|
13
|
13
|
Visual C++ 2010 or newer, named <tt>freetype.sln</tt>,
|
|
14
|
14
|
and <tt>freetype.vcxproj</tt>. It compiles the following libraries
|
|
15
|
|
-from the FreeType 2.13.2 sources:</p>
|
|
|
15
|
+from the FreeType 2.13.3 sources:</p>
|
|
16
|
16
|
|
|
17
|
17
|
<ul>
|
|
18
|
18
|
<li>freetype.dll using 'Release' or 'Debug' configurations</li>
|
builds/windows/visualc/index.html
| ... |
... |
@@ -12,7 +12,7 @@ |
|
12
|
12
|
<p>This directory contains project files <tt>freetype.dsp</tt> for
|
|
13
|
13
|
Visual C++ 6.0, and <tt>freetype.vcproj</tt> for Visual C++ 2002
|
|
14
|
14
|
through 2008, which you might need to upgrade automatically.
|
|
15
|
|
-It compiles the following libraries from the FreeType 2.13.2 sources:</p>
|
|
|
15
|
+It compiles the following libraries from the FreeType 2.13.3 sources:</p>
|
|
16
|
16
|
|
|
17
|
17
|
<ul>
|
|
18
|
18
|
<li>freetype.dll using 'Release' or 'Debug' configurations</li>
|
builds/windows/visualce/index.html
| ... |
... |
@@ -21,7 +21,7 @@ the following targets: |
|
21
|
21
|
<li>PPC/SP WM6 (Windows Mobile 6)</li>
|
|
22
|
22
|
</ul>
|
|
23
|
23
|
|
|
24
|
|
-It compiles the following libraries from the FreeType 2.13.2 sources:</p>
|
|
|
24
|
+It compiles the following libraries from the FreeType 2.13.3 sources:</p>
|
|
25
|
25
|
|
|
26
|
26
|
<ul>
|
|
27
|
27
|
<pre>
|
docs/CHANGES
|
1
|
|
-CHANGES BETWEEN 2.13.2 and 2.13.3 (2024-Mmm-DD)
|
|
|
1
|
+CHANGES BETWEEN 2.13.2 and 2.13.3 (2024-Aug-11)
|
|
2
|
2
|
|
|
3
|
3
|
I. IMPORTANT CHANGES
|
|
4
|
4
|
|
| ... |
... |
@@ -17,8 +17,8 @@ CHANGES BETWEEN 2.13.2 and 2.13.3 (2024-Mmm-DD) |
|
17
|
17
|
|
|
18
|
18
|
III. MISCELLANEOUS
|
|
19
|
19
|
|
|
20
|
|
- - The B/W rasterizer has received a major upkeep that resulted in
|
|
21
|
|
- large performance improvement. The rendering speed has increased
|
|
|
20
|
+ - The B/W rasterizer has received a major upkeep that results in
|
|
|
21
|
+ large performance improvements. The rendering speed has increased
|
|
22
|
22
|
and even doubled for very complex glyphs.
|
|
23
|
23
|
|
|
24
|
24
|
- If the new configuration option `TT_CONFIG_OPTION_GPOS_KERNING` is
|
docs/VERSIONS.TXT
| ... |
... |
@@ -60,6 +60,7 @@ found on _most_ systems, but not all of them: |
|
60
|
60
|
|
|
61
|
61
|
release libtool so
|
|
62
|
62
|
-------------------------------
|
|
|
63
|
+ 2.13.3 26.2.20 6.20.2
|
|
63
|
64
|
2.13.2 26.1.20 6.20.1
|
|
64
|
65
|
2.13.1 26.0.20 6.20.0
|
|
65
|
66
|
2.13.0 25.0.19 6.19.0
|
docs/freetype-config.1
|
1
|
|
-.TH FREETYPE-CONFIG 1 "August 2023" "FreeType 2.13.2"
|
|
|
1
|
+.TH FREETYPE-CONFIG 1 "August 2024" "FreeType 2.13.3"
|
|
2
|
2
|
.
|
|
3
|
3
|
.
|
|
4
|
4
|
.SH NAME
|
include/freetype/freetype.h
| ... |
... |
@@ -5174,7 +5174,7 @@ FT_BEGIN_HEADER |
|
5174
|
5174
|
*/
|
|
5175
|
5175
|
#define FREETYPE_MAJOR 2
|
|
5176
|
5176
|
#define FREETYPE_MINOR 13
|
|
5177
|
|
-#define FREETYPE_PATCH 2
|
|
|
5177
|
+#define FREETYPE_PATCH 3
|
|
5178
|
5178
|
|
|
5179
|
5179
|
|
|
5180
|
5180
|
/**************************************************************************
|
include/freetype/ftdriver.h
| ... |
... |
@@ -847,7 +847,7 @@ FT_BEGIN_HEADER |
|
847
|
847
|
* FT_Property_Set( library, "sdf", "spread", &spread );
|
|
848
|
848
|
* ```
|
|
849
|
849
|
*
|
|
850
|
|
- * @note
|
|
|
850
|
+ * @note:
|
|
851
|
851
|
* FreeType has two rasterizers for generating SDF, namely:
|
|
852
|
852
|
*
|
|
853
|
853
|
* 1. `sdf` for generating SDF directly from glyph's outline, and
|
include/freetype/ftimage.h
| ... |
... |
@@ -21,9 +21,10 @@ |
|
21
|
21
|
* Note: A 'raster' is simply a scan-line converter, used to render
|
|
22
|
22
|
* `FT_Outline`s into `FT_Bitmap`s.
|
|
23
|
23
|
*
|
|
24
|
|
- * Note: This file can be used for STANDALONE_ compilation of raster (B/W)
|
|
25
|
|
- * and smooth (anti-aliased) renderers. Therefore, it must rely on
|
|
26
|
|
- * standard variable types only rather than aliases in fttypes.h.
|
|
|
24
|
+ * Note: This file can be used for `STANDALONE_` compilation of raster
|
|
|
25
|
+ * (B/W) and smooth (anti-aliased) renderers. Therefore, it must
|
|
|
26
|
+ * rely on standard variable types only instead of aliases in
|
|
|
27
|
+ * `fttypes.h`.
|
|
27
|
28
|
*
|
|
28
|
29
|
*/
|
|
29
|
30
|
|
include/freetype/internal/ftcalc.h
| ... |
... |
@@ -511,8 +511,8 @@ FT_BEGIN_HEADER |
|
511
|
511
|
* The result of 'sqrt(x)'.
|
|
512
|
512
|
*
|
|
513
|
513
|
* @note:
|
|
514
|
|
- * This function is slow and should be avoided. Consider `FT_Hypot` or
|
|
515
|
|
- * `FT_Vector_NormLen' instead.
|
|
|
514
|
+ * This function is slow and should be avoided. Consider @FT_Hypot or
|
|
|
515
|
+ * @FT_Vector_NormLen instead.
|
|
516
|
516
|
*/
|
|
517
|
517
|
FT_BASE( FT_UInt32 )
|
|
518
|
518
|
FT_SqrtFixed( FT_UInt32 x );
|
meson.build
| ... |
... |
@@ -54,6 +54,9 @@ freetype_includedir = join_paths(get_option('includedir'), 'freetype2') |
|
54
|
54
|
|
|
55
|
55
|
ft2_defines = []
|
|
56
|
56
|
|
|
|
57
|
+freetype_aclocaldir = join_paths(get_option('datadir'), 'aclocal')
|
|
|
58
|
+
|
|
|
59
|
+
|
|
57
|
60
|
# Generate a custom `ftmodule.h` version based on the content of
|
|
58
|
61
|
# `modules.cfg`.
|
|
59
|
62
|
|
| ... |
... |
@@ -231,7 +234,7 @@ endif |
|
231
|
234
|
# value from the environment, when this is supported. A smaller refactor
|
|
232
|
235
|
# might make these platform-specific files much smaller, and could be moved
|
|
233
|
236
|
# into `ftsystem.c` as well.
|
|
234
|
|
-#
|
|
|
237
|
+
|
|
235
|
238
|
if host_machine.system() == 'windows'
|
|
236
|
239
|
winmod = import('windows')
|
|
237
|
240
|
ft2_sources += [
|
| ... |
... |
@@ -251,7 +254,7 @@ common_ldflags = [] |
|
251
|
254
|
#
|
|
252
|
255
|
# OSX sets the compatibility_version (aka libtools version) differently from
|
|
253
|
256
|
# the library name.
|
|
254
|
|
-#
|
|
|
257
|
+
|
|
255
|
258
|
if host_machine.system() == 'darwin'
|
|
256
|
259
|
# maintain compatibility with autotools on macOS
|
|
257
|
260
|
common_ldflags = [
|
| ... |
... |
@@ -266,13 +269,13 @@ endif |
|
266
|
269
|
process_header_command = [python_exe,
|
|
267
|
270
|
files('builds/meson/process_ftoption_h.py'),
|
|
268
|
271
|
'@INPUT@', '--output=@OUTPUT@']
|
|
269
|
|
-ftoption_command = process_header_command
|
|
270
|
272
|
|
|
|
273
|
+ftoption_command = process_header_command
|
|
271
|
274
|
|
|
272
|
|
-# external GZip support
|
|
|
275
|
+# External GZip support.
|
|
273
|
276
|
zlib_option = get_option('zlib')
|
|
274
|
277
|
|
|
275
|
|
-# Backwards-compatible aliases.
|
|
|
278
|
+# Backward-compatible aliases.
|
|
276
|
279
|
if zlib_option == 'disabled'
|
|
277
|
280
|
zlib_option = 'none'
|
|
278
|
281
|
elif zlib_option == 'enabled'
|
| ... |
... |
@@ -315,10 +318,12 @@ else |
|
315
|
318
|
assert(false, 'Invalid zlib option ' + zlib_option)
|
|
316
|
319
|
endif
|
|
317
|
320
|
|
|
318
|
|
-# BZip2 support
|
|
|
321
|
+# BZip2 support.
|
|
319
|
322
|
bzip2_dep = dependency('bzip2', required: false)
|
|
320
|
323
|
if not bzip2_dep.found()
|
|
321
|
|
- bzip2_dep = cc.find_library('bz2', has_headers: ['bzlib.h'], required: get_option('bzip2'))
|
|
|
324
|
+ bzip2_dep = cc.find_library('bz2',
|
|
|
325
|
+ has_headers: ['bzlib.h'],
|
|
|
326
|
+ required: get_option('bzip2'))
|
|
322
|
327
|
endif
|
|
323
|
328
|
|
|
324
|
329
|
if bzip2_dep.found()
|
| ... |
... |
@@ -327,7 +332,7 @@ if bzip2_dep.found() |
|
327
|
332
|
ft2_deps += [bzip2_dep]
|
|
328
|
333
|
endif
|
|
329
|
334
|
|
|
330
|
|
-# PNG support
|
|
|
335
|
+# PNG support.
|
|
331
|
336
|
libpng_dep = dependency('libpng',
|
|
332
|
337
|
required: get_option('png'),
|
|
333
|
338
|
fallback: 'libpng')
|
| ... |
... |
@@ -337,7 +342,7 @@ if libpng_dep.found() |
|
337
|
342
|
ft2_deps += [libpng_dep]
|
|
338
|
343
|
endif
|
|
339
|
344
|
|
|
340
|
|
-# Harfbuzz support
|
|
|
345
|
+# Harfbuzz support.
|
|
341
|
346
|
harfbuzz_dep = dependency('harfbuzz',
|
|
342
|
347
|
version: '>= 2.0.0',
|
|
343
|
348
|
required: get_option('harfbuzz'),
|
| ... |
... |
@@ -348,7 +353,7 @@ if harfbuzz_dep.found() |
|
348
|
353
|
ft2_deps += [harfbuzz_dep]
|
|
349
|
354
|
endif
|
|
350
|
355
|
|
|
351
|
|
-# Brotli decompression support
|
|
|
356
|
+# Brotli decompression support.
|
|
352
|
357
|
brotli_dep = dependency('libbrotlidec',
|
|
353
|
358
|
required: get_option('brotli'))
|
|
354
|
359
|
|
| ... |
... |
@@ -376,6 +381,7 @@ endif |
|
376
|
381
|
# Generate `ftconfig.h`.
|
|
377
|
382
|
|
|
378
|
383
|
ftconfig_command = process_header_command
|
|
|
384
|
+
|
|
379
|
385
|
if has_unistd_h
|
|
380
|
386
|
ftconfig_command += '--enable=HAVE_UNISTD_H'
|
|
381
|
387
|
endif
|
| ... |
... |
@@ -409,7 +415,8 @@ ft2_lib = library('freetype', |
|
409
|
415
|
)
|
|
410
|
416
|
|
|
411
|
417
|
|
|
412
|
|
-# To be used by other projects including this one through `subproject`.
|
|
|
418
|
+# To be used by other projects including this one via `subproject`.
|
|
|
419
|
+
|
|
413
|
420
|
freetype_dep = declare_dependency(
|
|
414
|
421
|
include_directories: ft2_includes,
|
|
415
|
422
|
link_with: ft2_lib,
|
| ... |
... |
@@ -418,9 +425,9 @@ freetype_dep = declare_dependency( |
|
418
|
425
|
meson.override_dependency('freetype2', freetype_dep)
|
|
419
|
426
|
|
|
420
|
427
|
|
|
421
|
|
-# NOTE: Using both `install_dir` and `subdir` doesn't seem to work below,
|
|
422
|
|
-# i.e., the subdir value seems to be ignored, contrary to examples in the
|
|
423
|
|
-# Meson documentation.
|
|
|
428
|
+# NOTE: Using both `install_dir` and `subdir` doesn't seem to work
|
|
|
429
|
+# below, i.e., the `subdir` value seems to be ignored, contrary to
|
|
|
430
|
+# examples in the Meson documentation.
|
|
424
|
431
|
install_headers('include/ft2build.h',
|
|
425
|
432
|
install_dir: freetype_includedir)
|
|
426
|
433
|
install_headers(ft2_public_headers,
|
| ... |
... |
@@ -429,6 +436,10 @@ install_headers(ft2_config_headers, |
|
429
|
436
|
install_dir: join_paths(freetype_includedir, 'freetype/config'))
|
|
430
|
437
|
|
|
431
|
438
|
|
|
|
439
|
+install_data('builds/unix/freetype2.m4',
|
|
|
440
|
+ install_dir: freetype_aclocaldir)
|
|
|
441
|
+
|
|
|
442
|
+
|
|
432
|
443
|
pkgconfig = import('pkgconfig')
|
|
433
|
444
|
|
|
434
|
445
|
pkgconfig.generate(ft2_lib,
|
| ... |
... |
@@ -444,9 +455,11 @@ if get_option('tests').enabled() |
|
444
|
455
|
subdir('tests')
|
|
445
|
456
|
endif
|
|
446
|
457
|
|
|
|
458
|
+
|
|
447
|
459
|
# NOTE: Unlike the old `make refdoc` command, this generates the
|
|
448
|
460
|
# documentation under `$BUILD/docs/` since Meson doesn't support modifying
|
|
449
|
461
|
# the source root directory (which is a good thing).
|
|
|
462
|
+
|
|
450
|
463
|
gen_docs = custom_target('freetype2 reference documentation',
|
|
451
|
464
|
output: 'docs',
|
|
452
|
465
|
input: ft2_public_headers + ft2_config_headers,
|
src/base/ftcalc.c
| ... |
... |
@@ -897,11 +897,11 @@ |
|
897
|
897
|
|
|
898
|
898
|
#ifndef FT_INT64
|
|
899
|
899
|
|
|
900
|
|
- /* Algorithm by Christophe Meessen (1993) with overflow fixed and */
|
|
901
|
|
- /* rounding added. Any unsigned fixed 16.16 argument is acceptable. */
|
|
902
|
|
- /* However, this algorithm is slower than the Babylonian method with */
|
|
903
|
|
- /* a good initial guess. We only use it for large 32-bit values when */
|
|
904
|
|
- /* 64-bit computations are not desirable. */
|
|
|
900
|
+ /* Algorithm by Christophe Meessen (1993) with overflow fixed and */
|
|
|
901
|
+ /* rounding added. Any unsigned fixed 16.16 argument is acceptable. */
|
|
|
902
|
+ /* However, this algorithm is slower than the Babylonian method with */
|
|
|
903
|
+ /* a good initial guess. We only use it for large 32-bit values when */
|
|
|
904
|
+ /* 64-bit computations are not desirable. */
|
|
905
|
905
|
else if ( v > 0x10000U )
|
|
906
|
906
|
{
|
|
907
|
907
|
FT_UInt32 r = v >> 1;
|
| ... |
... |
@@ -920,8 +920,8 @@ |
|
920
|
920
|
}
|
|
921
|
921
|
r <<= 1;
|
|
922
|
922
|
b >>= 1;
|
|
923
|
|
- }
|
|
924
|
|
- while ( b > 0x10 ); /* exactly 25 cycles */
|
|
|
923
|
+
|
|
|
924
|
+ } while ( b > 0x10 ); /* exactly 25 cycles */
|
|
925
|
925
|
|
|
926
|
926
|
return ( q + 0x40 ) >> 7;
|
|
927
|
927
|
}
|
| ... |
... |
@@ -946,8 +946,8 @@ |
|
946
|
946
|
{
|
|
947
|
947
|
t = q;
|
|
948
|
948
|
q = ( t + (FT_UInt32)( r / t ) + 1 ) >> 1;
|
|
949
|
|
- }
|
|
950
|
|
- while ( q != t ); /* less than 6 cycles */
|
|
|
949
|
+
|
|
|
950
|
+ } while ( q != t ); /* less than 6 cycles */
|
|
951
|
951
|
|
|
952
|
952
|
return q;
|
|
953
|
953
|
}
|
src/base/ftver.rc
| ... |
... |
@@ -18,8 +18,8 @@ |
|
18
|
18
|
|
|
19
|
19
|
#include<windows.h>
|
|
20
|
20
|
|
|
21
|
|
-#define FT_VERSION 2,13,2,0
|
|
22
|
|
-#define FT_VERSION_STR "2.13.2"
|
|
|
21
|
+#define FT_VERSION 2,13,3,0
|
|
|
22
|
+#define FT_VERSION_STR "2.13.3"
|
|
23
|
23
|
|
|
24
|
24
|
VS_VERSION_INFO VERSIONINFO
|
|
25
|
25
|
FILEVERSION FT_VERSION
|
| ... |
... |
@@ -45,7 +45,7 @@ BEGIN |
|
45
|
45
|
VALUE "FileVersion", FT_VERSION_STR
|
|
46
|
46
|
VALUE "ProductName", "FreeType"
|
|
47
|
47
|
VALUE "ProductVersion", FT_VERSION_STR
|
|
48
|
|
- VALUE "LegalCopyright", L"\x00A9 2000-2023 The FreeType Project www.freetype.org. All rights reserved."
|
|
|
48
|
+ VALUE "LegalCopyright", L"\x00A9 2000-2024 The FreeType Project www.freetype.org. All rights reserved."
|
|
49
|
49
|
VALUE "InternalName", "freetype"
|
|
50
|
50
|
VALUE "OriginalFilename", FT_FILENAME
|
|
51
|
51
|
END
|
src/cache/ftcbasic.c
| ... |
... |
@@ -45,8 +45,9 @@ |
|
45
|
45
|
FT_BOOL( FTC_SCALER_COMPARE( &(a)->scaler, &(b)->scaler ) && \
|
|
46
|
46
|
(a)->load_flags == (b)->load_flags )
|
|
47
|
47
|
|
|
48
|
|
-#define FTC_BASIC_ATTR_HASH( a ) \
|
|
49
|
|
- ( FTC_SCALER_HASH( &(a)->scaler ) + 31 * (a)->load_flags )
|
|
|
48
|
+#define FTC_BASIC_ATTR_HASH( a ) \
|
|
|
49
|
+ ( FTC_SCALER_HASH( &(a)->scaler ) + \
|
|
|
50
|
+ (FT_Offset)( 31 * (a)->load_flags ) )
|
|
50
|
51
|
|
|
51
|
52
|
|
|
52
|
53
|
typedef struct FTC_BasicQueryRec_
|
src/psaux/psintrp.c
| ... |
... |
@@ -445,7 +445,7 @@ |
|
445
|
445
|
cf2_stack_getReal( opStack,
|
|
446
|
446
|
delta++ ) ) );
|
|
447
|
447
|
|
|
448
|
|
- FT_TRACE6(( "%f ", (float) sum / 65536 ));
|
|
|
448
|
+ FT_TRACE6(( "%f ", (double)sum / 65536 ));
|
|
449
|
449
|
|
|
450
|
450
|
/* store blended result */
|
|
451
|
451
|
cf2_stack_setReal( opStack, i + base, sum );
|
| ... |
... |
@@ -2282,7 +2282,7 @@ |
|
2282
|
2282
|
|
|
2283
|
2283
|
arg = cf2_stack_popFixed( opStack );
|
|
2284
|
2284
|
if ( arg > 0 )
|
|
2285
|
|
- arg = (CF2_F16Dot16)FT_SqrtFixed( arg );
|
|
|
2285
|
+ arg = (CF2_F16Dot16)FT_SqrtFixed( (FT_UInt32)arg );
|
|
2286
|
2286
|
else
|
|
2287
|
2287
|
arg = 0;
|
|
2288
|
2288
|
|
src/sfnt/ttgpos.c
| ... |
... |
@@ -58,6 +58,7 @@ |
|
58
|
58
|
|
|
59
|
59
|
typedef enum gpos_lookup_type_
|
|
60
|
60
|
{
|
|
|
61
|
+ GPOS_LOOKUP_TYPE_NONE = 0,
|
|
61
|
62
|
GPOS_LOOKUP_TYPE_SINGLE_ADJUSTMENT = 1,
|
|
62
|
63
|
GPOS_LOOKUP_TYPE_PAIR_ADJUSTMENT = 2,
|
|
63
|
64
|
GPOS_LOOKUP_TYPE_CURSIVE_ATTACHMENT = 3,
|
| ... |
... |
@@ -132,14 +133,14 @@ |
|
132
|
133
|
else
|
|
133
|
134
|
{
|
|
134
|
135
|
context->current_lookup_table = NULL;
|
|
135
|
|
- context->current_lookup_type = 0;
|
|
|
136
|
+ context->current_lookup_type = GPOS_LOOKUP_TYPE_NONE;
|
|
136
|
137
|
context->subtable_count = 0;
|
|
137
|
138
|
context->subtable_offsets = NULL;
|
|
138
|
139
|
}
|
|
139
|
140
|
|
|
140
|
141
|
context->subtable_idx = 0;
|
|
141
|
142
|
context->subtable = NULL;
|
|
142
|
|
- context->subtable_type = 0;
|
|
|
143
|
+ context->subtable_type = GPOS_LOOKUP_TYPE_NONE;
|
|
143
|
144
|
}
|
|
144
|
145
|
|
|
145
|
146
|
|
| ... |
... |
@@ -195,7 +196,7 @@ |
|
195
|
196
|
FT_Int m;
|
|
196
|
197
|
|
|
197
|
198
|
FT_Int straw;
|
|
198
|
|
- FT_Int needle = glyph;
|
|
|
199
|
+ FT_Int needle = (FT_Int)glyph;
|
|
199
|
200
|
|
|
200
|
201
|
|
|
201
|
202
|
/* Binary search. */
|
| ... |
... |
@@ -230,7 +231,7 @@ |
|
230
|
231
|
|
|
231
|
232
|
FT_Int straw_start;
|
|
232
|
233
|
FT_Int straw_end;
|
|
233
|
|
- FT_Int needle = glyph;
|
|
|
234
|
+ FT_Int needle = (FT_Int)glyph;
|
|
234
|
235
|
|
|
235
|
236
|
|
|
236
|
237
|
/* Binary search. */
|
| ... |
... |
@@ -254,14 +255,11 @@ |
|
254
|
255
|
FT_PEEK_USHORT( range_record + 4 );
|
|
255
|
256
|
|
|
256
|
257
|
|
|
257
|
|
- return start_coverage_index + glyph - straw_start;
|
|
|
258
|
+ return (FT_Int)start_coverage_index + (FT_Int)glyph - straw_start;
|
|
258
|
259
|
}
|
|
259
|
260
|
}
|
|
260
|
261
|
break;
|
|
261
|
262
|
}
|
|
262
|
|
-
|
|
263
|
|
- default:
|
|
264
|
|
- return -1; /* unsupported */
|
|
265
|
263
|
}
|
|
266
|
264
|
|
|
267
|
265
|
return -1;
|
| ... |
... |
@@ -303,7 +301,7 @@ |
|
303
|
301
|
|
|
304
|
302
|
FT_Int straw_start;
|
|
305
|
303
|
FT_Int straw_end;
|
|
306
|
|
- FT_Int needle = glyph;
|
|
|
304
|
+ FT_Int needle = (FT_Int)glyph;
|
|
307
|
305
|
|
|
308
|
306
|
|
|
309
|
307
|
while ( l <= r )
|
| ... |
... |
@@ -325,9 +323,6 @@ |
|
325
|
323
|
}
|
|
326
|
324
|
break;
|
|
327
|
325
|
}
|
|
328
|
|
-
|
|
329
|
|
- default:
|
|
330
|
|
- return -1; /* Unsupported definition type, return an error. */
|
|
331
|
326
|
}
|
|
332
|
327
|
|
|
333
|
328
|
/* "All glyphs not assigned to a class fall into class 0." */
|
| ... |
... |
@@ -514,7 +509,7 @@ |
|
514
|
509
|
pair_value_count = FT_PEEK_USHORT( pair_value_table );
|
|
515
|
510
|
pair_value_array = pair_value_table + 2;
|
|
516
|
511
|
|
|
517
|
|
- needle = right_glyph;
|
|
|
512
|
+ needle = (FT_Int)right_glyph;
|
|
518
|
513
|
r = pair_value_count - 1;
|
|
519
|
514
|
l = 0;
|
|
520
|
515
|
|
| ... |
... |
@@ -584,9 +579,6 @@ |
|
584
|
579
|
|
|
585
|
580
|
return x_advance;
|
|
586
|
581
|
}
|
|
587
|
|
-
|
|
588
|
|
- default:
|
|
589
|
|
- return 0;
|
|
590
|
582
|
}
|
|
591
|
583
|
}
|
|
592
|
584
|
}
|
src/sfnt/ttpost.c
| ... |
... |
@@ -226,7 +226,7 @@ |
|
226
|
226
|
FT_UInt len = *p;
|
|
227
|
227
|
|
|
228
|
228
|
|
|
229
|
|
- /* all names in Adobe Glyph List are shorter than 40 characters */
|
|
|
229
|
+ /* names in the Adobe Glyph List are shorter than 40 characters */
|
|
230
|
230
|
if ( len >= 40U )
|
|
231
|
231
|
FT_TRACE4(( "load_format_20: unusual %u-char name found\n", len ));
|
|
232
|
232
|
|
| ... |
... |
@@ -240,7 +240,7 @@ |
|
240
|
240
|
if ( n < num_names )
|
|
241
|
241
|
{
|
|
242
|
242
|
FT_TRACE4(( "load_format_20: %hu PostScript names are truncated\n",
|
|
243
|
|
- num_names - n ));
|
|
|
243
|
+ (FT_UShort)( num_names - n ) ));
|
|
244
|
244
|
|
|
245
|
245
|
for ( ; n < num_names; n++ )
|
|
246
|
246
|
name_strings[n] = p_end;
|
src/truetype/ttgxvar.c
| ... |
... |
@@ -2115,7 +2115,7 @@ |
|
2115
|
2115
|
/* Convert delta in F2DOT14 to 16.16 before adding. */
|
|
2116
|
2116
|
v += MUL_INT( delta, 4 );
|
|
2117
|
2117
|
|
|
2118
|
|
- /* Clamp value range [-1, 1]. */
|
|
|
2118
|
+ /* Clamp value to range [-1, 1]. */
|
|
2119
|
2119
|
v = v >= 0x10000L ? 0x10000 : v;
|
|
2120
|
2120
|
v = v <= -0x10000L ? -0x10000 : v;
|
|
2121
|
2121
|
|
| ... |
... |
@@ -3770,8 +3770,8 @@ |
|
3770
|
3770
|
for ( i = 0; i < face->cvt_size; i++ )
|
|
3771
|
3771
|
face->cvt[i] += FT_fixedToFdot6( cvt_deltas[i] );
|
|
3772
|
3772
|
|
|
3773
|
|
- /* iterate over all FT_Size objects and set `cvt_ready' to -1 */
|
|
3774
|
|
- /* to trigger rescaling of all CVT values */
|
|
|
3773
|
+ /* Iterate over all `FT_Size` objects and set `cvt_ready` to -1 */
|
|
|
3774
|
+ /* to trigger rescaling of all CVT values. */
|
|
3775
|
3775
|
FT_List_Iterate( &root->sizes_list,
|
|
3776
|
3776
|
tt_cvt_ready_iterator,
|
|
3777
|
3777
|
NULL );
|
subprojects/libpng.wrap
|
1
|
1
|
[wrap-file]
|
|
2
|
|
-directory = libpng-1.6.40
|
|
3
|
|
-source_url = https://github.com/glennrp/libpng/archive/v1.6.40.tar.gz
|
|
4
|
|
-source_filename = libpng-1.6.40.tar.gz
|
|
5
|
|
-source_hash = 62d25af25e636454b005c93cae51ddcd5383c40fa14aa3dae8f6576feb5692c2
|
|
6
|
|
-patch_filename = libpng_1.6.40-1_patch.zip
|
|
7
|
|
-patch_url = https://wrapdb.mesonbuild.com/v2/libpng_1.6.40-1/get_patch
|
|
8
|
|
-patch_hash = bad558070e0a82faa5c0ae553bcd12d49021fc4b628f232a8e58c3fbd281aae1
|
|
9
|
|
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libpng_1.6.40-1/libpng-1.6.40.tar.gz
|
|
10
|
|
-wrapdb_version = 1.6.40-1
|
|
|
2
|
+directory = libpng-1.6.43
|
|
|
3
|
+source_url = https://github.com/glennrp/libpng/archive/v1.6.43.tar.gz
|
|
|
4
|
+source_filename = libpng-1.6.43.tar.gz
|
|
|
5
|
+source_hash = fecc95b46cf05e8e3fc8a414750e0ba5aad00d89e9fdf175e94ff041caf1a03a
|
|
|
6
|
+patch_filename = libpng_1.6.43-2_patch.zip
|
|
|
7
|
+patch_url = https://wrapdb.mesonbuild.com/v2/libpng_1.6.43-2/get_patch
|
|
|
8
|
+patch_hash = 49951297edf03e81d925ab03726555f09994ad1ed78fb539a269216430eef3da
|
|
|
9
|
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libpng_1.6.43-2/libpng-1.6.43.tar.gz
|
|
|
10
|
+wrapdb_version = 1.6.43-2
|
|
11
|
11
|
|
|
12
|
12
|
[provide]
|
|
13
|
13
|
libpng = libpng_dep |
subprojects/zlib.wrap
|
1
|
1
|
[wrap-file]
|
|
2
|
|
-directory = zlib-1.3
|
|
3
|
|
-source_url = http://zlib.net/fossils/zlib-1.3.tar.gz
|
|
4
|
|
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/zlib_1.3-1/zlib-1.3.tar.gz
|
|
5
|
|
-source_filename = zlib-1.3.tar.gz
|
|
6
|
|
-source_hash = ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e
|
|
7
|
|
-patch_filename = zlib_1.3-1_patch.zip
|
|
8
|
|
-patch_url = https://wrapdb.mesonbuild.com/v2/zlib_1.3-1/get_patch
|
|
9
|
|
-patch_hash = ab9d6b8167bb34a7c52b60b0cd6138aa4e0c2d31f997343a5f506f3b97b32008
|
|
10
|
|
-wrapdb_version = 1.3-1
|
|
|
2
|
+directory = zlib-1.3.1
|
|
|
3
|
+source_url = http://zlib.net/fossils/zlib-1.3.1.tar.gz
|
|
|
4
|
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/zlib_1.3.1-1/zlib-1.3.1.tar.gz
|
|
|
5
|
+source_filename = zlib-1.3.1.tar.gz
|
|
|
6
|
+source_hash = 9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23
|
|
|
7
|
+patch_filename = zlib_1.3.1-1_patch.zip
|
|
|
8
|
+patch_url = https://wrapdb.mesonbuild.com/v2/zlib_1.3.1-1/get_patch
|
|
|
9
|
+patch_hash = e79b98eb24a75392009cec6f99ca5cdca9881ff20bfa174e8b8926d5c7a47095
|
|
|
10
|
+wrapdb_version = 1.3.1-1
|
|
11
|
11
|
|
|
12
|
12
|
[provide]
|
|
13
|
13
|
zlib = zlib_dep |
|