diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2015-01-30 18:32:44 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2015-01-30 18:32:44 +0000 |
| commit | 206639055572c11bcad0d71b22d325779dc83e95 (patch) | |
| tree | dd968039af6ce4ed5e19c372e5e213da9beae24c /amiga/font.c | |
| parent | 2893e30c4e1eebecf84636c35fd1bbc54698b1ed (diff) | |
| download | netsurf-206639055572c11bcad0d71b22d325779dc83e95.tar.gz netsurf-206639055572c11bcad0d71b22d325779dc83e95.tar.bz2 | |
Fix bullet.library usage
Diffstat (limited to 'amiga/font.c')
| -rw-r--r--[-rwxr-xr-x] | amiga/font.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/amiga/font.c b/amiga/font.c index 4fbd60ace..435e75992 100755..100644 --- a/amiga/font.c +++ b/amiga/font.c @@ -554,7 +554,7 @@ struct OutlineFont *ami_open_outline_font(const plot_font_style_t *fstyle, struct BulletBase *BulletBase = ofont->BulletBase; #endif - if(ESetInfo(&ofont->olf_EEngine, + if(ESetInfo(AMI_OFONT_ENGINE, OT_DeviceDPI, ami_devicedpi, OT_PointHeight, ysize, OT_EmboldenX, emboldenx, @@ -602,12 +602,12 @@ int32 ami_font_plot_glyph(struct OutlineFont *ofont, struct RastPort *rp, #endif } - if(ESetInfo(&ofont->olf_EEngine, + if(ESetInfo(AMI_OFONT_ENGINE, OT_GlyphCode, *char1, OT_GlyphCode2, *char2, TAG_END) == OTERR_Success) { - if(EObtainInfo(&ofont->olf_EEngine, + if(EObtainInfo(AMI_OFONT_ENGINE, glyphmaptag, &glyph, TAG_END) == 0) { @@ -639,17 +639,17 @@ int32 ami_font_plot_glyph(struct OutlineFont *ofont, struct RastPort *rp, kern = 0; - if(*char2) EObtainInfo(&ofont->olf_EEngine, + if(*char2) EObtainInfo(AMI_OFONT_ENGINE, OT_TextKernPair, &kern, TAG_END); char_advance = (ULONG)(((glyph->glm_Width - kern) * emwidth) / 65536); - EReleaseInfo(&ofont->olf_EEngine, + EReleaseInfo(AMI_OFONT_ENGINE, glyphmaptag, glyph, TAG_END); - if(*char2) EReleaseInfo(&ofont->olf_EEngine, + if(*char2) EReleaseInfo(AMI_OFONT_ENGINE, OT_TextKernPair, kern, TAG_END); } @@ -683,12 +683,12 @@ int32 ami_font_width_glyph(struct OutlineFont *ofont, if (*char2 < 0x0020) skip_c2 = true; - if(ESetInfo(&ofont->olf_EEngine, + if(ESetInfo(AMI_OFONT_ENGINE, OT_GlyphCode, *char1, OT_GlyphCode2, *char1, TAG_END) == OTERR_Success) { - if(EObtainInfo(&ofont->olf_EEngine, + if(EObtainInfo(AMI_OFONT_ENGINE, OT_WidthList, &gwlist, TAG_END) == 0) { @@ -698,23 +698,23 @@ int32 ami_font_width_glyph(struct OutlineFont *ofont, kern = 0; if(!skip_c2) { - if(ESetInfo(&ofont->olf_EEngine, + if(ESetInfo(AMI_OFONT_ENGINE, OT_GlyphCode, *char1, OT_GlyphCode2, *char2, TAG_END) == OTERR_Success) { - EObtainInfo(&ofont->olf_EEngine, + EObtainInfo(AMI_OFONT_ENGINE, OT_TextKernPair, &kern, TAG_END); } } char_advance = (ULONG)(((char1w - kern) * emwidth) / 65536); - if(!skip_c2) EReleaseInfo(&ofont->olf_EEngine, + if(!skip_c2) EReleaseInfo(AMI_OFONT_ENGINE, OT_TextKernPair, kern, TAG_END); - EReleaseInfo(&ofont->olf_EEngine, + EReleaseInfo(AMI_OFONT_ENGINE, OT_WidthList, gwlist, TAG_END); } |