From 801cd842e27c85cb1d5000f6397f382ffe295daa Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sun, 18 Jul 2021 07:53:57 +0200 Subject: [PATCH] * Version 2.11.0 released. ========================== Tag sources with `VER-2-11-0'. * docs/VERSION.TXT: Add entry for version 2.11.0. * docs/CHANGES: Updated. * README, src/base/ftver.rc, builds/windows/vc2010/index.html, builds/windows/visualc/index.html, builds/windows/visualce/index.html, builds/wince/vc2005-ce/index.html, builds/wince/vc2008-ce/index.html, docs/freetype-config.1: s/2.10.4/2.11.0/, s/2104/2110/. * include/freetype/freetype.h (FREETYPE_MINOR): Set to 11. (FREETYPE_PATCH): Set to 0. * builds/unix/configure.raw (version_info): Set to 24:0:18. * CMakeLists.txt (VERSION_MINOR): Set to 11. (VERSION_PATCH): Set to 0. * builds/toplevel.mk (dist): Ignore more git-related files. --- CMakeLists.txt | 4 ++-- ChangeLog | 27 +++++++++++++++++++++++++++ README | 8 ++++---- builds/toplevel.mk | 3 +++ builds/unix/configure.raw | 2 +- builds/wince/vc2005-ce/index.html | 2 +- builds/wince/vc2008-ce/index.html | 2 +- builds/windows/vc2010/index.html | 2 +- builds/windows/visualc/index.html | 2 +- builds/windows/visualce/index.html | 2 +- docs/CHANGES | 15 +++++++-------- docs/INSTALL.GNU | 2 +- docs/VERSIONS.TXT | 1 + docs/freetype-config.1 | 2 +- include/freetype/freetype.h | 4 ++-- src/base/ftver.rc | 4 ++-- src/psaux/psblues.c | 4 ++-- src/psnames/psmodule.c | 2 +- src/sfnt/ttpost.c | 2 +- 19 files changed, 60 insertions(+), 30 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e9b6fb6d5..0935c15aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -149,8 +149,8 @@ endif () project(freetype C) set(VERSION_MAJOR "2") -set(VERSION_MINOR "10") -set(VERSION_PATCH "4") +set(VERSION_MINOR "11") +set(VERSION_PATCH "0") # Generate LIBRARY_VERSION and LIBRARY_SOVERSION. set(LIBTOOL_REGEX "version_info='([0-9]+):([0-9]+):([0-9]+)'") diff --git a/ChangeLog b/ChangeLog index 2aefedd54..e649d31e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,30 @@ +2021-07-18 Werner Lemberg + + * Version 2.11.0 released. + ========================== + + + Tag sources with `VER-2-11-0'. + + * docs/VERSION.TXT: Add entry for version 2.11.0. + * docs/CHANGES: Updated. + + * README, src/base/ftver.rc, builds/windows/vc2010/index.html, + builds/windows/visualc/index.html, + builds/windows/visualce/index.html, + builds/wince/vc2005-ce/index.html, + builds/wince/vc2008-ce/index.html, docs/freetype-config.1: + s/2.10.4/2.11.0/, s/2104/2110/. + + * include/freetype/freetype.h (FREETYPE_MINOR): Set to 11. + (FREETYPE_PATCH): Set to 0. + + * builds/unix/configure.raw (version_info): Set to 24:0:18. + * CMakeLists.txt (VERSION_MINOR): Set to 11. + (VERSION_PATCH): Set to 0. + + * builds/toplevel.mk (dist): Ignore more git-related files. + 2021-07-17 David Turner * src/smooth/ftgrays.c: Fix compilation if `FT_LONG64` is undefined. diff --git a/README b/README index faad25133..b7e1b3be3 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -FreeType 2.10.4 +FreeType 2.11.0 =============== Homepage: https://www.freetype.org @@ -30,9 +30,9 @@ sites. Go to and download one of the following files. - freetype-doc-2.10.4.tar.xz - freetype-doc-2.10.4.tar.gz - ftdoc2104.zip + freetype-doc-2.11.0.tar.xz + freetype-doc-2.11.0.tar.gz + ftdoc2110.zip To view the documentation online, go to diff --git a/builds/toplevel.mk b/builds/toplevel.mk index 789d6fbf2..3b3fd64fe 100644 --- a/builds/toplevel.mk +++ b/builds/toplevel.mk @@ -248,7 +248,10 @@ dist: currdir=`pwd` ; \ for f in `find . -wholename '*/.git' -prune \ + -o -name .gitattributes \ -o -name .gitignore \ + -o -name .gitlab-ci.yml \ + -o -name .gitmodules \ -o -name .mailmap \ -o -type d \ -o -print` ; do \ diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw index 09b5584f2..56e0a8e2c 100644 --- a/builds/unix/configure.raw +++ b/builds/unix/configure.raw @@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.h.in]) # Don't forget to update `docs/VERSIONS.TXT'! -version_info='23:4:17' +version_info='24:0:18' AC_SUBST([version_info]) ft_version=`echo $version_info | tr : .` AC_SUBST([ft_version]) diff --git a/builds/wince/vc2005-ce/index.html b/builds/wince/vc2005-ce/index.html index 6936a8909..0b6fc295f 100644 --- a/builds/wince/vc2005-ce/index.html +++ b/builds/wince/vc2005-ce/index.html @@ -21,7 +21,7 @@ the following targets:
  • PPC/SP WM6 (Windows Mobile 6)
    • -It compiles the following libraries from the FreeType 2.10.4 sources:

    +It compiles the following libraries from the FreeType 2.11.0 sources:

      diff --git a/builds/wince/vc2008-ce/index.html b/builds/wince/vc2008-ce/index.html
index ee385af86..0c7ffcc6d 100644
--- a/builds/wince/vc2008-ce/index.html
+++ b/builds/wince/vc2008-ce/index.html
@@ -21,7 +21,7 @@ the following targets:
   
    • PPC/SP WM6 (Windows Mobile 6)
      •
    -It compiles the following libraries from the FreeType 2.10.4 sources:

    +It compiles the following libraries from the FreeType 2.11.0 sources:

      diff --git a/builds/windows/vc2010/index.html b/builds/windows/vc2010/index.html
index 3b60c5fe1..6332d41fd 100644
--- a/builds/windows/vc2010/index.html
+++ b/builds/windows/vc2010/index.html
@@ -12,7 +12,7 @@
 
      This directory contains solution and project files for
 Visual C++ 2010 or newer, named freetype.sln,
 and freetype.vcxproj.  It compiles the following libraries
-from the FreeType 2.10.4 sources:
      
+from the FreeType 2.11.0 sources:
      
 
 
        
   
      • freetype.dll using 'Release' or 'Debug' configurations
        • 
diff --git a/builds/windows/visualc/index.html b/builds/windows/visualc/index.html
index cec26d27a..dbc93ad80 100644
--- a/builds/windows/visualc/index.html
+++ b/builds/windows/visualc/index.html
@@ -12,7 +12,7 @@
 
        This directory contains project files freetype.dsp for
 Visual C++ 6.0, and freetype.vcproj for Visual C++ 2002
 through 2008, which you might need to upgrade automatically.
-It compiles the following libraries from the FreeType 2.10.4 sources:
        
+It compiles the following libraries from the FreeType 2.11.0 sources:
        
 
 
          
   
        • freetype.dll using 'Release' or 'Debug' configurations
          • 
diff --git a/builds/windows/visualce/index.html b/builds/windows/visualce/index.html
index 474e85c37..45aec7a98 100644
--- a/builds/windows/visualce/index.html
+++ b/builds/windows/visualce/index.html
@@ -21,7 +21,7 @@ the following targets:
   
        • PPC/SP WM6 (Windows Mobile 6)
          • 
 
        
 
-It compiles the following libraries from the FreeType 2.10.4 sources:
        
+It compiles the following libraries from the FreeType 2.11.0 sources:
        
 
 
          
   
          diff --git a/docs/CHANGES b/docs/CHANGES
index 10cad4337..7dab3e7d7 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -2,11 +2,6 @@ CHANGES BETWEEN 2.10.4 and 2.11.0
 
   I. IMPORTANT CHANGES
 
-  - The legacy Type 1 and CFF  engines are further demoted due to lack
-    of CFF2 charstring support.  You now need to use `FT_Property_Set`
-    to  enable   it  besides  the   `T1_CONFIG_OPTION_OLD_ENGINE`  and
-    `CFF_CONFIG_OPTION_OLD_ENGINE` options.
-
   - A  new rendering  module has  been  added to  create 8-bit  Signed
     Distance Field (SDF)  bitmaps for both outline  and bitmap glyphs.
     The new  rendering mode is called  `FT_RENDER_MODE_SDF`, the pixel
@@ -72,6 +67,11 @@ CHANGES BETWEEN 2.10.4 and 2.11.0
 
     This work was Priyesh Kumar's GSoC 2020 project.
 
+  - The legacy Type 1 and CFF  engines are further demoted due to lack
+    of CFF2 charstring support.  You now need to use `FT_Property_Set`
+    to  enable  them  besides  the  `T1_CONFIG_OPTION_OLD_ENGINE`  and
+    `CFF_CONFIG_OPTION_OLD_ENGINE` options, respectively.
+
   - The experimental 'warp' mode (AF_CONFIG_OPTION_USE_WARPER) for the
     auto-hinter has been removed.
 
@@ -83,9 +83,8 @@ CHANGES BETWEEN 2.10.4 and 2.11.0
   - PCF bitmap fonts compressed with LZW (these are usually files with
     the extension `.pcf.Z`) are now handled correctly.
 
-  - Improved Meson build support for the library.
-
-  - Meson support to build the FreeType demo programs.
+  - Improved  Meson  build  files,  including  support  to  build  the
+    FreeType demo programs.
 
   - A new demo program `ftsdf` is available to display Signed Distance
     Fields of glyphs.
diff --git a/docs/INSTALL.GNU b/docs/INSTALL.GNU
index 8810f2a30..a04e6fc1c 100644
--- a/docs/INSTALL.GNU
+++ b/docs/INSTALL.GNU
@@ -152,7 +152,7 @@ instructions in the file `INSTALL.UNIX' instead.
 
     To  launch  the build,  simply  invoke  GNU  Make again:  The  top
     Makefile will detect the configuration file and run the build with
