Commit graph

212 commits

Author SHA1 Message Date
artemp
a7c6df98a3 update variant deps 2016-08-03 12:35:34 +01:00
artemp
9a0d7b0d68 update variant 2016-07-26 10:38:28 +02:00
artemp
dc88582b4d Merge branch 'master' into geometry-refactor 2016-07-19 10:25:33 +01:00
artemp
85a6ef9a15 update variant deps 2016-07-19 10:24:31 +01:00
artemp
359a3a845a update geometry.hpp 2016-07-11 10:17:45 +01:00
artemp
710a9be5b0 update to the latest geometry.hpp 2016-07-05 10:47:41 +01:00
Dane Springmeyer
71496e7828 install geometry.hpp 2016-06-27 16:49:30 -07:00
artemp
d169fb473e add geometry.hpp as submodule 2016-06-27 09:45:25 +01:00
artemp
18aa50a59e update variant 2016-06-07 14:19:22 +02:00
artemp
2f9c2a3a9b update variant submodule 2016-06-02 11:33:43 +02:00
artemp
04ce225728 update variant (again) to 7f7470fee6a42c3c68f1fa359a28cf762df385c3 2016-05-11 12:35:01 +02:00
artemp
5228dad91a update to latest variant 2016-05-11 10:58:08 +02:00
artemp
07ca572af4 fix mapbox/variant install path 2016-05-10 15:15:03 +02:00
artemp
75189905d6 upgrade to latest variant.hpp 2016-05-09 11:42:46 +02:00
artemp
c4d80de56e update deps 2016-05-06 10:58:19 +02:00
artemp
f5d6af4bb8 agg - make cover unsigned to avoid left shift of negative values ref #3406 2016-04-26 15:30:50 +02:00
artemp
f90f6d83c6 update deps / ref https://github.com/mapbox/variant/issues/96 2016-03-10 11:59:49 +01:00
Dane Springmeyer
f014041d9c restore intended variant version - partial revert of 93c4974b1 - refs #3297 2016-02-16 17:07:34 -08:00
Dane Springmeyer
93c4974b1b fix PYTHONUSERBASE - broken since b3170c397c [skip ci] 2016-02-16 13:23:34 -08:00
artemp
ff54a14e34 update deps 2016-02-15 13:57:54 +01:00
artemp
fa6376d9a1 update variant submodule 2016-02-11 10:18:16 +01:00
artemp
09163f969d deps - update variant 2016-02-03 11:06:00 +01:00
artemp
b427139951 update variant 2016-02-02 12:41:22 +01:00
Dane Springmeyer
d59460861e update to latest variant 2016-02-01 11:51:23 -08:00
artemp
33be145be9 variant - update to the latest upstream 2016-02-01 09:22:14 +01:00
Dane Springmeyer
61ffe096fc latest variant 2016-01-29 16:32:09 -08:00
artemp
4233fb4abb update deps 2016-01-29 11:37:01 +01:00
artemp
28b807f852 update variant 2016-01-28 15:33:57 +01:00
artemp
0ac9d39759 update variantx 2016-01-27 17:17:26 +01:00
artemp
9da449edf7 sync up variant again! 2016-01-27 15:59:58 +01:00
artemp
4b33780663 update variant 2016-01-27 15:48:29 +01:00
artemp
d027ed67c7 more const strictness, update to work with latest mapbox::variant/visitor-no-copy branch 2016-01-27 14:50:17 +01:00
Tom Hughes
920cb93d4c Remove execute permission from header files 2016-01-26 09:39:14 +00:00
artemp
db9facef90 update submodules 2016-01-25 10:04:10 +01:00
artemp
f140cc7dd1 update submodules 2016-01-21 18:52:24 +01:00
Dane Springmeyer
03285f60b0 install mapbox variant - followup to #3236 2016-01-14 14:09:32 -08:00
artemp
3333f3e1fa inherit mapnik::util::variant from mapbox::variant and add mapbox::variant as submodule 2016-01-14 15:02:41 +00:00
artemp
65b20e44e3 export agg::vcgen_dash 2016-01-08 10:48:47 +00:00
Dane Springmeyer
50d1e2fbb3 handle more gcc 4.9 -Wshadow warnings 2015-12-04 14:07:42 -05:00
Dane Springmeyer
e424ef1d77 start fixing gcc 4.9 -Wshadow warnings 2015-12-02 15:55:26 -05:00
Dane Springmeyer
d9d37423b7 use mapnik/warning_ignore.hpp in a few last places 2015-11-12 09:51:41 -08:00
Dane Springmeyer
a5594bd445 fix scan-build 'Value stored to 'a_' is never read' warning 2015-07-02 10:19:33 -07:00
artemp
8c6bf0eef6 update copyright notice 2015-06-16 12:49:16 +02:00
Dane Springmeyer
9a80a253bf fix -Wshadow warnings in agg 2015-06-15 20:41:51 -07:00
Dane Springmeyer
eb8c412a3b silence more boost gil warnings 2015-06-15 20:41:51 -07:00
Dane Springmeyer
3b450f14bf Avoid potential division by zero [coverity 54716] 2015-06-11 11:43:41 -07:00
Blake Thompson
a138b8717d Removed angus clipper library from code and updated all visual tests to master 2015-06-02 14:14:21 -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
Dane Springmeyer
4667e9470a more portable workaround for gil c++11 bug - closes #2859 2015-05-24 13:48:04 -07:00
Dane Springmeyer
956de13d4e fix issues reported by scan-build - closes #2813 2015-05-14 18:00:25 -07:00
Dane Springmeyer
a9bda0a5df remove agg_conv clipper - we are only interested in PolyTree 2015-04-30 14:27:53 -07:00
Blake Thompson
1bb8136390 Fix for bench 2015-04-21 10:29:22 -05:00
Blake Thompson
d7f7bc18c1 A large set of changes that help allow WKT for int64_t type geometeries, modified some strategies, made it so that the clipper would use mapnik geometries. 2015-04-21 09:34:52 -05:00
Blake Thompson
26131fb708 Updated clipper 2015-04-15 00:35:31 -05:00
Blake Thompson
feca4d9f9b Updated the clipper dependency to allow it to have some methods linked externally 2015-04-14 01:02:33 -05:00
Dane Springmeyer
369a82e421 fix variable shadowing in clipper 2015-04-05 02:23:31 -04:00
artemp
146bf85349 add 'clipper' based offset converter - it created buffer around geometry so can't replace current impl 2015-04-02 16:11:46 +02:00
Dane Springmeyer
529231f709 make clipperlib::PolyNode and PolyTree visable from the outside 2015-04-01 21:44:16 -04:00
Dane Springmeyer
6a89b37a76 upgrade clipper to v6.2.8 / svn r492 2015-02-15 13:06:01 -08:00
Dane Springmeyer
1753d0ab47 require boost >= 1.56 for geojson/topojson plugins 2015-01-27 22:20:03 -08:00
Dane Springmeyer
387b8f85d5 new dot symbolizer for fast rendering of points - refs #1651 mapbox/mapnik-vector-tile#62 #2612 2014-12-17 12:01:28 -08:00
artemp
19e3ce9035 gdal : experimenting with fetching gray scale single band as image_data_float32 2014-12-02 15:56:40 +01:00
artemp
2365fb2f43 add support for agg_pixfmt_gray32(_pre) and port changes to agg_color_gray/rgba and gamma calc from https://github.com/pelson/antigrain 2014-12-01 11:55:05 +01:00
Dane Springmeyer
b860b58f0f comment exit calls in densehashtable - refs #2547 2014-10-27 09:03:05 -07:00
Dane Springmeyer
ed425b7f3f move local boost headers into deps directory 2014-10-22 23:51:44 -07:00
Dane Springmeyer
aae4a20ec9 fix various -Wunused-parameter warnings 2014-10-21 20:23:17 -07:00
Dane Springmeyer
83588937b9 silence boost warnings 2014-10-21 16:37:27 -07:00
Dane Springmeyer
963ac22588 silence -Wunused-parameter warning in grain-extract for now - refs #2067 2014-10-21 13:01:14 -07:00
Dane Springmeyer
2d7f79a8c5 fix possible out-of-bounds write [coverity] 2014-10-13 16:19:51 -07:00
Dane Springmeyer
24e1bcfeec fix visibility of agg headers needed for svg2png built with -fvisibility=hidden - similiar to #1860 2014-10-01 10:34:47 -07:00
Dane Springmeyer
d9b9b0efac fix -Wdangling-else warning in clipper.cpp 2014-10-01 10:34:47 -07:00
Dane Springmeyer
6d8f126c3f avoid -Wunused-local-typedefs warning in sparsehash 2014-09-30 16:57:44 -07:00
Dane Springmeyer
54b2880e53 markers: support offset, geometry-transform, and simplify - closes #2108 2014-09-06 21:27:15 -07:00
Dane Springmeyer
f9e11dabeb simplify agg_basics.h
- remove unused/obsolete asm
 - visual studio since 2010 supports long long and we target 2014 now
