diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2017-05-30 15:32:06 +0000 |
|---|---|---|
| committer | jabiertxof <info@marker.es> | 2017-05-30 15:32:06 +0000 |
| commit | b1b37cc376e531f2be21f5ce6ce27c33127d7283 (patch) | |
| tree | 3a3b52a88620f04bad6106e557973f85ccb1883b | |
| parent | Working on hide (diff) | |
| parent | Fix broken fix for bug pointed by parclytaxel in IRC (diff) | |
| download | inkscape-b1b37cc376e531f2be21f5ce6ce27c33127d7283.tar.gz inkscape-b1b37cc376e531f2be21f5ce6ce27c33127d7283.zip | |
Update to trunk
(bzr r15712)
| -rw-r--r-- | CMakeScripts/InstallMSYS2.cmake | 2 | ||||
| -rwxr-xr-x | msys2installdeps.sh | 3 | ||||
| -rw-r--r-- | src/sp-lpe-item.cpp | 8 |
3 files changed, 8 insertions, 5 deletions
diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake index 495e8e1e6..d3e63c3c9 100644 --- a/CMakeScripts/InstallMSYS2.cmake +++ b/CMakeScripts/InstallMSYS2.cmake @@ -225,7 +225,7 @@ if(WIN32) set(site_packages "lib/python2.7/site-packages")
# Python packages installed via pacman
- set(packages "python2-lxml" "python2-numpy")
+ set(packages "python2-lxml" "python2-numpy" "python2-pillow")
foreach(package ${packages})
list_files_pacman(${package} paths)
install_list(FILES ${paths}
diff --git a/msys2installdeps.sh b/msys2installdeps.sh index 7b339fdd6..fd46e455c 100755 --- a/msys2installdeps.sh +++ b/msys2installdeps.sh @@ -78,7 +78,8 @@ eval pacman -S --needed --noconfirm \ $ARCH-python2 \ $ARCH-python2-pip \ $ARCH-python2-lxml \ -$ARCH-python2-numpy +$ARCH-python2-numpy \ +$ARCH-python2-pillow for arch in $(eval echo $ARCH); do case ${arch} in mingw-w64-i686) diff --git a/src/sp-lpe-item.cpp b/src/sp-lpe-item.cpp index be886bdd2..84d318db2 100644 --- a/src/sp-lpe-item.cpp +++ b/src/sp-lpe-item.cpp @@ -555,19 +555,21 @@ void SPLPEItem::removeAllPathEffects(bool keep_paths) return; } } - for (PathEffectList::const_iterator it = path_effect_list->begin(); it != path_effect_list->end(); ++it) - { + + PathEffectList::iterator it = this->path_effect_list->begin(); + + while ( it != this->path_effect_list->end() ) { LivePathEffectObject *lpeobj = (*it)->lpeobject; if (lpeobj) { Inkscape::LivePathEffect::Effect * lpe = lpeobj->get_lpe(); lpe->keep_paths = keep_paths; lpe->doOnRemove(this); } + // unlink and delete all references in the list (*it)->unlink(); delete *it; it = this->path_effect_list->erase(it); } - this->getRepr()->setAttribute("inkscape:path-effect", NULL); if (!keep_paths) { |