diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-05-09 19:38:45 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-05-09 19:43:04 +0000 |
| commit | b85b43a64e3d3d7e623b4bcd99b08ef8f6fc7a43 (patch) | |
| tree | 58d4726a94512ba16e15d535b40795ef65cde0c0 /src/svg | |
| parent | fix bug compiling (diff) | |
| download | inkscape-b85b43a64e3d3d7e623b4bcd99b08ef8f6fc7a43.tar.gz inkscape-b85b43a64e3d3d7e623b4bcd99b08ef8f6fc7a43.zip | |
Reset old code to reaply 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, 2 insertions, 3 deletions
diff --git a/src/svg/path-string.cpp b/src/svg/path-string.cpp index 2fa2c8f02..7d0092dfa 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/disable_optimizations" ) && Inkscape::Preferences::get()->getBool("/options/svgoutput/forcerepeatcommands")) + force_repeat_commands(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 1f26d02b1..d1e91ace1 100644 --- a/src/svg/svg-color.cpp +++ b/src/svg/svg-color.cpp @@ -491,8 +491,7 @@ 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") && - !prefs->getBool("/options/svgoutput/disable_optimizations" )) { + if (prefs->getBool("/options/svgoutput/usenamedcolors")) { rgb24_to_css(buf, rgb24); } else { g_snprintf(buf, buflen, "#%06x", rgb24); |