2014-08-30 15:39:52 -07:00
Dane Springmeyer
7e74967282 fix std:: prefixing for cmath 2014-08-30 15:13:26 -07:00
Dane Springmeyer
34b04cd0d1 agg: disable unused epsilon 2014-08-06 22:42:24 -07:00
artemp
c1c5421fb6 add divide, linear-dodge and linear-burn blending modes (needs testing) 2014-08-04 12:33:37 +01:00
Seth Fitzsimmons
8476efbbba Work in HSL so luma can be preserved
Signed-off-by: artemp <artem@mapnik.org>
2014-07-22 10:48:58 +01:00
Dane Springmeyer
39737c5f1d Merge branch '2.3.x' of github.com:mapnik/mapnik
Conflicts:
	.travis.yml
	CHANGELOG.md
	bindings/python/build.py
	include/mapnik/feature_style_processor_context.hpp
	include/mapnik/feature_style_processor_impl.hpp
	include/mapnik/json/feature_collection_grammar.hpp
	include/mapnik/json/feature_collection_parser.hpp
	include/mapnik/json/feature_generator_grammar.hpp
	include/mapnik/json/feature_parser.hpp
	include/mapnik/json/geojson_generator.hpp
	include/mapnik/json/geometry_generator_grammar.hpp
	include/mapnik/json/geometry_parser.hpp
	plugins/input/gdal/gdal_featureset.cpp
	plugins/input/geojson/geojson_datasource.cpp
	plugins/input/occi/occi_featureset.cpp
	plugins/input/osm/osm_featureset.cpp
	plugins/input/postgis/build.py
	plugins/input/postgis/connection.hpp
	src/agg/agg_renderer.cpp
	src/build.py
	src/cairo_context.cpp
	src/datasource_cache.cpp
	src/grid/process_line_symbolizer.cpp
	src/grid/process_polygon_pattern_symbolizer.cpp
	src/grid/process_polygon_symbolizer.cpp
	src/grid/process_text_symbolizer.cpp
	src/json/feature_grammar.cpp
	tests/cpp_tests/fontset_runtime_test.cpp
	tests/visual_tests/images/collision-600-400-1.0-agg-reference.png
	tests/visual_tests/images/image-filters-multi-blur-512-512-1.0-agg-reference.png
	tests/visual_tests/images/image-filters-multi-blur-512-512-2.0-agg-reference.png
	tests/visual_tests/images/image-filters-multi-blur-inflate-512-512-1.0-agg-reference.png
	tests/visual_tests/images/image-filters-multi-blur-inflate-512-512-2.0-agg-reference.png
	tests/visual_tests/images/lines-1-400-400-2.0-agg-reference.png
	tests/visual_tests/images/lines-1-600-600-1.0-agg-reference.png
	tests/visual_tests/images/lines-1-600-600-2.0-agg-reference.png
	tests/visual_tests/images/lines-2-200-200-1.0-agg-reference.png
	tests/visual_tests/images/lines-2-400-400-1.0-cairo-reference.png
	tests/visual_tests/images/lines-2-400-400-2.0-agg-reference.png
	tests/visual_tests/images/lines-2-600-600-2.0-agg-reference.png
	tests/visual_tests/images/lines-2-800-800-2.0-agg-reference.png
	tests/visual_tests/images/lines-3-400-400-2.0-agg-reference.png
	tests/visual_tests/images/lines-3-600-600-1.0-agg-reference.png
	tests/visual_tests/images/lines-3-600-600-2.0-agg-reference.png
	tests/visual_tests/images/lines-5-200-200-1.0-agg-reference.png
	tests/visual_tests/images/lines-5-200-200-2.0-agg-reference.png
	tests/visual_tests/images/lines-5-400-400-1.0-agg-reference.png
	tests/visual_tests/images/lines-5-400-400-2.0-agg-reference.png
	tests/visual_tests/images/lines-5-600-600-1.0-agg-reference.png
	tests/visual_tests/images/lines-5-600-600-2.0-agg-reference.png
	tests/visual_tests/images/lines-5-800-800-1.0-agg-reference.png
	tests/visual_tests/images/lines-5-800-800-2.0-agg-reference.png
	tests/visual_tests/images/lines-6-200-200-1.0-agg-reference.png
	tests/visual_tests/images/lines-6-200-200-2.0-agg-reference.png
	tests/visual_tests/images/lines-6-400-400-1.0-agg-reference.png
	tests/visual_tests/images/lines-6-600-600-1.0-agg-reference.png
	tests/visual_tests/images/lines-6-600-600-2.0-agg-reference.png
	tests/visual_tests/images/lines-6-800-800-1.0-agg-reference.png
	tests/visual_tests/images/lines-6-800-800-2.0-agg-reference.png
	tests/visual_tests/images/lines-shield-600-600-2.0-agg-reference.png
	tests/visual_tests/images/lines-shield-600-600-2.0-cairo-reference.png
	tests/visual_tests/images/shield-on-polygon-600-400-1.0-agg-reference.png
	tests/visual_tests/images/shield-on-polygon-600-400-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-490-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-495-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-495-100-2.0-cairo-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-497-100-1.0-cairo-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-497-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-497-100-2.0-cairo-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-498-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-499-100-1.0-cairo-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-499-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-499-100-2.0-cairo-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-500-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-501-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-502-100-1.0-cairo-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-502-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-505-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-505-100-2.0-cairo-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-510-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-3-490-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-3-495-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-3-497-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-3-498-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-3-499-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-3-500-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-3-501-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-3-502-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-3-505-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-3-510-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-4-490-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-4-495-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-4-497-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-4-498-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-4-499-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-4-500-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-4-501-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-4-502-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-4-505-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-4-510-100-2.0-agg-reference.png
	tests/visual_tests/test.py
