* src/base/ftobjs.c (FT_Request_Metrics): Avoid division by zero.

The division-by-zero might happen in broken fonts (see #1194). Instead of returning a huge number from FT_DivFix until and failing to scale later, we now bail immediately.
2023-01-03 20:41:42 +00:00
641 changed files with 11686 additions and 10383 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,11 +1,5 @@
 # CI setup for FreeType.

-# https://gitlab.freedesktop.org/freedesktop/freedesktop/-/issues/540
-workflow:
-  rules:
-    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
-    - if: $CI_PIPELINE_SOURCE == 'push'
-
 stages:
 - build

@ -54,7 +48,17 @@ variables:
    # Make sure meson is up to date so we don't need to rebuild the image
    # with each release.
    - pip3 install -U 'meson==0.59.*'
+    - pip3 install --upgrade certifi
    - pip3 install -U ninja
+
+    # Generate a UWP cross-file in case it's used
+    - $PSDefaultParameterValues['Out-File:Encoding'] = 'ASCII'
+    - echo "[binaries]" > uwp-crossfile.meson
+    - echo "c = 'cl'" >> uwp-crossfile.meson
+    - echo "strip = ['true']" >> uwp-crossfile.meson
+    - echo "[built-in options]" >> uwp-crossfile.meson
+    - echo "c_args = ['-DWINAPI_FAMILY=WINAPI_FAMILY_APP', '-DUNICODE', '-D_WIN32_WINNT=0x0A00', '-we4013']" >> uwp-crossfile.meson
+    - echo "c_winlibs = ['windowsapp.lib']" >> uwp-crossfile.meson
  script:
    # For some reason, options are separated by newlines instead of spaces,
    # so we have to replace them first.
@ -65,31 +69,14 @@ variables:
    # script.  Environment variables substitutions is done by PowerShell
    # before calling `cmd.exe`, that's why we use `$env:FOO` instead of
    # `%FOO%`.
-    - cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=$env:ARCH &&
-        meson setup build $env:MESON_ARGS_WINDOWS &&
-        meson compile --verbose -C build &&
-        meson test -C build &&
-        meson test -C build --benchmark"
-
-
-.build windows msbuild:
-  extends: '.build windows common'
-  variables:
-    # Make sure any failure in PowerShell scripts is fatal.
-    ErrorActionPreference: 'Stop'
-    WarningPreference: 'Stop'
-  script:
-    - git submodule update --init --recursive
-    - cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=$env:ARCH &&
-      MSBuild.exe -clp:ForceConsoleColor -t:Rebuild
-               -p:Configuration=Debug
-               -p:Platform=$env:PLATFORM
-               -p:UserDefines=FT_DEBUG_LOGGING
-               MSBuild.sln"
+    - cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=$env:ARCH $env:VS_UWP &&
+        meson setup build $env:MESON_ARGS_WINDOWS $env:MESON_ARGS_UWP &&
+        meson compile --verbose -C build
+        $env:MESON_WINDOWS_TESTS"


 # Format of job names:
-# <OS> <Build-Tool> <Build-Params> <Architecture>:
+# <OS> <Build-Tool> <Build-Params> <Architecture> 


 # Windows jobs.
@ -98,18 +85,20 @@ windows meson vs2019 amd64:
  extends: '.build windows meson'
  variables:
    ARCH: 'amd64'
+    MESON_WINDOWS_TESTS: '&& meson test -C build && meson test -C build --benchmark'

 windows meson vs2019 x86:
  extends: '.build windows meson'
  variables:
    ARCH: 'x86'
+    MESON_WINDOWS_TESTS: '&& meson test -C build && meson test -C build --benchmark'

-windows msbuild vs2019 amd64:
-  extends: '.build windows msbuild'
+windows meson vs2019 amd64 uwp:
+  extends: '.build windows meson'
  variables:
    ARCH: 'amd64'
-    PLATFORM: 'x64'
-
+    VS_UWP: '-app_platform=UWP'
+    MESON_ARGS_UWP: '--cross-file uwp-crossfile.meson -Dc_winlibs="windowsapp.lib"'

 # Linux Jobs.
 #
--- a/.mailmap
+++ b/.mailmap
@ -1,7 +1,7 @@
-Alexander Borsuk <me@alex.bio> <alexander.borsuk@qnective.com>
 Behdad Esfahbod (بهداد اسفهبد) <behdad@behdad.org> <behdad.esfahbod@gmail.com>
 Behdad Esfahbod (بهداد اسفهبد) <behdad@behdad.org> <behdad@google.com>
 Behdad Esfahbod (بهداد اسفهبد) <behdad@behdad.org>
+Alexander Borsuk <me@alex.bio> <alexander.borsuk@qnective.com>
 Ewald Hew (Hew Yih Shiuan 丘毅宣) <ewaldhew@gmail.com>
 Moazin Khatti (موؤذن کھٹی) <moazinkhatri@gmail.com>
 Priyesh Kumar (प्रियेश कुमार) <priyeshkkumar@gmail.com>
@ -15,11 +15,10 @@ Suzuki, Toshiya (鈴木俊哉) <mpsuzuki@hiroshima-u.ac.jp> sssa <sssa@sssas-pow
 Suzuki, Toshiya (鈴木俊哉) <mpsuzuki@hiroshima-u.ac.jp> suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
 Bram Tassyns <bramt@enfocus.be> bram tassyns <BramT@enfocus.be>
 Bram Tassyns <bramt@enfocus.be> <BramT@enfocus.com>
-Anurag Thakur (अनुराग ठाकुर) <anuthadev@gmail.com>
 David Turner <david@freetype.org> <david.turner.dev@gmail.com>
 David Turner <david@freetype.org> <digit@google.com>
 Anuj Verma (अनुज वर्मा) <anujv@iitbhilai.ac.in>
-Ben Wagner <bungeman@gmail.com>
+Ben Wagner <bungeman@gmail.com> Bungeman <bungeman@gmail.com>
 Ben Wagner <bungeman@gmail.com> <bungeman@google.com>
 Ben Wagner <bungeman@gmail.com> <bungeman@chromium.org>
 Nikolaus Waxweiler <madigens@gmail.com> <nikolaus.waxweiler@daltonmaag.com>
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,6 +1,6 @@
 # CMakeLists.txt
 #
-# Copyright (C) 2013-2024 by
+# Copyright (C) 2013-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # Written originally by John Cary <cary@txcorp.com>
@ -110,7 +110,7 @@

 # To minimize the number of cmake_policy() workarounds,
 # CMake >= 3 is requested.
-cmake_minimum_required(VERSION 3.0...3.5)
+cmake_minimum_required(VERSION 3.0)

 if (NOT CMAKE_VERSION VERSION_LESS 3.3)
  # Allow symbol visibility settings also on static libraries. CMake < 3.3
@ -163,8 +163,8 @@ endif ()
 project(freetype C)

 set(VERSION_MAJOR "2")
-set(VERSION_MINOR "13")
-set(VERSION_PATCH "2")
+set(VERSION_MINOR "12")
+set(VERSION_PATCH "1")

 # Generate LIBRARY_VERSION and LIBRARY_SOVERSION.
 set(LIBTOOL_REGEX "version_info='([0-9]+):([0-9]+):([0-9]+)'")
@ -265,8 +265,6 @@ if (NOT FT_DISABLE_PNG)
  else ()
    find_package(PNG)
  endif ()
-  # FreePNG calls FindZLIB so unset ZLIB_FOUND to respect FT_DISABLE_ZLIB
-  unset(ZLIB_FOUND)
 endif ()

 if (NOT FT_DISABLE_ZLIB)
@ -299,7 +297,7 @@ if (NOT FT_DISABLE_BROTLI)
 endif ()

 # Create the configuration file
-if (UNIX AND NOT WIN32)
+if (UNIX)
  check_include_file("unistd.h" HAVE_UNISTD_H)
  check_include_file("fcntl.h" HAVE_FCNTL_H)

@ -425,10 +423,10 @@ set(BASE_SRCS
  src/winfonts/winfnt.c
 )

-if (WIN32)
-  list(APPEND BASE_SRCS "builds/windows/ftsystem.c")
-elseif (UNIX)
+if (UNIX)
  list(APPEND BASE_SRCS "builds/unix/ftsystem.c")
+elseif (WIN32)
+  list(APPEND BASE_SRCS "builds/windows/ftsystem.c")
 else ()
  list(APPEND BASE_SRCS "src/base/ftsystem.c")
 endif ()
--- a/LICENSE.TXT
+++ b/LICENSE.TXT
@ -29,16 +29,12 @@ The contributed  BDF and PCF  drivers come  with a license  similar to
 that  of the  X Window  System.   It is  compatible to  the above  two
 licenses (see files `src/bdf/README`  and `src/pcf/README`).  The same
 holds   for   the   source    code   files   `src/base/fthash.c`   and
-`include/freetype/internal/fthash.h`; they were part of the BDF driver
+`include/freetype/internal/fthash.h`; they wer part  of the BDF driver
 in earlier FreeType versions.

 The gzip  module uses the  zlib license (see  `src/gzip/zlib.h`) which
 too is compatible to the above two licenses.

-The files `src/autofit/ft-hb.c` and `src/autofit/ft-hb.h` contain code
-taken almost  verbatim from the  HarfBuzz file `hb-ft.cc`,  which uses
-the 'Old MIT' license, compatible to the above two licenses.
-
 The  MD5 checksum  support  (only used  for  debugging in  development
 builds) is in the public domain.

--- a/MSBuild.rsp
+++ b/MSBuild.rsp
@ -1,2 +0,0 @@
-#/p:WindowsTargetPlatformVersion=10.0.16299.0
-/p:Configuration="Release"
--- a/2
+++ b/2
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/10
+++ b/10
@ -1,4 +1,4 @@
-FreeType 2.13.2
+FreeType 2.12.1
 ===============

 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.12.1.tar.xz
+  freetype-doc-2.12.1.tar.gz
+  ftdoc2121.zip

 To view the documentation online, go to

@ -94,7 +94,7 @@ Enjoy!

 ----------------------------------------------------------------------

-Copyright (C) 2006-2024 by
+Copyright (C) 2006-2022 by
 David Turner, Robert Wilhelm, and Werner Lemberg.

 This  file is  part of  the FreeType  project, and  may only  be used,
--- a/README.git
+++ b/README.git
@ -89,7 +89,7 @@ address:

 ----------------------------------------------------------------------

-Copyright (C) 2005-2024 by
+Copyright (C) 2005-2022 by
 David Turner, Robert Wilhelm, and Werner Lemberg.

 This  file is  part of  the FreeType  project, and  may only  be used,
--- a/autogen.sh
+++ b/autogen.sh
@ -1,6 +1,6 @@
 #!/bin/sh

-# Copyright (C) 2005-2024 by
+# Copyright (C) 2005-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@ -190,7 +190,8 @@ if test -e ".git"; then
    :
  else
    echo "Checking out submodule in \`subprojects/dlg':"
-    git submodule update --init
+    git submodule init
+    git submodule update
  fi

  copy_submodule_files
--- a/builds/amiga/README
+++ b/builds/amiga/README
@ -1,7 +1,7 @@

 README for the builds/amiga subdirectory.

-Copyright (C) 2005-2024 by
+Copyright (C) 2005-2022 by
 Werner Lemberg and Detlef Würkner.

 This file is part of the FreeType project, and may only be used, modified,
--- a/builds/amiga/include/config/ftconfig.h
+++ b/builds/amiga/include/config/ftconfig.h
@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Amiga-specific configuration file (specification only).              */
 /*                                                                         */
-/*  Copyright (C) 2005-2024 by                                             */
+/*  Copyright (C) 2005-2022 by                                             */
 /*  Werner Lemberg and Detlef Würkner.                                     */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
--- a/builds/amiga/include/config/ftmodule.h
+++ b/builds/amiga/include/config/ftmodule.h
@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Amiga-specific FreeType module selection.                            */
 /*                                                                         */
-/*  Copyright (C) 2005-2024 by                                             */
+/*  Copyright (C) 2005-2022 by                                             */
 /*  Werner Lemberg and Detlef Würkner.                                     */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
--- a/builds/amiga/makefile
+++ b/builds/amiga/makefile
@ -5,7 +5,7 @@
 #


-# Copyright (C) 2005-2024 by
+# Copyright (C) 2005-2022 by
 # Werner Lemberg and Detlef Würkner.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/amiga/makefile.os4
+++ b/builds/amiga/makefile.os4
@ -4,7 +4,7 @@
 #


-# Copyright (C) 2005-2024 by
+# Copyright (C) 2005-2022 by
 # Werner Lemberg and Detlef Würkner.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/amiga/smakefile
+++ b/builds/amiga/smakefile
@ -3,7 +3,7 @@
 #


-# Copyright (C) 2005-2024 by
+# Copyright (C) 2005-2022 by
 # Werner Lemberg and Detlef Würkner.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/amiga/src/base/ftdebug.c
+++ b/builds/amiga/src/base/ftdebug.c
@ -4,7 +4,7 @@
 *
 *   Debugging and logging component for amiga (body).
 *
- * Copyright (C) 1996-2024 by
+ * Copyright (C) 1996-2022 by
 * David Turner, Robert Wilhelm, Werner Lemberg, and Detlef Wuerkner.
 *
 * This file is part of the FreeType project, and may only be used,
--- a/builds/amiga/src/base/ftsystem.c
+++ b/builds/amiga/src/base/ftsystem.c
@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Amiga-specific FreeType low-level system interface (body).           */
 /*                                                                         */
-/*  Copyright (C) 1996-2024 by                                             */
+/*  Copyright (C) 1996-2022 by                                             */
 /*  David Turner, Robert Wilhelm, Werner Lemberg and Detlef Würkner.       */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
--- a/builds/ansi/ansi-def.mk
+++ b/builds/ansi/ansi-def.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/ansi/ansi.mk
+++ b/builds/ansi/ansi.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/beos/beos-def.mk
+++ b/builds/beos/beos-def.mk
@ -5,7 +5,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/beos/beos.mk
+++ b/builds/beos/beos.mk
@ -2,7 +2,7 @@
 # FreeType 2 configuration rules for a BeOS system
 #

-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/beos/detect.mk
+++ b/builds/beos/detect.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/cmake/FindBrotliDec.cmake
+++ b/builds/cmake/FindBrotliDec.cmake
@ -1,6 +1,6 @@
 # FindBrotliDec.cmake
 #
-# Copyright (C) 2019-2024 by
+# Copyright (C) 2019-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # Written by Werner Lemberg <wl@gnu.org>
--- a/builds/cmake/iOS.cmake
+++ b/builds/cmake/iOS.cmake
@ -1,6 +1,6 @@
 # iOS.cmake
 #
-# Copyright (C) 2014-2024 by
+# Copyright (C) 2014-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # Written by David Wimsey <david@wimsey.us>
--- a/builds/cmake/testbuild.sh
+++ b/builds/cmake/testbuild.sh
@ -1,6 +1,6 @@
 #!/bin/sh -e

-# Copyright (C) 2015-2024 by
+# Copyright (C) 2015-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/compiler/ansi-cc.mk
+++ b/builds/compiler/ansi-cc.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/compiler/bcc-dev.mk
+++ b/builds/compiler/bcc-dev.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/compiler/bcc.mk
+++ b/builds/compiler/bcc.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/compiler/emx.mk
+++ b/builds/compiler/emx.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 2003-2024 by
+# Copyright (C) 2003-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/compiler/gcc-dev.mk
+++ b/builds/compiler/gcc-dev.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/compiler/gcc.mk
+++ b/builds/compiler/gcc.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/compiler/intelc.mk
+++ b/builds/compiler/intelc.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/compiler/unix-lcc.mk
+++ b/builds/compiler/unix-lcc.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/compiler/visualage.mk
+++ b/builds/compiler/visualage.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/compiler/visualc.mk
+++ b/builds/compiler/visualc.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/compiler/watcom.mk
+++ b/builds/compiler/watcom.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/compiler/win-lcc.mk
+++ b/builds/compiler/win-lcc.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/detect.mk
+++ b/builds/detect.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/dos/detect.mk
+++ b/builds/dos/detect.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/dos/dos-def.mk
+++ b/builds/dos/dos-def.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/dos/dos-emx.mk
+++ b/builds/dos/dos-emx.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 2003-2024 by
+# Copyright (C) 2003-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/dos/dos-gcc.mk
+++ b/builds/dos/dos-gcc.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/dos/dos-wat.mk
+++ b/builds/dos/dos-wat.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 2003-2024 by
+# Copyright (C) 2003-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/exports.mk
+++ b/builds/exports.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 2005-2024 by
+# Copyright (C) 2005-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/freetype.mk
+++ b/builds/freetype.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@ -299,7 +299,7 @@ refdoc:
                  $(PUBLIC_DIR)/config/*.h \
                  $(PUBLIC_DIR)/cache/*.h
 	@echo Building static site...
-	cd $(DOC_DIR) && $(PYTHON) -m mkdocs build
+	cd $(DOC_DIR) && mkdocs build
 	@echo Done.

 # Variables for running `refdoc' with Python's `virtualenv'.  The
--- a/builds/link_dos.mk
+++ b/builds/link_dos.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/link_std.mk
+++ b/builds/link_std.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/mac/README
+++ b/builds/mac/README
@ -200,6 +200,14 @@ environment by Metrowerks. GCC for MPW and Symantec
  behaviours are not tested at all. Building ftdemos
  for classic MacOS and working test is required.

+  4-3. Porting Jam onto MPW
+  -------------------------
+
+  FreeType uses Jam (and FT-Jam) for unified cross-
+  platform building tool. At present, Jam is not ported
+  to MPW. To update classic MacOS support easily,
+  building by Jam is expected on MPW.
+

 APPENDIX I
 ----------
--- a/builds/mac/ftmac.c
+++ b/builds/mac/ftmac.c
@ -5,7 +5,7 @@
 /*    Mac FOND support.  Written by just@letterror.com.                    */
 /*  Heavily Fixed by mpsuzuki, George Williams and Sean McBride            */
 /*                                                                         */
-/*  Copyright (C) 1996-2024 by                                             */
+/*  Copyright (C) 1996-2022 by                                             */
 /*  Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg.     */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
--- a/builds/meson/extract_freetype_version.py
+++ b/builds/meson/extract_freetype_version.py
@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2020-2024 by
+# Copyright (C) 2020-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/meson/extract_libtool_version.py
+++ b/builds/meson/extract_libtool_version.py
@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2020-2024 by
+# Copyright (C) 2020-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/meson/generate_reference_docs.py
+++ b/builds/meson/generate_reference_docs.py
@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2020-2024 by
+# Copyright (C) 2020-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/meson/parse_modules_cfg.py
+++ b/builds/meson/parse_modules_cfg.py
@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2020-2024 by
+# Copyright (C) 2020-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@ -97,12 +97,8 @@ def generate_ftmodule(lists):

    for module in lists["AUX_MODULES"]:
        if module in ("psaux", "psnames", "otvalid", "gxvalid"):
-            name = {
-                "gxvalid": "gxv",
-                "otvalid": "otv",
-            }.get(module, module)
            result += (
-                "FT_USE_MODULE( FT_Module_Class, %s_module_class )\n" % name
+                "FT_USE_MODULE( FT_Module_Class, %s_module_class )\n" % module
            )

    result += "/* EOF */\n"
--- a/builds/meson/process_ftoption_h.py
+++ b/builds/meson/process_ftoption_h.py
@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2020-2024 by
+# Copyright (C) 2020-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/modules.mk
+++ b/builds/modules.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/os2/detect.mk
+++ b/builds/os2/detect.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/os2/os2-def.mk
+++ b/builds/os2/os2-def.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/os2/os2-dev.mk
+++ b/builds/os2/os2-dev.mk
@ -5,7 +5,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/os2/os2-gcc.mk
+++ b/builds/os2/os2-gcc.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/symbian/bld.inf
+++ b/builds/symbian/bld.inf
@ -2,7 +2,7 @@
 // FreeType 2 project for the symbian platform
 //

-// Copyright (C) 2008-2024 by
+// Copyright (C) 2008-2022 by
 // David Turner, Robert Wilhelm, and Werner Lemberg.
 //
 // This file is part of the FreeType project, and may only be used, modified,
--- a/builds/symbian/freetype.mmp
+++ b/builds/symbian/freetype.mmp
@ -2,7 +2,7 @@
 // FreeType 2 makefile for the symbian platform
 //

-// Copyright (C) 2008-2024 by
+// Copyright (C) 2008-2022 by
 // David Turner, Robert Wilhelm, and Werner Lemberg.
 //
 // This file is part of the FreeType project, and may only be used, modified,
--- a/builds/toplevel.mk
+++ b/builds/toplevel.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@ -170,7 +170,8 @@ endif # test check_platform

 check_out_submodule:
 	$(info Checking out submodule in `subprojects/dlg')
-	git -C $(TOP_DIR) submodule update --init
+	git --git-dir=$(TOP_DIR) submodule init
+	git --git-dir=$(TOP_DIR) submodule update

 copy_submodule:
 	$(info Copying files from `subprojects/dlg' to `src/dlg' and `include/dlg')
@ -197,22 +198,27 @@ modules:
 include $(TOP_DIR)/builds/modules.mk


-# get FreeType version string using built-in string functions
+# get FreeType version string, using a
+# poor man's `sed' emulation with make's built-in string functions
 #
-hash := \#
-
 work := $(strip $(shell $(CAT) \
                  $(subst /,$(SEP),$(TOP_DIR)/include/freetype/freetype.h)))
+work := $(subst |,x,$(work))
+work := $(subst $(space),|,$(work))
+work := $(subst \#define|FREETYPE_MAJOR|,$(space),$(work))
+work := $(word 2,$(work))
+major := $(subst |,$(space),$(work))
+major := $(firstword $(major))

-work := $(subst $(hash)define$(space)FREETYPE_MAJOR$(space),MAjOR=,$(work))
-work := $(subst $(hash)define$(space)FREETYPE_MINOR$(space),MInOR=,$(work))
-work := $(subst $(hash)define$(space)FREETYPE_PATCH$(space),PAtCH=,$(work))
+work := $(subst \#define|FREETYPE_MINOR|,$(space),$(work))
+work := $(word 2,$(work))
+minor := $(subst |,$(space),$(work))
+minor := $(firstword $(minor))

-major := $(subst MAjOR=,,$(filter MAjOR=%,$(work)))
-minor := $(subst MInOR=,,$(filter MInOR=%,$(work)))
-patch := $(subst PAtCH=,,$(filter PAtCH=%,$(work)))
-
-work :=
+work := $(subst \#define|FREETYPE_PATCH|,$(space),$(work))
+work := $(word 2,$(work))
+patch := $(subst |,$(space),$(work))
+patch := $(firstword $(patch))

 # ifneq ($(findstring x0x,x$(patch)x),)
 #   version := $(major).$(minor)
@ -311,6 +317,6 @@ do-dist: distclean refdoc
 	rm -f $(TOP_DIR)/docs/mkdocs.yml

 	@# Remove more stuff related to git.
-	rm -rf $(TOP_DIR)/subprojects/dlg
+	rm -rf (TOP_DIR)/subprojects/dlg

 # EOF
--- a/builds/unix/configure.raw
+++ b/builds/unix/configure.raw
@ -2,7 +2,7 @@
 #
 # Process this file with autoconf to produce a configure script.
 #
-# Copyright (C) 2001-2024 by
+# Copyright (C) 2001-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@ -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='24:3:18'
 AC_SUBST([version_info])
 ft_version=`echo $version_info | tr : .`
 AC_SUBST([ft_version])
@ -966,14 +966,14 @@ esac
 AX_PTHREAD([have_pthread=yes], [have_pthread=no])

 # Check for Python and docwriter
-PYTHON_MIN_VERSION=3.5
+
 have_py3=no
 have_docwriter=no
 PIP=pip

 AC_CHECK_PROGS([PYTHON], [python3 python], [missing])
 if test "x$PYTHON" != "xmissing"; then
-  AX_PROG_PYTHON_VERSION([$PYTHON_MIN_VERSION], [have_py3=yes], [])
+  AX_PROG_PYTHON_VERSION([3.5], [have_py3=yes], [])

  if test "x$have_py3" = "xyes"; then
    PIP="$PYTHON -m $PIP"
@ -1162,7 +1162,7 @@ if test $have_docwriter = no; then
  `make refdoc' will fail since pip package `docwriter' is not installed.
  To install, run `$PIP install docwriter', or to use a Python
  virtual environment, run `make refdoc-venv' (requires pip package
-  `virtualenv').  These operations require Python >= $PYTHON_MIN_VERSION.
+  `virtualenv').  These operations require Python >= 3.5.
  ])
 fi

--- a/builds/unix/detect.mk
+++ b/builds/unix/detect.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/unix/freetype-config.in
+++ b/builds/unix/freetype-config.in
@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright (C) 2000-2024 by
+# Copyright (C) 2000-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/unix/freetype2.m4
+++ b/builds/unix/freetype2.m4
@ -1,7 +1,7 @@
 # Configure paths for FreeType2
 # Marcelo Magallon 2001-10-26, based on `gtk.m4` by Owen Taylor
 #
-# Copyright (C) 2001-2024 by
+# Copyright (C) 2001-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@ -15,7 +15,7 @@
 # generated by Autoconf, under the same distribution terms as the rest of
 # that program.
 #
-# serial 7
+# serial 6

 # AC_CHECK_FT2([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
 # Test for FreeType 2, and define FT2_CFLAGS and FT2_LIBS.
--- a/builds/unix/ft-munmap.m4
+++ b/builds/unix/ft-munmap.m4
@ -1,6 +1,6 @@
 ## FreeType specific autoconf tests
 #
-# Copyright (C) 2002-2024 by
+# Copyright (C) 2002-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/unix/ftconfig.h.in
+++ b/builds/unix/ftconfig.h.in
@ -4,7 +4,7 @@
 *
 *   UNIX-specific configuration file (specification only).
 *
- * Copyright (C) 1996-2024 by
+ * Copyright (C) 1996-2022 by
 * David Turner, Robert Wilhelm, and Werner Lemberg.
 *
 * This file is part of the FreeType project, and may only be used,
--- a/builds/unix/ftsystem.c
+++ b/builds/unix/ftsystem.c
@ -4,7 +4,7 @@
 *
 *   Unix-specific FreeType low-level system interface (body).
 *
- * Copyright (C) 1996-2024 by
+ * Copyright (C) 1996-2022 by
 * David Turner, Robert Wilhelm, and Werner Lemberg.
 *
 * This file is part of the FreeType project, and may only be used,
--- a/builds/unix/install.mk
+++ b/builds/unix/install.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/unix/unix-cc.in
+++ b/builds/unix/unix-cc.in
@ -2,7 +2,7 @@
 # FreeType 2 template for Unix-specific compiler definitions
 #

-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/unix/unix-def.in
+++ b/builds/unix/unix-def.in
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/unix/unix-dev.mk
+++ b/builds/unix/unix-dev.mk
@ -6,7 +6,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/unix/unix-lcc.mk
+++ b/builds/unix/unix-lcc.mk
@ -6,7 +6,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/unix/unix.mk
+++ b/builds/unix/unix.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/unix/unixddef.mk
+++ b/builds/unix/unixddef.mk
@ -4,7 +4,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/vms/LIBS.OPT_IA64
+++ b/builds/vms/LIBS.OPT_IA64
--- a/builds/vms/_LINK.OPT_IA64
+++ b/builds/vms/_LINK.OPT_IA64
--- a/builds/vms/apinames_vms.bash
+++ b/builds/vms/apinames_vms.bash
@ -1,2 +0,0 @@
-src/tools/apinames -wV include/freetype/*.h > freetype_vms0.opt
-mv freetype_vms0.opt freetype_vms.opt
--- a/builds/vms/ftconfig.h
+++ b/builds/vms/ftconfig.h
@ -4,7 +4,7 @@
 *
 *   VMS-specific configuration file (specification only).
 *
- * Copyright (C) 1996-2024 by
+ * Copyright (C) 1996-2022 by
 * David Turner, Robert Wilhelm, and Werner Lemberg.
 *
 * This file is part of the FreeType project, and may only be used,
--- a/builds/vms/ftsystem.c
+++ b/builds/vms/ftsystem.c
@ -4,7 +4,7 @@
 /*                                                                         */
 /*    VMS-specific FreeType low-level system interface (body).             */
 /*                                                                         */
-/*  Copyright (C) 1996-2024 by                                             */
+/*  Copyright (C) 1996-2022 by                                             */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
--- a/builds/vms/vmslib.dat
+++ b/builds/vms/vmslib.dat
@ -0,0 +1,28 @@
+!
+! This is a simple driver file with information used by make.com to
+! check if external libraries (like t1lib and freetype) are available on
+! the system.
+!
+! Layout of the file:
+!
+!    - Lines starting with ! are treated as comments
+!    - Elements in a data line are separated by # signs
+!    - The elements need to be listed in the following order
+!      1.) Name of the Library 
+!      2.) Location where the object library can be found
+!      3.) Location where the include files for the library can be found
+!      4.) Include file used to verify library location
+!      5.) CPP define to pass to the build to indicate availability of
+!          the library
+!
+! Example: The following  lines show how definitions
+!          might look like. They are site specific and the locations of the
+!          library and include files need almost certainly to be changed.
+!
+! Location: All of the libaries can be found at the following addresses
+!
+!   ZLIB:     http://www.decus.de:8080/www/vms/sw/zlib.htmlx
+!
+BZ2LIB # sys$library:libbz2.olb # decc$user_include: # bzlib.h # FT_CONFIG_OPTION_SYSTEM_ZLIB
+PNGLIB # sys$library:libpng.olb # sys$library: # png.h # FT_CONFIG_OPTION_SYSTEM_ZLIB
+ZLIB # sys$library:libz.olb # sys$library: # zlib.h # FT_CONFIG_OPTION_SYSTEM_ZLIB
--- a/builds/wince/ftdebug.c
+++ b/builds/wince/ftdebug.c
@ -4,7 +4,7 @@
 *
 *   Debugging and logging component for WinCE (body).
 *
