Commit graph

9675 commits

Author SHA1 Message Date
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
Dane Springmeyer
e01b39729f respect args passed to apply_to_layer which repairs broken mapnik::request usage (#1737) after 7495d2f381 2013-10-16 09:42:57 +01:00
Dane Springmeyer
c881fee7f0 respect args passed to apply_to_layer which repairs broken mapnik::request usage (#1737) after 7495d2f381 2013-10-15 18:12:07 -04:00
artemp
d6c56e737f == c++11
+ remove legacy 'register' keyword usage from last century
2013-10-15 16:29:24 +01:00
Dane Springmeyer
2e0d905589 add configure test for c++11 support 2013-10-14 19:03:01 -04:00
Dane Springmeyer
fc0ca0d847 merge with remote 2.3.x 2013-10-14 17:51:17 -04:00
Dane Springmeyer
1aad73b2ad iwyu 2013-10-14 17:47:51 -04:00
Dane Springmeyer
5e86e8680d Merge pull request #2040 from mojodna/fix-debug-build
Fix debug build in 2.3.x
2013-10-14 14:44:49 -07:00
Seth Fitzsimmons
1304a6a1b8 Fix reference to non-existent 'colors'
Allows builds with DEBUG=true to succeed.
2013-10-14 14:40:19 -07:00
artemp
10f9371088 + fix typo 2013-10-14 13:06:20 +01:00
Hermann Kraus
765dda465c Only call function if it is actually built. 2013-10-14 02:34:28 +02:00
Hermann Kraus
cf7aa83bd8 Only call function if it is actually built. 2013-10-14 02:24:36 +02:00
artemp
be56a61dea + input plugins: don't link to boost_thread
(python bindings still need boost_thread via thread_specific_ptr usage)
2013-10-11 15:17:32 +01:00
artemp
7f9578c830 + cleaup 2013-10-11 14:19:41 +01:00
artemp
e231117504 == c++11
+ remove remaining boost::thread usage
+ don't link to boost_thread
2013-10-11 14:18:35 +01:00
artemp
582ca02f44 remove unused boost.thread includes 2013-10-11 13:39:39 +01:00
artemp
0e40b3c87d == c++11
use std::thread (removes boost.thread dependency)
2013-10-11 13:20:46 +01:00
artemp
3edfc69c81 == c++11
use std::tuple with std::get<>
2013-10-11 12:36:04 +01:00