Merge remote-tracking branch 'origin/released'

Conflicts:
	libXfont/src/fontfile/fontfile.c
	libXfont/src/util/utilbitmap.c

4 files changed, 12 insertions, 10 deletions

diff --git a/libXfont/src/FreeType/Makefile.in b/libXfont/src/FreeType/Makefile.in
index f185aca7f..9c0e25006 100644
--- a/libXfont/src/FreeType/Makefile.in
+++ b/libXfont/src/FreeType/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/libXfont/src/FreeType/ftfuncs.c b/libXfont/src/FreeType/ftfuncs.c
index f8b01835c..3dd8eb946 100644
--- a/libXfont/src/FreeType/ftfuncs.c
+++ b/libXfont/src/FreeType/ftfuncs.c
@@ -1073,6 +1073,8 @@ FT_Do_SBit_Metrics( FT_Face ft_face, FT_Size ft_size, FT_ULong strike_index,
 #endif
 }
 
+#pragma GCC diagnostic ignored "-Wbad-function-cast"
+
 int
 FreeTypeRasteriseGlyph(unsigned idx, int flags, CharInfoPtr tgp,
 		       FTInstancePtr instance, int hasMetrics)
diff --git a/libXfont/src/FreeType/ftfuncs.h b/libXfont/src/FreeType/ftfuncs.h
index 068a59523..6545dfabd 100644
--- a/libXfont/src/FreeType/ftfuncs.h
+++ b/libXfont/src/FreeType/ftfuncs.h
@@ -158,7 +158,7 @@ typedef struct _FTFont{
 
 static int FreeTypeOpenFace(FTFacePtr *facep, char *FTFileName, char *realFileName, int faceNumber);
 static void FreeTypeFreeFace(FTFacePtr face);
-static int 
+static int
 FreeTypeOpenInstance(FTInstancePtr *instancep, FTFacePtr face,
                      char *FTFileName, FTNormalisedTransformationPtr trans,
                      int spacing, FontBitmapFormatPtr bmfmt,
@@ -169,20 +169,20 @@ FreeTypeInstanceGetGlyph(unsigned idx, int flags, CharInfoPtr *g, FTInstancePtr
 static int
 FreeTypeInstanceGetGlyphMetrics(unsigned idx, int flags,
 				xCharInfo **metrics, FTInstancePtr instance );
-static int 
-FreeTypeRasteriseGlyph(unsigned idx, int flags, CharInfoPtr tgp, 
+static int
+FreeTypeRasteriseGlyph(unsigned idx, int flags, CharInfoPtr tgp,
 		       FTInstancePtr instance, int hasMetrics );
 static void FreeTypeFreeFont(FTFontPtr font);
 static void FreeTypeFreeXFont(FontPtr pFont, int freeProps);
 static void FreeTypeUnloadXFont(FontPtr pFont);
 static int
-FreeTypeAddProperties(FTFontPtr font, FontScalablePtr vals, FontInfoPtr info, 
+FreeTypeAddProperties(FTFontPtr font, FontScalablePtr vals, FontInfoPtr info,
                       char *fontname, int rawAverageWidth, Bool font_properties);
 static int FreeTypeFontGetGlyph(unsigned code, int flags, CharInfoPtr *g, FTFontPtr font);
 static int
 FreeTypeLoadFont(FTFontPtr font, FontInfoPtr info, FTFacePtr face,
 		 char *FTFileName, FontScalablePtr vals, FontEntryPtr entry,
-                 FontBitmapFormatPtr bmfmt, FT_Int32 load_flags, 
+                 FontBitmapFormatPtr bmfmt, FT_Int32 load_flags,
 		 struct TTCapInfo *tmp_ttcap, char *dynStrTTCapCodeRange,
 		 int ttcap_spacing );
 
diff --git a/libXfont/src/FreeType/fttools.c b/libXfont/src/FreeType/fttools.c
index a0e34d021..a85d3ee72 100644
--- a/libXfont/src/FreeType/fttools.c
+++ b/libXfont/src/FreeType/fttools.c
@@ -119,17 +119,17 @@ FTGetName(FT_Face face, int nid, int pid, int eid, FT_SfntName *name_return)
     return 0;
 }
 
-int 
+int
 FTGetEnglishName(FT_Face face, int nid, char *name_return, int name_len)
 {
     FT_SfntName name;
     int len;
 
-    if(FTGetName(face, nid, 
+    if(FTGetName(face, nid,
                  TT_PLATFORM_MICROSOFT, TT_MS_ID_UNICODE_CS, &name) ||
-       FTGetName(face, nid, 
+       FTGetName(face, nid,
                  TT_PLATFORM_APPLE_UNICODE, -1, &name))
-        return FTu2a(name.string_len, name.string, name_return, 
+        return FTu2a(name.string_len, name.string, name_return,
                      MSBFirst, name_len);
 
     /* Pretend that Apple Roman is ISO 8859-1. */