2014-04-24 14:50:55 -07:00
Dane Springmeyer
bc1c7234c3 drop vertex_dist_epsilon to 1e-5 (could likely even go lower) - refs #2196, #2186 2014-03-31 21:22:05 -07:00
Dane Springmeyer
aff0c09f33 Merge branch '2.3.x' of github.com:mapnik/mapnik 2013-11-07 20:06:17 -08:00
Dane Springmeyer
9c82c0c957 enable deprecated features in clipper 6.x - refs https://github.com/mapbox/mapnik-vector-tile/issues/30 2013-11-07 20:04:37 -08:00
Dane Springmeyer
08fa9fd8ec Merge branch '2.3.x' of github.com:mapnik/mapnik
Conflicts:
	bindings/python/mapnik_building_symbolizer.cpp
	bindings/python/mapnik_debug_symbolizer.cpp
	bindings/python/mapnik_line_pattern_symbolizer.cpp
	bindings/python/mapnik_line_symbolizer.cpp
	bindings/python/mapnik_markers_symbolizer.cpp
	bindings/python/mapnik_point_symbolizer.cpp
	bindings/python/mapnik_polygon_symbolizer.cpp
	bindings/python/mapnik_python.cpp
	bindings/python/mapnik_raster_symbolizer.cpp
	bindings/python/mapnik_shield_symbolizer.cpp
	bindings/python/mapnik_symbolizer.cpp
