Dane Springmeyer
1c56f0dc19
Merge branch '2.3.x' of github.com:mapnik/mapnik
2013-11-21 13:09:52 -08:00
Dane Springmeyer
9688562df3
python render_with_detector: respect scale_factor and offsets - refs #2075
2013-11-17 20:10:20 -08:00
Dane Springmeyer
03fdf7e596
Merge branch '2.3.x' of github.com:mapnik/mapnik
...
Conflicts:
src/deepcopy.cpp
src/expression.cpp
src/rule.cpp
2013-11-13 20:00:13 -08:00
Dane Springmeyer
5de5ffb764
remove unused and broken deepcopy support to be replaced in #2081 - refs #1390 and #946
2013-11-13 19:26:17 -08:00
Dane Springmeyer
53e95bb506
Merge pull request #2074 from mapnik/text-refactor
...
Organize text code in subdirectory
2013-11-08 17:31:52 -08:00
Dane Springmeyer
cb614af83e
iwyu
2013-11-07 20:24:10 -08:00
Dane Springmeyer
c7a6265869
organize text code in subdirectory
2013-11-07 20:09:22 -08:00
Dane Springmeyer
08fa9fd8ec
Merge branch '2.3.x' of github.com:mapnik/mapnik
...
Conflicts:
bindings/python/mapnik_building_symbolizer.cpp
bindings/python/mapnik_debug_symbolizer.cpp
bindings/python/mapnik_line_pattern_symbolizer.cpp
bindings/python/mapnik_line_symbolizer.cpp
bindings/python/mapnik_markers_symbolizer.cpp
bindings/python/mapnik_point_symbolizer.cpp
bindings/python/mapnik_polygon_symbolizer.cpp
bindings/python/mapnik_python.cpp
bindings/python/mapnik_raster_symbolizer.cpp
bindings/python/mapnik_shield_symbolizer.cpp
bindings/python/mapnik_symbolizer.cpp
2013-11-07 09:21:05 -08:00
Dane Springmeyer
fe5b3713ba
python bindings: reduce compile times by consolidating code in fewer cpp files
2013-11-05 15:11:23 -08:00
artemp
afd58da6e2
geojson - feature_collection_parser
...
(allow single feature and geometry input)
2013-11-04 12:39:10 +00:00
Dane Springmeyer
0d58a8aee4
merge with 2.3.x
2013-10-28 14:45:52 -07:00
Dane Springmeyer
86dfa0778a
fix cairo reference counting and add more cairo context tests - closes #2031
2013-10-28 12:46:44 -07:00
Dane Springmeyer
882ee3cb32
Merge branch '2.3.x' of github.com:mapnik/mapnik
2013-10-23 21:12:54 -07:00
Dane Springmeyer
5a2954dab7
attempt to fix boost python with c++11 and boost 1.49 - refs #2022
2013-10-23 15:42:01 -07:00
Dane Springmeyer
710d558218
scons: simplify linkflags/ldflags setting / attempt to fix #2025
2013-10-22 16:35:46 -04:00
artemp
7adee4ab36
c++11 : remove boost::make_shared includes
2013-10-17 15:09:56 +01:00
Dane Springmeyer
1aad73b2ad
iwyu
2013-10-14 17:47:51 -04:00
Hermann Kraus
765dda465c
Only call function if it is actually built.
2013-10-14 02:34:28 +02:00
Hermann Kraus
cf7aa83bd8
Only call function if it is actually built.
2013-10-14 02:24:36 +02:00
artemp
3edfc69c81
== c++11
...
use std::tuple with std::get<>
2013-10-11 12:36:04 +01:00
Dane Springmeyer
f9e630bbd3
Merge remote-tracking branch 'origin/2.3.x'
2013-10-02 18:23:09 -07:00
Dane Springmeyer
ac961feb64
expose mapnik.Color.packed to get unsigned rgba value
2013-10-01 21:30:49 -07:00
Dane Springmeyer
e9ad589e13
Add boost version header
2013-10-01 09:35:36 -07:00
artemp
c0461280be
+ add get_pointer impl for std::shared_ptr<T>
...
when building agaist boost version < 1.53
2013-10-01 15:08:46 +01:00
artemp
a3c329a6f8
== Boost.Python std::shared_ptr ==
...
+ ensure mapnik::memory_datasource is wrapped in std::shared_ptr in Python bindings
+ register implicit conversion from std::shared_ptr<memory_datasource> to std::shared_pre<datasource>
ref #2020
2013-10-01 14:48:54 +01:00
Dane Springmeyer
0f4ba4dfd5
sync with 2.3.x branch
2013-09-25 20:04:31 -07:00
Dane Springmeyer
feaddaeed0
fix raster colorizer via python
2013-09-25 15:22:57 -07:00
artemp
10196f35b4
Merge branch 'c++11' into c++11-revised
...
Conflicts:
bindings/python/python_grid_utils.cpp
include/mapnik/font_engine_freetype.hpp
include/mapnik/value.hpp
src/agg/process_building_symbolizer.cpp
src/cairo_renderer.cpp
src/grid/process_building_symbolizer.cpp
2013-09-23 08:53:36 +01:00
artemp
0eada70845
+ use const std::unique_ptr< []> instead of boost::scoped_array
2013-09-20 15:01:58 +01:00
artemp
62af2e6765
+ replace <boost/shared_ptr.hpp> with <memory>
2013-09-20 14:13:23 +01:00
artemp
b315eb2167
+ use std::shared_ptr and std::make_shared
2013-09-20 14:01:27 +01:00
Dane Springmeyer
5d12a345ae
start using c++11 features: auto/for/unique_ptr/variadic args - refs #1972
2013-09-19 20:19:01 -07:00
Dane Springmeyer
30c8ca5f66
minor formatting to sync cleaner with master
2013-09-18 19:04:44 -07:00
Dane Springmeyer
d79ecf882f
merge with master
2013-09-18 18:49:32 -07:00
Dane Springmeyer
7a6ab9b0ed
sync a few files with master
2013-09-18 18:47:44 -07:00
Dane Springmeyer
722aa4ae14
python: add support for __geo_interface__ - closes #2009
2013-09-18 16:08:34 -07:00
artemp
ec0bdb21ad
Merge branch 'geometry-types' into c++11
2013-09-16 14:18:22 +01:00
Dane Springmeyer
6bfbb53eac
optimized WKTReader for parsing WKT into geometry paths
2013-09-15 23:23:43 -07:00
artemp
b690015d63
Merge branch 'master' into c++11
2013-09-09 12:32:47 +01:00
Dane Springmeyer
c5dd5487a5
Merge pull request #1966 from mapnik/background-image-comp-op
...
Map background-image-comp-op and background-image-opacity
2013-09-05 12:25:47 -07:00
artemp
d4b9a48cb1
+ geometry::types Exterior/Interior polygon loops
2013-09-03 12:15:31 +01: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
5e322dbff2
Merge pull request #1991 from PetrDlouhy/master
...
Offset enabled for LinePatternSymbolizer + tests
2013-08-27 15:13:15 -07:00
Dane Springmeyer
6af6d66739
python: fix reporting of tiff and webp image support
2013-08-23 15:18:00 -07:00
Petr Dlouhý
1e9ee87fce
add LinePatternSymbolizer offset python binding
2013-08-22 12:56:04 +02:00
Dane Springmeyer
e0026f3df2
use icu:: namespace and start isolating icu impl by consistenly using mapnik::value_unicode_string
2013-08-13 18:52:04 -04:00
Dane Springmeyer
78b4980352
finish exposing mapnik.Feature.from_geojson
2013-07-30 15:45:46 -04:00
Dane Springmeyer
13343eb5be
workaround c++11 compile error due to ambiguous std::vector::insert usage - closes #1973
2013-07-30 15:14:47 -04:00
Dane Springmeyer
fad9af5263
add support for applying custom comp_op and opacity when blending map background image into background color at render time - refs mapnik/mapnik-support#8
2013-07-25 01:00:38 -04:00
Dane Springmeyer
88b24144b6
ensure libmapnik DEFINES are propagated to the python bindings
2013-07-23 19:58:13 -04:00
