This commit is contained in:
Dane Springmeyer 2013-03-14 15:13:02 -07:00
parent 5e224bd705
commit 06803de192
6 changed files with 20 additions and 11 deletions

View file

@ -25,29 +25,36 @@
#define MAPNIK_CAIRO_CONTEXT_HPP #define MAPNIK_CAIRO_CONTEXT_HPP
// mapnik // mapnik
#include <mapnik/debug.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/box2d.hpp>
#include <mapnik/color.hpp> #include <mapnik/color.hpp>
#include <mapnik/stroke.hpp> #include <mapnik/stroke.hpp>
#include <mapnik/image_data.hpp> #include <mapnik/image_data.hpp>
#include <mapnik/image_compositing.hpp> #include <mapnik/image_compositing.hpp>
#include <mapnik/font_engine_freetype.hpp> #include <mapnik/font_engine_freetype.hpp>
#include <mapnik/font_set.hpp>
#include <mapnik/text_path.hpp>
#include <mapnik/text_properties.hpp>
#include <mapnik/gradient.hpp> #include <mapnik/gradient.hpp>
#include <mapnik/vertex.hpp>
#include <mapnik/noncopyable.hpp>
// boost // boost
#include <boost/utility.hpp>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
// cairo // cairo
#include <cairo.h> #include <cairo.h>
#include <cairo-ft.h> #include <cairo-ft.h>
// stl // stl
#include <valarray> #include <map>
#include <vector>
#include <stdexcept>
// agg // agg
#include "agg_basics.h" #include "agg_basics.h"
namespace mapnik { namespace mapnik {
class text_path;
typedef cairo_status_t ErrorStatus; typedef cairo_status_t ErrorStatus;
/// Throws the appropriate exception, if exceptions are enabled. /// Throws the appropriate exception, if exceptions are enabled.
@ -301,7 +308,7 @@ public:
void fill(); void fill();
void paint(); void paint();
void set_pattern(cairo_pattern const& pattern); void set_pattern(cairo_pattern const& pattern);
void set_gradient(cairo_gradient const& pattern, const box2d<double> &bbox); void set_gradient(cairo_gradient const& pattern, box2d<double> const& bbox);
void add_image(double x, double y, image_data_32 & data, double opacity = 1.0); void add_image(double x, double y, image_data_32 & data, double opacity = 1.0);
void add_image(agg::trans_affine const& tr, image_data_32 & data, double opacity = 1.0); void add_image(agg::trans_affine const& tr, image_data_32 & data, double opacity = 1.0);
void set_font_face(cairo_face_manager & manager, face_ptr face); void set_font_face(cairo_face_manager & manager, face_ptr face);

View file

@ -24,13 +24,14 @@
#define MAPNIK_MEMORY_FEATURESET_HPP #define MAPNIK_MEMORY_FEATURESET_HPP
// mapnik // mapnik
#include <mapnik/box2d.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/datasource.hpp> #include <mapnik/datasource.hpp>
#include <mapnik/memory_datasource.hpp> #include <mapnik/memory_datasource.hpp>
#include <mapnik/feature.hpp> #include <mapnik/feature.hpp>
#include <mapnik/raster.hpp> #include <mapnik/raster.hpp>
// boost #include <deque>
#include <boost/utility.hpp>
namespace mapnik { namespace mapnik {

View file

@ -56,7 +56,6 @@
#include "agg_image_accessors.h" #include "agg_image_accessors.h"
#include "agg_span_image_filter_rgba.h" #include "agg_span_image_filter_rgba.h"
// boost // boost
#include <boost/utility.hpp>
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>
#include <boost/math/special_functions/round.hpp> #include <boost/math/special_functions/round.hpp>

View file

@ -22,7 +22,11 @@
#include <mapnik/cairo_context.hpp> #include <mapnik/cairo_context.hpp>
#include <mapnik/font_util.hpp> #include <mapnik/font_util.hpp>
#include <mapnik/text_properties.hpp>
#include <mapnik/text_path.hpp>
#include <mapnik/font_set.hpp>
#include <valarray>
namespace mapnik { namespace mapnik {
cairo_face::cairo_face(boost::shared_ptr<freetype_engine> const& engine, face_ptr const& face) cairo_face::cairo_face(boost::shared_ptr<freetype_engine> const& engine, face_ptr const& face)

View file

@ -46,7 +46,6 @@
#include <mapnik/pixel_position.hpp> #include <mapnik/pixel_position.hpp>
// boost // boost
#include <boost/utility.hpp>
#include <boost/math/special_functions/round.hpp> #include <boost/math/special_functions/round.hpp>
// agg // agg

View file

@ -34,7 +34,6 @@
// boost // boost
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <boost/utility.hpp>
#include <boost/ptr_container/ptr_vector.hpp> #include <boost/ptr_container/ptr_vector.hpp>
#include <boost/tuple/tuple.hpp> #include <boost/tuple/tuple.hpp>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>