artemp
|
7f219b4f8b
|
use phoenix v3 syntax + cleanups
|
2014-10-08 11:00:25 +01:00 |
|
artemp
|
66252075e9
|
use <type_traits>
|
2014-10-08 10:37:35 +01:00 |
|
artemp
|
29c7c5ac3e
|
throw std::runtime_error on expectation failure
|
2014-10-07 11:21:44 +01:00 |
|
artemp
|
5990eecec5
|
better rules names
|
2014-10-07 11:21:05 +01:00 |
|
Dane Springmeyer
|
c2fe4a14be
|
drop useless template usage for has_key
|
2014-10-06 23:21:13 -07:00 |
|
Dane Springmeyer
|
7ce776a79c
|
fix handling of shield-text-opacity/text-opacity - closes #2507
|
2014-10-06 21:52:29 -07:00 |
|
Dane Springmeyer
|
1ae43a25ff
|
text_properties code cleanup - pregame for #2504
|
2014-10-06 16:59:49 -07:00 |
|
Jordan Hollinger
|
8405400776
|
Pass recentered transform to markers_placement_finder in vector_markers_rasterizer_dispatch_grid. Update expected grids for test case.
|
2014-10-06 09:16:16 -04:00 |
|
Dane Springmeyer
|
4aec64871d
|
add missing header
|
2014-10-03 20:00:33 -07:00 |
|
Dane Springmeyer
|
e0ba9e9a8c
|
use common dispatch for symbolizers
|
2014-10-03 19:07:08 -07:00 |
|
Dane Springmeyer
|
ebf7a61135
|
fix unsafe return of temporary - closes #2493
|
2014-10-03 16:39:25 -07:00 |
|
Dane Springmeyer
|
2925a70046
|
c++ style / delay std::string creation in xml loading
|
2014-10-03 16:39:25 -07:00 |
|
artemp
|
e8b3083a6a
|
remove std::function usage in text_properties
|
2014-10-03 16:00:05 +01:00 |
|
Dane Springmeyer
|
f586f6909f
|
make vertex_cache noncopyable
|
2014-10-02 15:41:21 -07:00 |
|
Dane Springmeyer
|
109b45a0ad
|
c++ style
|
2014-10-02 15:37:55 -07:00 |
|
Jiri Drbalek
|
5861980f91
|
add wrap-character support to Layout node of TextSymbolizer
|
2014-10-02 18:34:37 +00:00 |
|
Dane Springmeyer
|
d4f11bd80e
|
fix miniz visibility with -fvisibility=hidden
|
2014-10-02 10:27:17 -07:00 |
|
artemp
|
2bab0512ff
|
refactor vertex_cache to use unique_ptr's and less copying
|
2014-10-02 16:36:50 +01:00 |
|
Dane Springmeyer
|
887f5a982b
|
remove unneeded include
|
2014-10-01 21:08:36 -07:00 |
|
Dane Springmeyer
|
687a33575c
|
fast, non-caching check if a font can be opened and read
|
2014-10-01 20:32:03 -07:00 |
|
Dane Springmeyer
|
ad7e619ba3
|
remove state from freetype_engine - now fully static
|
2014-10-01 20:03:03 -07:00 |
|
Dane Springmeyer
|
898d58c4f5
|
face_set_ptr can be unique rather than shared
|
2014-10-01 19:01:26 -07:00 |
|
Dane Springmeyer
|
d29add9db3
|
use face_manager_freetype typedef everywhere
|
2014-10-01 18:54:11 -07:00 |
|
Dane Springmeyer
|
d96093d3aa
|
rebase with master
|
2014-10-01 18:45:28 -07:00 |
|
Dane Springmeyer
|
bef269bc01
|
Add file_io.hpp
|
2014-10-01 18:44:19 -07:00 |
|
Dane Springmeyer
|
23cb5dd47d
|
new util::file class wrapping cstdio + more library usage
|
2014-10-01 18:31:04 -07:00 |
|
Dane Springmeyer
|
3cdd42bab4
|
fix include
|
2014-10-01 18:29:59 -07:00 |
|
Dane Springmeyer
|
e6fe3cd8a6
|
new font_library raii class
|
2014-10-01 18:19:26 -07:00 |
|
Dane Springmeyer
|
83533c16c6
|
fix add_layer move signature - refs #2453
|
2014-10-01 14:20:58 -07:00 |
|
Dane Springmeyer
|
aae56fa387
|
avoid style, layer, and fontset copies in load_map - refs #2453
|
2014-10-01 14:09:09 -07:00 |
|
Dane Springmeyer
|
9b2c14466c
|
explicit move ctor for feature_type_style
|
2014-10-01 13:54:44 -07:00 |
|
Dane Springmeyer
|
9ecdc839b5
|
c++ style
|
2014-10-01 11:24:41 -07:00 |
|
artemp
|
1d5f1f12f0
|
remove static std::map<marker_placement_e, boost::function<markers_placement(Locator &locator,Detector &detector,markers_placement_params const& params)>
^ it was hurting compile times badly
|
2014-10-01 11:26:14 +01:00 |
|
Dane Springmeyer
|
98f89ce2fd
|
Merge pull request #2472 from zerebubuth/warning_2468
Fix compiler warning about uninitialised variable.
|
2014-09-30 19:16:54 -07:00 |
|
Dane Springmeyer
|
4cbc139689
|
remove boost::format usage
|
2014-09-30 18:35:07 -07:00 |
|
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 |
|