update GetTextSize

hybridgroup · Jul 18, 2021 · 1d585b0 · 1d585b0
1 parent 5ba547d
commit 1d585b0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/contrib/freetype.go b/contrib/freetype.go
@@ -90,14 +90,14 @@ func (f *FreeType2) PutText(img *gocv.Mat, text string, org image.Point,
 // For further details, please see:
 // https://docs.opencv.org/master/d9/dfa/classcv_1_1freetype_1_1FreeType2.html#af135a132505125bdea74b378dda3bb5d
 //
-func (f *FreeType2) GetTextSize(text string, fontHeight int, thickness int, baseLine *int) image.Point {
+func (f *FreeType2) GetTextSize(text string, fontHeight int, thickness int) (image.Point, int) {
 	cText := C.CString(text)
 	defer C.free(unsafe.Pointer(cText))
-	var cBaseLine C.int = C.int(*baseLine)
+	cBaseLine := C.int(0)
+
 	sz := C.FreeType2_GetTextSize((C.FreeType2)(f.p), cText, C.int(fontHeight), C.int(thickness), &cBaseLine)
-	*baseLine = int(cBaseLine)
 	return image.Point{
 		X: int(sz.width),
 		Y: int(sz.height),
-	}
+	}, int(cBaseLine)
 }
diff --git a/contrib/freetype_test.go b/contrib/freetype_test.go
@@ -21,8 +21,7 @@ func TestFreeTypeGetTextSize(t *testing.T) {
 
 	ft.LoadFontData("../fonts/JetBrainsMono-Regular.ttf", 0)
 
-	baseLine := 0
-	size := ft.GetTextSize("test", 60, 2, &baseLine)
+	size, baseLine := ft.GetTextSize("test", 60, 2)
 
 	if size.X != 140 {
 		t.Error("Invalid text size width")