diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2014-07-27 11:44:25 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2014-07-27 11:44:25 +0000 |
| commit | 3ebd8c4550a8c8bf944e18fec8f3df3d2da5c1af (patch) | |
| tree | 981526f208f9998ea858cfd55a2c946f72dcb02e /src/style-internal.cpp | |
| parent | update to trunk (r13454) (diff) | |
| parent | Properly fix 1309050, revert incorrect fix for 601336 (diff) | |
| download | inkscape-3ebd8c4550a8c8bf944e18fec8f3df3d2da5c1af.tar.gz inkscape-3ebd8c4550a8c8bf944e18fec8f3df3d2da5c1af.zip | |
update to trunk (r13472)
(bzr r13398.1.5)
Diffstat (limited to 'src/style-internal.cpp')
| -rw-r--r-- | src/style-internal.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/style-internal.cpp b/src/style-internal.cpp index 6a56d75c0..ae70fc10d 100644 --- a/src/style-internal.cpp +++ b/src/style-internal.cpp @@ -270,18 +270,18 @@ SPILength::read( gchar const *str ) { } else if (!strcmp(e, "em")) { /* EM square */ unit = SP_CSS_UNIT_EM; - if( style && &style->font_size ) { + if( style ) { computed = value * style->font_size.computed; } else { - computed = value * style->font_size.font_size_default; + computed = value * SPIFontSize::font_size_default; } } else if (!strcmp(e, "ex")) { /* ex square */ unit = SP_CSS_UNIT_EX; - if( style && &style->font_size ) { + if( style ) { computed = value * style->font_size.computed * 0.5; // FIXME } else { - computed = value * style->font_size.font_size_default * 0.5; + computed = value * SPIFontSize::font_size_default * 0.5; } } else if (!strcmp(e, "%")) { /* Percentage */ |