diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-11 11:15:52 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-11 11:15:52 +0200 |
| commit | 1de316b38f589817344e1a342050de4c427501df (patch) | |
| tree | de3ec426a2a640a021b17ea55da8d71a07a8a412 /fontconfig | |
| parent | 41665774749bc54dcd635ebbaab045a4350d5b2f (diff) | |
| parent | a7d3f63ee5e292379ed6d6eba0c65512205a4786 (diff) | |
| download | vcxsrv-1de316b38f589817344e1a342050de4c427501df.tar.gz vcxsrv-1de316b38f589817344e1a342050de4c427501df.tar.bz2 vcxsrv-1de316b38f589817344e1a342050de4c427501df.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa pixman git update 11 Sep 2013
Conflicts:
pixman/pixman/pixman-sse2.c
Diffstat (limited to 'fontconfig')
| -rw-r--r-- | fontconfig/doc/fontconfig-devel.sgml | 2 | ||||
| -rw-r--r-- | fontconfig/doc/fontconfig-user.sgml | 2 | ||||
| -rw-r--r-- | fontconfig/fontconfig/fontconfig.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/fontconfig/doc/fontconfig-devel.sgml b/fontconfig/doc/fontconfig-devel.sgml index a7b853021..7306d7924 100644 --- a/fontconfig/doc/fontconfig-devel.sgml +++ b/fontconfig/doc/fontconfig-devel.sgml @@ -170,7 +170,7 @@ convenience for the application's rendering mechanism. the file ftface FC_FT_FACE FT_Face Use the specified FreeType face object - rasterizer FC_RASTERIZER String Which rasterizer is in use + rasterizer FC_RASTERIZER String Which rasterizer is in use (deprecated) outline FC_OUTLINE Bool Whether the glyphs are outlines scalable FC_SCALABLE Bool Whether glyphs can be scaled scale FC_SCALE Double Scale factor for point->pixel diff --git a/fontconfig/doc/fontconfig-user.sgml b/fontconfig/doc/fontconfig-user.sgml index eeff69add..775d1f725 100644 --- a/fontconfig/doc/fontconfig-user.sgml +++ b/fontconfig/doc/fontconfig-user.sgml @@ -116,7 +116,7 @@ convenience for the applications' rendering mechanism. file String The filename holding the font index Int The index of the font within the file ftface FT_Face Use the specified FreeType face object - rasterizer String Which rasterizer is in use + rasterizer String Which rasterizer is in use (deprecated) outline Bool Whether the glyphs are outlines scalable Bool Whether glyphs can be scaled scale Double Scale factor for point->pixel conversions diff --git a/fontconfig/fontconfig/fontconfig.h b/fontconfig/fontconfig/fontconfig.h index 079177d4c..58912f572 100644 --- a/fontconfig/fontconfig/fontconfig.h +++ b/fontconfig/fontconfig/fontconfig.h @@ -91,7 +91,7 @@ typedef int FcBool; #define FC_FILE "file" /* String */ #define FC_INDEX "index" /* Int */ #define FC_FT_FACE "ftface" /* FT_Face */ -#define FC_RASTERIZER "rasterizer" /* String */ +#define FC_RASTERIZER "rasterizer" /* String (deprecated) */ #define FC_OUTLINE "outline" /* Bool */ #define FC_SCALABLE "scalable" /* Bool */ #define FC_SCALE "scale" /* double */ |