apply fix from #2418 to 2.3.x branch
This commit is contained in:
parent
faa87d42e5
commit
c2385437f1
5 changed files with 23 additions and 1 deletions
|
@ -127,6 +127,8 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
void painted(bool painted);
|
void painted(bool painted);
|
||||||
|
bool painted();
|
||||||
|
|
||||||
inline eAttributeCollectionPolicy attribute_collection_policy() const
|
inline eAttributeCollectionPolicy attribute_collection_policy() const
|
||||||
{
|
{
|
||||||
return DEFAULT;
|
return DEFAULT;
|
||||||
|
|
|
@ -115,6 +115,12 @@ public:
|
||||||
// cairo renderer doesn't support processing of multiple symbolizers.
|
// cairo renderer doesn't support processing of multiple symbolizers.
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool painted()
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
void painted(bool /*painted*/)
|
void painted(bool /*painted*/)
|
||||||
{
|
{
|
||||||
// nothing to do
|
// nothing to do
|
||||||
|
|
|
@ -704,7 +704,7 @@ void feature_style_processor<Processor>::render_style(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
p.painted(was_painted);
|
p.painted(p.painted() | was_painted);
|
||||||
p.end_style_processing(*style);
|
p.end_style_processing(*style);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -114,14 +114,22 @@ public:
|
||||||
// grid renderer doesn't support processing of multiple symbolizers.
|
// grid renderer doesn't support processing of multiple symbolizers.
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool painted()
|
||||||
|
{
|
||||||
|
pixmap_.painted();
|
||||||
|
}
|
||||||
|
|
||||||
void painted(bool painted)
|
void painted(bool painted)
|
||||||
{
|
{
|
||||||
pixmap_.painted(painted);
|
pixmap_.painted(painted);
|
||||||
}
|
}
|
||||||
|
|
||||||
inline eAttributeCollectionPolicy attribute_collection_policy() const
|
inline eAttributeCollectionPolicy attribute_collection_policy() const
|
||||||
{
|
{
|
||||||
return DEFAULT;
|
return DEFAULT;
|
||||||
}
|
}
|
||||||
|
|
||||||
inline double scale_factor() const
|
inline double scale_factor() const
|
||||||
{
|
{
|
||||||
return scale_factor_;
|
return scale_factor_;
|
||||||
|
|
|
@ -457,6 +457,12 @@ void agg_renderer<T>::painted(bool painted)
|
||||||
pixmap_.painted(painted);
|
pixmap_.painted(painted);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
bool agg_renderer<T>::painted()
|
||||||
|
{
|
||||||
|
return pixmap_.painted();
|
||||||
|
}
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
void agg_renderer<T>::debug_draw_box(box2d<double> const& box,
|
void agg_renderer<T>::debug_draw_box(box2d<double> const& box,
|
||||||
double x, double y, double angle)
|
double x, double y, double angle)
|
||||||
|
|
Loading…
Add table
Reference in a new issue