-    it.  If you have used variables in  step 3, you must used the same
+    it.  If you have used variables in  step 3, you must use  the same
     variables here, too.
 
 
diff --git a/docs/VERSIONS.TXT b/docs/VERSIONS.TXT
index 0d586192e..e4b16ef49 100644
--- a/docs/VERSIONS.TXT
+++ b/docs/VERSIONS.TXT
@@ -60,6 +60,7 @@ found on _most_ systems, but not all of them:
 
     release     libtool     so
   -------------------------------
+     2.11.0     24.0.18   6.18.0
      2.10.4     23.4.17   6.17.4
      2.10.3     23.3.17   6.17.3
      2.10.2     23.2.17   6.17.2
diff --git a/docs/freetype-config.1 b/docs/freetype-config.1
index 7dea66afa..692ec79b9 100644
--- a/docs/freetype-config.1
+++ b/docs/freetype-config.1
@@ -1,4 +1,4 @@
-.TH FREETYPE-CONFIG 1 "October 2020" "FreeType 2.10.4"
+.TH FREETYPE-CONFIG 1 "July 2021" "FreeType 2.11.0"
 .
 .
 .SH NAME
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index 566f56d7b..77fede35c 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -4724,8 +4724,8 @@ FT_BEGIN_HEADER
    *
    */
 #define FREETYPE_MAJOR  2
