Chromium Code Reviews Chromium Code Reviews
Issue 1413673003:
Update bundled freetype to 2.6.1 (Closed)
Base URL: https://pdfium.googlesource.com/pdfium.git@master| Index: third_party/freetype/include/freetype/config/ftoption.h |
| diff --git a/third_party/freetype/include/config/ftoption.h b/third_party/freetype/include/freetype/config/ftoption.h |
| similarity index 96% |
| rename from third_party/freetype/include/config/ftoption.h |
| rename to third_party/freetype/include/freetype/config/ftoption.h |
| index d5f14d7023d8865ddff9b53bf1b2a78267368cdf..886e64e9bfadcf9a9fa79fec54bd792d308fcf17 100644 |
| --- a/third_party/freetype/include/config/ftoption.h |
| +++ b/third_party/freetype/include/freetype/config/ftoption.h |
| @@ -4,7 +4,7 @@ |
| /* */ |
| /* User-selectable configuration macros (specification only). */ |
| /* */ |
| -/* Copyright 1996-2014 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, */ |
| @@ -38,9 +38,9 @@ FT_BEGIN_HEADER |
| /* library from a single source directory. */ |
| /* */ |
| /* - You can put a copy of this file in your build directory, more */ |
| - /* precisely in `$BUILD/config/ftoption.h', where `$BUILD' is the */ |
| - /* name of a directory that is included _before_ the FreeType include */ |
| - /* path during compilation. */ |
| + /* precisely in `$BUILD/freetype/config/ftoption.h', where `$BUILD' */ |
| + /* is the name of a directory that is included _before_ the FreeType */ |
| + /* include path during compilation. */ |
| /* */ |
| /* The default FreeType Makefiles and Jamfiles use the build */ |
| /* directory `builds/<system>' by default, but you can easily change */ |
| @@ -51,7 +51,7 @@ FT_BEGIN_HEADER |
| /* locate this file during the build. For example, */ |
| /* */ |
| /* #define FT_CONFIG_OPTIONS_H <myftoptions.h> */ |
| - /* #include <config/ftheader.h> */ |
| + /* #include <freetype/config/ftheader.h> */ |
| /* */ |
| /* will use `$BUILD/myftoptions.h' instead of this file for macro */ |
| /* definitions. */ |
| @@ -59,7 +59,7 @@ FT_BEGIN_HEADER |
| /* Note also that you can similarly pre-define the macro */ |
| /* FT_CONFIG_MODULES_H used to locate the file listing of the modules */ |
| /* that are statically linked to the library at compile time. By */ |
| - /* default, this file is <config/ftmodule.h>. */ |
| + /* default, this file is <freetype/config/ftmodule.h>. */ |
| /* */ |
| /* We highly recommend using the third method whenever possible. */ |
| /* */ |
| @@ -92,7 +92,7 @@ FT_BEGIN_HEADER |
| /* This is done to allow FreeType clients to run unmodified, forcing */ |
| /* them to display normal gray-level anti-aliased glyphs. */ |
| /* */ |
| - #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING |
| +#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING |
| /*************************************************************************/ |
| @@ -378,10 +378,6 @@ FT_BEGIN_HEADER |
| /* The size in bytes of the render pool used by the scan-line converter */ |
| /* to do all of its work. */ |
| /* */ |
| - /* This must be greater than 4KByte if you use FreeType to rasterize */ |
| - /* glyphs; otherwise, you may set it to zero to avoid unnecessary */ |
| - /* allocation of the render pool. */ |
| - /* */ |
| #define FT_RENDER_POOL_SIZE 16384L |
| @@ -435,6 +431,8 @@ FT_BEGIN_HEADER |
| /* af_glyph_hints_dump_points */ |
| /* af_glyph_hints_dump_segments */ |
| /* af_glyph_hints_dump_edges */ |
| + /* af_glyph_hints_get_num_segments */ |
| + /* af_glyph_hints_get_segment_offset */ |
| /* */ |
| /* As an argument, they use another global variable: */ |
| /* */ |
| @@ -659,19 +657,6 @@ FT_BEGIN_HEADER |
| /*************************************************************************/ |
| /* */ |
| - /* Define TT_CONFIG_OPTION_INTERPRETER_SWITCH to compile the TrueType */ |
| - /* bytecode interpreter with a huge switch statement, rather than a call */ |
| - /* table. This results in smaller and faster code for a number of */ |
| - /* architectures. */ |
| - /* */ |
| - /* Note however that on some compiler/processor combinations, undefining */ |
| - /* this macro will generate faster, though larger, code. */ |
| - /* */ |
| -#define TT_CONFIG_OPTION_INTERPRETER_SWITCH |
| - |
| - |
| - /*************************************************************************/ |
| - /* */ |
| /* Define TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED to compile the */ |
| /* TrueType glyph loader to use Apple's definition of how to handle */ |
| /* component offsets in composite glyphs. */ |
| @@ -684,7 +669,7 @@ FT_BEGIN_HEADER |
| /* fonts will not have them. */ |
| /* */ |
| /* http://www.microsoft.com/typography/otspec/glyf.htm */ |
| - /* http://fonts.apple.com/TTRefMan/RM06/Chap6glyf.html */ |
| + /* https://developer.apple.com/fonts/TrueType-Reference-Manual/RM06/Chap6glyf.html */ |
| /* */ |
| #undef TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED |
| @@ -835,10 +820,12 @@ FT_BEGIN_HEADER |
| /* grid. To find out the optimal scaling and shifting value, various */ |
| /* parameter combinations are tried and scored. */ |
| /* */ |
| - /* This experimental option is only active if the render mode is */ |
| - /* FT_RENDER_MODE_LIGHT. */ |
| + /* This experimental option is active only if the rendering mode is */ |
| + /* FT_RENDER_MODE_LIGHT; you can switch warping on and off with the */ |
| + /* `warping' property of the auto-hinter (see file `ftautoh.h' for more */ |
| + /* information; by default it is switched off). */ |
| /* */ |
| -/* #define AF_CONFIG_OPTION_USE_WARPER */ |
| +#define AF_CONFIG_OPTION_USE_WARPER |
|
Lei Zhang
2015/11/05 18:29:56
This was commented out before.
Oliver Chang
2015/11/05 18:45:26
Oh, upstream had this commented out too back in 2.
Lei Zhang
2015/11/05 18:50:23
So this is just FT changing their defaults? If we
|
| /* */ |
