From 6d4a4139b3a08ed42548908da2660e9514068921 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Mon, 4 May 2015 14:49:17 +0200
Subject: [PATCH] is_switchable to control switchabilty of vertex_converters --
 revive stroke_tag fix vertex_converter in cairo/agg

---
 demo/viewer/info_dialog.cpp                   |  2 +-
 demo/viewer/layer_info_dialog.cpp             |  2 +-
 include/mapnik/vertex_converters.hpp          | 14 ++------------
 src/agg/process_line_symbolizer.cpp           |  4 +---
 src/cairo/process_line_pattern_symbolizer.cpp |  3 +--
 src/cairo/process_line_symbolizer.cpp         |  4 +---
 6 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/demo/viewer/info_dialog.cpp b/demo/viewer/info_dialog.cpp
index 6a9c1a31b..37c243d69 100644
--- a/demo/viewer/info_dialog.cpp
+++ b/demo/viewer/info_dialog.cpp
@@ -28,7 +28,7 @@ info_dialog::info_dialog(QVector<QPair<QString,QString> > const& info, QWidget *
   ui.tableWidget->setHorizontalHeaderItem(0,new QTableWidgetItem("Name"));
   ui.tableWidget->setHorizontalHeaderItem(1,new QTableWidgetItem("Value"));
 
-  ui.tableWidget->set_rowCount(info.size());
+  ui.tableWidget->setRowCount(info.size());
   ui.tableWidget->setColumnCount(2);
   for (int i=0;i<info.size();++i)
   {
diff --git a/demo/viewer/layer_info_dialog.cpp b/demo/viewer/layer_info_dialog.cpp
index b145a5a88..6d176e8f2 100644
--- a/demo/viewer/layer_info_dialog.cpp
+++ b/demo/viewer/layer_info_dialog.cpp
@@ -46,7 +46,7 @@ layer_info_dialog::layer_info_dialog(mapnik::layer& lay, QWidget *parent)
     {
         mapnik::parameters ps = ds->params();
 
-        ui.tableWidget->set_rowCount(ps.size());
+        ui.tableWidget->setRowCount(ps.size());
         ui.tableWidget->setColumnCount(2);
 
         mapnik::parameters::const_iterator pos;
diff --git a/include/mapnik/vertex_converters.hpp b/include/mapnik/vertex_converters.hpp
index 35326e8cf..13c07d8e7 100644
--- a/include/mapnik/vertex_converters.hpp
+++ b/include/mapnik/vertex_converters.hpp
@@ -260,26 +260,16 @@ struct is_switchable
 };
 
 template <typename T>
-struct is_switchable<T,transform_tag>
-{
-    static constexpr bool value = false;
-};
-
-// https://github.com/mapnik/mapnik/issues/2791
-/*
-template <typename T>
-struct is_switchable<T,stroke_tag>
+struct is_switchable<T, transform_tag>
 {
     static constexpr bool value = false;
 };
 
 template <typename T>
-struct is_switchable<T,offset_transform_tag>
+struct is_switchable<T, stroke_tag>
 {
     static constexpr bool value = false;
 };
-*/
-
 
 template <typename Dispatcher, typename... ConverterTypes>
 struct converters_helper;
diff --git a/src/agg/process_line_symbolizer.cpp b/src/agg/process_line_symbolizer.cpp
index 6ce50e10b..7397141ce 100644
--- a/src/agg/process_line_symbolizer.cpp
+++ b/src/agg/process_line_symbolizer.cpp
@@ -167,9 +167,7 @@ void agg_renderer<T0,T1>::process(line_symbolizer const& sym,
         using vertex_converter_type = vertex_converter<clip_line_tag, transform_tag,
                                                        affine_transform_tag,
                                                        simplify_tag, smooth_tag,
-                                                       offset_transform_tag,
-                                                       dash_tag, stroke_tag>;
-
+                                                       offset_transform_tag>;
         vertex_converter_type converter(clip_box,sym,common_.t_,prj_trans,tr,feature,common_.vars_,common_.scale_factor_);
         if (clip) converter.set<clip_line_tag>(); // optional clip (default: true)
         converter.set<transform_tag>(); // always transform
diff --git a/src/cairo/process_line_pattern_symbolizer.cpp b/src/cairo/process_line_pattern_symbolizer.cpp
index 76f868871..fbc625c6a 100644
--- a/src/cairo/process_line_pattern_symbolizer.cpp
+++ b/src/cairo/process_line_pattern_symbolizer.cpp
@@ -146,8 +146,7 @@ void cairo_renderer<T>::process(line_pattern_symbolizer const& sym,
     using vertex_converter_type = vertex_converter<clip_line_tag, transform_tag,
                                                    affine_transform_tag,
                                                    simplify_tag, smooth_tag,
-                                                   offset_transform_tag,
-                                                   dash_tag, stroke_tag>;
+                                                   offset_transform_tag>;
 
     vertex_converter_type converter(clipping_extent,sym, common_.t_, prj_trans, tr, feature, common_.vars_, common_.scale_factor_);
 
diff --git a/src/cairo/process_line_symbolizer.cpp b/src/cairo/process_line_symbolizer.cpp
index 584e34ef0..6021bbf22 100644
--- a/src/cairo/process_line_symbolizer.cpp
+++ b/src/cairo/process_line_symbolizer.cpp
@@ -85,8 +85,7 @@ void cairo_renderer<T>::process(line_symbolizer const& sym,
                                                     transform_tag,
                                                     affine_transform_tag,
                                                     simplify_tag, smooth_tag,
-                                                    offset_transform_tag,
-                                                    dash_tag, stroke_tag>;
+                                                    offset_transform_tag>;
 
     vertex_converter_type converter(clipping_extent,sym,common_.t_,prj_trans,tr,feature,common_.vars_,common_.scale_factor_);
 
@@ -96,7 +95,6 @@ void cairo_renderer<T>::process(line_symbolizer const& sym,
     converter.set<affine_transform_tag>(); // optional affine transform
     if (simplify_tolerance > 0.0) converter.set<simplify_tag>(); // optional simplify converter
     if (smooth > 0.0) converter.set<smooth_tag>(); // optional smooth converter
-
     using apply_vertex_converter_type = detail::apply_vertex_converter<vertex_converter_type, cairo_context>;
     using vertex_processor_type = geometry::vertex_processor<apply_vertex_converter_type>;
     apply_vertex_converter_type apply(converter, context_);