Commit graph

2821 commits

Author SHA1 Message Date
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
Dane Springmeyer
324fb11f66 include <cstdint> - fixes msvs compile - refs #2396 2014-08-28 18:51:27 -07:00
Dane Springmeyer
7ff712af52 remove unused code 2014-08-28 17:24:17 -07:00
Dane Springmeyer
3c66054524 Merge branch 'master' of github.com:mapnik/mapnik into 3x-msvs 2014-08-28 17:23:59 -07:00
Dane Springmeyer
23189d7059 remove invalid MAPNIK_DECL usage - amends d61efc0b5a (may break lto, but fixes windows) 2014-08-28 17:23:32 -07:00
artemp
1ac0ebdd83 rename coord_transform to transform_path_adapter and move implementation into separate header 2014-08-28 10:59:08 +01:00
artemp
ecfaec1027 rename ctrans.hpp to view_transform.hpp 2014-08-28 10:29:04 +01:00
artemp
de22d5900c rename CoordTransform to view_transform to better reflect its purpose and be consistent 2014-08-28 10:17:15 +01:00
artemp
cc76ac4c6a c++ style - avoid implicit bool conversions in comparison + make note re:scale_denom *= p.scale_factor(); 2014-08-28 09:57:24 +01:00
artemp
4628dc3ff3 c++11 style 2014-08-28 09:55:16 +01:00
Dane Springmeyer
0635052349 fix CTP 2013 issue 8 from #2396 2014-08-26 20:01:59 -07:00
Dane Springmeyer
a8e8632572 don't trust __cplusplus - addresses issue 5 from #2396 2014-08-26 19:24:53 -07:00
Dane Springmeyer
f364069e25 fix issue 6 from #2396 2014-08-26 19:11:44 -07:00
Dane Springmeyer
b6bfab99b8 remove unneeded header 2014-08-26 16:09:04 -07:00
Dane Springmeyer
884db7de8c fix issue 1 from #2396 2014-08-26 12:43:11 -07:00
artemp
0cfbd3c5e8 expression_string : implement function call support 2014-08-26 10:51:55 +01:00
Dane Springmeyer
3e1ab9beab fix gdal compile with msvs 2013 - closes #2257 2014-08-25 17:50:45 -07:00
Dane Springmeyer
70f71790fe simplify expression handling in marker_helpers 2014-08-25 14:51:22 -07:00
Dane Springmeyer
feffa8f53c respect int return type for WebPValidateConfig 2014-08-25 14:38:03 -07:00
artemp
2a254a4017 expressions - refactor function calls into separate compilation unit 2014-08-25 15:06:53 +01:00
artemp
4adb0abb64 expressions - implement unary and binary function expression nodes
(sample functions: exp, pow, sin, cos, min, max, tan, atan)
2014-08-25 14:17:18 +01:00
Dane Springmeyer
48c23f27dc remove duplicate calculation of image_ratio 2014-08-24 19:21:54 -07:00
Dane Springmeyer
0b8439c8d2 fix inialization order 2014-08-24 16:37:39 -07:00
Jiri Drbalek
e1aededb09 refactor marker placements 2014-08-24 18:10:41 +00:00
artemp
eb7716aeed expressions - initial function_call framework implementation (TODO) 2014-08-22 12:30:25 +01:00
artemp
8db68fc5e3 hextree - avoid quantizing images with less than 3 pixels (hextree implementation requirement) 2014-08-21 12:43:43 +01:00
artemp
3c99514c85 GeoJSON : re-implement grammar to allow any order for "type", "coordinates" and "geometries" elements
Also, ammend positions parser to handle multi-dimensional coordinates e.g [x,y,z,....,N] (we only extract x and y)
2014-08-20 15:45:16 +01:00
Dane Springmeyer
7d23d49ecb fix #2368 2014-08-19 14:47:03 -07:00
artemp
59b089f65d remove unused (after grammar refactor) support_multi_pass.hpp include 2014-08-19 16:04:31 +01:00
Dane Springmeyer
0e87d913ed fix return type 2014-08-18 19:19:48 -07:00
Dane Springmeyer
83b7ccb3ae optimize set_symbolizer_property_impl 2014-08-18 15:37:46 -07:00
artemp
801848ac97 Merge branch 'jh-min-repeat-distance' of git://github.com/MapQuest/mapnik into MapQuest-jh-min-repeat-distance
Conflicts:
	include/mapnik/renderer_common/process_group_symbolizer.hpp
	src/text/text_properties.cpp
2014-08-18 14:05:14 +01:00
Jiri Drbalek
f3fba6e299 fix compile with gcc 2014-08-17 13:15:56 +00:00
artemp
67379d1bba fix icu_shaper 2014-08-15 14:11:44 +01:00
Dane Springmeyer
751e039347 add RESPECT mode to make 'fixing' of bbox aspect a no-op on map 2014-08-14 20:27:27 -07:00
Dane Springmeyer
8cfb49de81 fix quoting in svg output grammars - regressed in 350c2c29bd 2014-08-14 12:28:28 -07:00
Dane Springmeyer
595b81107c variant : make operator<< stricter to avoid unexpected instantiations - refs 7602779836 2014-08-14 11:50:58 -07:00
Dane Springmeyer
8ef6558496 iwyu 2014-08-14 10:04:26 -07:00
artemp
52ba1383ec move hash_value into value_adl_barrier namespace where it expected 2014-08-14 18:02:52 +01:00
artemp
454a69c582 mapnik::value - revive hash_value function implementation (#2358) 2014-08-14 10:00:23 +01:00