diff options
author | marha <marha@users.sourceforge.net> | 2014-10-01 20:47:44 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-10-01 20:47:44 +0200 |
commit | 30eb28e89e513ba7c04e8424be0cba326a01882b (patch) | |
tree | c84d1ffa742ebc6f077abb20a6b80c56ddaea888 /fontconfig | |
parent | 438af0c7d4bf60b408b259c88205ff2193195466 (diff) | |
download | vcxsrv-30eb28e89e513ba7c04e8424be0cba326a01882b.tar.gz vcxsrv-30eb28e89e513ba7c04e8424be0cba326a01882b.tar.bz2 vcxsrv-30eb28e89e513ba7c04e8424be0cba326a01882b.zip |
libxtrans pixman fontconfig mesa xserver xkeyboard-config git update 1 Oct 2014
plink 10277
xserver commit d3d845ca9e92f0a2ccde93f4242d7769cfe14164
xkeyboard-config commit 73aa90ce32967747c84a1b5fe32cee329bc3bbcf
pixman commit f078727f392bc9f235df916e75634ed87177b9b4
libxtrans commit 7cbad9fe2e61cd9d5caeaf361826a6f4bd320f03
fontconfig commit 1082161ea303cf2bbc13b62a191662984131e820
mesa commit 4f7916ab4f8093fa33519dfa3d08e73b4d35ebe3
Diffstat (limited to 'fontconfig')
-rw-r--r-- | fontconfig/doc/fcrange.fncs | 10 | ||||
-rw-r--r-- | fontconfig/fontconfig/fontconfig.h | 3 | ||||
-rw-r--r-- | fontconfig/src/fcrange.c | 23 |
3 files changed, 36 insertions, 0 deletions
diff --git a/fontconfig/doc/fcrange.fncs b/fontconfig/doc/fcrange.fncs index 605459525..4181b8093 100644 --- a/fontconfig/doc/fcrange.fncs +++ b/fontconfig/doc/fcrange.fncs @@ -62,3 +62,13 @@ integer sized value. all memory associated with it. @SINCE@ 2.11.91 @@ + +@RET@ FcBool +@FUNC@ FcRangeGetDouble +@TYPE1@ const FcRange * @ARG1@ range +@TYPE2@ double * @ARG2@ begin +@TYPE3@ double * @ARG3@ end +@PURPOSE@ Get the range in double +@DESC@ +Returns in <parameter>begin</parameter> and <parameter>end</parameter> as the range. +@SINCE@ 2.11.91 diff --git a/fontconfig/fontconfig/fontconfig.h b/fontconfig/fontconfig/fontconfig.h index e5b09591b..afc917c6b 100644 --- a/fontconfig/fontconfig/fontconfig.h +++ b/fontconfig/fontconfig/fontconfig.h @@ -908,6 +908,9 @@ FcRangeDestroy (FcRange *range); FcPublic FcRange * FcRangeCopy (const FcRange *r); +FcPublic FcBool +FcRangeGetDouble(const FcRange *range, double *begin, double *end); + /* fcweight.c */ FcPublic int 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) { |