Dane Springmeyer
|
30c8ca5f66
|
minor formatting to sync cleaner with master
|
2013-09-18 19:04:44 -07:00 |
|
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
|
93d36ff1e3
|
avoid -Wunused-parameter warning
|
2013-07-23 16:10:16 -04:00 |
|
artemp
|
e57f5f9547
|
cherry picking..
|
2013-05-20 14:00:02 +01:00 |
|
artemp
|
392561c5d9
|
add to/from specialisation for boost::optional<bool>
|
2013-05-17 11:16:11 +01:00 |
|
Dane Springmeyer
|
b6a937e93d
|
iwyu
|
2013-05-16 12:47:36 -07:00 |
|
artemp
|
37cc3de4aa
|
+ use mapnik::noncopyable
|
2013-05-16 19:41:59 +01:00 |
|
artemp
|
a3900131fd
|
+ add python_optional<float> specialization
|
2013-05-16 19:41:59 +01:00 |
|
artemp
|
8ed9606046
|
* c++ style comments, pls!
* formatting
|
2013-05-16 19:41:59 +01:00 |
|
Dane Springmeyer
|
16aae90bfc
|
iwyu
|
2012-12-16 12:50:36 -08:00 |
|
kunitoki
|
1f351e0e09
|
implement new debug system
|
2012-04-08 02:20:56 +02:00 |
|
Dane Springmeyer
|
b36739fd88
|
apply mapnik_format.el formatting
|
2012-03-13 07:59:22 -07:00 |
|
Hermann Kraus
|
d203d56d34
|
Update tests.
|
2012-02-21 10:21:40 +01:00 |
|
Hermann Kraus
|
383ad9dad8
|
Add explicit namespaces. Old code compiled with clang but not with gcc.
|
2012-02-09 00:07:55 +01:00 |
|
Hermann Kraus
|
7088f972e5
|
Work around ugly boost python bug.
|
2012-02-08 23:00:07 +01:00 |
|
Dane Springmeyer
|
39d199aa49
|
code formatting
|
2011-11-13 19:54:32 -08:00 |
|
Artem Pavlenko
|
246731874b
|
+ apply 'mapnik-format' to *.cpp *.hpp
|
2010-06-02 11:03:30 +00:00 |
|
Artem Pavlenko
|
d959701d5a
|
1. added boost::optional<T> to/form Python converter
2. make background color optional (Map object)
3. exposed 'blend' method for Image object
|
2007-08-01 09:59:23 +00:00 |
|