summaryrefslogtreecommitdiffstats
path: root/include/ftglyph.h
diff options
context:
space:
mode:
authorMakoto Onuki <omakoto@google.com>2015-06-09 16:35:08 -0700
committerAbhisek Devkota <ciwrl@cyanogenmod.com>2015-08-19 11:42:11 -0700
commita3a6685e80688af254c5c23a62a2f3b0bcef5e5f (patch)
tree7e67208cafc4572557e8d10469fb5dc173ca2edf /include/ftglyph.h
parent6bb07037be23a1523b3af5b1be5432bd4ccf22b7 (diff)
downloadandroid_external_freetype-a3a6685e80688af254c5c23a62a2f3b0bcef5e5f.tar.gz
android_external_freetype-a3a6685e80688af254c5c23a62a2f3b0bcef5e5f.tar.bz2
android_external_freetype-a3a6685e80688af254c5c23a62a2f3b0bcef5e5f.zip
Update to freetype 2.6.0stable/cm-11.0-XNG3C
Bug 18751561 RM-154 Change-Id: Ia8c081f8fd38a1f78c72d30234c5ace8cfffe6a9 (cherry picked from commit c341565733345bef8ebe68db3c175301afe4ec97)
Diffstat (limited to 'include/ftglyph.h')
-rw-r--r--include/ftglyph.h21
1 files changed, 3 insertions, 18 deletions
diff --git a/include/ftglyph.h b/include/ftglyph.h
index 2d30ed9..803ad39 100644
--- a/include/ftglyph.h
+++ b/include/ftglyph.h
@@ -4,7 +4,7 @@
/* */
/* FreeType convenience functions to handle glyphs (specification). */
/* */
-/* Copyright 1996-2003, 2006, 2008, 2009, 2011, 2013 by */
+/* Copyright 1996-2015 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -325,22 +325,8 @@ FT_BEGIN_HEADER
} FT_Glyph_BBox_Mode;
- /*************************************************************************/
- /* */
- /* <Enum> */
- /* ft_glyph_bbox_xxx */
- /* */
- /* <Description> */
- /* These constants are deprecated. Use the corresponding */
- /* @FT_Glyph_BBox_Mode values instead. */
- /* */
- /* <Values> */
- /* ft_glyph_bbox_unscaled :: See @FT_GLYPH_BBOX_UNSCALED. */
- /* ft_glyph_bbox_subpixels :: See @FT_GLYPH_BBOX_SUBPIXELS. */
- /* ft_glyph_bbox_gridfit :: See @FT_GLYPH_BBOX_GRIDFIT. */
- /* ft_glyph_bbox_truncate :: See @FT_GLYPH_BBOX_TRUNCATE. */
- /* ft_glyph_bbox_pixels :: See @FT_GLYPH_BBOX_PIXELS. */
- /* */
+ /* these constants are deprecated; use the corresponding */
+ /* `FT_Glyph_BBox_Mode' values instead */
#define ft_glyph_bbox_unscaled FT_GLYPH_BBOX_UNSCALED
#define ft_glyph_bbox_subpixels FT_GLYPH_BBOX_SUBPIXELS
#define ft_glyph_bbox_gridfit FT_GLYPH_BBOX_GRIDFIT
@@ -603,7 +589,6 @@ FT_BEGIN_HEADER
FT_EXPORT( FT_Error )
FT_Matrix_Invert( FT_Matrix* matrix );
-
/* */