Commit graph

9121 commits

Author SHA1 Message Date
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
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
32f80b2b3e fix layer buffer default 2014-10-01 14:08:08 -07:00
Dane Springmeyer
9b2c14466c explicit move ctor for feature_type_style 2014-10-01 13:54:44 -07:00
Dane Springmeyer
ed3bc1d411 explicitly initialize all members of layer class in ctor 2014-10-01 13:53:12 -07:00
Dane Springmeyer
9ecdc839b5 c++ style 2014-10-01 11:24:41 -07:00
Dane Springmeyer
1b70ce8c3d Merge pull request #2477 from mapycz/fix-plugin-sqlite
fix multiple attach to the same sqlite database
2014-10-01 10:52:17 -07:00
Sandro Santilli
aa2ddc5ded Further speedup dataraster test by importing only tiled 2014-10-01 10:48:03 -07:00
Sandro Santilli
a226482158 Use a smaller input file for testing dataraster 16bsi
Also test a minor number of overviews.
The aim is to make the test faster (#2470)
2014-10-01 10:47:56 -07:00
Dane Springmeyer
24e1bcfeec fix visibility of agg headers needed for svg2png built with -fvisibility=hidden - similiar to #1860 2014-10-01 10:34:47 -07:00
Dane Springmeyer
d9b9b0efac fix -Wdangling-else warning in clipper.cpp 2014-10-01 10:34:47 -07:00
Jiri Drbalek
b6438a80d1 fix multiple attach to the same sqlite database 2014-10-01 14:02:38 +00:00