minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 9 Releases Wiki Activity

Merge branch 'adjust' of https://gitlab.freedesktop.org/freetype/freetype into adjust

This commit is contained in:
Craig White 2025-01-29 00:09:30 -05:00
parent 74e456d4f0 cb432ad21e
commit 65d517dace
74 changed files with 1155 additions and 1771 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
CMakeLists.txt
View File

@ -108,18 +108,8 @@
# (this is compatible with the same CMake variables in zlib's CMake
# support).
# To minimize the number of cmake_policy() workarounds,
# CMake >= 3 is requested.
cmake_minimum_required(VERSION 3.0...3.5)
if (NOT CMAKE_VERSION VERSION_LESS 3.3)
# Allow symbol visibility settings also on static libraries. CMake < 3.3
# only sets the property on a shared library build.
cmake_policy(SET CMP0063 NEW)
# Support new IN_LIST if() operator.
cmake_policy(SET CMP0057 NEW)
endif ()
# CMake 3.12 provides for IMPORTED targets for common libraries like zlib, libpng and bzip2
cmake_minimum_required(VERSION 3.12)
include(CheckIncludeFile)
include(CMakeDependentOption)
@ -164,7 +154,7 @@ project(freetype C)
set(VERSION_MAJOR "2")
set(VERSION_MINOR "13")
set(VERSION_PATCH "2")
set(VERSION_PATCH "3")
# Generate LIBRARY_VERSION and LIBRARY_SOVERSION.
set(LIBTOOL_REGEX "version_info='([0-9]+):([0-9]+):([0-9]+)'")
@ -524,13 +514,11 @@ set(PKGCONFIG_LIBS "-L\${libdir} -lfreetype")
set(PKGCONFIG_LIBS_PRIVATE "")
if (ZLIB_FOUND)
target_link_libraries(freetype PRIVATE ${ZLIB_LIBRARIES})
target_include_directories(freetype PRIVATE ${ZLIB_INCLUDE_DIRS})
target_link_libraries(freetype PRIVATE ZLIB::ZLIB)
list(APPEND PKGCONFIG_REQUIRES_PRIVATE "zlib")
endif ()
if (BZIP2_FOUND)
target_link_libraries(freetype PRIVATE ${BZIP2_LIBRARIES})
target_include_directories(freetype PRIVATE ${BZIP2_INCLUDE_DIR}) # not BZIP2_INCLUDE_DIRS
target_link_libraries(freetype PRIVATE BZip2::BZip2)
if (PC_BZIP2_FOUND)
list(APPEND PKGCONFIG_REQUIRES_PRIVATE "bzip2")
else ()
@ -538,14 +526,11 @@ if (BZIP2_FOUND)
endif ()
endif ()
if (PNG_FOUND)
target_link_libraries(freetype PRIVATE ${PNG_LIBRARIES})
target_compile_definitions(freetype PRIVATE ${PNG_DEFINITIONS})
target_include_directories(freetype PRIVATE ${PNG_INCLUDE_DIRS})
target_link_libraries(freetype PRIVATE PNG::PNG)
list(APPEND PKGCONFIG_REQUIRES_PRIVATE "libpng")
endif ()
if (HarfBuzz_FOUND)
target_link_libraries(freetype PRIVATE ${HarfBuzz_LIBRARY})
target_include_directories(freetype PRIVATE ${HarfBuzz_INCLUDE_DIRS})
target_link_libraries(freetype PRIVATE HarfBuzz::HarfBuzz)
list(APPEND PKGCONFIG_REQUIRES_PRIVATE "harfbuzz >= ${HARFBUZZ_MIN_VERSION}")
endif ()
if (BROTLIDEC_FOUND)

4
MSBuild.rsp
View File

@ -1,2 +1,4 @@
# MSBuild.rsp with default command-line switches
/clp:ForceConsoleColor
/p:Configuration=Release
#/p:WindowsTargetPlatformVersion=10.0.16299.0
/p:Configuration="Release"

8
README
View File

@ -1,4 +1,4 @@
FreeType 2.13.2
FreeType 2.13.3
===============
Homepage: https://www.freetype.org
@ -32,9 +32,9 @@ sites. Go to
and download one of the following files.
freetype-doc-2.13.2.tar.xz
freetype-doc-2.13.2.tar.gz
ftdoc2132.zip
freetype-doc-2.13.3.tar.xz
freetype-doc-2.13.3.tar.gz
ftdoc2133.zip
To view the documentation online, go to

4
autogen.sh
View File

