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

initialise blur radius's to 1 for real this time

Browse source
This commit is contained in:
Artem Pavlenko 2012-05-23 20:37:31 +01:00
parent 4fc4535c95
commit f76c6ee25f
3 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bindings/python/mapnik_text_placement.cpp
View file

@ -193,7 +193,8 @@ struct ListNodeWrap: formatting::list_node, wrapper<formatting::list_node>
ListNodeWrap(object l) : formatting::list_node(), wrapper<formatting::list_node>()
{
stl_input_iterator<formatting::node_ptr> begin(l), end;
children_.insert(children_.end(), begin, end);
// FIXME c++11 : error: call to 'make_move_iterator' is ambiguous
// children_.insert(children_.end(), begin, end);
}
/* TODO: Add constructor taking variable number of arguments.

27
demo/viewer/viewer.pro
View file

@ -1,18 +1,29 @@
######################################################################
# Mapnik viewer - Copyright (C) 2007 Artem Pavlenko
######################################################################
CC = g++
QMAKE_CXX = /opt/llvm/bin/clang++
TEMPLATE = app
INCLUDEPATH += /usr/local/include/
INCLUDEPATH += /usr/boost/include/
INCLUDEPATH += /usr/X11/include/
INCLUDEPATH += /usr/X11/include/freetype2
INCLUDEPATH += /opt/mapnik/include/
INCLUDEPATH += /opt/boost_1_49_0/include/
INCLUDEPATH += /opt/mapnik_deps/include/
INCLUDEPATH += /opt/mapnik_deps/include/freetype2
### Cairo backend
INCLUDEPATH += /opt/mapnik_deps/include/cairo
INCLUDEPATH += /opt/mapnik_deps/include/cairomm-1.0
INCLUDEPATH += /opt/mapnik_deps/include/sigc++-2.0
INCLUDEPATH += /opt/mapnik_deps/lib/sigc++-2.0/include
###
INCLUDEPATH += /Users/artem/Projects/mapnik/deps/agg/include
INCLUDEPATH += .
QMAKE_CXXFLAGS +=' -DDARWIN -Wno-missing-field-initializers -ansi'
unix:LIBS = -L/usr/local/lib -L/usr/X11/lib -lmapnik -lfreetype
unix:LIBS += -lboost_system -licuuc -lboost_filesystem -lboost_regex
QMAKE_CXXFLAGS +='-DDARWIN -Wno-missing-field-initializers -fno-inline -ansi'
QMAKE_CXXFLAGS +=' -DHAVE_CAIRO'
unix:LIBS = -L/opt/mapnik/lib -L/opt/mapnik_deps/lib -lmapnik -lfreetype -L/opt/mapnik/lib
unix:LIBS += -lboost_system -licuuc -lboost_filesystem -lboost_regex -L/opt/boost_1_49_0/lib
unix:LIBS += -lcairo -lcairomm-1.0
# Input

3
include/mapnik/image_filter_types.hpp
View file

@ -43,7 +43,8 @@ struct agg_stack_blur
: rx(rx_),ry(ry_) {}
// an attempt to support older boost spirit (< 1.46)
agg_stack_blur()
: rx(0),ry(0) {}
: rx(1),ry(1) {}
unsigned rx;
unsigned ry;
};