[dia/dia-0-97] [warningectomy] implicit conversion from enumeration type
- From: Hans Breuer <hans src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dia/dia-0-97] [warningectomy] implicit conversion from enumeration type
- Date: Sat, 15 Mar 2014 17:09:33 +0000 (UTC)
commit a069515d3ff6f8b27ea6cf3c8c787628cfeda98b
Author: Hans Breuer <hans breuer org>
Date: Mon May 20 16:29:43 2013 +0200
[warningectomy] implicit conversion from enumeration type
implicit conversion from enumeration type 'enum _cairo_font_slant' to
different enumeration type 'cairo_font_weight_t' (aka 'enum
_cairo_font_weight') [-Wenum-conversion]
DIA_FONT_STYLE_GET_WEIGHT (style) <
DIA_FONT_MEDIUM ? CAIRO_FONT_SLANT_NORMAL : CAIRO_FONT_WEIGHT_BOLD);
^~~~~~~~~~~~~~~~~~~~~~~
(cherry picked from commit 36104262d2d3cffb1ac61ed3ce6585ec306904c1)
objects/standard/outline.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/objects/standard/outline.c b/objects/standard/outline.c
index cea4d4c..ea2caf3 100644
--- a/objects/standard/outline.c
+++ b/objects/standard/outline.c
@@ -275,7 +275,7 @@ outline_update_data (Outline *outline)
/* not exact matching but almost the best we can do with the toy api */
cairo_select_font_face (cr, dia_font_get_family (outline->font),
DIA_FONT_STYLE_GET_SLANT (style) == DIA_FONT_NORMAL ? CAIRO_FONT_SLANT_NORMAL :
CAIRO_FONT_SLANT_ITALIC,
- DIA_FONT_STYLE_GET_WEIGHT (style) < DIA_FONT_MEDIUM ? CAIRO_FONT_SLANT_NORMAL :
CAIRO_FONT_WEIGHT_BOLD);
+ DIA_FONT_STYLE_GET_WEIGHT (style) < DIA_FONT_MEDIUM ? CAIRO_FONT_WEIGHT_NORMAL :
CAIRO_FONT_WEIGHT_BOLD);
cairo_set_font_size (cr, outline->font_height);
cairo_text_extents (cr, outline->name, &extents);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]