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

remove tabs

Browse source
This commit is contained in:
Dane Springmeyer 2011-04-01 20:47:26 +00:00
parent b65c932ac0
commit c1a6a54060
14 changed files with 76 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/jpeg_reader.cpp
View file

@ -56,7 +56,7 @@ namespace mapnik
~JpegReader();
unsigned width() const;
unsigned height() const;
void read(unsigned x,unsigned y,image_data_32& image);
void read(unsigned x,unsigned y,image_data_32& image);
private:
void init();
};

1
src/libxml2_loader.cpp
View file

@ -155,7 +155,6 @@ public:
xmlFreeDoc(doc);
throw config_error("XML XInclude error. One or more files failed to load.");
}
xmlNode * root = xmlDocGetRootElement( doc );
if ( ! root ) {

10
src/svg/process_building_symbolizer.cpp
View file

@ -28,13 +28,13 @@ namespace mapnik
{
template <typename T>
void svg_renderer<T>::process(building_symbolizer const& sym,
Feature const& feature,
proj_transform const& prj_trans)
Feature const& feature,
proj_transform const& prj_trans)
{
// nothing yet.
// nothing yet.
}
template void svg_renderer<std::ostream_iterator<char> >::process(building_symbolizer const& sym,
Feature const& feature,
proj_transform const& prj_trans);
Feature const& feature,
proj_transform const& prj_trans);
}

10
src/svg/process_glyph_symbolizer.cpp
View file

@ -28,13 +28,13 @@ namespace mapnik
{
template <typename T>
void svg_renderer<T>::process(glyph_symbolizer const& sym,
Feature const& feature,
proj_transform const& prj_trans)
Feature const& feature,
proj_transform const& prj_trans)
{
// nothing yet.
// nothing yet.
}
template void svg_renderer<std::ostream_iterator<char> >::process(glyph_symbolizer const& sym,
Feature const& feature,
proj_transform const& prj_trans);
Feature const& feature,
proj_transform const& prj_trans);
}

10
src/svg/process_line_pattern_symbolizer.cpp
View file

@ -28,13 +28,13 @@ namespace mapnik
{
template <typename T>
void svg_renderer<T>::process(line_pattern_symbolizer const& sym,
Feature const& feature,
proj_transform const& prj_trans)
Feature const& feature,
proj_transform const& prj_trans)
{
// nothing yet.
// nothing yet.
}
template void svg_renderer<std::ostream_iterator<char> >::process(line_pattern_symbolizer const& sym,
Feature const& feature,
proj_transform const& prj_trans);
Feature const& feature,
proj_transform const& prj_trans);
}

22
src/svg/process_line_symbolizer.cpp
View file

@ -31,19 +31,19 @@ namespace mapnik
*/
template <typename T>
void svg_renderer<T>::process(line_symbolizer const& sym,
Feature const& feature,
proj_transform const& prj_trans)
Feature const& feature,
proj_transform const& prj_trans)
{
path_attributes_.set_stroke_color(sym.get_stroke().get_color());
path_attributes_.set_stroke_opacity(sym.get_stroke().get_opacity());
path_attributes_.set_stroke_width(sym.get_stroke().get_width());
path_attributes_.set_stroke_linecap(sym.get_stroke().get_line_cap());
path_attributes_.set_stroke_linejoin(sym.get_stroke().get_line_join());
path_attributes_.set_stroke_dasharray(sym.get_stroke().get_dash_array());
path_attributes_.set_stroke_dashoffset(sym.get_stroke().dash_offset());
path_attributes_.set_stroke_color(sym.get_stroke().get_color());
path_attributes_.set_stroke_opacity(sym.get_stroke().get_opacity());
path_attributes_.set_stroke_width(sym.get_stroke().get_width());
path_attributes_.set_stroke_linecap(sym.get_stroke().get_line_cap());
path_attributes_.set_stroke_linejoin(sym.get_stroke().get_line_join());
path_attributes_.set_stroke_dasharray(sym.get_stroke().get_dash_array());
path_attributes_.set_stroke_dashoffset(sym.get_stroke().dash_offset());
}
template void svg_renderer<std::ostream_iterator<char> >::process(line_symbolizer const& sym,
Feature const& feature,
proj_transform const& prj_trans);
Feature const& feature,
proj_transform const& prj_trans);
}

