diff options
| author | Liam P. White <inkscapebrony@gmail.com> | 2016-03-04 15:39:45 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebrony@gmail.com> | 2016-03-04 15:39:45 +0000 |
| commit | 1e3c55578b899990862b21e826dbe38129c3fff0 (patch) | |
| tree | f1496625ae2c592e016587967cdde692a6c12455 /src/extension/internal/cdr-input.cpp | |
| parent | Update 2geom copy to 143bbcf: Fix for multiple sequential closepath commands (diff) | |
| download | inkscape-1e3c55578b899990862b21e826dbe38129c3fff0.tar.gz inkscape-1e3c55578b899990862b21e826dbe38129c3fff0.zip | |
Remove regex hack added in 14650
(bzr r14687)
Diffstat (limited to 'src/extension/internal/cdr-input.cpp')
| -rw-r--r-- | src/extension/internal/cdr-input.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/extension/internal/cdr-input.cpp b/src/extension/internal/cdr-input.cpp index a4e26e224..f4789a08f 100644 --- a/src/extension/internal/cdr-input.cpp +++ b/src/extension/internal/cdr-input.cpp @@ -22,7 +22,6 @@ #include <string> #include <cstring> -#include <glibmm/regex.h> #include <libcdr/libcdr.h> @@ -282,12 +281,7 @@ SPDocument *CdrInput::open(Inkscape::Extension::Input * /*mod*/, const gchar * u } } - // remove consecutive closepath commands (see bug 1492153) - Glib::RefPtr<Glib::Regex> regex = Glib::Regex::create("(Z(?:\\s+Z)+)(?=[^<]+\")"); - Glib::ustring outString1 = Glib::ustring(tmpSVGOutput[page_num-1].cstr()); - Glib::ustring outString2 = regex->replace(outString1, 0, "Z", Glib::REGEX_MATCH_NEWLINE_ANY); - - SPDocument * doc = SPDocument::createNewDocFromMem(outString2.c_str(), outString2.bytes(), TRUE); + SPDocument * doc = SPDocument::createNewDocFromMem(tmpSVGOutput[page_num-1].cstr(), strlen(tmpSVGOutput[page_num-1].cstr()), TRUE); // Set viewBox if it doesn't exist if (doc && !doc->getRoot()->viewBox_set) { |