From 478e6969f70a62349396fa4e57e3c63b5811c165 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Sun, 4 Oct 2015 10:16:46 +0200 Subject: Protect against a NULL value for 'font-feature-settings'. "Fixes" #1502432. Fixed bugs: - https://launchpad.net/bugs/1502432 (bzr r14395) --- src/style.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/style.cpp b/src/style.cpp index d8402e08a..0cb5db0a7 100644 --- a/src/style.cpp +++ b/src/style.cpp @@ -1258,7 +1258,7 @@ SPStyle::getFontFeatureString() { if( font_variant_east_asian.value & SP_CSS_FONT_VARIANT_EAST_ASIAN_RUBY ) feature_string += "ruby, "; - if ( strcmp( font_feature_settings.value, "normal") ) { + if ( font_feature_settings.value && strcmp( font_feature_settings.value, "normal") ) { // We do no sanity checking... feature_string += font_feature_settings.value; feature_string += ", "; -- cgit v1.2.3 From 4ebb09cb87a2f082f505e774f33c1f6d24fdf26d Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Sun, 4 Oct 2015 17:42:12 +0200 Subject: Fixes clonetiler trace mode on non-px documents Fixed bugs: - https://launchpad.net/bugs/1502521 (bzr r14396) --- src/ui/dialog/clonetiler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp index f84a2ffd6..da1c6d9fb 100644 --- a/src/ui/dialog/clonetiler.cpp +++ b/src/ui/dialog/clonetiler.cpp @@ -2479,7 +2479,7 @@ void CloneTiler::clonetiler_apply(GtkWidget */*widget*/, GtkWidget *dlg) // Trace tab if (dotrace) { - Geom::Rect bbox_t = transform_rect (bbox_original, t); + Geom::Rect bbox_t = transform_rect (bbox_original, t*Geom::Scale(1.0/scale_units)); guint32 rgba = clonetiler_trace_pick (bbox_t); float r = SP_RGBA32_R_F(rgba); -- cgit v1.2.3