rename ctrans.hpp to view_transform.hpp
This commit is contained in:
parent
de22d5900c
commit
ecfaec1027
26 changed files with 28 additions and 28 deletions
|
@ -3,7 +3,7 @@
|
||||||
#include "agg_conv_clip_polygon.h"
|
#include "agg_conv_clip_polygon.h"
|
||||||
#include <mapnik/geometry.hpp>
|
#include <mapnik/geometry.hpp>
|
||||||
#include <mapnik/vertex.hpp>
|
#include <mapnik/vertex.hpp>
|
||||||
#include <mapnik/ctrans.hpp>
|
#include <mapnik/view_transform.hpp>
|
||||||
#include <mapnik/graphics.hpp>
|
#include <mapnik/graphics.hpp>
|
||||||
#include <mapnik/wkt/wkt_factory.hpp>
|
#include <mapnik/wkt/wkt_factory.hpp>
|
||||||
#include <mapnik/wkt/wkt_grammar_impl.hpp>
|
#include <mapnik/wkt/wkt_grammar_impl.hpp>
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
#include <mapnik/layer.hpp>
|
#include <mapnik/layer.hpp>
|
||||||
#include <mapnik/map.hpp>
|
#include <mapnik/map.hpp>
|
||||||
#include <mapnik/projection.hpp>
|
#include <mapnik/projection.hpp>
|
||||||
#include <mapnik/ctrans.hpp>
|
#include <mapnik/view_transform.hpp>
|
||||||
#include <mapnik/feature_type_style.hpp>
|
#include <mapnik/feature_type_style.hpp>
|
||||||
#include "mapnik_enumeration.hpp"
|
#include "mapnik_enumeration.hpp"
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
#include <boost/python.hpp>
|
#include <boost/python.hpp>
|
||||||
|
|
||||||
// mapnik
|
// mapnik
|
||||||
#include <mapnik/ctrans.hpp>
|
#include <mapnik/view_transform.hpp>
|
||||||
|
|
||||||
using mapnik::view_transform;
|
using mapnik::view_transform;
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
#include <mapnik/layer.hpp>
|
#include <mapnik/layer.hpp>
|
||||||
#include <mapnik/projection.hpp>
|
#include <mapnik/projection.hpp>
|
||||||
#include <mapnik/scale_denominator.hpp>
|
#include <mapnik/scale_denominator.hpp>
|
||||||
#include <mapnik/ctrans.hpp>
|
#include <mapnik/view_transform.hpp>
|
||||||
#include <mapnik/memory_datasource.hpp>
|
#include <mapnik/memory_datasource.hpp>
|
||||||
#include <mapnik/feature_kv_iterator.hpp>
|
#include <mapnik/feature_kv_iterator.hpp>
|
||||||
//#include <mapnik/config_error.hpp>
|
//#include <mapnik/config_error.hpp>
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
#include <mapnik/rule.hpp> // for rule, symbolizers
|
#include <mapnik/rule.hpp> // for rule, symbolizers
|
||||||
#include <mapnik/box2d.hpp> // for box2d
|
#include <mapnik/box2d.hpp> // for box2d
|
||||||
#include <mapnik/color.hpp> // for color
|
#include <mapnik/color.hpp> // for color
|
||||||
#include <mapnik/ctrans.hpp> // for view_transform
|
#include <mapnik/view_transform.hpp> // for view_transform
|
||||||
#include <mapnik/image_compositing.hpp> // for composite_mode_e
|
#include <mapnik/image_compositing.hpp> // for composite_mode_e
|
||||||
#include <mapnik/pixel_position.hpp>
|
#include <mapnik/pixel_position.hpp>
|
||||||
#include <mapnik/request.hpp>
|
#include <mapnik/request.hpp>
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
#include <mapnik/rule.hpp> // for rule, symbolizers
|
#include <mapnik/rule.hpp> // for rule, symbolizers
|
||||||
#include <mapnik/box2d.hpp> // for box2d
|
#include <mapnik/box2d.hpp> // for box2d
|
||||||
#include <mapnik/color.hpp> // for color
|
#include <mapnik/color.hpp> // for color
|
||||||
#include <mapnik/ctrans.hpp> // for view_transform
|
#include <mapnik/view_transform.hpp> // for view_transform
|
||||||
#include <mapnik/image_compositing.hpp> // for composite_mode_e
|
#include <mapnik/image_compositing.hpp> // for composite_mode_e
|
||||||
#include <mapnik/pixel_position.hpp>
|
#include <mapnik/pixel_position.hpp>
|
||||||
#include <mapnik/renderer_common.hpp>
|
#include <mapnik/renderer_common.hpp>
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
#include <mapnik/marker_cache.hpp>
|
#include <mapnik/marker_cache.hpp>
|
||||||
#include <mapnik/text/placement_finder.hpp>
|
#include <mapnik/text/placement_finder.hpp>
|
||||||
#include <mapnik/proj_transform.hpp>
|
#include <mapnik/proj_transform.hpp>
|
||||||
#include <mapnik/ctrans.hpp>
|
#include <mapnik/view_transform.hpp>
|
||||||
|
|
||||||
namespace mapnik {
|
namespace mapnik {
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
#define MAPNIK_MARKERS_PLACEMENTS_LINE_HPP
|
#define MAPNIK_MARKERS_PLACEMENTS_LINE_HPP
|
||||||
|
|
||||||
#include <mapnik/markers_placements/point.hpp>
|
#include <mapnik/markers_placements/point.hpp>
|
||||||
#include <mapnik/ctrans.hpp>
|
#include <mapnik/view_transform.hpp>
|
||||||
#include <mapnik/debug.hpp>
|
#include <mapnik/debug.hpp>
|
||||||
#include <mapnik/global.hpp> //round
|
#include <mapnik/global.hpp> //round
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
#include <mapnik/config.hpp> // for MAPNIK_DECL
|
#include <mapnik/config.hpp> // for MAPNIK_DECL
|
||||||
#include <mapnik/font_engine_freetype.hpp> // for face_manager, etc
|
#include <mapnik/font_engine_freetype.hpp> // for face_manager, etc
|
||||||
#include <mapnik/box2d.hpp> // for box2d
|
#include <mapnik/box2d.hpp> // for box2d
|
||||||
#include <mapnik/ctrans.hpp> // for view_transform
|
#include <mapnik/view_transform.hpp> // for view_transform
|
||||||
#include <mapnik/attribute.hpp>
|
#include <mapnik/attribute.hpp>
|
||||||
|
|
||||||
// fwd declarations to speed up compile
|
// fwd declarations to speed up compile
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
// mapnik
|
// mapnik
|
||||||
#include <mapnik/global.hpp>
|
#include <mapnik/global.hpp>
|
||||||
#include <mapnik/geometry.hpp> // for container stuff
|
#include <mapnik/geometry.hpp> // for container stuff
|
||||||
#include <mapnik/ctrans.hpp> // for container stuff
|
#include <mapnik/view_transform.hpp> // for container stuff
|
||||||
#include <mapnik/util/path_iterator.hpp>
|
#include <mapnik/util/path_iterator.hpp>
|
||||||
#include <mapnik/util/container_adapter.hpp>
|
#include <mapnik/util/container_adapter.hpp>
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
#define MAPNIK_SVG_GENERATOR_HPP
|
#define MAPNIK_SVG_GENERATOR_HPP
|
||||||
|
|
||||||
// mapnik
|
// mapnik
|
||||||
#include <mapnik/ctrans.hpp>
|
#include <mapnik/view_transform.hpp>
|
||||||
#include <mapnik/color.hpp>
|
#include <mapnik/color.hpp>
|
||||||
#include <mapnik/geometry.hpp>
|
#include <mapnik/geometry.hpp>
|
||||||
#include <mapnik/svg/geometry_svg_generator.hpp>
|
#include <mapnik/svg/geometry_svg_generator.hpp>
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
|
|
||||||
// mapnik
|
// mapnik
|
||||||
#include <mapnik/geometry.hpp>
|
#include <mapnik/geometry.hpp>
|
||||||
#include <mapnik/ctrans.hpp>
|
#include <mapnik/view_transform.hpp>
|
||||||
|
|
||||||
// boost
|
// boost
|
||||||
#include <boost/iterator/iterator_adaptor.hpp>
|
#include <boost/iterator/iterator_adaptor.hpp>
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
#include <mapnik/rule.hpp> // for rule, symbolizers
|
#include <mapnik/rule.hpp> // for rule, symbolizers
|
||||||
#include <mapnik/box2d.hpp> // for box2d
|
#include <mapnik/box2d.hpp> // for box2d
|
||||||
#include <mapnik/color.hpp> // for color
|
#include <mapnik/color.hpp> // for color
|
||||||
#include <mapnik/ctrans.hpp> // for view_transform
|
#include <mapnik/view_transform.hpp> // for view_transform
|
||||||
#include <mapnik/image_compositing.hpp> // for composite_mode_e
|
#include <mapnik/image_compositing.hpp> // for composite_mode_e
|
||||||
#include <mapnik/pixel_position.hpp>
|
#include <mapnik/pixel_position.hpp>
|
||||||
#include <mapnik/request.hpp>
|
#include <mapnik/request.hpp>
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
//mapnik
|
//mapnik
|
||||||
#include <mapnik/debug.hpp>
|
#include <mapnik/debug.hpp>
|
||||||
#include <mapnik/label_collision_detector.hpp>
|
#include <mapnik/label_collision_detector.hpp>
|
||||||
#include <mapnik/ctrans.hpp>
|
#include <mapnik/view_transform.hpp>
|
||||||
#include <mapnik/expression_evaluator.hpp>
|
#include <mapnik/expression_evaluator.hpp>
|
||||||
#include <mapnik/text/placement_finder.hpp>
|
#include <mapnik/text/placement_finder.hpp>
|
||||||
#include <mapnik/text/text_layout.hpp>
|
#include <mapnik/text/text_layout.hpp>
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
#include <mapnik/marker_cache.hpp>
|
#include <mapnik/marker_cache.hpp>
|
||||||
#include <mapnik/text/placement_finder.hpp>
|
#include <mapnik/text/placement_finder.hpp>
|
||||||
#include <mapnik/proj_transform.hpp>
|
#include <mapnik/proj_transform.hpp>
|
||||||
#include <mapnik/ctrans.hpp>
|
#include <mapnik/view_transform.hpp>
|
||||||
#include <mapnik/vertex_converters.hpp>
|
#include <mapnik/vertex_converters.hpp>
|
||||||
|
|
||||||
namespace mapnik {
|
namespace mapnik {
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
// mapnik
|
// mapnik
|
||||||
#include <mapnik/config.hpp>
|
#include <mapnik/config.hpp>
|
||||||
#include <mapnik/attribute.hpp>
|
#include <mapnik/attribute.hpp>
|
||||||
#include <mapnik/ctrans.hpp>
|
#include <mapnik/view_transform.hpp>
|
||||||
#include <mapnik/offset_converter.hpp>
|
#include <mapnik/offset_converter.hpp>
|
||||||
#include <mapnik/simplify.hpp>
|
#include <mapnik/simplify.hpp>
|
||||||
#include <mapnik/simplify_converter.hpp>
|
#include <mapnik/simplify_converter.hpp>
|
||||||
|
|
|
@ -20,8 +20,8 @@
|
||||||
*
|
*
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
#ifndef MAPNIK_CTRANS_HPP
|
#ifndef MAPNIK_VIEW_TRANSFORM_HPP
|
||||||
#define MAPNIK_CTRANS_HPP
|
#define MAPNIK_VIEW_TRANSFORM_HPP
|
||||||
|
|
||||||
// mapnik
|
// mapnik
|
||||||
#include <mapnik/config.hpp>
|
#include <mapnik/config.hpp>
|
||||||
|
@ -279,4 +279,4 @@ public:
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // MAPNIK_CTRANS_HPP
|
#endif // MAPNIK_VIEW_TRANSFORM_HPP
|
|
@ -26,7 +26,7 @@
|
||||||
#include <mapnik/debug.hpp>
|
#include <mapnik/debug.hpp>
|
||||||
#include <mapnik/image_data.hpp>
|
#include <mapnik/image_data.hpp>
|
||||||
#include <mapnik/raster.hpp>
|
#include <mapnik/raster.hpp>
|
||||||
#include <mapnik/ctrans.hpp>
|
#include <mapnik/view_transform.hpp>
|
||||||
#include <mapnik/feature.hpp>
|
#include <mapnik/feature.hpp>
|
||||||
#include <mapnik/feature_factory.hpp>
|
#include <mapnik/feature_factory.hpp>
|
||||||
#include <mapnik/util/variant.hpp>
|
#include <mapnik/util/variant.hpp>
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
#include <mapnik/unicode.hpp>
|
#include <mapnik/unicode.hpp>
|
||||||
#include <mapnik/value_types.hpp>
|
#include <mapnik/value_types.hpp>
|
||||||
#include <mapnik/feature_factory.hpp>
|
#include <mapnik/feature_factory.hpp>
|
||||||
#include <mapnik/ctrans.hpp>
|
#include <mapnik/view_transform.hpp>
|
||||||
#include <mapnik/raster.hpp>
|
#include <mapnik/raster.hpp>
|
||||||
#include <mapnik/image_data.hpp>
|
#include <mapnik/image_data.hpp>
|
||||||
#include <mapnik/util/conversions.hpp>
|
#include <mapnik/util/conversions.hpp>
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
#include <mapnik/datasource.hpp> // for datasource_exception
|
#include <mapnik/datasource.hpp> // for datasource_exception
|
||||||
#include <mapnik/global.hpp>
|
#include <mapnik/global.hpp>
|
||||||
#include <mapnik/debug.hpp>
|
#include <mapnik/debug.hpp>
|
||||||
#include <mapnik/ctrans.hpp>
|
#include <mapnik/view_transform.hpp>
|
||||||
#include <mapnik/raster.hpp>
|
#include <mapnik/raster.hpp>
|
||||||
#include <mapnik/image_data.hpp>
|
#include <mapnik/image_data.hpp>
|
||||||
#include <mapnik/util/conversions.hpp>
|
#include <mapnik/util/conversions.hpp>
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
// mapnik
|
// mapnik
|
||||||
#include <mapnik/util/fs.hpp>
|
#include <mapnik/util/fs.hpp>
|
||||||
#include <mapnik/debug.hpp>
|
#include <mapnik/debug.hpp>
|
||||||
#include <mapnik/ctrans.hpp>
|
#include <mapnik/view_transform.hpp>
|
||||||
#include <mapnik/image_util.hpp>
|
#include <mapnik/image_util.hpp>
|
||||||
#include <mapnik/image_reader.hpp>
|
#include <mapnik/image_reader.hpp>
|
||||||
#include <mapnik/boolean.hpp>
|
#include <mapnik/boolean.hpp>
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
#include <mapnik/debug.hpp>
|
#include <mapnik/debug.hpp>
|
||||||
#include <mapnik/image_data.hpp>
|
#include <mapnik/image_data.hpp>
|
||||||
#include <mapnik/raster.hpp>
|
#include <mapnik/raster.hpp>
|
||||||
#include <mapnik/ctrans.hpp>
|
#include <mapnik/view_transform.hpp>
|
||||||
#include <mapnik/image_reader.hpp>
|
#include <mapnik/image_reader.hpp>
|
||||||
#include <mapnik/image_util.hpp>
|
#include <mapnik/image_util.hpp>
|
||||||
#include <mapnik/feature_factory.hpp>
|
#include <mapnik/feature_factory.hpp>
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
#include <mapnik/datasource.hpp>
|
#include <mapnik/datasource.hpp>
|
||||||
#include <mapnik/projection.hpp>
|
#include <mapnik/projection.hpp>
|
||||||
#include <mapnik/proj_transform.hpp>
|
#include <mapnik/proj_transform.hpp>
|
||||||
#include <mapnik/ctrans.hpp>
|
#include <mapnik/view_transform.hpp>
|
||||||
#include <mapnik/filter_featureset.hpp>
|
#include <mapnik/filter_featureset.hpp>
|
||||||
#include <mapnik/hit_test_filter.hpp>
|
#include <mapnik/hit_test_filter.hpp>
|
||||||
#include <mapnik/scale_denominator.hpp>
|
#include <mapnik/scale_denominator.hpp>
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
//mapnik
|
//mapnik
|
||||||
#include <mapnik/debug.hpp>
|
#include <mapnik/debug.hpp>
|
||||||
#include <mapnik/label_collision_detector.hpp>
|
#include <mapnik/label_collision_detector.hpp>
|
||||||
#include <mapnik/ctrans.hpp>
|
#include <mapnik/view_transform.hpp>
|
||||||
#include <mapnik/expression_evaluator.hpp>
|
#include <mapnik/expression_evaluator.hpp>
|
||||||
#include <mapnik/text/placement_finder_impl.hpp>
|
#include <mapnik/text/placement_finder_impl.hpp>
|
||||||
#include <mapnik/text/text_layout.hpp>
|
#include <mapnik/text/text_layout.hpp>
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
#include <mapnik/image_data.hpp>
|
#include <mapnik/image_data.hpp>
|
||||||
#include <mapnik/image_util.hpp>
|
#include <mapnik/image_util.hpp>
|
||||||
#include <mapnik/box2d.hpp>
|
#include <mapnik/box2d.hpp>
|
||||||
#include <mapnik/ctrans.hpp>
|
#include <mapnik/view_transform.hpp>
|
||||||
#include <mapnik/raster.hpp>
|
#include <mapnik/raster.hpp>
|
||||||
#include <mapnik/proj_transform.hpp>
|
#include <mapnik/proj_transform.hpp>
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#include <mapnik/feature_type_style.hpp>
|
#include <mapnik/feature_type_style.hpp>
|
||||||
#include <mapnik/rule.hpp>
|
#include <mapnik/rule.hpp>
|
||||||
#include <mapnik/debug.hpp>
|
#include <mapnik/debug.hpp>
|
||||||
#include <mapnik/ctrans.hpp>
|
#include <mapnik/view_transform.hpp>
|
||||||
#include <mapnik/feature.hpp>
|
#include <mapnik/feature.hpp>
|
||||||
#include <mapnik/vertex_converters.hpp>
|
#include <mapnik/vertex_converters.hpp>
|
||||||
#include <mapnik/geometry.hpp>
|
#include <mapnik/geometry.hpp>
|
||||||
|
|
Loading…
Reference in a new issue