[librsvg] text: impl From trait for XmlLang



commit d10cd6131f97e250eb40bb8fbec2c889099f3692
Author: Paolo Borelli <pborelli gnome org>
Date:   Sun Dec 30 18:11:28 2018 +0100

    text: impl From trait for XmlLang

 rsvg_internals/src/text.rs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/rsvg_internals/src/text.rs b/rsvg_internals/src/text.rs
index b2604888..7168ed44 100644
--- a/rsvg_internals/src/text.rs
+++ b/rsvg_internals/src/text.rs
@@ -21,6 +21,7 @@ use state::{
     TextAnchor,
     UnicodeBidi,
     WritingMode,
+    XmlLang,
     XmlSpace,
 };
 
@@ -656,6 +657,12 @@ fn to_pango_units(v: f64) -> i32 {
     (v * f64::from(pango::SCALE) + 0.5) as i32
 }
 
+impl From<&XmlLang> for pango::Language {
+    fn from(l: &XmlLang) -> pango::Language {
+        pango::Language::from_string(&l.0)
+    }
+}
+
 impl From<FontStyle> for pango::Style {
     fn from(s: FontStyle) -> pango::Style {
         match s {
@@ -764,8 +771,7 @@ fn create_pango_layout(
     // We use "" there as the default value; this means that the language is not set.
     // If the language *is* set, we can use it here.
     if !values.xml_lang.0.is_empty() {
-        let pango_lang = pango::Language::from_string(&values.xml_lang.0);
-        pango_context.set_language(&pango_lang);
+        pango_context.set_language(&pango::Language::from(&values.xml_lang));
     }
 
     pango_context.set_base_gravity(pango::Gravity::from(values.writing_mode));


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]