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

modify agg conv classes to support type() member - closes #1607 refs #1604

Browse source
This commit is contained in:
Dane Springmeyer 2012-11-28 19:22:10 -08:00
parent a2d82af5c1
commit f2276d97a0
5 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
deps/agg/include/agg_conv_adaptor_vcgen.h vendored
View file

@ -29,6 +29,7 @@ namespace agg
void rewind(unsigned) {} void rewind(unsigned) {}
unsigned vertex(double*, double*) { return path_cmd_stop; } unsigned vertex(double*, double*) { return path_cmd_stop; }
unsigned type() const { return 0; }
}; };
@ -64,6 +65,7 @@ namespace agg
} }
unsigned vertex(double* x, double* y); unsigned vertex(double* x, double* y);
unsigned type() const { return m_source->type(); }
private: private:
// Prohibit copying // Prohibit copying

1
deps/agg/include/agg_conv_adaptor_vpgen.h vendored
View file

@ -33,6 +33,7 @@ namespace agg
void rewind(unsigned path_id); void rewind(unsigned path_id);
unsigned vertex(double* x, double* y); unsigned vertex(double* x, double* y);
unsigned type() const { return m_source->type(); }
private: private:
conv_adaptor_vpgen(const conv_adaptor_vpgen<VertexSource, VPGen>&); conv_adaptor_vpgen(const conv_adaptor_vpgen<VertexSource, VPGen>&);

1
deps/agg/include/agg_conv_clip_polygon.h vendored
View file

@ -51,6 +51,7 @@ namespace agg
double y1() const { return base_type::vpgen().y1(); } double y1() const { return base_type::vpgen().y1(); }
double x2() const { return base_type::vpgen().x2(); } double x2() const { return base_type::vpgen().x2(); }
double y2() const { return base_type::vpgen().y2(); } double y2() const { return base_type::vpgen().y2(); }
unsigned type() const { return base_type::type(); }
private: private:
conv_clip_polygon(const conv_clip_polygon<VertexSource>&); conv_clip_polygon(const conv_clip_polygon<VertexSource>&);

1
deps/agg/include/agg_conv_clip_polyline.h vendored
View file

@ -51,6 +51,7 @@ namespace agg
double y1() const { return base_type::vpgen().y1(); } double y1() const { return base_type::vpgen().y1(); }
double x2() const { return base_type::vpgen().x2(); } double x2() const { return base_type::vpgen().x2(); }
double y2() const { return base_type::vpgen().y2(); } double y2() const { return base_type::vpgen().y2(); }
unsigned type() const { return base_type::type(); }
private: private:
conv_clip_polyline(const conv_clip_polyline<VertexSource>&); conv_clip_polyline(const conv_clip_polyline<VertexSource>&);

2
deps/agg/include/agg_conv_smooth_poly1.h vendored
View file

@ -42,6 +42,7 @@ namespace agg
void smooth_value(double v) { base_type::generator().smooth_value(v); } void smooth_value(double v) { base_type::generator().smooth_value(v); }
double smooth_value() const { return base_type::generator().smooth_value(); } double smooth_value() const { return base_type::generator().smooth_value(); }
unsigned type() const { return base_type::type(); }
private: private:
conv_smooth_poly1(const conv_smooth_poly1<VertexSource>&); conv_smooth_poly1(const conv_smooth_poly1<VertexSource>&);
@ -64,6 +65,7 @@ namespace agg
void smooth_value(double v) { m_smooth.generator().smooth_value(v); } void smooth_value(double v) { m_smooth.generator().smooth_value(v); }
double smooth_value() const { return m_smooth.generator().smooth_value(); } double smooth_value() const { return m_smooth.generator().smooth_value(); }
unsigned type() const { return m_smooth.type(); }
private: private:
conv_smooth_poly1_curve(const conv_smooth_poly1_curve<VertexSource>&); conv_smooth_poly1_curve(const conv_smooth_poly1_curve<VertexSource>&);