10
src/svg/process_markers_symbolizer.cpp
View file

@ -28,13 +28,13 @@ namespace mapnik
{
template <typename T>
void svg_renderer<T>::process(markers_symbolizer const& sym,
Feature const& feature,
proj_transform const& prj_trans)
Feature const& feature,
proj_transform const& prj_trans)
{
// nothing yet.
// nothing yet.
}
template void svg_renderer<std::ostream_iterator<char> >::process(markers_symbolizer const& sym,
Feature const& feature,
proj_transform const& prj_trans);
Feature const& feature,
proj_transform const& prj_trans);
}

10
src/svg/process_point_symbolizer.cpp
View file

@ -28,13 +28,13 @@ namespace mapnik
{
template <typename T>
void svg_renderer<T>::process(point_symbolizer const& sym,
Feature const& feature,
proj_transform const& prj_trans)
Feature const& feature,
proj_transform const& prj_trans)
{
// nothing yet.
// nothing yet.
}
template void svg_renderer<std::ostream_iterator<char> >::process(point_symbolizer const& sym,
Feature const& feature,
proj_transform const& prj_trans);
Feature const& feature,
proj_transform const& prj_trans);
}

10
src/svg/process_polygon_pattern_symbolizer.cpp
View file

@ -28,13 +28,13 @@ namespace mapnik
{
template <typename T>
void svg_renderer<T>::process(polygon_pattern_symbolizer const& sym,
Feature const& feature,
proj_transform const& prj_trans)
Feature const& feature,
proj_transform const& prj_trans)
{
// nothing yet.
// nothing yet.
}
template void svg_renderer<std::ostream_iterator<char> >::process(polygon_pattern_symbolizer const& sym,
Feature const& feature,
proj_transform const& prj_trans);
Feature const& feature,
proj_transform const& prj_trans);
}

12
src/svg/process_polygon_symbolizer.cpp
View file

@ -31,14 +31,14 @@ namespace mapnik
*/
template <typename T>
void svg_renderer<T>::process(polygon_symbolizer const& sym,
Feature const& feature,
proj_transform const& prj_trans)
Feature const& feature,
proj_transform const& prj_trans)
{
path_attributes_.set_fill_color(sym.get_fill());
path_attributes_.set_fill_opacity(sym.get_opacity());
path_attributes_.set_fill_color(sym.get_fill());
path_attributes_.set_fill_opacity(sym.get_opacity());
}
template void svg_renderer<std::ostream_iterator<char> >::process(polygon_symbolizer const& sym,
Feature const& feature,
proj_transform const& prj_trans);
Feature const& feature,
proj_transform const& prj_trans);
}

10
src/svg/process_raster_symbolizer.cpp
View file

@ -28,13 +28,13 @@ namespace mapnik
{
template <typename T>
void svg_renderer<T>::process(raster_symbolizer const& sym,
Feature const& feature,
proj_transform const& prj_trans)
Feature const& feature,
proj_transform const& prj_trans)
{
// nothing yet.
// nothing yet.
}
template void svg_renderer<std::ostream_iterator<char> >::process(raster_symbolizer const& sym,
Feature const& feature,
proj_transform const& prj_trans);
Feature const& feature,
proj_transform const& prj_trans);
}

6
src/svg/process_shield_symbolizer.cpp
View file

