From ba4dbfb351180e0fc4ad57be6e3534fa2ab5cf8c Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Tue, 28 Apr 2015 00:38:31 +0100
Subject: Fix unnecessary inclusion of glibmm/threads.h.  This can be resolved
 by ensuring that glibmm headers always preceed glib.h headers. Same applies
 with gtkmm/gtk+ etc

(bzr r14064)
---
 src/libdepixelize/kopftracer2011.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'src/libdepixelize')

diff --git a/src/libdepixelize/kopftracer2011.cpp b/src/libdepixelize/kopftracer2011.cpp
index 1e769b0c9..96784b14f 100644
--- a/src/libdepixelize/kopftracer2011.cpp
+++ b/src/libdepixelize/kopftracer2011.cpp
@@ -28,11 +28,6 @@
 
 #include <glibmm.h>
 
-// Build fix under Inkscape build tree
-#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
-#include <glibmm/threads.h>
-#endif
-
 #include <algorithm>
 #include "kopftracer2011.h"
 #include "priv/colorspace.h"
@@ -667,4 +662,4 @@ inline bool Heuristics::islands(PixelGraph::const_iterator a,
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
-- 
cgit v1.2.3


From c883d7627a479c8c5b6a9f77b9841fa5631572ad Mon Sep 17 00:00:00 2001
From: Krzysztof Kosi??ski <tweenk.pl@gmail.com>
Date: Mon, 27 Apr 2015 19:39:29 -0400
Subject: 2Geom sync - initial commit

(bzr r14059.2.1)
---
 src/libdepixelize/priv/splines-kopf2011.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/libdepixelize')

diff --git a/src/libdepixelize/priv/splines-kopf2011.h b/src/libdepixelize/priv/splines-kopf2011.h
index c586f74b7..c3da58c05 100644
--- a/src/libdepixelize/priv/splines-kopf2011.h
+++ b/src/libdepixelize/priv/splines-kopf2011.h
@@ -93,7 +93,7 @@ template<class T>
 void worker(const typename HomogeneousSplines<T>::Polygon &source,
             Splines::Path &dest, bool optimize)
 {
-    dest.pathVector.reserve(source.holes.size() + 1);
+    //dest.pathVector.reserve(source.holes.size() + 1);
 
     for ( int i = 0 ; i != 4 ; ++i )
         dest.rgba[i] = source.rgba[i];
-- 
cgit v1.2.3