From e1082c90fa84db89810fd596c73db414f5a865d8 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 19 Dec 2014 18:26:28 -0800 Subject: XFA: merge patch from CL 789163008 and 815333002 Add the license back to ftmodule.h after the freetype 2.5.4 upgrade. Review URL: https://codereview.chromium.org/815333002 Set the freetype options missing in the recent update. Turn on the FT_CONFIG_OPTION_SUBPIXEL_RENDERING to enable sub-pixel rendering. Also undef some other options to match what they look like before. BUG=444243 R=thestig@chromium.org Review URL: https://codereview.chromium.org/789163008 --- third_party/freetype/include/config/ftmodule.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'third_party/freetype/include/config/ftmodule.h') diff --git a/third_party/freetype/include/config/ftmodule.h b/third_party/freetype/include/config/ftmodule.h index 0d31ce6932..fb255743a7 100644 --- a/third_party/freetype/include/config/ftmodule.h +++ b/third_party/freetype/include/config/ftmodule.h @@ -1,3 +1,20 @@ +/***************************************************************************/ +/* */ +/* ftmodule.h */ +/* */ +/* FreeType modules public interface (specification). */ +/* */ +/* Copyright 1996-2001, 2002, 2003 by */ +/* David Turner, Robert Wilhelm, and 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. */ +/* */ +/***************************************************************************/ + /* * This file registers the FreeType modules compiled into the library. * -- cgit v1.2.3