- * Copyright (C) 1996-2024 by
+ * Copyright (C) 1996-2022 by
 * David Turner, Robert Wilhelm, and Werner Lemberg.
 *
 * This file is part of the FreeType project, and may only be used,
--- a/builds/wince/vc2005-ce/index.html
+++ b/builds/wince/vc2005-ce/index.html
@ -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.12.1 sources:</p>

 <ul>
  <pre>
--- a/builds/wince/vc2008-ce/index.html
+++ b/builds/wince/vc2008-ce/index.html
@ -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.12.1 sources:</p>

 <ul>
  <pre>
--- a/builds/windows/detect.mk
+++ b/builds/windows/detect.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/windows/ftdebug.c
+++ b/builds/windows/ftdebug.c
@ -4,7 +4,7 @@
 *
 *   Debugging and logging component for Win32 (body).
 *
- * Copyright (C) 1996-2024 by
+ * Copyright (C) 1996-2022 by
 * David Turner, Robert Wilhelm, and Werner Lemberg.
 *
 * This file is part of the FreeType project, and may only be used,
--- a/builds/windows/ftsystem.c
+++ b/builds/windows/ftsystem.c
@ -4,7 +4,7 @@
 *
 *   Windows-specific FreeType low-level system interface (body).
 *
- * Copyright (C) 2021-2024 by
+ * Copyright (C) 2021-2022 by
 * David Turner, Robert Wilhelm, and Werner Lemberg.
 *
 * This file is part of the FreeType project, and may only be used,
