diff options
| author | Andrew Weintraub <asweintraub@google.com> | 2018-01-24 23:54:02 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-01-24 23:54:02 +0000 |
| commit | 5a21af6cf90ccb2eb18823130e16666a76d9ecba (patch) | |
| tree | 598d5f94c9d0511328ec8659f10204632c00032c | |
| parent | f9f1a5dd73b918d50bcd3a4b461b87544260b9f8 (diff) | |
| download | pdfium-chromium/3331.tar.xz | |
Put required DEFINE_PS_TABLES define in fx_freetype.cpp where it's used.chromium/3332chromium/3331
This makes things more self-contained since we don't need the define in
the BUILD.gn file.
Change-Id: I27138f409521751f4994e6e9dc3c1a029e679836
Reviewed-on: https://pdfium-review.googlesource.com/23550
Reviewed-by: Lei Zhang <thestig@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
| -rw-r--r-- | BUILD.gn | 3 | ||||
| -rw-r--r-- | core/fxge/freetype/fx_freetype.cpp | 1 |
2 files changed, 2 insertions, 2 deletions
@@ -1083,11 +1083,10 @@ jumbo_static_library("fxge") { ":fxcrt", ] - defines = [ "DEFINE_PS_TABLES" ] if (is_component_build || use_system_freetype) { # ft_adobe_glyph_list is not exported from the Freetype shared library so we # need it defined in component builds and builds using system freetype. - defines += [ "DEFINE_PS_TABLES_DATA" ] + defines = [ "DEFINE_PS_TABLES_DATA" ] } if (pdf_enable_xfa) { diff --git a/core/fxge/freetype/fx_freetype.cpp b/core/fxge/freetype/fx_freetype.cpp index b0f56ab66c..fb1c29a63a 100644 --- a/core/fxge/freetype/fx_freetype.cpp +++ b/core/fxge/freetype/fx_freetype.cpp @@ -6,6 +6,7 @@ #include "core/fxge/fx_freetype.h" +#define DEFINE_PS_TABLES #include "third_party/freetype/include/pstables.h" static int xyq_search_node(char* glyph_name, |