diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-01-20 23:32:34 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-01-20 23:32:34 +0000 |
| commit | 239f999936663c9832bc7569133e694c1ce72741 (patch) | |
| tree | 87dba34352fd8a6f8924ea3bfddd67999c3e44c3 /amiga/font_bullet.c | |
| parent | 1724e2835028daf90de80b151ab8fd4c3064fd02 (diff) | |
| parent | 750677795ba1ca41627edd68a4de24e0d6c07a20 (diff) | |
| download | netsurf-239f999936663c9832bc7569133e694c1ce72741.tar.gz netsurf-239f999936663c9832bc7569133e694c1ce72741.tar.bz2 | |
Merge branch 'master' of git://git.netsurf-browser.org/netsurf
Diffstat (limited to 'amiga/font_bullet.c')
| -rw-r--r-- | amiga/font_bullet.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/amiga/font_bullet.c b/amiga/font_bullet.c index 2800533a0..f63455257 100644 --- a/amiga/font_bullet.c +++ b/amiga/font_bullet.c @@ -55,7 +55,7 @@ #define NSA_VALUE_SHEARSIN (1 << 14) #define NSA_VALUE_SHEARCOS (1 << 16) -#define NSA_FONT_EMWIDTH(s) (s / FONT_SIZE_SCALE) * (ami_xdpi / 72.0) +#define NSA_FONT_EMWIDTH(s) (s / FONT_SIZE_SCALE) * (ami_font_dpi_get_xdpi() / 72.0) const uint16 sc_table[] = { 0x0061, 0x1D00, /* a */ @@ -155,7 +155,7 @@ static inline uint32 amiga_nsfont_decode_surrogate(const uint16 *char1) } } -static inline bool amiga_nsfont_width(const plot_font_style_t *fstyle, +static bool amiga_nsfont_width(const plot_font_style_t *fstyle, const char *string, size_t length, int *width) { @@ -178,7 +178,7 @@ static inline bool amiga_nsfont_width(const plot_font_style_t *fstyle, * \return true on success, false on error and error reported */ -static inline bool amiga_nsfont_position_in_string(const plot_font_style_t *fstyle, +static bool amiga_nsfont_position_in_string(const plot_font_style_t *fstyle, const char *string, size_t length, int x, size_t *char_offset, int *actual_x) { @@ -261,7 +261,7 @@ static inline bool amiga_nsfont_position_in_string(const plot_font_style_t *fsty * Returning char_offset == length means no split possible */ -static inline bool amiga_nsfont_split(const plot_font_style_t *fstyle, +static bool amiga_nsfont_split(const plot_font_style_t *fstyle, const char *string, size_t length, int x, size_t *char_offset, int *actual_x) { @@ -510,7 +510,7 @@ static struct OutlineFont *ami_open_outline_font(const plot_font_style_t *fstyle #endif if(ESetInfo(AMI_OFONT_ENGINE, - OT_DeviceDPI, ami_devicedpi, + OT_DeviceDPI, ami_font_dpi_get_devicedpi(), OT_PointHeight, ysize, OT_EmboldenX, emboldenx, OT_EmboldenY, emboldeny, |