diff options
| author | marha <marha@users.sourceforge.net> | 2014-03-28 17:43:20 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-03-28 17:43:20 +0100 |
| commit | f0f09f4aa3cdd0267f58b362a7c9fc5ae0921afd (patch) | |
| tree | afbeb028495328a2817aedbac7aae484a2c71a83 /fontconfig/src/fcdbg.c | |
| parent | bf0cbcc1d00962ef2221cb4ceae87cc5ae737454 (diff) | |
| parent | cbfb19790917d271b8ca6156554b16acc802719f (diff) | |
| download | vcxsrv-f0f09f4aa3cdd0267f58b362a7c9fc5ae0921afd.tar.gz vcxsrv-f0f09f4aa3cdd0267f58b362a7c9fc5ae0921afd.tar.bz2 vcxsrv-f0f09f4aa3cdd0267f58b362a7c9fc5ae0921afd.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
X11/xtrans/Xtrans.c
Diffstat (limited to 'fontconfig/src/fcdbg.c')
| -rw-r--r-- | fontconfig/src/fcdbg.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/fontconfig/src/fcdbg.c b/fontconfig/src/fcdbg.c index d74bc2769..ef038f017 100644 --- a/fontconfig/src/fcdbg.c +++ b/fontconfig/src/fcdbg.c @@ -29,6 +29,8 @@ static void _FcValuePrintFile (FILE *f, const FcValue v) { + FcRange r; + switch (v.type) { case FcTypeUnknown: fprintf (f, "<unknown>"); @@ -61,6 +63,10 @@ _FcValuePrintFile (FILE *f, const FcValue v) case FcTypeFTFace: fprintf (f, "face"); break; + case FcTypeRange: + r = FcRangeCanonicalize (v.u.r); + fprintf (f, "(%g, %g)", r.u.d.begin, r.u.d.end); + break; } } @@ -261,6 +267,8 @@ FcOpPrint (FcOp op_) void FcExprPrint (const FcExpr *expr) { + FcRange r; + if (!expr) printf ("none"); else switch (FC_OP_GET_OP (expr->op)) { case FcOpInteger: printf ("%d", expr->u.ival); break; @@ -277,7 +285,10 @@ FcExprPrint (const FcExpr *expr) FcExprPrint (expr->u.mexpr->yy); printf ("]"); break; - case FcOpRange: break; + case FcOpRange: + r = FcRangeCanonicalize (expr->u.rval); + printf ("(%g, %g)", r.u.d.begin, r.u.d.end); + break; case FcOpBool: printf ("%s", expr->u.bval ? "true" : "false"); break; case FcOpCharSet: printf ("charset\n"); break; case FcOpLangSet: |