Merge branch 'master' into skia-renderer

include/mapnik/agg_renderer.hpp

@@ -132,6 +132,11 @@ public:
         return DEFAULT;
     }
 
+    inline double scale_factor() const
+    {
+        return scale_factor_;
+    }
+
 protected:
     template <typename R>
     void debug_draw_box(R& buf, box2d<double> const& extent,

include/mapnik/cairo_renderer.hpp

@@ -129,6 +129,11 @@ public:
         return DEFAULT;
     }
 
+    inline double scale_factor() const
+    {
+        return scale_factor_;
+    }
+
     void render_marker(pixel_position const& pos,
                        marker const& marker,
                        agg::trans_affine const& mtx,

include/mapnik/feature_style_processor.hpp

@@ -92,7 +92,6 @@ private:
                       proj_transform const& prj_trans);
 
     Map const& m_;
-    double scale_factor_;
 };
 }
 

include/mapnik/feature_style_processor_impl.hpp

@@ -33,7 +33,6 @@
 #include <mapnik/query.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/datasource.hpp>
-#include <mapnik/memory_datasource.hpp>
 #include <mapnik/feature_type_style.hpp>
 #include <mapnik/box2d.hpp>
 #include <mapnik/layer.hpp>
@@ -41,7 +40,6 @@
 #include <mapnik/rule_cache.hpp>
 #include <mapnik/attribute_collector.hpp>
 #include <mapnik/expression_evaluator.hpp>
-#include <mapnik/utils.hpp>
 #include <mapnik/scale_denominator.hpp>
 #include <mapnik/projection.hpp>
 #include <mapnik/proj_transform.hpp>
@@ -134,11 +132,10 @@ struct has_process
 
 template <typename Processor>
 feature_style_processor<Processor>::feature_style_processor(Map const& m, double scale_factor)
-    : m_(m),
+    : m_(m)
-      scale_factor_(scale_factor)
 {
     // https://github.com/mapnik/mapnik/issues/1100
-    if (scale_factor_ <= 0)
+    if (scale_factor <= 0)
     {
         throw std::runtime_error("scale_factor must be greater than 0.0");
     }
@@ -153,7 +150,7 @@ void feature_style_processor<Processor>::apply(double scale_denom)
     projection proj(m_.srs(),true);
     if (scale_denom <= 0.0)
         scale_denom = mapnik::scale_denominator(m_.scale(),proj.is_geographic());
-    scale_denom *= scale_factor_;
+    scale_denom *= p.scale_factor();
 
     BOOST_FOREACH ( layer const& lyr, m_.layers() )
     {
@@ -188,7 +185,7 @@ void feature_style_processor<Processor>::apply(mapnik::layer const& lyr,
     projection proj(m_.srs(),true);
     if (scale_denom <= 0.0)
         scale_denom = mapnik::scale_denominator(m_.scale(),proj.is_geographic());
-    scale_denom *= scale_factor_;
+    scale_denom *= p.scale_factor();
 
     if (lyr.visible(scale_denom))
     {
@@ -458,7 +455,6 @@ void feature_style_processor<Processor>::apply_to_layer(layer const& lay, Proces
             boost::shared_ptr<featureset_buffer> cache = boost::make_shared<featureset_buffer>();
             if (features)
             {
-                // Cache all features into the memory_datasource before rendering.
                 feature_ptr feature;
                 while ((feature = features->next()))
                 {

include/mapnik/grid/grid_renderer.hpp

@@ -122,6 +122,10 @@ public:
     {
         return DEFAULT;
     }
+    inline double scale_factor() const
+    {
+        return scale_factor_;
+    }
 
 private:
     buffer_type & pixmap_;

include/mapnik/svg/output/svg_renderer.hpp

@@ -137,6 +137,11 @@ public:
         return DEFAULT;
     }
 
+    inline double scale_factor() const
+    {
+        return scale_factor_;
+    }
+
     inline OutputIterator& get_output_iterator()
     {
         return output_iterator_;