4 files changed, 7 insertions, 7 deletions
diff --git a/frontends/framebuffer/fbtk/text.c b/frontends/framebuffer/fbtk/text.c
index 4f3a2385d..9c96dcef4 100644
--- a/frontends/framebuffer/fbtk/text.c
+++ b/frontends/framebuffer/fbtk/text.c
@@ -71,7 +71,7 @@ fb_text_font_style(fbtk_widget_t *widget, int *font_height, int *padding,
 #endif
 
 	font_style->family = PLOT_FONT_FAMILY_SANS_SERIF;
-	font_style->size = px_to_pt(*font_height * FONT_SIZE_SCALE);
+	font_style->size = px_to_pt(*font_height * PLOT_STYLE_SCALE);
 	font_style->weight = 400;
 	font_style->flags = FONTF_NONE;
 	font_style->background = widget->bg;
diff --git a/frontends/framebuffer/font_freetype.c b/frontends/framebuffer/font_freetype.c
index 9e47e4b99..744ac6281 100644
--- a/frontends/framebuffer/font_freetype.c
+++ b/frontends/framebuffer/font_freetype.c
@@ -392,7 +392,7 @@ static void fb_fill_scalar(const plot_font_style_t *fstyle, FTC_Scaler srec)
 
         srec->face_id = (FTC_FaceID)fb_faces[selected_face];
 
-	srec->width = srec->height = (fstyle->size * 64) / FONT_SIZE_SCALE;
+	srec->width = srec->height = (fstyle->size * 64) / PLOT_STYLE_SCALE;
 	srec->pixel = 0;
 
 	srec->x_res = srec->y_res = browser_get_dpi();
diff --git a/frontends/framebuffer/font_internal.c b/frontends/framebuffer/font_internal.c
index ff3471d1d..d755681c6 100644
--- a/frontends/framebuffer/font_internal.c
+++ b/frontends/framebuffer/font_internal.c
@@ -212,7 +212,7 @@ fb_get_font_size(const plot_font_style_t *fstyle)
 {
 	int size = fstyle->size * 10 /
 			(((nsoption_int(font_min_size) * 3 +
-			   nsoption_int(font_size)) / 4) * FONT_SIZE_SCALE);
+			   nsoption_int(font_size)) / 4) * PLOT_STYLE_SCALE);
 	if (size > 2)
 		size = 2;
 	else if (size <= 0)
diff --git a/frontends/framebuffer/framebuffer.c b/frontends/framebuffer/framebuffer.c
index 2ccc75062..52afdbf5d 100644
--- a/frontends/framebuffer/framebuffer.c
+++ b/frontends/framebuffer/framebuffer.c
@@ -168,7 +168,7 @@ framebuffer_plot_line(const struct redraw_context *ctx,
 		}
 
 		pen.stroke_colour = style->stroke_colour;
-		pen.stroke_width = style->stroke_width;
+		pen.stroke_width = plot_style_fixed_to_int(style->stroke_width);
 		nsfb_plot_line(nsfb, &rect, &pen);
 	}
 
@@ -216,7 +216,9 @@ framebuffer_plot_rectangle(const struct redraw_context *ctx,
 			dashed = true;
 		}
 
-		nsfb_plot_rectangle(nsfb, &rect, style->stroke_width, style->stroke_colour, dotted, dashed);
+		nsfb_plot_rectangle(nsfb, &rect,
+				plot_style_fixed_to_int(style->stroke_width),
+				style->stroke_colour, dotted, dashed);
 	}
 	return NSERROR_OK;
 }
@@ -259,7 +261,6 @@ framebuffer_plot_polygon(const struct redraw_context *ctx,
  * \param pstyle Style controlling the path plot.
  * \param p elements of path
  * \param n nunber of elements on path
- * \param width The width of the path
  * \param transform A transform to apply to the path.
  * \return NSERROR_OK on success else error code.
  */
@@ -268,7 +269,6 @@ framebuffer_plot_path(const struct redraw_context *ctx,
 		const plot_style_t *pstyle,
 		const float *p,
 		unsigned int n,
-		float width,
 		const float transform[6])
 {
 	NSLOG(netsurf, INFO, "path unimplemented");