From f35bb1f74a0ffeb5c6477a25e3c4cde87a97bcf1 Mon Sep 17 00:00:00 2001 From: Adrian Boguszewski Date: Thu, 28 Jul 2016 12:06:06 +0200 Subject: Removed unused includes, decrease compilation time (bzr r15025) --- src/svg/css-ostringstream.cpp | 1 - src/svg/path-string.cpp | 1 - src/svg/svg-affine.cpp | 3 +-- src/svg/svg-angle.cpp | 5 +---- src/svg/svg-color.cpp | 1 - src/svg/svg-path.cpp | 4 ---- 6 files changed, 2 insertions(+), 13 deletions(-) (limited to 'src/svg') diff --git a/src/svg/css-ostringstream.cpp b/src/svg/css-ostringstream.cpp index 33985443e..ef0413372 100644 --- a/src/svg/css-ostringstream.cpp +++ b/src/svg/css-ostringstream.cpp @@ -1,7 +1,6 @@ #include "svg/css-ostringstream.h" #include "svg/strip-trailing-zeros.h" #include "preferences.h" -#include Inkscape::CSSOStringStream::CSSOStringStream() { diff --git a/src/svg/path-string.cpp b/src/svg/path-string.cpp index 6dddeadff..7d0092dfa 100644 --- a/src/svg/path-string.cpp +++ b/src/svg/path-string.cpp @@ -17,7 +17,6 @@ #include "svg/stringstream.h" #include "svg/svg.h" #include "preferences.h" -#include // 1<=numericprecision<=16, doubles are only accurate upto (slightly less than) 16 digits (and less than one digit doesn't make sense) // Please note that these constants are used to allocate sufficient space to hold serialized numbers diff --git a/src/svg/svg-affine.cpp b/src/svg/svg-affine.cpp index d9d79bba5..21635c79b 100644 --- a/src/svg/svg-affine.cpp +++ b/src/svg/svg-affine.cpp @@ -12,7 +12,7 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include "config.h" #endif #include @@ -21,7 +21,6 @@ #include #include #include <2geom/transforms.h> -#include <2geom/angle.h> #include "svg.h" #include "preferences.h" diff --git a/src/svg/svg-angle.cpp b/src/svg/svg-angle.cpp index ed5ccd45e..9d4435a18 100644 --- a/src/svg/svg-angle.cpp +++ b/src/svg/svg-angle.cpp @@ -13,16 +13,13 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include "config.h" #endif #include #include -#include #include -#include "svg.h" -#include "stringstream.h" #include "svg/svg-angle.h" #include "util/units.h" diff --git a/src/svg/svg-color.cpp b/src/svg/svg-color.cpp index 693094048..89a5636a8 100644 --- a/src/svg/svg-color.cpp +++ b/src/svg/svg-color.cpp @@ -19,7 +19,6 @@ #include // sprintf #include #include -#include #include #include // g_assert #include diff --git a/src/svg/svg-path.cpp b/src/svg/svg-path.cpp index 7bb58fc9c..13795f2a3 100644 --- a/src/svg/svg-path.cpp +++ b/src/svg/svg-path.cpp @@ -17,17 +17,13 @@ #include #include -#include #include // g_assert() #include <2geom/pathvector.h> -#include <2geom/path.h> #include <2geom/curves.h> #include <2geom/sbasis-to-bezier.h> #include <2geom/path-sink.h> #include <2geom/svg-path-parser.h> -#include <2geom/exception.h> -#include <2geom/angle.h> #include "svg/svg.h" #include "svg/path-string.h" -- cgit v1.2.3 From 43b49e325db73cc19b1731db6c69545664ee8fbe Mon Sep 17 00:00:00 2001 From: Adrian Boguszewski Date: Thu, 28 Jul 2016 13:26:17 +0200 Subject: Reverted changes to r15024 after many building problems (bzr r15027) --- src/svg/css-ostringstream.cpp | 1 + src/svg/path-string.cpp | 1 + src/svg/svg-affine.cpp | 3 ++- src/svg/svg-angle.cpp | 5 ++++- src/svg/svg-color.cpp | 1 + src/svg/svg-path.cpp | 4 ++++ 6 files changed, 13 insertions(+), 2 deletions(-) (limited to 'src/svg') diff --git a/src/svg/css-ostringstream.cpp b/src/svg/css-ostringstream.cpp index ef0413372..33985443e 100644 --- a/src/svg/css-ostringstream.cpp +++ b/src/svg/css-ostringstream.cpp @@ -1,6 +1,7 @@ #include "svg/css-ostringstream.h" #include "svg/strip-trailing-zeros.h" #include "preferences.h" +#include Inkscape::CSSOStringStream::CSSOStringStream() { diff --git a/src/svg/path-string.cpp b/src/svg/path-string.cpp index 7d0092dfa..6dddeadff 100644 --- a/src/svg/path-string.cpp +++ b/src/svg/path-string.cpp @@ -17,6 +17,7 @@ #include "svg/stringstream.h" #include "svg/svg.h" #include "preferences.h" +#include // 1<=numericprecision<=16, doubles are only accurate upto (slightly less than) 16 digits (and less than one digit doesn't make sense) // Please note that these constants are used to allocate sufficient space to hold serialized numbers diff --git a/src/svg/svg-affine.cpp b/src/svg/svg-affine.cpp index 21635c79b..d9d79bba5 100644 --- a/src/svg/svg-affine.cpp +++ b/src/svg/svg-affine.cpp @@ -12,7 +12,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +# include "config.h" #endif #include @@ -21,6 +21,7 @@ #include #include #include <2geom/transforms.h> +#include <2geom/angle.h> #include "svg.h" #include "preferences.h" diff --git a/src/svg/svg-angle.cpp b/src/svg/svg-angle.cpp index 9d4435a18..ed5ccd45e 100644 --- a/src/svg/svg-angle.cpp +++ b/src/svg/svg-angle.cpp @@ -13,13 +13,16 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +# include "config.h" #endif #include #include +#include #include +#include "svg.h" +#include "stringstream.h" #include "svg/svg-angle.h" #include "util/units.h" diff --git a/src/svg/svg-color.cpp b/src/svg/svg-color.cpp index 89a5636a8..693094048 100644 --- a/src/svg/svg-color.cpp +++ b/src/svg/svg-color.cpp @@ -19,6 +19,7 @@ #include // sprintf #include #include +#include #include #include // g_assert #include diff --git a/src/svg/svg-path.cpp b/src/svg/svg-path.cpp index 13795f2a3..7bb58fc9c 100644 --- a/src/svg/svg-path.cpp +++ b/src/svg/svg-path.cpp @@ -17,13 +17,17 @@ #include #include +#include #include // g_assert() #include <2geom/pathvector.h> +#include <2geom/path.h> #include <2geom/curves.h> #include <2geom/sbasis-to-bezier.h> #include <2geom/path-sink.h> #include <2geom/svg-path-parser.h> +#include <2geom/exception.h> +#include <2geom/angle.h> #include "svg/svg.h" #include "svg/path-string.h" -- cgit v1.2.3 From 35830f456cadaecf8b8e3944e3031a1a93f6cb41 Mon Sep 17 00:00:00 2001 From: Adrian Boguszewski Date: Wed, 3 Aug 2016 15:29:38 +0200 Subject: Removed unused includes, decreased compilation time. Once again (bzr r15034) --- src/svg/css-ostringstream.cpp | 1 - src/svg/path-string.cpp | 1 - src/svg/svg-affine.cpp | 3 +-- src/svg/svg-angle.cpp | 5 +---- src/svg/svg-color.cpp | 1 - src/svg/svg-path.cpp | 4 ---- 6 files changed, 2 insertions(+), 13 deletions(-) (limited to 'src/svg') diff --git a/src/svg/css-ostringstream.cpp b/src/svg/css-ostringstream.cpp index 33985443e..ef0413372 100644 --- a/src/svg/css-ostringstream.cpp +++ b/src/svg/css-ostringstream.cpp @@ -1,7 +1,6 @@ #include "svg/css-ostringstream.h" #include "svg/strip-trailing-zeros.h" #include "preferences.h" -#include Inkscape::CSSOStringStream::CSSOStringStream() { diff --git a/src/svg/path-string.cpp b/src/svg/path-string.cpp index 6dddeadff..7d0092dfa 100644 --- a/src/svg/path-string.cpp +++ b/src/svg/path-string.cpp @@ -17,7 +17,6 @@ #include "svg/stringstream.h" #include "svg/svg.h" #include "preferences.h" -#include // 1<=numericprecision<=16, doubles are only accurate upto (slightly less than) 16 digits (and less than one digit doesn't make sense) // Please note that these constants are used to allocate sufficient space to hold serialized numbers diff --git a/src/svg/svg-affine.cpp b/src/svg/svg-affine.cpp index d9d79bba5..21635c79b 100644 --- a/src/svg/svg-affine.cpp +++ b/src/svg/svg-affine.cpp @@ -12,7 +12,7 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include "config.h" #endif #include @@ -21,7 +21,6 @@ #include #include #include <2geom/transforms.h> -#include <2geom/angle.h> #include "svg.h" #include "preferences.h" diff --git a/src/svg/svg-angle.cpp b/src/svg/svg-angle.cpp index ed5ccd45e..9d4435a18 100644 --- a/src/svg/svg-angle.cpp +++ b/src/svg/svg-angle.cpp @@ -13,16 +13,13 @@ */ #ifdef HAVE_CONFIG_H -# include "config.h" +#include "config.h" #endif #include #include -#include #include -#include "svg.h" -#include "stringstream.h" #include "svg/svg-angle.h" #include "util/units.h" diff --git a/src/svg/svg-color.cpp b/src/svg/svg-color.cpp index 693094048..89a5636a8 100644 --- a/src/svg/svg-color.cpp +++ b/src/svg/svg-color.cpp @@ -19,7 +19,6 @@ #include // sprintf #include #include -#include #include #include // g_assert #include diff --git a/src/svg/svg-path.cpp b/src/svg/svg-path.cpp index 7bb58fc9c..13795f2a3 100644 --- a/src/svg/svg-path.cpp +++ b/src/svg/svg-path.cpp @@ -17,17 +17,13 @@ #include #include -#include #include // g_assert() #include <2geom/pathvector.h> -#include <2geom/path.h> #include <2geom/curves.h> #include <2geom/sbasis-to-bezier.h> #include <2geom/path-sink.h> #include <2geom/svg-path-parser.h> -#include <2geom/exception.h> -#include <2geom/angle.h> #include "svg/svg.h" #include "svg/path-string.h" -- cgit v1.2.3 From e471a664f923f517b68071f2e33fbb6ce070f8b7 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Mon, 8 Aug 2016 13:56:40 +0100 Subject: Remove deprecated Autotools and btool files. Please use CMake instead (bzr r15046) --- src/svg/Makefile_insert | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100644 src/svg/Makefile_insert (limited to 'src/svg') diff --git a/src/svg/Makefile_insert b/src/svg/Makefile_insert deleted file mode 100644 index 4f82bdd76..000000000 --- a/src/svg/Makefile_insert +++ /dev/null @@ -1,32 +0,0 @@ -## Makefile.am fragment sourced by src/Makefile.am. - -ink_common_sources += \ - svg/css-ostringstream.h \ - svg/css-ostringstream.cpp \ - svg/path-string.h \ - svg/path-string.cpp \ - svg/stringstream.h \ - svg/stringstream.cpp \ - svg/strip-trailing-zeros.h \ - svg/strip-trailing-zeros.cpp \ - svg/svg-affine.cpp \ - svg/svg-color.cpp \ - svg/svg-color.h \ - svg/svg-icc-color.h \ - svg/svg-angle.cpp \ - svg/svg-angle.h \ - svg/svg-length.cpp \ - svg/svg-length.h \ - svg/svg-path.cpp \ - svg/svg.h - -# ###################### -# ### CxxTest stuff #### -# ###################### -CXXTEST_TESTSUITES += \ - $(srcdir)/svg/css-ostringstream-test.h \ - $(srcdir)/svg/stringstream-test.h \ - $(srcdir)/svg/svg-affine-test.h \ - $(srcdir)/svg/svg-color-test.h \ - $(srcdir)/svg/svg-length-test.h \ - $(srcdir)/svg/svg-path-geom-test.h -- cgit v1.2.3 From 2f53e4dbb4620edcabaffc964c55cb71090912f8 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Wed, 17 Aug 2016 09:39:43 +0200 Subject: Use M_PI, M_PI_2. We use these constants everywhere so if they are not defined we are already in trouble. No need to define them ourselves (except maybe in shared libraries). (bzr r15063) --- src/svg/svg-affine.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/svg') diff --git a/src/svg/svg-affine.cpp b/src/svg/svg-affine.cpp index 21635c79b..76d89579d 100644 --- a/src/svg/svg-affine.cpp +++ b/src/svg/svg-affine.cpp @@ -24,10 +24,6 @@ #include "svg.h" #include "preferences.h" -#ifndef M_PI -# define M_PI 3.14159265358979323846 -#endif - bool sp_svg_transform_read(gchar const *str, Geom::Affine *transform) { -- cgit v1.2.3 From 9170e269c2dc12c9b416e5a18a90e5fe9669c32f Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Sun, 5 Feb 2017 19:50:27 +0100 Subject: add missing header (bzr r15480) --- src/svg/svg-length.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/svg') diff --git a/src/svg/svg-length.h b/src/svg/svg-length.h index bd3435ca6..4663aced4 100644 --- a/src/svg/svg-length.h +++ b/src/svg/svg-length.h @@ -12,6 +12,8 @@ #ifndef SEEN_SP_SVG_LENGTH_H #define SEEN_SP_SVG_LENGTH_H +#include + /** * SVG length type */ -- cgit v1.2.3 From 71f7e26f4a6714fe1d3b6a72f61c481c3e1f52a0 Mon Sep 17 00:00:00 2001 From: chr Date: Tue, 23 May 2017 21:48:27 +0200 Subject: fix a brunch of memory leaks pt.2 I'd like to see the crappy API fixed, to avoid this stupid mistakes. (bzr r15698.1.12) --- src/svg/svg-affine-test.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/svg') diff --git a/src/svg/svg-affine-test.h b/src/svg/svg-affine-test.h index af670a3a8..829ef8a5a 100644 --- a/src/svg/svg-affine-test.h +++ b/src/svg/svg-affine-test.h @@ -67,7 +67,9 @@ public: void testWriteIdentity() { - TS_ASSERT_EQUALS(sp_svg_transform_write(Geom::identity()) , (void*)0) + gchar str = sp_svg_transform_write(Geom::identity()); + TS_ASSERT_EQUALS(str, NULL); + g_free(str); } void testReadMatrix() -- cgit v1.2.3