diff options
author | Bo Xu <bo_xu@foxitsoftware.com> | 2014-12-19 14:29:17 -0800 |
---|---|---|
committer | Bo Xu <bo_xu@foxitsoftware.com> | 2014-12-19 15:03:12 -0800 |
commit | 4c764f391a4cfb82c81117cf9f249a8598be1cc5 (patch) | |
tree | 7d0cc6e2db4182a12ecab5f528c9bfccb4b7df6e /core/src/fxge/fx_freetype/include/fxft_ft2build.h | |
parent | d44e39279b08c0954f07283b4fb3e7f3e292e4de (diff) | |
download | pdfium-4c764f391a4cfb82c81117cf9f249a8598be1cc5.tar.xz |
XFA: merge patch from CL 815103002
Update freetype to 2.5.4.
Put freetype into third_party directory, cleaning up header files.
Previously freetype header files are in core/src/fxge/freetype and core/include/thirdparties. There were also multiple fx_freetype.h.
This patch removes the additional Foxit wrapper to make further update easier.
Notice, for original freetype source code, the following files are modified and need to be updated accordingly in future update:
third_party/freetype/include/config/ftmodule.h
third_party/freetype/include/config/ftoption.h
BUG=407341
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/815103002
Diffstat (limited to 'core/src/fxge/fx_freetype/include/fxft_ft2build.h')
-rw-r--r-- | core/src/fxge/fx_freetype/include/fxft_ft2build.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/core/src/fxge/fx_freetype/include/fxft_ft2build.h b/core/src/fxge/fx_freetype/include/fxft_ft2build.h deleted file mode 100644 index f3438d4b24..0000000000 --- a/core/src/fxge/fx_freetype/include/fxft_ft2build.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2014 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef _FXFT_FT2BUILD_H_ -#define _FXFT_FT2BUILD_H_ -#include "../fxft2.5.01/include/ft2build.h" -#endif |