[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 doc/fontconfig-devel.sgml |    2 +-
 doc/fontconfig-user.sgml  |    2 +-
 fontconfig/fontconfig.h   |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 55ff8419274fd5ce59675f220b85035a3986d6cf
Author: Akira TAGOH <akira at tagoh.org>
Date:   Tue May 12 14:47:38 2015 +0900

    Make FC_SCALE deprecated
    
    Use FC_MATRIX instead.
    
    https://bugs.freedesktop.org/show_bug.cgi?id=90257

diff --git a/doc/fontconfig-devel.sgml b/doc/fontconfig-devel.sgml
index 0fa4605..17402c7 100644
--- a/doc/fontconfig-devel.sgml
+++ b/doc/fontconfig-devel.sgml
@@ -176,7 +176,7 @@ convenience for the application's rendering mechanism.
     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
-                                                  conversions
+                                                  conversions (deprecated)
     color          FC_COLOR               Bool    Whether any glyphs have color
     dpi            FC_DPI                 Double  Target dots per inch
     rgba           FC_RGBA                Int     unknown, rgb, bgr, vrgb,
diff --git a/doc/fontconfig-user.sgml b/doc/fontconfig-user.sgml
index 5803929..e7cdb2e 100644
--- a/doc/fontconfig-user.sgml
+++ b/doc/fontconfig-user.sgml
@@ -120,7 +120,7 @@ convenience for the applications' rendering mechanism.
   outline         Bool    Whether the glyphs are outlines
   scalable        Bool    Whether glyphs can be scaled
   color           Bool    Whether any glyphs have color
-  scale           Double  Scale factor for point->pixel conversions
+  scale           Double  Scale factor for point->pixel conversions (deprecated)
   dpi             Double  Target dots per inch
   rgba            Int     unknown, rgb, bgr, vrgb, vbgr,
                           none - subpixel geometry
diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index b14c961..58b6b51 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -95,7 +95,7 @@ typedef int		FcBool;
 #define FC_OUTLINE	    "outline"		/* Bool */
 #define FC_SCALABLE	    "scalable"		/* Bool */
 #define FC_COLOR	    "color"		/* Bool */
-#define FC_SCALE	    "scale"		/* double */
+#define FC_SCALE	    "scale"		/* double (deprecated) */
 #define FC_DPI		    "dpi"		/* double */
 #define FC_RGBA		    "rgba"		/* Int */
 #define FC_MINSPACE	    "minspace"		/* Bool use minimum line spacing */