Stephan Bösch-Plepelits
|
a48ed22a06
|
Use points.csv instead of points.osm
- for mapnik/mapnik#1900
|
2014-07-29 14:46:14 +02:00 |
|
Stephan Bösch-Plepelits
|
8a5f03b923
|
Visual Tests for issue mapnik/mapnik#1900
Conflicts:
tests/visual_tests/test.py
|
2014-07-29 12:47:20 +02:00 |
|
Dane Springmeyer
|
e525ca28b5
|
Re-instate skipping of proj_transform failures - closes #2147
|
2014-07-28 20:46:30 -07:00 |
|
Dane Springmeyer
|
cdb075f75f
|
make clipping off by default - closes #2146
|
2014-07-28 20:31:10 -07:00 |
|
Dane Springmeyer
|
8feedd94cd
|
rename mapnik::boolean to mapnik::boolean_type - closes #1899
|
2014-07-28 19:46:49 -07:00 |
|
Dane Springmeyer
|
51be686f6c
|
remove paths-from-xml option in load_map parsing - closes #1893
|
2014-07-28 19:33:48 -07:00 |
|
Dane Springmeyer
|
914b4c2e8b
|
support for inline topojson (in memory string) - closes #2058
|
2014-07-28 19:26:35 -07:00 |
|
Dane Springmeyer
|
3cb26311fb
|
fix topojson tests
|
2014-07-28 19:14:12 -07:00 |
|
Dane Springmeyer
|
7521243a7a
|
visual test for text-halo-transform - refs #2125
|
2014-07-28 18:56:57 -07:00 |
|
Dane Springmeyer
|
8ae5d322db
|
fix geojson plugin by avoiding static const grammar for now
|
2014-07-28 18:44:55 -07:00 |
|
Dane Springmeyer
|
c8ecff7ba1
|
reduce tolerance of cairo test on linux - closes #2302
|
2014-07-28 17:05:15 -07:00 |
|
Dane Springmeyer
|
7f0029eb0b
|
implement inline (in-memory string) support for GeoJSON plugin - refs #2058
|
2014-07-28 16:16:10 -07:00 |
|
Dane Springmeyer
|
ba1127ea57
|
add (currently failing) test for #2319
|
2014-07-28 16:15:34 -07:00 |
|
Dane Springmeyer
|
ddda3dc56d
|
fix geojson plugin test
|
2014-07-28 13:07:27 -07:00 |
|
Dane Springmeyer
|
34bbf36e3a
|
Revert "return code 0 to gracefully exit if python bindings are not available"
This reverts commit 2f08dc29ef.
Conflicts:
tests/run_tests.py
tests/visual_tests/test.py
|
2014-07-25 11:49:05 -07:00 |
|
artemp
|
e6a21253e1
|
tests fix : rename ExpressionFormat to Format
|
2014-07-25 14:29:46 +01:00 |
|
Dane Springmeyer
|
ae1c88fb13
|
fix import
|
2014-07-24 19:00:15 -07:00 |
|
Dane Springmeyer
|
2f08dc29ef
|
return code 0 to gracefully exit if python bindings are not available
|
2014-07-24 18:58:03 -07:00 |
|
Dane Springmeyer
|
c5be70ff65
|
refactor spirit grammars
|
2014-07-24 14:31:59 -07:00 |
|
Dane Springmeyer
|
8dcd85a708
|
iwyu
|
2014-07-23 14:02:36 -07:00 |
|
Dane Springmeyer
|
cccb610976
|
fix xml round-tripping test
|
2014-07-23 13:00:34 -07:00 |
|
Dane Springmeyer
|
97b27c54c0
|
fix compile of svg renderer tests
|
2014-07-23 12:36:36 -07:00 |
|
artemp
|
8502019310
|
more format_properties expessions
|
2014-07-23 18:09:18 +01:00 |
|
artemp
|
e67f046a0e
|
start re-factoring char_property (TODO: change name!)
|
2014-07-23 16:19:14 +01:00 |
|
Dane Springmeyer
|
3de2457799
|
fwd declare layer
|
2014-07-22 23:11:12 -07:00 |
|
Dane Springmeyer
|
64e70fb374
|
iwyu
|
2014-07-22 22:40:39 -07:00 |
|
Dane Springmeyer
|
62324714c1
|
dodge unimportant failing test (should throw) with old proj4 - closes #2309
|
2014-07-22 14:58:12 -07:00 |
|
Dane Springmeyer
|
d770afdb0d
|
lower visual test threshold for agg on linux - refs #2309
|
2014-07-22 14:55:06 -07:00 |
|
Dane Springmeyer
|
ed6e16b92c
|
again even smaller text size for lohit bengali test - refs #2309
|
2014-07-22 14:53:30 -07:00 |
|
Dane Springmeyer
|
f86ef33307
|
smaller text size for lohit bengali test - refs #2309
|
2014-07-22 14:52:34 -07:00 |
|
Dane Springmeyer
|
8301e28b13
|
more marker tests on polygons - able to detect change from ecc5acbdb9
|
2014-07-22 12:17:40 -07:00 |
|
Dane Springmeyer
|
006c460c9c
|
fix use of comp-op as data-driven expression
|
2014-07-22 10:52:30 -07:00 |
|
artemp
|
8cc9b06e12
|
visual tests: update to reflect #2308 change
|
2014-07-22 11:02:08 +01:00 |
|
Dane Springmeyer
|
0b1ad62cf5
|
Merge pull request #2300 from strk/master-false-negatives
Fix false negative responses from python tests
|
2014-07-14 19:43:11 -07:00 |
|
Dane Springmeyer
|
998b10be12
|
fix compile of svg test
|
2014-07-14 11:42:23 -07:00 |
|
Sandro Santilli
|
cd21789111
|
Fix false negative responses from python tests
Closes #2298
|
2014-07-14 18:34:20 +02:00 |
|
artemp
|
4afd98a34a
|
text_properties : store 'orientation' parameter in symbolizer_base::value_type
|
2014-07-11 14:43:56 +01:00 |
|
artemp
|
fe215a684e
|
c++11 style : replace (almost) all typedef with type alias's
|
2014-07-07 18:23:15 +01:00 |
|
Dane Springmeyer
|
5688a93858
|
update expected text images - refs #2277 #2276
|
2014-06-20 20:29:01 -07:00 |
|
Dane Springmeyer
|
8c3683f41f
|
updated expected test images after #2272
|
2014-06-19 16:41:45 -07:00 |
|
Dane Springmeyer
|
f523acdee4
|
add testcase for halo-comp-op - refs #2267
|
2014-06-19 16:28:28 -07:00 |
|
Dane Springmeyer
|
e974279f1a
|
update expected images again (not sure what went wrong before) refs #1313 - amends 66905ca69f
|
2014-06-19 10:23:23 -07:00 |
|
Dane Springmeyer
|
66905ca69f
|
update expected images after 68a5cc55a6 - refs #1313
|
2014-06-19 09:53:07 -07:00 |
|
Dane Springmeyer
|
118cce8d58
|
add test for #2240
|
2014-06-17 22:19:17 -07:00 |
|
Dane Springmeyer
|
6571508576
|
Merge branch 'master' of github.com:mapnik/mapnik
|
2014-06-17 21:42:42 -07:00 |
|
artemp
|
6669765ce1
|
visual tests : add text-halo-opacity
|
2014-06-17 17:22:05 +01:00 |
|
Dane Springmeyer
|
6e6c9f21ac
|
improve png comparison tests
Conflicts:
tests/python_tests/png_encoding_test.py
|
2014-06-16 09:52:26 -07:00 |
|
Dane Springmeyer
|
cc874364b2
|
allow external image data - refs #2002
Conflicts:
include/mapnik/image_data.hpp
tests/cpp_tests/image_io_test.cpp
|
2014-06-16 09:52:25 -07:00 |
|
artemp
|
3ded23fbab
|
move make_unique out of std namespace and allow building with c++14 compilers
( -std=c++1y )
|
2014-06-12 15:14:05 +01:00 |
|
Dane Springmeyer
|
d0b357cab7
|
scons: support MAPNIK_NAME option to customize libmapnik name for custom packaging
|
2014-06-09 13:55:56 -07:00 |
|
artemp
|
b6bab7d0bb
|
move cairo renderer into its own subdir
|
2014-06-06 13:38:00 +01:00 |
|
Dane Springmeyer
|
961e160ff9
|
update test image after #2264
|
2014-06-05 11:26:30 -07:00 |
|
artemp
|
6297c72f02
|
preserve old MemoryDatasource interface in Python
|
2014-05-30 11:03:57 +01:00 |
|
artemp
|
f9cf23b59f
|
memory_datasource: support datasource interface
|
2014-05-30 10:16:49 +01:00 |
|
Dane Springmeyer
|
f88e602dcc
|
more tests for handling of empty Parameters
|
2014-05-28 14:32:52 -07:00 |
|
artemp
|
aa5bff2a3f
|
fix test name
|
2014-05-28 15:23:36 +01:00 |
|
artemp
|
01ac0fb7d9
|
more copy/move tests
|
2014-05-28 15:19:14 +01:00 |
|
artemp
|
d311fa11cd
|
initial copy/move test
|
2014-05-28 11:24:50 +01:00 |
|
Dane Springmeyer
|
6610fcc297
|
fix skipping of empty text nodes in rapidxml parser (matches libxml2) - closes #2253
|
2014-05-23 10:42:55 -07:00 |
|
Dane Springmeyer
|
c0559a80bd
|
tests for #2245
|
2014-05-16 12:22:48 -07:00 |
|
Dane Springmeyer
|
e300a41dca
|
variables now available as postgis datasource tokens
|
2014-05-13 20:47:22 -07:00 |
|
Dane Springmeyer
|
2f8451b99a
|
variables support for cairo/grid/svg
|
2014-05-13 18:24:17 -07:00 |
|
Dane Springmeyer
|
2c661ed3d5
|
support for render time variables
|
2014-05-11 13:08:24 -07:00 |
|
Dane Springmeyer
|
33acec6dcb
|
make css_value_broken truly broken with latest mapnik - refs #2237
|
2014-05-05 17:12:45 -07:00 |
|
Dane Springmeyer
|
5ddde3c885
|
stop testing bogus wkb since it will crash wkb reader - refs #2236
|
2014-05-05 17:05:00 -07:00 |
|
Dane Springmeyer
|
ef837eb92f
|
c++11 optimizations for faster map loading
|
2014-04-28 17:10:00 -07:00 |
|
Dane Springmeyer
|
5beac8fa2b
|
update expecte test images accidentally overwritten from 2.3.x merge
|
2014-04-27 08:50:50 -07:00 |
|
Dane Springmeyer
|
10ce32696a
|
add support for halo-rasterizer for shields - closes #2226
Conflicts:
src/load_map.cpp
tests/visual_tests/images/shield-on-line-spacing-eq-width-600-400-1.0-agg-reference.png
tests/visual_tests/images/shield-on-line-spacing-eq-width-600-400-2.0-agg-reference.png
|
2014-04-25 16:07:03 -07:00 |
|
Dane Springmeyer
|
72fd84f872
|
write test output to tmp
|
2014-04-24 23:54:33 -07:00 |
|
Dane Springmeyer
|
4724eaaf9e
|
update a few visual tests
|
2014-04-24 23:51:29 -07:00 |
|
Dane Springmeyer
|
9adbfa59e7
|
disable python symbolizer attribute access tests for now
|
2014-04-24 22:44:33 -07:00 |
|
Dane Springmeyer
|
297442b7c6
|
fix postgis tests
|
2014-04-24 22:24:22 -07:00 |
|
Dane Springmeyer
|
f7cd4ded03
|
disable python plugin tests since they are so brittle and I'm too impatient to fix
|
2014-04-24 22:22:37 -07:00 |
|
Dane Springmeyer
|
f3a824c2cc
|
grid renderer: remove old method and fix tests
|
2014-04-24 22:18:36 -07:00 |
|
Dane Springmeyer
|
4502ef2c83
|
fix symbolizer introspection test
|
2014-04-24 22:09:07 -07:00 |
|
Dane Springmeyer
|
06bbedaffb
|
fix raster colorizer access from python
|
2014-04-24 22:01:58 -07:00 |
|
Dane Springmeyer
|
874cd00a2d
|
update a few visual tests
|
2014-04-24 21:53:17 -07:00 |
|
Dane Springmeyer
|
9e9747ffad
|
Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
Conflicts:
src/agg/process_building_symbolizer.cpp
src/cairo_context.cpp
src/cairo_renderer.cpp
src/grid/process_building_symbolizer.cpp
src/grid/process_line_pattern_symbolizer.cpp
src/grid/process_text_symbolizer.cpp
tests/python_tests/images/support/marker-text-line-scale-factor-0.899.png
tests/python_tests/images/support/marker-text-line-scale-factor-1.5.png
tests/python_tests/images/support/marker-text-line-scale-factor-1.png
tests/python_tests/images/support/marker-text-line-scale-factor-10.png
tests/python_tests/images/support/marker-text-line-scale-factor-100.png
tests/python_tests/images/support/marker-text-line-scale-factor-2.png
tests/python_tests/images/support/marker-text-line-scale-factor-5.png
tests/visual_tests/images/lines-5-200-200-1.0-agg-reference.png
tests/visual_tests/images/lines-5-200-200-2.0-agg-reference.png
tests/visual_tests/images/lines-5-400-400-1.0-agg-reference.png
tests/visual_tests/images/lines-5-400-400-2.0-agg-reference.png
tests/visual_tests/images/lines-5-600-600-1.0-agg-reference.png
tests/visual_tests/images/lines-5-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-5-800-800-1.0-agg-reference.png
tests/visual_tests/images/lines-5-800-800-2.0-agg-reference.png
tests/visual_tests/images/lines-6-200-200-2.0-agg-reference.png
tests/visual_tests/images/lines-6-400-400-2.0-agg-reference.png
tests/visual_tests/images/lines-6-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-6-800-800-2.0-agg-reference.png
tests/visual_tests/test.py
|
2014-04-24 21:44:28 -07:00 |
|
Dane Springmeyer
|
67357568a5
|
move line rendering tests to visual tests
|
2014-04-24 21:00:00 -07:00 |
|
Dane Springmeyer
|
cc855ac7e2
|
update expected visual tests - 39737c5f1d accidentaly overwrote some using 2.3.x code
|
2014-04-24 19:16:00 -07:00 |
|
Dane Springmeyer
|
39737c5f1d
|
Merge branch '2.3.x' of github.com:mapnik/mapnik
Conflicts:
.travis.yml
CHANGELOG.md
bindings/python/build.py
include/mapnik/feature_style_processor_context.hpp
include/mapnik/feature_style_processor_impl.hpp
include/mapnik/json/feature_collection_grammar.hpp
include/mapnik/json/feature_collection_parser.hpp
include/mapnik/json/feature_generator_grammar.hpp
include/mapnik/json/feature_parser.hpp
include/mapnik/json/geojson_generator.hpp
include/mapnik/json/geometry_generator_grammar.hpp
include/mapnik/json/geometry_parser.hpp
plugins/input/gdal/gdal_featureset.cpp
plugins/input/geojson/geojson_datasource.cpp
plugins/input/occi/occi_featureset.cpp
plugins/input/osm/osm_featureset.cpp
plugins/input/postgis/build.py
plugins/input/postgis/connection.hpp
src/agg/agg_renderer.cpp
src/build.py
src/cairo_context.cpp
src/datasource_cache.cpp
src/grid/process_line_symbolizer.cpp
src/grid/process_polygon_pattern_symbolizer.cpp
src/grid/process_polygon_symbolizer.cpp
src/grid/process_text_symbolizer.cpp
src/json/feature_grammar.cpp
tests/cpp_tests/fontset_runtime_test.cpp
tests/visual_tests/images/collision-600-400-1.0-agg-reference.png
tests/visual_tests/images/image-filters-multi-blur-512-512-1.0-agg-reference.png
tests/visual_tests/images/image-filters-multi-blur-512-512-2.0-agg-reference.png
tests/visual_tests/images/image-filters-multi-blur-inflate-512-512-1.0-agg-reference.png
tests/visual_tests/images/image-filters-multi-blur-inflate-512-512-2.0-agg-reference.png
tests/visual_tests/images/lines-1-400-400-2.0-agg-reference.png
tests/visual_tests/images/lines-1-600-600-1.0-agg-reference.png
tests/visual_tests/images/lines-1-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-2-200-200-1.0-agg-reference.png
tests/visual_tests/images/lines-2-400-400-1.0-cairo-reference.png
tests/visual_tests/images/lines-2-400-400-2.0-agg-reference.png
tests/visual_tests/images/lines-2-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-2-800-800-2.0-agg-reference.png
tests/visual_tests/images/lines-3-400-400-2.0-agg-reference.png
tests/visual_tests/images/lines-3-600-600-1.0-agg-reference.png
tests/visual_tests/images/lines-3-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-5-200-200-1.0-agg-reference.png
tests/visual_tests/images/lines-5-200-200-2.0-agg-reference.png
tests/visual_tests/images/lines-5-400-400-1.0-agg-reference.png
tests/visual_tests/images/lines-5-400-400-2.0-agg-reference.png
tests/visual_tests/images/lines-5-600-600-1.0-agg-reference.png
tests/visual_tests/images/lines-5-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-5-800-800-1.0-agg-reference.png
tests/visual_tests/images/lines-5-800-800-2.0-agg-reference.png
tests/visual_tests/images/lines-6-200-200-1.0-agg-reference.png
tests/visual_tests/images/lines-6-200-200-2.0-agg-reference.png
tests/visual_tests/images/lines-6-400-400-1.0-agg-reference.png
tests/visual_tests/images/lines-6-600-600-1.0-agg-reference.png
tests/visual_tests/images/lines-6-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-6-800-800-1.0-agg-reference.png
tests/visual_tests/images/lines-6-800-800-2.0-agg-reference.png
tests/visual_tests/images/lines-shield-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-shield-600-600-2.0-cairo-reference.png
tests/visual_tests/images/shield-on-polygon-600-400-1.0-agg-reference.png
tests/visual_tests/images/shield-on-polygon-600-400-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-490-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-495-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-495-100-2.0-cairo-reference.png
tests/visual_tests/images/shieldsymbolizer-1-497-100-1.0-cairo-reference.png
tests/visual_tests/images/shieldsymbolizer-1-497-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-497-100-2.0-cairo-reference.png
tests/visual_tests/images/shieldsymbolizer-1-498-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-499-100-1.0-cairo-reference.png
tests/visual_tests/images/shieldsymbolizer-1-499-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-499-100-2.0-cairo-reference.png
tests/visual_tests/images/shieldsymbolizer-1-500-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-501-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-502-100-1.0-cairo-reference.png
tests/visual_tests/images/shieldsymbolizer-1-502-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-505-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-505-100-2.0-cairo-reference.png
tests/visual_tests/images/shieldsymbolizer-1-510-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-490-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-495-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-497-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-498-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-499-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-500-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-501-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-502-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-505-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-510-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-490-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-495-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-497-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-498-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-499-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-500-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-501-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-502-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-505-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-510-100-2.0-agg-reference.png
tests/visual_tests/test.py
|
2014-04-24 14:50:55 -07:00 |
|
Dane Springmeyer
|
83c0db36cb
|
add support for rendering (vs skipping) 3D and 4D postgis geometries like POINTZM, LINESTRINGZM, and POLYGONZM - closes #44
|
2014-04-09 19:40:14 -04:00 |
|
Dane Springmeyer
|
0e8fa50215
|
update a few expected tests due to differences I presume are related to freetype version
|
2014-04-09 00:42:06 -04:00 |
|
Dane Springmeyer
|
fa745d9e76
|
update more expected tests - refs #2207
|
2014-04-09 00:32:45 -04:00 |
|
Dane Springmeyer
|
ca0f3da780
|
update expected test image - refs #2207
|
2014-04-08 23:15:49 -04:00 |
|
Dane Springmeyer
|
103e874f25
|
fix #2202
|
2014-04-03 17:15:57 -07:00 |
|
Dane Springmeyer
|
659772168b
|
add (currently buggy) visual test images for #2202
|
2014-04-03 17:12:18 -07:00 |
|
Dane Springmeyer
|
a5ee9cbcb9
|
add testcase for #2202
|
2014-04-03 16:57:11 -07:00 |
|
Dane Springmeyer
|
e94876ebe4
|
Merge pull request #2160 from MapQuest/expr-v2-group-symbolizer
Group Symbolizer
|
2014-04-03 11:52:21 -07:00 |
|
Dane Springmeyer
|
2c8cf76808
|
update a few expected tests
|
2014-04-01 19:41:57 -07:00 |
|
Dane Springmeyer
|
af64692dcc
|
visual test threshold of 2 on OS X
|
2014-04-01 18:15:31 -07:00 |
|
Dane Springmeyer
|
818e87dce4
|
update tests
|
2014-04-01 17:34:24 -07:00 |
|
Dane Springmeyer
|
e15e64a5a9
|
update test images after bc1c723 - refs #2196
|
2014-03-31 21:26:42 -07:00 |
|
Dane Springmeyer
|
947f7a4b33
|
use COMPUTE_THRESHOLD=0 on os x, update expected test images
|
2014-03-31 21:15:35 -07:00 |
|
Dane Springmeyer
|
1baeac34c7
|
use make_unique
|
2014-03-18 14:10:02 -07:00 |
|
Dane Springmeyer
|
c9e3248cec
|
more auto_ptr usage to avoid bare geometry pointers
|
2014-03-12 13:11:51 -07:00 |
|
Dane Springmeyer
|
66654683a2
|
work in progress: fix some expressions tests disable others
|
2014-03-10 13:30:49 -07:00 |
|
Dane Springmeyer
|
811e93cdc4
|
update visual tests against freetype 2.5.3
|
2014-03-10 11:38:42 -07:00 |
|
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 |
|