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/fxft2.5.01/include/freetype/internal/services/svgldict.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/fxft2.5.01/include/freetype/internal/services/svgldict.h')
-rw-r--r-- | core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/internal/services/svgldict.h | 88 |
1 files changed, 0 insertions, 88 deletions
diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/internal/services/svgldict.h b/core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/internal/services/svgldict.h deleted file mode 100644 index 9956f74455..0000000000 --- a/core/src/fxge/fx_freetype/fxft2.5.01/include/freetype/internal/services/svgldict.h +++ /dev/null @@ -1,88 +0,0 @@ -/***************************************************************************/ -/* */ -/* svgldict.h */ -/* */ -/* The FreeType glyph dictionary services (specification). */ -/* */ -/* Copyright 2003, 2009, 2012 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. */ -/* */ -/***************************************************************************/ - - -#ifndef __SVGLDICT_H__ -#define __SVGLDICT_H__ - -#include "../ftserv.h" - - -FT_BEGIN_HEADER - - - /* - * A service used to retrieve glyph names, as well as to find the - * index of a given glyph name in a font. - * - */ - -#define FT_SERVICE_ID_GLYPH_DICT "glyph-dict" - - - typedef FT_Error - (*FT_GlyphDict_GetNameFunc)( FT_Face face, - FT_UInt glyph_index, - FT_Pointer buffer, - FT_UInt buffer_max ); - - typedef FT_UInt - (*FT_GlyphDict_NameIndexFunc)( FT_Face face, - FT_String* glyph_name ); - - - FT_DEFINE_SERVICE( GlyphDict ) - { - FT_GlyphDict_GetNameFunc get_name; - FT_GlyphDict_NameIndexFunc name_index; /* optional */ - }; - - -#ifndef FT_CONFIG_OPTION_PIC - -#define FT_DEFINE_SERVICE_GLYPHDICTREC( class_, \ - get_name_, \ - name_index_) \ - static const FT_Service_GlyphDictRec class_ = \ - { \ - get_name_, name_index_ \ - }; - -#else /* FT_CONFIG_OPTION_PIC */ - -#define FT_DEFINE_SERVICE_GLYPHDICTREC( class_, \ - get_name_, \ - name_index_) \ - void \ - FT_Init_Class_ ## class_( FT_Library library, \ - FT_Service_GlyphDictRec* clazz ) \ - { \ - FT_UNUSED( library ); \ - \ - clazz->get_name = get_name_; \ - clazz->name_index = name_index_; \ - } - -#endif /* FT_CONFIG_OPTION_PIC */ - - /* */ - - -FT_END_HEADER - - -#endif /* __SVGLDICT_H__ */ |