diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2015-10-04 18:16:29 +0000 |
|---|---|---|
| committer | jabiertxof <jabier.arraiza@marker.es> | 2015-10-04 18:16:29 +0000 |
| commit | bd5317c58e55c608148f1cc62b813fea7077c76a (patch) | |
| tree | ba739ddc4c3c6c2e8860b2ea9308307efcdad158 /src | |
| parent | Added knots to post editing the measure and make it persistant throught tools (diff) | |
| parent | Fixes clonetiler trace mode on non-px documents (diff) | |
| download | inkscape-bd5317c58e55c608148f1cc62b813fea7077c76a.tar.gz inkscape-bd5317c58e55c608148f1cc62b813fea7077c76a.zip | |
update to trunk
(bzr r14393.1.4)
Diffstat (limited to 'src')
| -rw-r--r-- | src/style.cpp | 2 | ||||
| -rw-r--r-- | src/ui/dialog/clonetiler.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
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 += ", "; 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); |