From a8e79b4d391fe41d25b1aeb79edc8a49b806751b Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Tue, 20 May 2014 20:17:48 +0100 Subject: Remove redundant NULL check. --- atari/plot/font_vdi.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/atari/plot/font_vdi.c b/atari/plot/font_vdi.c index 8f30b1b70..aee116e2f 100755 --- a/atari/plot/font_vdi.c +++ b/atari/plot/font_vdi.c @@ -280,19 +280,18 @@ static int text( FONT_PLOTTER self, int x, int y, const char *text, size_t leng atari_to_vdi_str(lstr, slen); - if( fstyle != NULL){ - if( fstyle->flags & FONTF_ITALIC ) - fx |= 4; - if( fstyle->flags & FONTF_OBLIQUE ) - fx |= 4; - if( fstyle->weight > 450 ) - fx |= 1; - - /* TODO: netsurf uses 90 as default dpi ( somewhere defined in libcss), - use that value or pass it as arg, to reduce netsurf dependency */ - //pxsize = ceil( (fstyle->size/FONT_SIZE_SCALE) * 90 / 72 ); - pxsize = ceil( (fstyle->size/FONT_SIZE_SCALE) * 90 / 72 ); - } + if( fstyle->flags & FONTF_ITALIC ) + fx |= 4; + if( fstyle->flags & FONTF_OBLIQUE ) + fx |= 4; + if( fstyle->weight > 450 ) + fx |= 1; + + /* TODO: netsurf uses 90 as default dpi ( somewhere defined in libcss), + use that value or pass it as arg, to reduce netsurf dependency */ + //pxsize = ceil( (fstyle->size/FONT_SIZE_SCALE) * 90 / 72 ); + pxsize = ceil( (fstyle->size/FONT_SIZE_SCALE) * 90 / 72 ); + plot_get_dimensions(&canvas); x += canvas.g_x; y += canvas.g_y; -- cgit v1.2.3