From 94387ff96e9cd31a12401d4eb75b8a6644206bf2 Mon Sep 17 00:00:00 2001
From: Matthew <wakinchau@msn.com>
Date: Sat, 3 Aug 2024 08:51:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9=E7=A9=BA=E6=A0=BC?=
 =?UTF-8?q?=E7=9A=84=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/cpp/CvText.cpp | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/app/src/main/cpp/CvText.cpp b/app/src/main/cpp/CvText.cpp
index 01dbcdd5..48a15b16 100644
--- a/app/src/main/cpp/CvText.cpp
+++ b/app/src/main/cpp/CvText.cpp
@@ -354,7 +354,18 @@ namespace cv {
 				mvFn(NULL, (void*)userData);
 
 				// Update current position ( in FreeType coordinates )
+#if defined(USING_HB)
 				currentPos.x += mFace->glyph->advance.x;
+#else
+				if (wstr[i] == ' ')
+				{
+					currentPos.x += mFace->glyph->advance.x << 1;
+				}
+				else
+				{
+					currentPos.x += mFace->glyph->advance.x;
+				}
+#endif
 				currentPos.y += mFace->glyph->advance.y;
 			}
 			delete userData;
@@ -1036,7 +1047,19 @@ namespace cv {
 						(this->*putPixel)(dst, gPos.y + row, gPos.x + col, _colorUC8n, cl);
 					}
 				}
-				_org.x += (mFace->glyph->advance.x) >> 6;
+
+#if defined(USING_HB)
+                _org.x += (mFace->glyph->advance.x) >> 6;
+#else
+                if (wstr[i] == ' ')
+                {
+                    _org.x += ((mFace->glyph->advance.x) >> 6) << 1;
+                }
+                else
+                {
+                    _org.x += (mFace->glyph->advance.x) >> 6;
+                }
+#endif
 				_org.y += (mFace->glyph->advance.y) >> 6;
 			}