sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
12729 commits 112 branches 95 tags 181 MiB
Commit graph

178 commits

Author SHA1 Message Date
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
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
584aad0c88 fix windows linking to clipper - needed by node-mapnik is_solid check 2013-05-22 14:11:28 -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
9246239d14 + update clipper to r304 2013-02-27 11:57:19 -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
artemp
ff8819efc3 + update clipper to latest (5.1.0) 2013-02-19 09:03:25 +00:00
artemp
79ba830347 + test original (un-moded) clipper 2013-02-13 10:23:29 +00:00
artemp
56c0fb6982 + clipper based polygon clipper 
(FIXME: avoid leaking memory)
 2013-02-12 16:45:13 +00:00
artemp
8b757a1c7e + avoid creating two coincident vertices (needs more testing) 2013-02-12 15:51:40 +00:00
Dane Springmeyer
3c59eba780 ensure agg headers are always installed 2013-02-08 17:22:17 -08:00
Dane Springmeyer
6f8a12d29d further fixup the sparsehash usage internally 2013-01-10 17:20:34 -08:00
Dane Springmeyer
6b2b66b894 fix handling/install of sparsehash headers 2013-01-10 09:39:43 -08:00
Dane Springmeyer
193c7d9d20 use boost/function/hash for easy msvc compatibility even though msvc 2010 would support using std::hash in <functional> 2013-01-09 19:46:47 -08:00
Dane Springmeyer
0121f53f56 refactor and speed up hextree image encoding by using dense_has_map - refs #1629 2013-01-08 19:07:11 -08:00
Dane Springmeyer
f2276d97a0 modify agg conv classes to support type() member - closes #1607 refs #1604 2012-11-28 19:22:10 -08:00
Dane Springmeyer
5e84ce0dfc agg compositing: change src_over alpha to avoid pixel artifacts by reordering computations and add basic tests comparing src_over composting to normal agg alpha blending - closes #1452 - refs #1313, #1454, #1369 2012-08-31 18:04:08 -07:00
Dane Springmeyer
ac320b2d1a agg: spelling fix 2012-08-31 17:52:01 -07:00
Dane Springmeyer
f983a73feb avoid gcc compiler warnings after 352ad7499d - refs #1383 2012-08-31 21:49:06 +00:00
Dane Springmeyer
9a8051fcf0 scons: remove dependence of agg headers on libmapnik to avoid constant re-installs 2012-08-29 14:47:01 -07:00
Dane Springmeyer
a56c63bed1 start installing agg headers so that c++ programs using mapnik can use more of the mapnik api - closes #1383 2012-08-27 18:45:04 -07:00
Dane Springmeyer
352ad7499d move agg compositing methods that use boost gil into cpp file to lessen dependence on boost gil headers - refs #1383 2012-08-27 18:44:01 -07:00
Dane Springmeyer
ac418a7d4e remote the last references 2012-08-27 16:43:40 -07:00
Dane Springmeyer
4cf1484b53 disable colorize-alpha comp-op as per #1371 2012-08-15 14:46:58 -07:00
Dane Springmeyer
b43697fd5d colorize-alpha: only recolor if source alpha is > 0 to avoid overpainted background - refs #1371 2012-08-03 14:48:02 -07:00
artemp
66614df453 + fix - move Sca>0 test 2012-08-03 17:33:15 +01:00
artemp
5414912160 + prevent division by zero in color-burn mode 
(FIXME: re-implement using latest(corrected) math from
    http://www.w3.org/TR/SVGCompositing/)
+ re-implemented grain-extract mode
 2012-08-03 15:34:21 +01:00
Artem Pavlenko
2201eb6941 Merge remote-tracking branch 'origin/master' 2012-06-20 10:07:10 -04:00
Artem Pavlenko
eba3a88388 + agg_pixfmt_rgba.h : impl blend_color_hspan_alpha 
+ agg_renderer_scanline.h : add support for setting alpha
+ process_polygon_pattern_symbolizer.cpp : setting variable opacity
 2012-06-20 10:03:24 -04:00
Tom MacWright
aa5a726b92 Rename color-spin composite operation to colorize alpha 
to make it less confusing alongside actual color manipulation
modes.
 2012-06-19 17:16:25 -04:00
Artem Pavlenko
9b61c0effe Merge remote-tracking branch 'origin/master' 
Conflicts:
	deps/agg/include/agg_pixfmt_rgba.h
	include/mapnik/image_compositing.hpp
	src/cairo_renderer.cpp
	src/image_compositing.cpp
 2012-06-18 14:36:15 -04:00
Artem Pavlenko
c71944bf32 + use HSV color space (as in GIMP) 
+ rename 'luminosity' to 'value'
 2012-06-18 14:30:01 -04:00
Tom MacWright
f6c10bbb7e Add color_spin composite operation. 2012-06-18 11:10:04 -04:00
Dane Springmeyer
465842e0e4 agg build: stop restricting CPPPATH so that boost can be reliably found, post b9765ec1db 2012-06-17 16:21:20 -04:00
Artem Pavlenko
14d365d572 + hue, saturation, color and luminosity blending modes (HSL based) 
(http://en.wikipedia.org/wiki/Blend_modes#Hue.2C_saturation_and_luminosity)
 2012-06-17 15:19:29 -04:00
Mickey Rose
d346c57e17 agg::trans_affine: add static const identity, make mul/div operators const 
(cherry picked from commit db47a6c9bad5828fe62b5c1c05661118e23ad218)
 2012-06-06 17:34:08 +02:00
Mickey Rose
44538e29d4 agg::conv_transform: changed transformer to non-const reference (replaces ba270e0) 2012-05-29 18:32:04 +02:00
Artem Pavlenko
f3c774baa4 + add grain-extract blending mode (gimp) 2012-05-29 15:09:33 +01:00
Artem Pavlenko
f692df9337 + untabify 2012-05-25 13:28:00 +01:00
Artem Pavlenko
6bea57d690 + implement grain-merge blending mode (GIMP) 2012-05-25 10:35:43 +01:00
Dane Springmeyer
19631e50e2 restore pristine agg2.4 agg:span_image_resample_rgba_affine - refs #1227 2012-05-24 14:12:04 -07:00
Artem Pavlenko
92c41e8626 + restore allocator (as it used to store objects with 
non-trivial ctor's - svg_converter) TODO: expose allocator
 2012-05-15 14:30:04 +01:00
Artem Pavlenko
ba270e07f2 store Transformer by value in conv_transform 2012-04-18 09:38:17 +01:00
Artem Pavlenko
254c623a99 + remove vc++ 6.0 work-around 2012-03-23 09:32:22 +00:00
Artem Pavlenko
2f5e7f8464 + use in-place ::new/::delete 2012-03-23 09:31:02 +00:00
Lucio Asnaghi
180f2543b2 - Fixed a typo in agg_rounded_rect.cpp 2011-10-26 20:34:13 +03:00
Artem Pavlenko
e837b46f5c agg-2.4.tar.gz-noarch-fixpathstoragewarning.diff [JoeB] 2011-10-26 10:21:21 +01:00
Artem Pavlenko
6798e52c58 agg-2.4.tar.gz-noarch-fixoutlineaaoptimizer.diff [JoeB] 2011-10-26 10:20:08 +01:00
Dane Springmeyer
28ed3e5fdf remove tinyxml, no longer needed by boost ptree as it bundles rapidxml now 2011-10-11 20:02:50 -07:00