From f9733d9f72490a3d0460b92833781eb9be3a054e Mon Sep 17 00:00:00 2001 From: ryanlerch <> Date: Thu, 3 Apr 2014 13:50:22 +0200 Subject: Fix for Bug #1301869 (util/signal-blocker.h not included in tarbal) by Ryan Lerch. Fixed bugs: - https://launchpad.net/bugs/1301869 (bzr r13255) --- src/util/Makefile_insert | 1 + 1 file changed, 1 insertion(+) (limited to 'src/util') diff --git a/src/util/Makefile_insert b/src/util/Makefile_insert index 7169fa8f7..6d2e63278 100644 --- a/src/util/Makefile_insert +++ b/src/util/Makefile_insert @@ -31,6 +31,7 @@ ink_common_sources += \ util/reverse-list.h \ util/share.h \ util/share.cpp \ + util/signal-blocker.h \ util/tuple.h \ util/ucompose.hpp \ util/units.cpp \ -- cgit v1.2.3 From 40c62107849b6eb5e66dd0b1f7fe2a7d29cc83a6 Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" Date: Sat, 5 Apr 2014 00:24:46 +0200 Subject: fix cmake build errors for changes in 2geom Fixed bugs: - https://launchpad.net/bugs/1283174 (bzr r13267) --- src/util/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'src/util') diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt index cfccfa94d..924cab355 100644 --- a/src/util/CMakeLists.txt +++ b/src/util/CMakeLists.txt @@ -5,6 +5,7 @@ set(util_SRC expression-evaluator.cpp share.cpp units.cpp + ziptool.cpp # ------- -- cgit v1.2.3 From 112e440d4b24d60e19c3863a8a092cd50383f584 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 28 Apr 2014 01:46:05 +1000 Subject: Update CMake Files (bzr r13313) --- src/util/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/util') diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt index 924cab355..732e01b0c 100644 --- a/src/util/CMakeLists.txt +++ b/src/util/CMakeLists.txt @@ -35,10 +35,12 @@ set(util_SRC reference.h reverse-list.h share.h + signal-blocker.h tuple.h ucompose.hpp units.h unordered-containers.h + ziptool.h ) # add_inkscape_lib(util_LIB "${util_SRC}") -- cgit v1.2.3 From 38b8b56f7a45878b6aea857f8bcc15064f44200d Mon Sep 17 00:00:00 2001 From: Matthew Petroff Date: Sat, 16 Aug 2014 20:23:01 -0400 Subject: Fix grid jumping (bug #1342238). Fixed bugs: - https://launchpad.net/bugs/1342238 (bzr r13522) --- src/util/units.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/util') diff --git a/src/util/units.cpp b/src/util/units.cpp index d2053f60b..eb4a313e0 100644 --- a/src/util/units.cpp +++ b/src/util/units.cpp @@ -291,11 +291,15 @@ Quantity UnitTable::parseQuantity(Glib::ustring const &q) const std::istringstream tmp_v(match_info.fetch(0)); tmp_v >> value; } + int start_pos, end_pos; + match_info.fetch_pos(0, end_pos, start_pos); + end_pos = q.size() - start_pos; + Glib::ustring u = q.substr(start_pos, end_pos); // Extract unit abbreviation Glib::ustring abbr; Glib::RefPtr unit_regex = Glib::Regex::create("[A-z%]+"); - if (unit_regex->match(q, match_info)) { + if (unit_regex->match(u, match_info)) { abbr = match_info.fetch(0); } -- cgit v1.2.3 From cb0223da226fadcedaaae8cadce0c52bb1eeca56 Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" Date: Wed, 19 Nov 2014 21:34:11 +0100 Subject: units: remove a remnant from old code. There should be only one UnitTable instantiated. (bzr r13737) --- src/util/units.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/util') diff --git a/src/util/units.cpp b/src/util/units.cpp index eb4a313e0..3d635e2d2 100644 --- a/src/util/units.cpp +++ b/src/util/units.cpp @@ -206,7 +206,6 @@ bool Unit::compatibleWith(Unit const *u) const } bool Unit::compatibleWith(Glib::ustring const &u) const { - static UnitTable unit_table; return compatibleWith(unit_table.getUnit(u)); } -- cgit v1.2.3