From 112e440d4b24d60e19c3863a8a092cd50383f584 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Mon, 28 Apr 2014 01:46:05 +1000
Subject: Update CMake Files

(bzr r13313)
---
 src/libdepixelize/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/libdepixelize')

diff --git a/src/libdepixelize/CMakeLists.txt b/src/libdepixelize/CMakeLists.txt
index 895e16e85..a69d37bc7 100644
--- a/src/libdepixelize/CMakeLists.txt
+++ b/src/libdepixelize/CMakeLists.txt
@@ -7,11 +7,11 @@ set(libdepixelize_SRC
 	kopftracer2011.h
 	splines.h
 
-        priv/branchless.h
+	priv/branchless.h
 	priv/colorspace.h
 	priv/curvature.h
 	priv/homogeneoussplines.h
-	priv/integral
+	priv/integral.h
 	priv/iterator.h
 	priv/optimization-kopf2011.h
 	priv/pixelgraph.h
-- 
cgit v1.2.3


From 3ef365a9d42823ded18fb31aa2c36c39005cb0ee Mon Sep 17 00:00:00 2001
From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch>
Date: Sun, 11 May 2014 23:38:10 +0200
Subject: fix build for some (windows 64 bit devlibs attempt) specifically,
 fixes this build error: .../include/glibmm-2.4/glibmm/threads.h:201:11:
 error: field 'gobject_' has incomplete type 'GThread {aka _GThread}'

(bzr r13357)
---
 src/libdepixelize/kopftracer2011.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/libdepixelize')

diff --git a/src/libdepixelize/kopftracer2011.cpp b/src/libdepixelize/kopftracer2011.cpp
index e2f387c86..1e769b0c9 100644
--- a/src/libdepixelize/kopftracer2011.cpp
+++ b/src/libdepixelize/kopftracer2011.cpp
@@ -26,6 +26,8 @@
 # include <config.h>
 #endif
 
+#include <glibmm.h>
+
 // Build fix under Inkscape build tree
 #if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
 #include <glibmm/threads.h>
-- 
cgit v1.2.3


From 41ab3bd526807e0a092466e7d4e979f12bab81ff Mon Sep 17 00:00:00 2001
From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch>
Date: Tue, 13 May 2014 21:17:06 +0200
Subject: fix windows 64bit build. (changes already committed to trunk)

(bzr r13341.1.19)
---
 src/libdepixelize/kopftracer2011.cpp | 4 +++-
 src/libdepixelize/kopftracer2011.h   | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/libdepixelize')

diff --git a/src/libdepixelize/kopftracer2011.cpp b/src/libdepixelize/kopftracer2011.cpp
index e2f387c86..bbb73d445 100644
--- a/src/libdepixelize/kopftracer2011.cpp
+++ b/src/libdepixelize/kopftracer2011.cpp
@@ -26,13 +26,15 @@
 # include <config.h>
 #endif
 
+
+#include "kopftracer2011.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"
 #include "priv/homogeneoussplines.h"
 #include "priv/branchless.h"
diff --git a/src/libdepixelize/kopftracer2011.h b/src/libdepixelize/kopftracer2011.h
index 598f6c79c..c60d0a61a 100644
--- a/src/libdepixelize/kopftracer2011.h
+++ b/src/libdepixelize/kopftracer2011.h
@@ -27,6 +27,7 @@
 
 #include <string>
 
+#include <glibmm.h>
 // Contains exception definitions
 #include <glibmm/fileutils.h>
 #include <gdkmm/pixbuf.h>
-- 
cgit v1.2.3