Commit graph

8942 commits

Author SHA1 Message Date
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
artemp
7c5cdc8e2c fix viewer compilation 2014-10-01 14:07:27 +01:00
artemp
745d45bb68 remove std::function from placement loop
(std::function incurs overhead of polymorphic dispatch internally and relatively expensive - avoid using in performance critic code)
2014-10-01 11:26:14 +01:00
artemp
1d5f1f12f0 remove static std::map<marker_placement_e, boost::function<markers_placement(Locator &locator,Detector &detector,markers_placement_params const& params)>
^ it was hurting compile times badly
2014-10-01 11:26:14 +01:00
Artem Pavlenko
6b1a2621b5 Merge pull request #2474 from joto/std_chrono
Use std::chrono instead of boost::chrono in benchmarks.
2014-10-01 10:53:51 +01:00
Jochen Topf
0aec5003b3 Use std::chrono instead of boost::chrono in benchmarks.
This reduces the external dependencies and fixes a bug where a duration was
reported in microseconds instead of milliseconds on some systems.
2014-10-01 11:38:08 +02:00
Dane Springmeyer
d09765ad08 travis: give up and just do clang++/release 2014-09-30 21:54:20 -07:00
Dane Springmeyer
0cf9498d21 travis: is there hope? 2014-09-30 21:40:10 -07:00
Dane Springmeyer
e9e5ec4a6b quick fix for #2451 2014-09-30 21:29:55 -07:00
Dane Springmeyer
548f30b81f travis: try JOBS=4 for gcc 2014-09-30 21:24:43 -07:00
Dane Springmeyer
4c07585312 fix #2464 2014-09-30 21:16:29 -07:00
Dane Springmeyer
babffe08fb travis: fix Debug comparision 2014-09-30 19:39:52 -07:00
Dane Springmeyer
e55e606025 Travis: debug JOBS in DEBUG mode 2014-09-30 19:19:25 -07:00
Dane Springmeyer
98f89ce2fd Merge pull request #2472 from zerebubuth/warning_2468
Fix compiler warning about uninitialised variable.
2014-09-30 19:16:54 -07:00
Dane Springmeyer
7e8275a283 travis: tune JOBS 2014-09-30 19:08:26 -07:00
Dane Springmeyer
eda8c3336b travis: fix typo 2014-09-30 18:50:26 -07:00
Dane Springmeyer
d4f7c2ae49 travis use boost 1.55 over 1.48 to dodge for now #2469 and #2471 2014-09-30 18:47:41 -07:00
Dane Springmeyer
4cbc139689 remove boost::format usage 2014-09-30 18:35:07 -07:00
Matt Amos
e759b61b07 Fix compiler warning about uninitialised variable. 2014-10-01 02:12:19 +01:00
Dane Springmeyer
8bf957e73e disable failing test for now (it is non critical + mysterious) - refs #2438 2014-09-30 17:53:24 -07:00
Dane Springmeyer
efec7cd843 visual tests: specialize grid diff tolerance 2014-09-30 17:42:40 -07:00
Dane Springmeyer
53b3cb3b46 visual tests: better grid diffing 2014-09-30 17:42:40 -07:00
Dane Springmeyer
e392feeec2 re-enable gcc, more JOBS, less boost 2014-09-30 17:05:34 -07:00
Dane Springmeyer
dfc7ba86d3 remove unused typedef 2014-09-30 17:00:52 -07:00
Dane Springmeyer
6d8f126c3f avoid -Wunused-local-typedefs warning in sparsehash 2014-09-30 16:57:44 -07:00
Dane Springmeyer
3bd7ee87c6 clean config.cache by default 2014-09-30 16:40:08 -07:00
Dane Springmeyer
c53bcd99a6 csv plugin: only attempt to parse ascii as numbers - closes #2450 2014-09-30 16:30:45 -07:00
Dane Springmeyer
9cba3a2036 travis: try more aggressive JOBS again - refs #2439 2014-09-30 14:52:50 -07:00
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