Commit graph

2911 commits

Author SHA1 Message Date
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