-#define FREETYPE_MINOR  10
-#define FREETYPE_PATCH  4
+#define FREETYPE_MINOR  11
+#define FREETYPE_PATCH  0
 
 
   /**************************************************************************
diff --git a/src/base/ftver.rc b/src/base/ftver.rc
index 371adb56a..5fe433cbd 100644
--- a/src/base/ftver.rc
+++ b/src/base/ftver.rc
@@ -18,8 +18,8 @@
 
 #include
 
-#define FT_VERSION      2,10,4,0
-#define FT_VERSION_STR  "2.10.4"
+#define FT_VERSION      2,11,0,0
+#define FT_VERSION_STR  "2.11.0"
 
 VS_VERSION_INFO      VERSIONINFO
 FILEVERSION          FT_VERSION
diff --git a/src/psaux/psblues.c b/src/psaux/psblues.c
index 7bfd419d5..f9c864fea 100644
--- a/src/psaux/psblues.c
+++ b/src/psaux/psblues.c
@@ -506,8 +506,8 @@
             /* guarantee minimum of 1 pixel overshoot */
             dsNew = FT_MIN(
                       cf2_fixedRound( bottomHintEdge->dsCoord ),
-                      SUB_INT32 ( blues->zone[i].dsFlatEdge,
-                                  cf2_intToFixed( 1 ) ) );
+                      SUB_INT32( blues->zone[i].dsFlatEdge,
+                                 cf2_intToFixed( 1 ) ) );
           }
 
           else
diff --git a/src/psnames/psmodule.c b/src/psnames/psmodule.c
index 186e8ed90..fff9c42a3 100644
--- a/src/psnames/psmodule.c
+++ b/src/psnames/psmodule.c
@@ -166,7 +166,7 @@
       /* `.notdef', `.null' and the empty name are short cut */
       if ( p > glyph_name )
       {
-        value =  (FT_UInt32)ft_get_adobe_glyph_index( glyph_name, p );
+        value = (FT_UInt32)ft_get_adobe_glyph_index( glyph_name, p );
 
         if ( *p == '.' )
           value |= (FT_UInt32)VARIANT_BIT;
diff --git a/src/sfnt/ttpost.c b/src/sfnt/ttpost.c
index 427c3f4c7..b92ca5db1 100644
--- a/src/sfnt/ttpost.c
+++ b/src/sfnt/ttpost.c
@@ -265,7 +265,7 @@
           if ( FT_QREALLOC( strings, 1, 2 ) )
             goto Fail;
 
-          post_len = 1;
+          post_len          = 1;
           strings[post_len] = 0;
         }