From 2a52232867b37c9b648b77e5d37fd416766c8df4 Mon Sep 17 00:00:00 2001
From: modehua <mo1027728827@qq.com>
Date: Wed, 19 Jul 2023 22:50:35 -0700
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMakeLists.txt       | 4 ++--
 UsbScanner.cpp       | 4 ++--
 scanservices_utils.h | 9 +++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 42e1dbb..848bf59 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,10 +64,10 @@ add_custom_command(TARGET ${PROJECT_NAME}
 
 set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS_RELEASE  "-s")
 target_link_libraries(${PROJECT_NAME} ${PROJECT_BINARY_DIR}/bin/libfpgaupdate.a)
-#target_link_libraries(${PROJECT_NAME}  opencv_core opencv_highgui opencv_imgproc opencv_imgcodecs turbojpeg pthread ) 
+target_link_libraries(${PROJECT_NAME}  opencv_core opencv_highgui opencv_imgproc opencv_imgcodecs turbojpeg pthread ) 
 target_link_libraries(${PROJECT_NAME}  pthread ) 
 
 target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR} 
     ${PROJECT_SOURCE_DIR}/fpga
-    ${PROJECT_SOURCE_DIR}/home/modehua/sdk/sysroots/cortexa9t2hf-neon-xilinx-linux-gnueabi/usr/include/opencv4/
+    /home/modehua/sdk/sysroots/cortexa9t2hf-neon-xilinx-linux-gnueabi/usr/include/opencv4/
 )
\ No newline at end of file
diff --git a/UsbScanner.cpp b/UsbScanner.cpp
index 821b518..6089493 100644
--- a/UsbScanner.cpp
+++ b/UsbScanner.cpp
@@ -260,7 +260,7 @@ void UsbScanner::ClearImages()
 static int aquiredimgindex = 0;
 HG_JpegCompressInfo UsbScanner::GetImage()
 {
-    HG_JpegCompressInfo ret = {nullptr, 0};
+    HG_JpegCompressInfo ret = {0};
     if (m_images.Size() > 0 && !m_images.IsShutDown())
     {
         ret = m_images.Take();
@@ -308,7 +308,7 @@ bool UsbScanner::GetEventQueueEmpty()
 
 HG_JpegCompressInfo UsbScanner::GetFrontImage()
 {
-    HG_JpegCompressInfo ret = {nullptr, 0};
+    HG_JpegCompressInfo ret = {0};
     if (m_images.Size() > 0)
         ret = m_images.Front();
     return ret;
diff --git a/scanservices_utils.h b/scanservices_utils.h
index 31151b0..db17a0d 100644
--- a/scanservices_utils.h
+++ b/scanservices_utils.h
@@ -82,11 +82,12 @@ enum class LedStatus
 
 struct HG_JpegCompressInfo
 {
-	unsigned char *pJpegData;
 	unsigned int DataLength;
-	bool first_frame;
-	bool last_frame;
-	bool index_frame;
+	unsigned int data_type;		//jpg  raw bitmap....
+	unsigned int  first_frame;
+	unsigned int  last_frame;
+	unsigned int  index_frame;
+	unsigned char *pJpegData;
 };