lmh188
/
zynq_7010
mirror of http://192.168.10.5:8099/huagao/zynq_7010.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

微调

This commit is contained in:
modehua 2023-07-19 22:50:35 -07:00
parent 435a9b48d3
commit 2a52232867
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -64,10 +64,10 @@ add_custom_command(TARGET ${PROJECT_NAME}
set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS_RELEASE "-s") 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} ${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_link_libraries(${PROJECT_NAME} pthread )
target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR} target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR}
${PROJECT_SOURCE_DIR}/fpga ${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/
) )

4
UsbScanner.cpp
View File

@ -260,7 +260,7 @@ void UsbScanner::ClearImages()
static int aquiredimgindex = 0; static int aquiredimgindex = 0;
HG_JpegCompressInfo UsbScanner::GetImage() HG_JpegCompressInfo UsbScanner::GetImage()
{ {
HG_JpegCompressInfo ret = {nullptr, 0}; HG_JpegCompressInfo ret = {0};
if (m_images.Size() > 0 && !m_images.IsShutDown()) if (m_images.Size() > 0 && !m_images.IsShutDown())
{ {
ret = m_images.Take(); ret = m_images.Take();
@ -308,7 +308,7 @@ bool UsbScanner::GetEventQueueEmpty()
HG_JpegCompressInfo UsbScanner::GetFrontImage() HG_JpegCompressInfo UsbScanner::GetFrontImage()
{ {
HG_JpegCompressInfo ret = {nullptr, 0}; HG_JpegCompressInfo ret = {0};
if (m_images.Size() > 0) if (m_images.Size() > 0)
ret = m_images.Front(); ret = m_images.Front();
return ret; return ret;

9
scanservices_utils.h
View File

@ -82,11 +82,12 @@ enum class LedStatus
struct HG_JpegCompressInfo struct HG_JpegCompressInfo
{ {
unsigned char *pJpegData;
unsigned int DataLength; unsigned int DataLength;
bool first_frame; unsigned int data_type; //jpg raw bitmap....
bool last_frame; unsigned int first_frame;
bool index_frame; unsigned int last_frame;
unsigned int index_frame;
unsigned char *pJpegData;
}; };