Commit graph

10957 commits

Author SHA1 Message Date
Matt Amos
5616d406b4 Trim whitespace in rapidxml parser text nodes.
The libxml parser already trims text nodes, which leads to a
difference in behaviour when reading map style XML. This patch
normalises the behaviour between the two.
2015-06-02 17:50:08 +01:00
artemp
8e1e5f19d1 Merge remote-tracking branch 'origin/master' 2015-06-02 15:39:35 +01:00
artemp
59b69846fe Merge remote-tracking branch 'origin/master' 2015-06-02 15:39:01 +01:00
artemp
90a27abccb catch and remove more spurious std::move's 2015-06-02 15:36:31 +01:00
Dane Springmeyer
f8370acc9c fix a few files that need utf_conv_win.hpp 2015-06-02 07:14:31 -07:00
artemp
82a98a6d85 catch and remove more spurious std::move's 2015-06-02 14:48:02 +01:00
artemp
df4226a825 remove spurious std::move's (clang - moving a temporary object prevents copy elision [-Wpessimizing-move]) 2015-06-02 14:26:35 +01:00
artemp
be731f17ce use vec.resize() ref #2846 (this fixes -fsanitize=address error on OS X) 2015-06-02 14:24:19 +01:00
artemp
de568ff054 polygon<T> - add default ctor 2015-06-02 14:23:22 +01:00
artemp
2eaa90033a move singleton to util/singleton.hpp
move windows UTF conversion routines to util/utf_conv_win.hpp
2015-06-02 11:10:41 +01:00
artemp
9a93b21159 remove unused member variable + make singleton always thread safe 2015-06-02 10:32:30 +01:00
artemp
8653508a9a use std::aligned_storage in CreateStatic policy 2015-06-02 10:27:22 +01:00
artemp
b3af8bd5f9 implement DCLP using c++11 (http://preshing.com/20130930/double-checked-locking-is-fixed-in-cpp11/)
ref #2838
2015-06-02 10:24:38 +01:00
artemp
c399469d95 use constexpr instead of BOOST_STATIC_CONST 2015-06-01 17:23:51 +01:00
artemp
5e9b40aebd use assignment to initialise built-in types 2015-06-01 14:03:53 +01:00
artemp
6f9a5dcd0b use STL algorithms 2015-06-01 13:58:37 +01:00
Artem Pavlenko
2e377e876a Merge pull request #2879 from zerebubuth/fix/remove-unused-source-files
Remove unused source `memory.[ch]pp`.
2015-06-01 11:22:11 +01:00
Artem Pavlenko
9106f5ca9e Merge pull request #2877 from mapycz/fix-text-vertex-placement-infinite-loop
vertex placement: fix infinite loop
2015-06-01 10:23:19 +01:00
Matt Amos
ebab4df95f Remove unused source memory.[ch]pp.
I could not find any references to this source file from any
other, and it looks like it has been largely unmodified for the
past 5 years. This suggests that it has been orphaned.
2015-05-29 19:06:13 +01:00
Jiri Drbalek
5ea57b62de vertex placement: fix infinite loop 2015-05-28 15:06:56 +00:00
Jiri Drbalek
b0759e8ade visual tests: update visual data 2015-05-27 10:25:25 +00:00
Blake Thompson
a08d4dcc72 Fix for rasterlite plugin compile 2015-05-26 18:21:57 -05:00
Blake Thompson
32652e5c4a Merge pull request #2872 from pnorman/patch-3
make test/run independent of bash location
2015-05-26 17:57:52 -05:00
Paul Norman
d683795af5 make test/run independent of bash location 2015-05-26 14:38:51 -07:00
Blake Thompson
847a9f0d45 Merge pull request #2839 from mapnik/static_strategy
Changed from numeric casts to static casts in strategies
2015-05-26 16:19:13 -05:00
Blake Thompson
ee551cd949 Removed vector tile strategy 2015-05-26 16:18:10 -05:00
Blake Thompson
3768702699 Updated unit tests 2015-05-26 16:03:25 -05:00
Blake Thompson
85e2b53490 Changed from floor to round 2015-05-26 15:52:41 -05:00
Blake Thompson
506d2f435f Added vector tile strategy 2015-05-26 15:52:41 -05:00
Blake Thompson
611eb6e7a3 Changed from numeric casts to static casts 2015-05-26 15:52:41 -05:00
Blake Thompson
94dd9eb613 Merge pull request #2865 from mapycz/improve-visual-test-6
Visual tests improvements, support for grid renderer
2015-05-26 15:44:40 -05:00
Blake Thompson
4f6d87e5b1 Merge branch 'master' of github.com:mapnik/mapnik 2015-05-26 15:15:16 -05:00
Blake Thompson
feae68f142 FreeBSD build script fix closes #2861 2015-05-26 15:15:08 -05:00
Blake Thompson
93359d00d2 Merge pull request #2870 from mapnik/suse_fix
-fPIC fix
2015-05-26 15:12:30 -05:00
Blake Thompson
3492d06f80 Always use -fPIC, refs #2861, closes #2867 2015-05-26 15:11:44 -05:00
Blake Thompson
775fcb5378 Updated clipper so that it uses stable_sort rather then sort so results are the same across operating systems 2015-05-26 14:40:16 -05:00
Blake Thompson
e027204b91 Added c++ with -fPIC for SUSE 2015-05-26 13:02:18 -05:00
Jiri Drbalek
b5d07a7e0d visual tests: update visual data 2015-05-25 21:32:47 +00:00
Jiri Drbalek
d4de1226ab visual tests: add support for grid renderer 2015-05-25 21:03:40 +00:00
Jiri Drbalek
c1461f495a visual tests: handle runner exceptions 2015-05-25 21:03:40 +00:00
Jiri Drbalek
86ce91bd09 visual tests: apply constness 2015-05-25 21:03:40 +00:00
Jiri Drbalek
344a6ec8ba grid: formatting 2015-05-25 21:03:40 +00:00
Jiri Drbalek
51064a9479 grid: use correct types 2015-05-25 21:03:40 +00:00
Dane Springmeyer
91065df5f0 Merge pull request #2852 from mapnik/svg-visual-tests
Add svg_renderer to visual tests
2015-05-25 08:26:40 -07:00
Dane Springmeyer
ea3eb674c7 default compiler to cc/c++ / remove obsolete special casing for os x 2015-05-24 13:51:45 -07:00
Dane Springmeyer
b0f93e4596 Merge pull request #2862 from pnorman/patch-2
Don't hard-code bash path in mapnik-config
2015-05-24 13:49:01 -07:00
Dane Springmeyer
4667e9470a more portable workaround for gil c++11 bug - closes #2859 2015-05-24 13:48:04 -07:00
Paul Norman
eeec7850d0 Don't hard-code bash path in mapnik-config
[[ is a bashism, so this script needs bash, but shouldn't assume a location.
2015-05-24 13:16:31 -07:00
Blake Thompson
647d20981a Merge pull request #2855 from pnorman/host_typo
Remove stray " in HOST config line
2015-05-23 21:37:37 -05:00
Blake Thompson
a4f068b6d9 Merge pull request #2856 from pnorman/libmapnik_gitignore
Expand .gitignore for so files
2015-05-23 20:45:25 -05:00