sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
9417 commits 112 branches 95 tags 181 MiB
Commit graph

9417 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dane Springmeyer
84166882d9 minimum boost version is 1.47 - remove obsolete code handling older versions 2014-01-27 13:19:21 -08:00
Dane Springmeyer
1c16b3797d update expected tests after #2117 2014-01-27 13:18:42 -08:00
Dane Springmeyer
18dbf34b72 remove env clone and instead just push DHAVE_LIBXML2 into main CPPDEFINES 2014-01-27 12:25:51 -08:00
Dane Springmeyer
777e067770 remove workaround for boost less than 1.46 since 1.47 is now the min needed - refs #1082 2014-01-27 12:24:20 -08:00
Dane Springmeyer
587a1c1bff remove compile workaround for old OS X gcc since we only support c++11/clang++ now at Mapnik 3.x - refs #1835 2014-01-27 12:23:33 -08:00
Dane Springmeyer
dec15c257b geometry envelope: calculate size once 2014-01-27 12:19:49 -08:00
Dane Springmeyer
43f9aa36ac Merge pull request #2134 from mapnik/no-predefined-terminals 
Use BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
 2014-01-27 12:08:41 -08:00
Dane Springmeyer
c5aad93428 fix topojson compile and centralize confix workaround 2014-01-26 16:19:27 -08:00
Dane Springmeyer
d82d9d382f fix compile with BOOST_SPIRIT_NO_PREDEFINED_TERMINALS 2014-01-26 16:06:32 -08:00
Dane Springmeyer
63ea37b4c2 further no terminal port 2014-01-26 14:49:03 -08:00
Dane Springmeyer
cd24a7b877 Merge branch 'master' of github.com:mapnik/mapnik into expr-v2 
Conflicts:
	tests/cpp_tests/svg_renderer_tests/path_element_test.cpp
 2014-01-26 14:12:03 -08:00
Dane Springmeyer
87e0ae8124 adapt build to use BOOST_SPIRIT_NO_PREDEFINED_TERMINALS 2014-01-26 14:00:58 -08:00
Dane Springmeyer
7b58b26df1 catch another addLayer -> add_layer case 2014-01-26 13:51:16 -08:00
Dane Springmeyer
0fc7b8bc01 include <array> header for std::array 2014-01-26 13:45:29 -08:00
Dane Springmeyer
29e7b19007 boost::array -> std::array 2014-01-26 13:44:30 -08:00
Dane Springmeyer
8181aa9dec addLayer -> add_layer (change also coming in expr-v2 branch) 2014-01-26 13:41:30 -08:00
Dane Springmeyer
9944ca65ee fix -pthread issue on linux - closes #2132 2014-01-23 13:07:14 -08:00
Dane Springmeyer
f8ea04f85f fix -pthread issue on linux - closes #2132 2014-01-23 13:06:07 -08:00
Dane Springmeyer
afb287633b update expected test images after fix from #2117 2014-01-23 11:38:09 -08:00
Dane Springmeyer
1155a6e33d better library sort 2014-01-23 00:42:41 -08:00
Dane Springmeyer
cd4c645032 boost threads are no longer needed 2014-01-23 00:42:05 -08:00
Dane Springmeyer
499d485151 another try to fix linking order on linux 2014-01-23 00:13:39 -08:00
Dane Springmeyer
17434992d1 update a few expected visual tests 2014-01-22 22:58:41 -08:00
Dane Springmeyer
83bde5fef2 use premultiplied renderer for points/shields - closes #2117 2014-01-22 22:44:33 -08:00
Dane Springmeyer
7bcbcb0c4f use premultiplied renderer for points/shields - closes #2117 2014-01-22 22:44:04 -08:00
Dane Springmeyer
4731baab93 use premultiplied renderer for points/shields - closes #2117 2014-01-22 22:43:34 -08:00
Dane Springmeyer
b3ca4fb15f fix cairo road-casings-non-grouped-rendering test by matching agg clipping behavior 2014-01-22 22:24:47 -08:00
Dane Springmeyer
7520c15e86 Merge branch 'master' of github.com:mapnik/mapnik into expr-v2 2014-01-22 20:48:07 -08:00
Dane Springmeyer
047373772d update a few expected test images 2014-01-22 20:46:18 -08:00
Dane Springmeyer
328df74c13 correct include for std::min/max 2014-01-22 17:02:28 -08:00
Dane Springmeyer
3bd9e1b283 correct include for std::min/max 2014-01-22 17:01:38 -08:00
Dane Springmeyer
97d737fa7b scons: fix variable name 2014-01-22 00:10:28 -08:00
Dane Springmeyer
4742aea92b scons: fix variable name 2014-01-22 00:10:11 -08:00
Dane Springmeyer
7ad2e5b43d finish support for disabling soname on linux 2014-01-21 21:35:10 -08:00
Dane Springmeyer
4fda93bf3e finish support for disabling soname on linux 2014-01-21 21:34:43 -08:00
Dane Springmeyer
fd6474b65e improve configure doc for FULL_LIB_PATH and ENABLE_SONAME 2014-01-21 21:15:57 -08:00
Dane Springmeyer
4e1423f8ce improve configure doc for FULL_LIB_PATH and ENABLE_SONAME 2014-01-21 21:15:28 -08:00
Dane Springmeyer
edd0f24997 add ENABLE_SONAME option + embed rpath/loader_path by default - closes #1225 2014-01-21 21:12:55 -08:00
Dane Springmeyer
7a2607a73f Merge branch 'expr-v2' of github.com:mapnik/mapnik into expr-v2 2014-01-21 21:02:22 -08:00
Dane Springmeyer
99bf263afd Merge branch 'master' of github.com:mapnik/mapnik into expr-v2 2014-01-21 21:01:48 -08:00
Dane Springmeyer
0e38731152 add ENABLE_SONAME option + embed rpath/loader_path by default - closes #1225 2014-01-20 20:16:08 -08:00
Dane Springmeyer
b50b534ab9 fix boost_regex icu detection on linux when statically linking 2014-01-20 17:47:23 -08:00
Dane Springmeyer
855a7149cb fix linux linking order in python bindings 
Conflicts:
	bindings/python/build.py
	src/build.py
 2014-01-20 17:47:08 -08:00
Dane Springmeyer
5153678876 fix linking order in svg c++ tests 
Conflicts:
	tests/cpp_tests/svg_renderer_tests/build.py
 2014-01-20 17:45:06 -08:00
Dane Springmeyer
cdaa31aa5e Revert "branch 2.3.x from master at v2.2.0-242-ge85cdda" 
This reverts commit 9e66317af1.
 2014-01-20 14:39:28 -08:00
Dane Springmeyer
fede08d4da fix boost_regex icu detection on linux when statically linking 2014-01-20 14:19:41 -08:00
Dane Springmeyer
2a826e7fc8 fix linux linking order in python bindings 2014-01-20 11:15:10 -08:00
Dane Springmeyer
75d5d9fd3c fix linking order in svg c++ tests 2014-01-20 11:07:18 -08:00
Dane Springmeyer
257fa3be54 fix jpeg reading regression after #1805 - closes #2123 (patch from @clundgren) 2014-01-20 12:53:35 +00:00
Dane Springmeyer
a9953fb385 fix relative paths in mapnik-config for fonts/plugins 2014-01-19 16:31:17 -08:00