Commit graph

10398 commits

Author SHA1 Message Date
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
6f176ab0bf Merge pull request #2241 from mapnik/freetype-new-lib
FT_New_Library/FT_Done_Library
2014-05-13 16:14:38 -07:00
Dane Springmeyer
92bf9782f8 scons: fix path remove to be less aggressive 2014-05-13 15:25:16 -07:00
artemp
f0fd0aa8ce font_engine : use FT_New_Library/FT_Done_Library with custom memory management (ref #2209 #2210) 2014-05-13 12:43:59 +01:00
Dane Springmeyer
29d92fd162 Merge branch 'master' of github.com:mapnik/mapnik into render-time-variables 2014-05-12 21:26:04 -07:00
Dane Springmeyer
039e620147 don't allow marker-spacing less than 1 - fixes #2218 2014-05-12 21:25:49 -07:00
Dane Springmeyer
544917788f Merge branch 'master' of github.com:mapnik/mapnik into render-time-variables 2014-05-12 09:20:49 -07:00
Dane Springmeyer
760d3c967e Merge branch 'master' of github.com:mapnik/mapnik 2014-05-12 09:20:32 -07:00
Dane Springmeyer
0465a4d43a do inherit dynamic library path 2014-05-12 09:20:24 -07:00
Dane Springmeyer
1e3f062af8 Merge branch 'master' of github.com:mapnik/mapnik into render-time-variables 2014-05-12 08:45:15 -07:00
artemp
ba35dfe3b0 mapnik::value - return 'infinity' if rhs == 0 to avoid division by zero 2014-05-12 10:14:10 +01:00
artemp
1a32cc5630 + add eq/neq operators value_null <--> T 2014-05-12 10:12:09 +01:00
Dane Springmeyer
2c661ed3d5 support for render time variables 2014-05-11 13:08:24 -07:00
Dane Springmeyer
57c9aee63d shapeindex: more consistent error output 2014-05-11 12:41:08 -07:00
Dane Springmeyer
404e221c25 fix #2239 2014-05-11 12:40:24 -07:00
Dane Springmeyer
c770cfec3c fix possible crash in mapnik::process_layout::box_offset_align 2014-05-10 07:47:41 -07:00
Dane Springmeyer
6171c3252d fix a few sign comparison warnings 2014-05-10 07:37:28 -07:00
Dane Springmeyer
b2d62d5fd9 travis: disable clang - refs #2235 2014-05-08 07:26:44 -07:00
Dane Springmeyer
7364a30e67 improve handling of colors as expressions 2014-05-08 00:45:18 -07:00
Dane Springmeyer
88701b8669 revert usage of -flto on linux due to #2238 - refs #2232 2014-05-08 00:42:41 -07:00
Dane Springmeyer
e137985ecd travis: try -Os with -flto to see if #2235 and #2232 are still broken on travis 2014-05-06 23:00:42 -07:00
Dane Springmeyer
01d580d747 fix variable shadowing 2014-05-06 18:38:04 -07:00
artemp
99bbb10290 c++11 : use int types from <cstdint> 2014-05-06 18:06:47 +01:00
Dane Springmeyer
7bf50e9b5b fix build of test_array_allocation.cpp on older boost 2014-05-05 18:29:14 -07:00
Dane Springmeyer
cd4fdf17fe Merge pull request #2231 from mapnik/fast-static-grammars
static grammars
2014-05-05 18:24:59 -07:00
Dane Springmeyer
d7bb97a22e simplify code 2014-05-05 18:16:42 -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
b462913fa1 load_map: use const_iterator 2014-05-05 16:06:01 -07:00
Dane Springmeyer
74c7e67d60 Various c++11 improvements
- std::make_unique
 - avoiding uneccessary std::move calls which make actually prevent rvo (http://stackoverflow.com/questions/4986673/c11-rvalues-and-move-semantics-confusion)
 - more c++11 for loops
2014-05-05 16:02:42 -07:00
Dane Springmeyer
439fc9f700 fix variable shadowing in placements_list.hpp 2014-05-05 10:44:59 -07:00
Dane Springmeyer
15d3ceffc8 make clean: also clear out shared libs 2014-05-05 10:08:40 -07:00
Dane Springmeyer
f9ad079d39 benchmark: break out string to int/bool/double conversions 2014-05-05 10:08:25 -07:00
Dane Springmeyer
7158df8b08 benchmark: png encoding with z=1 to ensure we're testing hextree not zlib 2014-05-05 10:07:57 -07:00
Dane Springmeyer
ba17b9e374 add TODO comments for grammars that are not stateless - refs #2231 2014-04-30 11:04:26 -07:00
Dane Springmeyer
356cc85ad8 cleanup + rename svg_transform parser 2014-04-30 10:55:46 -07:00
Dane Springmeyer
97a45f21bb all static grammar usage const + xml_tree cleanups 2014-04-30 10:42:05 -07:00
Dane Springmeyer
8c1e69fdb8 static grammars
- construct on first use
 - allows for faster map loading and unloading of xml loading tree
 - modified expression and transform grammars to not take args/not crash
 - simplifies interfaces, allows fast parsing from python without passing grammar instance
2014-04-30 00:11:27 -07:00
Dane Springmeyer
ab7fc55535 more realistic expression benchmark string - refs #1167 2014-04-29 18:25:21 -07:00
Dane Springmeyer
2806bd1cac rapidxml: validate closing tags like libxml2 parser (no overhead measurable seen) 2014-04-29 14:32:57 -07:00
Dane Springmeyer
c399812c34 Merge pull request #2230 from MapQuest/jh-fix-group-symbolizer-text
Group symbolizer serialization
2014-04-29 11:01:37 -07:00
Jordan Hollinger
9ec187505b Add serialization for group symbolizer components. 2014-04-29 12:08:05 -04:00
Dane Springmeyer
59bba65ce8 inherit PYTHONPATH in localize.sh 2014-04-28 20:17:38 -07:00
Dane Springmeyer
69ec89789a array alloc bench: add static_vector + fix valarray usage 2014-04-28 19:58:15 -07:00
Dane Springmeyer
ad10497503 cache result of parse_expression to speed up map loading - refs #1167 2014-04-28 18:02:14 -07:00
Dane Springmeyer
ef837eb92f c++11 optimizations for faster map loading 2014-04-28 17:10:00 -07:00
Dane Springmeyer
73517c9104 fix return value for string2bool 2014-04-27 08:51:14 -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
b7b1acaa50 optimize string2bool 2014-04-25 21:46:40 -07:00