Merge branch 'master' into large_csv

include/mapnik/marker_helpers.hpp

@@ -24,12 +24,11 @@
 #define MAPNIK_MARKER_HELPERS_HPP
 
 #include <mapnik/feature.hpp>
-#include <mapnik/color.hpp>
 #include <mapnik/geometry.hpp>
 #include <mapnik/geometry_type.hpp>
 #include <mapnik/geometry_centroid.hpp>
 #include <mapnik/symbolizer.hpp>
-#include <mapnik/svg/svg_converter.hpp>
+#include <mapnik/svg/svg_path_attributes.hpp>
 #include <mapnik/marker.hpp> // for svg_storage_type
 #include <mapnik/markers_placement.hpp>
 #include <mapnik/attribute.hpp>
@@ -47,8 +46,6 @@ namespace mapnik {
 
 struct clip_poly_tag;
 
-namespace svg { struct path_attributes; }
-
 using svg_attribute_type = agg::pod_bvector<svg::path_attributes>;
 
 template <typename Detector>

include/mapnik/renderer_common/process_group_symbolizer.hpp

@@ -47,8 +47,6 @@
 
 namespace mapnik {
 
-class proj_transform;
-struct glyph_info;
 class text_symbolizer_helper;
 
 using svg::svg_path_adapter;
@@ -95,7 +93,7 @@ struct virtual_renderer_common : private util::noncopyable
 // This should allow us to re-use as much as possible of the
 // existing symbolizer layout and rendering code while still
 // being able to interpose our own decisions about whether
-// a collision has occured or not.
+// a collision has occurred or not.
 
 // Thunk for rendering a particular instance of a point - this
 // stores all the arguments necessary to re-render this point
@@ -117,13 +115,7 @@ struct vector_marker_render_thunk  : util::noncopyable
                                composite_mode_e comp_op,
                                bool snap_to_pixels);
 
-    vector_marker_render_thunk(vector_marker_render_thunk && rhs)
+    vector_marker_render_thunk(vector_marker_render_thunk && rhs);
-      : src_(std::move(rhs.src_)),
-        attrs_(std::move(rhs.attrs_)),
-        tr_(std::move(rhs.tr_)),
-        opacity_(std::move(rhs.opacity_)),
-        comp_op_(std::move(rhs.comp_op_)),
-        snap_to_pixels_(std::move(rhs.snap_to_pixels_)) {}
 };
 
 struct raster_marker_render_thunk  : util::noncopyable
@@ -140,12 +132,7 @@ struct raster_marker_render_thunk  : util::noncopyable
                                composite_mode_e comp_op,
                                bool snap_to_pixels);
 
-    raster_marker_render_thunk(raster_marker_render_thunk && rhs)
+    raster_marker_render_thunk(raster_marker_render_thunk && rhs);
-      : src_(rhs.src_),
-        tr_(std::move(rhs.tr_)),
-        opacity_(std::move(rhs.opacity_)),
-        comp_op_(std::move(rhs.comp_op_)),
-        snap_to_pixels_(std::move(rhs.snap_to_pixels_)) {}
 };
 
 using helper_ptr = std::unique_ptr<text_symbolizer_helper>;
@@ -164,12 +151,7 @@ struct text_render_thunk : util::noncopyable
                       double opacity, composite_mode_e comp_op,
                       halo_rasterizer_enum halo_rasterizer);
 
-    text_render_thunk(text_render_thunk && rhs)
+    text_render_thunk(text_render_thunk && rhs);
-      : helper_(std::move(rhs.helper_)),
-        placements_(std::move(rhs.placements_)),
-        opacity_(std::move(rhs.opacity_)),
-        comp_op_(std::move(rhs.comp_op_)),
-        halo_rasterizer_(std::move(rhs.halo_rasterizer_)) {}
 
 };
 
@@ -395,7 +377,7 @@ void render_group_symbolizer(group_symbolizer const& sym,
             rpt_key_expr = get<expression_ptr>(sym, keys::repeat_key);
         }
 
