fix(kmeans): wg wait

Author: fumiama

examples/fonts_test.go

@@ -1,6 +1,19 @@
 package main
 
-import "runtime"
+import (
+	"os"
+	"runtime"
+)
+
+// firstExisting returns the first path that exists on disk, or the last path as fallback.
+func firstExisting(paths ...string) string {
+	for _, p := range paths {
+		if _, err := os.Stat(p); err == nil {
+			return p
+		}
+	}
+	return paths[len(paths)-1]
+}
 
 // fontPath returns the OS-specific file path for a given font name.
 // Supported names: "Impact", "Arial", "Arial Bold".
@@ -9,29 +22,62 @@ func fontPath(name string) string {
 	case "windows":
 		switch name {
 		case "Impact":
-			return `C:\Windows\Fonts\impact.ttf`
+			return firstExisting(
+				`C:\Windows\Fonts\impact.ttf`,
+				`C:\Windows\Fonts\DejaVuSans-Bold.ttf`,
+			)
 		case "Arial":
-			return `C:\Windows\Fonts\arial.ttf`
+			return firstExisting(
+				`C:\Windows\Fonts\arial.ttf`,
+				`C:\Windows\Fonts\LiberationSans-Regular.ttf`,
+			)
 		case "Arial Bold":
-			return `C:\Windows\Fonts\arialbd.ttf`
+			return firstExisting(
+				`C:\Windows\Fonts\arialbd.ttf`,
+				`C:\Windows\Fonts\LiberationSans-Bold.ttf`,
+			)
 		}
 	case "darwin":
 		switch name {
 		case "Impact":
-			return "/System/Library/Fonts/Supplemental/Impact.ttf"
+			return firstExisting(
+				"/System/Library/Fonts/Supplemental/Impact.ttf",
+				"/System/Library/Fonts/Impact.ttf",
+				"/Library/Fonts/Impact.ttf",
+			)
 		case "Arial":
-			return "/System/Library/Fonts/Supplemental/Arial.ttf"
+			return firstExisting(
+				"/System/Library/Fonts/Supplemental/Arial.ttf",
+				"/System/Library/Fonts/Arial.ttf",
+				"/Library/Fonts/Arial.ttf",
+			)
 		case "Arial Bold":
-			return "/System/Library/Fonts/Supplemental/Arial Bold.ttf"
+			return firstExisting(
+				"/System/Library/Fonts/Supplemental/Arial Bold.ttf",
+				"/System/Library/Fonts/Arial Bold.ttf",
+				"/Library/Fonts/Arial Bold.ttf",
+			)
 		}
 	default: // linux, freebsd, etc.
 		switch name {
 		case "Impact":
-			return "/usr/share/fonts/truetype/msttcorefonts/Impact.ttf"
+			return firstExisting(
+				"/usr/share/fonts/truetype/msttcorefonts/Impact.ttf",
+				"/usr/share/fonts/truetype/dejavu/DejaVuSans-Bold.ttf",
+				"/usr/share/fonts/TTF/DejaVuSans-Bold.ttf",
+			)
 		case "Arial":
-			return "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf"
+			return firstExisting(
+				"/usr/share/fonts/truetype/msttcorefonts/Arial.ttf",
+				"/usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf",
+				"/usr/share/fonts/TTF/LiberationSans-Regular.ttf",
+			)
 		case "Arial Bold":
-			return "/usr/share/fonts/truetype/msttcorefonts/Arial_Bold.ttf"
+			return firstExisting(
+				"/usr/share/fonts/truetype/msttcorefonts/Arial_Bold.ttf",
+				"/usr/share/fonts/truetype/liberation/LiberationSans-Bold.ttf",
+				"/usr/share/fonts/TTF/LiberationSans-Bold.ttf",
+			)
 		}
 	}
 	return name

kmeans.go

@@ -90,14 +90,11 @@ func (ki *kmeansImage) assign() error {
 
 	n := runtime.NumCPU()
 	batchcnt := len(ki.pixels) / n
-	rem := len(ki.pixels) % n
 	wg := sync.WaitGroup{}
 	wg.Add(n)
-	if rem < 0 {
-		wg.Add(1)
-	}
 	for batch := range n {
 		go func(batch int) {
+			defer wg.Done()
 			base := batch * batchcnt
 			for i, pixel := range ki.pixels[base : base+batchcnt] {
 				minDistance := math.MaxFloat64
@@ -126,6 +123,7 @@ func (ki *kmeansImage) assign() error {
 		}
 		ki.clusterAssignments[base+i] = assign
 	}
+	wg.Wait()
 	return nil
 }