diff options
| author | James Bursa <james@netsurf-browser.org> | 2005-02-20 13:10:58 +0000 |
|---|---|---|
| committer | James Bursa <james@netsurf-browser.org> | 2005-02-20 13:10:58 +0000 |
| commit | 729bcd6437c428ca2e37f181344354210883b3de (patch) | |
| tree | e981f834d2e0b2c3c3fa5e053787839f8736c779 | |
| parent | c9b0e66246b905805a9e5d025771587a0e4f9a75 (diff) | |
| download | librufl-729bcd6437c428ca2e37f181344354210883b3de.tar.gz librufl-729bcd6437c428ca2e37f181344354210883b3de.tar.bz2 | |
[project @ 2005-02-20 13:10:58 by bursa]
Fix rufl_place_in_cache() bug and some other bugs.
svn path=/import/rufl/; revision=2450
| -rw-r--r-- | rufl_paint.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/rufl_paint.c b/rufl_paint.c index af771bb..8c39637 100644 --- a/rufl_paint.c +++ b/rufl_paint.c @@ -365,10 +365,8 @@ rufl_code rufl_process_span_old(rufl_action action, (trfm ? font_GIVEN_TRFM : 0) | font_GIVEN_LENGTH | font_GIVEN_FONT | font_KERN, *x, y, 0, trfm, n); - if (rufl_fm_error) { - xfont_lose_font(f); + if (rufl_fm_error) return rufl_FONT_MANAGER_ERROR; - } } /* increment x by width of span */ @@ -387,10 +385,8 @@ rufl_code rufl_process_span_old(rufl_action action, 0x7fffffff, 0x7fffffff, 0, trfm, n, 0, &x_out, &y_out, 0); } - if (rufl_fm_error) { - xfont_lose_font(f); + if (rufl_fm_error) return rufl_FONT_MANAGER_ERROR; - } *x += x_out / 400; return rufl_OK; @@ -513,9 +509,11 @@ rufl_code rufl_place_in_cache(unsigned int font, unsigned int font_size, evict = i; } } - rufl_fm_error = xfont_lose_font(rufl_cache[evict].f); - if (rufl_fm_error) - return rufl_FONT_MANAGER_ERROR; + if (rufl_cache[evict].font != rufl_CACHE_NONE) { + rufl_fm_error = xfont_lose_font(rufl_cache[evict].f); + if (rufl_fm_error) + return rufl_FONT_MANAGER_ERROR; + } rufl_cache[evict].font = font; rufl_cache[evict].size = font_size; rufl_cache[evict].f = f; |