Patrick Lam
530e66b008
Fix the underlying cause of the below segfault (must usually call
...
FcDirCacheHasCurrentArch after FcDirCacheValid).
2006-02-18 18:18:07 +00:00
Patrick Lam
a68ce9525d
Fix segfault (reported by fcrozat) caused by incorrect input on cache
...
files.
2006-02-18 17:56:25 +00:00
Patrick Lam
310817371c
Bump up magic version; we changed the binary format.
2006-02-17 14:44:42 +00:00
Patrick Lam
8c0d692125
Deal correctly with changing FC_CACHE_MAGIC.
2006-02-16 17:50:04 +00:00
Patrick Lam
719f4b841f
Don't bail if fontconfig can't remove a dir cache file. Skip the ID of a
...
cache file when copying. Eliminate 'source file too small' bug in
FcDirCacheWrite.
2006-02-16 07:12:04 +00:00
Patrick Lam
f8a17f3298
Fix memory leak in error condition code.
2006-02-13 22:19:30 +00:00
Patrick Lam
5657098e29
Skip bitmap fonts which can't even get it together enough to declare a
...
family name; this appears to reproduce previous fontconfig behaviour.
reviewed by: plam
2006-02-13 21:51:11 +00:00
Patrick Lam
d00c3cb5e0
Try to open /var/cache/fontconfig/[hashed name] before fonts.cache-2 in a
...
directory, because /var/cache/fontconfig failures ought to be fixable,
unlike fonts.cache-2 failures, which may leave you screwed.
reviewed by: plam
2006-02-11 05:01:32 +00:00
Patrick Lam
9e07e0a77b
Use a tri-state to mark the fonts which didn't get blocked but were just
...
missing an element, to distinguish them from the fonts that do match
the element.
reviewed by: plam
2006-02-11 04:50:46 +00:00
Patrick Lam
f11a184104
Don't kill fonts because they don't declare an element that's being matched
...
on.
reviewed by: plam
2006-02-10 19:40:11 +00:00
Patrick Lam
879af7060b
Define and pass O_BINARY to open if appropriate, for those platforms that
...
need it. Reported by Doodle.
2006-02-09 18:44:14 +00:00
Patrick Lam
c7490074c5
Fix attempt to close -1. Don't unboundedly grow bad caches (reported by
...
fcrozat).
2006-02-09 16:19:42 +00:00
Patrick Lam
a8c425301a
Fix problem with missing 'en' due to euro.patch: change cache file format
...
slightly to coincide with that generated by fc-lang.
2006-02-09 15:25:57 +00:00
Patrick Lam
b10e77628c
Fix warning.
2006-02-08 03:34:17 +00:00
Patrick Lam
5c3deb2985
Don't reject dirs that can't be normalized (fixes lilypond, and is correct
...
in the context of application font directories.)
Use normalized directory name exclusively in FcCacheReadDirs.
reviewed by: plam
2006-02-07 22:09:01 +00:00
Patrick Lam
efb11b36c4
Perf optimizations. Inline FcValueCanonicalize, reduce FcValueListPtrU
...
usage, remove redundant cast.
reviewed by: plam
2006-02-07 21:15:33 +00:00
Patrick Lam
6cc02fe6b9
src/fccharset.c (FcLangCharSetPopulate, FcCharSetInsertLeaf)
...
Fix missing FcCacheBankToIndex in FcCharSetInsertLeaf. Declare extern for
static arrays as arrays, not pointers. (Part of the fix for 'fonts
don't have en' issue after Euro patch.)
(I forgot to commit the ChangeLog last time.)
reviewed by: plam
2006-02-07 20:56:48 +00:00
Patrick Lam
a81f23c0ce
Fix hidden variable warning.
2006-02-07 03:53:32 +00:00
Patrick Lam
799157dbbf
Remove de-escaping logic because FcCacheWriteString doesn't escape anyway.
...
Do blockwise reading instead of byte-wise for performance.
2006-02-07 02:33:57 +00:00
Patrick Lam
8b413bb62c
Takashi Iwai <tiwai@suse.de>
...
Don't loop infinitely on recursive symlinks (client-side).
2006-02-07 02:22:50 +00:00
Patrick Lam
fff5a5af30
Skip subdirs when skipping over stale bits of global cache. Introduce state
...
machine into FcGlobalCacheDir to avoid doing inappropriate operations
on global dir entries, e.g. writing out an out-of-date cache entry.
reviewed by: plam
2006-02-06 22:44:02 +00:00
Patrick Lam
98592bbb1d
Hoist FcFileIsDir check out of FcFileScanConfig loop.
...
reviewed by: plam
2006-02-06 21:52:15 +00:00
Patrick Lam
a0aa54f6ee
Don't rescan when trying to normalize a non-declared font dir. Don't add
...
font dirs multiple times (even if they're aliased).
reviewed by: plam
2006-02-06 19:25:45 +00:00
Patrick Lam
86e75dfb5d
Explain apples/oranges comparison and fix compilation error.
...
reviewed by: plam
2006-02-06 14:44:46 +00:00
Patrick Lam
f076169d19
Insert check for integer overflow in # of fonts.
...
reviewed by: plam
2006-02-06 14:14:21 +00:00
Patrick Lam
68355f3877
src/fccache.c (FcGlobalCacheLoad, FcGlobalCacheSave, FcDirCacheConsume,
...
FcDirCacheWrite)
Check I/O call return values and eliminate unused variable warnings.
reviewed by: plam
2006-02-05 02:57:21 +00:00
Patrick Lam
c4c47a7654
src/fccfg.c (FcConfigAppFontAddFile, FcConfigAppFontAddDir)
...
Fix memory leak.
reviewed by: plam
2006-02-04 00:09:42 +00:00
Patrick Lam
a8e4d9eb39
Gracefully handle the case where a cache asserts that it has a negative
...
number of fonts, causing overflow.
reviewed by: plam
2006-02-04 00:04:00 +00:00
Patrick Lam
1af0f5741a
Fix double free in error case.
2006-02-03 23:47:37 +00:00
Patrick Lam
28aefd013d
Toast broken global cache files.
...
reviewed by: plam
2006-01-31 07:16:22 +00:00
Patrick Lam
3616cbe251
Actually use the directories that I added to the global cache. Fixes 'make
...
check'.
2006-01-31 04:42:20 +00:00
Patrick Lam
81d97094cf
Make global cache work again after putting dir names into global cache (I
...
misplaced the recording of a file offset).
2006-01-30 16:31:56 +00:00
Patrick Lam
2c4e012497
Update fc-cat to handle subdir lists in global cache file.
...
Another FcCacheReadString return value check.
2006-01-30 15:59:17 +00:00
Patrick Lam
c5411c4cae
Make fccache more resilient to broken cache files by checking return value
...
of FcCacheReadString all the time.
reviewed by: plam
2006-01-30 15:44:13 +00:00
Patrick Lam
30c4189deb
Fix global cache reads of subdirectories.
...
reviewed by: plam
2006-01-30 04:47:17 +00:00
Patrick Lam
971cf18018
Add documentation for FcConfigNormalizeFontDir.
...
Write directory information to global caches to fix make check (reported by
Ronny V. Vindenes). This changes the global cache format again.
2006-01-30 04:27:53 +00:00
Patrick Lam
97293e07dd
Move FcConfigNormalizeFontDir call so that it doesn't result in infinite
...
recursion (reported by Ronny V. Vindenes).
2006-01-27 05:47:59 +00:00
Patrick Lam
3cf9f5cec3
Add a couple of missing normalizations to make fc-cache work right; only
...
scan subdirectories once.
2006-01-27 00:27:37 +00:00
Patrick Lam
4073203deb
Don't crash on non-existant directories in global cache.
...
reviewed by: plam
2006-01-26 16:11:41 +00:00
Patrick Lam
f468f568b4
Stop trampling the directory name when writing out caches. (with Mike
...
Fabian:) Beef up FcConfigNormalizeFontDir to scan subdirs when
necessary. Don't scan directories that can't be normalized.
2006-01-26 16:09:12 +00:00
Patrick Lam
575a37b797
Fix additional memory leaks reported by Ronny V. Vindenes: don't invoke
...
FcValueSave on hashed static strings in FcPatternAddWithBinding.
Add another st_dev check in FcDirCacheOpen.
2006-01-25 14:52:49 +00:00
Patrick Lam
16a71eff3e
Treat zh-hk fonts differently from zh-tw fonts. This patch may cause
...
fontconfig to treat A-X fonts differently from A-Y fonts; please mail
the fontconfig list if this causes any problems.
reviewed by: plam
2006-01-25 02:54:37 +00:00
Patrick Lam
6f9fcb5186
Fix memory leaks reported by Ronny V. Vindenes.
2006-01-25 02:33:46 +00:00
Patrick Lam
986e35979e
Fix for unaligned memory accesses.
...
reviewed by: plam
2006-01-19 19:20:30 +00:00
Patrick Lam
58bdd29619
Properly order the FcConfigAddFontDir and FcConfigNormalizeFontDir calls to
...
avoid crashes.
reviewed by: plam
2006-01-18 15:41:15 +00:00
Patrick Lam
eadadf489a
Fix segfault when consuming zero-length caches in fc-cat (which has no
...
config, so FcConfigAddFontDir shouldn't be called.)
2006-01-15 05:31:58 +00:00
Patrick Lam
8a0b0ed6d0
Compare device numbers as well as inodes. Always normalize directory names
...
before comparing them.
Allocate extra space for appended '/' in directory name.
reviewed by: plam
2006-01-14 21:23:03 +00:00
Patrick Lam
df3efc11a9
Explicitly add font dirs to config.fontDirs even if they're empty. Set
...
current config in fc-cache.c. Fix treatment of cache directory as read
from cache file; don't use string equality to determine if we have the
right file, use inode equality.
2006-01-10 13:15:05 +00:00
Patrick Lam
cd9bca6970
Normalize font dirs by using the form, as given in fonts.conf, and recorded
...
in FcConfig's fontDirs string set, as canonical.
Actually update config.fontDirs as font directories are scanned.
2006-01-09 13:58:04 +00:00
Patrick Lam
5576a5873d
Fix matching bug when multiple elements match; don't use the sum of all
...
scores, but the best score.
Also more perf opts, e.g. evaluate best over all font sets rather than on a
per-set basis (and other changes).
2006-01-08 10:58:30 +00:00
Patrick Lam
05a98eaf4b
Properly skip past dir caches that contain zero fonts (as occurs in global
...
caches.) Reported by Mike Fabian.
2006-01-08 10:50:51 +00:00
Patrick Lam
5fe09702f4
Print out full pathname in fc-match -v as well. Reported by Frederic
...
Crozat.
Fix bug where fc-match crashes when given __DUMMY__ property to match on.
(I added the __DUMMY__ string to enable callers of FcObjectToPtrLookup to
distinguish an error return from a successful return. -PL)
reviewed by: plam
2006-01-07 06:36:24 +00:00
Patrick Lam
c60ec7cc6d
Add self to AUTHORS list.
...
Minor change to global cache file format to fix fc-cat bug reported by
Frederic Crozat, and buglet with not globally caching directories with
zero fonts cached.
2006-01-05 15:12:22 +00:00
Patrick Lam
52ac91f7c1
Fix double-free which occurs because FcValueCanonicalize doesn't create an
...
extra copy of the returned value, it only canonicalizes it.
reviewed by: plam
2006-01-02 17:20:23 +00:00
Patrick Lam
ebc157f9a1
Shut up GCC warnings on amd.
...
reviewed by: plam
2005-12-21 20:00:20 +00:00
Patrick Lam
19ea60bc7c
Avoid check on _fcBankId nullness and fix case where it used to crash.
2005-12-21 05:37:10 +00:00
Patrick Lam
3bfae75d44
Bump version to 2.3.93.
...
Use open instead of fopen (requested by Phil Race for Sun).
src/fccache.c (FcDirCacheWrite);
Fix GCC4 warning and Makefile brokenness for /var/cache/fontconfig dir.
2005-12-21 03:31:19 +00:00
Patrick Lam
6f767cec49
Restore code to skip over PCF fonts that have no encoded characters. (We
...
guess that a font is PCF by presence of the PIXEL_SIZE BDF property.)
2005-12-20 20:35:47 +00:00
Patrick Lam
ec760b178a
Read and write the original location as a fallback for the hashed cache
...
file locations. This is mostly for users to be able to have
per-directory cache files.
2005-12-12 20:45:54 +00:00
Patrick Lam
83b6739035
Improve error message when fc-cache can't write the cache. Add missing
...
slash. Reported by Behdad. Incorporate Behdad's patch to create
/var/cache/fontconfig when appropriate.
2005-12-12 13:46:45 +00:00
Patrick Lam
368104c381
Fix crash reported by Frederic Crozat when using libxml2.
...
reviewed by: plam
2005-12-12 13:20:41 +00:00
Patrick Lam
ea44e21841
Migrate cache files from fonts directories to /var/cache/fontconfig. This
...
helps make fontconfig FHS-compliant, but requires that all caches get
rebuilt.
Also, autogen.sh now needs the additional parameter
--localstatedir=/var.
2005-12-09 16:36:45 +00:00
Patrick Lam
204da5a8b8
Because we've changed FcPatternAddString to use FcStrStaticName and not
...
FcValueSave, explicitly handle the case of a null string.
2005-12-08 05:54:27 +00:00
Patrick Lam
c6103dfb22
Don't assign types to user object names.
2005-12-06 18:57:43 +00:00
Patrick Lam
9ede93f1dc
Don't free strings that have been returned from FcStrStaticName.
2005-12-05 16:08:01 +00:00
Patrick Lam
cb6d97eb1b
Only add a config file to the set of config files once.
...
reviewed by: plam
2005-11-30 22:13:21 +00:00
Patrick Lam
93a27747a4
src/fcint.h (FcCacheBankToIndex);
...
Fix segfault by guarding array dereference.
2005-11-29 15:04:06 +00:00
Patrick Lam
b8948e8542
Refactor FcCacheBankToIndex into an inlineable part (in fcint.h) which
...
checks the front of the list and a non-inlineable part which finds and
moves the appropriate element to the front of the list.
reviewed by: plam
2005-11-29 14:57:10 +00:00
Patrick Lam
9fad72abaf
Make the perf guys hate me a bit less: hoist the directory-name
...
FcConfigAcceptFont check for cached fonts up to directory cache read
time, rather than running it for each font.
2005-11-29 06:23:00 +00:00
Patrick Lam
51af050992
Don't make FcPatternFindFullFname available to fccfg, it's not really safe.
...
Instead go through FcPatternGetString (sorry, perf guys.) Also, use
globs for dirs as well.
2005-11-29 06:09:18 +00:00
Patrick Lam
e0421d0289
Fix segfault.
2005-11-29 00:21:05 +00:00
Patrick Lam
ced3f0a0ab
Fix problem dating back at least to 2.3.2 where globs weren't being applied
...
to patterns loaded from a cache.
Fix some obvious spelling mistakes.
2005-11-29 00:14:42 +00:00
Patrick Lam
1ed98a0c87
Stephan Kulow <coolo@suse.de> reviewed by: plam
...
Don't kill all fonts during match (oops!)
2005-11-28 10:54:11 +00:00
Patrick Lam
aa472e5f1a
Stephan Kulow <coolo@suse.de> Michael Matz <matz@suse.de> reviewed by: plam
...
Rewrite FcFontSetMatch to a path-finding based algorithm, i.e. inline
FcCompare into FcFontSetMatch and reorder the loops, adding a boolean
array which blocks patterns from future consideration if they're known
to not be best on some past criterion.
2005-11-28 01:40:53 +00:00
Patrick Lam
200a44fed0
Fix incorrect merge.
...
reviewed by: plam
2005-11-26 05:05:14 +00:00
Patrick Lam
cbe1df8150
Don't do random matching when bad objects are passed into
...
FcCompareValueList.
2005-11-25 16:33:58 +00:00
Patrick Lam
81fe99fdd0
Rename fcpatterns, fcpatternelts, fcvaluelists to _fcPatterns,
...
_fcPatternElts, _fcValueLists for consistency.
2005-11-25 16:04:44 +00:00
Patrick Lam
d854eaf8a9
Pass the FcObjectPtr to FcCompareValueList, not the char * (perf).
...
reviewed by: plam
2005-11-25 15:54:24 +00:00
Patrick Lam
61571f3f2e
Pass around FcCache *s to the Unserialize functions for extra consistency
...
(and less overhead, for what that's worth).
2005-11-25 15:50:34 +00:00
Patrick Lam
9ab79bdfb7
Inline the *PtrU functions to gain perf. Remove unneeded params for the
...
FcCompare* functions.
reviewed by: plam
2005-11-25 03:00:51 +00:00
Patrick Lam
1c9fdccab9
Move FC_BANK_DYNAMIC, FC_BANK_FIRST to internal header.
...
Check for type validity during FcPatternAddWithBinding, don't verify type
in FcFontMatch, don't call FcCanonicalize here (which always does a
deep copy).
reviewed by: plam
2005-11-24 21:40:20 +00:00
Patrick Lam
4f8b266fd9
Make FcCompareString and FcCompareFamily less expensive. Only add a value
...
for FC_FAMILY if the proposed value is a string.
reviewed by: plam
2005-11-24 20:20:26 +00:00
Patrick Lam
b97a34b592
Inline FcDebug invocations and only initialize once, in FcInit*. Improve
...
debug msg in FcPatternPrint.
reviewed by: plam
2005-11-24 19:38:05 +00:00
Patrick Lam
adac22f290
Manually perform inlining & partial redundancy elimination to reduce calls
...
to FcValueListPtrU.
Only invoke strlen() when really necessary.
reviewed by: plam
reviewed by: plam
2005-11-22 04:46:55 +00:00
Patrick Lam
824c7bf025
Get rid of the use of freetype internal headers in fcfreetype.c, since
...
those headers will go away with freetype 2.2. Replace with public
domain ftglue code from pango. Note that the patch removes some extra
error checking in FT_Get_BDF_Property() and comments out the skipping
of empty pcf fonts.
reviewed by: plam
2005-11-19 22:37:24 +00:00
Patrick Lam
8ebf7725a8
Get rid of the use of freetype internal headers in fcfreetype.c, since
...
those headers will go away with freetype 2.2. Replace with public
domain ftglue code from pango. Note that the patch removes some extra
error checking in FT_Get_BDF_Property() and comments out the skipping
of empty pcf fonts.
reviewed by: plam
2005-11-19 22:32:13 +00:00
Patrick Lam
8f2a807810
Don't crash when fc-cat invoked with no arguments.
...
Fix invalid read access caused by premature free and GCC4 warnings in
libxml2 codepath.
reviewed by: plam
reviewed by: plam
2005-11-18 20:32:30 +00:00
Patrick Lam
82912b062b
List iteration not needed in FcConfigValues, since it's building up the
...
list itself; we can just strip FcVoid elements during construction.
reviewed by: plam
2005-11-18 04:21:10 +00:00
Patrick Lam
38b2ecad5a
Fix crash on invalid constants in config files (forgot to update a pointer
...
upon list iteration.)
2005-11-17 16:46:07 +00:00
Patrick Lam
f28472fdb4
Complain about invalid constants in config files.
...
reviewed by: plam
2005-11-17 16:17:05 +00:00
Patrick Lam
1c5b6345b9
Don't add current_arch_start more than once.
...
Fix ordering of ALIGN with respect to saving block_ptr; add another ALIGN
to fcfs.c.
reviewed by: plam
2005-11-17 15:43:39 +00:00
Patrick Lam
8e351527bb
src/fccache.c (FcDirCacheProduce)
...
Fix case where alignment bytes bumped up metadata->count causing
unwarranted failures to write cache files. (Reported by Stephan Kulow).
2005-11-16 17:49:01 +00:00
Patrick Lam
7fd7221e68
Add *NeededBytesAlign(), which overestimates the padding which is later
...
added by the new ALIGN macro. Fix alignment problems on ia64 and s390
by bumping up block_ptr appropriately. (Earlier version by Andreas
Schwab).
Use sysconf to determine proper PAGESIZE value; this appears to be
POSIX-compliant. (reported by Andreas Schwab)
reviewed by: plam
2005-11-16 15:55:17 +00:00
Patrick Lam
82f35f8bb4
Fix bug 2878 (excessive relocations at startup for charsets, reported by
...
Ross Burton): fc-lang/fc-lang now creates the static form of the
langset, not the dynamic form, so that the charsets should now be in
.rodata.
2005-11-04 19:31:26 +00:00
Patrick Lam
50544b13c1
Add test for validity of directory caches that somehow got lost (reported
...
by make distcheck).
2005-11-04 16:48:32 +00:00
Patrick Lam
ea9726b620
Fix argument ordering problem in call to FcPatternTransferFullFname.
2005-11-03 04:45:57 +00:00
Patrick Lam
7358dae49b
Fix warnings and embarrassing double-free error.
2005-11-03 04:23:22 +00:00
Patrick Lam
d7b3ac6367
Don't zero out full names for FC_REF_CONSTANT fonts; also, duplicate full
...
names when transferring, and free full names when freeing the
associated font. Reported by Jinghua Luo.
2005-11-02 15:29:53 +00:00
Patrick Lam
303bcf9b9d
Revert the previous patch and commit the correct patch: I forgot a
...
canonicalization in FcValueListSerialize, so that it would choke on
already-serialized input files. Duh!
2005-11-02 07:37:00 +00:00
Patrick Lam
9090cb9ece
Fix thinko: actually, the whole global cache is stale if the global cache
...
is older than the (newest) config file.
2005-11-02 06:39:23 +00:00
Patrick Lam
2b25f00c50
Declare the global cache of a directory's contents to be stale if the
...
directory is newer than the (newest) configuration file. S:
----------------------------------------------------------------------
2005-11-02 06:29:14 +00:00
Patrick Lam
793154ed8d
Copy the full pathname whenever duplicating an FcPattern; otherwise,
...
applications continue breaking.
2005-11-01 06:57:25 +00:00
Patrick Lam
d6946c1a11
Fix small memory error (tried to free argv); use basename and dirname
...
correctly (they can modify their arguments).
2005-11-01 05:52:28 +00:00
Patrick Lam
e77c17184a
Reinstate basename patch, but keep a hash table linking FcPatterns to their
...
fully-qualified font names for clients' benefit. Clients only pay for
the font names once they request the FC_FILE property from an
FcPattern, but the font name is malloc'd at that point (i.e. not
mmapped: that's impossible, since it may vary between machines.)
Clients do have to pay for a copy of the path name per cache file.
Note that FcPatternGetString now does some rewriting if you ask for an
FC_FILE, appending the pathname as appropriate.
2005-11-01 05:26:27 +00:00
Patrick Lam
be99726f67
Revert basename patch, which breaks fontconfig clients on my system.
2005-10-31 06:02:00 +00:00
Patrick Lam
720298e773
Add FC_EMBEDDED_BITMAP object type to tell Xft/Cairo whether to load
...
embedded bitmaps or not.
reviewed by: plam
2005-10-26 06:34:29 +00:00
Patrick Lam
961d9b9993
Only add basename to patterns' FC_FILE element, not any part of the
...
dirname.
2005-10-25 22:29:13 +00:00
Patrick Lam
573da72910
Add some more consts, fixing more GCC4 warnings.
2005-10-22 15:12:05 +00:00
Patrick Lam
904426816d
Support localized font family and style names. This has been reported to
...
break old apps like xfd, but modern (gtk+/qt/mozilla) apps work fine.
reviewed by: plam
2005-10-22 14:21:14 +00:00
Patrick Lam
e58b50e88c
Destroy the global cache file if it's terminally broken. (reported by Mike
...
Fabian)
2005-10-21 20:24:30 +00:00
Patrick Lam
2fa3f27e68
Prevent fc-list from escaping strings when printing them.
2005-10-21 19:47:43 +00:00
Patrick Lam
21696e5bf0
Add consts to variables so as to move arrays into .rodata.
...
reviewed by: plam
2005-10-14 21:02:31 +00:00
Patrick Lam
15d7bd0a16
Check existence of directory cache file before attempting to unlink.
...
reviewed by: plam
2005-10-14 20:56:27 +00:00
Patrick Lam
1178b56976
Fix flipped return value on unlink. (Reported by Mike Fabian)
2005-10-13 12:32:14 +00:00
Patrick Lam
2eb8437406
When fc-cache is run without --force, use directory cache files to speed up
...
fc-cache run time.
2005-10-12 07:55:42 +00:00
Patrick Lam
23787a8f1b
Add padding to make valgrind and glibc not hate each other when calling
...
strlen().
2005-10-06 20:45:25 +00:00
Patrick Lam
edffd3b964
Fix typo in manually applying patch.
2005-10-05 21:12:25 +00:00
Patrick Lam
1ed67f658c
Use libtool -no-undefined flag on all platforms.
...
reviewed by: plam & keithp
2005-10-05 19:32:41 +00:00
Patrick Lam
751932ddb1
Implement move-to-front array for banks (perf regression reported by Ronny
...
V. Vindenes).
2005-10-05 18:41:55 +00:00
Patrick Lam
55c8fa4f08
Add new API which unlinks directory caches and checks dir caches for
...
existence of appropriate sections. Fix fc-cache to unlink stale cache
files and save directory caches that lack relevant sections.
2005-10-05 00:34:52 +00:00
Patrick Lam
6bf2380478
Ensure that a directory cache has the appropriate section before reporting
...
that it is valid (reported by Matthias Clasen).
2005-10-03 19:51:11 +00:00
Patrick Lam
e99f0f0a45
Use libxml2 if requested (with --enable-libxml2) or if expat is not
...
available.
reviewed by: plam
2005-09-29 20:53:30 +00:00
Patrick Lam
649cc3616d
Fix multi-arch cache files: compute the position for the block to be added
...
using info from OrigFile, not NewFile.
2005-09-29 05:14:04 +00:00
Patrick Lam
cd3109114c
Cast results of sizeof() to unsigned int to get rid of warnings on x86_64
...
(thanks Matthias Clasen).
2005-09-28 16:21:14 +00:00
Patrick Lam
1d879de2d9
Use FcAtomic to rewrite cache files.
2005-09-28 00:23:15 +00:00
Patrick Lam
099f9a8683
Don't unlink the fonts.cache-2 file even if there's no data to write; just
...
write an empty cache file. (thanks Lubos Lunak)
2005-09-27 15:52:58 +00:00
Patrick Lam
6aee8c6faa
Allocate room for the subdirectory names in each directory cache. Thanks to
...
James Cloos for finding and diagnosing this bug!
2005-09-27 05:43:08 +00:00
Patrick Lam
a9698bed65
Update documentation -- fc-cache's man page now says that you need to run
...
fc-cache once per cached architecture; add some documentation to the
FcCache structure.
Make fc-cache write out fonts.cache-2 files for directories with no fonts
(i.e. only subdirectories).
2005-09-23 04:09:37 +00:00
Patrick Lam
e3ff8a4ea6
Remove debugging printf (oops).
2005-09-23 02:33:55 +00:00
Patrick Lam
bef069e19e
Convert fromcode to char[12] from char *.
2005-09-23 02:08:40 +00:00
Patrick Lam
c7beacf916
Small patch for output in case where lineno not defined.
2005-09-23 01:48:33 +00:00
Patrick Lam
67accef4d3
Fix more gcc4 warnings:
...
- Cast sizeof to int, to shut up signedness warnings in comparison.
- Add consts where appropriate.
reviewed by: Patrick Lam <plam@mit.edu>
2005-09-22 23:45:53 +00:00
Patrick Lam
141432505a
Fix bug when clients use FcNameRegisterObjectTypes; fontconfig was
...
returning bogus (i.e. duplicate) FcObjectPtr values. Now use negative
values for dynamic object strings and positive values for built-in and
FcNameRegisterObjectType strings. Thanks to Matthias Clasen for
pinpointing this bus!
2005-09-22 20:49:24 +00:00
Patrick Lam
9fe2bd7ab0
Add missing FcValueCanonicalize on call to FcPatternAdd.
2005-09-16 04:57:18 +00:00
Patrick Lam
13cdf60753
Revert ill-advised addition of FC_RENDER. Add strategy for handling objects
...
that aren't hardcoded into fontconfig, but generated by fontconfig
clients: keep another array of user-defined objects (indexed after the
built-in objects).
Fix compilation warning (uninitialized variable).
Add comment.
2005-09-15 20:36:44 +00:00
Patrick Lam
0fa237d1e0
Add a global binding for the 'render' pattern element used by Xft; the lack
...
of said binding prevented programs from using FcPatterns through Xft.
2005-09-11 05:17:28 +00:00
Patrick Lam
8245771d5a
Merge with HEAD and finish the GCC 4 cleanups (no more warnings!)
2005-09-11 02:16:09 +00:00
Patrick Lam
8cb4c56d99
Robustness fixes: check return values from read and lseek; fix
...
uninitialized variables; ensure progress on FcCacheSkipToArch.
2005-09-07 15:38:46 +00:00
Patrick Lam
03a212e525
Really fix the global cache: make sure we're reading and writing the same
...
data format. Also match subdirectories when consuming cache
information. Also check dates for global cache: a dir is out of date if
it is newer than the global cache; scan it manually if that's the case.
2005-09-03 04:56:56 +00:00
Patrick Lam
f6ee3db5f0
Fix addressing in the global cache file, preventing infinite loops. Get rid
...
of unused variables.
2005-09-02 06:16:49 +00:00
Patrick Lam
07b3e57663
Apply Matthias Clasen's patch to fix obvious bogosity (i.e. missing
...
FcObjectPtrU).
2005-09-01 18:29:28 +00:00
Patrick Lam
0230c9f887
Fix embarassing attempt to free a static buffer.
2005-09-01 06:59:44 +00:00
Patrick Lam
2304e38f9b
:
...
Save subdirectory names in cache files to save time. This completely
restores the original fontconfig API, BTW. Note that directories
without fonts don't get a cache file; but then how many files would it
have in that directory...
2005-09-01 06:14:46 +00:00
Patrick Lam
5e678e9459
Only load requested fonts for fc-cache, and cleanup memory handling:
...
*Serialize no longer mutates original FcPatterns, it creates a new copy
in the supplied buffer. Fix thinkos in global cache freeing and in
FcCacheSkipToArch.
2005-08-31 15:12:41 +00:00
Patrick Lam
fd77c154af
Fix compilation error exposed with gcc 2.95.
2005-08-30 23:03:42 +00:00
Patrick Lam
eb0cf67144
src/fcint.c
...
The global cache now uses the same mmap-based cache infrastructure as the
per-directory caches. Furthermore, the global cache is automatically
updated (if possible) whenever fontconfig is used. Rip out remnants of
the old cache infrastructure.
2005-08-30 05:55:13 +00:00
Patrick Lam
2dbe759762
Emit and verify machine signature (sizeof (stuff) + endianness) in cache
...
files. Fix bugs in FcCacheBankToIndex.
2005-08-28 05:20:23 +00:00
Patrick Lam
7f37423d8c
Replace FcObjectStaticName by FcStrStaticName. Implement serialization of
...
'object' table (strings pointed to by FcPatternElt->object and used as
keys) and loading of object table from cache file if more strings are
present in cache file than in current version of fontconfig. Hash the
object table in memory.
2005-08-27 02:34:24 +00:00
Patrick Lam
1b7be37790
Reinstate the old global cache code. For the forseeable future, it's
...
probably all right to use the global cache as it was previously and
just store filenames and font info, as long as no mmap cache exists in
the directory. Of course, if an mmap cache exists, use that instead.
If a directory cache does not exist or is invalid, load the fonts for just
that directory using the old codepath.
Fix premature free of the FcPatterns belonging to the FcFontSet which we
create from the mmapped files.
2005-08-25 07:38:02 +00:00
Patrick Lam
4262e0b385
Overhaul the serialization system to create one mmapable file per directory
...
and distribute bytes for each directory from a single malloc for that
directory. Store pointers as differences between the data pointed to
and the pointer's address (s_off = s - v). Don't serialize data
structures that never actually get serialized. Separate strings used
for keys from strings used for values (in FcPatternElt and FcValue,
respectively). Bump FC_CACHE_VERSION to 2.
2005-08-24 06:21:30 +00:00