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

disable the hsla image-filter - not yet ready for primetime

Browse source
This commit is contained in:
Dane Springmeyer 2013-04-16 19:09:40 -07:00
parent 60eee883e5
commit 294b10229e
5 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mapnik/image_filter.hpp
View file

@ -483,6 +483,7 @@ void apply_filter(Src & src, colorize_alpha const& op)
}
}
/*
template <typename Src>
void apply_filter(Src & src, hsla const& transform)
{
@ -572,6 +573,7 @@ void apply_filter(Src & src, hsla const& transform)
}
}
}
*/
template <typename Src>
void apply_filter(Src & src, gray const& op)

4
include/mapnik/image_filter_grammar.hpp
View file

@ -67,8 +67,8 @@ struct image_filter_grammar :
qi::rule<Iterator, ContType(), qi::ascii::space_type> start;
qi::rule<Iterator, ContType(), qi::ascii::space_type> filter;
qi::rule<Iterator, qi::locals<int,int>, void(ContType&), qi::ascii::space_type> agg_blur_filter;
qi::rule<Iterator, qi::locals<double,double,double,double,double,double,double,double>,
void(ContType&), qi::ascii::space_type> hsla_filter;
//qi::rule<Iterator, qi::locals<double,double,double,double,double,double,double,double>,
// void(ContType&), qi::ascii::space_type> hsla_filter;
qi::rule<Iterator, qi::locals<mapnik::filter::colorize_alpha, mapnik::filter::color_stop>, void(ContType&), qi::ascii::space_type> colorize_alpha_filter;
qi::rule<Iterator, qi::ascii::space_type> no_args;
qi::uint_parser< unsigned, 10, 1, 3 > radius_;

6
include/mapnik/image_filter_types.hpp
View file

@ -54,6 +54,7 @@ struct agg_stack_blur
unsigned ry;
};
/*
struct hsla
{
hsla(double _h0, double _h1,
@ -97,6 +98,7 @@ struct hsla
double a0;
double a1;
};
*/
struct color_stop
{
@ -122,7 +124,7 @@ typedef boost::variant<filter::blur,
filter::x_gradient,
filter::y_gradient,
filter::invert,
filter::hsla,
//filter::hsla,
filter::colorize_alpha> filter_type;
inline std::ostream& operator<< (std::ostream& os, blur)
@ -143,6 +145,7 @@ inline std::ostream& operator<< (std::ostream& os, agg_stack_blur const& filter)
return os;
}
/*
inline std::ostream& operator<< (std::ostream& os, hsla const& filter)
{
os << "hsla(" << filter.h0 << 'x' << filter.h1 << ':'
@ -151,6 +154,7 @@ inline std::ostream& operator<< (std::ostream& os, hsla const& filter)
<< filter.a0 << 'x' << filter.a1 << ')';
return os;
}
*/
inline std::ostream& operator<< (std::ostream& os, emboss)
{

6
src/image_filter_grammar.cpp
View file

@ -88,8 +88,8 @@ image_filter_grammar<Iterator,ContType>::image_filter_grammar()
|
agg_blur_filter(_val)
|
hsla_filter(_val)
|
//hsla_filter(_val)
//|
colorize_alpha_filter(_val)
;
@ -100,6 +100,7 @@ image_filter_grammar<Iterator,ContType>::image_filter_grammar()
[push_back(_r1,construct<mapnik::filter::agg_stack_blur>(_a,_b))]
;
/*
hsla_filter = lit("hsla")
>> lit('(')
>> double_[_a = _1] >> lit('x') >> double_[_b = _1] >> lit(';')
@ -108,6 +109,7 @@ image_filter_grammar<Iterator,ContType>::image_filter_grammar()
>> double_[_g = _1] >> lit('x') >> double_[_h = _1] >> lit(')')
[push_back(_r1, construct<mapnik::filter::hsla>(_a,_b,_c,_d,_e,_f,_g,_h))]
;
*/
colorize_alpha_filter = lit("colorize-alpha")[_a = construct<mapnik::filter::colorize_alpha>()]
>> lit('(')

2
tests/visual_tests/test.py
View file

@ -53,7 +53,7 @@ files = [
{'name': "marker-on-line-spacing-eq-width-overlap", 'sizes':[(600,400)]},
{'name': "marker_line_placement_on_points"},
{'name': "marker-with-background-image", 'sizes':[(600,400),(400,600),(257,256)]},
{'name': "marker-with-background-image-and-hsla-transform", 'sizes':[(600,400),(400,600),(257,256)]},
#{'name': "marker-with-background-image-and-hsla-transform", 'sizes':[(600,400),(400,600),(257,256)]},
{'name': "marker-on-hex-grid", 'sizes':[(600,400),(400,600),(257,256)]},
{'name': "whole-centroid", 'sizes':[(600,400)],
'bbox': mapnik.Box2d(736908, 4390316, 2060771, 5942346)},