diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2014-10-15 14:43:15 +0200 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2014-12-03 12:25:51 +0100 |
| commit | 1ce69ac127c823463204ad522bb7c71ac7fad27a (patch) | |
| tree | 7814d15bc5f50a714c22eb33d70de63a6773ab28 /source/html/css-apply.c | |
| parent | 5cb1a29be4993d72cf6ab2af128135e2b7e40dd2 (diff) | |
| download | mupdf-1ce69ac127c823463204ad522bb7c71ac7fad27a.tar.xz | |
html: Use float for dimensions.
Diffstat (limited to 'source/html/css-apply.c')
| -rw-r--r-- | source/html/css-apply.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/source/html/css-apply.c b/source/html/css-apply.c index 550ade85..d38d999e 100644 --- a/source/html/css-apply.c +++ b/source/html/css-apply.c @@ -696,8 +696,8 @@ get_style_property_string(struct style *node, const char *name, const char *init return value->data; } -static int -compute_number(struct value *value, int em, int hundred, int scale, int initial) +static float +compute_number(struct value *value, float em, float hundred, float scale, float initial) { char *p; @@ -722,9 +722,9 @@ compute_number(struct value *value, int em, int hundred, int scale, int initial) if (p[0] == 'i' && p[1] == 'n') return x * 72; if (p[0] == 'c' && p[1] == 'm') - return x * 72 / 2.54; + return x * 7200 / 254; if (p[0] == 'm' && p[1] == 'm') - return x * 72 / 25.4; + return x * 720 / 254; if (p[0] == 'p' && p[1] == 'c') return x * 12; @@ -743,8 +743,8 @@ void compute_style(struct computed_style *style, struct style *node) { struct value *value; - int em = 12; - int hundred = 100; + float em = 12; + float hundred = 100; memset(style, 0, sizeof *style); @@ -875,13 +875,13 @@ print_style(struct computed_style *style) printf("\tfont-weight = %s;\n", style->bold ? "bold" : "normal"); printf("\tfont-style = %s;\n", style->italic ? "italic" : "normal"); printf("\tfont-variant = %s;\n", style->smallcaps ? "small-caps" : "normal"); - printf("\tfont-size = %d;\n", style->font_size); - printf("\tline-height = %d;\n", style->line_height); - printf("\ttext-indent = %d;\n", style->text_indent); + printf("\tfont-size = %g;\n", style->font_size); + printf("\tline-height = %g;\n", style->line_height); + printf("\ttext-indent = %g;\n", style->text_indent); printf("\tvertical-align = %d;\n", style->vertical_align); - printf("\tmargin = %d %d %d %d;\n", + printf("\tmargin = %g %g %g %g;\n", style->margin[0], style->margin[1], style->margin[2], style->margin[3]); - printf("\tpadding = %d %d %d %d;\n", + printf("\tpadding = %g %g %g %g;\n", style->padding[0], style->padding[1], style->padding[2], style->padding[3]); printf("}\n"); } |