summaryrefslogtreecommitdiffstats
path: root/src/libdepixelize
diff options
context:
space:
mode:
authorMarkus Engel <markus.engel@tum.de>2013-09-26 13:56:34 +0000
committerMarkus Engel <markus.engel@tum.de>2013-09-26 13:56:34 +0000
commit2eb38df468e306e32b9961fcc102431e413ebb42 (patch)
tree71bef633bfc255edfa17887a9bbcec507889c68d /src/libdepixelize
parentSimplified some in-code circle creation. (diff)
parentC++ify calling a few SPLPEItem functions, much more work than expected... slo... (diff)
downloadinkscape-2eb38df468e306e32b9961fcc102431e413ebb42.tar.gz
inkscape-2eb38df468e306e32b9961fcc102431e413ebb42.zip
Merged from trunk (r12593).
(bzr r11608.1.132)
Diffstat (limited to 'src/libdepixelize')
-rw-r--r--src/libdepixelize/Makefile_insert2
-rw-r--r--src/libdepixelize/kopftracer2011.cpp7
2 files changed, 8 insertions, 1 deletions
diff --git a/src/libdepixelize/Makefile_insert b/src/libdepixelize/Makefile_insert
index b5be88c5f..8aed7244f 100644
--- a/src/libdepixelize/Makefile_insert
+++ b/src/libdepixelize/Makefile_insert
@@ -13,7 +13,7 @@ libdepixelize_libdepixelize_a_SOURCES = \
libdepixelize/priv/colorspace.h \
libdepixelize/priv/curvature.h \
libdepixelize/priv/homogeneoussplines.h \
- libdepixelize/priv/integral \
+ libdepixelize/priv/integral.h \
libdepixelize/priv/iterator.h \
libdepixelize/priv/optimization-kopf2011.h \
libdepixelize/priv/pixelgraph.h \
diff --git a/src/libdepixelize/kopftracer2011.cpp b/src/libdepixelize/kopftracer2011.cpp
index 50b12d527..5e6e26048 100644
--- a/src/libdepixelize/kopftracer2011.cpp
+++ b/src/libdepixelize/kopftracer2011.cpp
@@ -331,9 +331,16 @@ void Kopf2011::_remove_puzzle_pattern(PixelGraph &graph)
+ graph.nodeBottomRight(it2)->adj.top == 3 ) {
// We fake a new connection =)
it2->adj.right = true;
+ graph.nodeRight(it2)->adj.left = true;
+
it2->adj.bottom = true;
+ graph.nodeBottom(it2)->adj.top = true;
+
graph.nodeBottomRight(it2)->adj.left = true;
+ graph.nodeBottom(it2)->adj.right = true;
+
graph.nodeBottomRight(it2)->adj.top = true;
+ graph.nodeRight(it2)->adj.bottom = true;
}
it2 = graph.nodeRight(it2);