merge

(bzr r13922.1.12)

5 files changed, 12 insertions, 92 deletions

diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index 732e01b0c..8fd8c8c66 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -31,7 +31,6 @@ set(util_SRC
 	list.h
 	longest-common-suffix.h
 	map-list.h
-	mathfns.h
 	reference.h
 	reverse-list.h
 	share.h
@@ -43,5 +42,5 @@ set(util_SRC
 	ziptool.h
 )
 
-# add_inkscape_lib(util_LIB "${util_SRC}")
-add_inkscape_source("${util_SRC}")
+add_inkscape_lib(util_LIB "${util_SRC}")
+# add_inkscape_source("${util_SRC}")
diff --git a/src/util/Makefile_insert b/src/util/Makefile_insert
index 6d2e63278..c23dffbca 100644
--- a/src/util/Makefile_insert
+++ b/src/util/Makefile_insert
@@ -1,8 +1,13 @@
 ## Makefile.am fragment sourced by src/Makefile.am.
 
-ink_common_sources += \
-    util/ziptool.h \
-    util/ziptool.cpp \
+util/all: util/libutil.a
+
+util/clean:
+	rm -f util/libutil.a $(util_libutil_a_OBJECTS)
+
+util_libutil_a_SOURCES = \
+	util/ziptool.h \
+	util/ziptool.cpp	\
 	util/accumulators.h	\
 	util/compose.hpp	\
 	util/copy.h \
@@ -26,7 +31,6 @@ ink_common_sources += \
 	util/list-copy.h \
 	util/longest-common-suffix.h \
 	util/map-list.h \
-	util/mathfns.h \
 	util/reference.h \
 	util/reverse-list.h \
 	util/share.h \
diff --git a/src/util/list.h b/src/util/list.h
index de5a458e9..563b6091c 100644
--- a/src/util/list.h
+++ b/src/util/list.h
@@ -12,7 +12,7 @@
 
 #include <cstddef>
 #include <iterator>
-#include "gc-managed.h"
+#include "inkgc/gc-managed.h"
 #include "util/reference.h"
 
 namespace Inkscape {
diff --git a/src/util/mathfns.h b/src/util/mathfns.h
deleted file mode 100644
index 830e159da..000000000
--- a/src/util/mathfns.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Inkscape::Util::... some mathmatical functions 
- *
- * Authors:
- *   Johan Engelen <goejendaagh@zonnet.nl>
- *
- * Copyright (C) 2007 Johan Engelen
- *
- * Released under GNU GPL, read the file 'COPYING' for more information
- */
-
-#ifndef SEEN_INKSCAPE_UTIL_MATHFNS_H
-#define SEEN_INKSCAPE_UTIL_MATHFNS_H
-
-#include <2geom/point.h>
-
-namespace Inkscape {
-
-namespace Util {
-
-/**
- * Returns area in triangle given by points; may be negative.
- */
-inline double
-triangle_area (Geom::Point p1, Geom::Point p2, Geom::Point p3)
-{
-    using Geom::X;
-    using Geom::Y;
-    return (p1[X]*p2[Y] + p1[Y]*p3[X] + p2[X]*p3[Y] - p2[Y]*p3[X] - p1[Y]*p2[X] - p1[X]*p3[Y]);
-}
-
-/**
- * \return x rounded to the nearest multiple of c1 plus c0.
- *
- * \note
- * If c1==0 (and c0 is finite), then returns +/-inf.  This makes grid spacing of zero
- * mean "ignore the grid in this dimension".
- */
-inline double round_to_nearest_multiple_plus(double x, double const c1, double const c0)
-{
-    return floor((x - c0) / c1 + .5) * c1 + c0;
-}
-
-/**
- * \return x rounded to the lower multiple of c1 plus c0.
- *
- * \note
- * If c1==0 (and c0 is finite), then returns +/-inf.  This makes grid spacing of zero
- * mean "ignore the grid in this dimension".
- */
-inline double round_to_lower_multiple_plus(double x, double const c1, double const c0 = 0)
-{
-    return floor((x - c0) / c1) * c1 + c0;
-}
-
-/**
- * \return x rounded to the upper multiple of c1 plus c0.
- *
- * \note
- * If c1==0 (and c0 is finite), then returns +/-inf.  This makes grid spacing of zero
- * mean "ignore the grid in this dimension".
- */
-inline double round_to_upper_multiple_plus(double x, double const c1, double const c0 = 0)
-{
-    return ceil((x - c0) / c1) * c1 + c0;
-}
-
-
-}
-
-}
-
-#endif
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/util/share.h b/src/util/share.h
index 6b5e6a4ef..8f1e7045a 100644
--- a/src/util/share.h
+++ b/src/util/share.h
@@ -12,7 +12,7 @@
 #ifndef SEEN_INKSCAPE_UTIL_SHARE_H
 #define SEEN_INKSCAPE_UTIL_SHARE_H
 
-#include "gc-core.h"
+#include "inkgc/gc-core.h"
 #include <cstring>
 #include <cstddef>