Dane Springmeyer
9b789a398b
remove bilinear8 from master/3.x - closes #2076
2014-08-12 13:43:37 -07:00
artemp
6136a32092
Merge branch 'master' into custom-variant-2
2014-08-12 19:44:37 +01:00
Dane Springmeyer
04e4b47d91
stricter string2bool conversion - refs #2348
2014-08-12 11:33:20 -07:00
artemp
f57f3a7f83
ammend topojson_grammar and remove last boost::variant usage
2014-08-12 16:16:17 +01:00
artemp
7f8e18f89b
cleanup
2014-08-12 16:15:57 +01:00
artemp
95cea92a4a
convert all boost::variant to util::variant
...
apart from topojson (TODO)
2014-08-12 13:40:45 +01:00
artemp
8c7be886bd
fix typo - uncomment column_collector
2014-08-12 10:47:29 +01:00
artemp
3f8c459195
make mapnik::symbolizer a mapnik::util::variant<Symbolizers...>
2014-08-12 10:40:38 +01:00
Dane Springmeyer
80aeceafc7
remove duplicate typedef for dash_array
2014-08-11 22:22:12 -07:00
Jordan Hollinger
c63e3a55f1
Merge branch 'master' of github.com:mapnik/mapnik into jh-min-repeat-distance
2014-08-11 17:43:51 -04:00
artemp
9a1639a1d6
AGG/Cairo - fix pattern opacity
2014-08-11 15:42:45 +01:00
artemp
201641a206
AGG/Cairo - fix pattern opacity
2014-08-11 15:36:48 +01:00
Jordan Hollinger
726274c2c9
Merge branch 'master' of github.com:mapnik/mapnik into jh-min-repeat-distance
2014-08-11 09:48:04 -04:00
artemp
27ee642bbe
fix cairo_renderer usage in demo/viewer + revert aac69d0b34
2014-08-11 13:40:12 +01:00
artemp
9bfb41a39f
convert symbolizer properties to use util::variant
2014-08-11 13:24:53 +01:00
artemp
aac69d0b34
expose cairo_renderer<cairo_surface_ptr>
2014-08-11 13:24:11 +01:00
artemp
c197822116
add getter interface compatible with boost::variant
2014-08-11 13:23:01 +01:00
artemp
e315922b70
Merge branch 'master' into custom-variant-2
...
Conflicts:
include/mapnik/value.hpp
2014-08-11 11:53:59 +01:00
artemp
43b8069698
topojson - revert to using boost::variant for mapnik::topojson::geometry (TODO)
2014-08-11 11:51:19 +01:00
Dane Springmeyer
c285cfa188
refactor cairo_renderer
...
- splits process functions into new cpp files to reduce peak compile memory usage
- drops cairo_renderer_base to match agg_renderer design
- only cairo_ptr is accepted so cairo_surface_ptr must be converted into a context first
- fixes -fvisibility=hidden
2014-08-10 13:53:45 -07:00
Dane Springmeyer
7cae3c34ca
iwyu in renderer_common
2014-08-10 13:04:20 -07:00
Dane Springmeyer
4c10d90145
declare segment y_order inline
2014-08-10 13:02:34 -07:00
Dane Springmeyer
378ab71a51
more -fvisibility=hidden fixes for osx
2014-08-09 14:23:23 -07:00
Dane Springmeyer
678907e027
silence webp -Wunused-function warning
2014-08-09 13:57:01 -07:00
Dane Springmeyer
8ff987af6d
iwyu
2014-08-09 13:46:13 -07:00
Dane Springmeyer
1c0b1884c3
use extern template to solve -fvisibility=hidden issues on osx
2014-08-09 13:44:42 -07:00
Dane Springmeyer
d61efc0b5a
-fvisibility=hidden fixes on osx with -flto
2014-08-09 13:44:42 -07:00
Dane Springmeyer
1c9afc9a86
boolean_type cleanup/code re-use
2014-08-09 13:44:41 -07:00
Dane Springmeyer
95430a3beb
remove uneeded debug statement
2014-08-08 15:41:18 -07:00
Dane Springmeyer
578da31702
use extern template to fix osx -flto bug - closes #2339
2014-08-08 14:16:49 -07:00
Dane Springmeyer
1727fae6e7
remove boost concept_check usage - refs #2346
2014-08-08 13:15:57 -07:00
Dane Springmeyer
e33e0150ad
2x faster compile of value_types.hpp - start working on #2346
2014-08-08 12:34:41 -07:00
Dane Springmeyer
8f183ac63a
Merge pull request #2345 from mapnik/emplace
...
use emplace/emplace_back over insert/push_back - refs #2336
2014-08-08 11:30:14 -07:00
artemp
1f403a078e
transform : is_null_node visitor
2014-08-08 16:43:15 +01:00
artemp
1a94ee1900
add link to custom generator TODO
2014-08-08 16:42:48 +01:00
artemp
93bad52e7e
use is_null_visitor
2014-08-08 16:42:14 +01:00
artemp
7b255f2b95
value traits to control to value conversions + fix is_null
2014-08-08 16:41:03 +01:00
artemp
784d24828f
replace boost::spirit::karma alternate operator (uses boost::variant) with direct util::variant to string conversion
2014-08-08 15:53:28 +01:00
artemp
6095df6702
Merge branch 'master' into custom-variant-2
...
Conflicts:
include/mapnik/value.hpp
2014-08-08 12:31:31 +01:00
artemp
eff7fb2f94
Merge branch '3.x-szn-markers-symbolizer-vertex-placements' of git://github.com/mapycz/mapnik into mapycz-3.x-szn-markers-symbolizer-vertex-placements
2014-08-08 12:15:53 +01:00
artemp
09e78e3ee9
remove unused includes
2014-08-08 12:14:11 +01:00
artemp
ade32abcd8
mapnik::util::variant in mapnik::value
2014-08-08 12:13:49 +01:00
Jiri Drbalek
705260aa06
prefer c++ style comments
2014-08-08 06:34:33 +00:00
Jiri Drbalek
9b0953a955
remove needless virtual inheritance
2014-08-08 06:34:33 +00:00
Jiri Drbalek
fa0b97fff7
add markers placement methods vertex-first and vertex-last
2014-08-08 06:34:33 +00:00
artemp
e7caf63de2
remove unused includes
2014-08-07 16:53:32 +01:00
Dane Springmeyer
38852f27bb
iwyu
2014-08-06 12:29:07 -07:00
Dane Springmeyer
aaaf82f28c
remove unused <<operator
2014-08-06 12:28:35 -07:00
Dane Springmeyer
6ae59b80af
iwyu
2014-08-06 12:27:10 -07:00
Dane Springmeyer
d4bb7ee279
remove unused <<operator
2014-08-06 12:26:01 -07:00
Dane Springmeyer
b8b76c1e1c
iwyu
2014-08-06 08:17:31 -07:00
artemp
0490b7887c
text_symbolizer - ``geometry-transform`` support
2014-08-06 14:54:38 +01:00
artemp
9835057b0f
Use vertex_converters in text placement
2014-08-06 13:10:24 +01:00
artemp
ec97b8b744
c++ style
2014-08-06 12:32:50 +01:00
Dane Springmeyer
ce8aee1994
be explicit about copy needed to safely pass glyph_info into text_line - closes #2337
2014-08-05 17:03:30 -07:00
Dane Springmeyer
d27b45553a
use emplace/emplace_back over insert/push_back - refs #2336
2014-08-05 15:19:37 -07:00
Dane Springmeyer
7a013e8151
switch glyph_info cache to an unordered_map (but no perf diff on osx)
2014-08-05 14:31:29 -07:00
Dane Springmeyer
2a7fc29e42
add support for opacity with svgs in pattern symbolizers - refs #1010
2014-08-05 13:48:40 -07:00
Dane Springmeyer
e111f77310
pedantic fixes to line_pattern_rasterizer
2014-08-05 12:33:39 -07:00
Dane Springmeyer
2c9e089317
move harfbuzz_shaper inc + other iwyu fixups
2014-08-05 11:10:49 -07:00
artemp
c3a83e6f74
re-arrange headers
2014-08-05 18:58:22 +01:00
Mike Morris
617524505b
fix header include comment
2014-08-05 13:15:55 -04:00
artemp
2b90b382e7
move render_pattern into sepratre compilation module
2014-08-05 17:40:15 +01:00
artemp
a8991cd600
refactor clipping_extent into separate header for sharing
2014-08-05 17:22:13 +01:00
artemp
d01a5407ae
remove unused symbolizer hash
2014-08-05 13:05:32 +01:00
artemp
59b666cb77
Cairo : use vertex_converter in line_pattern_symbolizer ( #1386 )
...
fix pattern alignment
2014-08-05 11:48:42 +01:00
Dane Springmeyer
8232180614
c++11 style in harfbuzz_shaper.hpp
2014-08-04 23:42:42 -07:00
Dane Springmeyer
ab1e5def47
text_line: remove unneeded acces to glyph storage
2014-08-04 20:29:25 -07:00
Dane Springmeyer
99a46f6910
re-enable glyph_info caching - refs #2326 , #2265 , #2334
2014-08-04 19:50:16 -07:00
Dane Springmeyer
db96f3c933
drop unnessary use of boost in transform_processor.hpp
2014-08-04 15:09:37 -07:00
Dane Springmeyer
aa63d6c9a0
include cleanups where we used to use boost
2014-08-04 14:42:51 -07:00
Dane Springmeyer
d7c3d8f774
fix std::sort and std::lower_bound usage
2014-08-04 14:42:24 -07:00
Dane Springmeyer
5134fdc0d3
use std::sort over boost::sort
2014-08-04 14:13:33 -07:00
Dane Springmeyer
a73440496a
iwyu
2014-08-04 13:59:13 -07:00
Dane Springmeyer
03429f9bcb
use std::unordered_map in non-perf critical code
2014-08-04 13:59:02 -07:00
Dane Springmeyer
75248e3376
remove obsolete wrap-character option for text symbolizer - closes #2333
2014-08-04 12:52:46 -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
9f05389754
fix handling of all sym enums as expressions - fixes tests from #2328
2014-08-03 21:28:36 -07:00
jhollinger2
0aad860a75
Add repeat-distance to text symbolizer properties.
...
Update collision detector to handle minimum-distance and repeat-distance seperately.
Update placement_finder to use repeat-distance.
Update group symbolizer to handle minimum-distance and repeat-distance.
2014-08-03 16:10:21 -04:00
artemp
f2db42d5e4
support image-transform for vector patterns
2014-08-01 13:39:29 +01:00
artemp
a9f0408e4f
polygon_pattern_symbolizer: use set_symbolizer_property + add image-transform
2014-08-01 10:05:30 +01:00
artemp
18a7731d42
AGG line/polygon_pattern_symbolizer add support for SVG patterns
2014-07-31 15:25:22 +01:00
Dane Springmeyer
c6a291271f
fix conditional pixel snapping for marker rasters
2014-07-31 00:49:00 -07:00
Dane Springmeyer
3412c071ab
initialize default black square in marker cache - refs #952
2014-07-31 00:41:27 -07:00
Dane Springmeyer
6078f4cef1
more marker bbox fixes
2014-07-30 23:43:48 -07:00
Dane Springmeyer
d685307250
fix regression in raster marker collision box placement - refs #2295
2014-07-30 22:50:01 -07:00
Dane Springmeyer
6070c9caf0
fix compile
2014-07-30 16:25:21 -07:00
Dane Springmeyer
2a18280dc5
Add support for dynamic expressions for dasharrays - closes #2168
2014-07-30 16:02:23 -07:00
Dane Springmeyer
b7ecd00c31
complete support for face-name/fontset-name in <Format> node - closes #1900
2014-07-30 14:16:32 -07:00
Dane Springmeyer
350c2c29bd
drop karma confix + solve conflicting spirit headers - closes #2323
2014-07-30 13:06:08 -07:00
Dane Springmeyer
da457eba81
Merge branch 'master' of github.com:mapnik/mapnik
2014-07-30 08:42:03 -07:00
artemp
3f5344ca82
geojson - make feature_collection_grammar not dependend on mapnik::context
2014-07-30 11:01:54 +01:00
Dane Springmeyer
8646ccc83f
start passing fontsets down to format and layout - refs #1900
2014-07-29 18:29:20 -07:00
Dane Springmeyer
e7c6d84028
Avoid -Wdelete-non-virtual-dtor warning
2014-07-29 17:17:45 -07:00
Dane Springmeyer
acbebcdd79
Merge branch 'master' of github.com:mapnik/mapnik
2014-07-29 17:07:09 -07:00
Dane Springmeyer
673bd4fd8f
use detail namespace in json/geometry_generator_parser.hpp
2014-07-29 17:06:54 -07:00
Dane Springmeyer
ba999ff4be
Merge pull request #2295 from mapycz/3.x-szn-markers-symbolizer
...
refactor markers placements
2014-07-29 17:04:27 -07:00
Dane Springmeyer
1fa31d5d20
remove force-odd-labels - refs #2120
2014-07-29 14:37:29 -07:00
artemp
08c3dd1f88
convert remaining text properties to expressions
2014-07-29 14:43:26 +01:00
artemp
c565aa8722
move symbolizer property handling to symbolizer_utils
2014-07-29 13:31:07 +01:00
