diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2021-07-06 15:52:32 +0100 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2021-07-06 15:52:32 +0100 |
| commit | 6451155a3b5b8ad4e42515fb6708d43af14b1c0b (patch) | |
| tree | 3fc3bd0700d1d07cfed295df94058eb937650cd9 | |
| parent | 6471c6dd8b05a8e994830471ae413b7335aa7ae6 (diff) | |
| download | netsurf-6451155a3b5b8ad4e42515fb6708d43af14b1c0b.tar.gz netsurf-6451155a3b5b8ad4e42515fb6708d43af14b1c0b.tar.bz2 | |
Amiga: use diskfont v47 API when building for AmigaOS 3
| -rw-r--r-- | frontends/amiga/font_bullet.c | 14 | ||||
| -rwxr-xr-x | frontends/amiga/font_scan.h | 7 |
2 files changed, 2 insertions, 19 deletions
diff --git a/frontends/amiga/font_bullet.c b/frontends/amiga/font_bullet.c index dec39a1f7..5813e0f1c 100644 --- a/frontends/amiga/font_bullet.c +++ b/frontends/amiga/font_bullet.c @@ -25,15 +25,13 @@ #include <stdlib.h> -#ifndef __amigaos4__ -#include <proto/bullet.h> -#endif #include <proto/diskfont.h> #include <proto/exec.h> #include <proto/graphics.h> #include <proto/utility.h> #include <diskfont/diskfonttag.h> +#include <diskfont/glyph.h> /* for FIXED */ #include <diskfont/oterrors.h> #include "utils/log.h" @@ -527,10 +525,6 @@ static struct OutlineFont *ami_open_outline_font(const plot_font_style_t *fstyle ofont = designed_node->font; } -#ifndef __amigaos4__ - struct BulletBase *BulletBase = ofont->BulletBase; -#endif - if(ESetInfo(AMI_OFONT_ENGINE, OT_DeviceDPI, ami_font_dpi_get_devicedpi(), OT_PointHeight, ysize, @@ -555,9 +549,6 @@ static inline int32 ami_font_plot_glyph(struct OutlineFont *ofont, struct RastPo ULONG glyphmaptag; ULONG template_type; uint32 long_char_1 = 0, long_char_2 = 0; -#ifndef __amigaos4__ - struct BulletBase *BulletBase = ofont->BulletBase; -#endif #ifndef __amigaos4__ if (__builtin_expect(((*char1 >= 0xD800) && (*char1 <= 0xDBFF)), 0)) { @@ -662,9 +653,6 @@ static inline int32 ami_font_width_glyph(struct OutlineFont *ofont, bool skip_c2 = false; uint32 long_char_1 = 0; uint32 long_char_2; -#ifndef __amigaos4__ - struct BulletBase *BulletBase = ofont->BulletBase; -#endif #ifndef __amigaos4__ if (__builtin_expect(((*char1 >= 0xD800) && (*char1 <= 0xDBFF)), 0)) { diff --git a/frontends/amiga/font_scan.h b/frontends/amiga/font_scan.h index 7d61e2daa..f1dd397cd 100755 --- a/frontends/amiga/font_scan.h +++ b/frontends/amiga/font_scan.h @@ -21,13 +21,9 @@ #include "amiga/os3support.h" #include <libwapcaplet/libwapcaplet.h> -/* Compatibliity define used by font.c and font_scan.c +/* Compatibility define used by font.c and font_scan.c * It's here because this file is included by both. */ -#ifdef __amigaos4__ #define AMI_OFONT_ENGINE &ofont->olf_EEngine -#else -#define AMI_OFONT_ENGINE ofont->GEngine -#endif void ami_font_scan_init(const char *filename, bool force_scan, bool save, lwc_string **glypharray); @@ -36,4 +32,3 @@ void ami_font_scan_save(const char *filename, lwc_string **glypharray); const char *ami_font_scan_lookup(const uint16 *code, lwc_string **glypharray); #endif - |