Revert "min compiler is g++ 4.8 - refs #2486"
This reverts commit 612b4a0207
.
This commit is contained in:
parent
47c9d77f8f
commit
dfaa860522
4 changed files with 2 additions and 10 deletions
|
@ -50,7 +50,7 @@ For troubleshooting help see https://github.com/mapnik/mapnik/wiki/InstallationT
|
||||||
|
|
||||||
Build system dependencies are:
|
Build system dependencies are:
|
||||||
|
|
||||||
* C++ compiler supporting `-std=c++11` (like >= g++ 4.8 or >= clang++ 3.4)
|
* C++ compiler (like g++ or clang++)
|
||||||
* >= 2 GB RAM (> 5 GB for g++)
|
* >= 2 GB RAM (> 5 GB for g++)
|
||||||
* Python 2.4-2.7
|
* Python 2.4-2.7
|
||||||
* Scons (a copy is bundled)
|
* Scons (a copy is bundled)
|
||||||
|
|
|
@ -65,7 +65,6 @@ void agg_renderer<T0,T1>::process(debug_symbolizer const& sym,
|
||||||
draw_rect(pixmap_, itr->box);
|
draw_rect(pixmap_, itr->box);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// TODO - random color per feature
|
|
||||||
else if (mode == DEBUG_SYM_MODE_VERTEX)
|
else if (mode == DEBUG_SYM_MODE_VERTEX)
|
||||||
{
|
{
|
||||||
for (auto const& geom : feature.paths())
|
for (auto const& geom : feature.paths())
|
||||||
|
|
|
@ -495,13 +495,6 @@ void map_parser::parse_fontset(Map & map, xml_node const& node)
|
||||||
{
|
{
|
||||||
success = true;
|
success = true;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
// https://github.com/mapnik/mapnik/issues/1791
|
|
||||||
MAPNIK_LOG_ERROR(fontset) << "warning: unable to find face-name '"
|
|
||||||
<< n.get_attr<std::string>("face-name","")
|
|
||||||
<< "' in FontSet '" << fontset.get_name() << "'";
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<!DOCTYPE Map>
|
<!DOCTYPE Map>
|
||||||
<Map background-color="white" srs="+proj=latlong +datum=WGS84"
|
<Map background-color="white" srs="+proj=latlong +datum=WGS84"
|
||||||
>
|
font-directory="../fonts/KhmerOS/">
|
||||||
|
|
||||||
<Layer name="layer" srs="+proj=latlong +datum=WGS84">
|
<Layer name="layer" srs="+proj=latlong +datum=WGS84">
|
||||||
<StyleName>My Style</StyleName>
|
<StyleName>My Style</StyleName>
|
||||||
|
|
Loading…
Add table
Reference in a new issue