diff options
| author | Keith Packard <keithp@keithp.com> | 2005-01-11 10:03:01 +0000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2005-01-11 10:03:01 +0000 |
| commit | ad2225c6f4f18570cbd5e4391788458533895bb8 (patch) | |
| tree | 764a8f3958ec7efdbc91e40c7aaea9cf92aeec0f /src/cairo-cache.c | |
| parent | dc0d812f6c78bfc3e4cbf717cf09a4524d8f149c (diff) | |
| download | cairo-ad2225c6f4f18570cbd5e4391788458533895bb8.tar.gz | |
Fix math library detection to use autotools helper
Remove cache memory usage assertions as single objects can be larger than the cache size
Decompose font matrix transformations into a couple of helper routines. Return all metrics in font space.
Eliminate compiler warning
Expect glyph metrics to be in font space. Compute text extents by fetching one glyph metric at a time, transforming to user space and computing the overall bounding box.
use 'sincos' where available. Scale factors now ensure the non-scale transform is area preserving. Scale factors requires another parameter to mark the fixed axis.
Change license to LGPL Mark int32x32_64_mul as broken (which it still is)
Ensure each glyph is located as close to the specified position as possible
interface change to _cairo_matrix_compute_scale_factors
Diffstat (limited to 'src/cairo-cache.c')
| -rw-r--r-- | src/cairo-cache.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/cairo-cache.c b/src/cairo-cache.c index 9e0777844..b097b609b 100644 --- a/src/cairo-cache.c +++ b/src/cairo-cache.c @@ -121,7 +121,8 @@ _cache_sane_state (cairo_cache_t *cache) assert (cache->entries != NULL); assert (cache->backend != NULL); assert (cache->arrangement != NULL); - assert (cache->used_memory <= cache->max_memory); + /* Cannot check this, a single object may larger */ + /* assert (cache->used_memory <= cache->max_memory); */ assert (cache->live_entries <= cache->arrangement->size); } #else @@ -417,7 +418,8 @@ _cairo_cache_lookup (cairo_cache_t *cache, _entry_destroy (cache, idx); } - assert(cache->max_memory >= (cache->used_memory + new_entry->memory)); + /* Can't assert this; new_entry->memory may be larger than max_memory */ + /* assert(cache->max_memory >= (cache->used_memory + new_entry->memory)); */ /* Make room in the table for a new slot. */ status = _resize_cache (cache, cache->live_entries + 1); |