diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-05-09 19:47:33 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-05-09 19:47:33 +0000 |
| commit | e312c345ba946b59dcd228d1e4d382b51aa37e9d (patch) | |
| tree | 4291cf591ca52682a00bc72341dc1d626058c6d0 /src/svg | |
| parent | Reset code to reaply (diff) | |
| download | inkscape-e312c345ba946b59dcd228d1e4d382b51aa37e9d.tar.gz inkscape-e312c345ba946b59dcd228d1e4d382b51aa37e9d.zip | |
Apply fixed
Diffstat (limited to 'src/svg')
| -rw-r--r-- | src/svg/path-string.cpp | 2 | ||||
| -rw-r--r-- | src/svg/svg-color.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/svg/path-string.cpp b/src/svg/path-string.cpp index 7d0092dfa..2fa2c8f02 100644 --- a/src/svg/path-string.cpp +++ b/src/svg/path-string.cpp @@ -28,7 +28,7 @@ int Inkscape::SVG::PathString::minimumexponent; Inkscape::SVG::PATHSTRING_FORMAT Inkscape::SVG::PathString::format; Inkscape::SVG::PathString::PathString() : - force_repeat_commands(Inkscape::Preferences::get()->getBool("/options/svgoutput/forcerepeatcommands")) + force_repeat_commands(!Inkscape::Preferences::get()->getBool("/options/svgoutput/disable_optimizations" ) && Inkscape::Preferences::get()->getBool("/options/svgoutput/forcerepeatcommands")) { Inkscape::Preferences *prefs = Inkscape::Preferences::get(); format = (PATHSTRING_FORMAT)prefs->getIntLimited("/options/svgoutput/pathstring_format", 1, 0, PATHSTRING_FORMAT_SIZE - 1 ); diff --git a/src/svg/svg-color.cpp b/src/svg/svg-color.cpp index d1e91ace1..1f26d02b1 100644 --- a/src/svg/svg-color.cpp +++ b/src/svg/svg-color.cpp @@ -491,7 +491,8 @@ void sp_svg_write_color(gchar *buf, unsigned const buflen, guint32 const rgba32) Inkscape::Preferences *prefs = Inkscape::Preferences::get(); unsigned const rgb24 = rgba32 >> 8; - if (prefs->getBool("/options/svgoutput/usenamedcolors")) { + if ( prefs->getBool("/options/svgoutput/usenamedcolors") && + !prefs->getBool("/options/svgoutput/disable_optimizations" )) { rgb24_to_css(buf, rgb24); } else { g_snprintf(buf, buflen, "#%06x", rgb24); |