Commit graph

7239 commits

Author SHA1 Message Date
artemp
ac8ececf1c == topojson ==
+ use boost::variant<> for storing properties
+ parse properties as top level key/value pairs
2013-10-03 15:32:07 +01:00
Dane Springmeyer
5b3e89df94 fix compile after merge with 2.3.x 2013-10-02 19:37:07 -07:00
Dane Springmeyer
9c8f7cc90d merge with 2.3.x branch 2013-10-02 18:25:24 -07:00
Dane Springmeyer
f9e630bbd3 Merge remote-tracking branch 'origin/2.3.x' 2013-10-02 18:23:09 -07:00
Dane Springmeyer
83fde93411 add note about #2000 to changelog 2013-10-02 17:20:20 -07:00
Dane Springmeyer
fdf9288ba7 add xml needed for f91ae9f51c 2013-10-02 17:16:58 -07:00
Dane Springmeyer
371d79774a avoid integer overflows in agg by using clamping in agg:iround with agg::rasterizer_sl_clip_int_sat - closes #2000 2013-10-02 17:08:22 -07:00
Dane Springmeyer
f847a67ee9 fix span_image_resample_rgba 2013-10-02 16:55:11 -07:00
Dane Springmeyer
f91ae9f51c benchmark: add new rendering test harness and use to compare clipping impact on speeds at high and low zoom 2013-10-02 16:09:32 -07:00
Dane Springmeyer
0624ec31dc benchmark: add conv_clip_polygon + very basic validation for clipping tests 2013-10-02 15:14:52 -07:00
Dane Springmeyer
9aa596401a rename the agg int overflow test so it actually runs under nose 2013-10-02 09:41:05 -07:00
artemp
48e65feb62 == topojson ==
+ polygon generator
2013-10-02 15:14:27 +01:00
artemp
77d0ecc459 c++11
remove BOOST_FOREACH
2013-10-02 09:42:03 +01:00
Dane Springmeyer
9d8be8ea21 fix one clear case of unsigned overflow in comp_op_rgba_minus - refs #1679 2013-10-01 22:03:15 -07:00
Dane Springmeyer
a25826fb13 tests: use black background in test 2013-10-01 21:35:27 -07:00
Dane Springmeyer
ac961feb64 expose mapnik.Color.packed to get unsigned rgba value 2013-10-01 21:30:49 -07:00
Dane Springmeyer
8722def984 fix unsigned integer overflow warnings in agg - refs #1679 2013-10-01 21:30:19 -07:00
Dane Springmeyer
d84443b4f3 fix unsigned integer overflow when passing args to composite_bitmap 2013-10-01 21:29:22 -07:00
Dane Springmeyer
81f14b8d36 Add currently failing test for #2000 2013-10-01 21:21:55 -07:00
Dane Springmeyer
61dde4b093 fix several -Wsign-compare warnings 2013-10-01 11:48:27 -07:00
Dane Springmeyer
37a203cf83 Merge branch 'master' of github.com:mapnik/mapnik 2013-10-01 11:48:12 -07:00
Dane Springmeyer
3dba53e333 fix several -Wsign-compare warnings 2013-10-01 11:47:47 -07:00
artemp
81159bc006 oops -> don't copy topology object 2013-10-01 19:18:05 +01:00
Dane Springmeyer
32d053abf6 only build pgsql2sqlite if pg_config is available 2013-10-01 10:15:41 -07:00
Dane Springmeyer
2e630c5c14 only build pgsql2sqlite if pg_config is available 2013-10-01 10:13:54 -07:00
Dane Springmeyer
e9ad589e13 Add boost version header 2013-10-01 09:35:36 -07:00
Dane Springmeyer
433e711a0e Merge branch 'master' of github.com:mapnik/mapnik 2013-10-01 09:26:43 -07:00
Dane Springmeyer
d5bacc39e2 installing g++-4.7 breaks clang, so disable for now 2013-10-01 09:26:14 -07:00
artemp
bfcf356b84 topojson
+ populate r-tree index
2013-10-01 17:22:41 +01:00
artemp
20a0f55e7d topojson
+ bounding box visitor
2013-10-01 17:16:16 +01:00
artemp
4bf15a04ef topojson
+ make transform optional to match TopoJSON spec
2013-10-01 17:16:16 +01:00
Dane Springmeyer
087cc9e2ae travis: start building python bindings again 2013-10-01 08:41:39 -07:00
artemp
c0461280be + add get_pointer impl for std::shared_ptr<T>
when building agaist boost version < 1.53
2013-10-01 15:08:46 +01:00
artemp
a3c329a6f8 == Boost.Python std::shared_ptr ==
+ ensure mapnik::memory_datasource is wrapped in std::shared_ptr in Python bindings
+ register implicit conversion from std::shared_ptr<memory_datasource> to std::shared_pre<datasource>

ref #2020
2013-10-01 14:48:54 +01:00
artemp
ecc2b39865 mapnik::memory_datasource - qualify virtual methods for brevity 2013-10-01 14:48:54 +01:00
Dane Springmeyer
c34c8a568f merge with branch 2.3.x 2013-09-30 13:33:28 -07:00
artemp
ae3f682564 add missin copyright notice 2013-09-30 13:32:30 -07:00
Dane Springmeyer
8ebd804360 remove tabs 2013-09-30 13:30:16 -07:00
Dane Springmeyer
a6ad3e6627 + avoid copying feature_ptr during r-tree initialisation + avoid taking reference to temporary 2013-09-30 13:23:38 -07:00
artemp
fddec700ad TopoJSON input plugin
skeleton implementation
2013-09-30 14:14:58 +01:00
artemp
ff93a8117b add missin copyright notice 2013-09-30 13:32:24 +01:00
artemp
b3948e4a9c + avoid copying feature_ptr during r-tree initialisation 2013-09-30 11:36:04 +01:00
artemp
d116ca062f + cleanup 2013-09-30 11:35:42 +01:00
artemp
c860ed4d99 == TopoJSON parser ==
https://github.com/mbostock/topojson/wiki
2013-09-30 11:16:58 +01:00
artemp
2b50c105c3 + style 2013-09-30 08:56:58 +01:00
Dane Springmeyer
2d1249ef98 gah, completely disable image comparions for webp since versions differ too widely 2013-09-27 17:01:58 -07:00
Dane Springmeyer
619f7ec406 catch one more case of webp needing test workaround for old systems 2013-09-27 16:39:15 -07:00
Dane Springmeyer
06dc054208 skip webp tests that cannot run because expected test images cannot be opened - avoids 'WebPGetInfo failed' error 2013-09-27 16:34:41 -07:00
Dane Springmeyer
ca6d6df446 fix code formatting 2013-09-27 16:15:16 -07:00
Dane Springmeyer
82e1b37281 allow single color colorize-alpha 2013-09-27 16:11:23 -07:00