From 6e13c2fb0a9b386bcca999a5744a655ec3721aad Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Tue, 21 Jul 2009 16:55:35 +0000 Subject: Scale font sizes, for better accuracy. svn path=/trunk/netsurf/; revision=8657 --- desktop/plot_style.h | 7 ++++++- desktop/save_pdf/font_haru.c | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'desktop') diff --git a/desktop/plot_style.h b/desktop/plot_style.h index 3b74a4efd..088f0d275 100644 --- a/desktop/plot_style.h +++ b/desktop/plot_style.h @@ -104,12 +104,17 @@ typedef unsigned long plot_font_flags_t; #define FONTF_OBLIQUE 2 #define FONTF_SMALLCAPS 4 +/** + * Scaling factor for font sizes + */ +#define FONT_SIZE_SCALE 1024 + /** * Font style for plotting */ typedef struct { plot_font_generic_family_t family; /**< Generic family to plot with */ - int size; /**< Font size, in points */ + int size; /**< Font size, in points * FONT_SIZE_SCALE */ int weight; /**< Font weight: value in range [100,900] as per CSS */ plot_font_flags_t flags; /**< Font flags */ colour background; /**< Background colour to blend to, if appropriate */ diff --git a/desktop/save_pdf/font_haru.c b/desktop/save_pdf/font_haru.c index faed7c168..0bf86c340 100644 --- a/desktop/save_pdf/font_haru.c +++ b/desktop/save_pdf/font_haru.c @@ -336,7 +336,7 @@ bool haru_nsfont_apply_style(const plot_font_style_t *fstyle, LOG(("Setting font: %s", font_name)); #endif - size = fstyle->size; + size = fstyle->size; if (font != NULL) size *= pdf_text_scale; @@ -344,6 +344,8 @@ bool haru_nsfont_apply_style(const plot_font_style_t *fstyle, if (size <= 0) return true; + size /= FONT_SIZE_SCALE; + if (size > HPDF_MAX_FONTSIZE) size = HPDF_MAX_FONTSIZE; -- cgit v1.2.3