Commit Graph

1311 Commits

Author SHA1 Message Date
Akira TAGOH 9fe7c986c6 Bug 48020 - Fix for src/makealias on Solaris 10
Use the command substitution `command` instead of $(command) for
Solaris 10.
2012-03-29 15:43:38 +09:00
Akira TAGOH becbdaebe3 Move workaround macros for fat binaries into the separate header file 2012-03-29 12:50:47 +09:00
Akira TAGOH fe6ba5e5c5 Fix the hardcoded cache file suffix 2012-03-28 16:27:46 +09:00
Akira TAGOH 4a060729a1 fcpat: Increase the number of buckets in the shared string hash table
This is a reasonably conservative increase in the number of buckets in the hash
table to 251.  After FcInit(), there are 240 shared strings in use on my system
(from configuration files I assume).  The hash value is stored in each link in
the chains so comparison are actually not very expensive.  This change should
reduce the average length of chains by a factor of 8.  With the reference
counted strings, it should keep the average length of chains to about 2.  The
number of buckets is prime so as not to rely too much on the quality of the
hash function.

https://bugs.freedesktop.org/show_bug.cgi?id=17832#c5

Patch from Karl Tomlinson
2012-03-28 13:42:01 +09:00
Akira TAGOH d8dcff7b96 Bug 17832 - Memory leaks due to FcStrStaticName use for external patterns
Use the reference-counted strings instead of the static strings

Patch from Karl Tomlinson
2012-03-28 13:42:01 +09:00
Akira TAGOH ea1c6ea337 Fix a memory leak in FcDirScanConfig() 2012-03-27 21:06:36 +09:00
Akira TAGOH 1aaf8b773d Bug 17722 - Don't overwrite user's configurations in default config
Use "append" to avoid overwriting the user configuration.
This presumes most clients may takes care of the first value only.
2012-03-26 10:58:18 +09:00
Akira TAGOH 900675d0b0 Bug 47703 - SimSun default family
40-nonlatin.conf: SimSun should be serif but not sans-serif.

http://www.microsoft.com/typography/fonts/family.aspx?FID=37

Patch from Petr Gajdos
2012-03-22 19:57:47 +09:00
Akira TAGOH 92ac054ce5 fcmatch: Set FcResultMatch at the end if the return value is valid.
In the previous code, the result of 'result' in the argument for
FcFontSetSort() and FcFontSetMatch() wasn't predictable and not reliable to
check if the return value is valid or not. this change is to ensure if it's
performed successfully.
2012-03-22 19:15:27 +09:00
Akira TAGOH 1db3e9cdd8 fc-cache: improvement of the fix for Bug#39914.
Use sizeof() instead of strlen() and use stdio.
2012-03-22 12:36:34 +09:00
Akira TAGOH 4f7f3bf9f7 Bug 39914 - Please tag the cache directory with CACHEDIR.TAG
fc-cache: Create CACHEDIR.TAG at the top of the cache directory.

Reviewed-by: Josh Triplett <josh@joshtriplett.org>
2012-03-21 16:06:37 +09:00
Jeremy Huddleston 8cc4498122 fcarch: Check for architecture signature at compile time rather than configure time
https://bugs.freedesktop.org/show_bug.cgi?id=20208

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-03-21 11:59:01 +09:00
Akira TAGOH e1ffb3dcd4 Get rid of the prerequisites from the sufix rules
Thanks to Adam Sampson for pointing this out.
2012-03-16 23:18:23 +09:00
Akira TAGOH 93460f93e9 Fix a build issue due to the use of non-portable variables
$< isn't supported in BSD make say. $(RM) is pre-defined in GNU make
though, not in BSD make say. so changed to check on configure if it's
pre-defined by make, otherwise set the appropriate command to $(RM).

This would be a workaround until it has the certain pre-defined value.
2012-03-16 16:34:37 +09:00
Akira TAGOH f2813ffc68 Revert "Fix a build fail on some environment"
This reverts commit b75eb63982.
2012-03-16 11:55:47 +09:00
Akira TAGOH a5b609196f Revert "Fix a build fail on some environment."
This reverts commit 0fdfddf2ac.

Conflicts:

	doc/Makefile.am
