summaryrefslogtreecommitdiff
path: root/usvg/src
diff options
context:
space:
mode:
authorEvgeniy Reizner <razrfalcon@gmail.com>2019-07-23 16:58:12 +0300
committerEvgeniy Reizner <razrfalcon@gmail.com>2019-07-23 16:58:22 +0300
commitb7a724cb540737326e01d74221e8ecbddbcdd76f (patch)
treea4d07ce399aecb84a13bee7ef456f32b38c4d76d /usvg/src
parenta829bc6c2272b96ed1875f2984f84e11f74a71fc (diff)
Dependencies updated.
Diffstat (limited to 'usvg/src')
-rw-r--r--usvg/src/fontdb.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/usvg/src/fontdb.rs b/usvg/src/fontdb.rs
index ec10e44..f003258 100644
--- a/usvg/src/fontdb.rs
+++ b/usvg/src/fontdb.rs
@@ -175,8 +175,8 @@ impl Database {
};
let underline = match font.underline_metrics() {
- Ok(metrics) => metrics,
- Err(_) => {
+ Some(metrics) => metrics,
+ None => {
ttf_parser::LineMetrics {
position: -(units_per_em as i16) / 9,
thickness: units_per_em as i16 / 12,
@@ -185,18 +185,18 @@ impl Database {
};
let line_through_position = match font.strikeout_metrics() {
- Ok(metrics) => metrics.position,
- Err(_) => x_height / 2,
+ Some(metrics) => metrics.position,
+ None => x_height / 2,
};
// 0.2 and 0.4 are generic offsets used by some applications (Inkscape/librsvg).
let mut subscript_offset = (units_per_em as f32 / 0.2).round() as i16;
let mut superscript_offset = (units_per_em as f32 / 0.4).round() as i16;
- if let Ok(metrics) = font.subscript_metrics() {
+ if let Some(metrics) = font.subscript_metrics() {
subscript_offset = metrics.y_offset;
}
- if let Ok(metrics) = font.superscript_metrics() {
+ if let Some(metrics) = font.superscript_metrics() {
superscript_offset = metrics.y_offset;
}