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

Merge branch 'master' of https://github.com/mapnik/mapnik into statistics

Browse source
This commit is contained in:
Tom MacWright 2012-02-01 15:53:36 -05:00
commit 6f06316f28
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/agg/process_line_pattern_symbolizer.cpp
View file

@ -62,7 +62,13 @@ void agg_renderer<T>::process(line_pattern_symbolizer const& sym,
std::string filename = path_processor_type::evaluate( *sym.get_filename(), feature);
boost::optional<marker_ptr> mark = marker_cache::instance()->find(filename,true);
if (!mark || !(*mark)->is_bitmap()) return;
if (!mark) return;
if (!(*mark)->is_bitmap())
{
std::clog << "### Warning only images (not '" << filename << "') are supported in the line_pattern_symbolizer\n";
return;
}
boost::optional<image_ptr> pat = (*mark)->get_bitmap_data();

8
src/agg/process_polygon_pattern_symbolizer.cpp
View file

@ -103,7 +103,13 @@ void agg_renderer<T>::process(polygon_pattern_symbolizer const& sym,
std::clog << "### Warning: file not found: " << filename << "\n";
}
if (!marker || !(*marker)->is_bitmap()) return;
if (!marker) return;
if (!(*marker)->is_bitmap())
{
std::clog << "### Warning only images (not '" << filename << "') are supported in the polygon_pattern_symbolizer\n";
return;
}
boost::optional<image_ptr> pat = (*marker)->get_bitmap_data();