artemp
|
4f4e2b001e
|
Merge branch 'master' into c++11
Conflicts:
SConstruct
benchmark/run.cpp
bindings/python/mapnik_datasource.cpp
bindings/python/mapnik_feature.cpp
bindings/python/python_optional.hpp
include/mapnik/css_color_grammar.hpp
include/mapnik/expression_grammar.hpp
include/mapnik/feature.hpp
include/mapnik/feature_style_processor_impl.hpp
include/mapnik/image_filter_types.hpp
include/mapnik/image_util.hpp
include/mapnik/json/geometry_generator_grammar.hpp
include/mapnik/json/geometry_grammar.hpp
include/mapnik/processed_text.hpp
include/mapnik/tiff_io.hpp
include/mapnik/util/geometry_svg_generator.hpp
include/mapnik/util/geometry_wkt_generator.hpp
include/mapnik/utils.hpp
include/mapnik/webp_io.hpp
include/mapnik/wkt/wkt_grammar.hpp
plugins/input/shape/shape_datasource.cpp
plugins/input/shape/shapefile.hpp
src/expression_grammar.cpp
src/expression_string.cpp
src/image_util.cpp
src/json/feature_collection_parser.cpp
src/json/feature_parser.cpp
src/miniz.c
src/symbolizer_helpers.cpp
src/tiff_reader.cpp
src/webp_reader.cpp
tests/cpp_tests/geometry_converters_test.cpp
tests/cpp_tests/image_io_test.cpp
tests/cpp_tests/map_request_test.cpp
tests/python_tests/image_test.py
tests/visual_tests/test.py
|
2013-08-30 09:46:09 +01:00 |
|
Dane Springmeyer
|
3b2bdba7b0
|
iwyu
|
2013-06-02 20:19:33 -07:00 |
|
Dane Springmeyer
|
a41c2205d5
|
more cpp test cleanup
|
2013-05-25 18:16:18 -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 |
|
artemp
|
58927b404c
|
c++11
+ replace BOOST_FOREACH with for( : )
+ remove boost/foreach.hpp
+ fix benchmarks (17,18)
|
2013-04-24 16:40:35 +01:00 |
|
Dane Springmeyer
|
11e825a045
|
formatting
|
2013-03-14 18:33:59 -07:00 |
|
Dane Springmeyer
|
96c65979a1
|
first pass at a lower level set of clipping tests that avoid complexity of wkt and vertex converters - refs #1699
|
2013-03-07 13:31:32 -08:00 |
|