Matt Amos
|
e759b61b07
|
Fix compiler warning about uninitialised variable.
|
2014-10-01 02:12:19 +01:00 |
|
Dane Springmeyer
|
dfc7ba86d3
|
remove unused typedef
|
2014-09-30 17:00:52 -07:00 |
|
Dane Springmeyer
|
ad43b37672
|
Merge branch 'master' of github.com:mapnik/mapnik into localized-font-cache
|
2014-09-30 14:42:15 -07:00 |
|
Dane Springmeyer
|
09b02ddc17
|
Merge branch 'master' of github.com:mapnik/mapnik into localized-font-cache
Conflicts:
src/build.py
|
2014-09-30 14:42:01 -07:00 |
|
Dane Springmeyer
|
f34d12094c
|
new files
|
2014-09-30 12:50:42 -07:00 |
|
Dane Springmeyer
|
822d3a5bce
|
break apart symbolizer.hpp + fwd declars + svg output grammar impl
|
2014-09-30 12:50:08 -07:00 |
|
Dane Springmeyer
|
985ddb3aeb
|
fix compile of (currently unsed) symbolizer_grammar.hpp
|
2014-09-30 12:12:58 -07:00 |
|
Dane Springmeyer
|
6be1eb94c2
|
Revert "ditch boost/function" - refs #2465
This reverts commit 24052580b9.
|
2014-09-30 10:45:56 -07:00 |
|
Dane Springmeyer
|
1452c5b92f
|
Merge pull request #2466 from mapnik/reduce-compile-times
reduce compile time by minimizing template instantiations
|
2014-09-30 10:45:39 -07:00 |
|
artemp
|
9c0046fb61
|
reduce compile time by minimizing template instantiaions
|
2014-09-30 14:44:02 +01:00 |
|
Dane Springmeyer
|
40a1189357
|
chip away at complexity of marker_helpers.hpp
|
2014-09-29 19:32:22 -07:00 |
|
Dane Springmeyer
|
d111dcbed6
|
iwyu
|
2014-09-29 18:47:05 -07:00 |
|
Dane Springmeyer
|
dc57849b7d
|
geometry container typedef fixing
|
2014-09-29 18:40:57 -07:00 |
|
Dane Springmeyer
|
c654994dbc
|
remove obsolete text_path.hpp header
|
2014-09-29 18:23:46 -07:00 |
|
Dane Springmeyer
|
d2a7fda55d
|
fix visibility of regex_match/replace nodes
|
2014-09-29 18:12:39 -07:00 |
|
Dane Springmeyer
|
24052580b9
|
ditch boost/function
|
2014-09-29 17:51:05 -07:00 |
|
Dane Springmeyer
|
d0b167affc
|
iwyu shuffle
|
2014-09-29 17:14:40 -07:00 |
|
Dane Springmeyer
|
9b0d6fc702
|
iwyu
|
2014-09-29 17:01:40 -07:00 |
|
Dane Springmeyer
|
3ee609112a
|
using pimpl to isolate boost::regex headers - refs #2439
|
2014-09-29 16:48:19 -07:00 |
|
Dane Springmeyer
|
a41978f439
|
iwyu
|
2014-09-29 13:50:21 -07:00 |
|
Dane Springmeyer
|
ba689b379e
|
iwyu
|
2014-09-29 13:50:14 -07:00 |
|
Dane Springmeyer
|
848370c678
|
speed up compile / move iomanip to cpp - refs #2439
|
2014-09-29 13:49:56 -07:00 |
|
Dane Springmeyer
|
a1b98e6238
|
speed up compile / avoid boost/math - refs #2439
|
2014-09-29 13:49:22 -07:00 |
|
Dane Springmeyer
|
89f64f6b97
|
avoid spirit usage in function_call.hpp - refs #2439
|
2014-09-29 13:12:46 -07:00 |
|
artemp
|
8ff17378a4
|
make index constexpr
|
2014-09-29 21:03:34 +01:00 |
|
artemp
|
752d9def3c
|
remove unused //#include <mapnik/expression_node.hpp>
|
2014-09-29 21:03:09 +01:00 |
|
Dane Springmeyer
|
688e97e148
|
move dasharray parser to cpp file - refs #2439
|
2014-09-29 12:07:15 -07:00 |
|
artemp
|
953f4b700c
|
remove unused mpl header
|
2014-09-29 19:29:44 +01:00 |
|
artemp
|
14ba64174b
|
make arguments noncopyable
|
2014-09-29 14:07:39 +01:00 |
|
artemp
|
95d13e0b3d
|
Merge branch 'master' into vertex-converter
|
2014-09-29 12:34:54 +01:00 |
|
artemp
|
7f81fc9146
|
cleanup
|
2014-09-29 12:22:54 +01:00 |
|
artemp
|
e57f66b97d
|
re-implement vertex_converters using c++11 feature (removes dependency on boost::mpl/boost::fusion)
|
2014-09-29 11:58:04 +01:00 |
|
Dane Springmeyer
|
7b97e3ace8
|
unique_ptr for font_face_set
|
2014-09-28 22:35:08 -07:00 |
|
Dane Springmeyer
|
e21e8b6696
|
c++ style
|
2014-09-28 22:20:59 -07:00 |
|
Dane Springmeyer
|
d1adabf7d5
|
3.x port of localized font caching and then some
|
2014-09-26 19:54:07 -07:00 |
|
Dane Springmeyer
|
d3d6b09516
|
fix windows compile - apparently numeric_limits is not viably constexpr - closes #2452
|
2014-09-26 16:57:16 -07:00 |
|
artemp
|
130e621ace
|
use c++11 in vertex_converters (work-in-progress)
|
2014-09-26 12:41:03 +01:00 |
|
Dane Springmeyer
|
385a77fc47
|
pass map to renderer common (viable after 60a55cb48, needed for upcoming font changes)
|
2014-09-25 22:37:43 -07:00 |
|
Dane Springmeyer
|
59eb03a346
|
simplify parse error in xml
|
2014-09-25 22:20:44 -07:00 |
|
Jiri Drbalek
|
13f950159f
|
fix text symbolizer property data binding
|
2014-09-25 18:26:36 +00:00 |
|
Dane Springmeyer
|
60a55cb48b
|
noncopyable renderer_common (needed for upcoming font work)
|
2014-09-24 22:46:19 -07:00 |
|
artemp
|
4be6ca37e9
|
c++11 - use auto
|
2014-09-23 18:49:31 +01:00 |
|
artemp
|
7a1cc786fc
|
position_grammar - re-order rules to allow expectation operators
|
2014-09-23 15:12:22 +01:00 |
|
artemp
|
2f319e92cc
|
use error_handler across json parsers
|
2014-09-23 14:58:10 +01:00 |
|
artemp
|
1382e57ebe
|
avoid allocating potentially large std::string in error_handler
|
2014-09-23 14:02:08 +01:00 |
|
artemp
|
f4694d03ff
|
json error handler : use MAPNIK_LOG_ERROR and better message
|
2014-09-23 13:22:53 +01:00 |
|
Jiri Drbalek
|
31607cb3f4
|
add text attribute horizontal-alignment="adjust"
|
2014-09-23 08:49:27 +00:00 |
|
artemp
|
43c04a72bf
|
add set_property_from_xml_impl specialization from std::string
( parse as an expression first )
|
2014-09-22 12:04:05 +01:00 |
|
artemp
|
5db32ab2e2
|
properties_util : template apply static method on value type
|
2014-09-22 11:23:57 +01:00 |
|
artemp
|
5df668d126
|
refactor error handler to work with mapnik/debug macros
|
2014-09-22 10:10:08 +01:00 |
|
Dane Springmeyer
|
9e78712dc4
|
Merge pull request #2377 from mapycz/3.x-fix-text-on-line-glyph-distance
text rendering with line placement on corners in 3.x
|
2014-09-19 15:12:32 -07:00 |
|
Dane Springmeyer
|
98adcc2d58
|
fix compile with clang++ after #2416
|
2014-09-19 14:51:27 -07:00 |
|
Dane Springmeyer
|
7576c8e384
|
fix return of painted in grid_renderer
|
2014-09-19 14:34:08 -07:00 |
|
Dane Springmeyer
|
68d90adda6
|
enable painted for svg_renderer
Conflicts:
include/mapnik/svg/output/svg_renderer.hpp
|
2014-09-19 14:34:07 -07:00 |
|
Dane Springmeyer
|
753cd5d6a0
|
Merge pull request #2416 from mapycz/add-font-features
add font-feature-settings
|
2014-09-19 14:30:17 -07:00 |
|
Jiri Drbalek
|
2dcfa9e4b7
|
add font-feature-settings
|
2014-09-17 19:22:07 +00:00 |
|
Jiri Drbalek
|
e6a32f22cf
|
fix image painted
|
2014-09-16 18:54:52 +02:00 |
|
artemp
|
4c296e65e7
|
use expectation operators parsing attributes #2390
|
2014-09-12 17:19:11 +01:00 |
|
Dane Springmeyer
|
0cb63c51e8
|
finish removing ancient reduced size grid rendering pathway - amends f3a824c2cc
|
2014-09-12 00:56:51 -07:00 |
|
artemp
|
246336d2b1
|
Merge branch 'min-dist-compatibility' of git://github.com/MapQuest/mapnik into MapQuest-min-dist-compatibility
|
2014-09-10 16:20:36 +01:00 |
|
artemp
|
f8dc7b023a
|
text - add ``repeat-wrap-char`` parameter default:false (#2333)
|
2014-09-10 16:08:41 +01:00 |
|
Jordan Hollinger
|
9b5a9dfe3e
|
Change text-margin option to margin.
|
2014-09-10 07:45:41 -04:00 |
|
artemp
|
b441586acf
|
text-symbolizer: revive 'wrap-char' property which uses special (naive) line_breaker - ref #2333
|
2014-09-09 17:30:01 +01:00 |
|
Dane Springmeyer
|
479b9e13d0
|
Merge pull request #2383 from MapQuest/min-dist-compatibility
3.x -> 2.3.x compatibility for minimum-distance
|
2014-09-06 22:50:13 -07:00 |
|
Dane Springmeyer
|
4ac190e8ef
|
fix handling of marker width/height
|
2014-09-06 22:44:57 -07:00 |
|
Dane Springmeyer
|
cc07ac2b00
|
simplify marker width/height handling
|
2014-09-06 22:13:30 -07:00 |
|
Dane Springmeyer
|
54b2880e53
|
markers: support offset, geometry-transform, and simplify - closes #2108
|
2014-09-06 21:27:15 -07:00 |
|
Dane Springmeyer
|
dc8a46017f
|
fix recursion on windows - closes #2414
|
2014-09-06 21:07:48 +00:00 |
|
Dane Springmeyer
|
9d363ce7e7
|
change runtime warning to compile time warning
|
2014-09-06 12:57:53 -07:00 |
|
Dane Springmeyer
|
1482835c08
|
fix visibility of image compositing/scaling with -flto - closes #2413
|
2014-09-06 10:52:00 -07:00 |
|
Dane Springmeyer
|
e26570dfdb
|
completely ignore layers with status=off - closes #153
|
2014-09-06 10:08:40 -07:00 |
|
artemp
|
fef3d22154
|
support avoid-edges in all markers placements
|
2014-09-05 16:33:20 +01:00 |
|
artemp
|
2727eddf90
|
implement 'avoid-adges' for markers placements (point placement)
(TODO: support all placement types)
|
2014-09-05 16:19:55 +01:00 |
|
artemp
|
aea77a7155
|
use generic_json types in topojson grammar
refactor value_converters into separate header
usd value_converters in geojson parser
|
2014-09-05 12:13:58 +01:00 |
|
Jiri Drbalek
|
b7e7e29781
|
fix text rendering with line placement on corners
|
2014-09-05 10:46:46 +00:00 |
|
Jiri Drbalek
|
69708dc640
|
add length method
|
2014-09-05 10:46:46 +00:00 |
|
Dane Springmeyer
|
492e084714
|
add copy ctor to rule: avoids last copy of syms in load_map - closes #1293
|
2014-09-04 22:03:54 -07:00 |
|
Dane Springmeyer
|
25a41ae31b
|
restore value hash + add test harness
|
2014-09-04 19:38:53 -07:00 |
|
Dane Springmeyer
|
3c1ad84f95
|
remove mapnik-config.bat
|
2014-09-04 16:40:37 -07:00 |
|
Dane Springmeyer
|
038cc41cd4
|
we are targeting 2014 so rollback 2013 CTP workarounds
|
2014-09-04 18:26:17 +00:00 |
|
Dane Springmeyer
|
7d5d02e031
|
Merge branch 'master' of github.com:mapnik/mapnik into 3x-msvs
|
2014-09-04 09:22:53 -07:00 |
|
Dane Springmeyer
|
c30f1715e6
|
Revert "workaround msvs variant init bug"
This reverts commit be44b647fa.
|
2014-09-04 09:22:43 -07:00 |
|
Dane Springmeyer
|
98c881432a
|
Revert "attempt to workaround other mapnik_value_type->variant bugs"
This reverts commit 7dc1aed9ee.
|
2014-09-04 09:21:14 -07:00 |
|
artemp
|
72e2f4446f
|
re-implement mapnik::value deriving from value_base and update across core
fix mapnik::value conversions in topojson plugin
|
2014-09-04 17:10:13 +01:00 |
|
artemp
|
0985cc907d
|
remove copy converting ctor and fix converting move constuctor to use 'universal reference' and perfect forwarding
( re : http://isocpp.org/blog/2012/11/universal-references-in-c11-scott-meyers)
|
2014-09-04 14:54:42 +01:00 |
|
Jiri Drbalek
|
67d8f41a1b
|
fix angle calculation
Conflicts:
src/text/vertex_cache.cpp
|
2014-09-03 11:53:23 -07:00 |
|
Dane Springmeyer
|
7dc1aed9ee
|
attempt to workaround other mapnik_value_type->variant bugs
|
2014-08-31 17:18:15 -07:00 |
|
Dane Springmeyer
|
be44b647fa
|
workaround msvs variant init bug
|
2014-08-31 12:44:12 -07:00 |
|
Dane Springmeyer
|
beaf7a56cc
|
fix linking problems from python
|
2014-08-31 07:44:41 +00:00 |
|
Dane Springmeyer
|
603ea3811f
|
Merge branch 'master' of github.com:mapnik/mapnik into 3x-msvs
|
2014-08-30 20:05:33 -07:00 |
|
Dane Springmeyer
|
8cd198625e
|
remove unused code
|
2014-08-30 14:30:51 -07:00 |
|
Dane Springmeyer
|
d577ef8719
|
Merge branch 'master' of https://github.com/mapnik/mapnik into 3x-msvs
|
2014-08-29 18:56:43 -07:00 |
|
Dane Springmeyer
|
c7f58ee64c
|
clean up harfbuzz->icu interface
|
2014-08-29 17:41:29 -07:00 |
|
Dane Springmeyer
|
15356f6320
|
handle wchar_t UChar typedef on windows
|
2014-08-29 16:46:23 -07:00 |
|
Dane Springmeyer
|
12a45744fb
|
Merge pull request #2403 from mapycz/3.x-fix-vertext_last-warning
fix compiler warning
|
2014-08-29 11:52:09 -07:00 |
|
Jiri Drbalek
|
21dcb2e2c4
|
fix compiler warning
|
2014-08-29 18:18:25 +00:00 |
|
Dane Springmeyer
|
8d7bf7a8da
|
fix imagedata visability on windows
|
2014-08-29 11:01:04 -07:00 |
|
artemp
|
a5925c1f15
|
remove redundant private copy assignment op
|
2014-08-29 18:06:08 +01:00 |
|
Dane Springmeyer
|
3f6a5ae246
|
re-enable harfbuzz shaper
|
2014-08-29 00:05:34 -07:00 |
|
Dane Springmeyer
|
6f3b8f969d
|
params: make msvs happy
|
2014-08-28 19:06:17 -07:00 |
|