diff options
author | John Tytgat <joty@netsurf-browser.org> | 2004-08-14 15:07:21 +0000 |
---|---|---|
committer | John Tytgat <joty@netsurf-browser.org> | 2004-08-14 15:07:21 +0000 |
commit | 7264ae50e52050243d9723c47c395975e00b5e50 (patch) | |
tree | 43210eba9464a839d5cc5d76b1d60bfc7aaba467 /css | |
parent | 402c4ca66c7d95b1cdfc9eefbcb94947c807155b (diff) | |
download | netsurf-7264ae50e52050243d9723c47c395975e00b5e50.tar.gz netsurf-7264ae50e52050243d9723c47c395975e00b5e50.tar.bz2 |
[project @ 2004-08-14 15:07:19 by joty]
- Rename len() to css_len2px().
- Less compiler warnings concerning float/int implicit casts.
- More stddef.h type usuage.
svn path=/import/netsurf/; revision=1232
Diffstat (limited to 'css')
-rw-r--r-- | css/css.c | 8 | ||||
-rw-r--r-- | css/css.h | 2 |
2 files changed, 5 insertions, 5 deletions
@@ -948,7 +948,7 @@ bool css_match_detail(const struct css_selector *detail, bool match = false; char *s = 0; char *space, *word; - unsigned int length; + size_t length; switch (detail->type) { case CSS_SELECTOR_ID: @@ -2396,12 +2396,12 @@ unsigned int css_hash(const char *s, int length) * Convert a struct css_length to pixels. */ -float len(struct css_length * length, struct css_style * style) +float css_len2px(struct css_length * length, struct css_style * style) { assert(!((length->unit == CSS_UNIT_EM || length->unit == CSS_UNIT_EX) && style == 0)); switch (length->unit) { - case CSS_UNIT_EM: return length->value * len(&style->font_size.value.length, 0); - case CSS_UNIT_EX: return length->value * len(&style->font_size.value.length, 0) * 0.6; + case CSS_UNIT_EM: return length->value * css_len2px(&style->font_size.value.length, 0); + case CSS_UNIT_EX: return length->value * css_len2px(&style->font_size.value.length, 0) * 0.6; case CSS_UNIT_PX: return length->value; case CSS_UNIT_IN: return length->value * 90.0; case CSS_UNIT_CM: return length->value * 35.0; @@ -538,6 +538,6 @@ colour named_colour(const char *name); void css_dump_style(const struct css_style * const style); void css_dump_stylesheet(const struct css_stylesheet * stylesheet); -float len(struct css_length * length, struct css_style * style); +float css_len2px(struct css_length * length, struct css_style * style); #endif |