From e90047abba941c7b7dcbdc23e5f5f995b640420b Mon Sep 17 00:00:00 2001
From: Matthew <wakinchau@msn.com>
Date: Wed, 20 Nov 2024 13:39:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=AF=91=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E5=92=8C=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/cpp/CvText.cpp            | 4 ++--
 app/src/main/cpp/PhoneDevice.cpp       | 2 +-
 app/src/main/cpp/camera2/ndkcamera.cpp | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/cpp/CvText.cpp b/app/src/main/cpp/CvText.cpp
index 39be43a9..d17187e7 100644
--- a/app/src/main/cpp/CvText.cpp
+++ b/app/src/main/cpp/CvText.cpp
@@ -371,7 +371,7 @@ namespace cv {
 			delete userData;
 #if defined(USING_HB)
 			hb_buffer_destroy(hb_buffer);
-#endif 0
+#endif // 0
 			}
 
 		// https://freetype.org/freetype2/docs/tutorial/example2.cpp
@@ -630,7 +630,7 @@ namespace cv {
 
 #if defined(USING_HB)
 			hb_buffer_destroy(hb_buffer);
-#endif 0
+#endif // 0
 		}
 
 		Size FreeType2Impl::getTextSize(
diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp
index 132d6fb9..2af576f5 100644
--- a/app/src/main/cpp/PhoneDevice.cpp
+++ b/app/src/main/cpp/PhoneDevice.cpp
@@ -2116,7 +2116,7 @@ bool CPhoneDevice::onBurstCapture(std::shared_ptr<ACameraMetadata> characteristi
 
             int32_t planeCount = 0;
             mstatus = AImage_getNumberOfPlanes(spImage.get(), &planeCount);
-            AASSERT(status == AMEDIA_OK && planeCount == 1, "Error: getNumberOfPlanes() planeCount = %d", planeCount);
+            AASSERT(mstatus == AMEDIA_OK && planeCount == 1, "Error: getNumberOfPlanes() planeCount = %d", planeCount);
 
             uint8_t *planeData = NULL;
             int planeDataLen = 0;
diff --git a/app/src/main/cpp/camera2/ndkcamera.cpp b/app/src/main/cpp/camera2/ndkcamera.cpp
index 5386fe90..57fa9a15 100644
--- a/app/src/main/cpp/camera2/ndkcamera.cpp
+++ b/app/src/main/cpp/camera2/ndkcamera.cpp
@@ -2328,6 +2328,8 @@ bool NdkCamera::convertAImageToNv21(AImage* image, uint8_t** nv21, int32_t& widt
         }
 
     }
+
+	return true;
 }
 
 void NdkCamera::EnumCameraResult(ACameraMetadata* result, CAPTURE_RESULT& captureResult)