diff options
| author | Karl Tomlinson <bugs.freedesktop@karlt.net> | 2009-01-27 03:35:51 -0500 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2009-02-15 13:40:18 -0800 |
| commit | 575ee6cddd391857339f57331d2677fcc868369e (patch) | |
| tree | 1074b018676d8e6f9a99059f211131a6f3db815a /doc | |
| parent | b8860e2faffa8b3f62b3c7aafd2d3b6962566f41 (diff) | |
Change FcCharSetMerge API
To only work on writable charsets. Also, return a bool indicating whether
the merge changed the charset.
Also changes the implementation of FcCharSetMerge and FcCharSetIsSubset
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/fccharset.fncs | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/doc/fccharset.fncs b/doc/fccharset.fncs index 0dd7d1a5..de06aa49 100644 --- a/doc/fccharset.fncs +++ b/doc/fccharset.fncs @@ -98,17 +98,19 @@ Returns a set including only those chars found in either <parameter>a</parameter Returns a set including only those chars found in <parameter>a</parameter> but not <parameter>b</parameter>. @@ -@RET@ FcCharSet * +@RET@ FcBool @FUNC@ FcCharSetMerge -@TYPE1@ const FcCharSet * @ARG1@ a +@TYPE1@ FcCharSet * @ARG1@ a @TYPE2@ const FcCharSet * @ARG2@ b +@TYPE3@ FcBool * @ARG3@ changed @PURPOSE@ Merge charsets @DESC@ -If <parameter>a</parameter> is NULL, returns a newly-created copy of <parameter>b</parameter>. -If <parameter>a</parameter> is an FcCharSet object owned by fontconfig that -cannot be modified, it returns the union of <parameter>a</parameter> and -<parameter>b</parameter> in a newly-created FcCharSet object. -Otherwise, adds all chars in <parameter>b</parameter> to <parameter>a</parameter> and returns <parameter>a</parameter>. In other words, this is an in-place versionof FcCharSetUnion. +Adds all chars in <parameter>b</parameter> to <parameter>a</parameter>. +In other words, this is an in-place version of FcCharSetUnion. +If <parameter>changed</parameter> is not NULL, then it returns whether any new +chars from <parameter>b</parameter> were added to <parameter>a</parameter>. +Returns FcFalse on failure, either when <parameter>a</parameter> is a constant +set or from running out of memory. @@ @RET@ FcBool |