diff options
| author | Felipe Corrêa da Silva Sanches <juca@members.fsf.org> | 2018-03-27 20:57:32 +0000 |
|---|---|---|
| committer | Felipe Corrêa da Silva Sanches <juca@members.fsf.org> | 2018-03-27 20:58:51 +0000 |
| commit | a679bb93e87a142a4cfa2720881bd033d570bebb (patch) | |
| tree | 291650706054e23166970c7e7d03c61523822543 /src/ui | |
| parent | Convert Pango font variations string to CSS format before saving to CSS. (diff) | |
| download | inkscape-a679bb93e87a142a4cfa2720881bd033d570bebb.tar.gz inkscape-a679bb93e87a142a4cfa2720881bd033d570bebb.zip | |
a few more fixes to build warnings related to libnrtype
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/dialog/font-substitution.cpp | 6 | ||||
| -rw-r--r-- | src/ui/widget/font-variants.cpp | 18 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/ui/dialog/font-substitution.cpp b/src/ui/dialog/font-substitution.cpp index a07a7b7b3..da7d14d9c 100644 --- a/src/ui/dialog/font-substitution.cpp +++ b/src/ui/dialog/font-substitution.cpp @@ -170,11 +170,9 @@ std::vector<SPItem*> FontSubstitution::getFontReplacedItems(SPDocument* doc, Gli if (parent_text != NULL) { family = SP_TEXT(parent_text)->layout.getFontFamily(0); // Add all the spans fonts to the set - gint ii = 0; - for (auto& child: parent_text->children) { - family = SP_TEXT(parent_text)->layout.getFontFamily(ii); + for (unsigned int f=0; f < parent_text->children.size(); f++) { + family = SP_TEXT(parent_text)->layout.getFontFamily(f); setFontSpans.insert(family); - ii++; } } } diff --git a/src/ui/widget/font-variants.cpp b/src/ui/widget/font-variants.cpp index 12c920264..6d072602f 100644 --- a/src/ui/widget/font-variants.cpp +++ b/src/ui/widget/font-variants.cpp @@ -662,29 +662,31 @@ namespace Widget { // Caps { - unsigned caps_new = SP_CSS_FONT_VARIANT_CAPS_NORMAL; + //unsigned caps_new; Glib::ustring css_string; if( _caps_normal.get_active() ) { css_string = "normal"; - caps_new = SP_CSS_FONT_VARIANT_CAPS_NORMAL; + // caps_new = SP_CSS_FONT_VARIANT_CAPS_NORMAL; } else if( _caps_small.get_active() ) { css_string = "small-caps"; - caps_new = SP_CSS_FONT_VARIANT_CAPS_SMALL; + // caps_new = SP_CSS_FONT_VARIANT_CAPS_SMALL; } else if( _caps_all_small.get_active() ) { css_string = "all-small-caps"; - caps_new = SP_CSS_FONT_VARIANT_CAPS_ALL_SMALL; + // caps_new = SP_CSS_FONT_VARIANT_CAPS_ALL_SMALL; } else if( _caps_petite.get_active() ) { css_string = "petite"; - caps_new = SP_CSS_FONT_VARIANT_CAPS_PETITE; + // caps_new = SP_CSS_FONT_VARIANT_CAPS_PETITE; } else if( _caps_all_petite.get_active() ) { css_string = "all-petite"; - caps_new = SP_CSS_FONT_VARIANT_CAPS_ALL_PETITE; + // caps_new = SP_CSS_FONT_VARIANT_CAPS_ALL_PETITE; } else if( _caps_unicase.get_active() ) { css_string = "unicase"; - caps_new = SP_CSS_FONT_VARIANT_CAPS_UNICASE; + // caps_new = SP_CSS_FONT_VARIANT_CAPS_UNICASE; } else if( _caps_titling.get_active() ) { css_string = "titling"; - caps_new = SP_CSS_FONT_VARIANT_CAPS_TITLING; + // caps_new = SP_CSS_FONT_VARIANT_CAPS_TITLING; + //} else { + // caps_new = SP_CSS_FONT_VARIANT_CAPS_NORMAL; } // May not be necessary... need to test. |