Lazy-load hatch params, again for GCR instantiation speed.

Author: anntzer

src/_mplcairo.cpp

@@ -140,8 +140,8 @@ GraphicsContextRenderer::GraphicsContextRenderer(
     /* clip_rectangle */  {},
     /* clip_path */       {{}, {nullptr, cairo_path_destroy}},
     /* hatch */           {},
-    /* hatch_color */     to_rgba(rc_param("hatch.color")),
-    /* hatch_linewidth */ rc_param("hatch.linewidth").cast<double>(),
+    /* hatch_color */     {},  // Lazily loaded by get_hatch_color.
+    /* hatch_linewidth */ {},  // Lazily loaded by get_hatch_linewidth.
     /* sketch */          {},
     /* snap */            true,  // Defaults to None, i.e. True for us.
     /* url */             {}
@@ -912,10 +912,10 @@ void GraphicsContextRenderer::draw_path(
     auto hatch_gcr = GraphicsContextRenderer{
       hatch_cr, double(dpi), double(dpi), double(dpi)};
     hatch_gcr.get_additional_state().snap = false;
-    hatch_gcr.set_linewidth(get_additional_state().hatch_linewidth);
+    hatch_gcr.set_linewidth(get_additional_state().get_hatch_linewidth());
     auto const& matrix =
       cairo_matrix_t{double(dpi), 0, 0, -double(dpi), 0, double(dpi)};
-    auto const& hatch_color = get_additional_state().hatch_color;
+    auto const& hatch_color = get_additional_state().get_hatch_color();
     fill_and_stroke_exact(
       hatch_cr, *hatch_path, &matrix, hatch_color, hatch_color);
     auto const& hatch_pattern =
@@ -1620,12 +1620,12 @@ PYBIND11_MODULE(_mplcairo, m)
     .def(
       "get_hatch_color",
       [](GraphicsContextRenderer& gcr) -> rgba_t {
-        return gcr.get_additional_state().hatch_color;
+        return gcr.get_additional_state().get_hatch_color();
       })
     .def(
       "get_hatch_linewidth",
       [](GraphicsContextRenderer& gcr) -> double {
-        return gcr.get_additional_state().hatch_linewidth;
+        return gcr.get_additional_state().get_hatch_linewidth();
       })
     // Not strictly needed now.
     .def("get_linewidth", &GraphicsContextRenderer::get_linewidth)

src/_pattern_cache.cpp

@@ -237,8 +237,6 @@ void PatternCache::mask(
     auto const& raster_surface =
       cairo_image_surface_create(CAIRO_FORMAT_A8, width, height);
     auto const& raster_gcr =
-      // FIXME: Looks like building a full new gcr is too costly :/ (involves
-      // Python to build the additional state).
       GraphicsContextRenderer::make_pattern_gcr(raster_surface);
     key.draw(
       raster_gcr.cr_,

src/_util.cpp

@@ -39,6 +39,20 @@ cairo_user_data_key_t const REFS_KEY{}, STATE_KEY{}, FT_KEY{};
 py::object UNIT_CIRCLE{}, PIXEL_MARKER{};
 }
 
+rgba_t AdditionalState::get_hatch_color() {
+  if (!hatch_color) {
+    hatch_color = to_rgba(rc_param("hatch.color"));
+  }
+  return *hatch_color;
+}
+
+double AdditionalState::get_hatch_linewidth() {
+  if (!hatch_linewidth) {
+    hatch_linewidth = rc_param("hatch.linewidth").cast<double>();
+  }
+  return *hatch_linewidth;
+}
+
 bool py_eq(py::object obj1, py::object obj2) {
   return py::module::import("operator").attr("eq")(obj1, obj2).cast<bool>();
 }

src/_util.h

@@ -87,11 +87,17 @@ struct AdditionalState {
   std::tuple<std::optional<py::object>, std::shared_ptr<cairo_path_t>>
     clip_path;
   std::optional<std::string> hatch;
-  rgba_t hatch_color;
-  double hatch_linewidth;
+  // hatch_color and linewidth are made optional only to be able to lazy-load
+  // them, which is needed to keep GCR instantiation fast... which is needed
+  // for the pattern cache.
+  std::optional<rgba_t> hatch_color;
+  std::optional<double> hatch_linewidth;
   std::optional<py::object> sketch;
   bool snap;
   std::optional<std::string> url;
+
+  rgba_t get_hatch_color();
+  double get_hatch_linewidth();
 };
 
 bool py_eq(py::object obj1, py::object obj2);