summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLei Zhang <thestig@google.com>2014-12-19 18:26:28 -0800
committerBo Xu <bo_xu@foxitsoftware.com>2014-12-19 19:36:06 -0800
commite1082c90fa84db89810fd596c73db414f5a865d8 (patch)
tree6588a7a6c0f3f2126927bbb4a07777e086fc4aac
parent0b07b3138f0d6b0f9cedf5d1d126366e754729e3 (diff)
downloadpdfium-e1082c90fa84db89810fd596c73db414f5a865d8.tar.xz
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
-rw-r--r--third_party/freetype/include/config/ftmodule.h17
-rw-r--r--third_party/freetype/include/config/ftoption.h12
2 files changed, 23 insertions, 6 deletions
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.
*
diff --git a/third_party/freetype/include/config/ftoption.h b/third_party/freetype/include/config/ftoption.h
index 6fceef7628..d5f14d7023 100644
--- a/third_party/freetype/include/config/ftoption.h
+++ b/third_party/freetype/include/config/ftoption.h
@@ -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
/*************************************************************************/
@@ -336,7 +336,7 @@ FT_BEGIN_HEADER
/* */
/* Note that the `FOND' resource isn't checked. */
/* */
-#define FT_CONFIG_OPTION_MAC_FONTS
+#undef FT_CONFIG_OPTION_MAC_FONTS
/*************************************************************************/
@@ -514,7 +514,7 @@ FT_BEGIN_HEADER
/* embedded bitmaps in all formats using the SFNT module (namely */
/* TrueType & OpenType). */
/* */
-#define TT_CONFIG_OPTION_EMBEDDED_BITMAPS
+#undef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
/*************************************************************************/
@@ -696,7 +696,7 @@ FT_BEGIN_HEADER
/* and avar tables). This has many similarities to Type 1 Multiple */
/* Masters support. */
/* */
-#define TT_CONFIG_OPTION_GX_VAR_SUPPORT
+#undef TT_CONFIG_OPTION_GX_VAR_SUPPORT
/*************************************************************************/
@@ -704,7 +704,7 @@ FT_BEGIN_HEADER
/* Define TT_CONFIG_OPTION_BDF if you want to include support for */
/* an embedded `BDF ' table within SFNT-based bitmap formats. */
/* */
-#define TT_CONFIG_OPTION_BDF
+#undef TT_CONFIG_OPTION_BDF
/*************************************************************************/
@@ -740,7 +740,7 @@ FT_BEGIN_HEADER
/* */
/* The Chinese font MingTiEG-Medium (CNS 11643 character set) needs 256. */
/* */
-#define T1_MAX_CHARSTRINGS_OPERANDS 256
+#define T1_MAX_CHARSTRINGS_OPERANDS 512
/*************************************************************************/