[Fontconfig] fontconfig: Branch 'master' - 3 commits

[Behdad Esfahbod]

 src/fcfreetype.c |    6 ++++--
 src/fclang.c     |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 8b2910319610c90dcba021788b0739cf627c3ade
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Aug 4 14:22:30 2017 +0100

    Fix warning

diff --git a/src/fclang.c b/src/fclang.c
index 1eee8ef..fc0620c 100644
--- a/src/fclang.c
+++ b/src/fclang.c
@@ -351,7 +351,7 @@ FcLangCompare (const FcChar8 *s1, const FcChar8 *s2)
 {
     FcChar8	    c1, c2;
     FcLangResult    result = FcLangDifferentLang;
-    FcChar8	   *s1_orig = s1;
+    const FcChar8  *s1_orig = s1;
     FcBool	    is_und;
 
     is_und = FcToLower (s1[0]) == 'u' &&
commit 484cb300eadf54a1e2248f8bd4e7717d6d3f7d31
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Aug 4 14:13:56 2017 +0100

    Fix sign-difference compare warning

diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index 2363baf..724f275 100644
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -1164,7 +1164,6 @@ FcFreeTypeQueryFace (const FT_Face  face,
     int		    weight = -1;
     int		    width = -1;
     FcBool	    decorative = FcFalse;
-    int		    i;
     FcCharSet	    *cs;
     FcLangSet	    *ls;
 #if 0
@@ -1529,6 +1528,7 @@ FcFreeTypeQueryFace (const FT_Face  face,
     tmp = FT_Get_Postscript_Name (face);
     if (!tmp)
     {
+	unsigned int i;
 	FcChar8 *family, *familylang = NULL;
 	size_t len;
 	int n = 0;
@@ -1606,6 +1606,7 @@ FcFreeTypeQueryFace (const FT_Face  face,
 
     if (os2 && os2->version >= 0x0001 && os2->version != 0xffff)
     {
+	unsigned int i;
 	for (i = 0; i < NUM_CODE_PAGE_RANGE; i++)
 	{
 	    FT_ULong	bits;
@@ -1920,6 +1921,7 @@ FcFreeTypeQueryFace (const FT_Face  face,
 
     if (!(face->face_flags & FT_FACE_FLAG_SCALABLE))
     {
+	int i;
 	for (i = 0; i < face->num_fixed_sizes; i++)
 	    if (!FcPatternAddDouble (pat, FC_PIXEL_SIZE,
 				     FcGetPixelSize (face, i)))
commit 9bb36b42c9df42fb813d5fb3387d515667e859e0
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Aug 3 17:52:28 2017 +0100

    Minor

diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index b4d926d..2363baf 100644
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -1274,7 +1274,7 @@ FcFreeTypeQueryFace (const FT_Face  face,
     /*
      * Get the OS/2 table
      */
-    os2 = (TT_OS2 *) FT_Get_Sfnt_Table (face, ft_sfnt_os2);
+    os2 = (TT_OS2 *) FT_Get_Sfnt_Table (face, FT_SFNT_OS2);
 
     /*
      * Look first in the OS/2 table for the foundry, if