@ -196,8 +196,8 @@
  }


-  /* support for Universal Windows Platform UWP, formerly WinRT */
-#ifdef _WINRT_DLL
+  /* non-desktop Universal Windows Platform */
+#if defined( WINAPI_FAMILY ) && WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP

 #define PACK_DWORD64( hi, lo )  ( ( (DWORD64)(hi) << 32 ) | (DWORD)(lo) )

@ -248,11 +248,10 @@
                        dwCreationDisposition, &createExParams );
  }

-#endif  /* _WINRT_DLL */
+#endif


-  /* support for Windows CE */
-#ifdef _WIN32_WCE
+#if defined( _WIN32_WCE )

  /* malloc.h provides implementation of alloca()/_alloca() */
  #include <malloc.h>
@ -292,9 +291,9 @@
                        dwFlagsAndAttributes, hTemplateFile );
  }

-#endif  /* _WIN32_WCE */
+#endif
+

-  /* support for really old Windows */
 #if defined( _WIN32_WCE ) || defined ( _WIN32_WINDOWS ) || \
    !defined( _WIN32_WINNT ) || _WIN32_WINNT <= 0x0400

@ -312,7 +311,7 @@
      return TRUE;
  }

-#endif  /* _WIN32_WCE || _WIN32_WINDOWS || _WIN32_WINNT <= 0x0400 */
+#endif


  /* documentation is in ftobjs.h */
