From dba44cd4e5754b579f2184a864ffe7b79b0a7e56 Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Mon, 2 Nov 2015 07:10:28 +0400 Subject: Update bundled FreeType to 2.6.1 Change-Id: Ic489f8aa8ad42da3922f542e6c9064afe44f3799 Reviewed-by: Friedemann Kleint Reviewed-by: Lars Knoll --- src/3rdparty/freetype/src/tools/afblue.pl | 2 +- src/3rdparty/freetype/src/tools/apinames.c | 6 +- src/3rdparty/freetype/src/tools/chktrcmp.py | 2 +- .../freetype/src/tools/docmaker/content.py | 9 +- .../freetype/src/tools/docmaker/docmaker.py | 2 +- .../freetype/src/tools/docmaker/formatter.py | 2 +- .../freetype/src/tools/docmaker/sources.py | 9 +- src/3rdparty/freetype/src/tools/docmaker/tohtml.py | 2 +- src/3rdparty/freetype/src/tools/docmaker/utils.py | 4 +- src/3rdparty/freetype/src/tools/glnames.py | 6 +- src/3rdparty/freetype/src/tools/no-copyright | 61 ++++++++++ src/3rdparty/freetype/src/tools/test_afm.c | 2 +- src/3rdparty/freetype/src/tools/update-copyright | 14 +++ .../freetype/src/tools/update-copyright-year | 135 +++++++++++++++++++++ 14 files changed, 234 insertions(+), 22 deletions(-) create mode 100644 src/3rdparty/freetype/src/tools/no-copyright create mode 100644 src/3rdparty/freetype/src/tools/update-copyright create mode 100644 src/3rdparty/freetype/src/tools/update-copyright-year (limited to 'src/3rdparty/freetype/src/tools') diff --git a/src/3rdparty/freetype/src/tools/afblue.pl b/src/3rdparty/freetype/src/tools/afblue.pl index 60fe6966a8..56b6452348 100644 --- a/src/3rdparty/freetype/src/tools/afblue.pl +++ b/src/3rdparty/freetype/src/tools/afblue.pl @@ -5,7 +5,7 @@ # # Process a blue zone character data file. # -# Copyright 2013, 2014 by +# Copyright 2013-2015 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, diff --git a/src/3rdparty/freetype/src/tools/apinames.c b/src/3rdparty/freetype/src/tools/apinames.c index c85df721a0..9f81b1a6c7 100644 --- a/src/3rdparty/freetype/src/tools/apinames.c +++ b/src/3rdparty/freetype/src/tools/apinames.c @@ -10,7 +10,7 @@ * accepted if you are using GCC for compilation (and probably by * other compilers too). * - * Author: David Turner, 2005, 2006, 2008-2013 + * Author: David Turner, 2005, 2006, 2008-2013, 2015 * * This code is explicitly placed into the public domain. * @@ -156,6 +156,7 @@ names_dump( FILE* out, case OUTPUT_WATCOM_LBC: { const char* dot; + char temp[512]; if ( dll_name == NULL ) @@ -169,8 +170,7 @@ names_dump( FILE* out, dot = strchr( dll_name, '.' ); if ( dot != NULL ) { - char temp[512]; - int len = dot - dll_name; + int len = dot - dll_name; if ( len > (int)( sizeof ( temp ) - 1 ) ) diff --git a/src/3rdparty/freetype/src/tools/chktrcmp.py b/src/3rdparty/freetype/src/tools/chktrcmp.py index ce6500c7e2..4c40bdafdb 100644 --- a/src/3rdparty/freetype/src/tools/chktrcmp.py +++ b/src/3rdparty/freetype/src/tools/chktrcmp.py @@ -15,7 +15,7 @@ USED_COMPONENT = {} KNOWN_COMPONENT = {} SRC_FILE_DIRS = [ "src" ] -TRACE_DEF_FILES = [ "include/internal/fttrace.h" ] +TRACE_DEF_FILES = [ "include/freetype/internal/fttrace.h" ] # -------------------------------------------------------------- diff --git a/src/3rdparty/freetype/src/tools/docmaker/content.py b/src/3rdparty/freetype/src/tools/docmaker/content.py index adea6f1d70..1961878a7d 100644 --- a/src/3rdparty/freetype/src/tools/docmaker/content.py +++ b/src/3rdparty/freetype/src/tools/docmaker/content.py @@ -3,7 +3,7 @@ # # Parse comment blocks to build content blocks (library file). # -# Copyright 2002, 2004, 2006-2009, 2012-2014 by +# Copyright 2002-2015 by # David Turner. # # This file is part of the FreeType project, and may only be used, @@ -53,9 +53,10 @@ re_identifier = re.compile( r'((?:\w|-)*)' ) # # We collect macro names ending in `_H' (group 1), as defined in -# `config/ftheader.h'. While outputting the object data, we use this info -# together with the object's file location (group 2) to emit the appropriate -# header file macro and its associated file name before the object itself. +# `freetype/config/ftheader.h'. While outputting the object data, we use +# this info together with the object's file location (group 2) to emit the +# appropriate header file macro and its associated file name before the +# object itself. # # Example: # diff --git a/src/3rdparty/freetype/src/tools/docmaker/docmaker.py b/src/3rdparty/freetype/src/tools/docmaker/docmaker.py index 4fb1abf235..de82d930f5 100644 --- a/src/3rdparty/freetype/src/tools/docmaker/docmaker.py +++ b/src/3rdparty/freetype/src/tools/docmaker/docmaker.py @@ -4,7 +4,7 @@ # # Convert source code markup to HTML documentation. # -# Copyright 2002, 2004, 2008, 2013, 2014 by +# Copyright 2002-2015 by # David Turner. # # This file is part of the FreeType project, and may only be used, diff --git a/src/3rdparty/freetype/src/tools/docmaker/formatter.py b/src/3rdparty/freetype/src/tools/docmaker/formatter.py index 7152c019d7..f0a8808c47 100644 --- a/src/3rdparty/freetype/src/tools/docmaker/formatter.py +++ b/src/3rdparty/freetype/src/tools/docmaker/formatter.py @@ -3,7 +3,7 @@ # # Convert parsed content blocks to a structured document (library file). # -# Copyright 2002, 2004, 2007, 2008, 2014 by +# Copyright 2002-2015 by # David Turner. # # This file is part of the FreeType project, and may only be used, diff --git a/src/3rdparty/freetype/src/tools/docmaker/sources.py b/src/3rdparty/freetype/src/tools/docmaker/sources.py index 61ecc22c40..be38132d1d 100644 --- a/src/3rdparty/freetype/src/tools/docmaker/sources.py +++ b/src/3rdparty/freetype/src/tools/docmaker/sources.py @@ -3,7 +3,7 @@ # # Convert source code comments to multi-line blocks (library file). # -# Copyright 2002-2004, 2006-2009, 2012-2014 by +# Copyright 2002-2015 by # David Turner. # # This file is part of the FreeType project, and may only be used, @@ -150,10 +150,11 @@ re_crossref = re.compile( r'@((?:\w|-)*)(.*)' ) # @foo # Group 1 is the markup, group 2 the rest of the line. # # Note that the markup is limited to words consisting of letters, digits, -# the character `_', or an apostrophe (but not as the first character). +# the characters `_' and `-', or an apostrophe (but not as the first +# character). # -re_italic = re.compile( r"_(\w(?:\w|')*)_(.*)" ) # _italic_ -re_bold = re.compile( r"\*(\w(?:\w|')*)\*(.*)" ) # *bold* +re_italic = re.compile( r"_((?:\w|-)(?:\w|'|-)*)_(.*)" ) # _italic_ +re_bold = re.compile( r"\*((?:\w|-)(?:\w|'|-)*)\*(.*)" ) # *bold* # # This regular expression code to identify an URL has been taken from diff --git a/src/3rdparty/freetype/src/tools/docmaker/tohtml.py b/src/3rdparty/freetype/src/tools/docmaker/tohtml.py index 05fc08a92d..bc6bcf0511 100644 --- a/src/3rdparty/freetype/src/tools/docmaker/tohtml.py +++ b/src/3rdparty/freetype/src/tools/docmaker/tohtml.py @@ -3,7 +3,7 @@ # # A sub-class container of the `Formatter' class to produce HTML. # -# Copyright 2002, 2003, 2005-2008, 2013, 2014 by +# Copyright 2002-2015 by # David Turner. # # This file is part of the FreeType project, and may only be used, diff --git a/src/3rdparty/freetype/src/tools/docmaker/utils.py b/src/3rdparty/freetype/src/tools/docmaker/utils.py index b35823ab74..254083e92e 100644 --- a/src/3rdparty/freetype/src/tools/docmaker/utils.py +++ b/src/3rdparty/freetype/src/tools/docmaker/utils.py @@ -3,7 +3,7 @@ # # Auxiliary functions for the `docmaker' tool (library file). # -# Copyright 2002, 2004, 2007, 2008, 2014 by +# Copyright 2002-2015 by # David Turner. # # This file is part of the FreeType project, and may only be used, @@ -79,7 +79,7 @@ def check_output(): if not os.path.isdir( output_dir ): sys.stderr.write( "argument" + " '" + output_dir + "' " - + "is not a valid directory" ) + + "is not a valid directory\n" ) sys.exit( 2 ) else: output_dir = None diff --git a/src/3rdparty/freetype/src/tools/glnames.py b/src/3rdparty/freetype/src/tools/glnames.py index 8810bf57f1..0ad554c72d 100644 --- a/src/3rdparty/freetype/src/tools/glnames.py +++ b/src/3rdparty/freetype/src/tools/glnames.py @@ -6,7 +6,7 @@ # -# Copyright 1996-2000, 2003, 2005, 2007, 2008, 2011 by +# Copyright 1996-2015 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -35,7 +35,7 @@ import sys, string, struct, re, os.path # # See # -# http://fonts.apple.com/TTRefMan/RM06/Chap6post.html +# https://developer.apple.com/fonts/TrueType-Reference-Manual/RM06/Chap6post.html # # for the official list. # @@ -5267,7 +5267,7 @@ def main(): write( "/* */\n" ) write( "/* PostScript glyph names. */\n" ) write( "/* */\n" ) - write( "/* Copyright 2005, 2008, 2011 by */\n" ) + write( "/* Copyright 2005-2015 by */\n" ) write( "/* David Turner, Robert Wilhelm, and Werner Lemberg. */\n" ) write( "/* */\n" ) write( "/* This file is part of the FreeType project, and may only be used, */\n" ) diff --git a/src/3rdparty/freetype/src/tools/no-copyright b/src/3rdparty/freetype/src/tools/no-copyright new file mode 100644 index 0000000000..5011e3fb62 --- /dev/null +++ b/src/3rdparty/freetype/src/tools/no-copyright @@ -0,0 +1,61 @@ +# Files that don't get a copyright, or which are taken from elsewhere. +# +# All lines in this file are patterns, including the comment lines; this +# means that e.g. `FTL.TXT' matches all files that have this string in +# the file name (including the path relative to the current directory, +# always starting with `./'). +# +# Don't put empty lines into this file! +# +.gitignore +# +builds/unix/pkg.m4 +# +docs/FTL.TXT +docs/GPLv2.TXT +# +src/base/md5.c +src/base/md5.h +# +src/bdf/bdf.c +src/bdf/bdf.h +src/bdf/bdfdrivr.c +src/bdf/bdfdrivr.h +src/bdf/bdferror.h +src/bdf/bdflib.c +src/bdf/module.mk +src/bdf/README +src/bdf/rules.mk +# +src/pcf/module.mk +src/pcf/pcf.c +src/pcf/pcf.h +src/pcf/pcfdrivr.c +src/pcf/pcfdrivr.h +src/pcf/pcferror.h +src/pcf/pcfread.c +src/pcf/pcfread.h +src/pcf/pcfutil.c +src/pcf/pcfutil.h +src/pcf/README +src/pcf/rules.mk +# +src/gzip/adler32.c +src/gzip/infblock.c +src/gzip/infblock.h +src/gzip/infcodes.c +src/gzip/infcodes.h +src/gzip/inffixed.h +src/gzip/inflate.c +src/gzip/inftrees.c +src/gzip/inftrees.h +src/gzip/infutil.c +src/gzip/infutil.h +src/gzip/zconf.h +src/gzip/zlib.h +src/gzip/zutil.c +src/gzip/zutil.h +# +src/tools/ftrandom/ftrandom.c +# +# EOF diff --git a/src/3rdparty/freetype/src/tools/test_afm.c b/src/3rdparty/freetype/src/tools/test_afm.c index 24cd0c4f0e..8de619bb03 100644 --- a/src/3rdparty/freetype/src/tools/test_afm.c +++ b/src/3rdparty/freetype/src/tools/test_afm.c @@ -9,7 +9,7 @@ void dump_fontinfo( AFM_FontInfo fi ) { - FT_Int i; + FT_UInt i; printf( "This AFM is for %sCID font.\n\n", diff --git a/src/3rdparty/freetype/src/tools/update-copyright b/src/3rdparty/freetype/src/tools/update-copyright new file mode 100644 index 0000000000..4a8bf9b0ea --- /dev/null +++ b/src/3rdparty/freetype/src/tools/update-copyright @@ -0,0 +1,14 @@ +#!/bin/sh + +# Run the `update-copyright-year' script on all files in the git repository, +# taking care of exceptions stored in file `no-copyright'. + +topdir=`git rev-parse --show-toplevel` +toolsdir=$topdir/src/tools + +git ls-files --full-name $topdir \ +| sed 's|^|../../|' \ +| grep -vFf $toolsdir/no-copyright \ +| xargs $toolsdir/update-copyright-year + +# EOF diff --git a/src/3rdparty/freetype/src/tools/update-copyright-year b/src/3rdparty/freetype/src/tools/update-copyright-year new file mode 100644 index 0000000000..107754183d --- /dev/null +++ b/src/3rdparty/freetype/src/tools/update-copyright-year @@ -0,0 +1,135 @@ +eval '(exit $?0)' && eval 'exec perl -wS -i "$0" ${1+"$@"}' + & eval 'exec perl -wS -i "$0" $argv:q' + if 0; + +# Copyright 2015 by +# Werner Lemberg. +# +# This file is part of the FreeType project, and may only be used, modified, +# and distributed under the terms of the FreeType project license, +# LICENSE.TXT. By continuing to use, modify, or distribute this file you +# indicate that you have read the license and understand and accept it +# fully. + +# [Note: This script is expected to be called by the shell, which in turn +# calls perl automatically. The nifty start-up code above is based on +# gnulib's `update-copyright' script; it is a more portable replacement for +# the shebang, using the first `perl' program in the shell's path instead.] + +# Usage: +# +# update-copyright-year file1 [file2 ...] + + +# This script handles copyright entries like +# +# Copyright 2000 by +# foobar +# +# or +# +# /* Copyright 2000, 2001, 2004-2007 by */ +# /* foobar */ +# +# and replaces them uniformly with +# +# Copyright 2000-2015 +# foobar +# +# and +# +# /* Copyright 2000-2015 by */ +# /* foobar */ +# +# (assuming that the current year is 2015). As can be seen, the line length +# is retained if there is non-whitespace after the word `by' on the same +# line. + +use strict; + + +my (undef, undef, undef, + undef, undef, $year, + undef, undef, undef) = localtime(time); +$year += 1900; + +my $replaced = 0; + + +# Loop over all input files; option `-i' (issued at the very beginning of +# this script) makes perl edit them in-place. +while (<>) +{ + # Only handle the first copyright notice in a file. + if (!$replaced) + { + # First try: Search multiple copyright years. + s { + (?.*) + Copyright + (?\ +) + (?[12][0-9][0-9][0-9]) + (?.+) + (?[12][0-9][0-9][0-9]) + (?\ +) + by + (?\ *) + (?.*) + } + { + # Fill line to the same length (if appropriate); we skip the middle + # part but insert two spaces and `-'. + my $space = length($+{space1}) - 1 + + length($+{middle}) - 1 + + length($+{space2}) - 1 + + length($+{space3}); + + print "$+{begin}"; + print "Copyright\ $+{first}-$year\ by"; + print ' ' x $space if length($+{end}); + print "$+{end}\n"; + $replaced = 1; + }ex + || + # Second try: Search a single copyright year. + s { + (?.*) + Copyright + (?\ +) + (?[12][0-9][0-9][0-9]) + (?\ +) + by + (?\ *) + (?.*) + } + { + # Fill line to the same length (if appropriate); we insert two + # spaces, a `-', and the current year. + my $space = length($+{space1}) - 1 + + length($+{space2}) - 1 + + length($+{space3}) + - (length($year) + 1); + + print "$+{begin}"; + print "Copyright $+{first}-$year by"; + # If $space is negative this inserts nothing. + print ' ' x $space if length($+{end}); + print "$+{end}\n"; + $replaced = 1; + }ex + || + # Otherwise print line unaltered. + print; + } + else + { + print; + } +} +continue +{ + # Reset $replaced before processing the next file. + $replaced = 0 if eof; +} + +# EOF -- cgit v1.2.3