Skip to content

GitLab

T
tangled
Commit e014fe98 authored by Ben Wagner's avatar Ben Wagner Committed by Commit Bot
Browse files
Options

Roll src/third_party/freetype/src/ ae7dc1f62..94f6d57a4 (32 commits) 

https://chromium.googlesource.com/chromium/src/third_party/freetype2.git/+log/ae7dc1f62d82..94f6d57a4c42

$ git log ae7dc1f62..94f6d57a4 --date=short --no-merges --format='%ad %ae %s'
2017-10-16 ewaldhew [cff] Fix segfault on missing `psaux' (#52218)
2017-10-15 apodtele [base, cff] Fix MSVC warnings.
2017-10-14 apodtele [base] Netpbm image tracing.
2017-10-14 apodtele * builds/windows/ftdebug.c (FT_Message): Print to stderr.
2017-10-14 behdad [afshaper] Delay creating `hb_set' objects until needed.
2017-10-12 ewaldhew * devel/ftoption.h: Enable T1_CONFIG_OPTION_OLD_ENGINE by default.
2017-10-12 ewaldhew [type1, cid] Add hinting engine switch.
2017-10-12 ewaldhew Add T1_CONFIG_OPTION_OLD_ENGINE configuration option.
2017-10-12 ewaldhew Extract width parsing from Type 1 parser.
2017-10-12 wl [autofit] Better visualize table tracing in source code.
2017-10-09 wl * src/base/ftoutln.c (FT_Outline_Translate): Fix integer overflow.
2017-10-08 wl * src/base/ftobjs.c (ft_glyphslot_preset_bitmap): Integer overflows.
2017-10-08 wl Document global size metrics needed for native bytecode hinting (#52165).
2017-10-08 wl Prevent creation of an incorrect documentation entry.
2017-10-07 wl [sfnt] Adjust behaviour of PS font names for variation fonts.
2017-10-07 wl [cff, truetype] Adjust behaviour of named instances.
2017-10-07 wl Make `FT_Set_Named_Instance' work.
2017-10-07 wl Make `FT_FACE_FLAG_VARIATION' work.
2017-10-07 wl New function `FT_Set_Named_Instance'.
2017-10-07 wl Add macros for checking whether a font variation is active.
2017-10-07 wl Add framework for setting named instance in MM service.
2017-10-07 wl [type1] Minor code shuffling.
2017-10-05 wl * src/base/ftobjs.c (ft_glyphslot_preset_bitmap): Fix integer overflow.
2017-10-05 wl Fix compiler warnings.
2017-10-04 John.Tytgat [cff] Add support for `FSType'.
2017-10-02 wl CHANGES: Formatting.
2017-10-01 wl [smooth,type1] Formatting, whitespace.
2017-10-01 wl [psaux] Formatting, minor fixes, whitespace, copyright notices.
2017-09-30 wl [base,cff,cid] Whitespace, formatting.
2017-09-30 wl [include] Whitespace.
2017-09-30 apodtele Signedness fixes in bitmap presetting.
2017-09-29 apodtele Bitmap metrics presetting [2/2].

Created with:
  roll-dep src/third_party/freetype/src
R=bungeman@chromium.org,drott@chromium.org

Change-Id: Ie327d67350aeaec40df6d1a6d4379c8c20c8b58a
PDFium-bug: https://bugs.chromium.org/p/pdfium/issues/detail?id=918
Reviewed-on: https://chromium-review.googlesource.com/721779Reviewed-by: default avatarDominik Röttsches <drott@chromium.org>
Commit-Queue: Ben Wagner <bungeman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#509378}
parent c1c6ac7c
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 36 deletions
DEPS
View file @ e014fe98
...@@ -107,7 +107,7 @@ vars = { ...@@ -107,7 +107,7 @@ vars = {
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling freetype # the commit queue can handle CLs rolling freetype
# and whatever else without interference from each other. # and whatever else without interference from each other.
'freetype_revision': 'ae7dc1f62d826083d418e86cce3f66a76dff038a', 'freetype_revision': '94f6d57a4c4264e59493ccdf9b8cef92600c0c25',
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling catapult # the commit queue can handle CLs rolling catapult
# and whatever else without interference from each other. # and whatever else without interference from each other.
......
third_party/freetype/README.chromium
View file @ e014fe98
Name: FreeType Name: FreeType
URL: http://www.freetype.org/ URL: http://www.freetype.org/
Version: VER-2-8-1-75 Version: VER-2-8-1-107
Revision: ae7dc1f62d826083d418e86cce3f66a76dff038a Revision: 94f6d57a4c4264e59493ccdf9b8cef92600c0c25
License: Custom license "inspired by the BSD, Artistic, and IJG (Independent License: Custom license "inspired by the BSD, Artistic, and IJG (Independent
JPEG Group) licenses" JPEG Group) licenses"
License File: src/docs/FTL.TXT License File: src/docs/FTL.TXT
......
third_party/freetype/include/freetype-custom-config/ftconfig.h
View file @ e014fe98
...@@ -73,11 +73,11 @@ FT_BEGIN_HEADER ...@@ -73,11 +73,11 @@ FT_BEGIN_HEADER
/* The size of an `int' type. */ /* The size of an `int' type. */
#if FT_UINT_MAX == 0xFFFFUL #if FT_UINT_MAX == 0xFFFFUL
#define FT_SIZEOF_INT (16 / FT_CHAR_BIT) #define FT_SIZEOF_INT ( 16 / FT_CHAR_BIT )
#elif FT_UINT_MAX == 0xFFFFFFFFUL #elif FT_UINT_MAX == 0xFFFFFFFFUL
#define FT_SIZEOF_INT (32 / FT_CHAR_BIT) #define FT_SIZEOF_INT ( 32 / FT_CHAR_BIT )
#elif FT_UINT_MAX > 0xFFFFFFFFUL && FT_UINT_MAX == 0xFFFFFFFFFFFFFFFFUL #elif FT_UINT_MAX > 0xFFFFFFFFUL && FT_UINT_MAX == 0xFFFFFFFFFFFFFFFFUL
#define FT_SIZEOF_INT (64 / FT_CHAR_BIT) #define FT_SIZEOF_INT ( 64 / FT_CHAR_BIT )
#else #else
#error "Unsupported size of `int' type!" #error "Unsupported size of `int' type!"
#endif #endif
...@@ -85,11 +85,11 @@ FT_BEGIN_HEADER ...@@ -85,11 +85,11 @@ FT_BEGIN_HEADER
/* The size of a `long' type. A five-byte `long' (as used e.g. on the */ /* The size of a `long' type. A five-byte `long' (as used e.g. on the */
/* DM642) is recognized but avoided. */ /* DM642) is recognized but avoided. */
#if FT_ULONG_MAX == 0xFFFFFFFFUL #if FT_ULONG_MAX == 0xFFFFFFFFUL
#define FT_SIZEOF_LONG (32 / FT_CHAR_BIT) #define FT_SIZEOF_LONG ( 32 / FT_CHAR_BIT )
#elif FT_ULONG_MAX > 0xFFFFFFFFUL && FT_ULONG_MAX == 0xFFFFFFFFFFUL #elif FT_ULONG_MAX > 0xFFFFFFFFUL && FT_ULONG_MAX == 0xFFFFFFFFFFUL
#define FT_SIZEOF_LONG (32 / FT_CHAR_BIT) #define FT_SIZEOF_LONG ( 32 / FT_CHAR_BIT )
#elif FT_ULONG_MAX > 0xFFFFFFFFUL && FT_ULONG_MAX == 0xFFFFFFFFFFFFFFFFUL #elif FT_ULONG_MAX > 0xFFFFFFFFUL && FT_ULONG_MAX == 0xFFFFFFFFFFFFFFFFUL
#define FT_SIZEOF_LONG (64 / FT_CHAR_BIT) #define FT_SIZEOF_LONG ( 64 / FT_CHAR_BIT )
#else #else
#error "Unsupported size of `long' type!" #error "Unsupported size of `long' type!"
#endif #endif
...@@ -236,12 +236,12 @@ FT_BEGIN_HEADER ...@@ -236,12 +236,12 @@ FT_BEGIN_HEADER
#endif #endif
#if FT_SIZEOF_INT == (32 / FT_CHAR_BIT) #if FT_SIZEOF_INT == ( 32 / FT_CHAR_BIT )
typedef signed int FT_Int32; typedef signed int FT_Int32;
typedef unsigned int FT_UInt32; typedef unsigned int FT_UInt32;
#elif FT_SIZEOF_LONG == (32 / FT_CHAR_BIT) #elif FT_SIZEOF_LONG == ( 32 / FT_CHAR_BIT )
typedef signed long FT_Int32; typedef signed long FT_Int32;
typedef unsigned long FT_UInt32; typedef unsigned long FT_UInt32;
...@@ -252,12 +252,12 @@ FT_BEGIN_HEADER ...@@ -252,12 +252,12 @@ FT_BEGIN_HEADER
/* look up an integer type that is at least 32 bits */ /* look up an integer type that is at least 32 bits */
#if FT_SIZEOF_INT >= (32 / FT_CHAR_BIT) #if FT_SIZEOF_INT >= ( 32 / FT_CHAR_BIT )
typedef int FT_Fast; typedef int FT_Fast;
typedef unsigned int FT_UFast; typedef unsigned int FT_UFast;
#elif FT_SIZEOF_LONG >= (32 / FT_CHAR_BIT) #elif FT_SIZEOF_LONG >= ( 32 / FT_CHAR_BIT )
typedef long FT_Fast; typedef long FT_Fast;
typedef unsigned long FT_UFast; typedef unsigned long FT_UFast;
...@@ -267,7 +267,7 @@ FT_BEGIN_HEADER ...@@ -267,7 +267,7 @@ FT_BEGIN_HEADER
/* determine whether we have a 64-bit int type for platforms without */ /* determine whether we have a 64-bit int type for platforms without */
/* Autoconf */ /* Autoconf */
#if FT_SIZEOF_LONG == (64 / FT_CHAR_BIT) #if FT_SIZEOF_LONG == ( 64 / FT_CHAR_BIT )
/* FT_LONG64 must be defined if a 64-bit type is available */ /* FT_LONG64 must be defined if a 64-bit type is available */
#define FT_LONG64 #define FT_LONG64
...@@ -462,7 +462,7 @@ FT_BEGIN_HEADER ...@@ -462,7 +462,7 @@ FT_BEGIN_HEADER
#ifndef FT_EXPORT #ifndef FT_EXPORT
#if defined( _DLL ) #if defined( _DLL )
#define FT_EXPORT( x ) __declspec(dllexport) x #define FT_EXPORT( x ) __declspec( dllexport ) x
#elif defined( __cplusplus ) #elif defined( __cplusplus )
#define FT_EXPORT( x ) extern "C" x #define FT_EXPORT( x ) extern "C" x
#else #else
...@@ -475,7 +475,7 @@ FT_BEGIN_HEADER ...@@ -475,7 +475,7 @@ FT_BEGIN_HEADER
#ifndef FT_EXPORT_DEF #ifndef FT_EXPORT_DEF
#if defined( _DLL ) #if defined( _DLL )
#define FT_EXPORT_DEF( x ) __declspec(dllexport) x #define FT_EXPORT_DEF( x ) __declspec( dllexport ) x
#elif defined( __cplusplus ) #elif defined( __cplusplus )
#define FT_EXPORT_DEF( x ) extern "C" x #define FT_EXPORT_DEF( x ) extern "C" x
#else #else
......
third_party/freetype/include/freetype-custom-config/ftoption.h
View file @ e014fe98
...@@ -75,7 +75,7 @@ FT_BEGIN_HEADER ...@@ -75,7 +75,7 @@ FT_BEGIN_HEADER
/*************************************************************************/ /*************************************************************************/
/*************************************************************************/ /*#***********************************************************************/
/* */ /* */
/* If you enable this configuration option, FreeType recognizes an */ /* If you enable this configuration option, FreeType recognizes an */
/* environment variable called `FREETYPE_PROPERTIES', which can be used */ /* environment variable called `FREETYPE_PROPERTIES', which can be used */
...@@ -755,6 +755,16 @@ FT_BEGIN_HEADER ...@@ -755,6 +755,16 @@ FT_BEGIN_HEADER
#undef T1_CONFIG_OPTION_NO_MM_SUPPORT #undef T1_CONFIG_OPTION_NO_MM_SUPPORT
/*************************************************************************/
/* */
/* T1_CONFIG_OPTION_OLD_ENGINE controls whether the pre-Adobe Type 1 */
/* engine gets compiled into FreeType. If defined, it is possible to */
/* switch between the two engines using the `hinting-engine' property of */
/* the type1 driver module. */
/* */
/* #define T1_CONFIG_OPTION_OLD_ENGINE */
/*************************************************************************/ /*************************************************************************/
/*************************************************************************/ /*************************************************************************/
/**** ****/ /**** ****/
......
third_party/freetype/roll-freetype.sh
View file @ e014fe98
#!/bin/bash #!/bin/bash
REVIEWERS=`paste -s -d, third_party/freetype/OWNERS` && rolldeps() {
roll-dep -r "${REVIEWERS}" "$@" src/third_party/freetype/src/ && STEP="roll-deps" &&
REVIEWERS=`paste -s -d, third_party/freetype/OWNERS` &&
roll-dep -r "${REVIEWERS}" "$@" src/third_party/freetype/src/
}
TMPFILE=`mktemp` && checkmodules() {
git -C third_party/freetype/src/ cat-file blob HEAD@{1}:include/freetype/config/ftoption.h >> ${TMPFILE} && STEP="check modules.cfg: check list of modules and dependencies" &&
git merge-file third_party/freetype/include/freetype-custom-config/ftoption.h ${TMPFILE} third_party/freetype/src/include/freetype/config/ftoption.h && ! git -C third_party/freetype/src/ diff --name-only HEAD@{1} | grep -q modules.cfg
rm ${TMPFILE} && }
git add third_party/freetype/include/freetype-custom-config/ftoption.h &&
TMPFILE=`mktemp` && mergeinclude() {
git -C third_party/freetype/src/ cat-file blob HEAD@{1}:include/freetype/config/ftconfig.h >> ${TMPFILE} && INCLUDE=$1 &&
git merge-file third_party/freetype/include/freetype-custom-config/ftconfig.h ${TMPFILE} third_party/freetype/src/include/freetype/config/ftconfig.h && STEP="merge ${INCLUDE}: check for merge conflicts" &&
rm ${TMPFILE} && TMPFILE=`mktemp` &&
git add third_party/freetype/include/freetype-custom-config/ftconfig.h && git -C third_party/freetype/src/ cat-file blob HEAD@{1}:include/freetype/config/${INCLUDE} >> ${TMPFILE} &&
git merge-file third_party/freetype/include/freetype-custom-config/${INCLUDE} ${TMPFILE} third_party/freetype/src/include/freetype/config/${INCLUDE} &&
rm ${TMPFILE} &&
git add third_party/freetype/include/freetype-custom-config/${INCLUDE}
}
FTVERSION=`git -C third_party/freetype/src/ describe --long` && updatereadme() {
FTCOMMIT=`git -C third_party/freetype/src/ rev-parse HEAD` && STEP="update README.chromium" &&
sed -i "s/^Version: .*\$/Version: ${FTVERSION%-*}/" third_party/freetype/README.chromium && FTVERSION=`git -C third_party/freetype/src/ describe --long` &&
sed -i "s/^Revision: .*\$/Revision: ${FTCOMMIT}/" third_party/freetype/README.chromium && FTCOMMIT=`git -C third_party/freetype/src/ rev-parse HEAD` &&
git add third_party/freetype/README.chromium && sed -i "s/^Version: .*\$/Version: ${FTVERSION%-*}/" third_party/freetype/README.chromium &&
sed -i "s/^Revision: .*\$/Revision: ${FTCOMMIT}/" third_party/freetype/README.chromium &&
git add third_party/freetype/README.chromium
}
git commit --quiet --amend --no-edit && commit() {
STEP="commit" &&
git commit --quiet --amend --no-edit
}
true rolldeps "$@" &&
checkmodules &&
mergeinclude ftoption.h &&
mergeinclude ftconfig.h &&
updatereadme &&
commit &&
true || echo "Failed step ${STEP}" && false
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment