fix

nihui · nihui · commit 8fceb97a3960 · 2023-12-12T22:52:26.000+08:00
diff --git a/patches/opencv-3.4.20-drawing-mono-font.patch b/patches/opencv-3.4.20-drawing-mono-font.patch
@@ -93,7 +93,7 @@ diff -Nuarp opencv-3.4.20.orig/modules/imgproc/src/drawing.cpp opencv-3.4.20/mod
  
  double getFontScaleFromHeight(const int fontFace, const int pixelHeight, const int thickness)
  {
-+    return pixelHeight / 16.0;
++    return pixelHeight / (fontFace == 1 ? 16 : (fontFace == 5 ? 24 : 40));
 +#if 0
      // By https://stackoverflow.com/a/27898487/1531708
      const int* ascii = getFontData(fontFace);
diff --git a/patches/opencv-4.8.1-drawing-mono-font.patch b/patches/opencv-4.8.1-drawing-mono-font.patch
@@ -93,7 +93,7 @@ diff -Nuarp opencv-4.8.1.orig/modules/imgproc/src/drawing.cpp opencv-4.8.1/modul
  
  double getFontScaleFromHeight(const int fontFace, const int pixelHeight, const int thickness)
  {
-+    return pixelHeight / 16.0;
++    return pixelHeight / (fontFace == 1 ? 16 : (fontFace == 5 ? 24 : 40));
 +#if 0
      // By https://stackoverflow.com/a/27898487/1531708
      const int* ascii = getFontData(fontFace);

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ diff -Nuarp opencv-3.4.20.orig/modules/imgproc/src/drawing.cpp opencv-3.4.20/mod`
`93`	`93`
`94`	`94`	`double getFontScaleFromHeight(const int fontFace, const int pixelHeight, const int thickness)`
`95`	`95`	`{`
`96`		`-+ return pixelHeight / 16.0;`
	`96`	`++ return pixelHeight / (fontFace == 1 ? 16 : (fontFace == 5 ? 24 : 40));`
`97`	`97`	`+#if 0`
`98`	`98`	`// By https://stackoverflow.com/a/27898487/1531708`
`99`	`99`	`const int* ascii = getFontData(fontFace);`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ diff -Nuarp opencv-4.8.1.orig/modules/imgproc/src/drawing.cpp opencv-4.8.1/modul`
`93`	`93`
`94`	`94`	`double getFontScaleFromHeight(const int fontFace, const int pixelHeight, const int thickness)`
`95`	`95`	`{`
`96`		`-+ return pixelHeight / 16.0;`
	`96`	`++ return pixelHeight / (fontFace == 1 ? 16 : (fontFace == 5 ? 24 : 40));`
`97`	`97`	`+#if 0`
`98`	`98`	`// By https://stackoverflow.com/a/27898487/1531708`
`99`	`99`	`const int* ascii = getFontData(fontFace);`