diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2015-05-09 18:34:01 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2015-05-09 18:34:01 +0000 |
| commit | 36bc16fc9772ce0271eb5ec62e2c03cb1038282e (patch) | |
| tree | c13d992c952bd21bc00c393d80bfe31c3b35284e /src/libdepixelize | |
| parent | prevent overflow index on a pathinfo function (diff) | |
| parent | Fix Doxyfile (diff) | |
| download | inkscape-36bc16fc9772ce0271eb5ec62e2c03cb1038282e.tar.gz inkscape-36bc16fc9772ce0271eb5ec62e2c03cb1038282e.zip | |
update to trunk
(bzr r13645.1.85)
Diffstat (limited to 'src/libdepixelize')
| -rw-r--r-- | src/libdepixelize/kopftracer2011.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
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 : |