From 9539ce96a686b4354842e67bd00ff81f0e601bab Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Tue, 21 Aug 2012 13:27:35 -0700
Subject: [PATCH] for 2.1 release hold back clipping on lines with markers to
 avoid #1426 (refs #1424)

---
 src/agg/process_markers_symbolizer.cpp  | 15 +++++++++------
 src/cairo_renderer.cpp                  | 15 +++++++++------
 src/grid/process_markers_symbolizer.cpp | 15 +++++++++------
 3 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/src/agg/process_markers_symbolizer.cpp b/src/agg/process_markers_symbolizer.cpp
index 570161ef9..078dfd5cd 100644
--- a/src/agg/process_markers_symbolizer.cpp
+++ b/src/agg/process_markers_symbolizer.cpp
@@ -129,8 +129,9 @@ void agg_renderer<T>::process(markers_symbolizer const& sym,
                         eGeomType type = feature.paths()[0].type();
                         if (type == Polygon)
                             converter.template set<clip_poly_tag>();
-                        else if (type == LineString)
-                            converter.template set<clip_line_tag>();
+                        // line clipping disabled due to https://github.com/mapnik/mapnik/issues/1426
+                        //else if (type == LineString)
+                        //    converter.template set<clip_line_tag>();
                         // don't clip if type==Point
                     }
                     converter.template set<transform_tag>(); //always transform
@@ -164,8 +165,9 @@ void agg_renderer<T>::process(markers_symbolizer const& sym,
                         eGeomType type = feature.paths()[0].type();
                         if (type == Polygon)
                             converter.template set<clip_poly_tag>();
-                        else if (type == LineString)
-                            converter.template set<clip_line_tag>();
+                        // line clipping disabled due to https://github.com/mapnik/mapnik/issues/1426
+                        //else if (type == LineString)
+                        //    converter.template set<clip_line_tag>();
                         // don't clip if type==Point
                     }
                     converter.template set<transform_tag>(); //always transform
@@ -198,8 +200,9 @@ void agg_renderer<T>::process(markers_symbolizer const& sym,
                     eGeomType type = feature.paths()[0].type();
                     if (type == Polygon)
                         converter.template set<clip_poly_tag>();
-                    else if (type == LineString)
-                        converter.template set<clip_line_tag>();
+                    // line clipping disabled due to https://github.com/mapnik/mapnik/issues/1426
+                    //else if (type == LineString)
+                    //    converter.template set<clip_line_tag>();
                     // don't clip if type==Point
                 }
                 converter.template set<transform_tag>(); //always transform
diff --git a/src/cairo_renderer.cpp b/src/cairo_renderer.cpp
index 21bf6d2e8..680741317 100644
--- a/src/cairo_renderer.cpp
+++ b/src/cairo_renderer.cpp
@@ -1699,8 +1699,9 @@ void cairo_renderer_base::process(markers_symbolizer const& sym,
                         eGeomType type = feature.paths()[0].type();
                         if (type == Polygon)
                             converter.set<clip_poly_tag>();
-                        else if (type == LineString)
-                            converter.set<clip_line_tag>();
+                        // line clipping disabled due to https://github.com/mapnik/mapnik/issues/1426
+                        //else if (type == LineString)
+                        //    converter.template set<clip_line_tag>();
                         // don't clip if type==Point
                     }
                     converter.set<transform_tag>(); //always transform
@@ -1726,8 +1727,9 @@ void cairo_renderer_base::process(markers_symbolizer const& sym,
                         eGeomType type = feature.paths()[0].type();
                         if (type == Polygon)
                             converter.set<clip_poly_tag>();
-                        else if (type == LineString)
-                            converter.set<clip_line_tag>();
+                        // line clipping disabled due to https://github.com/mapnik/mapnik/issues/1426
+                        //else if (type == LineString)
+                        //    converter.template set<clip_line_tag>();
                         // don't clip if type==Point
                     }
                     converter.set<transform_tag>(); //always transform
@@ -1758,8 +1760,9 @@ void cairo_renderer_base::process(markers_symbolizer const& sym,
                         eGeomType type = feature.paths()[0].type();
                         if (type == Polygon)
                             converter.set<clip_poly_tag>();
-                        else if (type == LineString)
-                            converter.set<clip_line_tag>();
+                        // line clipping disabled due to https://github.com/mapnik/mapnik/issues/1426
+                        //else if (type == LineString)
+                        //    converter.template set<clip_line_tag>();
                         // don't clip if type==Point
                     }
                     converter.set<transform_tag>(); //always transform
diff --git a/src/grid/process_markers_symbolizer.cpp b/src/grid/process_markers_symbolizer.cpp
index 91d120dc7..d21a23d03 100644
--- a/src/grid/process_markers_symbolizer.cpp
+++ b/src/grid/process_markers_symbolizer.cpp
@@ -156,8 +156,9 @@ void grid_renderer<T>::process(markers_symbolizer const& sym,
                         eGeomType type = feature.paths()[0].type();
                         if (type == Polygon)
                             converter.template set<clip_poly_tag>();
-                        else if (type == LineString)
-                            converter.template set<clip_line_tag>();
+                        // line clipping disabled due to https://github.com/mapnik/mapnik/issues/1426
+                        //else if (type == LineString)
+                        //    converter.template set<clip_line_tag>();
                         // don't clip if type==Point
                     }
                     converter.template set<transform_tag>(); //always transform
@@ -200,8 +201,9 @@ void grid_renderer<T>::process(markers_symbolizer const& sym,
                         eGeomType type = feature.paths()[0].type();
                         if (type == Polygon)
                             converter.template set<clip_poly_tag>();
-                        else if (type == LineString)
-                            converter.template set<clip_line_tag>();
+                        // line clipping disabled due to https://github.com/mapnik/mapnik/issues/1426
+                        //else if (type == LineString)
+                        //    converter.template set<clip_line_tag>();
                         // don't clip if type==Point
                     }
                     converter.template set<transform_tag>(); //always transform
@@ -247,8 +249,9 @@ void grid_renderer<T>::process(markers_symbolizer const& sym,
                     eGeomType type = feature.paths()[0].type();
                     if (type == Polygon)
                         converter.template set<clip_poly_tag>();
-                    else if (type == LineString)
-                        converter.template set<clip_line_tag>();
+                    // line clipping disabled due to https://github.com/mapnik/mapnik/issues/1426
+                    //else if (type == LineString)
+                    //    converter.template set<clip_line_tag>();
                     // don't clip if type==Point
                 }
                 converter.template set<transform_tag>(); //always transform