Permalink
Browse files

Revert "initialise blur radius's to 1 for real this time"

This reverts commit f76c6ee.
  • Loading branch information...
1 parent 975242e commit 1077b79a632453dc1c9fa7fb9930ccc03c0c326d @artemp artemp committed May 24, 2012
Showing with 10 additions and 23 deletions.
  1. +1 −2 bindings/python/mapnik_text_placement.cpp
  2. +8 −19 demo/viewer/viewer.pro
  3. +1 −2 include/mapnik/image_filter_types.hpp
@@ -193,8 +193,7 @@ 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;
- // FIXME c++11 : error: call to 'make_move_iterator' is ambiguous
- // children_.insert(children_.end(), begin, end);
+ children_.insert(children_.end(), begin, end);
}
/* TODO: Add constructor taking variable number of arguments.
View
@@ -1,29 +1,18 @@
######################################################################
# Mapnik viewer - Copyright (C) 2007 Artem Pavlenko
######################################################################
-QMAKE_CXX = /opt/llvm/bin/clang++
+CC = g++
TEMPLATE = app
-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 += /usr/local/include/
+INCLUDEPATH += /usr/boost/include/
+INCLUDEPATH += /usr/X11/include/
+INCLUDEPATH += /usr/X11/include/freetype2
INCLUDEPATH += .
-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
+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
# Input
@@ -43,8 +43,7 @@ struct agg_stack_blur
: rx(rx_),ry(ry_) {}
// an attempt to support older boost spirit (< 1.46)
agg_stack_blur()
- : rx(1),ry(1) {}
-
+ : rx(0),ry(0) {}
unsigned rx;
unsigned ry;
};

0 comments on commit 1077b79

Please sign in to comment.