Commit graph

11686 commits

Author SHA1 Message Date
Dane Springmeyer
37bd319c87 start more font reg/cache tests 2014-10-06 14:31:27 -07:00
Dane Springmeyer
f733c7f2ac comment debug code 2014-10-06 14:31:11 -07:00
Dane Springmeyer
1670fdabf0 fix line symbolizer 'rasterizer' property - closes #2503 2014-10-06 14:10:43 -07:00
Dane Springmeyer
8be50220e0 Merge pull request #2501 from MapQuest/grid_markers_fix
Grid markers fix for issue #2500
2014-10-06 12:30:19 -07:00
Dane Springmeyer
737c299341 fix back compat for text-placement-type:dummy - closes #2502 2014-10-06 11:37:39 -07:00
jhollinger2
c5d0c44de0 Merge branch 'grid_markers_fix' into marker-refactor
Conflicts:
	include/mapnik/grid/grid_marker_helpers.hpp
2014-10-06 14:08:40 -04:00
jhollinger2
5ca07a26d1 Refactor marker helpers for agg and grid renderer. 2014-10-06 14:03:48 -04:00
Jordan Hollinger
f6368da679 Update other affected test grids from recenter fix in grid markers helper. 2014-10-06 09:16:16 -04: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
Jordan Hollinger
47bd76e683 Add test case to isolate collision error in grid renderer. 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
2cf3990e0d warn if fontset not found and load_map is not in strict mode - closes #1791 2014-10-03 17:43:44 -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
Dane Springmeyer
b09df2fa13 Merge pull request #2490 from MapQuest/group-margin
Use margin attribute in group symbolizer
2014-10-03 12:19:02 -07:00
Jordan Hollinger
8dad0c8975 Add test case expected results. 2014-10-03 14:45:25 -04:00
jhollinger2
4dfa76a0fc Update group symbolizer collision to use margin instead of minimum-distance. Add test case. 2014-10-03 13:46:23 -04:00
artemp
e8b3083a6a remove std::function usage in text_properties 2014-10-03 16:00:05 +01:00
Dane Springmeyer
f81fc53cbc fix compile on windows of font_feature_settings.cpp - refs #2489 2014-10-02 16:31:16 -07:00
Dane Springmeyer
75df4b12fd remove unneeded boost/version.hpp 2014-10-02 16:29:27 -07: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
Dane Springmeyer
d1f522b201 min compiler is g++ 4.8 - refs #2486 2014-10-02 13:24:00 -07:00
Dane Springmeyer
dfaa860522 Revert "min compiler is g++ 4.8 - refs #2486"
This reverts commit 612b4a0207.
2014-10-02 13:23:35 -07:00
Jiri Drbalek
47c9d77f8f Merge pull request #2485 from mapycz/fix-text-layout-wrap-char
add wrap-character support to Layout node of TextSymbolizer
2014-10-02 21:36:31 +02:00
Dane Springmeyer
612b4a0207 min compiler is g++ 4.8 - refs #2486 2014-10-02 12:04:32 -07:00
Jiri Drbalek
5861980f91 add wrap-character support to Layout node of TextSymbolizer 2014-10-02 18:34:37 +00:00
Dane Springmeyer
4ec3b5d013 travis: use harfbuzz from fontforge ppa 2014-10-02 11:27:59 -07:00
Dane Springmeyer
0a120dc92b disable minor failing params/value_null test for now - refs #2471 2014-10-02 11:27:16 -07:00
Dane Springmeyer
68fba05f5e try testing against boost 1.48 again - refs #2469 #2471 2014-10-02 10:32:16 -07: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
artemp
9b58b65583 Merge branch 'mapycz-fix-compile-ubuntu-precise' 2014-10-02 15:10:08 +01:00
artemp
a04276d90a use c++11 features over boost when available 2014-10-02 15:09:17 +01:00
Jiri Drbalek
667b6e3adc fix compile on ubuntu precise 2014-10-02 12:18:39 +00:00
Dane Springmeyer
a77bc9deb0 Merge pull request #2454 from mapnik/localized-font-cache
3.x port of localized font caching
2014-10-02 01:01:07 -07:00
Dane Springmeyer
dc6b6c1e81 c++ tests for font registration and caching on map 2014-10-02 00:48:02 -07:00
Dane Springmeyer
66889d32f9 only memcache local fonts if not already globally known and not already cached (avoid extra io for ttc) 2014-10-02 00:47:32 -07:00
Dane Springmeyer
887f5a982b remove unneeded include 2014-10-01 21:08:36 -07:00
Dane Springmeyer
0efb6964ef per map load cache if a fonts is known as valid 2014-10-01 20:59:05 -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
940c4a321d Merge branch 'master' of github.com:mapnik/mapnik into localized-font-cache 2014-10-01 18:54:25 -07:00
Dane Springmeyer
d29add9db3 use face_manager_freetype typedef everywhere 2014-10-01 18:54:11 -07:00
Dane Springmeyer
767c51cea2 add missing stdexcept include 2014-10-01 18:51:17 -07:00
Dane Springmeyer
d3802daea2 Merge branch 'master' of github.com:mapnik/mapnik into localized-font-cache 2014-10-01 18:45:41 -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