@ -99,7 +99,7 @@ check_tool_version ()
if test "$field"x = x; then
field=3 # default to 3 for all GNU autotools, after filtering enclosed string
fi
version=`$1 --version | head -1 | sed 's/([^)]*)/()/g' | cut -d ' ' -f $field`
version=`$1 --version | sed -n '1s/([^)]*)/()/gp' | cut -d ' ' -f $field`
version_check=`compare_to_minimum_version $version $4`
if test "$version_check"x = 0x; then
echo "ERROR: Your version of the \`$2' tool is too old."
@ -182,7 +182,7 @@ copy_submodule_files ()
cp $DLG_SRC_DIR/* src/dlg
}
if test -e ".git"; then
if test -d ".git" -o -h ".git"; then
DLG_INC_DIR=subprojects/dlg/include/dlg
DLG_SRC_DIR=subprojects/dlg/src/dlg

4
builds/cmake/FindHarfBuzz.cmake
View File

@ -28,8 +28,8 @@
# Try to find Harfbuzz include and library directories.
#
# After successful discovery, this will set for inclusion where needed:
# HarfBuzz_INCLUDE_DIRS - containg the HarfBuzz headers
# HarfBuzz_LIBRARIES - containg the HarfBuzz library
# HarfBuzz_INCLUDE_DIRS - containing the HarfBuzz headers
# HarfBuzz_LIBRARIES - containing the HarfBuzz library
#[=======================================================================[.rst:
FindHarfBuzz

1
builds/compiler/gcc-dev.mk
View File

@ -76,6 +76,7 @@ ifndef CFLAGS
-Wpointer-arith \
-Wwrite-strings \
-Wredundant-decls \
-Wno-format-extra-args \
-Wno-long-long \
$(nested_externs) \
$(strict_prototypes)

13
builds/toplevel.mk
View File

@ -274,12 +274,16 @@ dist:
# GNU `config' git repository), relative to the `tmp' directory used during
# `make dist'.
#
CONFIG_GUESS = ~/git/config/config.guess
CONFIG_SUB = ~/git/config/config.sub
# GNU_CONFIG_GIT_URL = git://git.savannah.gnu.org/config.git
GNU_CONFIG_GIT_URL = https://git.savannah.gnu.org/git/config.git
GNU_CONFIG_DESTDIR = $(TOP_DIR)/subprojects/gnu-config
CONFIG_GUESS = $(GNU_CONFIG_DESTDIR)/config.guess
CONFIG_SUB = $(GNU_CONFIG_DESTDIR)/config.sub
# We also use this repository to access the gnulib script that converts git
# commit messages to a ChangeLog file.
CHANGELOG_SCRIPT = ~/git/config/gitlog-to-changelog
CHANGELOG_SCRIPT = $(GNU_CONFIG_DESTDIR)/gitlog-to-changelog
# Don't say `make do-dist'. Always use `make dist' instead.
@ -295,6 +299,8 @@ do-dist: distclean refdoc
sh autogen.sh
rm -rf $(TOP_DIR)/builds/unix/autom4te.cache
rm -rf $(GNU_CONFIG_DESTDIR)
git clone https://git.savannah.gnu.org/git/config.git $(GNU_CONFIG_DESTDIR)
cp $(CONFIG_GUESS) $(TOP_DIR)/builds/unix
cp $(CONFIG_SUB) $(TOP_DIR)/builds/unix
@ -312,5 +318,6 @@ do-dist: distclean refdoc
@# Remove more stuff related to git.
rm -rf $(TOP_DIR)/subprojects/dlg
rm -rf $(TOP_DIR)/subprojects/gnu-config
# EOF

9
builds/unix/configure.raw
View File

@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.h.in])
# Don't forget to update `docs/VERSIONS.TXT'!
version_info='26:1:20'
version_info='26:2:20'
AC_SUBST([version_info])
ft_version=`echo $version_info | tr : .`
AC_SUBST([ft_version])
@ -46,6 +46,7 @@ if test ${cross_compiling} = yes; then
AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build}-gcc)
test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, gcc, gcc)
test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, cc, cc, , , /usr/ucb/cc)
test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, clang, clang)
test -z "${CC_BUILD}" && AC_MSG_ERROR([cannot find native C compiler])
AC_MSG_CHECKING([for suffix of native executables])
@ -62,12 +63,18 @@ if test ${cross_compiling} = yes; then
fi
rm -f a.* b.* a_out.exe conftest.*
AC_MSG_RESULT($EXEEXT_BUILD)
CFLAGS_BUILD=
LDFLAGS_BUILD=
else
CC_BUILD=${CC}
CFLAGS_BUILD=${CFLAGS}
LDFLAGS_BUILD=${LDFLAGS}
EXEEXT_BUILD=${EXEEXT}
fi
AC_SUBST(CC_BUILD)
AC_SUBST(CFLAGS_BUILD)
AC_SUBST(LDFLAGS_BUILD)
AC_SUBST(EXEEXT_BUILD)

4
builds/unix/unix-cc.in
View File

@ -113,7 +113,9 @@ LDFLAGS := @LDFLAGS@
CCraw_build := @CC_BUILD@ # native CC of building system
E_BUILD := @EXEEXT_BUILD@ # extension for executable on building system
EXPORTS_LIST := $(OBJ_DIR)/ftexport.sym
CCexe := $(CCraw_build) # used to compile `apinames' only
CCexe := $(CCraw_build) # used to compile `apinames' only, see exports.mk
CCexe_CFLAGS := @CFLAGS_BUILD@ # ditto.
CCexe_LDFLAGS := @LDFLAGS_BUILD@ # ditto.
# Library linking.

2
builds/vms/apinames_vms.bash
View File

@ -1,2 +1,2 @@
src/tools/apinames -wV include/freetype/*.h > freetype_vms0.opt
mv freetype_vms0.opt freetype_vms.opt
/gnu/bin/mv freetype_vms0.opt freetype_vms.opt

2
builds/wince/vc2005-ce/freetype.sln
View File

@ -146,7 +146,7 @@ Global
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Professional SDK (ARMV4I)
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Release|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Releaase|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Release|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Release|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Standard SDK (ARMV4I)
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Release|Windows Mobile 6 Standard SDK (ARMV4I).Build.0 = Release|Windows Mobile 6 Standard SDK (ARMV4I)
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.LIB Release|Windows Mobile 6 Standard SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Standard SDK (ARMV4I)

2
builds/wince/vc2005-ce/index.html
View File

@ -21,7 +21,7 @@ the following targets:
<li>PPC/SP WM6 (Windows Mobile 6)</li>
</ul>
It compiles the following libraries from the FreeType 2.13.2 sources:</p>
It compiles the following libraries from the FreeType 2.13.3 sources:</p>
<ul>
<pre>

2
builds/wince/vc2008-ce/index.html
View File

@ -21,7 +21,7 @@ the following targets:
<li>PPC/SP WM6 (Windows Mobile 6)</li>
</ul>
It compiles the following libraries from the FreeType 2.13.2 sources:</p>
It compiles the following libraries from the FreeType 2.13.3 sources:</p>
<ul>
<pre>

2
builds/windows/ftdebug.c
View File

@ -64,7 +64,7 @@
* with the actual log message if set to true.
*
* 5. The flag `ft_timestamp_flag` prints time along with the actual log
* message if set to ture.
* message if set to true.
*
* 6. `ft_have_newline_char` is used to differentiate between a log
* message with and without a trailing newline character.

2
builds/windows/ftsystem.c
View File

@ -296,7 +296,7 @@
/* support for really old Windows */
#if defined( _WIN32_WCE ) || defined ( _WIN32_WINDOWS ) || \
!defined( _WIN32_WINNT ) || _WIN32_WINNT <= 0x0400
( defined( _WIN32_WINNT ) && _WIN32_WINNT <= 0x0400 )
FT_LOCAL_DEF( BOOL )
GetFileSizeEx( HANDLE hFile,

2
builds/windows/vc2010/index.html
View File

@ -12,7 +12,7 @@
<p>This directory contains solution and project files for
Visual&nbsp;C++&nbsp;2010 or newer, named <tt>freetype.sln</tt>,
and <tt>freetype.vcxproj</tt>. It compiles the following libraries
from the FreeType 2.13.2 sources:</p>
from the FreeType 2.13.3 sources:</p>
<ul>
<li>freetype.dll using 'Release' or 'Debug' configurations</li>

2
builds/windows/visualc/index.html
View File

@ -12,7 +12,7 @@
<p>This directory contains project files <tt>freetype.dsp</tt> for
Visual C++ 6.0, and <tt>freetype.vcproj</tt> for Visual C++ 2002
through 2008, which you might need to upgrade automatically.
It compiles the following libraries from the FreeType 2.13.2 sources:</p>
It compiles the following libraries from the FreeType 2.13.3 sources:</p>
<ul>
<li>freetype.dll using 'Release' or 'Debug' configurations</li>

2
builds/windows/visualce/index.html
View File

@ -21,7 +21,7 @@ the following targets:
<li>PPC/SP WM6 (Windows Mobile 6)</li>
</ul>
It compiles the following libraries from the FreeType 2.13.2 sources:</p>
It compiles the following libraries from the FreeType 2.13.3 sources:</p>
<ul>
<pre>

26
docs/CHANGES
View File

@ -1,4 +1,22 @@
CHANGES BETWEEN 2.13.2 and 2.13.3 (2024-Mmm-DD)
CHANGES BETWEEN 2.13.3 and 2.13.4 (2025-Mmm-DD)
I. IMPORTANT CHANGES
- Bitmap-only TrueType fonts now ignore FT_LOAD_NO_BITMAP flag and
proceed loading bitmaps instead of giving an error. This behavior
is documented and implemented for other bitmap-only fonts. The
flag was always meant to suppress the bitmap strikes in favor of
outlines, not to ban them completely.
III. MISCELLANEOUS
- The BDF driver now loads fonts 75% faster.
======================================================================
CHANGES BETWEEN 2.13.2 and 2.13.3 (2024-Aug-11)
I. IMPORTANT CHANGES
@ -32,8 +50,8 @@ CHANGES BETWEEN 2.13.2 and 2.13.3 (2024-Mmm-DD)
III. MISCELLANEOUS
- The B/W rasterizer has received a major upkeep that resulted in
large performance improvement. The rendering speed has increased
- The B/W rasterizer has received a major upkeep that results in
large performance improvements. The rendering speed has increased
and even doubled for very complex glyphs.
- If the new configuration option `TT_CONFIG_OPTION_GPOS_KERNING` is
@ -594,7 +612,7 @@ CHANGES BETWEEN 2.9.1 and 2.10.0 (2019-Mar-15)
Set text foreground color for palette index 0xFFFF.
FT_Get_Color_Glyph_Layer
Get color layers for a given glyph (using an interator
Get color layers for a given glyph (using an iterator
object).
FT_Bitmap_Blend

1
docs/VERSIONS.TXT
View File

@ -60,6 +60,7 @@ found on _most_ systems, but not all of them:
release libtool so
-------------------------------
2.13.3 26.2.20 6.20.2
2.13.2 26.1.20 6.20.1
2.13.1 26.0.20 6.20.0
2.13.0 25.0.19 6.19.0

2
docs/freetype-config.1
View File

@ -1,4 +1,4 @@
.TH FREETYPE-CONFIG 1 "August 2023" "FreeType 2.13.2"
.TH FREETYPE-CONFIG 1 "August 2024" "FreeType 2.13.3"
.
.
.SH NAME

2
docs/markdown/javascripts/extra.js
View File

@ -1,5 +1,5 @@
/*
Internal link topbar offest adjust Javascript
Internal link topbar offset adjust Javascript
Code provided by @makshh on GitHub
Bug report on material-mkdocs

4
docs/oldlogs/ChangeLog.210
View File

@ -2983,7 +2983,7 @@
[raster] Tune SMART macro (#58352).
Windows seems to perform smart dropout control at 26.6 precision.
To mimick Windows independent of increased precision, we need to tweak
To mimic Windows independent of increased precision, we need to tweak
the macro so that some close calls break down rather than up.
* src/raster/ftraster.c (SMART): Tweak the macro.
@ -6484,7 +6484,7 @@
Add internal functions `FT_Trace_Disable' and `FT_Trace_Enable'.
It sometimes makes sense to suppress tracing informations, for
It sometimes makes sense to suppress tracing information, for
example, if it outputs identical messages again and again.
* include/freetype/internal/ftdebug.h: Make `ft_trace_levels' a

2
include/freetype/freetype.h
View File

@ -5174,7 +5174,7 @@ FT_BEGIN_HEADER
*/
#define FREETYPE_MAJOR 2
#define FREETYPE_MINOR 13
#define FREETYPE_PATCH 2
#define FREETYPE_PATCH 3
/**************************************************************************

4
include/freetype/ftcolor.h
View File

@ -1518,7 +1518,7 @@ FT_BEGIN_HEADER
*
* @return:
* Value~1 if a clip box is found. If no clip box is found or an error
* occured, value~0 is returned.
* occurred, value~0 is returned.
*
* @note:
* To retrieve the clip box in font units, reset scale to units-per-em
@ -1646,7 +1646,7 @@ FT_BEGIN_HEADER
*
* @return:
* Value~1 if everything is OK. Value~0 if no details can be found for
* this paint or any other error occured.
* this paint or any other error occurred.
*
* @since:
* 2.13

2
include/freetype/ftdriver.h
View File

@ -847,7 +847,7 @@ FT_BEGIN_HEADER
* FT_Property_Set( library, "sdf", "spread", &spread );
* ```
*
* @note
* @note:
* FreeType has two rasterizers for generating SDF, namely:
*
* 1. `sdf` for generating SDF directly from glyph's outline, and

11
include/freetype/ftimage.h
View File

@ -21,9 +21,10 @@
* Note: A 'raster' is simply a scan-line converter, used to render
* `FT_Outline`s into `FT_Bitmap`s.
*
* Note: This file can be used for STANDALONE_ compilation of raster (B/W)
* and smooth (anti-aliased) renderers. Therefore, it must rely on
* standard variable types only rather than aliases in fttypes.h.
* Note: This file can be used for `STANDALONE_` compilation of raster
* (B/W) and smooth (anti-aliased) renderers. Therefore, it must
* rely on standard variable types only instead of aliases in
* `fttypes.h`.
*
*/
@ -266,6 +267,10 @@ FT_BEGIN_HEADER
* *logical* one. For example, if @FT_Pixel_Mode is set to
* `FT_PIXEL_MODE_LCD`, the logical width is a just a third of the
* physical one.
*
* An empty bitmap with a NULL `buffer` is valid, with `rows` and/or
* `pitch` also set to 0. Such bitmaps might be produced while rendering
* empty or degenerate outlines.
*/
typedef struct FT_Bitmap_
{

6
include/freetype/internal/ftcalc.h
View File

@ -415,7 +415,7 @@ FT_BEGIN_HEADER
#define FT_MSB( x ) ( 31 - _CountLeadingZeros( x ) )
#elif defined( _M_ARM64 ) || defined( _M_ARM )
#elif defined( _M_ARM64 ) || defined( _M_ARM ) || defined( _M_ARM64EC )
#include <intrin.h>
#pragma intrinsic( _CountLeadingZeros )
@ -511,8 +511,8 @@ FT_BEGIN_HEADER
* The result of 'sqrt(x)'.
*
* @note:
* This function is slow and should be avoided. Consider `FT_Hypot` or
* `FT_Vector_NormLen' instead.
* This function is slow and should be avoided. Consider @FT_Hypot or
* @FT_Vector_NormLen instead.
*/
FT_BASE( FT_UInt32 )
FT_SqrtFixed( FT_UInt32 x );

6
include/freetype/internal/ftobjs.h
View File

@ -626,12 +626,6 @@ FT_BEGIN_HEADER
#define FT_FACE_MEMORY( x ) FT_FACE( x )->memory
#define FT_FACE_STREAM( x ) FT_FACE( x )->stream
#define FT_SIZE_FACE( x ) FT_SIZE( x )->face
#define FT_SLOT_FACE( x ) FT_SLOT( x )->face
#define FT_FACE_SLOT( x ) FT_FACE( x )->glyph
#define FT_FACE_SIZE( x ) FT_FACE( x )->size
/**************************************************************************
*

2
include/freetype/internal/fttrace.h
View File

@ -19,7 +19,7 @@
/* definitions of trace levels for FreeType 2 */
/* the maximum string length (if the argument to `FT_TRACE_DEF` */
/* gets used as a string) plus one charachter for ':' plus */
/* gets used as a string) plus one character for ':' plus */
/* another one for the trace level */
#define FT_MAX_TRACE_LEVEL_LENGTH (9 + 1 + 1)

6
include/freetype/internal/sfnt.h
View File

@ -612,7 +612,7 @@ FT_BEGIN_HEADER
*
* @return:
* Value~1 if a ClipBox is found. If no clip box is found or an
* error occured, value~0 is returned.
* error occurred, value~0 is returned.
*/
typedef FT_Bool
( *TT_Get_Color_Glyph_ClipBox_Func )( TT_Face face,
@ -707,7 +707,7 @@ FT_BEGIN_HEADER
*
* @return:
* Value~1 if everything is OK. Value~0 if no details can be found for
* this paint or any other error occured.
* this paint or any other error occurred.
*/
typedef FT_Bool
( *TT_Get_Paint_Func )( TT_Face face,
@ -808,7 +808,7 @@ FT_BEGIN_HEADER
* corresponding (1,0) Apple entry.
*
* @return:
* 1 if there is either a win or apple entry (or both), 0 otheriwse.
* 1 if there is either a win or apple entry (or both), 0 otherwise.
*/
typedef FT_Bool
(*TT_Get_Name_ID_Func)( TT_Face face,

5
include/freetype/tttables.h
View File

@ -838,8 +838,9 @@ FT_BEGIN_HEADER
* The target charmap.
*
* @return:
* The format of `charmap`. If `charmap` doesn't belong to an SFNT face,
* return -1.
* The format of `charmap`. If `charmap` doesn't belong to an SFNT face
* (including the synthetic Unicode charmap sometimes created by
* FreeType), return -1.
*/
FT_EXPORT( FT_Long )
FT_Get_CMap_Format( FT_CharMap charmap );

66
meson.build
View File

@ -54,6 +54,9 @@ freetype_includedir = join_paths(get_option('includedir'), 'freetype2')
ft2_defines = []
freetype_aclocaldir = join_paths(get_option('datadir'), 'aclocal')
# Generate a custom `ftmodule.h` version based on the content of
# `modules.cfg`.
@ -156,6 +159,7 @@ ft2_public_headers = files([
'include/freetype/ftincrem.h',
'include/freetype/ftlcdfil.h',
'include/freetype/ftlist.h',
'include/freetype/ftlogging.h',
'include/freetype/ftlzw.h',
'include/freetype/ftmac.h',
'include/freetype/ftmm.h',
@ -231,7 +235,7 @@ endif
# value from the environment, when this is supported. A smaller refactor
# might make these platform-specific files much smaller, and could be moved
# into `ftsystem.c` as well.
#
if host_machine.system() == 'windows'
winmod = import('windows')
ft2_sources += [
@ -251,7 +255,7 @@ common_ldflags = []
#
# OSX sets the compatibility_version (aka libtools version) differently from
# the library name.
#
if host_machine.system() == 'darwin'
# maintain compatibility with autotools on macOS
common_ldflags = [
@ -266,13 +270,13 @@ endif
process_header_command = [python_exe,
files('builds/meson/process_ftoption_h.py'),
'@INPUT@', '--output=@OUTPUT@']
ftoption_command = process_header_command
# external GZip support
# External GZip support.
zlib_option = get_option('zlib')
# Backwards-compatible aliases.
# Backward-compatible aliases.
if zlib_option == 'disabled'
zlib_option = 'none'
elif zlib_option == 'enabled'
@ -315,10 +319,17 @@ else
assert(false, 'Invalid zlib option ' + zlib_option)
endif
# BZip2 support
bzip2_dep = dependency('bzip2', required: false)
# BZip2 support.
bzip2_dep = dependency(
'bzip2',
required: get_option('bzip2').disabled() ? get_option('bzip2') : false,
)
if not bzip2_dep.found()
bzip2_dep = cc.find_library('bz2', has_headers: ['bzlib.h'], required: get_option('bzip2'))
bzip2_dep = cc.find_library(
'bz2',
has_headers: ['bzlib.h'],
required: get_option('bzip2'),
)
endif
if bzip2_dep.found()
@ -327,7 +338,7 @@ if bzip2_dep.found()
ft2_deps += [bzip2_dep]
endif
# PNG support
# PNG support.
libpng_dep = dependency('libpng',
required: get_option('png'),
fallback: 'libpng')
@ -337,7 +348,7 @@ if libpng_dep.found()
ft2_deps += [libpng_dep]
endif
# Harfbuzz support
# Harfbuzz support.
harfbuzz_dep = dependency('harfbuzz',
version: '>= 2.0.0',
required: get_option('harfbuzz'),
@ -348,7 +359,7 @@ if harfbuzz_dep.found()
ft2_deps += [harfbuzz_dep]
endif
# Brotli decompression support
# Brotli decompression support.
brotli_dep = dependency('libbrotlidec',
required: get_option('brotli'))
@ -357,6 +368,10 @@ if brotli_dep.found()
ft2_deps += [brotli_dep]
endif
if get_option('error_strings')
ftoption_command += ['--enable=FT_CONFIG_OPTION_ERROR_STRINGS']
endif
# We can now generate `ftoption.h`.
ftoption_h = custom_target('ftoption.h',
input: 'include/freetype/config/ftoption.h',
@ -368,7 +383,8 @@ ftoption_h = custom_target('ftoption.h',
ft2_sources += ftoption_h
ft2_defines += ['-DFT_CONFIG_OPTIONS_H=<ftoption.h>']
if host_machine.system() == 'windows'
if host_machine.system() == 'windows' and \
get_option('default_library') == 'shared'
ft2_defines += ['-DDLL_EXPORT=1']
endif
@ -376,6 +392,7 @@ endif
# Generate `ftconfig.h`.
ftconfig_command = process_header_command
if has_unistd_h
ftconfig_command += '--enable=HAVE_UNISTD_H'
endif
@ -409,7 +426,8 @@ ft2_lib = library('freetype',
)
# To be used by other projects including this one through `subproject`.
# To be used by other projects including this one via `subproject`.
freetype_dep = declare_dependency(
include_directories: ft2_includes,
link_with: ft2_lib,
@ -418,9 +436,9 @@ freetype_dep = declare_dependency(
meson.override_dependency('freetype2', freetype_dep)
# NOTE: Using both `install_dir` and `subdir` doesn't seem to work below,
# i.e., the subdir value seems to be ignored, contrary to examples in the
# Meson documentation.
# NOTE: Using both `install_dir` and `subdir` doesn't seem to work
# below, i.e., the `subdir` value seems to be ignored, contrary to
# examples in the Meson documentation.
install_headers('include/ft2build.h',
install_dir: freetype_includedir)
install_headers(ft2_public_headers,
@ -429,6 +447,10 @@ install_headers(ft2_config_headers,
install_dir: join_paths(freetype_includedir, 'freetype/config'))
install_data('builds/unix/freetype2.m4',
install_dir: freetype_aclocaldir)
pkgconfig = import('pkgconfig')
pkgconfig.generate(ft2_lib,
@ -444,9 +466,11 @@ if get_option('tests').enabled()
subdir('tests')
endif
# NOTE: Unlike the old `make refdoc` command, this generates the
# documentation under `$BUILD/docs/` since Meson doesn't support modifying
# the source root directory (which is a good thing).
gen_docs = custom_target('freetype2 reference documentation',
output: 'docs',
input: ft2_public_headers + ft2_config_headers,
@ -463,10 +487,10 @@ summary({'OS': host_machine.system(),
}, section: 'Operating System')
summary({'Zlib': zlib_option,
'Bzip2': bzip2_dep.found() ? 'yes' : 'no',
'Png': libpng_dep.found() ? 'yes' : 'no',
'Harfbuzz': harfbuzz_dep.found() ? 'yes' : 'no',
'Brotli': brotli_dep.found() ? 'yes' : 'no',
}, section: 'Used Libraries')
'Bzip2': bzip2_dep.found(),
'Png': libpng_dep.found(),
'Harfbuzz': harfbuzz_dep.found(),
'Brotli': brotli_dep.found(),
}, bool_yn: true, section: 'Used Libraries')
# EOF

5
meson_options.txt
View File

@ -52,4 +52,9 @@ option('zlib',
'disabled', 'enabled' ],
description: 'Support reading gzip-compressed font files')
option('error_strings',
type: 'boolean',
value: false,
description: 'Enable support for meaningful error descriptions')
# EOF

2
src/autofit/afcjk.c
View File

@ -1378,7 +1378,7 @@
}
/* Initalize hinting engine. */
/* Initialize hinting engine. */
FT_LOCAL_DEF( FT_Error )
af_cjk_hints_init( AF_GlyphHints hints,

2
src/autofit/aflatin.c
View File

@ -2625,7 +2625,7 @@
}
/* Initalize hinting engine. */
/* Initialize hinting engine. */
static FT_Error
af_latin_hints_init( AF_GlyphHints hints,

2
src/autofit/afmodule.c
View File

@ -438,7 +438,7 @@
AF_Module module = (AF_Module)module_;
FT_Error error = FT_Err_Ok;
FT_Memory memory = module->root.library->memory;
FT_Memory memory = module->root.memory;
#ifdef FT_DEBUG_AUTOFIT

18
src/base/ftcalc.c
View File

@ -897,11 +897,11 @@
#ifndef FT_INT64
/* Algorithm by Christophe Meessen (1993) with overflow fixed and */
/* rounding added. Any unsigned fixed 16.16 argument is acceptable. */
/* However, this algorithm is slower than the Babylonian method with */
/* a good initial guess. We only use it for large 32-bit values when */
/* 64-bit computations are not desirable. */
/* Algorithm by Christophe Meessen (1993) with overflow fixed and */
/* rounding added. Any unsigned fixed 16.16 argument is acceptable. */
/* However, this algorithm is slower than the Babylonian method with */
/* a good initial guess. We only use it for large 32-bit values when */
/* 64-bit computations are not desirable. */
else if ( v > 0x10000U )
{
FT_UInt32 r = v >> 1;
@ -920,8 +920,8 @@
}
r <<= 1;
b >>= 1;
}
while ( b > 0x10 ); /* exactly 25 cycles */
} while ( b > 0x10 ); /* exactly 25 cycles */
return ( q + 0x40 ) >> 7;
}
@ -946,8 +946,8 @@
{
t = q;
q = ( t + (FT_UInt32)( r / t ) + 1 ) >> 1;
}
while ( q != t ); /* less than 6 cycles */
} while ( q != t ); /* less than 6 cycles */
return q;
}

2
src/base/ftdebug.c
View File

@ -64,7 +64,7 @@
* with the actual log message if set to true.
*
* 5. The flag `ft_timestamp_flag` prints time along with the actual log
* message if set to ture.
* message if set to true.
*
* 6. `ft_have_newline_char` is used to differentiate between a log
* message with and without a trailing newline character.

16
src/base/ftobjs.c
View File

@ -1253,14 +1253,14 @@
FT_Driver driver = (FT_Driver)driver_;
/* finalize client-specific data */
if ( size->generic.finalizer )
size->generic.finalizer( size );
/* finalize format-specific stuff */
if ( driver->clazz->done_size )
driver->clazz->done_size( size );
/* finalize client-specific data */
if ( size->generic.finalizer )
size->generic.finalizer( size );
FT_FREE( size->internal );
FT_FREE( size );
}
@ -1322,10 +1322,6 @@
driver );
face->size = NULL;
/* now discard client data */
if ( face->generic.finalizer )
face->generic.finalizer( face );
/* discard charmaps */
destroy_charmaps( face, memory );
@ -1340,6 +1336,10 @@
face->stream = NULL;
/* now discard client data */
if ( face->generic.finalizer )
face->generic.finalizer( face );
/* get rid of it */
if ( face->internal )
{

4
src/base/ftstream.c
View File

@ -763,10 +763,10 @@
case ft_frame_bytes: /* read a byte sequence */
case ft_frame_skip: /* skip some bytes */
{
FT_UInt len = fields->size;
FT_Offset len = fields->size;
if ( cursor + len > stream->limit )
if ( len > (FT_Offset)( stream->limit - cursor ) )
{
error = FT_THROW( Invalid_Stream_Operation );
goto Exit;

20
src/base/ftstroke.c
View File

@ -1371,7 +1371,7 @@
arc[1] = *control;
arc[2] = stroker->center;
while ( arc >= bez_stack )
do
{
FT_Angle angle_in, angle_out;
@ -1524,10 +1524,12 @@
}
}
arc -= 2;
stroker->angle_in = angle_out;
}
if ( arc == bez_stack )
break;
arc -= 2;
} while ( 1 );
stroker->center = *to;
stroker->line_length = 0;
@ -1577,7 +1579,7 @@
arc[2] = *control1;
arc[3] = stroker->center;
while ( arc >= bez_stack )
do
{
FT_Angle angle_in, angle_mid, angle_out;
@ -1741,10 +1743,12 @@
}
}
arc -= 3;
stroker->angle_in = angle_out;
}
if ( arc == bez_stack )
break;
arc -= 3;
} while ( 1 );
stroker->center = *to;
stroker->line_length = 0;

2
src/base/ftsynth.c
View File

@ -141,7 +141,7 @@
/*
* XXX: overflow check for 16-bit system, for compatibility
* with FT_GlyphSlot_Embolden() since FreeType 2.1.10.
* unfortunately, this function return no informations
* unfortunately, this function return no information
* about the cause of error.
*/
if ( ( ystr >> 6 ) > FT_INT_MAX || ( ystr >> 6 ) < FT_INT_MIN )

6
src/base/ftver.rc
View File

@ -18,8 +18,8 @@
#include<windows.h>
#define FT_VERSION 2,13,2,0
#define FT_VERSION_STR "2.13.2"
#define FT_VERSION 2,13,3,0
#define FT_VERSION_STR "2.13.3"
VS_VERSION_INFO VERSIONINFO
FILEVERSION FT_VERSION
@ -45,7 +45,7 @@ BEGIN
VALUE "FileVersion", FT_VERSION_STR
VALUE "ProductName", "FreeType"
VALUE "ProductVersion", FT_VERSION_STR
VALUE "LegalCopyright", L"\x00A9 2000-2023 The FreeType Project www.freetype.org. All rights reserved."
VALUE "LegalCopyright", L"\x00A9 2000-2024 The FreeType Project www.freetype.org. All rights reserved."
VALUE "InternalName", "freetype"
VALUE "OriginalFilename", FT_FILENAME
END

45
src/bdf/bdf.h
View File

@ -57,39 +57,13 @@ FT_BEGIN_HEADER
*/
#define BDF_CORRECT_METRICS 0x01 /* Correct invalid metrics when loading. */
#define BDF_KEEP_COMMENTS 0x02 /* Preserve the font comments. */
#define BDF_KEEP_UNENCODED 0x04 /* Keep the unencoded glyphs. */
#define BDF_PROPORTIONAL 0x08 /* Font has proportional spacing. */
#define BDF_MONOWIDTH 0x10 /* Font has mono width. */
#define BDF_CHARCELL 0x20 /* Font has charcell spacing. */
#define BDF_CORRECT_METRICS 0x1000 /* Correct metrics when loading. */
#define BDF_KEEP_COMMENTS 0x2000 /* Preserve the font comments. */
#define BDF_KEEP_UNENCODED 0x4000 /* Keep the unencoded glyphs. */
#define BDF_ALL_SPACING ( BDF_PROPORTIONAL | \
BDF_MONOWIDTH | \
BDF_CHARCELL )
#define BDF_DEFAULT_LOAD_OPTIONS ( BDF_CORRECT_METRICS | \
BDF_KEEP_COMMENTS | \
BDF_KEEP_UNENCODED | \
BDF_PROPORTIONAL )
typedef struct bdf_options_t_
{
int correct_metrics;
int keep_unencoded;
int keep_comments;
int font_spacing;
} bdf_options_t;
/* Callback function type for unknown configuration options. */
typedef int
(*bdf_options_callback_t)( bdf_options_t* opts,
char** params,
unsigned long nparams,
void* client_data );
#define BDF_PROPORTIONAL 0x08 /* Font has proportional spacing. */
#define BDF_MONOWIDTH 0x10 /* Font has mono width. */
#define BDF_CHARCELL 0x20 /* Font has charcell spacing. */
/**************************************************************************
@ -167,9 +141,6 @@ FT_BEGIN_HEADER
unsigned long resolution_y; /* Font vertical resolution. */
int spacing; /* Font spacing value. */
unsigned short monowidth; /* Logical width for monowidth font. */
unsigned long default_char; /* Encoding of the default glyph. */
long font_ascent; /* Font ascent. */
@ -190,7 +161,7 @@ FT_BEGIN_HEADER
char* comments; /* Font comments. */
unsigned long comments_len; /* Length of comment string. */
void* internal; /* Internal data for the font. */
FT_Hash internal; /* Internal data for the font. */
unsigned short bpp; /* Bits per pixel. */
@ -233,7 +204,7 @@ FT_BEGIN_HEADER
FT_LOCAL( FT_Error )
bdf_load_font( FT_Stream stream,
FT_Memory memory,
bdf_options_t* opts,
unsigned long flags,
bdf_font_t* *font );
FT_LOCAL( void )

67
src/bdf/bdfdrivr.c
View File

@ -349,7 +349,6 @@ THE SOFTWARE.
FT_Memory memory = FT_FACE_MEMORY( face );
bdf_font_t* font = NULL;
bdf_options_t options;
FT_UNUSED( num_params );
FT_UNUSED( params );
@ -360,12 +359,8 @@ THE SOFTWARE.
if ( FT_STREAM_SEEK( 0 ) )
goto Exit;
options.correct_metrics = 1; /* FZ XXX: options semantics */
options.keep_unencoded = 1;
options.keep_comments = 0;
options.font_spacing = BDF_PROPORTIONAL;
error = bdf_load_font( stream, memory, &options, &font );
error = bdf_load_font( stream, memory,
BDF_CORRECT_METRICS | BDF_KEEP_UNENCODED, &font );
if ( FT_ERR_EQ( error, Missing_Startfont_Field ) )
{
FT_TRACE2(( " not a BDF file\n" ));
@ -408,10 +403,18 @@ THE SOFTWARE.
FT_FACE_FLAG_HORIZONTAL;
prop = bdf_get_font_property( font, "SPACING" );
if ( prop && prop->format == BDF_ATOM &&
prop->value.atom &&
( *(prop->value.atom) == 'M' || *(prop->value.atom) == 'm' ||
*(prop->value.atom) == 'C' || *(prop->value.atom) == 'c' ) )
if ( prop && prop->value.atom )
{
if ( prop->value.atom[0] == 'p' || prop->value.atom[0] == 'P' )
font->spacing = BDF_PROPORTIONAL;
else if ( prop->value.atom[0] == 'm' || prop->value.atom[0] == 'M' )
font->spacing = BDF_MONOWIDTH;
else if ( prop->value.atom[0] == 'c' || prop->value.atom[0] == 'C' )
font->spacing = BDF_CHARCELL;
}
if ( font->spacing == BDF_MONOWIDTH ||
font->spacing == BDF_CHARCELL )
face->face_flags |= FT_FACE_FLAG_FIXED_WIDTH;
/* FZ XXX: TO DO: FT_FACE_FLAGS_VERTICAL */
@ -444,19 +447,25 @@ THE SOFTWARE.
long value;
/* sanity checks */
if ( font->font_ascent > 0x7FFF || font->font_ascent < -0x7FFF )
{
font->font_ascent = font->font_ascent < 0 ? -0x7FFF : 0x7FFF;
FT_TRACE0(( "BDF_Face_Init: clamping font ascent to value %ld\n",
font->font_ascent ));
}
if ( font->font_descent > 0x7FFF || font->font_descent < -0x7FFF )
{
font->font_descent = font->font_descent < 0 ? -0x7FFF : 0x7FFF;
FT_TRACE0(( "BDF_Face_Init: clamping font descent to value %ld\n",
font->font_descent ));
}
prop = bdf_get_font_property( font, "FONT_ASCENT" );
if ( prop )
font->font_ascent = prop->value.l;
else
font->font_ascent = font->bbx.ascent;
if ( font->font_ascent > 0x7FFF )
font->font_ascent = 0x7FFF;
else if ( font->font_ascent < 0 )
font->font_ascent = 0;
prop = bdf_get_font_property( font, "FONT_DESCENT" );
if ( prop )
font->font_descent = prop->value.l;
else
font->font_descent = font->bbx.descent;
if ( font->font_descent > 0x7FFF )
font->font_descent = 0x7FFF;
else if ( font->font_descent < 0 )
font->font_descent = 0;
bsize->height = (FT_Short)( font->font_ascent + font->font_descent );
@ -591,6 +600,12 @@ THE SOFTWARE.
resolution_y );
else
bsize->x_ppem = bsize->y_ppem;
prop = bdf_get_font_property( font, "DEFAULT_CHAR" );
if ( prop )
font->default_char = prop->value.ul;
else
font->default_char = ~0UL;
}
/* encoding table */
@ -780,8 +795,8 @@ THE SOFTWARE.
FT_UInt glyph_index,
FT_Int32 load_flags )
{
BDF_Face bdf = (BDF_Face)FT_SIZE_FACE( size );
FT_Face face = FT_FACE( bdf );
FT_Face face = size->face;
BDF_Face bdf = (BDF_Face)face;
FT_Error error = FT_Err_Ok;
FT_Bitmap* bitmap = &slot->bitmap;
bdf_glyph_t glyph;

1328
src/bdf/bdflib.c
View File

File diff suppressed because it is too large Load Diff

5
src/cache/ftcbasic.c vendored
View File

@ -45,8 +45,9 @@
FT_BOOL( FTC_SCALER_COMPARE( &(a)->scaler, &(b)->scaler ) && \
(a)->load_flags == (b)->load_flags )
#define FTC_BASIC_ATTR_HASH( a ) \
( FTC_SCALER_HASH( &(a)->scaler ) + 31 * (a)->load_flags )
#define FTC_BASIC_ATTR_HASH( a ) \
( FTC_SCALER_HASH( &(a)->scaler ) + \
(FT_Offset)( 31 * (a)->load_flags ) )
typedef struct FTC_BasicQueryRec_

143
src/cff/cffdrivr.c
View File

@ -168,26 +168,8 @@
CFF_Size cffsize = (CFF_Size)size;
if ( !cffslot )
return FT_THROW( Invalid_Slot_Handle );
FT_TRACE1(( "cff_glyph_load: glyph index %d\n", glyph_index ));
/* check whether we want a scaled outline or bitmap */
if ( !cffsize )
load_flags |= FT_LOAD_NO_SCALE | FT_LOAD_NO_HINTING;
/* reset the size object if necessary */
if ( load_flags & FT_LOAD_NO_SCALE )
size = NULL;
if ( size )
{
/* these two objects must have the same parent */
if ( size->face != slot->face )
return FT_THROW( Invalid_Face_Handle );
}
/* now load the glyph outline if necessary */
error = cff_slot_load( cffslot, cffsize, glyph_index, load_flags );
@ -205,105 +187,70 @@
FT_Int32 flags,
FT_Fixed* advances )
{
FT_UInt nn;
FT_Error error = FT_Err_Ok;
FT_GlyphSlot slot = face->glyph;
CFF_Face cffface = (CFF_Face)face;
FT_Bool horz;
FT_UInt nn;
if ( FT_IS_SFNT( face ) )
if ( !FT_IS_SFNT( face ) )
return FT_THROW( Unimplemented_Feature );
horz = !( flags & FT_LOAD_VERTICAL_LAYOUT );
if ( horz )
{
/* OpenType 1.7 mandates that the data from `hmtx' table be used; */
/* it is no longer necessary that those values are identical to */
/* the values in the `CFF' table */
if ( !cffface->horizontal.number_Of_HMetrics )
return FT_THROW( Unimplemented_Feature );
CFF_Face cffface = (CFF_Face)face;
FT_Short dummy;
if ( flags & FT_LOAD_VERTICAL_LAYOUT )
{
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
/* no fast retrieval for blended MM fonts without VVAR table */
if ( ( FT_IS_NAMED_INSTANCE( face ) || FT_IS_VARIATION( face ) ) &&
!( cffface->variation_support & TT_FACE_FLAG_VAR_VADVANCE ) )
return FT_THROW( Unimplemented_Feature );
/* no fast retrieval for blended MM fonts without HVAR table */
if ( ( FT_IS_NAMED_INSTANCE( face ) || FT_IS_VARIATION( face ) ) &&
!( cffface->variation_support & TT_FACE_FLAG_VAR_HADVANCE ) )
return FT_THROW( Unimplemented_Feature );
#endif
}
else /* vertical */
{
/* check whether we have data from the `vmtx' table at all; */
/* otherwise we extract the info from the CFF glyphstrings */
/* (instead of synthesizing a global value using the `OS/2' */
/* table) */
if ( !cffface->vertical_info )
return FT_THROW( Unimplemented_Feature );
/* check whether we have data from the `vmtx' table at all; */
/* otherwise we extract the info from the CFF glyphstrings */
/* (instead of synthesizing a global value using the `OS/2' */
/* table) */
if ( !cffface->vertical_info )
goto Missing_Table;
for ( nn = 0; nn < count; nn++ )
{
FT_UShort ah;
( (SFNT_Service)cffface->sfnt )->get_metrics( cffface,
1,
start + nn,
&dummy,
&ah );
FT_TRACE5(( " idx %d: advance height %d font unit%s\n",
start + nn,
ah,
ah == 1 ? "" : "s" ));
advances[nn] = ah;
}
}
else
{
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
/* no fast retrieval for blended MM fonts without HVAR table */
if ( ( FT_IS_NAMED_INSTANCE( face ) || FT_IS_VARIATION( face ) ) &&
!( cffface->variation_support & TT_FACE_FLAG_VAR_HADVANCE ) )
return FT_THROW( Unimplemented_Feature );
/* no fast retrieval for blended MM fonts without VVAR table */
if ( ( FT_IS_NAMED_INSTANCE( face ) || FT_IS_VARIATION( face ) ) &&
!( cffface->variation_support & TT_FACE_FLAG_VAR_VADVANCE ) )
return FT_THROW( Unimplemented_Feature );
#endif
/* check whether we have data from the `hmtx' table at all */
if ( !cffface->horizontal.number_Of_HMetrics )
goto Missing_Table;
for ( nn = 0; nn < count; nn++ )
{
FT_UShort aw;
( (SFNT_Service)cffface->sfnt )->get_metrics( cffface,
0,
start + nn,
&dummy,
&aw );
FT_TRACE5(( " idx %d: advance width %d font unit%s\n",
start + nn,
aw,
aw == 1 ? "" : "s" ));
advances[nn] = aw;
}
}
return error;
}
Missing_Table:
flags |= (FT_UInt32)FT_LOAD_ADVANCE_ONLY;
/* proceed to fast advances */
for ( nn = 0; nn < count; nn++ )
{
error = cff_glyph_load( slot, face->size, start + nn, flags );
if ( error )
break;
FT_UShort aw;
FT_Short dummy;
advances[nn] = ( flags & FT_LOAD_VERTICAL_LAYOUT )
? slot->linearVertAdvance
: slot->linearHoriAdvance;
( (SFNT_Service)cffface->sfnt )->get_metrics( cffface,
!horz,
start + nn,
&dummy,
&aw );
FT_TRACE5(( " idx %d: advance %s %d font unit%s\n",
start + nn,
horz ? "width" : "height",
aw,
aw == 1 ? "" : "s" ));
advances[nn] = aw;
}
return error;
return FT_Err_Ok;
}

42
src/cff/cffgload.c
View File

@ -238,24 +238,12 @@
else if ( glyph_index >= cff->num_glyphs )
return FT_THROW( Invalid_Argument );
if ( load_flags & FT_LOAD_NO_RECURSE )
load_flags |= FT_LOAD_NO_SCALE | FT_LOAD_NO_HINTING;
glyph->x_scale = 0x10000L;
glyph->y_scale = 0x10000L;
if ( size )
{
glyph->x_scale = size->root.metrics.x_scale;
glyph->y_scale = size->root.metrics.y_scale;
}
#ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
/* try to load embedded bitmap if any */
/* */
/* XXX: The convention should be emphasized in */
/* the documents because it can be confusing. */
if ( size )
{
CFF_Face cff_face = (CFF_Face)size->root.face;
SFNT_Service sfnt = (SFNT_Service)cff_face->sfnt;
@ -284,9 +272,6 @@
FT_Short dummy;
glyph->root.outline.n_points = 0;
glyph->root.outline.n_contours = 0;
glyph->root.metrics.width = (FT_Pos)metrics.width * 64;
glyph->root.metrics.height = (FT_Pos)metrics.height * 64;
@ -426,6 +411,9 @@
/* if we have a CID subfont, use its matrix (which has already */
/* been multiplied with the root matrix) */
glyph->x_scale = size->root.metrics.x_scale;
glyph->y_scale = size->root.metrics.y_scale;
/* this scaling is only relevant if the PS hinter isn't active */
if ( cff->num_subfonts )
{
@ -457,9 +445,6 @@
font_offset = cff->top_font.font_dict.font_offset;
}
glyph->root.outline.n_points = 0;
glyph->root.outline.n_contours = 0;
/* top-level code ensures that FT_LOAD_NO_HINTING is set */
/* if FT_LOAD_NO_SCALE is active */
hinting = FT_BOOL( ( load_flags & FT_LOAD_NO_HINTING ) == 0 );
@ -467,7 +452,6 @@
glyph->hint = hinting;
glyph->scaled = scaled;
glyph->root.format = FT_GLYPH_FORMAT_OUTLINE; /* by default */
{
#ifdef CFF_CONFIG_OPTION_OLD_ENGINE
@ -602,10 +586,8 @@
{
/* Now, set the metrics -- this is rather simple, as */
/* the left side bearing is the xMin, and the top side */
/* bearing the yMax. */
/* For composite glyphs, return only left side bearing and */
/* advance width. */
/* bearing the yMax. For composite glyphs, return only */
/* left side bearing and advance width. */
if ( load_flags & FT_LOAD_NO_RECURSE )
{
FT_Slot_Internal internal = glyph->root.internal;
@ -624,6 +606,12 @@
FT_Bool has_vertical_info;
glyph->root.format = FT_GLYPH_FORMAT_OUTLINE;
glyph->root.outline.flags = FT_OUTLINE_REVERSE_FILL;
if ( size && size->root.metrics.y_ppem < 24 )
glyph->root.outline.flags |= FT_OUTLINE_HIGH_PRECISION;
if ( face->horizontal.number_Of_HMetrics )
{
FT_Short horiBearingX = 0;
@ -677,14 +665,6 @@
glyph->root.linearVertAdvance = metrics->vertAdvance;
glyph->root.format = FT_GLYPH_FORMAT_OUTLINE;
glyph->root.outline.flags = 0;
if ( size && size->root.metrics.y_ppem < 24 )
glyph->root.outline.flags |= FT_OUTLINE_HIGH_PRECISION;
glyph->root.outline.flags |= FT_OUTLINE_REVERSE_FILL;
/* apply the font matrix, if any */
if ( font_matrix.xx != 0x10000L || font_matrix.yy != 0x10000L ||
font_matrix.xy != 0 || font_matrix.yx != 0 )

8
src/cff/cffobjs.c
View File

@ -537,8 +537,8 @@
sfnt_format = 1;
/* now, the font can be either an OpenType/CFF font, or an SVG CEF */
/* font; in the latter case it doesn't have a `head' table */
/* the font may be OpenType/CFF, SVG CEF, or sfnt/CFF; a `head' table */
/* implies OpenType/CFF, otherwise just look for an optional cmap */
error = face->goto_table( face, TTAG_head, stream, 0 );
if ( !error )
{
@ -554,7 +554,9 @@
{
/* load the `cmap' table explicitly */
error = sfnt->load_cmap( face, stream );
if ( error )
/* this may fail because CID-keyed fonts don't have a cmap */
if ( FT_ERR_NEQ( error, Table_Missing ) && FT_ERR_NEQ( error, Ok ) )
goto Exit;
}

24
src/cid/cidgload.c
View File

@ -452,16 +452,12 @@
glyph->x_scale = cidsize->metrics.x_scale;
glyph->y_scale = cidsize->metrics.y_scale;
cidglyph->outline.n_points = 0;
cidglyph->outline.n_contours = 0;
hinting = FT_BOOL( ( load_flags & FT_LOAD_NO_SCALE ) == 0 &&
( load_flags & FT_LOAD_NO_HINTING ) == 0 );
scaled = FT_BOOL( ( load_flags & FT_LOAD_NO_SCALE ) == 0 );
glyph->hint = hinting;
glyph->scaled = scaled;
cidglyph->format = FT_GLYPH_FORMAT_OUTLINE;
error = psaux->t1_decoder_funcs->init( &decoder,
cidglyph->face,
@ -501,12 +497,8 @@
/* now set the metrics -- this is rather simple, as */
/* the left side bearing is the xMin, and the top side */
/* bearing the yMax */
cidglyph->outline.flags &= FT_OUTLINE_OWNER;
cidglyph->outline.flags |= FT_OUTLINE_REVERSE_FILL;
/* for composite glyphs, return only left side bearing and */
/* advance width */
/* bearing the yMax; for composite glyphs, return only */
/* left side bearing and advance width */
if ( load_flags & FT_LOAD_NO_RECURSE )
{
FT_Slot_Internal internal = cidglyph->internal;
@ -527,6 +519,13 @@
FT_Glyph_Metrics* metrics = &cidglyph->metrics;
cidglyph->format = FT_GLYPH_FORMAT_OUTLINE;
cidglyph->outline.flags &= FT_OUTLINE_OWNER;
cidglyph->outline.flags |= FT_OUTLINE_REVERSE_FILL;
if ( cidsize->metrics.y_ppem < 24 )
cidglyph->outline.flags |= FT_OUTLINE_HIGH_PRECISION;
/* copy the _unscaled_ advance width */
metrics->horiAdvance =
FIXED_TO_INT( decoder.builder.advance.x );
@ -539,11 +538,6 @@
face->cid.font_bbox.yMin ) >> 16;
cidglyph->linearVertAdvance = metrics->vertAdvance;
cidglyph->format = FT_GLYPH_FORMAT_OUTLINE;
if ( cidsize->metrics.y_ppem < 24 )
cidglyph->outline.flags |= FT_OUTLINE_HIGH_PRECISION;
/* apply the font matrix, if any */
if ( font_matrix.xx != 0x10000L || font_matrix.yy != 0x10000L ||
font_matrix.xy != 0 || font_matrix.yx != 0 )

2
src/pcf/pcfdrivr.c
View File

@ -453,7 +453,7 @@ THE SOFTWARE.
FT_UInt glyph_index,
FT_Int32 load_flags )
{
PCF_Face face = (PCF_Face)FT_SIZE_FACE( size );
PCF_Face face = (PCF_Face)size->face;
FT_Stream stream;
FT_Error error = FT_Err_Ok;
FT_Bitmap* bitmap = &slot->bitmap;

12
src/pfr/pfrobjs.c
View File

@ -355,11 +355,8 @@
goto Exit;
}
gchar = face->phy_font.chars + gindex;
pfrslot->format = FT_GLYPH_FORMAT_OUTLINE;
outline->n_points = 0;
outline->n_contours = 0;
gps_offset = face->header.gps_section_offset;
gchar = face->phy_font.chars + gindex;
gps_offset = face->header.gps_section_offset;
/* load the glyph outline (FT_LOAD_NO_RECURSE isn't supported) */
error = pfr_glyph_load( &slot->glyph, face->root.stream,
@ -371,10 +368,9 @@
FT_Glyph_Metrics* metrics = &pfrslot->metrics;
FT_Pos advance;
FT_UInt em_metrics, em_outline;
FT_Bool scaling;
scaling = FT_BOOL( !( load_flags & FT_LOAD_NO_SCALE ) );
pfrslot->format = FT_GLYPH_FORMAT_OUTLINE;
/* copy outline data */
*outline = slot->glyph.loader->base.outline;
@ -429,7 +425,7 @@
#endif
/* scale when needed */
if ( scaling )
if ( !( load_flags & FT_LOAD_NO_SCALE ) )
{
FT_Int n;
FT_Fixed x_scale = pfrsize->metrics.x_scale;

4
src/psaux/psintrp.c
View File

@ -445,7 +445,7 @@
cf2_stack_getReal( opStack,
delta++ ) ) );
FT_TRACE6(( "%f ", (float) sum / 65536 ));
FT_TRACE6(( "%f ", (double)sum / 65536 ));
/* store blended result */
cf2_stack_setReal( opStack, i + base, sum );
@ -2282,7 +2282,7 @@
arg = cf2_stack_popFixed( opStack );
if ( arg > 0 )
arg = (CF2_F16Dot16)FT_SqrtFixed( arg );
arg = (CF2_F16Dot16)FT_SqrtFixed( (FT_UInt32)arg );
else
arg = 0;

4
src/sdf/ftbsdf.c
View File

@ -373,7 +373,7 @@
* @Input:
* current ::
* Array of Euclidean distances. `current` must point to the position
* for which the distance is to be caculated. We treat this array as
* for which the distance is to be calculated. We treat this array as
* a two-dimensional array mapped to a one-dimensional array.
*
* x ::
@ -550,7 +550,7 @@
*
* @Description:
* Loops over all the pixels and call `compute_edge_distance` only for
* edge pixels. This maked the process a lot faster since
* edge pixels. This makes the process a lot faster since
* `compute_edge_distance` uses functions such as `FT_Vector_NormLen',
* which are quite slow.
*

2
src/sdf/ftsdf.c
View File

@ -3456,7 +3456,7 @@
* A complete shape which is used to generate SDF.
*
* spread ::
* Maximum distances to be allowed inthe output bitmap.
* Maximum distances to be allowed in the output bitmap.
*
* @Output:
* bitmap ::

2
src/sdf/ftsdf.h
View File

@ -57,7 +57,7 @@ FT_BEGIN_HEADER
* indicate positions inside of contours.
*
* flip_y ::
* Setting this parameter to true maked the output image flipped
* Setting this parameter to true makes the output image flipped
* along the y-axis.
*
* overlaps ::

2
src/sfnt/ttbdf.c
View File

@ -142,7 +142,7 @@
{
TT_Face ttface = (TT_Face)face;
TT_BDF bdf = &ttface->bdf;
FT_Size size = FT_FACE_SIZE( face );
FT_Size size = face->size;
FT_Error error = FT_Err_Ok;
FT_Byte* p;
FT_UInt count;

16
src/sfnt/ttcmap.c
View File

@ -179,7 +179,7 @@
cmap_info->format = 0;
cmap_info->language = (FT_ULong)TT_PEEK_USHORT( p );
cmap_info->language = TT_PEEK_USHORT( p );
return FT_Err_Ok;
}
@ -596,7 +596,7 @@
cmap_info->format = 2;
cmap_info->language = (FT_ULong)TT_PEEK_USHORT( p );
cmap_info->language = TT_PEEK_USHORT( p );
return FT_Err_Ok;
}
@ -1539,7 +1539,7 @@
cmap_info->format = 4;
cmap_info->language = (FT_ULong)TT_PEEK_USHORT( p );
cmap_info->language = TT_PEEK_USHORT( p );
return FT_Err_Ok;
}
@ -1712,7 +1712,7 @@
cmap_info->format = 6;
cmap_info->language = (FT_ULong)TT_PEEK_USHORT( p );
cmap_info->language = TT_PEEK_USHORT( p );
return FT_Err_Ok;
}
@ -2009,7 +2009,7 @@
cmap_info->format = 8;
cmap_info->language = (FT_ULong)TT_PEEK_ULONG( p );
cmap_info->language = TT_PEEK_ULONG( p );
return FT_Err_Ok;
}
@ -2184,7 +2184,7 @@
cmap_info->format = 10;
cmap_info->language = (FT_ULong)TT_PEEK_ULONG( p );
cmap_info->language = TT_PEEK_ULONG( p );
return FT_Err_Ok;
}
@ -2528,7 +2528,7 @@
cmap_info->format = 12;
cmap_info->language = (FT_ULong)TT_PEEK_ULONG( p );
cmap_info->language = TT_PEEK_ULONG( p );
return FT_Err_Ok;
}
@ -2844,7 +2844,7 @@
cmap_info->format = 13;
cmap_info->language = (FT_ULong)TT_PEEK_ULONG( p );
cmap_info->language = TT_PEEK_ULONG( p );
return FT_Err_Ok;
}

24
src/sfnt/ttgpos.c
View File

@ -58,6 +58,7 @@
typedef enum gpos_lookup_type_
{
GPOS_LOOKUP_TYPE_NONE = 0,
GPOS_LOOKUP_TYPE_SINGLE_ADJUSTMENT = 1,
GPOS_LOOKUP_TYPE_PAIR_ADJUSTMENT = 2,
GPOS_LOOKUP_TYPE_CURSIVE_ATTACHMENT = 3,
@ -132,14 +133,14 @@
else
{
context->current_lookup_table = NULL;
context->current_lookup_type = 0;
context->current_lookup_type = GPOS_LOOKUP_TYPE_NONE;
context->subtable_count = 0;
context->subtable_offsets = NULL;
}
context->subtable_idx = 0;
context->subtable = NULL;
context->subtable_type = 0;
context->subtable_type = GPOS_LOOKUP_TYPE_NONE;
}
@ -195,7 +196,7 @@
FT_Int m;
FT_Int straw;
FT_Int needle = glyph;
FT_Int needle = (FT_Int)glyph;
/* Binary search. */
@ -230,7 +231,7 @@
FT_Int straw_start;
FT_Int straw_end;
FT_Int needle = glyph;
FT_Int needle = (FT_Int)glyph;
/* Binary search. */
@ -254,14 +255,11 @@
FT_PEEK_USHORT( range_record + 4 );
return start_coverage_index + glyph - straw_start;
return (FT_Int)start_coverage_index + (FT_Int)glyph - straw_start;
}
}
break;
}
default:
return -1; /* unsupported */
}
return -1;
@ -303,7 +301,7 @@
FT_Int straw_start;
FT_Int straw_end;
FT_Int needle = glyph;
FT_Int needle = (FT_Int)glyph;
while ( l <= r )
@ -325,9 +323,6 @@
}
break;
}
default:
return -1; /* Unsupported definition type, return an error. */
}
/* "All glyphs not assigned to a class fall into class 0." */
@ -514,7 +509,7 @@
pair_value_count = FT_PEEK_USHORT( pair_value_table );
pair_value_array = pair_value_table + 2;
needle = right_glyph;
needle = (FT_Int)right_glyph;
r = pair_value_count - 1;
l = 0;
@ -584,9 +579,6 @@
return x_advance;
}
default:
return 0;
}
}
}

2
src/sfnt/ttload.c
View File

@ -1046,7 +1046,7 @@
FT_LOCAL_DEF( void )
tt_face_free_name( TT_Face face )
{
FT_Memory memory = face->root.driver->root.memory;
FT_Memory memory = face->root.memory;
TT_NameTable table = &face->name_table;

4
src/sfnt/ttpost.c
View File

@ -226,7 +226,7 @@
FT_UInt len = *p;
/* all names in Adobe Glyph List are shorter than 40 characters */
/* names in the Adobe Glyph List are shorter than 40 characters */
if ( len >= 40U )
FT_TRACE4(( "load_format_20: unusual %u-char name found\n", len ));
@ -240,7 +240,7 @@
if ( n < num_names )
{
FT_TRACE4(( "load_format_20: %hu PostScript names are truncated\n",
num_names - n ));
(FT_UShort)( num_names - n ) ));
for ( ; n < num_names; n++ )
name_strings[n] = p_end;

43
src/sfnt/ttsbit.c
View File

@ -1462,12 +1462,13 @@
FT_Int originOffsetX, originOffsetY;
FT_Tag graphicType;
FT_Int recurse_depth = 0;
FT_Bool flipped = FALSE;
FT_Error error;
FT_Byte* p;
FT_UNUSED( map );
#ifndef FT_CONFIG_OPTION_USE_PNG
FT_UNUSED( map );
FT_UNUSED( metrics_only );
#endif
@ -1517,12 +1518,16 @@
switch ( graphicType )
{
case FT_MAKE_TAG( 'f', 'l', 'i', 'p' ):
flipped = !flipped;
FALL_THROUGH;
case FT_MAKE_TAG( 'd', 'u', 'p', 'e' ):
if ( recurse_depth < 4 )
if ( recurse_depth++ < 4 )
{
glyph_index = FT_GET_USHORT();
FT_FRAME_EXIT();
recurse_depth++;
goto retry;
}
error = FT_THROW( Invalid_File_Format );
@ -1540,6 +1545,38 @@
glyph_end - glyph_start - 8,
TRUE,
metrics_only );
if ( flipped && !metrics_only && !error )
{
FT_UInt32* curr_pos = (FT_UInt32*)map->buffer;
/* `Load_SBit_Png` always returns a pixmap with 32 bits per pixel */
/* and no extra pitch bytes. */
FT_UInt width = map->width;
FT_UInt y;
for ( y = 0; y < map->rows; y++ )
{
FT_UInt32* left = curr_pos;
FT_UInt32* right = curr_pos + width - 1;
while ( left < right )
{
FT_UInt32 value;
value = *right;
*right = *left;
*left = value;
left++;
right--;
}
curr_pos += width;
}
}
#else
error = FT_THROW( Unimplemented_Feature );
#endif

13
src/smooth/ftgrays.c
View File

@ -1873,6 +1873,7 @@ typedef ptrdiff_t FT_PtrDist;
TCoord* band;
int continued = 0;
int error = Smooth_Err_Ok;
/* Initialize the null cell at the end of the poll. */
@ -1907,7 +1908,6 @@ typedef ptrdiff_t FT_PtrDist;
do
{
TCoord i;
int error;
ras.min_ex = band[1];
@ -1936,7 +1936,7 @@ typedef ptrdiff_t FT_PtrDist;
continue;
}
else if ( error != Smooth_Err_Raster_Overflow )
return error;
goto Exit;
/* render pool overflow; we will reduce the render band by half */
i = ( band[0] - band[1] ) >> 1;
@ -1945,7 +1945,8 @@ typedef ptrdiff_t FT_PtrDist;
if ( i == 0 )
{
FT_TRACE7(( "gray_convert_glyph: rotten glyph\n" ));
return FT_THROW( Raster_Overflow );
error = FT_THROW( Raster_Overflow );
goto Exit;
}
band++;
@ -1954,7 +1955,11 @@ typedef ptrdiff_t FT_PtrDist;
} while ( band >= bands );
}
return Smooth_Err_Ok;
Exit:
ras.cell = ras.cell_free = ras.cell_null = NULL;
ras.ycells = NULL;
return error;
}

37
src/tools/apinames.c
View File

@ -42,6 +42,7 @@ typedef enum OutputFormat_
} OutputFormat;
#define SUFFIX_VMS_64ADDR "64__"
static void
panic( const char* fmt,
@ -76,11 +77,12 @@ static int max_names;
static void
names_add( const char* name,
const char* end )
names_add( const char* name,
const char* end,
OutputFormat format )
{
unsigned int h;
int nn, len;
int nn, len, len_suffix;
Name nm;
@ -116,8 +118,18 @@ names_add( const char* name,
}
nm = &the_names[num_names++];
switch ( format )
{
case OUTPUT_VMS_OPT:
/* VMS mode would join the symbol name with a suffix */
len_suffix = sizeof ( SUFFIX_VMS_64ADDR );
break;
default:
len_suffix = 0;
}
nm->hash = h;
nm->name = (char*)malloc( len + 1 );
nm->name = (char*)malloc( len + len_suffix + 1 );
if ( !nm->name )
panic( "not enough memory" );
@ -181,6 +193,7 @@ names_dump( FILE* out,
case OUTPUT_WATCOM_LBC:
{
char temp[512];
const char* dot;
@ -195,7 +208,6 @@ names_dump( FILE* out,
dot = strchr( dll_name, '.' );
if ( dot )
{
char temp[512];
int len = dot - dll_name;
@ -229,7 +241,7 @@ names_dump( FILE* out,
/* Also emit a 64-bit symbol, as created by the `vms_auto64` tool. */
/* It has the string '64__' appended to its name. */
strcat( the_names[nn].name , "64__" );
strcat( the_names[nn].name , SUFFIX_VMS_64ADDR );
if ( vms_shorten_symbol( the_names[nn].name, short_symbol, 1 ) == -1 )
panic( "could not shorten name '%s'", the_names[nn].name );
fprintf( out, "symbol_vector = ( %s = PROCEDURE)\n", short_symbol );
@ -277,8 +289,9 @@ typedef enum State_
static int
read_header_file( FILE* file,
int verbose )
read_header_file( FILE* file,
int verbose,
OutputFormat format )
{
static char buff[LINEBUFF_SIZE + 1];
State state = STATE_START;
@ -350,7 +363,7 @@ read_header_file( FILE* file,
if ( verbose )
fprintf( stderr, ">>> %.*s\n", (int)( p - name ), name );
names_add( name, p );
names_add( name, p, format );
}
state = STATE_START;
@ -380,7 +393,7 @@ usage( void )
"It receives a list of header files as an argument and\n"
"generates a sorted list of unique identifiers in various formats.\n"
"\n"
"usage: %s header1 [options] [header2 ...]\n"
"usage: %s [options] header1 [header2 ...]\n"
"\n"
"options: - parse the contents of stdin, ignore arguments\n"
" -v verbose mode, output sent to standard error\n"
@ -519,7 +532,7 @@ main( int argc,
} /* end of while loop */
if ( from_stdin )
read_header_file( stdin, verbose );
read_header_file( stdin, verbose, format );
else
{
for ( --argc, argv++; argc > 0; argc--, argv++ )
@ -534,7 +547,7 @@ main( int argc,
if ( verbose )
fprintf( stderr, "opening '%s'\n", argv[0] );
read_header_file( file, verbose );
read_header_file( file, verbose, format );
fclose( file );
}
}

173
src/truetype/ttgload.c
View File

@ -1566,13 +1566,14 @@
if ( header_only )
goto Exit;
#ifdef FT_CONFIG_OPTION_INCREMENTAL
tt_get_metrics_incremental( loader, glyph_index );
#endif
tt_loader_set_pp( loader );
/* shortcut for empty glyphs */
if ( loader->byte_len == 0 || loader->n_contours == 0 )
{
#ifdef FT_CONFIG_OPTION_INCREMENTAL
tt_get_metrics_incremental( loader, glyph_index );
#endif
tt_loader_set_pp( loader );
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
@ -1627,11 +1628,6 @@
goto Exit;
}
#ifdef FT_CONFIG_OPTION_INCREMENTAL
tt_get_metrics_incremental( loader, glyph_index );
#endif
tt_loader_set_pp( loader );
/***********************************************************************/
/***********************************************************************/
@ -2126,9 +2122,6 @@
&sbit_metrics );
if ( !error )
{
glyph->outline.n_points = 0;
glyph->outline.n_contours = 0;
glyph->metrics.width = (FT_Pos)sbit_metrics.width * 64;
glyph->metrics.height = (FT_Pos)sbit_metrics.height * 64;
@ -2153,6 +2146,50 @@
glyph->bitmap_top = sbit_metrics.horiBearingY;
}
}
/* a missing glyph in a bitmap-only font is assumed whitespace */
/* that needs to be constructed using metrics data from `hmtx' */
/* and, optionally, `vmtx' tables */
else if ( FT_ERR_EQ( error, Missing_Bitmap ) &&
!FT_IS_SCALABLE( glyph->face ) &&
face->horz_metrics_size )
{
FT_Fixed x_scale = size->root.metrics.x_scale;
FT_Fixed y_scale = size->root.metrics.y_scale;
FT_Short left_bearing = 0;
FT_Short top_bearing = 0;
FT_UShort advance_width = 0;
FT_UShort advance_height = 0;
TT_Get_HMetrics( face, glyph_index,
&left_bearing,
&advance_width );
TT_Get_VMetrics( face, glyph_index,
0,
&top_bearing,
&advance_height );
glyph->metrics.width = 0;
glyph->metrics.height = 0;
glyph->metrics.horiBearingX = FT_MulFix( left_bearing, x_scale );
glyph->metrics.horiBearingY = 0;
glyph->metrics.horiAdvance = FT_MulFix( advance_width, x_scale );
glyph->metrics.vertBearingX = 0;
glyph->metrics.vertBearingY = FT_MulFix( top_bearing, y_scale );
glyph->metrics.vertAdvance = FT_MulFix( advance_height, y_scale );
glyph->format = FT_GLYPH_FORMAT_BITMAP;
glyph->bitmap.pixel_mode = FT_PIXEL_MODE_MONO;
glyph->bitmap_left = 0;
glyph->bitmap_top = 0;
error = FT_Err_Ok;
}
return error;
}
@ -2431,79 +2468,21 @@
#ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
/* try to load embedded bitmap (if any) */
if ( size->strike_index != 0xFFFFFFFFUL &&
( load_flags & FT_LOAD_NO_BITMAP ) == 0 &&
IS_DEFAULT_INSTANCE( glyph->face ) )
if ( size->strike_index != 0xFFFFFFFFUL &&
!( load_flags & FT_LOAD_NO_BITMAP &&
FT_IS_SCALABLE( glyph->face ) ) &&
IS_DEFAULT_INSTANCE( glyph->face ) )
{
FT_Fixed x_scale = size->root.metrics.x_scale;
FT_Fixed y_scale = size->root.metrics.y_scale;
error = load_sbit_image( size, glyph, glyph_index, load_flags );
if ( FT_ERR_EQ( error, Missing_Bitmap ) )
{
/* the bitmap strike is incomplete and misses the requested glyph; */
/* if we have a bitmap-only font, return an empty glyph */
if ( !FT_IS_SCALABLE( glyph->face ) )
{
FT_Short left_bearing = 0;
FT_Short top_bearing = 0;
FT_UShort advance_width = 0;
FT_UShort advance_height = 0;
/* to return an empty glyph, however, we need metrics data */
/* from the `hmtx' (or `vmtx') table; the assumption is that */
/* empty glyphs are missing intentionally, representing */
/* whitespace - not having at least horizontal metrics is */
/* thus considered an error */
if ( !face->horz_metrics_size )
return error;
/* we now construct an empty bitmap glyph */
TT_Get_HMetrics( face, glyph_index,
&left_bearing,
&advance_width );
TT_Get_VMetrics( face, glyph_index,
0,
&top_bearing,
&advance_height );
glyph->outline.n_points = 0;
glyph->outline.n_contours = 0;
glyph->metrics.width = 0;
glyph->metrics.height = 0;
glyph->metrics.horiBearingX = FT_MulFix( left_bearing, x_scale );
glyph->metrics.horiBearingY = 0;
glyph->metrics.horiAdvance = FT_MulFix( advance_width, x_scale );
glyph->metrics.vertBearingX = 0;
glyph->metrics.vertBearingY = FT_MulFix( top_bearing, y_scale );
glyph->metrics.vertAdvance = FT_MulFix( advance_height, y_scale );
glyph->format = FT_GLYPH_FORMAT_BITMAP;
glyph->bitmap.pixel_mode = FT_PIXEL_MODE_MONO;
glyph->bitmap_left = 0;
glyph->bitmap_top = 0;
return FT_Err_Ok;
}
}
else if ( error )
{
/* return error if font is not scalable */
if ( !FT_IS_SCALABLE( glyph->face ) )
return error;
}
else
if ( !error )
{
if ( FT_IS_SCALABLE( glyph->face ) ||
FT_HAS_SBIX( glyph->face ) )
{
FT_Fixed x_scale = size->root.metrics.x_scale;
FT_Fixed y_scale = size->root.metrics.y_scale;
/* for the bbox we need the header only */
(void)tt_loader_init( &loader, size, glyph, load_flags, TRUE );
(void)load_truetype_glyph( &loader, glyph_index, 0, TRUE );
@ -2550,8 +2529,10 @@
y_scale );
}
return FT_Err_Ok;
goto Exit;
}
else if ( !FT_IS_SCALABLE( glyph->face ) )
goto Exit;
}
if ( load_flags & FT_LOAD_SBITS_ONLY )
@ -2614,7 +2595,7 @@
glyph->metrics.horiAdvance = FT_MulFix( advanceX, x_scale );
glyph->metrics.vertAdvance = FT_MulFix( advanceY, y_scale );
return error;
goto Exit;
}
FT_TRACE3(( "Failed to load SVG glyph\n" ));
@ -2642,10 +2623,6 @@
goto Done;
}
glyph->format = FT_GLYPH_FORMAT_OUTLINE;
glyph->num_subglyphs = 0;
glyph->outline.flags = 0;
/* main loading loop */
error = load_truetype_glyph( &loader, glyph_index, 0, FALSE );
if ( !error )
@ -2657,9 +2634,18 @@
}
else
{
glyph->format = FT_GLYPH_FORMAT_OUTLINE;
glyph->outline = loader.gloader->base.outline;
glyph->outline.flags &= ~FT_OUTLINE_SINGLE_PASS;
/* Set the `high precision' bit flag. This is _critical_ to */
/* get correct output for monochrome TrueType glyphs at all */
/* sizes using the bytecode interpreter. */
if ( !( load_flags & FT_LOAD_NO_SCALE ) &&
size->metrics->y_ppem < 24 )
glyph->outline.flags |= FT_OUTLINE_HIGH_PRECISION;
/* Translate array so that (0,0) is the glyph's origin. Note */
/* that this behaviour is independent on the value of bit 1 of */
/* the `flags' field in the `head' table -- at least major */
@ -2708,14 +2694,6 @@
error = compute_glyph_metrics( &loader, glyph_index );
}
/* Set the `high precision' bit flag. */
/* This is _critical_ to get correct output for monochrome */
/* TrueType glyphs at all sizes using the bytecode interpreter. */
/* */
if ( !( load_flags & FT_LOAD_NO_SCALE ) &&
size->metrics->y_ppem < 24 )
glyph->outline.flags |= FT_OUTLINE_HIGH_PRECISION;
FT_TRACE1(( " subglyphs = %u, contours = %hu, points = %hu,"
" flags = 0x%.3x\n",
loader.gloader->base.num_subglyphs,
@ -2727,11 +2705,8 @@
tt_loader_done( &loader );
Exit:
#ifdef FT_DEBUG_LEVEL_TRACE
if ( error )
FT_TRACE1(( " failed (error code 0x%x)\n",
error ));
#endif
FT_TRACE1(( error ? " failed (error code 0x%x)\n" : "",
error ));
return error;
}

159
src/truetype/ttgxvar.c
View File

@ -129,9 +129,6 @@
* stream ::
* The data stream.
*
* size ::
* The size of the table holding the data.
*
* @Output:
* point_cnt ::
* The number of points read. A zero value means that
@ -144,14 +141,14 @@
*/
static FT_UShort*
ft_var_readpackedpoints( FT_Stream stream,
FT_ULong size,
FT_UInt *point_cnt )
{
FT_UShort *points = NULL;
FT_UInt n;
FT_UInt runcnt;
FT_UInt runcnt, cnt;
FT_UInt i, j;
FT_UShort first;
FT_Byte* p;
FT_Memory memory = stream->memory;
FT_Error error;
@ -169,56 +166,60 @@
n |= FT_GET_BYTE();
}
if ( n > size )
{
FT_TRACE1(( "ft_var_readpackedpoints: number of points too large\n" ));
return NULL;
}
/* in the nested loops below we increase `i' twice; */
/* it is faster to simply allocate one more slot */
/* than to add another test within the loop */
if ( FT_QNEW_ARRAY( points, n + 1 ) )
if ( FT_QNEW_ARRAY( points, n ) )
return NULL;
*point_cnt = n;
p = stream->cursor;
first = 0;
i = 0;
while ( i < n )
{
runcnt = FT_GET_BYTE();
if ( p >= stream->limit )
goto Fail;
runcnt = FT_NEXT_BYTE( p );
cnt = runcnt & GX_PT_POINT_RUN_COUNT_MASK;
/* first point not included in run count */
cnt++;
if ( cnt > n - i )
cnt = n - i;
if ( runcnt & GX_PT_POINTS_ARE_WORDS )
{
runcnt &= GX_PT_POINT_RUN_COUNT_MASK;
first += FT_GET_USHORT();
points[i++] = first;
if ( 2 * cnt > (FT_UInt)( stream->limit - p ) )
goto Fail;
/* first point not included in run count */
for ( j = 0; j < runcnt; j++ )
for ( j = 0; j < cnt; j++ )
{
first += FT_GET_USHORT();
first += FT_NEXT_USHORT( p );
points[i++] = first;
if ( i >= n )
break;
}
}
else
{
first += FT_GET_BYTE();
points[i++] = first;
if ( cnt > (FT_UInt)( stream->limit - p ) )
goto Fail;
for ( j = 0; j < runcnt; j++ )
for ( j = 0; j < cnt; j++ )
{
first += FT_GET_BYTE();
first += FT_NEXT_BYTE( p );
points[i++] = first;
if ( i >= n )
break;
}
}
}
stream->cursor = p;
*point_cnt = n;
return points;
Fail:
FT_TRACE1(( "ft_var_readpackedpoints: invalid table\n" ));
FT_FREE( points );
return NULL;
}
@ -240,9 +241,6 @@
* stream ::
* The data stream.
*
* size ::
* The size of the table holding the data.
*
* delta_cnt ::
* The number of deltas to be read.
*
@ -258,13 +256,12 @@
*/
static FT_Fixed*
ft_var_readpackeddeltas( FT_Stream stream,
FT_ULong size,
FT_UInt delta_cnt )
{
FT_Fixed *deltas = NULL;
FT_UInt runcnt, cnt;
FT_UInt i, j;
FT_UInt bytes_used;
FT_Byte* p;
FT_Memory memory = stream->memory;
FT_Error error;
@ -272,68 +269,51 @@
if ( FT_QNEW_ARRAY( deltas, delta_cnt ) )
return NULL;
i = 0;
bytes_used = 0;
while ( i < delta_cnt && bytes_used < size )
p = stream->cursor;
i = 0;
while ( i < delta_cnt )
{
runcnt = FT_GET_BYTE();
if ( p >= stream->limit )
goto Fail;
runcnt = FT_NEXT_BYTE( p );
cnt = runcnt & GX_DT_DELTA_RUN_COUNT_MASK;
bytes_used++;
/* first point not included in run count */
cnt++;
if ( cnt > delta_cnt - i )
cnt = delta_cnt - i;
if ( runcnt & GX_DT_DELTAS_ARE_ZERO )
{
/* `cnt` + 1 zeroes get added */
for ( j = 0; j <= cnt && i < delta_cnt; j++ )
for ( j = 0; j < cnt; j++ )
deltas[i++] = 0;
}
else if ( runcnt & GX_DT_DELTAS_ARE_WORDS )
{
/* `cnt` + 1 shorts from the stack */
bytes_used += 2 * ( cnt + 1 );
if ( bytes_used > size )
{
FT_TRACE1(( "ft_var_readpackeddeltas:"
" number of short deltas too large\n" ));
if ( 2 * cnt > (FT_UInt)( stream->limit - p ) )
goto Fail;
}
for ( j = 0; j <= cnt && i < delta_cnt; j++ )
deltas[i++] = FT_intToFixed( FT_GET_SHORT() );
for ( j = 0; j < cnt; j++ )
deltas[i++] = FT_intToFixed( FT_NEXT_SHORT( p ) );
}
else
{
/* `cnt` + 1 signed bytes from the stack */
bytes_used += cnt + 1;
if ( bytes_used > size )
{
FT_TRACE1(( "ft_var_readpackeddeltas:"
" number of byte deltas too large\n" ));
if ( cnt > (FT_UInt)( stream->limit - p ) )
goto Fail;
}
for ( j = 0; j <= cnt && i < delta_cnt; j++ )
deltas[i++] = FT_intToFixed( FT_GET_CHAR() );
}
if ( j <= cnt )
{
FT_TRACE1(( "ft_var_readpackeddeltas:"
" number of deltas too large\n" ));
goto Fail;
for ( j = 0; j < cnt; j++ )
deltas[i++] = FT_intToFixed( FT_NEXT_CHAR( p ) );
}
}
if ( i < delta_cnt )
{
FT_TRACE1(( "ft_var_readpackeddeltas: not enough deltas\n" ));
goto Fail;
}
stream->cursor = p;
return deltas;
Fail:
FT_TRACE1(( "ft_var_readpackeddeltas: invalid table\n" ));
FT_FREE( deltas );
return NULL;
}
@ -2135,7 +2115,7 @@
/* Convert delta in F2DOT14 to 16.16 before adding. */
v += MUL_INT( delta, 4 );
/* Clamp value range [-1, 1]. */
/* Clamp value to range [-1, 1]. */
v = v >= 0x10000L ? 0x10000 : v;
v = v <= -0x10000L ? -0x10000 : v;
@ -3604,9 +3584,8 @@
FT_Stream_SeekSet( stream, offsetToData );
sharedpoints = ft_var_readpackedpoints( stream,
table_len,
&spoint_count );
sharedpoints = ft_var_readpackedpoints( stream, &spoint_count );
offsetToData = FT_Stream_FTell( stream );
FT_Stream_SeekSet( stream, here );
@ -3680,9 +3659,7 @@
if ( tupleIndex & GX_TI_PRIVATE_POINT_NUMBERS )
{
localpoints = ft_var_readpackedpoints( stream,
table_len,
&point_count );
localpoints = ft_var_readpackedpoints( stream, &point_count );
points = localpoints;
}
else
@ -3693,14 +3670,13 @@
}
deltas = ft_var_readpackeddeltas( stream,
table_len,
point_count == 0 ? face->cvt_size
: point_count );
if ( !points || !deltas )
; /* failure, ignore it */
else if ( localpoints == ALL_POINTS )
else if ( points == ALL_POINTS )
{
#ifdef FT_DEBUG_LEVEL_TRACE
int count = 0;
@ -3794,8 +3770,8 @@
for ( i = 0; i < face->cvt_size; i++ )
face->cvt[i] += FT_fixedToFdot6( cvt_deltas[i] );
/* iterate over all FT_Size objects and set `cvt_ready' to -1 */
/* to trigger rescaling of all CVT values */
/* Iterate over all `FT_Size` objects and set `cvt_ready` to -1 */
/* to trigger rescaling of all CVT values. */
FT_List_Iterate( &root->sizes_list,
tt_cvt_ready_iterator,
NULL );
@ -4142,9 +4118,8 @@
FT_Stream_SeekSet( stream, offsetToData );
sharedpoints = ft_var_readpackedpoints( stream,
blend->gvar_size,
&spoint_count );
sharedpoints = ft_var_readpackedpoints( stream, &spoint_count );
offsetToData = FT_Stream_FTell( stream );
FT_Stream_SeekSet( stream, here );
@ -4228,9 +4203,7 @@
if ( tupleIndex & GX_TI_PRIVATE_POINT_NUMBERS )
{
localpoints = ft_var_readpackedpoints( stream,
blend->gvar_size,
&point_count );
localpoints = ft_var_readpackedpoints( stream, &point_count );
points = localpoints;
}
else
@ -4240,11 +4213,9 @@
}
deltas_x = ft_var_readpackeddeltas( stream,
blend->gvar_size,
point_count == 0 ? n_points
: point_count );
deltas_y = ft_var_readpackeddeltas( stream,
blend->gvar_size,
point_count == 0 ? n_points
: point_count );

22
src/truetype/ttobjs.c
View File

@ -949,11 +949,8 @@
FT_TRACE4(( "Executing `fpgm' table.\n" ));
error = face->interpreter( exec );
#ifdef FT_DEBUG_LEVEL_TRACE
if ( error )
FT_TRACE4(( " interpretation failed with error code 0x%x\n",
error ));
#endif
FT_TRACE4(( error ? " failed (error code 0x%x)\n" : "",
error ));
}
else
error = FT_Err_Ok;
@ -994,16 +991,16 @@
FT_Error error;
FT_UInt i;
/* unscaled CVT values are already stored in 26.6 format */
FT_Fixed scale = size->ttmetrics.scale >> 6;
/* Scale the cvt values to the new ppem. */
/* By default, we use the y ppem value for scaling. */
FT_TRACE6(( "CVT values:\n" ));
for ( i = 0; i < size->cvt_size; i++ )
{
size->cvt[i] = FT_MulFix( face->cvt[i], scale );
/* Unscaled CVT values are already stored in 26.6 format. */
/* Note that this scaling operation is very sensitive to rounding; */
/* the integer division by 64 must be applied to the first argument. */
size->cvt[i] = FT_MulFix( face->cvt[i] / 64, size->ttmetrics.scale );
FT_TRACE6(( " %3d: %f (%f)\n",
i, (double)face->cvt[i] / 64, (double)size->cvt[i] / 64 ));
}
@ -1035,11 +1032,8 @@
FT_TRACE4(( "Executing `prep' table.\n" ));
error = face->interpreter( exec );
#ifdef FT_DEBUG_LEVEL_TRACE
if ( error )
FT_TRACE4(( " interpretation failed with error code 0x%x\n",
error ));
#endif
FT_TRACE4(( error ? " failed (error code 0x%x)\n" : "",
error ));
}
else
error = FT_Err_Ok;

