Commit graph

12798 commits

Author SHA1 Message Date
Jiri Drbalek
4e160acc88 Avoid copying 2018-01-17 13:39:21 +00:00
Jiri Drbalek
99038229f7 Polylabel: cover the case of empty polygon or exterior ring 2018-01-17 13:39:15 +00:00
Jiri Drbalek
a97eace434 Interior: cover the case of empty polygon or exterior ring 2018-01-17 12:58:42 +00:00
Artem Pavlenko
da8b5c46d7
Merge pull request #3833 from mapycz/fix-crash-polygon_vertex_processor
Fix crash in case of empty ring
2018-01-17 10:06:32 +00:00
Jiri Drbalek
ec53f3d879 Fix crash in case of empty ring 2018-01-17 09:53:45 +00:00
Artem Pavlenko
ab4e1b77d0
Merge pull request #3828 from mikejcorey/except_syntax
Replaced old-style exception for Python 3 compatibility.
2018-01-11 09:53:57 +00:00
Michael Corey
e5e0b7674a Replaced old-style exception for Python 3 compatibility. 2018-01-10 21:50:49 -08:00
Artem Pavlenko
5ab6db2607 benchmark - slightly better stderr 2018-01-10 10:04:10 +00:00
Artem Pavlenko
b193d03151 Merge remote-tracking branch 'origin/master' 2018-01-09 17:03:08 +00:00
Artem Pavlenko
2aab39b8e7
Merge pull request #3826 from mapycz/svg-clippath-test
SVG: Add a test of clipPath
2018-01-09 17:02:24 +00:00
Jiri Drbalek
3af3286436 SVG: Add a test of clipPath 2018-01-09 16:11:19 +00:00
Artem Pavlenko
f6b11b86a8 update test/data 2018-01-09 15:40:41 +00:00
Artem Pavlenko
ff31c6d6eb SVG parser - add ignore_ member variable to allow skipping of unsupported elements, currently clipPath (#3818) 2018-01-09 15:19:52 +00:00
Artem Pavlenko
a04ca98c6b Merge branch 'mapycz-polylabel-as-interior' 2018-01-08 10:21:49 +00:00
Artem Pavlenko
c24568f033 Merge branch 'polylabel-as-interior' of https://github.com/mapycz/mapnik into mapycz-polylabel-as-interior 2018-01-08 10:21:09 +00:00
Artem Pavlenko
e2d741bdb7
Merge pull request #3809 from IMQS/pr-text-placements-export
Export all text_placements_ classes from mapnik.dll
2018-01-05 13:02:58 +00:00
Artem Pavlenko
45d4d5afb3 Merge branch 'lightmare-fix-group-symbolizer-crash' 2018-01-05 12:17:11 +00:00
Artem Pavlenko
c29f944726 Merge branch 'fix-group-symbolizer-crash' of https://github.com/lightmare/mapnik into lightmare-fix-group-symbolizer-crash 2018-01-05 12:16:41 +00:00
Artem Pavlenko
92afd0bebf Use macro to apply __attribute__((init_priority(val))) where it's supported (gcc+clang) (#3821) 2018-01-04 14:29:00 +00:00
Artem Pavlenko
50169e95b2 Enforce global variables initialisation order via __attribute__((init_priority(<priority>))) (#3821) 2018-01-04 12:22:04 +00:00
Artem Pavlenko
a67f5abb67 consistent syntax 2018-01-03 17:38:16 +00:00
Jiri Drbalek
7febf6c24a update visual tests 2017-12-17 08:11:58 +00:00
Jiri Drbalek
f52a0fa4f6 new interior algorithm 2017-12-13 21:48:13 +00:00
Jiri Drbalek
ea7ba2c099 add polylabel placement method 2017-12-13 21:48:13 +00:00
Jiri Drbalek
e243e16fd9 find text interior placement after reprojection 2017-12-13 21:48:13 +00:00
Artem Pavlenko
43d7278352 Don't apply preserveAscpectRatio logic logic if width and height expressed as % values (#3812) 2017-12-06 11:23:54 +01:00
Dane Springmeyer
54532cecb5 use lowercase boolean to match check in scripts/check_glibcxx.sh 2017-11-28 15:24:10 +01:00
Ben Harper
5507ab817a Export all text_placements_ classes from mapnik.dll
Previously, only text_placements_dummy had a MAPNIK_DECL annotation.
This commit adds that annotation to text_placements_simple and
text_placements_list, so that they are also exposed from the Windows DLL
build.
2017-11-28 11:30:35 +02:00
Artem Pavlenko
5d9a5b99a5 Fix licence link (#3804) 2017-11-27 09:51:51 +01:00
Artem Pavlenko
bfb071233e fix 'prioritize_linking' option + remove depricated has_key usage 2017-11-23 11:30:35 +01:00
Artem Pavlenko
92150e9ca9 update deps 2017-11-23 11:11:21 +01:00
Artem Pavlenko
851708c26e Merge branch 'scons3' 2017-11-22 15:47:47 +01:00
Artem Pavlenko
a04caf339e Merge branch 'master' into scons3 2017-11-22 15:47:03 +01:00
Artem Pavlenko
8cd2ae322e support both python 2 and 3. 2017-11-22 14:56:20 +01:00
Artem Pavlenko
cf6b88f8da Revert "make python3 default"
This reverts commit a790d8cdb9.
2017-11-22 14:55:52 +01:00
Artem Pavlenko
ce12610adc Add copyleft notice 2017-11-21 15:53:08 +01:00
Artem Pavlenko
a790d8cdb9 make python3 default 2017-11-21 15:09:12 +01:00
Artem Pavlenko
047c3f4bba Scons/python3 - fix bytes to str conversions (#3798) 2017-11-21 13:12:52 +01:00
Artem Pavlenko
c18730a182 use exit ${CODE} 2017-11-20 09:44:33 +01:00
Dane Springmeyer
58d7c72a22
Merge pull request #3796 from mapnik/glibcxx-fix2
Glibcxx fix redux
2017-11-16 14:53:58 -08:00
artemp
a780581ebc Scons - update to 2.5.1 2017-11-16 12:05:21 +01:00
Artem Pavlenko
5732df452c support SCons 3 (initial attempt) 2017-11-16 11:59:55 +01:00
Dane Springmeyer
a2b7f642e0 check symbols for all modes, only error if symbols exist + ENABLE_GLIBC_WORKAROUND 2017-11-15 21:48:20 -08:00
Dane Springmeyer
5e06dfb50b add script that asserts on expected symbols 2017-11-15 20:32:47 -08:00
Dane Springmeyer
f32f3b34ae add glibc_workaround.cpp if option is chosen
This reverts commit 751d9bff1672f6b8cbd2b5ebe2eb460223746806.
2017-11-15 20:32:38 -08:00
Artem Pavlenko
3cb74f0871 attempting to fix #3793 2017-11-14 10:10:26 +01:00
Artem Pavlenko
97f520c7cf cleanup 2017-11-14 10:10:26 +01:00
Artem Pavlenko
2cd335509b
Merge pull request #3794 from mapycz/char_array_buffer-seekpos
char_array_buffer should implement also seekpos()
2017-11-14 09:55:43 +01:00
Jiri Drbalek
fe268b0e71 char_array_buffer should implement also seekpos() 2017-11-13 22:42:37 +00:00
Artem Pavlenko
5db45d9fa3 use semantic actions to fix #3744 ( >= boost_1_65) 2017-11-13 13:15:47 +01:00