@ -31,10 +31,10 @@ namespace mapnik
Feature const& feature,
proj_transform const& prj_trans)
{
// nothing yet.
// nothing yet.
}
template void svg_renderer<std::ostream_iterator<char> >::process(shield_symbolizer const& sym,
Feature const& feature,
proj_transform const& prj_trans);
Feature const& feature,
proj_transform const& prj_trans);
}

10
src/svg/process_text_symbolizer.cpp
View file

@ -28,13 +28,13 @@ namespace mapnik
{
template <typename T>
void svg_renderer<T>::process(text_symbolizer const& sym,
Feature const& feature,
proj_transform const& prj_trans)
Feature const& feature,
proj_transform const& prj_trans)
{
// nothing yet.
// nothing yet.
}
template void svg_renderer<std::ostream_iterator<char> >::process(text_symbolizer const& sym,
Feature const& feature,
proj_transform const& prj_trans);
Feature const& feature,
proj_transform const& prj_trans);
}

31
src/svg/svg_generator.cpp
View file

@ -33,8 +33,7 @@ namespace mapnik { namespace svg {
template <typename OutputIterator>
svg_generator<OutputIterator>::svg_generator(OutputIterator& output_iterator)
: output_iterator_(output_iterator)
{}
: output_iterator_(output_iterator) {}
template <typename OutputIterator>
svg_generator<OutputIterator>::~svg_generator() {}
@ -42,40 +41,40 @@ namespace mapnik { namespace svg {
template <typename OutputIterator>
void svg_generator<OutputIterator>::generate_header()
{
karma::generate(output_iterator_, lit("<?xml version=\"1.0\" standalone=\"no\"?>\n"));
karma::generate(output_iterator_, lit("<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n"));
karma::generate(output_iterator_, lit("<?xml version=\"1.0\" standalone=\"no\"?>\n"));
karma::generate(output_iterator_, lit("<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n"));
}
template <typename OutputIterator>
void svg_generator<OutputIterator>::generate_opening_root(root_output_attributes const& root_attributes)
{
root_attributes_grammar attributes_grammar;
karma::generate(output_iterator_, lit("<svg ") << attributes_grammar << lit(">\n"), root_attributes);
root_attributes_grammar attributes_grammar;
karma::generate(output_iterator_, lit("<svg ") << attributes_grammar << lit(">\n"), root_attributes);
}
template <typename OutputIterator>
void svg_generator<OutputIterator>::generate_closing_root()
{
karma::generate(output_iterator_, lit("</svg>"));
karma::generate(output_iterator_, lit("</svg>"));
}
template <typename OutputIterator>
void svg_generator<OutputIterator>::generate_rect(rect_output_attributes const& rect_attributes)
{
rect_attributes_grammar attributes_grammar;
karma::generate(output_iterator_, lit("<rect ") << attributes_grammar << lit("/>\n"), rect_attributes);
rect_attributes_grammar attributes_grammar;
karma::generate(output_iterator_, lit("<rect ") << attributes_grammar << lit("/>\n"), rect_attributes);
}
template <typename OutputIterator>
void svg_generator<OutputIterator>::generate_path(path_type const& path, path_output_attributes const& path_attributes)
{
{
path_data_grammar data_grammar(path);
path_attributes_grammar attributes_grammar;
path_dash_array_grammar dash_array_grammar;
karma::generate(output_iterator_, lit("<path ") << data_grammar, path);
karma::generate(output_iterator_, lit(" ") << dash_array_grammar, path_attributes.stroke_dasharray());
karma::generate(output_iterator_, lit(" ") << attributes_grammar << lit("/>\n"), path_attributes);
path_attributes_grammar attributes_grammar;
path_dash_array_grammar dash_array_grammar;
karma::generate(output_iterator_, lit("<path ") << data_grammar, path);
karma::generate(output_iterator_, lit(" ") << dash_array_grammar, path_attributes.stroke_dasharray());
karma::generate(output_iterator_, lit(" ") << attributes_grammar << lit("/>\n"), path_attributes);
}
template class svg_generator<std::ostream_iterator<char> >;