diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2014-03-31 12:11:30 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2014-03-31 12:11:30 +0000 |
| commit | 00ea3a2ecf217ccd1889b6036054018b6b69105e (patch) | |
| tree | d611ddc875f766f4e32af29f5ac764037dcd0983 /src/extension | |
| parent | Fixed bug in LPE Bspline widget, on apply selected nodes, because a rounding ... (diff) | |
| parent | Fix Gtkmm 3.8 build issues on systems with Gtk+ 3.10 (diff) | |
| download | inkscape-00ea3a2ecf217ccd1889b6036054018b6b69105e.tar.gz inkscape-00ea3a2ecf217ccd1889b6036054018b6b69105e.zip | |
update to trunk
(bzr r11950.1.319)
Diffstat (limited to 'src/extension')
| -rw-r--r-- | src/extension/internal/filter/color.h | 2 | ||||
| -rw-r--r-- | src/extension/system.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/extension/internal/filter/color.h b/src/extension/internal/filter/color.h index 7059ad29b..19af6e969 100644 --- a/src/extension/internal/filter/color.h +++ b/src/extension/internal/filter/color.h @@ -941,7 +941,7 @@ Invert::get_filter_text (Inkscape::Extension::Extension * ext) std::ostringstream transparency; std::ostringstream hue; - if (ext->get_param_bool("hue") xor ext->get_param_bool("lightness")) { + if (ext->get_param_bool("hue") ^ ext->get_param_bool("lightness")) { hue << "<feColorMatrix type=\"hueRotate\" values=\"180\" result=\"color1\" />\n"; } else { hue << ""; diff --git a/src/extension/system.cpp b/src/extension/system.cpp index 7a50826ca..c244d9c16 100644 --- a/src/extension/system.cpp +++ b/src/extension/system.cpp @@ -99,7 +99,7 @@ SPDocument *open(Extension *key, gchar const *filename) Inkscape::Preferences *prefs = Inkscape::Preferences::get(); bool ask = prefs->getBool("/dialogs/import/ask"); Glib::ustring id = Glib::ustring(imod->get_id(), 28); - if (!ask and id.compare( "org.inkscape.input.gdkpixbuf") == 0) { + if (!ask && id.compare( "org.inkscape.input.gdkpixbuf") == 0) { show = false; imod->set_gui(false); } |