-        // evalute the repeat key with the matched sub feature if we have one
+        // evaluate the repeat key with the matched sub feature if we have one
         if (rpt_key_expr)
         {
             rpt_key_value = util::apply_visitor(evaluate<Feature,value_type,attributes>(*match_feature,common.vars_),

src/marker_helpers.cpp

@@ -22,6 +22,7 @@
 
 // mapnik
 #include <mapnik/marker_helpers.hpp>
+#include <mapnik/svg/svg_converter.hpp>
 
 #include "agg_ellipse.h"
 #include "agg_color_rgba.h"

src/renderer_common/process_group_symbolizer.cpp

@@ -37,6 +37,15 @@ vector_marker_render_thunk::vector_marker_render_thunk(svg_path_ptr const& src,
       comp_op_(comp_op), snap_to_pixels_(snap_to_pixels)
 {}
 
+vector_marker_render_thunk::vector_marker_render_thunk(vector_marker_render_thunk && rhs)
+  : src_(std::move(rhs.src_)),
+    attrs_(std::move(rhs.attrs_)),
+    tr_(std::move(rhs.tr_)),
+    opacity_(std::move(rhs.opacity_)),
+    comp_op_(std::move(rhs.comp_op_)),
+    snap_to_pixels_(std::move(rhs.snap_to_pixels_)) {}
+
+
 raster_marker_render_thunk::raster_marker_render_thunk(image_rgba8 const& src,
                                                        agg::trans_affine const& marker_trans,
                                                        double opacity,
@@ -46,6 +55,14 @@ raster_marker_render_thunk::raster_marker_render_thunk(image_rgba8 const& src,
       snap_to_pixels_(snap_to_pixels)
 {}
 
+raster_marker_render_thunk::raster_marker_render_thunk(raster_marker_render_thunk && rhs)
+      : src_(rhs.src_),
+        tr_(std::move(rhs.tr_)),
+        opacity_(std::move(rhs.opacity_)),
+        comp_op_(std::move(rhs.comp_op_)),
+        snap_to_pixels_(std::move(rhs.snap_to_pixels_)) {}
+
+
 text_render_thunk::text_render_thunk(helper_ptr && helper,
                                      double opacity, composite_mode_e comp_op,
                                      halo_rasterizer_enum halo_rasterizer)
@@ -56,6 +73,13 @@ text_render_thunk::text_render_thunk(helper_ptr && helper,
       halo_rasterizer_(halo_rasterizer)
 {}
 
+text_render_thunk::text_render_thunk(text_render_thunk && rhs)
+      : helper_(std::move(rhs.helper_)),
+        placements_(std::move(rhs.placements_)),
+        opacity_(std::move(rhs.opacity_)),
+        comp_op_(std::move(rhs.comp_op_)),
+        halo_rasterizer_(std::move(rhs.halo_rasterizer_)) {}
+
 namespace detail {
 
 template <typename Detector, typename RendererContext>

test/data-visual

@@ -1 +1 @@
-Subproject commit 1bcc3238531761998109f8ee7951c2cd411b746a
+Subproject commit 9a61f97dacf47f33538078a50b52122947d31caf

test/unit/run.cpp

@@ -2,7 +2,10 @@
 #include "catch.hpp"
 
 #include <libxml/parser.h> // for xmlInitParser(), xmlCleanupParser()
+
+#if defined(HAVE_CAIRO)
 #include <cairo.h>
+#endif
 #include <unicode/uclean.h>
 
 #ifdef MAPNIK_USE_PROJ4
@@ -17,8 +20,10 @@ int main (int argc, char* const argv[])
     // http://xmlsoft.org/xmlmem.html
     xmlCleanupParser();
 
+#if defined(HAVE_CAIRO)
     // http://cairographics.org/manual/cairo-Error-handling.html#cairo-debug-reset-static-data
     cairo_debug_reset_static_data();
+#endif
 
     // http://icu-project.org/apiref/icu4c/uclean_8h.html#a93f27d0ddc7c196a1da864763f2d8920
     u_cleanup();

test/visual/renderer.hpp

@@ -33,7 +33,9 @@
 // mapnik
 #include <mapnik/map.hpp>
 #include <mapnik/agg_renderer.hpp>
+#if defined(GRID_RENDERER)
 #include <mapnik/grid/grid_renderer.hpp>
+#endif
 #if defined(HAVE_CAIRO)
 #include <mapnik/cairo/cairo_renderer.hpp>
 #include <mapnik/cairo/cairo_image_util.hpp>
@@ -140,6 +142,7 @@ struct svg_renderer : renderer_base<std::string>
 };
 #endif
 
+#if defined(GRID_RENDERER)
 struct grid_renderer : renderer_base<mapnik::image_rgba8>
 {
     static constexpr const char * name = "grid";
@@ -186,6 +189,7 @@ struct grid_renderer : renderer_base<mapnik::image_rgba8>
         return image;
     }
 };
+#endif
 
 template <typename Renderer>
 class renderer

test/visual/run.cpp

@@ -30,7 +30,9 @@
 #include <boost/program_options.hpp>
 
 #include <libxml/parser.h> // for xmlInitParser(), xmlCleanupParser()
+#if defined(HAVE_CAIRO)
 #include <cairo.h>
+#endif
 #include <unicode/uclean.h>
 
 #ifdef MAPNIK_USE_PROJ4
@@ -116,8 +118,10 @@ int main(int argc, char** argv)
     // http://xmlsoft.org/xmlmem.html
     xmlCleanupParser();
 
+#if defined(HAVE_CAIRO)
     // http://cairographics.org/manual/cairo-Error-handling.html#cairo-debug-reset-static-data
     cairo_debug_reset_static_data();
+#endif
 
     // http://icu-project.org/apiref/icu4c/uclean_8h.html#a93f27d0ddc7c196a1da864763f2d8920
     u_cleanup();

test/visual/runner.cpp

@@ -67,7 +67,9 @@ runner::runner(runner::path_type const & styles_dir,
 #if defined(SVG_RENDERER)
                   ,renderer<svg_renderer>(output_dir_, reference_dir_, overwrite)
 #endif
+#if defined(GRID_RENDERER)
                   ,renderer<grid_renderer>(output_dir_, reference_dir_, overwrite)
+#endif
                 }
 {
 }

test/visual/runner.hpp

@@ -42,7 +42,10 @@ class runner
 #if defined(SVG_RENDERER)
                                                 ,renderer<svg_renderer>
 #endif
-                                                ,renderer<grid_renderer>>;
+#if defined(GRID_RENDERER)
+                                                ,renderer<grid_renderer>
+#endif
+                                                >;
     using path_type = boost::filesystem::path;
     using files_iterator = std::vector<path_type>::const_iterator;