sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

another attempt to satify windows

Browse source
This commit is contained in:
Dane Springmeyer 2016-07-28 12:55:55 -07:00
parent 4a480b18c9
commit 1c3d2907ba
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bootstrap.sh
View file

@ -10,7 +10,7 @@ todo
- shrink icu data - shrink icu data
' '
MASON_VERSION="b709931" MASON_VERSION="better-linking"
function setup_mason() { function setup_mason() {
if [[ ! -d ./.mason ]]; then if [[ ! -d ./.mason ]]; then
@ -29,7 +29,6 @@ function install() {
MASON_PLATFORM_ID=$(mason env MASON_PLATFORM_ID) MASON_PLATFORM_ID=$(mason env MASON_PLATFORM_ID)
if [[ ! -d ./mason_packages/${MASON_PLATFORM_ID}/${1}/${2} ]]; then if [[ ! -d ./mason_packages/${MASON_PLATFORM_ID}/${1}/${2} ]]; then
mason install $1 $2 mason install $1 $2
mason link $1 $2
if [[ ${3:-false} != false ]]; then if [[ ${3:-false} != false ]]; then
LA_FILE=$(mason prefix $1 $2)/lib/$3.la LA_FILE=$(mason prefix $1 $2)/lib/$3.la
if [[ -f ${LA_FILE} ]]; then if [[ -f ${LA_FILE} ]]; then
@ -39,6 +38,7 @@ function install() {
fi fi
fi fi
fi fi
mason link $1 $2
} }
ICU_VERSION="55.1" ICU_VERSION="55.1"

2
src/renderer_common/render_group_symbolizer.cpp
View file

@ -119,7 +119,7 @@ void render_group_symbolizer(group_symbolizer const& sym,
// symbolizers with avoid-edges set: only the avoid-edges of // symbolizers with avoid-edges set: only the avoid-edges of
// the group symbolizer itself should matter. // the group symbolizer itself should matter.
geometry::point<double> origin_pt(x,y); geometry::point<double> origin_pt(x,y);
sub_feature->set_geometry(std::move(origin_pt)); sub_feature->set_geometry(mapnik::geometry::geometry<double>(std::move(origin_pt)));
// get the layout for this set of properties // get the layout for this set of properties
for (auto const& rule : props->get_rules()) for (auto const& rule : props->get_rules())
{ {