--- a/builds/windows/vc2010/freetype.sln
+++ b/builds/windows/vc2010/freetype.sln
@ -1,20 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio Express 2012 for Windows Desktop
-#
-# You can build FreeType with MSBuild as follows
-#
-#    MSBuild.exe -t:Rebuild
-#                -p:Configuration=Debug
-#                -p:Platform=x64
-#                -p:UserDefines=FT_DEBUG_LOGGING
-#                   MSBuild.sln
-#
-# or with different appropriate switches. The library file
-# freetype.dll and/or freetype.lib should appear in the objs/
-# folder. A copy should be sent to ../freetype-demos/bin/
-# to be used with the demo programs.
-#
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "builds\windows\vc2010\freetype.vcxproj", "{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "freetype.vcxproj", "{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
--- a/builds/windows/vc2010/freetype.vcxproj
+++ b/builds/windows/vc2010/freetype.vcxproj
@ -168,7 +168,7 @@
      <WarningLevel>Level4</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CompileAs>Default</CompileAs>
-      <DisableSpecificWarnings>4001;4267</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4001</DisableSpecificWarnings>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
@ -195,7 +195,7 @@
      <WarningLevel>Level4</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CompileAs>Default</CompileAs>
-      <DisableSpecificWarnings>4001;4267</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4001</DisableSpecificWarnings>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
@ -248,7 +248,7 @@
      <WarningLevel>Level4</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CompileAs>Default</CompileAs>
-      <DisableSpecificWarnings>4001;4267</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4001</DisableSpecificWarnings>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
@ -274,7 +274,7 @@
      <WarningLevel>Level4</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CompileAs>Default</CompileAs>
-      <DisableSpecificWarnings>4001;4267</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4001</DisableSpecificWarnings>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
@ -328,7 +328,7 @@
      <DisableLanguageExtensions>true</DisableLanguageExtensions>
      <WarningLevel>Level4</WarningLevel>
      <CompileAs>Default</CompileAs>
-      <DisableSpecificWarnings>4001;4267</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4001</DisableSpecificWarnings>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
      <IntrinsicFunctions>true</IntrinsicFunctions>
@ -356,7 +356,7 @@
      <DisableLanguageExtensions>true</DisableLanguageExtensions>
      <WarningLevel>Level4</WarningLevel>
      <CompileAs>Default</CompileAs>
-      <DisableSpecificWarnings>4001;4267</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4001</DisableSpecificWarnings>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <IntrinsicFunctions>true</IntrinsicFunctions>
    </ClCompile>
@ -409,7 +409,7 @@
      <DisableLanguageExtensions>true</DisableLanguageExtensions>
      <WarningLevel>Level4</WarningLevel>
      <CompileAs>Default</CompileAs>
-      <DisableSpecificWarnings>4001;4267</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4001</DisableSpecificWarnings>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
      <IntrinsicFunctions>true</IntrinsicFunctions>
@ -435,7 +435,7 @@
      <DisableLanguageExtensions>true</DisableLanguageExtensions>
      <WarningLevel>Level4</WarningLevel>
      <CompileAs>Default</CompileAs>
-      <DisableSpecificWarnings>4001;4267</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4001</DisableSpecificWarnings>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <IntrinsicFunctions>true</IntrinsicFunctions>
    </ClCompile>
--- a/builds/windows/vc2010/index.html
+++ b/builds/windows/vc2010/index.html
@ -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.12.1 sources:</p>

 <ul>
  <li>freetype.dll using 'Release' or 'Debug' configurations</li>
--- a/builds/windows/visualc/index.html
+++ b/builds/windows/visualc/index.html
@ -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.12.1 sources:</p>

 <ul>
  <li>freetype.dll using 'Release' or 'Debug' configurations</li>
--- a/builds/windows/visualce/index.html
+++ b/builds/windows/visualce/index.html
@ -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.12.1 sources:</p>

 <ul>
  <pre>
--- a/builds/windows/w32-bcc.mk
+++ b/builds/windows/w32-bcc.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/windows/w32-bccd.mk
+++ b/builds/windows/w32-bccd.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/windows/w32-dev.mk
+++ b/builds/windows/w32-dev.mk
@ -5,7 +5,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/windows/w32-gcc.mk
+++ b/builds/windows/w32-gcc.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/windows/w32-icc.mk
+++ b/builds/windows/w32-icc.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/windows/w32-intl.mk
+++ b/builds/windows/w32-intl.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/builds/windows/w32-lcc.mk
+++ b/builds/windows/w32-lcc.mk
@ -3,7 +3,7 @@
 #


-# Copyright (C) 1996-2024 by
+# Copyright (C) 1996-2022 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
--- a/Show more
+++ b/Show more