aboutsummaryrefslogtreecommitdiff
path: root/fontconfig/src
diff options
context:
space:
mode:
Diffstat (limited to 'fontconfig/src')
-rw-r--r--fontconfig/src/fcdefault.c1
-rw-r--r--fontconfig/src/fcint.h2
-rw-r--r--fontconfig/src/fcname.c4
-rw-r--r--fontconfig/src/fcxml.c6
4 files changed, 7 insertions, 6 deletions
diff --git a/fontconfig/src/fcdefault.c b/fontconfig/src/fcdefault.c
index c6b5669ed..8ad1b1e90 100644
--- a/fontconfig/src/fcdefault.c
+++ b/fontconfig/src/fcdefault.c
@@ -32,6 +32,7 @@ static const struct {
{ FC_HINTING_OBJECT, FcTrue }, /* !FT_LOAD_NO_HINTING */
{ FC_VERTICAL_LAYOUT_OBJECT, FcFalse }, /* FC_LOAD_VERTICAL_LAYOUT */
{ FC_AUTOHINT_OBJECT, FcFalse }, /* FC_LOAD_FORCE_AUTOHINT */
+ /* XXX: FC_GLOBAL_ADVANCE is deprecated */
{ FC_GLOBAL_ADVANCE_OBJECT, FcTrue }, /* !FC_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH */
{ FC_EMBEDDED_BITMAP_OBJECT, FcTrue }, /* !FC_LOAD_NO_BITMAP */
{ FC_DECORATIVE_OBJECT, FcFalse },
diff --git a/fontconfig/src/fcint.h b/fontconfig/src/fcint.h
index 93f0f2730..0444ea926 100644
--- a/fontconfig/src/fcint.h
+++ b/fontconfig/src/fcint.h
@@ -870,7 +870,7 @@ FcListPatternMatchAny (const FcPattern *p,
#define FC_HINTING_OBJECT 17
#define FC_VERTICAL_LAYOUT_OBJECT 18
#define FC_AUTOHINT_OBJECT 19
-#define FC_GLOBAL_ADVANCE_OBJECT 20
+#define FC_GLOBAL_ADVANCE_OBJECT 20 /* deprecated */
#define FC_FILE_OBJECT 21
#define FC_INDEX_OBJECT 22
#define FC_RASTERIZER_OBJECT 23
diff --git a/fontconfig/src/fcname.c b/fontconfig/src/fcname.c
index d51307bec..6a1fc12e8 100644
--- a/fontconfig/src/fcname.c
+++ b/fontconfig/src/fcname.c
@@ -54,7 +54,7 @@ static const FcObjectType _FcBaseObjectTypes[] = {
{ FC_HINTING, FcTypeBool, },
{ FC_VERTICAL_LAYOUT, FcTypeBool, },
{ FC_AUTOHINT, FcTypeBool, },
- { FC_GLOBAL_ADVANCE, FcTypeBool, },
+ { FC_GLOBAL_ADVANCE, FcTypeBool, }, /* deprecated */
{ FC_FILE, FcTypeString, },
{ FC_INDEX, FcTypeInteger, },
{ FC_RASTERIZER, FcTypeString, },
@@ -442,7 +442,7 @@ static const FcConstant _FcBaseConstants[] = {
{ (FcChar8 *) "hinting", "hinting", FcTrue },
{ (FcChar8 *) "verticallayout", "verticallayout", FcTrue },
{ (FcChar8 *) "autohint", "autohint", FcTrue },
- { (FcChar8 *) "globaladvance", "globaladvance", FcTrue },
+ { (FcChar8 *) "globaladvance", "globaladvance", FcTrue }, /* deprecated */
{ (FcChar8 *) "outline", "outline", FcTrue },
{ (FcChar8 *) "scalable", "scalable", FcTrue },
{ (FcChar8 *) "minspace", "minspace", FcTrue },
diff --git a/fontconfig/src/fcxml.c b/fontconfig/src/fcxml.c
index 343208617..b8c658d55 100644
--- a/fontconfig/src/fcxml.c
+++ b/fontconfig/src/fcxml.c
@@ -1854,6 +1854,9 @@ FcParseDir (FcConfigParse *parse)
const FcChar8 *attr;
FcChar8 *data;
FcChar8 *prefix = NULL;
+#ifdef _WIN32
+ FcChar8 buffer[1000];
+#endif
attr = FcConfigGetAttribute (parse, "prefix");
if (attr && FcStrCmp (attr, (const FcChar8 *)"xdg") == 0)
@@ -2514,9 +2517,6 @@ FcEndElement(void *userData, const XML_Char *name)
{
FcConfigParse *parse = userData;
FcChar8 *data;
-#ifdef _WIN32
- FcChar8 buffer[1000];
-#endif
if (!parse->pstack)
return;