2012-03-16 11:55:30 +09:00
Akira TAGOH 765b7b32d8 [doc] Update for cachedir.
<cache> element is now obsoletes and no longer used. get rid of it
from the doc and add <cachedir> instead.
2012-03-12 19:02:27 +09:00
Akira TAGOH e8bdc6df2e [doc] Update the path for cache files and the version. 2012-03-12 17:58:00 +09:00
Akira TAGOH dd3214aa39 Bump version to 2.9.0 2012-03-11 02:24:33 +09:00
Akira TAGOH 3b142c2aae Get rid of $< from Makefile.am 2012-03-11 02:12:10 +09:00
Akira TAGOH 0fdfddf2ac Fix a build fail on some environment. 2012-03-10 23:30:30 +09:00
Akira TAGOH b75eb63982 Fix a build fail on some environment 2012-03-10 22:05:07 +09:00
Akira TAGOH a47899a853 Fix a build issue 2012-03-10 19:03:05 +09:00
Akira TAGOH d6de535192 Update to detect the uncommited changes properly 2012-03-09 22:24:18 +09:00
Akira TAGOH 78d75c003c Update the version info 2012-03-09 22:12:35 +09:00
Akira TAGOH 353f7cc691 Fix distcheck error 2012-03-09 17:33:03 +09:00
Akira TAGOH 254232f47e Bug 19128 - Handling whitespace in aliases
Add a workaround alias for Dingbats.
2012-03-07 18:16:35 +09:00
Akira TAGOH 0ca752dd25 Check null value for given object to avoid possibly segfaulting 2012-03-07 17:56:39 +09:00
Akira TAGOH 1f01c4b60c Bug 23336 - unable to display bitmap-only (SFNT) TrueType or OpenType
Force to find out a size for bitmap-only ttf to avoid the blank glyphs
in the font.

Patch from Bug Fly
2012-03-07 17:32:14 +09:00
Akira TAGOH a13d518fdd Bug 41694 - FcCache functions have random-number-generator side effects
Use the own random number generator state if possible.
2012-02-28 12:52:25 +09:00
Pravin Satpute c7a671ab60 Bug 25652 - Add ortho file for locale mni_IN
Add mni.orth for Maniputi

Signed-off-by: Akira TAGOH <akira@tagoh.org>
2012-02-24 16:50:14 +09:00
Pravin Satpute 04c96f59b9 Bug 25653 - Add ortho file for locale doi_IN
Add doi.orth for Dogri

Signed-off-by: Akira TAGOH <akira@tagoh.org>
2012-02-24 16:43:14 +09:00
Akira TAGOH 857753d368 Add brx.orth and sat.orth 2012-02-23 20:12:06 +09:00
Parag Nemade 942cb16f6c Bug 25650 - Add ortho file for locale sat_IN
Add sat.orth for Santali

Signed-off-by: Akira TAGOH <akira@tagoh.org>
2012-02-23 20:06:41 +09:00
Parag Nemade 38b9c42fe2 Bug 25651 - Add ortho file for locale brx_IN
Add brx.orth for Bodo.

Signed-off-by: Akira TAGOH <akira@tagoh.org>
2012-02-23 19:34:18 +09:00
Akira TAGOH a3ff1f07f8 Bug 27385 - lcdfilter settings for freetype-2.3.12 not available in fontconfig-2.8.0
Add config files for FT_LcdFilter options.

Patch from Robin Johnson.
2012-02-23 15:23:23 +09:00
Akira TAGOH 5e4ea1104c Do not update stream->pos when seeking is failed. 2012-02-22 16:50:13 +09:00
Akira TAGOH 71b14d645f Bug 46169 - Pointer error in FcConfigGlobMatch
Fix possibly accessing the invalid memory and a crash in the worst case
when the glob string is longer than the string.
2012-02-22 16:30:05 +09:00
Mike Frysinger 3abf981542 makealias: handle missing funcs better
When adding new functions, if the actual definition doesn't match the
header (say due to a typo), the regeneration of the internal headers
get confused and output bad cpp logic.  This causes gcc to barf due
to mismatched #ifdef/#endif.  Which is a pain to figure out due to
the sheer voulme of generated code.

