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

cleanup + rename svg_transform parser

Browse source
This commit is contained in:
Dane Springmeyer 2014-04-30 10:55:46 -07:00
parent 97a45f21bb
commit 356cc85ad8
3 changed files with 7 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/mapnik/svg/svg_path_parser.hpp
View file

@ -35,11 +35,8 @@ namespace mapnik { namespace svg {
bool parse_points(const char * wkt, PathType & p);
template <typename TransformType>
bool MAPNIK_DECL parse_transform(const char * wkt, TransformType & tr);
bool MAPNIK_DECL parse_svg_transform(const char * wkt, TransformType & tr);
//template <typename TransformType>
//bool MAPNIK_DECL parse_transform(std::string const& wkt, TransformType & tr);
}}
}}
#endif // MAPNIK_SVG_PATH_PARSER_HPP

4
src/svg/svg_parser.cpp
View file

@ -303,7 +303,7 @@ void parse_attr(svg_parser & parser, const xmlChar * name, const xmlChar * value
if (xmlStrEqual(name, BAD_CAST "transform"))
{
agg::trans_affine tr;
mapnik::svg::parse_transform((const char*) value,tr);
mapnik::svg::parse_svg_transform((const char*) value,tr);
parser.path_.transform().premultiply(tr);
}
else if (xmlStrEqual(name, BAD_CAST "fill"))
@ -911,7 +911,7 @@ bool parse_common_gradient(svg_parser & parser, xmlTextReaderPtr reader)
if (value)
{
agg::trans_affine tr;
mapnik::svg::parse_transform((const char*) value,tr);
mapnik::svg::parse_svg_transform((const char*) value,tr);
parser.temporary_gradient_.second.set_transform(tr);
xmlFree(value);
}

24
src/svg/svg_transform_parser.cpp
View file

@ -23,8 +23,6 @@
// mapnik
#include <mapnik/svg/svg_path_parser.hpp>
#include <mapnik/svg/svg_transform_grammar.hpp>
// agg
#include "agg_trans_affine.h"
// stl
#include <string>
#include <cstring>
@ -32,7 +30,7 @@
namespace mapnik { namespace svg {
template <typename TransformType>
bool parse_transform(const char * wkt, TransformType & p)
bool parse_svg_transform(const char * wkt, TransformType & p)
{
using namespace boost::spirit;
typedef const char * iterator_type;
@ -43,21 +41,5 @@ namespace mapnik { namespace svg {
return qi::phrase_parse(first, last, g, skip_type());
}
/*
template <typename TransformType>
bool parse_transform(std::string const& wkt, TransformType & p)
{
using namespace boost::spirit;
typedef std::string::const_iterator iterator_type;
typedef ascii::space_type skip_type;
svg_transform_grammar<iterator_type,skip_type,TransformType> g(p);
iterator_type first = wkt.begin();
iterator_type last = wkt.end();
return qi::phrase_parse(first, last, g, skip_type());
}
*/
template MAPNIK_DECL bool parse_transform<agg::trans_affine>(const char*, agg::trans_affine&);
//template bool parse_transform<agg::trans_affine>(std::string const& , agg::trans_affine&);
}}
template MAPNIK_DECL bool parse_svg_transform<agg::trans_affine>(const char*, agg::trans_affine&);
}}