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
|
ef4dfeb747
|
make it possible to disable compilation of grid_renderer - closes #1962
|
2013-07-23 19:37:25 -04:00 |
|
Dane Springmeyer
|
3b2bdba7b0
|
iwyu
|
2013-06-02 20:19:33 -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 |
|
XinGang Li
|
7bb5676f11
|
Let template parameter type same as declaration in hpp file.
|
2013-02-22 23:59:01 +08:00 |
|
Dane Springmeyer
|
4efb6ea234
|
round up array length to fix edge case memory corruption in utf grid encoding - closes #1584 and 1585
|
2012-11-21 19:24:45 -08:00 |
|
Dane Springmeyer
|
ad2250a4b5
|
back compatibility for raster-mode values using _ and shield-no-text
|
2012-08-16 19:20:29 -07:00 |
|
Dane Springmeyer
|
62e039d2c9
|
double grid encoding performance in python - closes #1315
|
2012-08-16 18:39:11 -07:00 |
|
Dane Springmeyer
|
58d848ae8e
|
c++ style
|
2012-08-16 18:25:06 -07:00 |
|
Dane Springmeyer
|
25a1643d54
|
partial revert of e6e32fc and general cleanup to match node-mapnik grid api - refs #1325 and 1315
|
2012-08-16 17:51:36 -07:00 |
|
artemp
|
8bba93d299
|
+ don't pass std::string arg by value - use const&
|
2012-08-16 12:05:31 +01:00 |
|
artemp
|
e6e32fcb39
|
+ applied patch from @lightmare - #1325
|
2012-08-16 11:00:07 +01:00 |
|
Dane Springmeyer
|
6c7ab1767b
|
include what you use
|
2012-07-24 18:35:18 -07:00 |
|
Dane Springmeyer
|
e13e81c4d5
|
move grid utility functions to cpp file - avoids function 'defined but not used' compiler warnings - refs #1330
|
2012-07-23 11:43:24 -07:00 |
|