diff options
author | marha <marha@users.sourceforge.net> | 2014-10-01 23:12:13 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-10-01 23:12:13 +0200 |
commit | 88236adfe3eb41b8368b4c9ecf3e09a7199dc474 (patch) | |
tree | 6acb3f7ad3c60c4605551245df9c321b5fb22c3b /fontconfig/src | |
parent | e4086b3defb6186a2fb8a5845968c97e613fb493 (diff) | |
parent | 30eb28e89e513ba7c04e8424be0cba326a01882b (diff) | |
download | vcxsrv-88236adfe3eb41b8368b4c9ecf3e09a7199dc474.tar.gz vcxsrv-88236adfe3eb41b8368b4c9ecf3e09a7199dc474.tar.bz2 vcxsrv-88236adfe3eb41b8368b4c9ecf3e09a7199dc474.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/hw/xwin/InitOutput.c
xorg-server/hw/xwin/win.h
xorg-server/hw/xwin/winclipboard/internal.h
xorg-server/hw/xwin/winclipboard/thread.c
xorg-server/hw/xwin/winclipboard/wndproc.c
xorg-server/hw/xwin/winclipboard/xevents.c
xorg-server/hw/xwin/winclipboardinit.c
xorg-server/hw/xwin/winclipboardwrappers.c
xorg-server/hw/xwin/winglobals.c
Diffstat (limited to 'fontconfig/src')
-rw-r--r-- | fontconfig/src/fcrange.c | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/fontconfig/src/fcrange.c b/fontconfig/src/fcrange.c index 39eafd82d..37cf06755 100644 --- a/fontconfig/src/fcrange.c +++ b/fontconfig/src/fcrange.c @@ -76,6 +76,29 @@ FcRangeCopy (const FcRange *range) return ret; } +FcBool +FcRangeGetDouble(const FcRange *range, double *begin, double *end) +{ + if (!range) + return FcFalse; + if (range->is_double) + { + if (begin) + *begin = range->u.d.begin; + if (end) + *end = range->u.d.end; + } + else + { + if (begin) + *begin = (double)range->u.i.begin; + if (end) + *end = (double)range->u.i.end; + } + + return FcTrue; +} + FcRange FcRangeCanonicalize (const FcRange *range) { |