Commit graph

7287 commits

Author SHA1 Message Date
Dane Springmeyer
01344baffb maintain default of max_size=10 and improve error output in the case max_size < max_async_connections 2013-09-23 17:32:42 -07:00
Dane Springmeyer
ad979a85a9 integrate async test into main postgis tests 2013-09-23 15:12:42 -07:00
Dane Springmeyer
dc1d568501 code cleanup, consistent debug output 2013-09-23 14:57:23 -07:00
Dane Springmeyer
5c020cf28f cleanup postgis async test 2013-09-23 14:52:46 -07:00
Dane Springmeyer
75d88f3370 Merge branch 'master' of github.com:mapnik/mapnik into Mappy-master-async-postgis 2013-09-23 14:31:55 -07:00
Dane Springmeyer
da4e6540d6 test: test to_geojson output to prevent regressions like #2019 2013-09-23 12:20:40 -07:00
Dane Springmeyer
81650e59c1 fix to_geojson polygon output after bug introduced in merge 76f111cc97 - closes #2019 2013-09-23 12:16:39 -07:00
Dane Springmeyer
63f97fa4aa lessen header interdependence between placement_finder.hpp and symbolizer_helpers.hpp 2013-09-23 11:42:47 -07:00
Dane Springmeyer
153c7cce60 fix compile of pgsql2sqlite 2013-09-23 11:37:16 -07:00
artemp
10196f35b4 Merge branch 'c++11' into c++11-revised
Conflicts:
	bindings/python/python_grid_utils.cpp
	include/mapnik/font_engine_freetype.hpp
	include/mapnik/value.hpp
	src/agg/process_building_symbolizer.cpp
	src/cairo_renderer.cpp
	src/grid/process_building_symbolizer.cpp
2013-09-23 08:53:36 +01:00
Dane Springmeyer
780d6a459d Merge branch 'master' of github.com:mapnik/mapnik into Mappy-master-async-postgis 2013-09-22 22:08:23 -07:00
Dane Springmeyer
a1bf65210d Merge branch 'master' of github.com:mapnik/mapnik 2013-09-22 22:07:55 -07:00
Dane Springmeyer
85fc82c03b fix #2018 2013-09-22 22:07:35 -07:00
Dane Springmeyer
8282ff28cb fix #2018 2013-09-22 22:06:34 -07:00
Dane Springmeyer
bd2a122b19 fix sign compare warning 2013-09-22 22:03:27 -07:00
Dane Springmeyer
8f99e35252 udpdate changelog after #1995 2013-09-20 13:51:05 -07:00
Dane Springmeyer
f05b727bf5 fix dst-over alpha handling - closes #1995 - refs #1452 and 5e84ce0 2013-09-20 13:37:34 -07:00
Dane Springmeyer
da226a48cf add test data for #1995 2013-09-20 13:35:54 -07:00
Dane Springmeyer
4713ddf8d6 reduced testcase for #1995 - refs #1452 and #1369 2013-09-20 13:31:11 -07:00
artemp
e2f5e35616 + opps, 'auto' is c++11 2013-09-20 17:19:23 +01:00
artemp
0eada70845 + use const std::unique_ptr< []> instead of boost::scoped_array 2013-09-20 15:01:58 +01:00
artemp
09ce29489e use const std::unique_ptr<> instead of boost::scoped_ptr<> 2013-09-20 14:22:58 +01:00
artemp
62af2e6765 + replace <boost/shared_ptr.hpp> with <memory> 2013-09-20 14:13:23 +01:00
artemp
b315eb2167 + use std::shared_ptr and std::make_shared 2013-09-20 14:01:27 +01:00
artemp
6e6cff4613 remove has_nothrow_copy
as it was triggering requirement for move ctor in UnicodeString
which is not _yet_ available
2013-09-20 14:01:27 +01:00
Dane Springmeyer
b0436a3ad1 scons: unbreak memory mapped access for shapefiles by fixing the setting of SHAPE_MEMORY_MAPPED_FILE 2013-09-19 20:51:49 -07:00
Dane Springmeyer
0619477238 optimize rule::active which is called in loop in feature_style_processor_impl 2013-09-19 20:24:59 -07:00
Dane Springmeyer
5d12a345ae start using c++11 features: auto/for/unique_ptr/variadic args - refs #1972 2013-09-19 20:19:01 -07:00
Dane Springmeyer
9df4deac73 consistent use of agg::rgba8_pre to construct premultiplied colors - refs #2011 2013-09-19 19:41:46 -07:00
Dane Springmeyer
5b78b6b2dc fix #2011 2013-09-19 19:19:11 -07:00
Dane Springmeyer
d054d47884 Add new test images - refs #2011 2013-09-19 19:16:46 -07:00
Dane Springmeyer
2ccbdb101c add testcase for building fill-opacity premultiplied alpha bug - refs #2011 2013-09-19 19:15:32 -07:00
Dane Springmeyer
576271d5ca merge 2013-09-19 18:40:48 -07:00
Dane Springmeyer
9bd3dd0e21 fix viewer compile 2013-09-19 18:39:44 -07:00
Dane Springmeyer
f00e85b46f QtWidgets is not available in latest release 2013-09-19 18:31:03 -07:00
Dane Springmeyer
d216aa9771 fix compile of styles_model.cpp/mapnik::to_expression_string() by ensuring compile defines are present 2013-09-19 18:30:28 -07:00
Dane Springmeyer
5c534c1ac6 make rule_cache noncopyable 2013-09-19 18:01:51 -07:00
artemp
a8d49b8112 + use mapnik::polygon_clipper by default 2013-09-19 09:12:50 +01:00
Dane Springmeyer
25ee36f74e merge 2013-09-18 20:41:20 -07:00
Dane Springmeyer
2ebd3e9bf8 iwyu 2013-09-18 20:40:30 -07:00
Dane Springmeyer
f2152c1d27 travis: start building plugins and use default optimization 2013-09-18 20:38:46 -07:00
Dane Springmeyer
1b3e07ef23 c++ style 2013-09-18 20:35:14 -07:00
Dane Springmeyer
daafcdae51 Merge branch 'master' of github.com:mapnik/mapnik into c++11 2013-09-18 20:32:09 -07:00
Dane Springmeyer
df352efc8f use std::size_t in wkb parser 2013-09-18 20:31:59 -07:00
Dane Springmeyer
35a42b49e6 cast to int 2013-09-18 20:29:59 -07:00
Dane Springmeyer
8b5323f101 drop suncc support from singleton class 2013-09-18 20:29:46 -07:00
Dane Springmeyer
9aff3c596b better type handling/casts 2013-09-18 20:29:26 -07:00
Dane Springmeyer
c77e9fed5c c++ style 2013-09-18 20:29:01 -07:00
Dane Springmeyer
5c77edcc5e remove uneeded usage of std::move 2013-09-18 20:24:51 -07:00
Dane Springmeyer
121e5b59b0 mapnik::value: avoid extra copy of value_unicode_string + define copy and assignment 2013-09-18 20:14:50 -07:00