28
src/type1/t1gload.c
View File

@ -398,16 +398,12 @@
glyph->y_scale = 0x10000L;
}
t1glyph->outline.n_points = 0;
t1glyph->outline.n_contours = 0;
hinting = FT_BOOL( !( load_flags & FT_LOAD_NO_SCALE ) &&
!( load_flags & FT_LOAD_NO_HINTING ) );
scaled = FT_BOOL( !( load_flags & FT_LOAD_NO_SCALE ) );
glyph->hint = hinting;
glyph->scaled = scaled;
t1glyph->format = FT_GLYPH_FORMAT_OUTLINE;
error = decoder_funcs->init( &decoder,
t1glyph->face,
@ -452,16 +448,12 @@
must_finish_decoder = FALSE;
/* now, set the metrics -- this is rather simple, as */
/* the left side bearing is the xMin, and the top side */
/* bearing the yMax */
if ( !error )
{
t1glyph->outline.flags &= FT_OUTLINE_OWNER;
t1glyph->outline.flags |= FT_OUTLINE_REVERSE_FILL;
/* for composite glyphs, return only left side bearing and */
/* advance width */
/* now, set the metrics -- this is rather simple, as */
/* the left side bearing is the xMin, and the top side */
/* bearing the yMax; for composite glyphs, return only */
/* left side bearing and advance width */
if ( load_flags & FT_LOAD_NO_RECURSE )
{
FT_Slot_Internal internal = t1glyph->internal;
@ -482,6 +474,13 @@
FT_Glyph_Metrics* metrics = &t1glyph->metrics;
t1glyph->format = FT_GLYPH_FORMAT_OUTLINE;
t1glyph->outline.flags &= FT_OUTLINE_OWNER;
t1glyph->outline.flags |= FT_OUTLINE_REVERSE_FILL;
if ( t1size && t1size->metrics.y_ppem < 24 )
t1glyph->outline.flags |= FT_OUTLINE_HIGH_PRECISION;
/* copy the _unscaled_ advance width */
metrics->horiAdvance =
FIXED_TO_INT( decoder.builder.advance.x );
@ -504,11 +503,6 @@
FIXED_TO_INT( decoder.builder.advance.y );
}
t1glyph->format = FT_GLYPH_FORMAT_OUTLINE;
if ( t1size && t1size->metrics.y_ppem < 24 )
t1glyph->outline.flags |= FT_OUTLINE_HIGH_PRECISION;
#if 1
/* apply the font matrix, if any */
if ( font_matrix.xx != 0x10000L || font_matrix.yy != 0x10000L ||

6
src/winfonts/winfnt.c
View File

@ -359,8 +359,8 @@
if ( type_id == 0x8008U )
{
font_count = count;
font_offset = FT_STREAM_POS() + 4 +
(FT_ULong)( stream->cursor - stream->limit );
font_offset = FT_STREAM_POS() + 4 -
(FT_ULong)( stream->limit - stream->cursor );
break;
}
@ -1006,7 +1006,7 @@
FT_UInt glyph_index,
FT_Int32 load_flags )
{
FNT_Face face = (FNT_Face)FT_SIZE_FACE( size );
FNT_Face face = (FNT_Face)size->face;
FNT_Font font;
FT_Error error = FT_Err_Ok;
FT_Byte* p;

18
subprojects/libpng.wrap
View File

@ -1,13 +1,13 @@
[wrap-file]
directory = libpng-1.6.40
source_url = https://github.com/glennrp/libpng/archive/v1.6.40.tar.gz
source_filename = libpng-1.6.40.tar.gz
source_hash = 62d25af25e636454b005c93cae51ddcd5383c40fa14aa3dae8f6576feb5692c2
patch_filename = libpng_1.6.40-1_patch.zip
patch_url = https://wrapdb.mesonbuild.com/v2/libpng_1.6.40-1/get_patch
patch_hash = bad558070e0a82faa5c0ae553bcd12d49021fc4b628f232a8e58c3fbd281aae1
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libpng_1.6.40-1/libpng-1.6.40.tar.gz
wrapdb_version = 1.6.40-1
directory = libpng-1.6.43
source_url = https://github.com/glennrp/libpng/archive/v1.6.43.tar.gz
source_filename = libpng-1.6.43.tar.gz
source_hash = fecc95b46cf05e8e3fc8a414750e0ba5aad00d89e9fdf175e94ff041caf1a03a
patch_filename = libpng_1.6.43-2_patch.zip
patch_url = https://wrapdb.mesonbuild.com/v2/libpng_1.6.43-2/get_patch
patch_hash = 49951297edf03e81d925ab03726555f09994ad1ed78fb539a269216430eef3da
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libpng_1.6.43-2/libpng-1.6.43.tar.gz
wrapdb_version = 1.6.43-2
[provide]
libpng = libpng_dep

18
subprojects/zlib.wrap
View File

@ -1,13 +1,13 @@
[wrap-file]
directory = zlib-1.3
source_url = http://zlib.net/fossils/zlib-1.3.tar.gz
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/zlib_1.3-1/zlib-1.3.tar.gz
source_filename = zlib-1.3.tar.gz
source_hash = ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e
patch_filename = zlib_1.3-1_patch.zip
patch_url = https://wrapdb.mesonbuild.com/v2/zlib_1.3-1/get_patch
patch_hash = ab9d6b8167bb34a7c52b60b0cd6138aa4e0c2d31f997343a5f506f3b97b32008
wrapdb_version = 1.3-1
directory = zlib-1.3.1
source_url = http://zlib.net/fossils/zlib-1.3.1.tar.gz
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/zlib_1.3.1-1/zlib-1.3.1.tar.gz
source_filename = zlib-1.3.1.tar.gz
source_hash = 9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23
patch_filename = zlib_1.3.1-1_patch.zip
patch_url = https://wrapdb.mesonbuild.com/v2/zlib_1.3.1-1/get_patch
patch_hash = e79b98eb24a75392009cec6f99ca5cdca9881ff20bfa174e8b8926d5c7a47095
wrapdb_version = 1.3.1-1
[provide]
zlib = zlib_dep

355
vms_make.com
View File

@ -221,77 +221,77 @@ $ deck
all :
define config [--.include.freetype.config]
define internal [--.include.freetype.internal]
define autofit [-.autofit]
define base [-.base]
define cache [-.cache]
define cff [-.cff]
define cid [-.cid]
define freetype [--.include.freetype]
define pcf [-.pcf]
define psaux [-.psaux]
define psnames [-.psnames]
define raster [-.raster]
define sfnt [-.sfnt]
define smooth [-.smooth]
define truetype [-.truetype]
define type1 [-.type1]
define winfonts [-.winfonts]
if f$search("lib.dir") .eqs. "" then create/directory [.lib]
set default [.builds.vms]
$(MMS)$(MMSQUALIFIERS)
set default [--.src.autofit]
$(MMS)$(MMSQUALIFIERS)
set default [-.base]
$(MMS)$(MMSQUALIFIERS)
set default [-.bdf]
$(MMS)$(MMSQUALIFIERS)
set default [-.cache]
$(MMS)$(MMSQUALIFIERS)
set default [-.cff]
$(MMS)$(MMSQUALIFIERS)
set default [-.cid]
$(MMS)$(MMSQUALIFIERS)
set default [-.gxvalid]
$(MMS)$(MMSQUALIFIERS)
set default [-.gzip]
$(MMS)$(MMSQUALIFIERS)
set default [-.bzip2]
$(MMS)$(MMSQUALIFIERS)
set default [-.lzw]
$(MMS)$(MMSQUALIFIERS)
set default [-.otvalid]
$(MMS)$(MMSQUALIFIERS)
set default [-.pcf]
$(MMS)$(MMSQUALIFIERS)
set default [-.pfr]
$(MMS)$(MMSQUALIFIERS)
set default [-.psaux]
$(MMS)$(MMSQUALIFIERS)
set default [-.pshinter]
$(MMS)$(MMSQUALIFIERS)
set default [-.psnames]
$(MMS)$(MMSQUALIFIERS)
set default [-.raster]
$(MMS)$(MMSQUALIFIERS)
set default [-.sfnt]
$(MMS)$(MMSQUALIFIERS)
set default [-.smooth]
$(MMS)$(MMSQUALIFIERS)
set default [-.svg]
$(MMS)$(MMSQUALIFIERS)
set default [-.truetype]
$(MMS)$(MMSQUALIFIERS)
set default [-.type1]
$(MMS)$(MMSQUALIFIERS)
set default [-.type42]
$(MMS)$(MMSQUALIFIERS)
set default [-.winfonts]
$(MMS)$(MMSQUALIFIERS)
set default [-.sdf]
$(MMS)$(MMSQUALIFIERS)
set default [--]
define config [--.include.freetype.config]
define internal [--.include.freetype.internal]
define autofit [-.autofit]
define base [-.base]
define cache [-.cache]
define cff [-.cff]
define cid [-.cid]
define freetype [--.include.freetype]
define pcf [-.pcf]
define psaux [-.psaux]
define psnames [-.psnames]
define raster [-.raster]
define sfnt [-.sfnt]
define smooth [-.smooth]
define truetype [-.truetype]
define type1 [-.type1]
define winfonts [-.winfonts]
if f$search("lib.dir") .eqs. "" then create/directory [.lib]
set default [.builds.vms]
$(MMS)$(MMSQUALIFIERS)
set default [--.src.autofit]
$(MMS)$(MMSQUALIFIERS)
set default [-.base]
$(MMS)$(MMSQUALIFIERS)
set default [-.bdf]
$(MMS)$(MMSQUALIFIERS)
set default [-.cache]
$(MMS)$(MMSQUALIFIERS)
set default [-.cff]
$(MMS)$(MMSQUALIFIERS)
set default [-.cid]
$(MMS)$(MMSQUALIFIERS)
set default [-.gxvalid]
$(MMS)$(MMSQUALIFIERS)
set default [-.gzip]
$(MMS)$(MMSQUALIFIERS)
set default [-.bzip2]
$(MMS)$(MMSQUALIFIERS)
set default [-.lzw]
$(MMS)$(MMSQUALIFIERS)
set default [-.otvalid]
$(MMS)$(MMSQUALIFIERS)
set default [-.pcf]
$(MMS)$(MMSQUALIFIERS)
set default [-.pfr]
$(MMS)$(MMSQUALIFIERS)
set default [-.psaux]
$(MMS)$(MMSQUALIFIERS)
set default [-.pshinter]
$(MMS)$(MMSQUALIFIERS)
set default [-.psnames]
$(MMS)$(MMSQUALIFIERS)
set default [-.raster]
$(MMS)$(MMSQUALIFIERS)
set default [-.sfnt]
$(MMS)$(MMSQUALIFIERS)
set default [-.smooth]
$(MMS)$(MMSQUALIFIERS)
set default [-.svg]
$(MMS)$(MMSQUALIFIERS)
set default [-.truetype]
$(MMS)$(MMSQUALIFIERS)
set default [-.type1]
$(MMS)$(MMSQUALIFIERS)
set default [-.type42]
$(MMS)$(MMSQUALIFIERS)
set default [-.winfonts]
$(MMS)$(MMSQUALIFIERS)
set default [-.sdf]
$(MMS)$(MMSQUALIFIERS)
set default [--]
# EOF
$ eod
@ -348,11 +348,11 @@ OBJS64=ftsystem_64.obj
OBJSCXX=ftsystem_cxx.obj
all : $(OBJS)
library/create [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
library/create [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
.ifdef X86
library/create [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
library/create [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
.endif
ftsystem.obj : ftsystem.c ftconfig.h
@ -411,11 +411,11 @@ OBJS64=autofit_64.obj
OBJSCXX=autofit_cxx.obj
all : $(OBJS)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
.ifdef X86
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
.endif
# EOF
@ -518,11 +518,11 @@ OBJSCXX=ftbase_cxx.obj,\
ftwinfnt_cxx.obj,ftpatent_cxx.obj,ftgxval_cxx.obj,ftotval_cxx.obj
all : $(OBJS)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
.ifdef X86
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
.endif
ftbase.obj : ftbase.c ftadvanc.c ftcalc.c ftcolor.c ftdbgmem.c fterrors.c\
@ -585,11 +585,11 @@ OBJS64=bdf_64.obj
OBJSCXX=bdf_cxx.obj
all : $(OBJS)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
.ifdef X86
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
.endif
# EOF
@ -647,11 +647,11 @@ OBJS64=ftcache_64.obj
OBJSCXX=ftcache_cxx.obj
all : $(OBJS)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
.ifdef X86
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
.endif
ftcache.obj : ftcache.c ftcbasic.c ftccache.c ftccmap.c ftcglyph.c ftcimage.c \
@ -712,11 +712,11 @@ OBJS64=cff_64.obj
OBJSCXX=cff_cxx.obj
all : $(OBJS)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
.ifdef X86
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
.endif
# EOF
@ -774,11 +774,11 @@ OBJS64=type1cid_64.obj
OBJSCXX=type1cid_cxx.obj
all : $(OBJS)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
.ifdef X86
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
.endif
# EOF
@ -836,11 +836,11 @@ OBJS64=gxvalid_64.obj
OBJSCXX=gxvalid_cxx.obj
all : $(OBJS)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
.ifdef X86
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
.endif
# EOF
@ -897,11 +897,11 @@ OBJS64=ftgzip_64.obj
OBJSCXX=ftgzip_cxx.obj
all : $(OBJS)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
.ifdef X86
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
.endif
# EOF
@ -960,11 +960,11 @@ OBJS64=ftbzip2_64.obj
OBJSCXX=ftbzip2_cxx.obj
all : $(OBJS)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
.ifdef X86
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
.endif
# EOF
@ -1021,11 +1021,11 @@ OBJS64=ftlzw_64.obj
OBJSCXX=ftlzw_cxx.obj
all : $(OBJS)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
.ifdef X86
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
.endif
# EOF
@ -1083,11 +1083,11 @@ OBJS64=otvalid_64.obj
OBJSCXX=otvalid_cxx.obj
all : $(OBJS)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
.ifdef X86
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
.endif
# EOF
@ -1157,11 +1157,11 @@ OBJS64=pcf_64.obj
OBJSCXX=pcf_cxx.obj
all : $(OBJS)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
.ifdef X86
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
.endif
# EOF
@ -1219,11 +1219,11 @@ OBJS64=pfr_64.obj
OBJSCXX=pfr_cxx.obj
all : $(OBJS)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
.ifdef X86
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
.endif
# EOF
@ -1281,11 +1281,11 @@ OBJS64=psaux_64.obj
OBJSCXX=psaux_cxx.obj
all : $(OBJS)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
.ifdef X86
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
.endif
# EOF
@ -1343,11 +1343,11 @@ OBJS64=pshinter_64.obj
OBJSCXX=pshinter_cxx.obj
all : $(OBJS)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
.ifdef X86
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
.endif
# EOF
@ -1405,11 +1405,11 @@ OBJS64=psnames_64.obj
OBJSCXX=psnames_cxx.obj
all : $(OBJS)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
.ifdef X86
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
.endif
# EOF
@ -1467,11 +1467,11 @@ OBJS64=raster_64.obj
OBJSCXX=raster_cxx.obj
all : $(OBJS)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
.ifdef X86
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
.endif
# EOF
@ -1499,7 +1499,8 @@ $ deck
CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.sfnt])
.ifdef X86
CXXFLAGS=$(CXXCOMP_FLAGS) -I[] -I[--.include] -I[--.src.base] -Isys$library
CXXFLAGS=$(CXXCOMP_FLAGS) -I[] -I[--.include] -I[--.src.base] -Isys$library\
-Wno-incompatible-pointer-types
.endif
.ifdef X86
@ -1529,11 +1530,11 @@ OBJS64=sfnt_64.obj
OBJSCXX=sfnt_cxx.obj
all : $(OBJS)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
.ifdef X86
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
.endif
# EOF
@ -1591,11 +1592,11 @@ OBJS64=smooth_64.obj
OBJSCXX=smooth_cxx.obj
all : $(OBJS)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
.ifdef X86
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
.endif
# EOF
@ -1653,11 +1654,11 @@ OBJS64=svg_64.obj
OBJSCXX=svg_cxx.obj
all : $(OBJS)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
.ifdef X86
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
.endif
# EOF
@ -1715,11 +1716,11 @@ OBJS64=truetype_64.obj
OBJSCXX=truetype_cxx.obj
all : $(OBJS)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
.ifdef X86
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
.endif
# EOF
@ -1777,11 +1778,11 @@ OBJS64=type1_64.obj
OBJSCXX=type1_cxx.obj
all : $(OBJS)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
.ifdef X86
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
.endif
type1.obj : type1.c t1parse.c t1load.c t1objs.c t1driver.c t1gload.c t1afm.c
@ -1841,11 +1842,11 @@ OBJS64=sdf_64.obj
OBJSCXX=sdf_cxx.obj
all : $(OBJS)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
.ifdef X86
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
.endif
sdf.obj : sdf.c ftbsdf.c ftsdf.c ftsdfcommon.c ftsdfrend.c
@ -1905,11 +1906,11 @@ OBJS64=type42_64.obj
OBJSCXX=type42_cxx.obj
all : $(OBJS)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
.ifdef X86
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
.endif
# EOF
@ -1967,11 +1968,11 @@ OBJS64=winfnt_64.obj
OBJSCXX=winfnt_cxx.obj
all : $(OBJS)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
library [--.lib]freetype.olb $(OBJS)
library [--.lib]freetype.olb $(OBJS64)
.ifdef X86
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
library [--.lib]freetype_cxx.olb $(OBJSCXX)
library [--.lib]freetype_cxx.olb $(OBJS64)
.endif
# EOF
@ -2014,7 +2015,7 @@ $ len = f$length(cparm) - start
$ cc_com = f$extract(start,len,cparm)
if (cc_com .nes. "DECC") .and. -
(cc_com .nes. "VAXC") .and. -
(cc_com .nes. "GNUC")
(cc_com .nes. "GNUC")
$ then
$ write sys$output "Unsupported compiler choice ''cc_com' ignored"
$ write sys$output "Use DECC, VAXC, or GNUC instead"