mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-01-03 17:54:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix use of uninitialised variables in gtk print

Browse Source 
fixes errors detected by coverity.
This commit is contained in:
Vincent Sanders 2017-03-04 14:23:06 +00:00
parent 30ccc06984
commit ca942e9e26
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
frontends/gtk/print.c
View File

@ -324,11 +324,11 @@ nsgtk_print_plot_rectangle(const struct redraw_context *ctx,
const plot_style_t *style, const plot_style_t *style,
const struct rect *rect) const struct rect *rect)
{ {
int x0,y0,x1,y1;
LOG("x0: %i ;\t y0: %i ;\t x1: %i ;\t y1: %i", LOG("x0: %i ;\t y0: %i ;\t x1: %i ;\t y1: %i",
rect->x0, rect->y0, rect->x1, rect->y1); rect->x0, rect->y0, rect->x1, rect->y1);
if (style->fill_type != PLOT_OP_TYPE_NONE) { if (style->fill_type != PLOT_OP_TYPE_NONE) {
int x0,y0,x1,y1;
nsgtk_print_set_colour(style->fill_colour); nsgtk_print_set_colour(style->fill_colour);
nsgtk_print_set_solid(); nsgtk_print_set_solid();
@ -349,7 +349,15 @@ nsgtk_print_plot_rectangle(const struct redraw_context *ctx,
} }
if (style->stroke_type != PLOT_OP_TYPE_NONE) { if (style->stroke_type != PLOT_OP_TYPE_NONE) {
nsgtk_print_set_colour(style->stroke_colour); int stroke_width;
/* ensure minimum stroke width */
stroke_width = style->stroke_width;
if (stroke_width == 0) {
stroke_width = 1;
}
nsgtk_print_set_colour(style->stroke_colour);
switch (style->stroke_type) { switch (style->stroke_type) {
case PLOT_OP_TYPE_SOLID: /**< Solid colour */ case PLOT_OP_TYPE_SOLID: /**< Solid colour */
@ -366,12 +374,12 @@ nsgtk_print_plot_rectangle(const struct redraw_context *ctx,
break; break;
} }
if (style->stroke_width == 0) cairo_set_line_width(gtk_print_current_cr, stroke_width);
cairo_set_line_width(gtk_print_current_cr, 1);
else cairo_rectangle(gtk_print_current_cr,
cairo_set_line_width(gtk_print_current_cr, style->stroke_width); rect->x0, rect->y0,
rect->x1 - rect->x0, rect->y1 - rect->y0);
cairo_rectangle(gtk_print_current_cr, x0, y0, x1 - x0, y1 - y0);
cairo_stroke(gtk_print_current_cr); cairo_stroke(gtk_print_current_cr);
} }