Commit graph

12165 commits

Author SHA1 Message Date
Jiri Drbalek
51064a9479 grid: use correct types 2015-05-25 21:03:40 +00:00
Dane Springmeyer
91065df5f0 Merge pull request #2852 from mapnik/svg-visual-tests
Add svg_renderer to visual tests
2015-05-25 08:26:40 -07:00
Dane Springmeyer
ea3eb674c7 default compiler to cc/c++ / remove obsolete special casing for os x 2015-05-24 13:51:45 -07:00
Dane Springmeyer
b0f93e4596 Merge pull request #2862 from pnorman/patch-2
Don't hard-code bash path in mapnik-config
2015-05-24 13:49:01 -07:00
Dane Springmeyer
4667e9470a more portable workaround for gil c++11 bug - closes #2859 2015-05-24 13:48:04 -07:00
Paul Norman
eeec7850d0 Don't hard-code bash path in mapnik-config
[[ is a bashism, so this script needs bash, but shouldn't assume a location.
2015-05-24 13:16:31 -07:00
Blake Thompson
647d20981a Merge pull request #2855 from pnorman/host_typo
Remove stray " in HOST config line
2015-05-23 21:37:37 -05:00
Blake Thompson
a4f068b6d9 Merge pull request #2856 from pnorman/libmapnik_gitignore
Expand .gitignore for so files
2015-05-23 20:45:25 -05:00
Paul Norman
7dba9cb04b Expand .gitignore for so files
The existing lines weren't catching libmapnik.so.3.0.0
2015-05-23 18:39:51 -07:00
Paul Norman
f0364c40a9 Remove stray " in HOST config line 2015-05-23 16:53:00 -07:00
Dane Springmeyer
11a90c401c Merge pull request #2854 from pnorman/configure_bash
Use sh instead of bash for configure
2015-05-23 16:34:00 -07:00
Paul Norman
9954b64b6a Use sh instead of bash for configure
Not everywhere has bash installed or installs it to /bin/bash

Given that there's no bash-specific features in configure, it makes
sense to just use sh
2015-05-23 15:59:52 -07:00
Dane Springmeyer
77907bdb1e another ifdef for renderers 2015-05-23 12:53:58 -07:00
Dane Springmeyer
c6adab02f4 Merge branch 'master' of github.com:mapnik/mapnik into svg-visual-tests 2015-05-23 12:08:58 -07:00
Dane Springmeyer
9d9a1283d6 make grind: no need to source mapnik-settings + add grinding of visual tests 2015-05-23 12:05:40 -07:00
Dane Springmeyer
ad09abee21 free memory in visual tests to keep valgrind happier 2015-05-23 12:05:10 -07:00
Dane Springmeyer
018c595dda properly ifdef cairo and svg renderers 2015-05-23 11:59:48 -07:00
Dane Springmeyer
0646e9446e use new visual test data with svg 2015-05-23 11:10:24 -07:00
Dane Springmeyer
99560b23ab add svg_renderer to visual tests 2015-05-23 11:08:51 -07:00
Dane Springmeyer
9a697a7dd6 boottrap: fix paths embedded in .la files
- these are invalid for local setups since they have travis absolute paths by default
 - this is not needed for building mapnik (since mapnik does not use libtool)
 - but it enables using the result of mapnik-config to build apps that do use libtool
 - so it unblocks building mod_tile against a local mapnik/mapnik-config built against mason
2015-05-23 10:33:18 -07:00
Dane Springmeyer
aae52dad2e u_cleanup is called from unit/run.cpp already [skip ci] 2015-05-22 13:56:59 -07:00
Dane Springmeyer
6c8a72dfb0 also skip running unit tests since they (currently at least) depend on test data - followup to #2845 2015-05-22 09:52:01 -07:00
Dane Springmeyer
0ac8389622 Merge pull request #2845 from mapycz/improve-visual-test-5
visual tests: skip visual tests when test data are not present
2015-05-22 09:48:57 -07:00
Jiri Drbalek
c349412056 visual tests: skip visual tests when test data are not present 2015-05-22 17:02:52 +00:00
artemp
9c9a7a06a0 unit test geometry - use appropriete std::string constructor ( file_io.get() doesn't guarantee to return null terminated C-string!) 2015-05-22 09:24:45 +01:00
artemp
bbbe24ac9f format - remove extra ; 2015-05-22 09:09:50 +01:00
Artem Pavlenko
8d911d8c77 Merge pull request #2843 from mapnik/fix-webp-views
Fix potential crash when encoding webp via image_view
2015-05-22 08:59:03 +01:00
Dane Springmeyer
d5e4197aa2 fixup webp test 2015-05-21 20:42:18 -07:00
Dane Springmeyer
c2e94c68a5 fix crash + add crashing testcase for #2842 2015-05-21 20:39:14 -07:00
Dane Springmeyer
145781aec9 remove uneeded includes [skip ci] 2015-05-21 11:11:04 -07:00
Dane Springmeyer
4a69a94fed always compile tests even if not installing 2015-05-21 07:41:28 -07:00
artemp
2e832586ab use mapnik geometry! 2015-05-21 15:00:20 +01:00
artemp
4debc817b5 don't pass invalid bounding_boxes to boost::geometry::rtree_index 2015-05-21 11:52:30 +01:00
artemp
3b663af863 use boost::spirit::standard instead of boost::spirit::ascii to avoid assertions failing (isascii_(ch)) in debug builds - ref #2829 2015-05-21 11:27:21 +01:00
Blake Thompson
8534d5e5c2 Updated to latest visual test version 2015-05-20 17:35:08 -05:00
Dane Springmeyer
fad048861d use latest visual test data 2015-05-20 14:23:28 -07:00
Blake Thompson
60ec991b2c Merge pull request #2837 from mapnik/correct
Geometry Correct
2015-05-20 16:21:47 -05:00
Dane Springmeyer
ec8f1620e5 correct polygons in topojson and osm plugins too 2015-05-20 14:09:52 -07:00
Dane Springmeyer
84e4d8bf22 Start calling geometry::correct everywhere possible - refs #2834 2015-05-20 14:00:30 -07:00
Dane Springmeyer
0f8b379eea update visual tests after mapnik/test-data-visual#1 2015-05-20 11:24:01 -07:00
Blake Thompson
f964046c19 Merge pull request #2830 from mapnik/clamp_multi
Rename set_alpha and multiply_alpha
2015-05-20 13:15:45 -05:00
Blake Thompson
05b4ea4955 Removed multiply_opacity 2015-05-20 13:14:44 -05:00
Blake Thompson
2031215247 Renamed set_opacity to apply_opacity, reverted it to the old logic of set_alpha. Updated tests, clamping is now used. 2015-05-20 13:08:18 -05:00
Dane Springmeyer
786dc49a6b update visual tests 2015-05-20 10:59:08 -07:00
Blake Thompson
b68d079255 Changed the name of the set_alpha and multiply_alpha to be set_opacity and multiply_opacity 2015-05-20 12:39:01 -05:00
Blake Thompson
25c6576fdd Updated the way that multiply_alpha works, such that it is not clamped at the multiplier, but rather at the result of the multiplier and alpha. 2015-05-20 12:39:00 -05:00
Dane Springmeyer
5d7c43457e Merge pull request #2825 from mapycz/improve-interior
improve interior placement
2015-05-20 10:37:39 -07:00
Dane Springmeyer
6537183f86 Merge pull request #2827 from mapycz/visual-tests-parallel
visual tests: set number of parallel threads by JOBS environment variable
2015-05-20 10:17:00 -07:00
Dane Springmeyer
6a7d785557 Merge pull request #2826 from mapycz/improve-visual-test-3
improve visual tests
2015-05-20 10:16:52 -07:00
Dane Springmeyer
adf85264c1 Merge pull request #2832 from afflerbach/unused-nodes-error-message
Message about unused text nodes now also contains line numbers.
2015-05-20 10:08:21 -07:00