Commit graph

83 commits

Author SHA1 Message Date
artemp
99c67a87cd Merge branch 'master' into spirit-x3 2016-01-26 10:59:30 +01:00
Tom Hughes
920cb93d4c Remove execute permission from header files 2016-01-26 09:39:14 +00:00
Dane Springmeyer
e874f9237b silence more gcc shadow/unused warnings 2016-01-19 18:06:11 -08: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
a5594bd445 fix scan-build 'Value stored to 'a_' is never read' warning 2015-07-02 10:19:33 -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
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
6a89b37a76 upgrade clipper to v6.2.8 / svn r492 2015-02-15 13:06:01 -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
aae4a20ec9 fix various -Wunused-parameter warnings 2014-10-21 20:23:17 -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
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
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
artemp
c1c5421fb6 add divide, linear-dodge and linear-burn blending modes (needs testing) 2014-08-04 12:33:37 +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
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
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
Dane Springmeyer
3bd2e6501f fix a batch of unused variable warnings (leaving several with are true bugs/missing features) 2013-07-23 15:51:22 -04:00
Dane Springmeyer
d34661f7d7 expose vpgen_clip_polyline so cpp tests will work on windows 2013-05-25 18:13:39 -07:00
Dane Springmeyer
36123141ff fix windows build 2013-05-22 22:06:36 -07:00
Dane Springmeyer
1c296aa4d4 fix #1860 - refs #1826 2013-05-22 14:31:19 -07:00
Dane Springmeyer
8af516a904 upgrade clipper to 5.1.5 - refs #1749 2013-05-09 18:11:49 -07:00
artemp
f96de9bdd8 + always ensure first value in gamma table to 0 2013-03-22 12:30:46 +00:00
Dane Springmeyer
7e974b9064 avoid potential zero division resulting in nan in agg::gamma_linear - closes #761 2013-03-14 17:48:59 -07:00
Dane Springmeyer
cecba84877 Revert "+"
This reverts commit af8f2e0ee8.
2013-03-07 10:19:29 -08:00
Dane Springmeyer
21ce1b8b2a Revert "+ remove unused members"
This reverts commit e59d979969.
2013-03-07 10:19:19 -08:00
artemp
e59d979969 + remove unused members 2013-03-01 16:54:16 -05:00
artemp
af8f2e0ee8 + 2013-03-01 16:18:32 -05:00
artemp
6d0caf88f5 + apply formatting 2013-03-01 11:08:58 -05:00
artemp
c0b4eda911 + use c++ headers
+ apply mapnik c++ style formatting
2013-03-01 11:08:58 -05:00
artemp
934a3f9b84 + untabify 2013-02-27 11:56:21 -05:00
artemp
21c618ccc5 + initialize x,y for close_path commands 2013-02-22 15:02:10 +00:00
artemp
997e807f3d + revert as it was breaking polygons in some cases 2013-02-20 14:11:07 +00:00
artemp
747305253c + link clipper obj's into core lib 2013-02-19 10:06:59 +00:00