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

use more forward declares in renderer headers to speed up compiles of process cpp files

Browse source
This commit is contained in:
Dane Springmeyer 2013-01-04 09:17:58 -08:00
parent c705fbff80
commit 2d7c7fed9b
3 changed files with 57 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
include/mapnik/agg_renderer.hpp
View file

@ -24,33 +24,33 @@
#define MAPNIK_AGG_RENDERER_HPP #define MAPNIK_AGG_RENDERER_HPP
// mapnik // mapnik
#include <mapnik/config.hpp> #include <mapnik/config.hpp> // for MAPNIK_DECL
#include <mapnik/feature_style_processor.hpp> #include <mapnik/feature_style_processor.hpp>
#include <mapnik/font_engine_freetype.hpp> #include <mapnik/font_engine_freetype.hpp> // for face_manager, etc
#include <mapnik/label_collision_detector.hpp> #include <mapnik/noncopyable.hpp> // for noncopyable
#include <mapnik/map.hpp> #include <mapnik/rule.hpp> // for rule, symbolizers
#include <mapnik/rule.hpp> // for all symbolizers #include <mapnik/box2d.hpp> // for box2d
#include <mapnik/noncopyable.hpp> #include <mapnik/color.hpp> // for color
#include <mapnik/ctrans.hpp> // for CoordTransform
#include <mapnik/image_compositing.hpp> // for composite_mode_e
// boost // boost
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <boost/optional.hpp>
// FIXME namespace agg { struct trans_affine; }
// forward declare so that namespace mapnik { class Map; }
// apps using mapnik do not namespace mapnik { class feature_impl; }
// need agg headers namespace mapnik { class feature_type_style; }
namespace agg { namespace mapnik { class label_collision_detector4; }
struct trans_affine; namespace mapnik { class layer; }
} namespace mapnik { class marker; }
namespace mapnik { class proj_transform; }
namespace mapnik { struct rasterizer; }
struct pixel_position;
namespace mapnik { namespace mapnik {
class marker;
struct rasterizer;
template <typename T> template <typename T>
class MAPNIK_DECL agg_renderer : public feature_style_processor<agg_renderer<T> >, class MAPNIK_DECL agg_renderer : public feature_style_processor<agg_renderer<T> >,
private mapnik::noncopyable private mapnik::noncopyable

30
include/mapnik/grid/grid_renderer.hpp
View file

@ -27,29 +27,31 @@
#include <mapnik/config.hpp> #include <mapnik/config.hpp>
#include <mapnik/feature_style_processor.hpp> #include <mapnik/feature_style_processor.hpp>
#include <mapnik/font_engine_freetype.hpp> #include <mapnik/font_engine_freetype.hpp>
#include <mapnik/label_collision_detector.hpp>
#include <mapnik/map.hpp>
#include <mapnik/rule.hpp> // for all symbolizers
#include <mapnik/grid/grid.hpp> #include <mapnik/grid/grid.hpp>
#include <mapnik/noncopyable.hpp> #include <mapnik/noncopyable.hpp>
#include <mapnik/rule.hpp> // for rule, symbolizers
#include <mapnik/box2d.hpp> // for box2d
#include <mapnik/color.hpp> // for color
#include <mapnik/ctrans.hpp> // for CoordTransform
#include <mapnik/image_compositing.hpp> // for composite_mode_e
// boost // boost
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp>
// FIXME namespace agg { struct trans_affine; }
// forward declare so that namespace mapnik { class Map; }
// apps using mapnik do not namespace mapnik { class feature_impl; }
// need agg headers namespace mapnik { class feature_type_style; }
namespace agg { namespace mapnik { class label_collision_detector4; }
struct trans_affine; namespace mapnik { class layer; }
} namespace mapnik { class marker; }
namespace mapnik { class proj_transform; }
namespace mapnik { struct grid_rasterizer; }
struct pixel_position;
namespace mapnik { namespace mapnik {
class marker;
struct grid_rasterizer;
template <typename T> template <typename T>
class MAPNIK_DECL grid_renderer : public feature_style_processor<grid_renderer<T> >, class MAPNIK_DECL grid_renderer : public feature_style_processor<grid_renderer<T> >,
private mapnik::noncopyable private mapnik::noncopyable

24
include/mapnik/svg/output/svg_renderer.hpp
View file

@ -24,15 +24,37 @@
#define MAPNIK_SVG_RENDERER_HPP #define MAPNIK_SVG_RENDERER_HPP
// mapnik // mapnik
#include <mapnik/config.hpp>
#include <mapnik/feature_style_processor.hpp> #include <mapnik/feature_style_processor.hpp>
#include <mapnik/map.hpp> #include <mapnik/font_engine_freetype.hpp>
#include <mapnik/svg/output/svg_generator.hpp> #include <mapnik/svg/output/svg_generator.hpp>
#include <mapnik/svg/output/svg_output_attributes.hpp> #include <mapnik/svg/output/svg_output_attributes.hpp>
#include <mapnik/noncopyable.hpp> #include <mapnik/noncopyable.hpp>
#include <mapnik/rule.hpp> // for rule, symbolizers
#include <mapnik/box2d.hpp> // for box2d
#include <mapnik/color.hpp> // for color
#include <mapnik/ctrans.hpp> // for CoordTransform
#include <mapnik/image_compositing.hpp> // for composite_mode_e
// boost
#include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp>
// stl // stl
#include <string> #include <string>
namespace agg { struct trans_affine; }
namespace mapnik { class Map; }
namespace mapnik { class feature_impl; }
namespace mapnik { class feature_type_style; }
namespace mapnik { class label_collision_detector4; }
namespace mapnik { class layer; }
namespace mapnik { class marker; }
namespace mapnik { class proj_transform; }
namespace mapnik { struct grid_rasterizer; }
struct pixel_position;
namespace mapnik namespace mapnik
{ {
// parameterized with the type of output iterator it will use for output. // parameterized with the type of output iterator it will use for output.