Dane Springmeyer
|
6433d9482e
|
Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
Conflicts:
include/mapnik/symbolizer.hpp
src/agg/agg_renderer.cpp
src/agg/process_line_pattern_symbolizer.cpp
src/agg/process_line_symbolizer.cpp
src/agg/process_polygon_pattern_symbolizer.cpp
src/agg/process_polygon_symbolizer.cpp
src/cairo_renderer.cpp
src/feature_type_style.cpp
src/grid/process_line_pattern_symbolizer.cpp
src/grid/process_line_symbolizer.cpp
src/grid/process_markers_symbolizer.cpp
src/grid/process_polygon_pattern_symbolizer.cpp
src/grid/process_polygon_symbolizer.cpp
|
2014-03-10 00:05:56 -07:00 |
|
Oliver Tonnhofer
|
5dedae4320
|
testcase for #2170
|
2014-03-08 19:54:05 -08:00 |
|
Dane Springmeyer
|
a98de6a348
|
Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
Conflicts:
include/mapnik/expression_grammar_impl.hpp
src/expression.cpp
|
2014-01-27 13:56:36 -08:00 |
|
Dane Springmeyer
|
84166882d9
|
minimum boost version is 1.47 - remove obsolete code handling older versions
|
2014-01-27 13:19:21 -08:00 |
|
Dane Springmeyer
|
8181aa9dec
|
addLayer -> add_layer (change also coming in expr-v2 branch)
|
2014-01-26 13:41:30 -08:00 |
|
Dane Springmeyer
|
e9ca9c8790
|
symbolizer-expressions replayed against latest master
|
2013-11-27 22:50:15 -08:00 |
|
artemp
|
7adee4ab36
|
c++11 : remove boost::make_shared includes
|
2013-10-17 15:09:56 +01:00 |
|
Dane Springmeyer
|
0365d3e081
|
start centralizing filesystem operations in mapnik::util::fs - refs #1177
|
2013-06-02 19:28:24 -07:00 |
|
Dane Springmeyer
|
a41c2205d5
|
more cpp test cleanup
|
2013-05-25 18:16:18 -07:00 |
|
Dane Springmeyer
|
37a1c07051
|
remove uneeded dependence of cpp tests on sqlite
|
2013-05-25 17:07:08 -07:00 |
|
Dane Springmeyer
|
4bd63ce7a0
|
iwyu and fix compile on linux
|
2013-05-25 16:04:40 -07:00 |
|
Dane Springmeyer
|
1211211f98
|
quiet mode for c++ tests
|
2013-05-24 17:21:55 -07:00 |
|
Dane Springmeyer
|
11e825a045
|
formatting
|
2013-03-14 18:33:59 -07:00 |
|
Dane Springmeyer
|
ec47745abf
|
fix failing exceptions test which needed a symbolizer added after #1670 and 0d8f415070
|
2013-01-03 16:25:14 -08:00 |
|
artemp
|
967d6110bf
|
+ singleton: return ref from instance() method
|
2012-09-07 16:23:03 +01:00 |
|
Dane Springmeyer
|
e225eaae4b
|
add c++ test for exceptions
|
2012-07-20 18:33:14 -07:00 |
|