Minor cleanups.

anntzer · anntzer · commit 0292022abaef · 2024-09-12T11:53:14.000+02:00
diff --git a/ext/_feature_tests.cpp b/ext/_feature_tests.cpp
@@ -5,5 +5,5 @@
 
 #include <cairo.h>
 #if CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 13, 1)
-  #error "Your version of cairo version is too old."
+  #error "cairo>=1.13.1 is required."
 #endif
diff --git a/ext/_mplcairo.cpp b/ext/_mplcairo.cpp
@@ -1395,7 +1395,7 @@ void GraphicsContextRenderer::draw_path_collection(
                fcs_raw(i_mod, 2), fcs_raw(i_mod, 3));
         cache.mask(ctx, path, mtx, draw_func_t::Fill, 0, {}, x, y);
       }
-      if (ecs_raw.size()) {
+      if (ecs_raw.shape(0)) {
         auto const& i_mod = i % ecs_raw.shape(0);
         cairo_set_source_rgba(
           ctx, ecs_raw(i_mod, 0), ecs_raw(i_mod, 1),
diff --git a/setup.py b/setup.py
@@ -102,18 +102,18 @@ def gen_extension(tmpdir):
     return ext
 
 
+# NOTE: Finding the dlls in libpath is not particularly correct as this really
+# specifies paths to .lib import libraries; instead we should use
+# ctypes.util.find_library and ask the caller to set PATH if desired.
 @functools.lru_cache(1)
 def paths_from_link_libpaths():
     # "Easy" way to call CommandLineToArgvW...
     argv = json.loads(subprocess.check_output(
         '"{}" -c "import json, sys; print(json.dumps(sys.argv[1:]))" {}'
         .format(sys.executable, os.environ.get("LINK", ""))))
-    paths = []
-    for arg in argv:
-        match = re.fullmatch("(?i)/LIBPATH:(.*)", arg)
-        if match:
-            paths.append(Path(match.group(1)))
-    return paths
+    return [Path(match[1])
+            for match in map(re.compile("(?i)/LIBPATH:(.*)").fullmatch, argv)
+            if match]
 
 
 class build_ext(setuptools.command.build_ext.build_ext):

Original file line number	Diff line number	Diff line change
`@@ -1395,7 +1395,7 @@ void GraphicsContextRenderer::draw_path_collection(`
`1395`	`1395`	`fcs_raw(i_mod, 2), fcs_raw(i_mod, 3));`
`1396`	`1396`	`cache.mask(ctx, path, mtx, draw_func_t::Fill, 0, {}, x, y);`
`1397`	`1397`	`}`
`1398`		`- if (ecs_raw.size()) {`
	`1398`	`+ if (ecs_raw.shape(0)) {`
`1399`	`1399`	`auto const& i_mod = i % ecs_raw.shape(0);`
`1400`	`1400`	`cairo_set_source_rgba(`
`1401`	`1401`	`ctx, ecs_raw(i_mod, 0), ecs_raw(i_mod, 1),`