So tweak the makealias script to detect this case and error out.
While we're here, improve the cpp output a bit to indent, include
comments, and merge similar ifdef blocks.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2012-02-21 14:15:58 -05:00
Mike Frysinger d9c4462778 FcObjectValidType: tweak -1 checking
Newer gcc doesn't like when you switch on an enum and use a value
that isn't declared:

fcname.c: In function 'FcObjectValidType':
fcname.c:299:2: warning: case value '4294967295'
	not in enumerated type 'FcType' [-Wswitch]

So tweak the logic to avoid this warning.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2012-02-21 14:15:58 -05:00
Mike Frysinger 97c9506e4d fix build warnings when using --with-arch
Latest configure code will setup FC_ARCHITECTURE directly rather than
going through ARCHITECTURE, so update fcarch.h accordingly.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2012-02-21 14:15:58 -05:00
Mike Frysinger 01c833379e fc-{list,match}: constify format string
We don't free this string anywhere, so mark it const to avoid gcc warnings
and possible bugs in the future (if people did try freeing it).

fc-list.c: In function 'main':
fc-list.c:161:16: warning: pointer targets in assignment
	differ in signedness [-Wpointer-sign]

fc-match.c: In function 'main':
fc-match.c:201:13: warning: pointer targets in assignment
	differ in signedness [-Wpointer-sign]
fc-match.c:203:13: warning: pointer targets in assignment
	differ in signedness [-Wpointer-sign]

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2012-02-21 14:15:58 -05:00
Mike Frysinger 123d344f45 FcName{,Get}Constant: constify string input
These funcs don't modify the incoming string, so add const markings.
This is the "right thing", shouldn't change the ABI, and fixes some
gcc warnings:

fccfg.c: In function 'FcConfigEvaluate':
fccfg.c:916:2: warning: passing argument 1 of 'IA__FcNameConstant'
	discards 'const' qualifier from pointer target type [enabled by default]
fcalias.h:253:34: note: expected 'FcChar8 *' but
	argument is of type 'const FcChar8 *'

fcxml.c: In function 'FcTypecheckExpr':
fcxml.c:604:2: warning: passing argument 1 of 'IA__FcNameGetConstant'
	discards 'const' qualifier from pointer target type [enabled by default]
fcalias.h:251:37: note: expected 'FcChar8 *' but
	argument is of type 'const FcChar8 *'

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2012-02-21 14:15:58 -05:00
Mike Frysinger da763aa77d fc-cat: fix pointer warning
Add a cast to avoid a gcc warning:

fc-cat.c: In function 'cache_print_set':
fc-cat.c:230:2: warning: pointer targets in passing argument 2
	of 'FcPatternFormat' differ in signedness [-Wpointer-sign]
../fontconfig/fontconfig.h:860:1: note:
	expected 'const FcChar8 *' but argument is of type 'char *'

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2012-02-21 14:15:58 -05:00
Mike Frysinger 647569d029 FcStat: change to FcChar8 for first arg
This shouldn't affect the ABI, makes FcStat more like the rest of the
fontconfig API, and fixes warnings where we pass FcChar8* pointers in
to this func from other places.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2012-02-21 14:15:58 -05:00
Mike Frysinger e3a66c2937 delete unused variables
Newer gcc is better at detecting set-but-unused variables.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2012-02-21 14:15:58 -05:00
Mike Frysinger 6f020161e8 FcStrPlus: optimize a little
We've already calculated the lengths of these strings, so re-use those
values to avoid having to rescan the strings multiple times.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2012-02-21 14:09:51 -05:00
Akira TAGOH 2b010e46e6 Bug 44826 - <alias> must contain only a single <family>
Fix invalid syntax around alias elements in 30-metric-aliases.conf
40-nonlatin.conf and 45-latin.conf.

Patch from lolilolicon
2012-02-21 16:23:22 +09:00
Akira TAGOH 54dd481512 Get rid of the unexpected family name
UmePlus P Gothic isn't a serif font.
2012-02-21 15:43:59 +09:00
MINAMI Hirokazu 1c13fee11a Bug 43406 - typo of Japanese font name in conf.d/65-nonlatin.conf
Fix a typo.

Signed-off-by: Akira TAGOH <akira@tagoh.org>
2012-02-21 15:43:59 +09:00