Commit graph

9442 commits

Author SHA1 Message Date
Dane Springmeyer
1f4160f0f0 topojson: built up knowledge of attributes and geometry type + tests 2013-10-29 00:37:41 -07:00
Dane Springmeyer
44fe776bf5 geojson plugin: simplify code 2013-10-29 00:34:42 -07:00
Dane Springmeyer
5d7012f32f iwyu 2013-10-28 18:46:58 -07:00
Dane Springmeyer
b21b59b835 shape.input: conditionally include boost interprocess 2013-10-28 18:31:20 -07:00
Dane Springmeyer
0d58a8aee4 merge with 2.3.x 2013-10-28 14:45:52 -07:00
Dane Springmeyer
a5926e70b2 tests: lessen strictness of cairo comparison tests so that files created on ubuntu saucy/os x pass on ubuntu precise - refs #1868 2013-10-28 14:18:44 -07:00
Dane Springmeyer
535dc0da3f add #2031 fix to changelog 2013-10-28 14:08:33 -07:00
Dane Springmeyer
7a153c44cb tests: stop testing cairo postscript output since it is not important 2013-10-28 13:57:34 -07:00
Dane Springmeyer
0978157e92 tests: looser tolerance for comparing cairo output sizes 2013-10-28 13:56:48 -07:00
Dane Springmeyer
4b55a20cc1 Merge branch '2.3.x' of github.com:mapnik/mapnik into 2.3.x 2013-10-28 20:40:01 +00:00
Dane Springmeyer
7d9392544d xadd more cairo test files, replace existing via ubuntu saucy 2013-10-28 20:39:47 +00:00
Dane Springmeyer
fa6969a561 travis: start testing cairo+pycairo+sqlite+postgres 2013-10-28 13:19:33 -07:00
Dane Springmeyer
86dfa0778a fix cairo reference counting and add more cairo context tests - closes #2031 2013-10-28 12:46:44 -07:00
artemp
c7a989ae83 first attempt to re-use generic JSON rules in geojson/topojson parsers 2013-10-28 15:57:51 +00:00
artemp
2eaf6a1ead use even/odd polygon filling rule ref https://github.com/mapbox/tilemill/issues/2110 2013-10-28 15:57:35 +00:00
Dane Springmeyer
986f47e959 remove demo/test files which were moved to tests/python_tests in c84ddc825e - refs #1460 2013-10-25 19:01:09 -07:00
Dane Springmeyer
3037fe9ef7 readme touchups 2013-10-25 17:17:00 -07:00
Dane Springmeyer
9755296091 Merge branch '2.3.x' of github.com:mapnik/mapnik 2013-10-24 00:00:53 -07:00
Dane Springmeyer
adabe3022d add harfbuzz branch testcases 2013-10-23 23:59:14 -07:00
Dane Springmeyer
dcbbcdd8a9 make label-position-tolerance a double, as it should have been all along 2013-10-23 23:48:24 -07:00
Dane Springmeyer
882ee3cb32 Merge branch '2.3.x' of github.com:mapnik/mapnik 2013-10-23 21:12:54 -07:00
Dane Springmeyer
2ef7f13d53 fix indent 2013-10-23 21:12:36 -07:00
Dane Springmeyer
730f8e36e2 remove dead code 2013-10-23 18:24:35 -07:00
Dane Springmeyer
f14854912c backport ecf8c20938 from master 2013-10-23 18:24:04 -07:00
Dane Springmeyer
ecf8c20938 completely fix (across various g++ versions) clipping regression - closes #2049 2013-10-23 18:09:22 -07:00
Vross
771964a770 datasource_cache: display correctly the error message 2013-10-23 17:44:27 -07:00
Dane Springmeyer
cb04fc0b34 apply bbox clipping fix to shield symbolizer as applied to text in 96fff72837 - refs #2049 2013-10-23 17:41:24 -07:00
Dane Springmeyer
bc2ee11d9a fix text related test failures on ubuntu precise/g++-4.7 - refs #2049 2013-10-23 17:41:15 -07:00
Dane Springmeyer
78f7de16b8 apply bbox clipping fix to shield symbolizer as applied to text in 96fff72837 - refs #2049 2013-10-23 17:39:46 -07:00
Dane Springmeyer
96fff72837 fix text related test failures on ubuntu precise/g++-4.7 - refs #2049 2013-10-24 00:33:26 +00:00
Dane Springmeyer
cbc58e0068 also set -fPIC for clipper 2013-10-23 16:25:56 -07:00
Dane Springmeyer
8c5b40a559 travis: restrict to only one job to avoid memory blowout 2013-10-23 16:14:09 -07:00
Dane Springmeyer
427e1c03b7 polygon clipper: ensure we return from function 2013-10-23 16:10:06 -07:00
Dane Springmeyer
045c544a4f g++ needs -fPIC for static archives 2013-10-23 16:00:39 -07:00
Dane Springmeyer
a248f880d6 include <mutex>: fixes compile on ubuntu precise/g++4.7/libstdc++ 2013-10-23 15:43:54 -07:00
Dane Springmeyer
efb687eb0b Merge branch 'master' of github.com:mapnik/mapnik 2013-10-23 15:42:39 -07:00
Dane Springmeyer
5a2954dab7 attempt to fix boost python with c++11 and boost 1.49 - refs #2022 2013-10-23 15:42:01 -07:00
Dane Springmeyer
bb3e38ebb3 add missing expected test images 2013-10-23 14:03:53 -07:00
artemp
24ce0f4b91 remove unused member variable 2013-10-23 17:44:04 +01:00
artemp
2f93188786 apply 116706fd1c fix - ref #2048 2013-10-23 15:26:43 +01:00
artemp
116706fd1c remove index_array from datasource and implement move semantics in featureset
fixes #2048 for topojson.input
2013-10-23 15:01:29 +01:00
Dane Springmeyer
8272b0b3db remove dead code 2013-10-22 21:13:02 -07:00
Dane Springmeyer
710d558218 scons: simplify linkflags/ldflags setting / attempt to fix #2025 2013-10-22 16:35:46 -04:00
Dane Springmeyer
afd23586f3 c++11 compile fixes 2013-10-22 16:05:44 -04:00
artemp
043f52d0a6 style : format 2013-10-22 17:15:27 +01:00
artemp
a1daefe467 fix index 2013-10-22 16:51:55 +01:00
Artem Pavlenko
7b2765c990 Merge pull request #2046 from vross/master
datasource_cache: display correctly the error message
2013-10-22 08:24:35 -07:00
Vross
43735a65d4 datasource_cache: display correctly the error message 2013-10-21 19:26:40 +02:00
artemp
e1fc9aed82 c++11
fix mapnik::noncopyable

Conflicts:
	include/mapnik/noncopyable.hpp
2013-10-21 16:46:41 +01:00
artemp
7adee4ab36 c++11 : remove boost::make_shared includes 2013-10-17 15:09:56 +01:00