2013-11-07 09:21:05 -08:00
Dane Springmeyer
84d9900862 upgrade clipper from 5.1.5->6.0.0 2013-11-06 13:37:30 -08:00
Dane Springmeyer
d0619bc402 update copyright year for scons build files 2013-11-05 16:54:13 -08:00
Dane Springmeyer
f998b2bda6 Merge branch '2.3.x' of github.com:mapnik/mapnik
Conflicts:
	deps/agg/build.py
	deps/clipper/build.py
	include/mapnik/feature_style_processor_impl.hpp
	plugins/input/csv/csv_datasource.cpp
2013-11-03 23:10:21 -08:00
Dane Springmeyer
0f8c931530 scons: suncc support is not maintained, remove it 2013-11-03 23:07:02 -08:00
Dane Springmeyer
cbc58e0068 also set -fPIC for clipper 2013-10-23 16:25:56 -07:00
Dane Springmeyer
045c544a4f g++ needs -fPIC for static archives 2013-10-23 16:00:39 -07:00
Dane Springmeyer
710d558218 scons: simplify linkflags/ldflags setting / attempt to fix #2025 2013-10-22 16:35:46 -04:00
artemp
d6c56e737f == c++11
+ remove legacy 'register' keyword usage from last century
2013-10-15 16:29:24 +01:00
Dane Springmeyer
f847a67ee9 fix span_image_resample_rgba 2013-10-02 16:55:11 -07: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
8722def984 fix unsigned integer overflow warnings in agg - refs #1679 2013-10-01 21:30:19 -07:00
Dane Springmeyer
f4c3620d67 protect against invalid memory access if agg gradient lookup fails to build 2013-09-27 15:24:33 -07:00
Dane Springmeyer
2c46300f61 remove dead code (colorize-alpha is now officially an image-filter) 2013-09-24 17:18:14 -07:00
Dane Springmeyer
f05b727bf5 fix dst-over alpha handling - closes #1995 - refs #1452 and 5e84ce0 2013-09-20 13:37:34 -07:00