use hatchstyles_enabled instead of hatch_buffer_scale

r3kste · r3kste · commit 0cc4df0f0769 · 2024-12-21T16:59:54.000+05:30
diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py
@@ -71,7 +71,7 @@ def __init__(self, width, height, dpi):
             (max(width, height) / dpi) if RendererAgg.hatchstyles_enabled else 1.0
         )
         self._renderer = _RendererAgg(int(width), int(height), dpi,
-                                      self.hatch_buffer_scale)
+                                      RendererAgg.hatchstyles_enabled)
         self._filter_renderers = []
 
         self._update_methods()
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -5,7 +5,7 @@
 #include <Python.h>
 #include "_backend_agg.h"
 
-RendererAgg::RendererAgg(unsigned int width, unsigned int height, double dpi, double hatch_buffer_scale)
+RendererAgg::RendererAgg(unsigned int width, unsigned int height, double dpi, bool hatchstyles_enabled)
     : width(width),
       height(height),
       dpi(dpi),
@@ -48,7 +48,7 @@ RendererAgg::RendererAgg(unsigned int width, unsigned int height, double dpi, do
     rendererBase.clear(_fill_color);
     rendererAA.attach(rendererBase);
     rendererBin.attach(rendererBase);
-    hatch_size = int(dpi * hatch_buffer_scale);
+    hatch_size = hatchstyles_enabled ? (width > height ? width : height) : int(dpi);
     hatchBuffer = new agg::int8u[hatch_size * hatch_size * 4];
     hatchRenderingBuffer.attach(hatchBuffer, hatch_size, hatch_size, hatch_size * 4);
 }
diff --git a/src/_backend_agg.h b/src/_backend_agg.h
@@ -127,7 +127,7 @@ class RendererAgg
     /* TODO: Remove facepair_t */
     typedef std::pair<bool, agg::rgba> facepair_t;
 
-    RendererAgg(unsigned int width, unsigned int height, double dpi, double hatch_buffer_scale=1.0);
+    RendererAgg(unsigned int width, unsigned int height, double dpi, bool hatchstyles_enabled = false);
 
     virtual ~RendererAgg();
 
diff --git a/src/_backend_agg_wrapper.cpp b/src/_backend_agg_wrapper.cpp
@@ -214,8 +214,8 @@ PyRendererAgg_draw_gouraud_triangles(RendererAgg *self,
 PYBIND11_MODULE(_backend_agg, m, py::mod_gil_not_used())
 {
     py::class_<RendererAgg>(m, "RendererAgg", py::buffer_protocol())
-        .def(py::init<unsigned int, unsigned int, double, double>(),
-             "width"_a, "height"_a, "dpi"_a, "hatch_buffer_scale"_a = 1.0)
+        .def(py::init<unsigned int, unsigned int, double, bool>(),
+             "width"_a, "height"_a, "dpi"_a, "hatchstyles_enabled"_a = false)
 
         .def("draw_path", &PyRendererAgg_draw_path,
              "gc"_a, "path"_a, "trans"_a, "face"_a = nullptr)

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ def __init__(self, width, height, dpi):`
`71`	`71`	`(max(width, height) / dpi) if RendererAgg.hatchstyles_enabled else 1.0`
`72`	`72`	`)`
`73`	`73`	`self._renderer = _RendererAgg(int(width), int(height), dpi,`
`74`		`- self.hatch_buffer_scale)`
	`74`	`+ RendererAgg.hatchstyles_enabled)`
`75`	`75`	`self._filter_renderers = []`
`76`	`76`
`77`	`77`	`self._update_methods()`